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

[Stephan Bergmann]

 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f80fceaa2ed360ef39710eefa5d00f2ad57a718
Author: Stephan Bergmann 
Date:   Thu Jan 26 08:54:57 2017 +0100

loplugin:salbool

Change-Id: I9c34c84d14084e84ab7d9fda78955cf2aebaf5dc

diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 
b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index ba82a41..4676966 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -460,7 +460,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData,
 else if ( rType == cppu::UnoType::get() )
 {
 // boolean
-sal_Bool bValue = false;
+bool bValue = false;
 rInData >>= bValue;
 aStringValue = OUString::boolean( bValue );
 aStringType = aTypeBoolean;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bryan Quigley]

 Makefile.fetch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 424897ba348093ab1697c676a3e44b9060c5b2da
Author: Bryan Quigley 
Date:   Wed Jan 25 15:13:25 2017 -0500

Stop working around broken IPv6 site

This basically reverts 324212ce01c10a8811d25c95d1ae6a83d8214f3d which
forced wget to only use IPv4.

dev-www.libreoffice.org's IPv6 support was broken for a while.  It
appears to be back to working.

Change-Id: Ib235ddd5719089eaf9d4559bd913571fc46069d1
Reviewed-on: https://gerrit.libreoffice.org/33558
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/Makefile.fetch b/Makefile.fetch
index db62719..a350b2f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log
 
 ifneq (,$(WGET))
 define fetch_Download__wget_command
-&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N 
--no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ 
$$PIPESTATUS -eq 0 ]'
+&& bash -c '$(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N 
--no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ 
$$PIPESTATUS -eq 0 ]'
 endef
 
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sc/source/filter/inc/namebuff.hxx |   26 +++---
 1 file changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 9c4c20367dd5b74c4302f9bf71030c23c8c49144
Author: Jochen Nitschke 
Date:   Wed Jan 25 20:06:47 2017 +0100

remove unused operators

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

diff --git a/sc/source/filter/inc/namebuff.hxx 
b/sc/source/filter/inc/namebuff.hxx
index 18e8a75..13233c7 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -43,33 +43,13 @@ private:
 static sal_uInt32   MakeHashCode( const OUString& );
 public:
 inline  StringHashEntry( const OUString& );
-inline void operator =( const sal_Char* );
-inline void operator =( const OUString& );
-inline void operator =( const StringHashEntry& );
 inline bool operator ==( const StringHashEntry& ) const;
 };
 
-inline StringHashEntry::StringHashEntry( const OUString& r ) : aString( r )
+inline StringHashEntry::StringHashEntry( const OUString& r )
+: aString( r )
+, nHash( MakeHashCode(r) )
 {
-nHash = MakeHashCode( r );
-}
-
-inline void StringHashEntry::operator =( const sal_Char* p )
-{
-aString = OUString(p, strlen(p), RTL_TEXTENCODING_ASCII_US);
-nHash = MakeHashCode( aString );
-}
-
-inline void StringHashEntry::operator =( const OUString& r )
-{
-aString = r;
-nHash = MakeHashCode( r );
-}
-
-inline void StringHashEntry::operator =( const StringHashEntry& r )
-{
-nHash = r.nHash;
-aString = r.aString;
 }
 
 inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sc/source/filter/inc/namebuff.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 26273f1c5522e6cccd4acd5e1523b28b277b7331
Author: Jochen Nitschke 
Date:   Wed Jan 25 20:12:27 2017 +0100

fix useless assign

typo from commit a599196064003b724c8ffe3144b77292a4082df3
Date:   Mon Sep 30 14:38:41 2013 +0200
covnert sc/source/filter/inc/namebuff.hxx from String to OUString

'=' should have been '+='
was 'aScAbsName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_ABS" ) );'

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

diff --git a/sc/source/filter/inc/namebuff.hxx 
b/sc/source/filter/inc/namebuff.hxx
index 13233c7..8f2b171 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -87,12 +87,11 @@ private:
 Entry( const OUString& rName, const OUString& 
rScName, const ScComplexRefData& rCRD )
 : aStrHashEntry( rName )
 , aScComplexRefDataRel( rCRD )
-, aScAbsName( rScName )
+, aScAbsName( rScName + "_ABS" )
 , nAbsInd(0)
 , nRelInd(0)
 , bSingleRef(false)
 {
-aScAbsName = "_ABS";
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sc/source/filter/excel/excdoc.cxx   |   33 ++---
 sc/source/filter/excel/excform.cxx  |1 +
 sc/source/filter/excel/exctools.cxx |1 +
 sc/source/filter/excel/impop.cxx|6 +-
 sc/source/filter/excel/namebuff.cxx |   16 
 sc/source/filter/inc/excdoc.hxx |4 
 sc/source/filter/inc/imp_op.hxx |2 --
 sc/source/filter/inc/namebuff.hxx   |   34 --
 8 files changed, 9 insertions(+), 88 deletions(-)

New commits:
commit 2640ec898a043c42f62a46f8381cb43cb33d91c2
Author: Jochen Nitschke 
Date:   Wed Jan 25 20:04:27 2017 +0100

NameBuffer is dead

all getters are gone since
commit 96d44c9b077a6cc8068067a795dc63248ab90fea
Date:   Wed Jul 22 10:20:03 2015 +0200
loplugin:unusedmethods sc

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

diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc/source/filter/excel/excdoc.cxx
index 6f3b2ad..e12f107 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -34,7 +34,6 @@
 #include "formulacell.hxx"
 #include "dociter.hxx"
 #include "document.hxx"
-#include "rangenam.hxx"
 #include "dbdata.hxx"
 #include "global.hxx"
 #include "globstr.hrc"
@@ -137,7 +136,6 @@ ExcTable::ExcTable( const XclExpRoot& rRoot ) :
 XclExpRoot( rRoot ),
 mnScTab( SCTAB_GLOBAL ),
 nExcTab( EXC_NOTAB ),
-pTabNames( new NameBuffer( nullptr, 16 ) ),
 mxNoteList( new XclExpNoteList )
 {
 }
@@ -146,7 +144,6 @@ ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) 
:
 XclExpRoot( rRoot ),
 mnScTab( nScTab ),
 nExcTab( rRoot.GetTabInfo().GetXclTab( nScTab ) ),
-pTabNames( new NameBuffer( nullptr, 16 ) ),
 mxNoteList( new XclExpNoteList )
 {
 }
@@ -174,9 +171,6 @@ void ExcTable::FillAsHeaderBinary( ExcBoundsheetList& 
rBoundsheetList )
 else
 Add( new ExcBofW8 );
 
-SCTAB   nC;
-OUString aTmpString;
-SCTAB  nScTabCount = rTabInfo.GetScTabCount();
 sal_uInt16  nExcTabCount= rTabInfo.GetXclTabCount();
 sal_uInt16  nCodenames  = static_cast< sal_uInt16 >( 
GetExtDocOptions().GetCodeNameCount() );
 
@@ -229,15 +223,6 @@ void ExcTable::FillAsHeaderBinary( ExcBoundsheetList& 
rBoundsheetList )
 
 Add( new XclExpUInt16Record( EXC_ID_FNGROUPCOUNT, 14 ) );
 
-// first setup table names and contents
-
-for( nC = 0 ; nC < nScTabCount ; nC++ )
-if( rTabInfo.IsExportTab( nC ) )
-{
-rDoc.GetName( nC, aTmpString );
-*pTabNames << aTmpString;
-}
-
 if ( GetBiff() <= EXC_BIFF5 )
 {
 // global link table: EXTERNCOUNT, EXTERNSHEET, NAME
@@ -290,6 +275,8 @@ void ExcTable::FillAsHeaderBinary( ExcBoundsheetList& 
rBoundsheetList )
 aRecList.AppendRecord( CreateRecord( EXC_ID_XFLIST ) );
 aRecList.AppendRecord( CreateRecord( EXC_ID_PALETTE ) );
 
+SCTAB   nC;
+SCTAB  nScTabCount = rTabInfo.GetScTabCount();
 if( GetBiff() <= EXC_BIFF5 )
 {
 // Bundlesheet
@@ -326,6 +313,7 @@ void ExcTable::FillAsHeaderBinary( ExcBoundsheetList& 
rBoundsheetList )
 rBoundsheetList.AppendRecord( xBoundsheet );
 }
 
+OUString aTmpString;
 for( SCTAB nAdd = 0; nC < static_cast(nCodenames) ; nC++, 
nAdd++ )
 {
 aTmpString = lcl_GetVbaTabName( nAdd );
@@ -362,24 +350,12 @@ void ExcTable::FillAsHeaderXml( ExcBoundsheetList& 
rBoundsheetList )
 ScDocument& rDoc = GetDoc();
 XclExpTabInfo& rTabInfo = GetTabInfo();
 
-SCTAB   nC;
-OUString aTmpString;
-SCTAB  nScTabCount = rTabInfo.GetScTabCount();
 sal_uInt16  nExcTabCount= rTabInfo.GetXclTabCount();
 sal_uInt16  nCodenames  = static_cast< sal_uInt16 >( 
GetExtDocOptions().GetCodeNameCount() );
 
 rR.pTabId = new XclExpChTrTabId( std::max( nExcTabCount, nCodenames ) );
 Add( rR.pTabId );
 
-// first setup table names and contents
-
-for( nC = 0 ; nC < nScTabCount ; nC++ )
-if( rTabInfo.IsExportTab( nC ) )
-{
-rDoc.GetName( nC, aTmpString );
-*pTabNames << aTmpString;
-}
-
 Add( new XclExpXmlStartSingleElementRecord( XML_workbookPr ) );
 Add( new XclExpBoolRecord(0x0040, false, XML_backupFile ) );// BACKUP
 Add( new XclExpBoolRecord(0x008D, false, XML_showObjects ) );   // HIDEOBJ
@@ -418,6 +394,8 @@ void ExcTable::FillAsHeaderXml( ExcBoundsheetList& 
rBoundsheetList )
 lcl_AddBookviews( aRecList, *this );
 
 // Bundlesheet
+SCTAB nC;
+SCTAB nScTabCount = rTabInfo.GetScTabCount();
 aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_sheets ) );
 for( nC = 0 ; nC < nScTabCount ; nC++ )
 if( rTabInfo.IsExportTab( nC ) )
@@ -428,6 +406,7 @@ void ExcTable::FillAsHeaderXml( ExcBoundsheetList& 
rBoundsheetLis

[Libreoffice-commits] core.git: 3 commits - include/editeng include/tools starmath/inc starmath/source sw/source

[Noel Grandin]

 include/editeng/flditem.hxx  |   54 +++
 include/editeng/measfld.hxx  |2 -
 include/tools/pstm.hxx   |2 -
 starmath/inc/view.hxx|6 ++--
 starmath/source/view.cxx |   18 +
 sw/source/uibase/inc/unoatxt.hxx |8 +++--
 sw/source/uibase/uno/unoatxt.cxx |   28 +---
 7 files changed, 57 insertions(+), 61 deletions(-)

New commits:
commit 0d172a803054801ff42296c65cfca844ad5e8f6b
Author: Noel Grandin 
Date:   Wed Jan 25 16:09:23 2017 +0200

use rtl::Reference in SmGraphicWindow

instead of storing both a raw pointer and an uno::Reference

Change-Id: Ib84809bee35c01fb590439174740d92bf4cd54bd

diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index cec85a1..b41f5a7 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -23,6 +23,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -72,8 +73,7 @@ protected:
 bool IsInlineEditEnabled() const;
 
 private:
-css::uno::Reference xAccessible;
-SmGraphicAccessible* pAccessible;
+rtl::Reference mxAccessible;
 
 SmViewShell* pViewShell;
 sal_uInt16 nZoom;
@@ -131,7 +131,7 @@ public:
 using Window::GetAccessible;
 SmGraphicAccessible* GetAccessible_Impl()
 {
-return pAccessible;
+return mxAccessible.get();
 }
 };
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index dc099f9..0e93bdd 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -95,7 +95,6 @@ using namespace css::uno;
 
 SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell)
 : ScrollableWindow(&pShell->GetViewFrame()->GetWindow())
-, pAccessible(nullptr)
 , pViewShell(pShell)
 , nZoom(100)
 {
@@ -122,10 +121,8 @@ SmGraphicWindow::~SmGraphicWindow()
 
 void SmGraphicWindow::dispose()
 {
-if (pAccessible)
-pAccessible->ClearWin();// make Accessible defunctional
-// Note: memory for pAccessible will be freed when the reference
-// xAccessible is released.
+if (mxAccessible.is())
+mxAccessible->ClearWin();// make Accessible defunctional
 CaretBlinkStop();
 ScrollableWindow::dispose();
 }
@@ -235,12 +232,12 @@ void SmGraphicWindow::GetFocus()
 void SmGraphicWindow::LoseFocus()
 {
 ScrollableWindow::LoseFocus();
-if (xAccessible.is())
+if (mxAccessible.is())
 {
 uno::Any aOldValue, aNewValue;
 aOldValue <<= AccessibleStateType::FOCUSED;
 // aNewValue remains empty
-pAccessible->LaunchEvent( AccessibleEventId::STATE_CHANGED,
+mxAccessible->LaunchEvent( AccessibleEventId::STATE_CHANGED,
 aOldValue, aNewValue );
 }
 if (!IsInlineEditEnabled())
@@ -614,12 +611,11 @@ void SmGraphicWindow::ZoomToFitInWindow()
 
 uno::Reference< XAccessible > SmGraphicWindow::CreateAccessible()
 {
-if (!pAccessible)
+if (!mxAccessible.is())
 {
-pAccessible = new SmGraphicAccessible( this );
-xAccessible = pAccessible;
+mxAccessible = new SmGraphicAccessible( this );
 }
-return xAccessible;
+return mxAccessible.get();
 }
 
 /**/
commit f025255bf66394ec168ae4cfc4d048c202800d16
Author: Noel Grandin 
Date:   Wed Jan 25 15:54:42 2017 +0200

use rtl::Reference in SwXAutoTextEntry

instead of storing both a raw pointer and an uno::Reference

Change-Id: I52c8827446d999d0a34b91ab17c056d4237d71a7

diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index feaf0ce..00d6bb0 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -34,7 +34,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+
 class SwTextBlocks;
 class SwGlossaries;
 class SwDoc;
@@ -172,12 +174,12 @@ class SwXAutoTextEntry
 OUStringsGroupName;
 OUStringsEntryName;
 SwDocShellRef   xDocSh;
-SwXBodyText*pBodyText;
-css::uno::Reference < css::lang::XServiceInfo> xBodyText;
+rtl::Reference
+mxBodyText;
 
 void EnsureBodyText ()
 {
-if ( !pBodyText )
+if ( !mxBodyText.is() )
 GetBodyText();
 }
 void GetBodyText ();
diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index f50550a..3b19d0f 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -721,8 +721,7 @@ SwXAutoTextEntry::SwXAutoTextEntry(SwGlossaries* pGlss, 
const OUString& rGroupNa
 WeakComponentImplHelper(m_aMutex),
 pGlossaries(pGlss),
 sGroupName(rGroupName),
-sEntryName(rEntryName),
-pBodyText ( nullptr )
+sEntryName(rEntryName)
 {
 }
 
@@ -761,7 +760,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const 
SfxHint& _rHint )
 if (SfxEventHintId::PrepareCloseDoc == pEventHint->GetEventId())
 {
 i

[Libreoffice-commits] core.git: include/com include/rtl include/tools

[Noel Grandin]

 include/com/sun/star/uno/Reference.h |9 +
 include/rtl/ref.hxx  |8 
 include/tools/ref.hxx|2 ++
 3 files changed, 19 insertions(+)

New commits:
commit 1480a2d05aff1eb6984882aacf39570b6b78a5d5
Author: Noel Grandin 
Date:   Wed Jan 25 10:42:28 2017 +0200

add 'explicit operator bool' to our reference classes

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

diff --git a/include/com/sun/star/uno/Reference.h 
b/include/com/sun/star/uno/Reference.h
index e657fd8..af2dc29 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -93,6 +93,15 @@ public:
 inline bool SAL_CALL is() const
 { return (NULL != _pInterface); }
 
+#if defined LIBO_INTERNAL_ONLY
+/** Checks if reference is null.
+
+@return true if reference acquires an interface, i.e. true if it is 
not null
+*/
+inline explicit operator bool() const
+{ return is(); }
+#endif
+
 /** Equality operator: compares two interfaces
 Checks if both references are null or refer to the same object.
 
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index b70088b..5eeb857 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -195,6 +195,14 @@ public:
 return (m_pBody != NULL);
 }
 
+#if defined LIBO_INTERNAL_ONLY
+/** Returns True if the handle does point to a valid body.
+ */
+inline explicit operator bool() const
+{
+return is();
+}
+#endif
 
 /** Returns True if this points to pBody.
  */
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index c251a78..97a5b36 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -90,6 +90,8 @@ public:
 
 bool Is() const { return pObj != nullptr; }
 
+explicit operator bool() const { return Is(); }
+
 T * get() const { return pObj; }
 
 T * operator ->() const { assert(pObj != nullptr); return pObj; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/ClientSession.cpp wsd/DocumentBroker.cpp

[Ashod Nakashian]

 wsd/ClientSession.cpp  |   10 --
 wsd/DocumentBroker.cpp |   10 --
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 6fe933b46678f3bf52a63f51890ac4c900989d3b
Author: Ashod Nakashian 
Date:   Wed Jan 25 20:55:39 2017 -0500

wsd: take lock to forward messages to clients

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

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 742bb07..63db162 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -583,13 +583,10 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 }
 else if (tokens.size() == 2 && tokens[0] == "statechanged:")
 {
-if (docBroker)
+StringTokenizer stateTokens(tokens[1], "=", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+if (stateTokens.count() == 2 && stateTokens[0] == 
".uno:ModifiedStatus")
 {
-StringTokenizer stateTokens(tokens[1], "=", 
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
-if (stateTokens.count() == 2 && stateTokens[0] == 
".uno:ModifiedStatus")
-{
-docBroker->setModified(stateTokens[1] == "true");
-}
+docBroker->setModified(stateTokens[1] == "true");
 }
 }
 
@@ -652,6 +649,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 stringToInteger(firstLineTokens[3], w);
 stringToInteger(firstLineTokens[4], h);
 }
+
 docBroker->invalidateCursor(x, y, w, h);
 }
 else
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 7b3ee4c..91f3ce4 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -759,8 +759,6 @@ bool DocumentBroker::handleInput(const std::vector& 
payload)
 
 void DocumentBroker::invalidateTiles(const std::string& tiles)
 {
-std::unique_lock lock(_mutex);
-
 // Remove from cache.
 _tileCache->invalidateTiles(tiles);
 }
@@ -904,6 +902,9 @@ void DocumentBroker::handleTileResponse(const 
std::vector& payload)
 const auto tile = TileDesc::parse(firstLine);
 const auto buffer = payload.data();
 const auto offset = firstLine.size() + 1;
+
+std::unique_lock lock(_mutex);
+
 tileCache().saveTileAndNotify(tile, buffer + offset, length - 
offset);
 }
 else
@@ -931,6 +932,9 @@ void DocumentBroker::handleTileCombinedResponse(const 
std::vector& payload
 const auto tileCombined = TileCombined::parse(firstLine);
 const auto buffer = payload.data();
 auto offset = firstLine.size() + 1;
+
+std::unique_lock lock(_mutex);
+
 for (const auto& tile : tileCombined.getTiles())
 {
 tileCache().saveTileAndNotify(tile, buffer + offset, 
tile.getImgSize());
@@ -1015,6 +1019,8 @@ bool DocumentBroker::forwardToClient(const 
std::shared_ptr& payload)
 std::string sid;
 if (LOOLProtocol::parseNameValuePair(payload->forwardToken(), name, sid, 
'-') && name == "client")
 {
+std::unique_lock lock(_mutex);
+
 const auto it = _sessions.find(sid);
 if (it != _sessions.end())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/ClientSession.cpp

[Ashod Nakashian]

 wsd/ClientSession.cpp |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit b8edc135a7ce72631da8efefd78cd3cbc287c469
Author: Ashod Nakashian 
Date:   Sun Jan 22 23:19:04 2017 -0500

wsd: use Message object to handle responses back to clients

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

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 6437d00..742bb07 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -477,9 +477,10 @@ void ClientSession::senderThread()
 
 bool ClientSession::handleKitToClientMessage(const char* buffer, const int 
length)
 {
-LOG_TRC(getName() + ": handling [" << getAbbreviatedMessage(buffer, 
length) << "].");
-const std::string firstLine = getFirstLine(buffer, length);
-StringTokenizer tokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
+const auto payload = std::make_shared(buffer, length, 
Message::Dir::Out);
+
+LOG_TRC(getName() + ": handling [" << payload->abbr() << "].");
+const std::string& firstLine = payload->firstLine();
 
 const auto docBroker = _docBroker.lock();
 if (!docBroker)
@@ -490,6 +491,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 
 LOOLWSD::dumpOutgoingTrace(docBroker->getJailId(), getId(), firstLine);
 
+const auto& tokens = payload->tokens();
 if (tokens[0] == "unocommandresult:")
 {
 const std::string stringMsg(buffer, length);
@@ -536,7 +538,6 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 errorKind == "passwordrequired:to-modify" ||
 errorKind == "wrongpassword")
 {
-const auto payload = std::make_shared(buffer, 
length, Message::Dir::Out);
 forwardToClient(payload);
 LOG_WRN("Document load failed: " << errorKind);
 return false;
@@ -544,13 +545,13 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 }
 }
 }
-else if (tokens[0] == "curpart:" && tokens.count() == 2)
+else if (tokens[0] == "curpart:" && tokens.size() == 2)
 {
 //TODO: Should forward to client?
 int curPart;
 return getTokenInteger(tokens[1], "part", curPart);
 }
-else if (tokens.count() == 2 && tokens[0] == "saveas:")
+else if (tokens.size() == 2 && tokens[0] == "saveas:")
 {
 std::string url;
 if (!getTokenString(tokens[1], "url", url))
@@ -580,7 +581,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 setSaveAsUrl(url);
 return true;
 }
-else if (tokens.count() == 2 && tokens[0] == "statechanged:")
+else if (tokens.size() == 2 && tokens[0] == "statechanged:")
 {
 if (docBroker)
 {
@@ -604,7 +605,6 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 docBroker->setLoaded();
 
 // Forward the status response to the client.
-const auto payload = std::make_shared(buffer, length, 
Message::Dir::Out);
 return forwardToClient(payload);
 }
 else if (tokens[0] == "commandvalues:")
@@ -628,7 +628,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 }
 else if (tokens[0] == "partpagerectangles:")
 {
-if (tokens.count() > 1 && !tokens[1].empty())
+if (tokens.size() > 1 && !tokens[1].empty())
 {
 docBroker->tileCache().saveTextFile(std::string(buffer, 
length), "partpagerectangles.txt");
 }
@@ -662,7 +662,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 else if (tokens[0] == "renderfont:")
 {
 std::string font, text;
-if (tokens.count() < 3 ||
+if (tokens.size() < 3 ||
 !getTokenString(tokens[1], "font", font))
 {
 LOG_ERR("Bad syntax for: " << firstLine);
@@ -672,7 +672,6 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 getTokenString(tokens[2], "char", text);
 assert(firstLine.size() < 
static_cast(length));
 docBroker->tileCache().saveRendering(font+text, "font", buffer + 
firstLine.size() + 1, length - firstLine.size() - 1);
-const auto payload = std::make_shared(buffer, length, 
Message::Dir::Out);
 return forwardToClient(payload);
 }
 }
@@ -682,7 +681,6 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 }
 
 // Forward everything else.
-const auto payload = std::make_shared(bu

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp

[Ashod Nakashian]

 wsd/DocumentBroker.cpp |   80 +
 wsd/DocumentBroker.hpp |3 +
 2 files changed, 37 insertions(+), 46 deletions(-)

New commits:
commit f73a17c759f1628db26ec3e8606b5ab799b1acf3
Author: Ashod Nakashian 
Date:   Sun Jan 22 23:18:37 2017 -0500

wsd: use Message objects to handle kit responses

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fb19ca4..7b3ee4c 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -716,39 +716,42 @@ void DocumentBroker::alertAllUsers(const std::string& msg)
 
 bool DocumentBroker::handleInput(const std::vector& payload)
 {
-const auto msg = LOOLProtocol::getAbbreviatedMessage(payload);
+auto message = std::make_shared(payload.data(), payload.size(), 
Message::Dir::Out);
+const auto& msg = message->abbr();
 LOG_TRC("DocumentBroker handling child message: [" << msg << "].");
 
 LOOLWSD::dumpOutgoingTrace(getJailId(), "0", msg);
 
-const auto command = LOOLProtocol::getFirstToken(msg);
-if (command == "tile:")
+if (LOOLProtocol::getFirstToken(message->forwardToken(), '-') == "client")
 {
-handleTileResponse(payload);
-}
-else if (command == "tilecombine:")
-{
-handleTileCombinedResponse(payload);
-}
-else if (LOOLProtocol::getFirstToken(command, '-') == "client")
-{
-forwardToClient(command, payload);
-}
-else if (command == "errortoall:")
-{
-StringTokenizer tokens(msg, " ", StringTokenizer::TOK_IGNORE_EMPTY | 
StringTokenizer::TOK_TRIM);
-assert(tokens.count() == 3);
-std::string cmd, kind;
-LOOLProtocol::getTokenString(tokens, "cmd", cmd);
-assert(cmd != "");
-LOOLProtocol::getTokenString(tokens, "kind", kind);
-assert(kind != "");
-Util::alertAllUsers(cmd, kind);
+forwardToClient(message);
 }
 else
 {
-LOG_ERR("Unexpected message: [" << msg << "].");
-return false;
+const auto& command = message->firstToken();
+if (command == "tile:")
+{
+handleTileResponse(payload);
+}
+else if (command == "tilecombine:")
+{
+handleTileCombinedResponse(payload);
+}
+else if (command == "errortoall:")
+{
+LOG_CHECK_RET(message->tokens().size() == 3, false);
+std::string cmd, kind;
+LOOLProtocol::getTokenString((*message)[1], "cmd", cmd);
+LOG_CHECK_RET(cmd != "", false);
+LOOLProtocol::getTokenString((*message)[2], "kind", kind);
+LOG_CHECK_RET(kind != "", false);
+Util::alertAllUsers(cmd, kind);
+}
+else
+{
+LOG_ERR("Unexpected message: [" << msg << "].");
+return false;
+}
 }
 
 return true;
@@ -1002,37 +1005,24 @@ bool DocumentBroker::forwardToChild(const std::string& 
viewId, const std::string
 return false;
 }
 
-bool DocumentBroker::forwardToClient(const std::string& prefix, const 
std::vector& payload)
+bool DocumentBroker::forwardToClient(const std::shared_ptr& payload)
 {
-assert(payload.size() > prefix.size());
-
-// Remove the prefix and trim.
-size_t index = prefix.size();
-for ( ; index < payload.size(); ++index)
-{
-if (payload[index] != ' ')
-{
-break;
-}
-}
-
-auto data = payload.data() + index;
-auto size = payload.size() - index;
-const auto message = getAbbreviatedMessage(data, size);
-LOG_TRC("Forwarding payload to " << prefix << ' ' << message);
+const std::string& msg = payload->abbr();
+const std::string& prefix = payload->forwardToken();
+LOG_TRC("Forwarding payload to [" << prefix << "]: " << msg);
 
 std::string name;
 std::string sid;
-if (LOOLProtocol::parseNameValuePair(prefix, name, sid, '-') && name == 
"client")
+if (LOOLProtocol::parseNameValuePair(payload->forwardToken(), name, sid, 
'-') && name == "client")
 {
 const auto it = _sessions.find(sid);
 if (it != _sessions.end())
 {
-return it->second->handleKitToClientMessage(data, size);
+return 
it->second->handleKitToClientMessage(payload->data().data(), payload->size());
 }
 else
 {
-LOG_WRN("Client session [" << sid << "] not found to forward 
message: " << message);
+LOG_WRN("Client session [" << sid << "] not found to forward 
message: " << msg);
 }
 }
 else
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 27c4916..8c416ba 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -35,6 +35,7 @@
 class DocumentBroker;
 class StorageBase;
 class TileCache;
+class Me

[Libreoffice-commits] online.git: common/Message.hpp

[Ashod Nakashian]

 common/Message.hpp |   31 +++
 1 file changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 9fe2d9322837806417af2b0ee0399f1d5f512c14
Author: Ashod Nakashian 
Date:   Sun Jan 22 16:09:08 2017 -0500

wsd: Message now supports parsing forwarding prefix

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

diff --git a/common/Message.hpp b/common/Message.hpp
index 5be6186..a71cf56 100644
--- a/common/Message.hpp
+++ b/common/Message.hpp
@@ -28,7 +28,8 @@ public:
 /// message must include the full first-line.
 Message(const std::string& message,
 const enum Dir dir) :
-_data(message.data(), message.data() + message.size()),
+_forwardToken(getForwardToken(message.data(), message.size())),
+_data(skipWhitespace(message.data() + _forwardToken.size()), 
message.data() + message.size()),
 _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
 _id(makeId(dir)),
 _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
@@ -43,15 +44,17 @@ public:
 Message(const std::string& message,
 const enum Dir dir,
 const size_t reserve) :
+_forwardToken(getForwardToken(message.data(), message.size())),
 _data(std::max(reserve, message.size())),
-_tokens(LOOLProtocol::tokenize(message)),
+_tokens(LOOLProtocol::tokenize(message.data() + _forwardToken.size(), 
message.size() - _forwardToken.size())),
 _id(makeId(dir)),
 _firstLine(LOOLProtocol::getFirstLine(message)),
 _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(message)),
 _type(detectType())
 {
 _data.resize(message.size());
-std::memcpy(_data.data(), message.data(), message.size());
+const auto offset = skipWhitespace(message.data() + 
_forwardToken.size());
+std::memcpy(_data.data(), offset, message.size() - (offset - 
message.data()));
 }
 
 /// Construct a message from a character array with type.
@@ -59,7 +62,8 @@ public:
 Message(const char* p,
 const size_t len,
 const enum Dir dir) :
-_data(p, p + len),
+_forwardToken(getForwardToken(p, len)),
+_data(skipWhitespace(p + _forwardToken.size()), p + len),
 _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
 _id(makeId(dir)),
 _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
@@ -72,8 +76,10 @@ public:
 const std::vector& data() const { return _data; }
 
 const std::vector& tokens() const { return _tokens; }
+const std::string& forwardToken() const { return _forwardToken; }
 const std::string& firstToken() const { return _tokens[0]; }
 const std::string& firstLine() const { return _firstLine; }
+const std::string& operator[](size_t index) const { return _tokens[index]; 
}
 
 /// Return the abbreviated message for logging purposes.
 const std::string& abbr() const { return _abbr; }
@@ -129,7 +135,24 @@ private:
 return Type::Text;
 }
 
+std::string getForwardToken(const char* buffer, int length)
+{
+auto forward = LOOLProtocol::getFirstToken(buffer, length);
+return (forward.find('-') != std::string::npos ? forward : 
std::string());
+}
+
+const char* skipWhitespace(const char* p)
+{
+while (p && *p == ' ')
+{
+++p;
+}
+
+return p;
+}
+
 private:
+const std::string _forwardToken;
 std::vector _data;
 const std::vector _tokens;
 const std::string _id;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Message.hpp wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/TileCache.cpp

[Ashod Nakashian]

 common/Message.hpp|   31 +++
 wsd/ClientSession.cpp |   22 --
 wsd/ClientSession.hpp |8 ++--
 wsd/TileCache.cpp |   10 --
 4 files changed, 33 insertions(+), 38 deletions(-)

New commits:
commit acc029a4113349ccc88bf77accd264f4584574e0
Author: Ashod Nakashian 
Date:   Sat Jan 21 23:50:08 2017 -0500

wsd: autodetect message type

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

diff --git a/common/Message.hpp b/common/Message.hpp
index cc7063e..5be6186 100644
--- a/common/Message.hpp
+++ b/common/Message.hpp
@@ -27,14 +27,13 @@ public:
 /// Construct a text message.
 /// message must include the full first-line.
 Message(const std::string& message,
-const enum Dir dir,
-const enum Type type = Type::Text) :
+const enum Dir dir) :
 _data(message.data(), message.data() + message.size()),
 _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
 _id(makeId(dir)),
 _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
 _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), 
_data.size())),
-_type(type)
+_type(detectType())
 {
 }
 
@@ -43,14 +42,13 @@ public:
 /// message must include the full first-line.
 Message(const std::string& message,
 const enum Dir dir,
-const enum Type type,
 const size_t reserve) :
 _data(std::max(reserve, message.size())),
 _tokens(LOOLProtocol::tokenize(message)),
 _id(makeId(dir)),
 _firstLine(LOOLProtocol::getFirstLine(message)),
 _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(message)),
-_type(type)
+_type(detectType())
 {
 _data.resize(message.size());
 std::memcpy(_data.data(), message.data(), message.size());
@@ -60,14 +58,13 @@ public:
 /// Note: p must include the full first-line.
 Message(const char* p,
 const size_t len,
-const enum Dir dir,
-const enum Type type) :
+const enum Dir dir) :
 _data(p, p + len),
 _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
 _id(makeId(dir)),
 _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
 _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), 
_data.size())),
-_type(type)
+_type(detectType())
 {
 }
 
@@ -114,6 +111,24 @@ private:
 return (dir == Dir::In ? 'i' : 'o') + std::to_string(++Counter);
 }
 
+Type detectType() const
+{
+if (_tokens[0] == "tile:" ||
+_tokens[0] == "tilecombine:" ||
+_tokens[0] == "renderfont:")
+{
+return Type::Binary;
+}
+
+if (_data[_data.size() - 1] == '}')
+{
+return Type::JSON;
+}
+
+// All others are plain text.
+return Type::Text;
+}
+
 private:
 std::vector _data;
 const std::vector _tokens;
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 12b8fb8..6437d00 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -536,9 +536,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 errorKind == "passwordrequired:to-modify" ||
 errorKind == "wrongpassword")
 {
-const auto payload = std::make_shared(buffer, 
length,
-   
Message::Dir::Out,
-   
Message::Type::Text);
+const auto payload = std::make_shared(buffer, 
length, Message::Dir::Out);
 forwardToClient(payload);
 LOG_WRN("Document load failed: " << errorKind);
 return false;
@@ -606,9 +604,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 docBroker->setLoaded();
 
 // Forward the status response to the client.
-const auto payload = std::make_shared(buffer, length,
-   Message::Dir::Out,
-   
Message::Type::Text);
+const auto payload = std::make_shared(buffer, length, 
Message::Dir::Out);
 return forwardToClient(payload);
 }
 else if (tokens[0] == "commandvalues:")
@@ -676,9 +672,7 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 getTokenString(tokens[2], "char", text);
 assert(firstLine.size() < 
static_cast(length));
 docBroker->tileCache().saveRenderin

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

[Kohei Yoshida]

 editeng/source/editeng/eerdll.cxx   |   12 ++--
 editeng/source/editeng/eerdll2.hxx  |4 
 editeng/source/editeng/impedit.hxx  |1 -
 editeng/source/editeng/impedit2.cxx |   29 +++--
 4 files changed, 21 insertions(+), 25 deletions(-)

New commits:
commit b41186a2fc49e440890b8c86e5367352ffaf9cd6
Author: Kohei Yoshida 
Date:   Mon Jan 23 22:01:37 2017 -0500

tdf#103927: Share single standard VirtualDevice instance.

To avoid creating excessive amounts of VirtualDevice instances. Also,
since we now have VclPtr, we shouldn't need this bOwnerOfRefDev flag.

Change-Id: I97a6f553a178b32bc173b83a6716185d126f97e1
Reviewed-on: https://gerrit.libreoffice.org/33508
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/editeng/source/editeng/eerdll.cxx 
b/editeng/source/editeng/eerdll.cxx
index 558c475..94f9760 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -83,9 +84,11 @@ EditDLL& EditDLL::Get()
 return theEditDLL::get();
 }
 
-GlobalEditData::GlobalEditData()
+GlobalEditData::GlobalEditData() :
+ppDefItems(nullptr),
+mpVirDev(VclPtr::Create())
 {
-ppDefItems = nullptr;
+mpVirDev->SetMapMode(MapUnit::MapTwip);
 }
 
 GlobalEditData::~GlobalEditData()
@@ -194,6 +197,11 @@ uno::Reference< linguistic2::XLanguageGuessing > const & 
GlobalEditData::GetLang
 return xLanguageGuesser;
 }
 
+VclPtr GlobalEditData::GetStdVirtualDevice()
+{
+return mpVirDev;
+}
+
 EditResId::EditResId(sal_uInt16 nId)
 : ResId(nId, *EditDLL::GetResMgr())
 {
diff --git a/editeng/source/editeng/eerdll2.hxx 
b/editeng/source/editeng/eerdll2.hxx
index 136b9cd..32c7c40 100644
--- a/editeng/source/editeng/eerdll2.hxx
+++ b/editeng/source/editeng/eerdll2.hxx
@@ -25,6 +25,7 @@
 #include 
 
 class SfxPoolItem;
+class VirtualDevice;
 
 class GlobalEditData
 {
@@ -33,6 +34,7 @@ private:
 std::vector*   ppDefItems;
 
 rtl::Reference xForbiddenCharsTable;
+VclPtr mpVirDev;
 
 public:
 GlobalEditData();
@@ -43,6 +45,8 @@ public:
 rtl::Reference const & 
GetForbiddenCharsTable();
 voidSetForbiddenCharsTable( 
rtl::Reference const & xForbiddenChars ) { 
xForbiddenCharsTable = xForbiddenChars; }
 css::uno::Reference< css::linguistic2::XLanguageGuessing > const & 
GetLanguageGuesser();
+
+VclPtr GetStdVirtualDevice();
 };
 
 #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EERDLL2_HXX
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 1b585f7..74a55ce 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -513,7 +513,6 @@ private:
 boolbIsInUndo:1;
 boolbUpdate:1;
 boolbUndoEnabled:1;
-boolbOwnerOfRefDev:1;
 boolbDowning:1;
 boolbUseAutoColor:1;
 boolbForceAutoColor:1;
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 0d89b43..1c56dfb 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -95,7 +95,6 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* 
pItemPool ) :
 bIsInUndo(false),
 bUpdate(true),
 bUndoEnabled(true),
-bOwnerOfRefDev(false),
 bDowning(false),
 bUseAutoColor(true),
 bForceAutoColor(false),
@@ -184,26 +183,15 @@ ImpEditEngine::~ImpEditEngine()
 delete mpIMEInfos;
 delete pColorConfig;
 delete pCTLOptions;
-if ( bOwnerOfRefDev )
-pRefDev.disposeAndClear();
 delete pSpellInfo;
 }
 
 void ImpEditEngine::SetRefDevice( OutputDevice* pRef )
 {
-if ( bOwnerOfRefDev )
-pRefDev.disposeAndClear();
-
-if ( !pRef )
-{
-pRefDev = VclPtr::Create();
-pRefDev->SetMapMode( MapUnit::MapTwip );
-bOwnerOfRefDev = true;
-} else
-{
+if (pRef)
 pRefDev = pRef;
-bOwnerOfRefDev = false;
-}
+else
+pRefDev = EditDLL::Get().GetGlobalData()->GetStdVirtualDevice();
 
 nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
 
@@ -219,13 +207,10 @@ void ImpEditEngine::SetRefMapMode( const MapMode& 
rMapMode )
 if ( GetRefDevice()->GetMapMode() == rMapMode )
 return;
 
-if ( !bOwnerOfRefDev )
-{
-pRefDev = VclPtr::Create();
-pRefDev->SetMapMode( MapUnit::MapTwip );
-SetRefDevice( pRefDev );
-bOwnerOfRefDev = true;
-}
+pRefDev = VclPtr::Create();
+pRefDev->SetMapMode( MapUnit::MapTwip );
+SetRefDevice( pRefDev );
+
 pRefDev->SetMapMode( rMapMode );
 nOnePixelInRef = (sal_uInt16)pRefDev->PixelToLogic( Size( 1, 0 ) ).Width();
 if ( IsFormatted() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lis

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist

[Thorsten Behrens]

 loleaflet/dist/toolbar/toolbar.js |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 44b495aa89a852f679faff85f0ffebd018cf1f11
Author: Thorsten Behrens 
Date:   Wed Jan 25 23:28:47 2017 +0100

Remove Textwrap dropdown from toolbar for the while

Let's leave that out for 5.3 - removes parts of
5902700922d110aee29d67be6224094bb521132d

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 80cdd08..cb95fcf 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -332,15 +332,6 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
-   {type: 'menu', id: 'writer:menu:wrap', caption: 
_('Textwrap'), items: [
-   { text: _('No wrap'), id: 'wrap-WrapOff' },
-   { text: _('Page wrap'), id: 'wrap-WrapOn' },
-   { text: _('Wrap anchor only'), id: 
'wrap-WrapAnchorOnly' },
-   { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
-   { text: _('Left wrap'), id: 'wrap-WrapLeft' },
-   { text: _('Right wrap'), id: 'wrap-WrapRight' },
-   { text: _('Wrap through'), id: 
'wrap-WrapThrough' }
-   ]},
{type: 'button',  id: 'save', img: 'save', hint: 
_('Save'), uno: 'Save'},
{type: 'break'},
{type: 'button',  id: 'undo',  img: 'undo', hint: 
_('Undo'), uno: 'Undo'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 canvas/source/directx/dx_9rm.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 6c6881f9c1011366c58176646f1770f6ecf7f4cf
Author: Aron Budea 
Date:   Mon Jan 23 03:47:19 2017 +0100

tdf#100151: Dispose of window if DX device creation failed

Before, if the device lacked Direct3D capabilities, VclPtr
handling became compromised, and caused a crash. This was
particularly a problem in virtualized/remote desktop
connections in Windows.

Now mpWindow instance is disposed of right away if DX
device creation fails.

Change-Id: I639340380affdb31a93ce6dccd8df33a0a466df6
Reviewed-on: https://gerrit.libreoffice.org/33413
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit bb50474225f80b8aeea49f14ad66173462026a41)
Reviewed-on: https://gerrit.libreoffice.org/33544
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 0d6833d..4c19a68 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -651,6 +651,14 @@ namespace dxcanvas
 // TODO(P2): get rid of those fine-grained locking
 ::osl::MutexGuard aGuard( maMutex );
 
+// TODO(F2): since we would like to share precious hardware
+// resources, the direct3d9 object should be global. each new
+// request for a canvas should only create a new swapchain.
+mpDirect3D9 = COMReference(
+Direct3DCreate9(D3D_SDK_VERSION));
+if(!mpDirect3D9.is())
+return false;
+
 maVertexCache.reserve( 1024 );
 
 mpWindow.disposeAndClear();
@@ -687,17 +695,12 @@ namespace dxcanvas
 // let the child window cover the same size as the parent window.
 mpWindow->setPosSizePixel(0,0,maSize.getX(),maSize.getY());
 
-// TODO(F2): since we would like to share precious hardware
-// resources, the direct3d9 object should be global. each new
-// request for a canvas should only create a new swapchain.
-mpDirect3D9 = COMReference(
-Direct3DCreate9(D3D_SDK_VERSION));
-if(!mpDirect3D9.is())
-return false;
-
 // create a device from the direct3d9 object.
 if(!(createDevice()))
+{
+mpWindow.disposeAndClear();
 return false;
+}
 
 mpWindow->Show();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 svx/source/stbctrls/stbctrls.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 326729ce54de5296cb2a673ae88d2befa3e245ef
Author: Tamás Zolnai 
Date:   Wed Jan 25 23:03:34 2017 +0100

tdf#105520: "Selection Count" does not appear on Status bar when selected

Change-Id: I6ade03b39aeafffa08cfbfcca4739cfe5a73d4ac
Reviewed-on: https://gerrit.libreoffice.org/33561
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 532bbe1..91d4fa9 100644
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.h
@@ -37,7 +37,7 @@
 #define PSZ_FUNC_MAX4
 #define PSZ_FUNC_MIN5
 #define PSZ_FUNC_SUM9
-#define PSZ_FUNC_SELECTION_COUNT12
+#define PSZ_FUNC_SELECTION_COUNT13
 #define PSZ_FUNC_NONE   16
 
 #define XMLSEC_CALL 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

re: Usage of ActiveX in Libre Office

[sos]

Bryan,Please clarify, will stuff like
oShell = CreateObject("WScript.Shell")

Still working after removing ActiveX?If not: then lots off API code will been 
broken and this will been a BIG regression ?
Greetz
Fernand

Sent from my Samsung Galaxy smartphone.
 Original message From: Bryan Quigley 
 Date: 25/01/2017  20:43  (GMT+01:00) To: 
libreoffice@lists.freedesktop.org, libroffice@artavi.de Subject: re: Usage 
of ActiveX in Libre Office 
Welcome and thanks for responding to notice!

You're the first person (AFAICT) who has written in response to the
deprecation notice.   My original intention was to remove it from the
5.2 release if we got no responses to that notice (that obviously
hasn't happened).

At this point the soonest release we could remove it from is 5.4
(which might be around Aug 2017).  It's far from scheduled though.

We really don't have much data to base this decision on, so I'll ask
you instead.  Knowing keeping support has an impact on LibreOffice
development, when do you think is reasonable for ActiveX support to be
removed?

What Windows version are you running?

Kind regards,
Bryan

[The whole original thread - quite long]
https://lists.freedesktop.org/archives/libreoffice/2015-December/071580.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ad/c647b8ee821db925e7296d0ebe0300abe8607c

[Caolán McNamara]

 ad/c647b8ee821db925e7296d0ebe0300abe8607c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2bd4369d5fff6a3e5313b6e8342d0f7583c240e
Author: Caolán McNamara 
Date:   Wed Jan 25 20:39:44 2017 +

Notes added by 'git notes add'

diff --git a/ad/c647b8ee821db925e7296d0ebe0300abe8607c 
b/ad/c647b8ee821db925e7296d0ebe0300abe8607c
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/ad/c647b8ee821db925e7296d0ebe0300abe8607c
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 23/578f63821e340dc1718dc1ed0d046d63efe523

[Caolán McNamara]

 23/578f63821e340dc1718dc1ed0d046d63efe523 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 96145c0032c803a3e149029d4522bcb06a17e519
Author: Caolán McNamara 
Date:   Wed Jan 25 20:38:54 2017 +

Notes added by 'git notes add'

diff --git a/23/578f63821e340dc1718dc1ed0d046d63efe523 
b/23/578f63821e340dc1718dc1ed0d046d63efe523
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/23/578f63821e340dc1718dc1ed0d046d63efe523
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/2c52f82b9e126159f76c4033923db14c9ec3fc

[Caolán McNamara]

 37/2c52f82b9e126159f76c4033923db14c9ec3fc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5d59e22ebdbd06e5256f8fdee3eb7c8a28b827cc
Author: Caolán McNamara 
Date:   Wed Jan 25 20:37:54 2017 +

Notes added by 'git notes add'

diff --git a/37/2c52f82b9e126159f76c4033923db14c9ec3fc 
b/37/2c52f82b9e126159f76c4033923db14c9ec3fc
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/37/2c52f82b9e126159f76c4033923db14c9ec3fc
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/13409161d2abbf4705d0732331c1c7175a51a8

[Caolán McNamara]

 8f/13409161d2abbf4705d0732331c1c7175a51a8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3c32a9323a0f91b692a2084b270eafe4f885a827
Author: Caolán McNamara 
Date:   Wed Jan 25 20:37:01 2017 +

Notes added by 'git notes add'

diff --git a/8f/13409161d2abbf4705d0732331c1c7175a51a8 
b/8f/13409161d2abbf4705d0732331c1c7175a51a8
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/8f/13409161d2abbf4705d0732331c1c7175a51a8
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - sc/source

[Eike Rathke]

 sc/source/ui/view/cellsh1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit df4efcbbb820f7e2c15afd15ccf29b4f613bca44
Author: Eike Rathke 
Date:   Wed Jan 25 13:34:43 2017 +0100

Resolves: tdf#105351 pass matching index key to conditional format dialog

Change-Id: I9d872140755c4ec0ae67349530b00f339057a356
(cherry picked from commit 0367acdcc59e14b0b067976a08202e8afef0ecf3)
Reviewed-on: https://gerrit.libreoffice.org/33529
Reviewed-by: Markus Mohrhard 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index f661f34..f17de35 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2004,6 +2004,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
 // found a matching range, edit this conditional 
format
 bCondFormatDlg = true;
+nIndex = pCondFormat->GetKey();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Usage of ActiveX in Libre Office

[Kaganski Mike]

Hello,

On 1/23/2017 5:42 PM, libroffice@artavi.de 
wrote:
We are recently switched from AOO to LO. In the release notes a possible 
removal of ActiveX is announced.
You are asking for information about the use case so here we are:

We are using in our company a selfmade ERP system which is grown for more than 
15 years now. For historical reasons the system is written in Delphi. At the 
beginning MS Office was used as "office frontend", since about 10 years 
OOo/AOO/LO. The main workflow is using calc for business calculation and writer 
as a kind of report tool. Most information from the main database is delivered 
via ActiveX to calc. After working in calc the information are read back and 
used to create documents in writer. The complete project and document 
management (and many more) is done by our ERP.

I know there are others and probably more elegant ways and about once a year we 
are discussing to change that and finding the "big solution" - but this is a 
huge and expensive project.

Just wanted to mention two (now discontinued) projects that aimed to provide 
alternative ActiveX MS Office-compatible APIs for OpenOffice.org: AutomateIT! 
(https://sourceforge.net/projects/automateit/) and UniOffice 
(http://wiki.etersoft.ru/UniOffice, 
http://ftp.etersoft.ru/pub/Etersoft/UniOffice@Etersoft/). They are open-source, 
and may be of some interest if someone wants to take the code and 
improve/maintain it. In Russia, there were a number of working solutions based 
on them, so they are at least working starting point.


Removing ActiveX from LO will be a showstopper and nail us to the last 
supported release - or bring us back to AOO, who knows.

Best regards
Joergen Pisarz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 76/5f7daa65e8f8fa0fe54f23c16bbbea8e81880e

[Caolán McNamara]

 76/5f7daa65e8f8fa0fe54f23c16bbbea8e81880e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30bf391a893aacba2abfde677852707663575ada
Author: Caolán McNamara 
Date:   Wed Jan 25 20:35:30 2017 +

Notes added by 'git notes add'

diff --git a/76/5f7daa65e8f8fa0fe54f23c16bbbea8e81880e 
b/76/5f7daa65e8f8fa0fe54f23c16bbbea8e81880e
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/76/5f7daa65e8f8fa0fe54f23c16bbbea8e81880e
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/core/data/conditio.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f6587264b2c5b9191a4a7b547416c366db1c5607
Author: Eike Rathke 
Date:   Wed Jan 25 11:40:52 2017 +0100

Resolves: tdf#104675 ScConditionalFormat ranges needed to start listening

Conditional format manager dialog holds a cloned list of
ScConditionalFormat and sets that at the document on OK. The ranges of a
format need to be set before ScFormatEntry/ScConditionEntry are added to
start their listeners.

Change-Id: I903553b1f6a8298838ee8753315a6ea263b29b08
(cherry picked from commit 657eea01046c7f39ee8ca4545241372177385946)
Reviewed-on: https://gerrit.libreoffice.org/33525
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 0f8764b..6657dcf 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1776,6 +1776,7 @@ ScConditionalFormat* 
ScConditionalFormat::Clone(ScDocument* pNewDoc) const
 pNewDoc = pDoc;
 
 ScConditionalFormat* pNew = new ScConditionalFormat(nKey, pNewDoc);
+pNew->SetRange( maRanges ); // prerequisite for listeners
 
 for (CondFormatContainer::const_iterator itr = maEntries.begin(); itr != 
maEntries.end(); ++itr)
 {
@@ -1783,7 +1784,6 @@ ScConditionalFormat* 
ScConditionalFormat::Clone(ScDocument* pNewDoc) const
 pNew->maEntries.push_back( std::unique_ptr(pNewEntry) );
 pNewEntry->SetParent(pNew);
 }
-pNew->SetRange( maRanges );
 
 return pNew;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 dev/null   |binary
 sw/qa/extras/ww8export/data/bnc863018b.doc |binary
 sw/qa/extras/ww8export/data/tdf96277.doc   |binary
 sw/qa/extras/ww8export/ww8export2.cxx  |   13 +
 sw/qa/extras/ww8import/ww8import.cxx   |   10 --
 sw/source/filter/ww8/ww8par.cxx|8 ++--
 sw/source/filter/ww8/ww8par.hxx|4 ++--
 sw/source/filter/ww8/ww8par2.cxx   |   11 ---
 sw/source/filter/ww8/ww8par6.cxx   |   20 +---
 9 files changed, 22 insertions(+), 44 deletions(-)

New commits:
commit a47cada052427bc5cf6123b11e3643a3a8a8516a
Author: Justin Luth 
Date:   Thu Jan 19 16:27:41 2017 +0300

tdf#96277 revert ww8 import: fix upper margin of floating table

commit 3755c87d0426a499d4755e82d8fbc77caa240764
mis-positions non-textframed floating tables.

The patch only worked under very ideal circumstances
that cannot be identified during import time. Lots of bug
reports indicate real world problems with it.

This is a pretty safe revert because the code only
processes a document one time, so old documents don't
depend on this to work.

Change-Id: I3b94d27901a20e46c2f5fd4305041d1d28acf33a
Reviewed-on: https://gerrit.libreoffice.org/33322
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 895f4bc27d518ecaa054d812fa6c24fd4301d327)
Reviewed-on: https://gerrit.libreoffice.org/33503
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/qa/extras/ww8import/data/bnc863018.doc 
b/sw/qa/extras/ww8export/data/bnc863018b.doc
old mode 100644
new mode 100755
similarity index 63%
rename from sw/qa/extras/ww8import/data/bnc863018.doc
rename to sw/qa/extras/ww8export/data/bnc863018b.doc
index ab7511b..c9744b8
Binary files a/sw/qa/extras/ww8import/data/bnc863018.doc and 
b/sw/qa/extras/ww8export/data/bnc863018b.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf96277.doc 
b/sw/qa/extras/ww8export/data/tdf96277.doc
new file mode 100755
index 000..904b2da
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf96277.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index bf6b36f..3259d23 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -40,6 +40,19 @@ DECLARE_WW8EXPORT_TEST(testTdf89377, 
"tdf89377_tableWithBreakBeforeParaStyle.doc
 CPPUNIT_ASSERT_EQUAL( 2, getPages() );
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf96277, "tdf96277.doc")
+{
+// mismatch between anchoring at paragraph and ULSpacing to Page
+CPPUNIT_ASSERT_EQUAL( 1, getPages() );
+}
+
+DECLARE_WW8EXPORT_TEST(testBnc863018b, "bnc863018b.doc")
+{
+// The whitespace above the table should allow text to flow between the 
table anchor and the table.
+// Since it doesn't, don't add the whitespace.
+CPPUNIT_ASSERT_EQUAL( 1, getPages() );
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf104805, "tdf104805.doc")
 {
 uno::Reference 
xPropertySet(getStyles("NumberingStyles")->getByName("WW8Num1"), 
uno::UNO_QUERY);
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 85f4ca3..b26c3db 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -42,16 +42,6 @@ DECLARE_WW8IMPORT_TEST(testN816593, "n816593.doc")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
 }
 
-DECLARE_WW8IMPORT_TEST(testBnc863018, "bnc863018.doc")
-{
-// The problem was that there should be some whitespace above the table,
-// but there wasn't.
-uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
-uno::Reference xTable(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
-// This was 0.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getProperty(xTable, 
"TopMargin"));
-}
 DECLARE_WW8IMPORT_TEST(testBnc875715, "bnc875715.doc")
 {
 uno::Reference 
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 10094cf..8074908 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2714,13 +2714,9 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, 
WW8_CP nStartCp)
 m_aApos[m_nInTable] = false;
 }
 
-// So that SwWW8ImplReader::StartApo() can write into this, and
-// WW8TabDesc::CreateSwTable() can read it, if necessary.
-SvxULSpaceItem aULSpaceItem(RES_UL_SPACE);
-
 if (aApo.mbStartApo)
 {
-m_aApos[m_nInTable] = StartApo(aApo, pTabPos, &aULSpaceItem);
+m_aApos[m_nInTable] = StartApo(aApo, pTabPos);
 // We need an ReSync after StartApo
 // (actually only if the Apo extends past

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/052c8193a5e7c8b57f1b11e4e25e2fe11663d2

[Caolán McNamara]

 5e/052c8193a5e7c8b57f1b11e4e25e2fe11663d2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02a4c6cba07b96c04640585eb272058eaea7744b
Author: Caolán McNamara 
Date:   Wed Jan 25 20:34:16 2017 +

Notes added by 'git notes add'

diff --git a/5e/052c8193a5e7c8b57f1b11e4e25e2fe11663d2 
b/5e/052c8193a5e7c8b57f1b11e4e25e2fe11663d2
new file mode 100644
index 000..9d44873
--- /dev/null
+++ b/5e/052c8193a5e7c8b57f1b11e4e25e2fe11663d2
@@ -0,0 +1 @@
+prefer: 5955a98b2aff796a0c7311f6f61a13eac8754ce7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sdext/Library_PresentationMinimizer.mk sdext/source

[Takeshi Abe]

 sdext/Library_PresentationMinimizer.mk |1 +
 sdext/source/minimizer/optimizerdialog.cxx |   27 +--
 2 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit dcd89d24f0837f85a359f2630981d985a9811d86
Author: Takeshi Abe 
Date:   Tue Jan 24 18:55:20 2017 +0900

tdf#105382 Set URL-decoded default filename for minimized presentation

See mailing-list thread starting at


for a discussion on the original presentation file's URL.

Reviewed-on: https://gerrit.libreoffice.org/33261
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins 
(cherry picked from commit d8aa4503966e2c8882c238a1a30c05b72bdf6f68)

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

diff --git a/sdext/Library_PresentationMinimizer.mk 
b/sdext/Library_PresentationMinimizer.mk
index 2ae650a..eb8995f 100644
--- a/sdext/Library_PresentationMinimizer.mk
+++ b/sdext/Library_PresentationMinimizer.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Library_use_libraries,PresentationMinimizer,\
 cppu \
 cppuhelper \
 sal \
+tl \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,PresentationMinimizer,\
diff --git a/sdext/source/minimizer/optimizerdialog.cxx 
b/sdext/source/minimizer/optimizerdialog.cxx
index 78c044a..40d8132 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace ::com::sun::star::io;
@@ -511,24 +512,14 @@ void ActionListener::actionPerformed( const ActionEvent& 
rEvent )
 Reference< XStorable > xStorable( 
mrOptimizerDialog.mxController->getModel(), UNO_QUERY );
 if ( xStorable.is() && xStorable->hasLocation() )
 {
-OUString aLocation( xStorable->getLocation() );
-if ( !aLocation.isEmpty() )
-{
-sal_Int32 nIndex = aLocation.lastIndexOf( '/', 
aLocation.getLength() - 1 );
-if ( nIndex >= 0 )
-{
-if ( nIndex < aLocation.getLength() - 1 )
-aLocation = aLocation.copy( nIndex + 1 );
-
-// remove extension
-nIndex = aLocation.lastIndexOf( '.', 
aLocation.getLength() - 1 );
-if ( nIndex >= 0 )
-aLocation = aLocation.copy( 0, nIndex );
-
-// adding .mini
-aLocation = aLocation.concat( ".mini" );
-aFileOpenDialog.setDefaultName( aLocation );
-}
+INetURLObject aURLObj( xStorable->getLocation() );
+if ( !aURLObj.hasFinalSlash() &&
+ aURLObj.setExtension( "mini", 
INetURLObject::LAST_SEGMENT, false ) ) {
+// tdf#105382 uri-decode file name
+auto aName( aURLObj.getName( 
INetURLObject::LAST_SEGMENT,
+ false,
+ 
INetURLObject::DECODE_WITH_CHARSET ) );
+aFileOpenDialog.setDefaultName( aName );
 }
 }
  bool bDialogExecuted = aFileOpenDialog.execute() == 
dialogs::ExecutableDialogResults::OK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - canvas/source

[Aron Budea]

 canvas/source/directx/dx_9rm.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit b0676e0ec9a770f83c19390d2d69df57bdb60d24
Author: Aron Budea 
Date:   Mon Jan 23 03:47:19 2017 +0100

tdf#100151: Dispose of window if DX device creation failed

Before, if the device lacked Direct3D capabilities, VclPtr
handling became compromised, and caused a crash. This was
particularly a problem in virtualized/remote desktop
connections in Windows.

Now mpWindow instance is disposed of right away if DX
device creation fails.

Change-Id: I639340380affdb31a93ce6dccd8df33a0a466df6
Reviewed-on: https://gerrit.libreoffice.org/33413
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit bb50474225f80b8aeea49f14ad66173462026a41)
Reviewed-on: https://gerrit.libreoffice.org/33478
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 1f58f2b..4b41d30 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -583,6 +583,14 @@ namespace dxcanvas
 // TODO(P2): get rid of those fine-grained locking
 ::osl::MutexGuard aGuard( maMutex );
 
+// TODO(F2): since we would like to share precious hardware
+// resources, the direct3d9 object should be global. each new
+// request for a canvas should only create a new swapchain.
+mpDirect3D9 = COMReference(
+Direct3DCreate9(D3D_SDK_VERSION));
+if(!mpDirect3D9.is())
+return false;
+
 maVertexCache.reserve( 1024 );
 
 mpWindow.disposeAndClear();
@@ -619,17 +627,12 @@ namespace dxcanvas
 // let the child window cover the same size as the parent window.
 mpWindow->setPosSizePixel(0,0,maSize.getX(),maSize.getY());
 
-// TODO(F2): since we would like to share precious hardware
-// resources, the direct3d9 object should be global. each new
-// request for a canvas should only create a new swapchain.
-mpDirect3D9 = COMReference(
-Direct3DCreate9(D3D_SDK_VERSION));
-if(!mpDirect3D9.is())
-return false;
-
 // create a device from the direct3d9 object.
 if(!(createDevice()))
+{
+mpWindow.disposeAndClear();
 return false;
+}
 
 mpWindow->Show();
 
___
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/filter/wmf/emfwr.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3d92c34d0a4db27435458e0f3dd50709622388a9
Author: Caolán McNamara 
Date:   Wed Jan 25 16:51:00 2017 +

Resolves: tdf#94457 our EmfPlusSetPageTransform is malformed

we write a single short, resulting in a record of 0x000C in length 
MS-EMFPLUS
spec has EmfPlusSetPageTransform as 0x0010 in length because we're not 
writing
the 4 byte PageScale value.

the previous pageunit unit we are writing is of value 1, which is
UnitTypeDisplay, the same spec says...

"The unit of measure for page space coordinates, from the UnitType 
enumeration.
This value SHOULD NOT be UnitTypeDisplay or UnitTypeWorld"

and footnotes that with...

"Windows never writes those values to the PageUnit field, but they are 
accepted
with undefined results."

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

diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 947d139..7eb9c63 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -102,8 +102,7 @@ enum class EmfPlusRecordType
 SetAntiAliasMode   = 0x401E,
 SetInterpolationMode   = 0x4021,
 SetPixelOffsetMode = 0x4022,
-SetCompositingQuality  = 0x4024,
-SetPageTransform   = 0x4030,
+SetCompositingQuality  = 0x4024
 };
 
 void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType )
@@ -190,7 +189,6 @@ void EMFWriter::WriteEMFPlusHeader( const Size 
&rMtfSizePix, const Size &rMtfSiz
 ImplPlusRecord( EmfPlusRecordType::SetPixelOffsetMode, 0x0 );
 ImplPlusRecord( EmfPlusRecordType::SetAntiAliasMode, 0x09 );  // TODO: 
Check actual values for AntiAlias
 ImplPlusRecord( EmfPlusRecordType::SetCompositingQuality, 0x0100 ); // 
Default Quality
-ImplPlusRecord( EmfPlusRecordType::SetPageTransform, 1 );
 ImplPlusRecord( EmfPlusRecordType::SetInterpolationMode, 0x00 );  // 
Default
 ImplPlusRecord( EmfPlusRecordType::GetDC, 0x00 );
 ImplEndCommentRecord();
___
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/filter/ixpm/xpmread.cxx |  205 ++---
 1 file changed, 81 insertions(+), 124 deletions(-)

New commits:
commit 88a3b62194d07bb64bfd2fc186097441dc93dfa3
Author: Caolán McNamara 
Date:   Wed Jan 25 12:09:04 2017 +

ofz: xpm parser is too slow

and keeps timing out on documents, this takes my example pathological
case from a callgrind cost of 40875 to 1292 million, and as a side effect
rhbz#1051121-xpm now look right

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

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index dd31d97..a0306b5 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -22,6 +22,8 @@
 #include "rgbtable.hxx"
 #include "xpmread.hxx"
 #include 
+#include 
+#include 
 
 #define XPMTEMPBUFSIZE  0x8000
 #define XPMSTRINGBUF0x8000
@@ -39,9 +41,6 @@
 #define XPMSTRING   0x0004
 #define XPMFINISHED 0x0008
 
-#define XPMCASESENSITIVE0x0001
-#define XPMCASENONSENSITIVE 0x0002
-
 enum ReadState
 {
 XPMREAD_OK,
@@ -76,21 +75,26 @@ private:
 sal_uLong   mnTempAvail;
 sal_uInt8*  mpTempBuf;
 sal_uInt8*  mpTempPtr;
-sal_uInt8*  mpFastColorTable;
-sal_uInt8*  mpColMap;
+// each key is ( mnCpp )Byte(s)-> ASCII entry assigned to the colour
+// each colordata is
+// 1 Byte   -> 0xFF if colour is transparent
+// 3 Bytes  -> RGB value of the colour
+typedef std::array colordata;
+typedef std::map colormap;
+colormapmaColMap;
 sal_uLong   mnStringSize;
 sal_uInt8*  mpStringBuf;
 sal_uLong   mnParaSize;
 sal_uInt8*  mpPara;
 
 boolImplGetString();
-boolImplGetColor( sal_uLong );
+boolImplGetColor();
 boolImplGetScanLine( sal_uLong );
-boolImplGetColSub( sal_uInt8* );
+boolImplGetColSub(colordata &rDest);
 boolImplGetColKey( sal_uInt8 );
-voidImplGetRGBHex( sal_uInt8*, sal_uLong );
+voidImplGetRGBHex(colordata &rDest, sal_uLong);
 boolImplGetPara( sal_uLong numb );
-static bool ImplCompare( sal_uInt8 const *, sal_uInt8 const *, 
sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
+static bool ImplCompare(sal_uInt8 const *, sal_uInt8 const *, 
sal_uLong);
 sal_uLong   ImplGetULONG( sal_uLong nPara );
 
 public:
@@ -115,8 +119,6 @@ XPMReader::XPMReader(SvStream& rStm)
 , mnTempAvail(0)
 , mpTempBuf(nullptr)
 , mpTempPtr(nullptr)
-, mpFastColorTable(nullptr)
-, mpColMap(nullptr)
 , mnStringSize(0)
 , mpStringBuf(nullptr)
 , mnParaSize(0)
@@ -162,14 +164,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 {
 mnIdentifier = XPMCOLORS;
 
-// mpColMap constitutes for all available
-// colour:   ( mnCpp )Byte(s)-> ASCII entry assigned to the 
colour
-//  1Byte   -> 0xFF if colour is transparent
-//  3Bytes  -> RGB value of the colour
-mpColMap = new sal_uInt8[ mnColors * ( 4 + mnCpp ) ];
-for ( sal_uLong i = 0; i < mnColors; i++ )
+for (sal_uLong i = 0; i < mnColors; ++i)
 {
-if ( !ImplGetColor( i ) )
+if (!ImplGetColor())
 {
 mbStatus = false;
 break;
@@ -202,34 +199,21 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 }
 if( mpAcc && mbStatus )
 {
-sal_uLong   i;
-if ( mnColors <=256 )   // palette is only needed by 
using less than 257
-{   // colors
-
-sal_uInt8*  pPtr = &mpColMap[mnCpp];
-
-for ( i = 0; i < mnColors; i++ )
-{
-mpAcc->SetPaletteColor( (sal_uInt8)i, Color( 
pPtr[1], pPtr[2], pPtr[3] ) );
-pPtr += ( mnCpp + 4 );
-}
-// using 2 characters per pixel and less than 257 
Colors we speed up
-if ( mnCpp == 2 )   // by using a 64kb indexing 
table
+if (mnColors <= 256)  // palette is only needed by 
using less than 257
+{ // colors
+ 

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

[Michael Stahl]

 sw/inc/ToxLinkProcessor.hxx |2 -
 sw/qa/core/test_ToxLinkProcessor.cxx|   38 ++--
 sw/source/core/tox/ToxLinkProcessor.cxx |   18 +++
 3 files changed, 27 insertions(+), 31 deletions(-)

New commits:
commit 0f3c645a8f6662aff1d96307b905f5309079bddc
Author: Michael Stahl 
Date:   Wed Jan 25 17:12:42 2017 +0100

sw: revert ToX hyperlinks to LO 4.3 behaviour

Commit 94b296d5416dd71d721ad16216b50bce79e3dc04 changed this to
potentially insert multiple overlapping hyperlink items.

Unfortunately Writer can only have one RES_TXTATR_INETFMT on any given
position in the paragraph, so the hyperlink hints inevitably overwrite
each other.

Revert this to do it the same way as the old code in LO 4.3 did: match
the last unmatched link-start with the first link-end, and ignore all
the link-start before the matching one, as well as the link-end after
the matching one.

This should prevent surprising formatting changes on index update,
including entries spontaneously turning green, and there is no reason
why the result of the new way is objectively better than the old one.

Change-Id: I55be9c212c473908428fa8bd6487d136343fe852
(cherry picked from commit 68f7be01a78a5bad56ddd94c04764131676d6cc0)
Reviewed-on: https://gerrit.libreoffice.org/33552
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 7fceef1..78bb7fb 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -82,7 +82,7 @@ private:
 
 std::vector> m_ClosedLinks;
 
-std::vector> m_StartedLinks;
+std::unique_ptr m_pStartedLink;
 
 friend class ::ToxLinkProcessorTest;
 };
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index eb4618e..d2d4721 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -30,17 +30,15 @@ using namespace sw;
 class ToxLinkProcessorTest : public test::BootstrapFixture
 {
 void NoExceptionIsThrownIfTooManyLinksAreClosed();
-void AddingAndClosingTwoLinksResultsInTwoClosedLinks();
+void AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink();
 void LinkIsCreatedCorrectly();
 void LinkSequenceIsPreserved();
-void StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed();
 
 CPPUNIT_TEST_SUITE(ToxLinkProcessorTest);
 CPPUNIT_TEST(NoExceptionIsThrownIfTooManyLinksAreClosed);
-CPPUNIT_TEST(AddingAndClosingTwoLinksResultsInTwoClosedLinks);
+CPPUNIT_TEST(AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink);
 CPPUNIT_TEST(LinkIsCreatedCorrectly);
 CPPUNIT_TEST(LinkSequenceIsPreserved);
-CPPUNIT_TEST(StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed);
 CPPUNIT_TEST_SUITE_END();
 public:
 void setUp() override {
@@ -71,30 +69,28 @@ 
ToxLinkProcessorTest::NoExceptionIsThrownIfTooManyLinksAreClosed()
 sut.CloseLink(1, URL_1);
 // fdo#85872 actually it turns out the UI does something like this
 // so an exception must not be thrown!
-sut.CloseLink(1, URL_1);
+// should not succeed either (for backward compatibility)
+sut.CloseLink(2, URL_1);
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(sut.m_ClosedLinks.size()));
+CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(0)->mEndTextPos));
+CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_pStartedLink == nullptr);
 }
 
 void
-ToxLinkProcessorTest::StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed()
-{
-ToxLinkProcessor sut;
-sut.StartNewLink(0, STYLE_NAME_1);
-sut.CloseLink(1, URL_1);
-sut.CloseLink(1, URL_1);
-CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
-}
-
-void
-ToxLinkProcessorTest::AddingAndClosingTwoLinksResultsInTwoClosedLinks()
+ToxLinkProcessorTest::AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink()
 {
 ToxLinkProcessor sut;
 sut.StartNewLink(0, STYLE_NAME_1);
 sut.StartNewLink(0, STYLE_NAME_2);
 sut.CloseLink(1, URL_1);
+// this should not cause an error, and should not succeed either
+// (for backward compatibility)
 sut.CloseLink(1, URL_2);
-CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_StartedLinks.empty());
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(sut.m_ClosedLinks.size()));
+CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_pStartedLink == nullptr);
+// backward compatibility: the last start is closed by the first end
+CPPUNIT_ASSERT_EQUAL(STYLE_NAME_2, 
sut.m_ClosedLinks[0]->mINetFormat.GetINetFormat());
+CPPUNIT_ASSERT_EQUAL(URL_1, sut.m_ClosedLinks[0]->mINetFormat.GetValue());
 }
 
 class ToxLinkProcessorWithOverriddenObtainPoolId : public ToxLinkPr

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

[Michael Stahl]

 sw/inc/ToxLinkProcessor.hxx |2 -
 sw/qa/core/test_ToxLinkProcessor.cxx|   38 ++--
 sw/source/core/tox/ToxLinkProcessor.cxx |   18 +++
 3 files changed, 27 insertions(+), 31 deletions(-)

New commits:
commit 15c0e82005254e9da0fcd905379e9eca85571bf9
Author: Michael Stahl 
Date:   Wed Jan 25 17:12:42 2017 +0100

sw: revert ToX hyperlinks to LO 4.3 behaviour

Commit 94b296d5416dd71d721ad16216b50bce79e3dc04 changed this to
potentially insert multiple overlapping hyperlink items.

Unfortunately Writer can only have one RES_TXTATR_INETFMT on any given
position in the paragraph, so the hyperlink hints inevitably overwrite
each other.

Revert this to do it the same way as the old code in LO 4.3 did: match
the last unmatched link-start with the first link-end, and ignore all
the link-start before the matching one, as well as the link-end after
the matching one.

This should prevent surprising formatting changes on index update,
including entries spontaneously turning green, and there is no reason
why the result of the new way is objectively better than the old one.

Change-Id: I55be9c212c473908428fa8bd6487d136343fe852
(cherry picked from commit 68f7be01a78a5bad56ddd94c04764131676d6cc0)
Reviewed-on: https://gerrit.libreoffice.org/33550
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 7fceef1..78bb7fb 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -82,7 +82,7 @@ private:
 
 std::vector> m_ClosedLinks;
 
-std::vector> m_StartedLinks;
+std::unique_ptr m_pStartedLink;
 
 friend class ::ToxLinkProcessorTest;
 };
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index eb4618e..d2d4721 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -30,17 +30,15 @@ using namespace sw;
 class ToxLinkProcessorTest : public test::BootstrapFixture
 {
 void NoExceptionIsThrownIfTooManyLinksAreClosed();
-void AddingAndClosingTwoLinksResultsInTwoClosedLinks();
+void AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink();
 void LinkIsCreatedCorrectly();
 void LinkSequenceIsPreserved();
-void StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed();
 
 CPPUNIT_TEST_SUITE(ToxLinkProcessorTest);
 CPPUNIT_TEST(NoExceptionIsThrownIfTooManyLinksAreClosed);
-CPPUNIT_TEST(AddingAndClosingTwoLinksResultsInTwoClosedLinks);
+CPPUNIT_TEST(AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink);
 CPPUNIT_TEST(LinkIsCreatedCorrectly);
 CPPUNIT_TEST(LinkSequenceIsPreserved);
-CPPUNIT_TEST(StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed);
 CPPUNIT_TEST_SUITE_END();
 public:
 void setUp() override {
@@ -71,30 +69,28 @@ 
ToxLinkProcessorTest::NoExceptionIsThrownIfTooManyLinksAreClosed()
 sut.CloseLink(1, URL_1);
 // fdo#85872 actually it turns out the UI does something like this
 // so an exception must not be thrown!
-sut.CloseLink(1, URL_1);
+// should not succeed either (for backward compatibility)
+sut.CloseLink(2, URL_1);
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(sut.m_ClosedLinks.size()));
+CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(0)->mEndTextPos));
+CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_pStartedLink == nullptr);
 }
 
 void
-ToxLinkProcessorTest::StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed()
-{
-ToxLinkProcessor sut;
-sut.StartNewLink(0, STYLE_NAME_1);
-sut.CloseLink(1, URL_1);
-sut.CloseLink(1, URL_1);
-CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
-}
-
-void
-ToxLinkProcessorTest::AddingAndClosingTwoLinksResultsInTwoClosedLinks()
+ToxLinkProcessorTest::AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink()
 {
 ToxLinkProcessor sut;
 sut.StartNewLink(0, STYLE_NAME_1);
 sut.StartNewLink(0, STYLE_NAME_2);
 sut.CloseLink(1, URL_1);
+// this should not cause an error, and should not succeed either
+// (for backward compatibility)
 sut.CloseLink(1, URL_2);
-CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_StartedLinks.empty());
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(sut.m_ClosedLinks.size()));
+CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_pStartedLink == nullptr);
+// backward compatibility: the last start is closed by the first end
+CPPUNIT_ASSERT_EQUAL(STYLE_NAME_2, 
sut.m_ClosedLinks[0]->mINetFormat.GetINetFormat());
+CPPUNIT_ASSERT_EQUAL(URL_1, sut.m_ClosedLinks[0]->mINetFormat.GetValue());
 }
 
 class ToxLinkProcessorWithOverriddenObtainPoolId : public ToxLinkPr

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/inc sw/qa

[Michael Stahl]

 sw/inc/ToxLinkProcessor.hxx  |7 +--
 sw/qa/core/test_ToxLinkProcessor.cxx |2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit ca512d0323c261d90559ddf6df561300cb048173
Author: Michael Stahl 
Date:   Wed Jan 25 16:42:16 2017 +0100

sw: stop swapping start and end position of links in ToX

This causes:

sw/source/core/txtnode/thints.cxx:3198: +SwpHints::Insert: invalid hint, 
end < start

Change-Id: I933c790127ab1469bb57c4d288dbb49be16ace19
(cherry picked from commit 4a43ffcef946067c5b3992a00c765a36804a194f)
Reviewed-on: https://gerrit.libreoffice.org/33549
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 699c0ec..7fceef1 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -69,8 +69,11 @@ private:
  * A link is closed if it has both a start and an end token.
  */
 struct ClosedLink {
-ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 
endPosition) :
-mINetFormat(url, OUString()), mStartTextPos(endPosition), 
mEndTextPos(startPosition) {
+ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 
endPosition)
+: mINetFormat(url, OUString())
+, mStartTextPos(startPosition)
+, mEndTextPos(endPosition)
+{
 }
 SwFormatINetFormat mINetFormat;
 sal_Int32 mStartTextPos;
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index 0a15982..eb4618e 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -82,7 +82,7 @@ 
ToxLinkProcessorTest::StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed(
 sut.CloseLink(1, URL_1);
 sut.CloseLink(1, URL_1);
 CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_EQUAL(0u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
+CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
 }
 
 void
___
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/inc sw/qa

[Michael Stahl]

 sw/inc/ToxLinkProcessor.hxx  |7 +--
 sw/qa/core/test_ToxLinkProcessor.cxx |2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit ba854d1e136bb69e87d7f2f22cf6d4dd421c30ab
Author: Michael Stahl 
Date:   Wed Jan 25 16:42:16 2017 +0100

sw: stop swapping start and end position of links in ToX

This causes:

sw/source/core/txtnode/thints.cxx:3198: +SwpHints::Insert: invalid hint, 
end < start

Change-Id: I933c790127ab1469bb57c4d288dbb49be16ace19
(cherry picked from commit 4a43ffcef946067c5b3992a00c765a36804a194f)
Reviewed-on: https://gerrit.libreoffice.org/33551
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 699c0ec..7fceef1 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -69,8 +69,11 @@ private:
  * A link is closed if it has both a start and an end token.
  */
 struct ClosedLink {
-ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 
endPosition) :
-mINetFormat(url, OUString()), mStartTextPos(endPosition), 
mEndTextPos(startPosition) {
+ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 
endPosition)
+: mINetFormat(url, OUString())
+, mStartTextPos(startPosition)
+, mEndTextPos(endPosition)
+{
 }
 SwFormatINetFormat mINetFormat;
 sal_Int32 mStartTextPos;
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index 0a15982..eb4618e 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -82,7 +82,7 @@ 
ToxLinkProcessorTest::StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed(
 sut.CloseLink(1, URL_1);
 sut.CloseLink(1, URL_1);
 CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_EQUAL(0u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
+CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
 }
 
 void
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/index/cnttab.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 24077d0551dc67914bc8f06889be3367fa1aaba6
Author: Caolán McNamara 
Date:   Wed Jan 25 15:05:27 2017 +

fix index widget control positions on first view

Change-Id: Ic70006d65100b0ed8b337d43ff81577fb4579192
(cherry picked from commit 1337932c038d0a0f689e59de7c8ffd272dbdafa4)
Reviewed-on: https://gerrit.libreoffice.org/33545
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5e7fb34..8105357 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2737,6 +2737,7 @@ void SwTokenWindow::setAllocation(const Size &rAllocation)
 aSize.Height() = aControlSize.Height();
 pControl->SetSizePixel(aSize);
 }
+AdjustPositions();
 }
 
 SwTokenWindow::~SwTokenWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

re: Usage of ActiveX in Libre Office

[Bryan Quigley]

Welcome and thanks for responding to notice!

You're the first person (AFAICT) who has written in response to the
deprecation notice.   My original intention was to remove it from the
5.2 release if we got no responses to that notice (that obviously
hasn't happened).

At this point the soonest release we could remove it from is 5.4
(which might be around Aug 2017).  It's far from scheduled though.

We really don't have much data to base this decision on, so I'll ask
you instead.  Knowing keeping support has an impact on LibreOffice
development, when do you think is reasonable for ActiveX support to be
removed?

What Windows version are you running?

Kind regards,
Bryan

[The whole original thread - quite long]
https://lists.freedesktop.org/archives/libreoffice/2015-December/071580.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 sc/source/ui/view/cellsh1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d0b841e5501881c5676e27da08fddcb5f9d4bc1a
Author: Eike Rathke 
Date:   Wed Jan 25 13:34:43 2017 +0100

Resolves: tdf#105351 pass matching index key to conditional format dialog

Change-Id: I9d872140755c4ec0ae67349530b00f339057a356
(cherry picked from commit 0367acdcc59e14b0b067976a08202e8afef0ecf3)
Reviewed-on: https://gerrit.libreoffice.org/33533
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c16d042..19a1618 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2004,6 +2004,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
 // found a matching range, edit this conditional 
format
 bCondFormatDlg = true;
+nIndex = pCondFormat->GetKey();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/ui/view/cellsh1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1705a22aa5f26f2590ee937f0e07201f8415696
Author: Eike Rathke 
Date:   Wed Jan 25 13:34:43 2017 +0100

Resolves: tdf#105351 pass matching index key to conditional format dialog

Change-Id: I9d872140755c4ec0ae67349530b00f339057a356
(cherry picked from commit 0367acdcc59e14b0b067976a08202e8afef0ecf3)
Reviewed-on: https://gerrit.libreoffice.org/33528
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index f661f34..f17de35 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2004,6 +2004,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
 // found a matching range, edit this conditional 
format
 bCondFormatDlg = true;
+nIndex = pCondFormat->GetKey();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/core/data/colorscale.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 56b76f27b1f9e8c9af005be0121f39ba4a073d8d
Author: Eike Rathke 
Date:   Tue Jan 24 21:23:22 2017 +0100

ScFormulaListener: do not start listening to clipboard or Undo docs

Change-Id: Ic00e30eccc64cc85ee877572ef8df042899f45f5
(cherry picked from commit 81845445de26111eb0b7e30f45b3708389fd76cf)
Reviewed-on: https://gerrit.libreoffice.org/33527
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 5f87b32..cb7599e 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -36,7 +36,7 @@ ScFormulaListener::ScFormulaListener(ScDocument* pDoc):
 
 void ScFormulaListener::startListening(ScTokenArray* pArr, const ScRange& 
rRange)
 {
-if (!pArr)
+if (!pArr || mpDoc->IsClipOrUndo())
 return;
 
 pArr->Reset();
@@ -123,6 +123,9 @@ private:
 
 void ScFormulaListener::stopListening()
 {
+if (mpDoc->IsClipOrUndo())
+return;
+
 std::for_each(maCells.begin(), maCells.end(), StopListeningCell(mpDoc, 
this));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/deduplication' - common/MessageQueue.cpp

[Jan Holesovsky]

 common/MessageQueue.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7606bad9d3a85ae286d1a668e99283ffebe8b935
Author: Jan Holesovsky 
Date:   Wed Jan 25 19:42:36 2017 +0100

Fix a size check.

Change-Id: I509d12dcde6f56a2a7a9ee244e721d8028dec501

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index 54f1871..05bdf58 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -158,7 +158,7 @@ bool extractRectangle(const std::vector& 
tokens, int& x, int& y, in
 h = INT_MAX;
 part = 0;
 
-if (tokens.size() < 4)
+if (tokens.size() < 5)
 return false;
 
 if (tokens[3] == "EMPTY,")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 source/text/sbasic/shared/03030101.xhp |8 
 source/text/sbasic/shared/03030102.xhp |8 
 source/text/sbasic/shared/03030103.xhp |8 
 source/text/sbasic/shared/03030104.xhp |8 
 source/text/sbasic/shared/03030105.xhp |8 
 source/text/sbasic/shared/03030106.xhp |8 
 source/text/sbasic/shared/03050200.xhp |8 
 source/text/sbasic/shared/03050300.xhp |8 
 source/text/sbasic/shared/03090103.xhp |8 
 source/text/sbasic/shared/03090203.xhp |9 -
 source/text/sbasic/shared/03090401.xhp |8 
 source/text/sbasic/shared/03090411.xhp |8 
 source/text/sbasic/shared/03100050.xhp |8 
 source/text/sbasic/shared/03100060.xhp |8 
 source/text/sbasic/shared/03100070.xhp |8 
 source/text/sbasic/shared/03100080.xhp |8 
 source/text/sbasic/shared/03101110.xhp |8 
 source/text/sbasic/shared/03102450.xhp |8 
 source/text/sbasic/shared/03102800.xhp |8 
 source/text/sbasic/shared/03104000.xhp |8 
 source/text/sbasic/shared/03104700.xhp |8 
 source/text/sbasic/shared/03120105.xhp |8 
 source/text/sbasic/shared/03120315.xhp |8 
 source/text/sbasic/shared/03120402.xhp |8 
 source/text/sbasic/shared/03130100.xhp |8 
 source/text/sbasic/shared/03130600.xhp |8 
 source/text/sbasic/shared/03132100.xhp |   10 +-
 27 files changed, 109 insertions(+), 110 deletions(-)

New commits:
commit 7b98ed0680a6573ec9b5710ffceeac8df60e684e
Author: Laurent Balland-Poirier 
Date:   Sun Jan 22 10:26:20 2017 +0100

Basic: remove ^M

Remove ^M characters at end of line
remove tabulation characters

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

diff --git a/source/text/sbasic/shared/03030101.xhp 
b/source/text/sbasic/shared/03030101.xhp
index 435dc6e..eaa589f 100644
--- a/source/text/sbasic/shared/03030101.xhp
+++ b/source/text/sbasic/shared/03030101.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
 
 
@@ -37,8 +36,8 @@
 Returns a Date value for a specified year, month, or 
day.
 
 Syntax:
-
-DateSerial (year, month, day)
+
+DateSerial (year, month, day)
 
 Return value:
 Date
@@ -68,3 +67,4 @@
 
 
 
+
diff --git a/source/text/sbasic/shared/03030102.xhp 
b/source/text/sbasic/shared/03030102.xhp
index 009e03f..c84b257 100644
--- a/source/text/sbasic/shared/03030102.xhp
+++ b/source/text/sbasic/shared/03030102.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
 
 
@@ -37,8 +36,8 @@
 Returns a date value from a date string. The date string is a 
complete date in a single numeric value. You can also use this serial number to 
determine the difference between two dates.
 
 Syntax:
-
-DateValue [(date)]
+
+DateValue [(date)]
 
 Return value:
 Datei66764
@@ -58,3 +57,4 @@
 
 
 
+
diff --git a/source/text/sbasic/shared/03030103.xhp 
b/source/text/sbasic/shared/03030103.xhp
index f9ed0f7..4ba4cb0 100644
--- a/source/text/sbasic/shared/03030103.xhp
+++ b/source/text/sbasic/shared/03030103.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
 
 
@@ -37,8 +36,8 @@
 Returns a value that represents the day of the month based on a 
serial date number generated by DateSerial or 
DateValue.
 
 Syntax:
-
-Day 
(Number)
+
+Day 
(Number)
 
 Return value:
 Integer
@@ -60,3 +59,4 @@
 
 
 
+
diff --git a/source/text/sbasic/shared/03030104.xhp 
b/source/text/sbasic/shared/03030104.xhp
index 5f1d275..58c81a9 100644
--- a/source/text/sbasic/shared/03030104.xhp
+++ b/source/text/sbasic/shared/03030104.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
 
 
@@ -37,8 +36,8 @@
 Returns the month of a year from a serial date that is generated by 
the DateSerial or the DateValue function.
 
 Syntax:
-
-Month 
(Number)
+
+Month 
(Number)
 
 Return value:
 Integer
@@ -60,3 +59,4 @@
 
 
 
+
diff --git a/source/text/sbasic/shared/03030105.xhp 
b/source/text/sbasic/shared/03030105.xhp
index 225a784..5fe29f1 100644
--- a/source/text/sbasic/shared/03030105.xhp
+++ b/source/text/sbasic/shared/03030105.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
 
 
@@ -37,8 +36,8 @@
 Returns the number corresponding to the weekday represented by a 
serial date number that is generated by the DateSerial or the DateValue 
function.
 
 Syntax:
-
-WeekDay (Number)
+
+WeekDay (Number)
 
 Return value:
 Integer
@@ -74,3 +73,4 @@
 
 
 
+
diff --git a/source/text/sbasic/shared/03030106.xhp 
b/source/text/sbasic/shared/03030106.xhp
index 37747ea..eff0c7d 100644
--- a/source/text/sbasic/shared/03030106.xhp
+++ b/source/text/sbasic/shared/03030106.xhp
@@ -1,6 +1,5 @@
 
 
-
 
-   
+
 
 
 
@@ -37,8 +36,8 @@
 Returns the year from a serial date number that is generated by the 
DateSerial or the DateValue function.
 
 Syntax:
-
-Year 
(Number)
+
+Year 
(Number)
 
 Return value:
 Integer
@@ -60,3 +59,4 @@
 
 
 

[Libreoffice-commits] core.git: helpcontent2

[Laurent Balland-Poirier]

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

New commits:
commit 6db2027647b2a6a5517bd0e8f958bb6865d4ecb0
Author: Laurent Balland-Poirier 
Date:   Sun Jan 22 10:26:20 2017 +0100

Updated core
Project: help  7b98ed0680a6573ec9b5710ffceeac8df60e684e

Basic: remove ^M

Remove ^M characters at end of line
remove tabulation characters

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

diff --git a/helpcontent2 b/helpcontent2
index ec31230..7b98ed0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ec3123033ab3ea3eace5dd7b53047dcd4daa4ece
+Subproject commit 7b98ed0680a6573ec9b5710ffceeac8df60e684e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/deduplication' - common/MessageQueue.cpp common/MessageQueue.hpp kit/Kit.cpp test/TileQueueTests.cpp

[Jan Holesovsky]

 common/MessageQueue.cpp |  179 ++--
 common/MessageQueue.hpp |   37 -
 kit/Kit.cpp |   10 --
 test/TileQueueTests.cpp |8 +-
 4 files changed, 33 insertions(+), 201 deletions(-)

New commits:
commit e35882318fc6f2b8471d6b9feca59a5183f2defd
Author: Jan Holesovsky 
Date:   Wed Jan 25 19:14:38 2017 +0100

Revert "loolwsd: improved MessageQueue"

Now we don't get a situation where there would be a tremendous amount of
invalidates & tile render requests piled in the queue, so we can do it
deterministic again.

The only thing that could potentially pile in the queue are the keypresses
events sent from the clients, but that is a different problem anyway.

This reverts commit c326228774e720011b8845f0ee14b4c0a5f1d4f2.

Change-Id: I98e199eab0187bf5f47ce322ac1b1b2e3b976b85

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index f31d665..54f1871 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -401,174 +401,46 @@ int TileQueue::priority(const std::string& tileMsg)
 return -1;
 }
 
-int TileQueue::findFirstNonPreview(bool preferTiles) const
+void TileQueue::deprioritizePreviews()
 {
-int firstTile = -1;
-int firstElse = -1;
 for (size_t i = 0; i < _queue.size(); ++i)
 {
-const auto& front = _queue[i];
-const bool isTile = LOOLProtocol::matchPrefix("tile", front);
-//LOG_WRN("#" << i << " " << (isTile ? "isTile" : "non-tile"));
+const auto front = _queue.front();
+const std::string message(front.data(), front.size());
 
-if (isTile && firstTile < 0)
-{
-const std::string msg(front.data(), front.size());
-std::string id;
-const bool isPreview = 
LOOLProtocol::getTokenStringFromMessage(msg, "id", id);
-//LOG_WRN("#" << i << " " << (isPreview ? "isPreview" : "isTile") 
<< ": " << msg);
-if (!isPreview)
-{
-firstTile = i;
-//LOG_WRN("firstTile: #" << i);
-}
-}
-else if (!isTile && firstElse < 0)
-{
-firstElse = i;
-//LOG_WRN("firstElse: #" << i);
-}
-else if (firstTile >=0 && firstElse >= 0)
+// stop at the first non-tile or non-'id' (preview) message
+std::string id;
+if (!LOOLProtocol::matchPrefix("tile", message) ||
+!LOOLProtocol::getTokenStringFromMessage(message, "id", id))
 {
 break;
 }
-}
-
-if (preferTiles && firstTile >= 0)
-{
-return firstTile;
-}
-
-if (firstElse >= 0)
-{
-return firstElse;
-}
-
-if (firstTile >= 0)
-{
-return firstTile;
-}
-
-return -1;
-}
-
-void TileQueue::bumpToTop(const size_t index)
-{
-if (index > 0)
-{
-Payload payload(_queue[index]);
-//LOG_WRN("Bumping: " << std::string(payload.data(), payload.size()));
-
-_queue.erase(_queue.begin() + index);
-_queue.insert(_queue.begin(), payload);
-}
-}
-
-void TileQueue::updateTimestamps(const bool isTile)
-{
-if (isTile)
-{
-_lastGetTile = true;
-_lastTileGetTime = std::chrono::steady_clock::now();
-}
-else if (_lastGetTile)
-{
-// Update non-tile timestamp when switching from tiles.
-_lastGetTile = false;
-_lastGetTime = std::chrono::steady_clock::now();
-}
-}
-
-bool TileQueue::shouldPreferTiles() const
-{
-if (_lastGetTile)
-{
-// If we had just done a tile, do something else.
-LOG_TRC("Last was tile, doing non-tiles.");
-return false;
-}
 
-// Check how long it's been since we'd done tiles.
-const auto tileDuration = (_lastGetTime - _lastTileGetTime);
-const auto tileDurationMs = 
std::chrono::duration_cast(tileDuration).count();
-const auto duration = (std::chrono::steady_clock::now() - _lastGetTime);
-const auto durationMs = 
std::chrono::duration_cast(duration).count();
-LOG_TRC("Tile duration: " << tileDurationMs << "ms, nonTile duration: " << 
durationMs << "ms.");
-
-if (durationMs > MaxTileSkipDurationMs)
-{
-LOG_TRC("Capping non-tiles to 100ms. Prefer tiles now.");
-return true;
-}
-
-if (durationMs > tileDurationMs)
-{
-LOG_TRC("Capping non-tiles to tileDurationMs (" << tileDurationMs << 
"). Prefer tiles now.");
-return true;
+_queue.erase(_queue.begin());
+_queue.push_back(front);
 }
-
-// We can still do some more non-tiles.
-LOG_TRC("Have time for more non-tiles.");
-return false;
 }
 
 TileQueue::Payload TileQueue::get_impl()
 {
-LOG_TRC("MessageQueue depth: " << _queue.size());
+const auto front = _queue.front();
 
-auto front = _queue.front();
-bool isTileFirst = LOOLProtocol::matchPrefix("tile", front);
-//LOG_WRN("isTileFirst: " <

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - README solenv/gbuild

[Damjan Jovanovic]

 README |3 ++-
 solenv/gbuild/JavaClassSet.mk  |2 +-
 solenv/gbuild/LinkTarget.mk|   16 
 solenv/gbuild/platform/freebsd.mk  |8 +++-
 solenv/gbuild/platform/linux.mk|4 
 solenv/gbuild/platform/macosx.mk   |6 +-
 solenv/gbuild/platform/os2.mk  |6 +-
 solenv/gbuild/platform/winmingw.mk |4 
 8 files changed, 44 insertions(+), 5 deletions(-)

New commits:
commit 372c52f82b9e126159f76c4033923db14c9ec3fc
Author: Damjan Jovanovic 
Date:   Wed Jan 25 17:27:45 2017 +

When debug symbols are produced for C / C++ / Objective C, produce them

for Java too.

Patch by: me

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 264e6ac..93e1d819 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -22,7 +22,7 @@
 
 
 gb_JavaClassSet_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
-gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
+gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
 
 define gb_JavaClassSet__command
 $(call gb_Helper_abbreviate_dirs_native,\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8050de5..65caabd 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -26,6 +26,7 @@
 # CFLAGS
 # CXXFLAGS
 # OBJCXXFLAGS
+# JAVAFLAGS
 # LDFLAGS
 
 # CFLAGS from environment override debug/optimization flags
@@ -47,6 +48,7 @@ ifeq ($(gb_DEBUGGING),TRUE)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
+JAVAFLAGS ?= -g
 else
 CFLAGS ?= $(gb_COMPILEROPTFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
commit 8f13409161d2abbf4705d0732331c1c7175a51a8
Author: Damjan Jovanovic 
Date:   Wed Jan 25 17:14:02 2017 +

Add debug symbols to gbuild modules when any of --enable-debug,

--enable-symbols, or --enable-crashdump are passed to ./configure (just
like it already is for dmake modules), as opposed to the previous behaviour
of only doing it on --enable-debug.

Also implemented --enable-symbols=small for gbuild modules on platforms
where AOO is built with GCC and Clang compilers (MSVC on Windows doesn't
seem to support that).

Patch by: me

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0bc6d59..8050de5 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -30,6 +30,20 @@
 
 # CFLAGS from environment override debug/optimization flags
 ifeq ($(gb_DEBUGLEVEL),2)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUGGING := TRUE
+else ifeq ($(ENABLE_SYMBOLS),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(ENABLE_CRASHDUMP),TRUE)
+gb_DEBUGGING := TRUE
+endif
+
+ifeq ($(gb_DEBUGGING),TRUE)
 CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
 OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index 5c53e9e..2c7c64f 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -234,9 +234,15 @@ ifeq ($(gb_DEBUGLEVEL),0)
 gb_LinkTarget_LDFLAGS += -Wl,-O1
 endif
 
-ifeq ($(gb_DEBUGLEVEL),2)
 ifeq ($(COM),CLANG)
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -fno-inline
+else
 gb_DEBUG_CFLAGS := -ggdb3 -fno-inline
+endif
+else
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -finline-limit=0 -fno-inline -fno-default-inline
 else
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
 endif
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 1981101..d361524 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -141,7 +141,11 @@ ifeq ($(gb_DEBUGLEVEL),0)
 gb_LinkTarget_LDFLAGS += -Wl,-O1
 endif
 
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -ggdb1 -finline-limit=0 -fno-inline -fno-default-inline
+else
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5ebf76e..6ad0999 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -137,7 +137,11 @@ gb_LinkTarget_LDFLAGS := \
$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
-gb_DEBUG_CFLAGS := -g
+ifeq ($(ENABLE_SYMBOLS),SMALL)
+gb_DEBUG_CFLAGS := -g1
+else
+gb_DEBUG_CFLAGS := -g3
+endif
 
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_COMPILEROPTFLAGS := -O0
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index f68679f..48a350a 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -287,7 +287,11 @@ endef
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb

[Libreoffice-commits] online.git: Branch 'feature/deduplication' - common/MessageQueue.cpp common/MessageQueue.hpp test/TileQueueTests.cpp test/WhiteBoxTests.cpp wsd/TileDesc.hpp

[Jan Holesovsky]

 common/MessageQueue.cpp |  181 
 common/MessageQueue.hpp |4 -
 test/TileQueueTests.cpp |   29 +++
 test/WhiteBoxTests.cpp  |   28 +++
 wsd/TileDesc.hpp|   13 ++-
 5 files changed, 223 insertions(+), 32 deletions(-)

New commits:
commit 37daf37cf3af7346336b1d6dba3017b2438d52bd
Author: Jan Holesovsky 
Date:   Wed Jan 25 18:21:56 2017 +0100

Deduplicate & remove obsolete invalidations from the queue.

There's no point in trying to paint something we know will be obsolete 
anyway.

Change-Id: I14f61f389b114f2cda1f97e5223b31fa2f01b06c

diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index bc61341..f31d665 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -80,9 +80,15 @@ void TileQueue::put_impl(const Payload& value)
 }
 else if (firstToken == "callback")
 {
-removeCallbackDuplicate(msg);
+std::string newMsg = removeCallbackDuplicate(msg);
+
+if (newMsg.empty())
+MessageQueue::put_impl(value);
+else
+{
+MessageQueue::put_impl(Payload(newMsg.data(), newMsg.data() + 
newMsg.size()));
+}
 
-MessageQueue::put_impl(value);
 return;
 }
 
@@ -143,45 +149,164 @@ std::string extractUnoCommand(const std::string& command)
 return command;
 }
 
+/// Extract rectangle from the invalidation callback
+bool extractRectangle(const std::vector& tokens, int& x, int& y, 
int& w, int& h, int& part)
+{
+x = 0;
+y = 0;
+w = INT_MAX;
+h = INT_MAX;
+part = 0;
+
+if (tokens.size() < 4)
+return false;
+
+if (tokens[3] == "EMPTY,")
+{
+part = std::atoi(tokens[4].c_str());
+return true;
+}
+
+if (tokens.size() < 8)
+return false;
+
+x = std::atoi(tokens[3].c_str());
+y = std::atoi(tokens[4].c_str());
+w = std::atoi(tokens[5].c_str());
+h = std::atoi(tokens[6].c_str());
+part = std::atoi(tokens[7].c_str());
+
+return true;
+}
+
 }
 
-void TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
+std::string TileQueue::removeCallbackDuplicate(const std::string& callbackMsg)
 {
 assert(LOOLProtocol::matchPrefix("callback", callbackMsg, 
/*ignoreWhitespace*/ true));
 
 std::vector tokens = LOOLProtocol::tokenize(callbackMsg);
 
 if (tokens.size() < 3)
-return;
+return std::string();
 
 // the message is "callback   ..."
 const std::string& callbackType = tokens[2];
 
 if (callbackType == "0")// invalidation
 {
-// TODO later add a more advanced merging of invalidates (like two
-// close ones merge into a bigger one); but for the moment remove just
-// the plain duplicates
-for (size_t i = 0; i < _queue.size(); ++i)
+int msgX, msgY, msgW, msgH, msgPart;
+
+if (!extractRectangle(tokens, msgX, msgY, msgW, msgH, msgPart))
+return std::string();
+
+bool performedMerge = false;
+
+// we always travel the entire queue
+size_t i = 0;
+while (i < _queue.size())
 {
 auto& it = _queue[i];
 
-if (callbackMsg.size() == it.size() && 
LOOLProtocol::matchPrefix(callbackMsg, it))
+std::vector queuedTokens = 
LOOLProtocol::tokenize(it.data(), it.size());
+if (queuedTokens.size() < 3)
+{
+++i;
+continue;
+}
+
+// not a invalidation callback
+if (queuedTokens[0] != tokens[0] || queuedTokens[1] != tokens[1] 
|| queuedTokens[2] != tokens[2])
+{
+++i;
+continue;
+}
+
+int queuedX, queuedY, queuedW, queuedH, queuedPart;
+
+if (!extractRectangle(queuedTokens, queuedX, queuedY, queuedW, 
queuedH, queuedPart))
+{
+++i;
+continue;
+}
+
+if (msgPart != queuedPart)
 {
-LOG_TRC("Remove duplicate invalidation callback: " << 
std::string(it.data(), it.size()) << " -> " << callbackMsg);
+++i;
+continue;
+}
+
+// the invalidation in the queue is fully covered by the message,
+// just remove it
+if (msgX <= queuedX && queuedX + queuedW <= msgX + msgW && msgY <= 
queuedY && queuedY + queuedH <= msgY + msgH)
+{
+LOG_TRC("Removing smaller invalidation: " << 
std::string(it.data(), it.size()) << " -> " <<
+tokens[0] << " " << tokens[1] << " " << tokens[2] << " 
" << msgX << " " << msgY << " " << msgW << " " << msgH << " " << msgPart);
+
+// remove from the queue
 _queue.erase(_queue.begin() + i);
-break;
+continue;
+}
+
+// the invalidation just intersects, join those (if the result is
+  

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

[Michael Stahl]

 sw/inc/ToxLinkProcessor.hxx |9 +--
 sw/qa/core/test_ToxLinkProcessor.cxx|   38 ++--
 sw/source/core/tox/ToxLinkProcessor.cxx |   18 +++
 3 files changed, 32 insertions(+), 33 deletions(-)

New commits:
commit 68f7be01a78a5bad56ddd94c04764131676d6cc0
Author: Michael Stahl 
Date:   Wed Jan 25 17:12:42 2017 +0100

sw: revert ToX hyperlinks to LO 4.3 behaviour

Commit 94b296d5416dd71d721ad16216b50bce79e3dc04 changed this to
potentially insert multiple overlapping hyperlink items.

Unfortunately Writer can only have one RES_TXTATR_INETFMT on any given
position in the paragraph, so the hyperlink hints inevitably overwrite
each other.

Revert this to do it the same way as the old code in LO 4.3 did: match
the last unmatched link-start with the first link-end, and ignore all
the link-start before the matching one, as well as the link-end after
the matching one.

This should prevent surprising formatting changes on index update,
including entries spontaneously turning green, and there is no reason
why the result of the new way is objectively better than the old one.

Change-Id: I55be9c212c473908428fa8bd6487d136343fe852

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 7fceef1..78bb7fb 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -82,7 +82,7 @@ private:
 
 std::vector> m_ClosedLinks;
 
-std::vector> m_StartedLinks;
+std::unique_ptr m_pStartedLink;
 
 friend class ::ToxLinkProcessorTest;
 };
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx 
b/sw/qa/core/test_ToxLinkProcessor.cxx
index eb4618e..d2d4721 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -30,17 +30,15 @@ using namespace sw;
 class ToxLinkProcessorTest : public test::BootstrapFixture
 {
 void NoExceptionIsThrownIfTooManyLinksAreClosed();
-void AddingAndClosingTwoLinksResultsInTwoClosedLinks();
+void AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink();
 void LinkIsCreatedCorrectly();
 void LinkSequenceIsPreserved();
-void StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed();
 
 CPPUNIT_TEST_SUITE(ToxLinkProcessorTest);
 CPPUNIT_TEST(NoExceptionIsThrownIfTooManyLinksAreClosed);
-CPPUNIT_TEST(AddingAndClosingTwoLinksResultsInTwoClosedLinks);
+CPPUNIT_TEST(AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink);
 CPPUNIT_TEST(LinkIsCreatedCorrectly);
 CPPUNIT_TEST(LinkSequenceIsPreserved);
-CPPUNIT_TEST(StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed);
 CPPUNIT_TEST_SUITE_END();
 public:
 void setUp() override {
@@ -71,30 +69,28 @@ 
ToxLinkProcessorTest::NoExceptionIsThrownIfTooManyLinksAreClosed()
 sut.CloseLink(1, URL_1);
 // fdo#85872 actually it turns out the UI does something like this
 // so an exception must not be thrown!
-sut.CloseLink(1, URL_1);
+// should not succeed either (for backward compatibility)
+sut.CloseLink(2, URL_1);
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(sut.m_ClosedLinks.size()));
+CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(0)->mEndTextPos));
+CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_pStartedLink == nullptr);
 }
 
 void
-ToxLinkProcessorTest::StandardOpenLinkIsAddedWhenMoreLinksThanAvaiableAreClosed()
-{
-ToxLinkProcessor sut;
-sut.StartNewLink(0, STYLE_NAME_1);
-sut.CloseLink(1, URL_1);
-sut.CloseLink(1, URL_1);
-CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_EQUAL(1u, 
static_cast(sut.m_ClosedLinks.at(1)->mEndTextPos));
-}
-
-void
-ToxLinkProcessorTest::AddingAndClosingTwoLinksResultsInTwoClosedLinks()
+ToxLinkProcessorTest::AddingAndClosingTwoOverlappingLinksResultsInOneClosedLink()
 {
 ToxLinkProcessor sut;
 sut.StartNewLink(0, STYLE_NAME_1);
 sut.StartNewLink(0, STYLE_NAME_2);
 sut.CloseLink(1, URL_1);
+// this should not cause an error, and should not succeed either
+// (for backward compatibility)
 sut.CloseLink(1, URL_2);
-CPPUNIT_ASSERT_EQUAL(2u, static_cast(sut.m_ClosedLinks.size()));
-CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_StartedLinks.empty());
+CPPUNIT_ASSERT_EQUAL(1u, static_cast(sut.m_ClosedLinks.size()));
+CPPUNIT_ASSERT_MESSAGE("no links are open", sut.m_pStartedLink == nullptr);
+// backward compatibility: the last start is closed by the first end
+CPPUNIT_ASSERT_EQUAL(STYLE_NAME_2, 
sut.m_ClosedLinks[0]->mINetFormat.GetINetFormat());
+CPPUNIT_ASSERT_EQUAL(URL_1, sut.m_ClosedLinks[0]->mINetFormat.GetValue());
 }
 
 class ToxLinkProcessorWithOverriddenObtainPoolId : public ToxLinkProcessor {
@@ -131,10 +127,10 @@ ToxLinkProcessorTest::LinkSequenceIsPreserved()
 // obtainpoolid needs to be overridden to check what we are
 ToxLinkProcessorWithOverriddenObtainPoolId sut;
 
-sut.Star

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

[Stephan Bergmann]

 idlc/inc/options.hxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 700470577f62f569a5e81c7b446167f8d9c7b7cc
Author: Stephan Bergmann 
Date:   Wed Jan 25 17:58:26 2017 +0100

Remove junk

left over from 232c0fb700efd31eff8cfee896437c481582ed0f "#115784# idlc: 
fixed
commandline option processing."

Change-Id: I41f81b1223cf72c0fcf8e84cdc7016e3aebf0c9d

diff --git a/idlc/inc/options.hxx b/idlc/inc/options.hxx
index ab910b2..212faf3 100644
--- a/idlc/inc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -53,11 +53,6 @@ public:
 throw(IllegalArgument);
 bool setOption(char const * option, std::string const & rArg);
 
-#if 0  /* @@@ */
-sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
-throw( IllegalArgument );
-#endif /* @@@ */
-
 OString prepareHelp();
 OString prepareVersion();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/vcl sd/source svx/source vcl/source

[Caolán McNamara]

 cui/source/customize/cfg.cxx|2 +-
 cui/source/dialogs/hlmarkwn.cxx |2 +-
 include/vcl/image.hxx   |1 -
 sd/source/ui/dlg/inspagob.cxx   |2 +-
 svx/source/dialog/svxruler.cxx  |2 +-
 vcl/source/image/Image.cxx  |6 --
 6 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit e9c17354d3cfb4f808fa2092ffcb3b9de7654dee
Author: Caolán McNamara 
Date:   Wed Jan 25 14:21:02 2017 +

move Image ctor variant with mask color to callers

Change-Id: I81a52aeb855edca823881360831b26e252780053

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index ca667f3..21c66b2 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4868,7 +4868,7 @@ Image SvxToolbarEntriesListBox::GetSizedImage(
 rVDev.DrawLine( Point( aNewSize.Width()-3, 0 ), Point( aNewSize.Width()-3, 
aNewSize.Height()-1 ));
 
 // Create new image that uses the fillcolor as transparent
-return Image( rVDev.GetBitmap( Point(), aNewSize ), aFillColor );
+return Image(BitmapEx(rVDev.GetBitmap(Point(), aNewSize), aFillColor));
 }
 
 void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index cd11a88..ca8a282 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -446,7 +446,7 @@ int SvxHlinkDlgMarkWnd::FillTree( const uno::Reference< 
container::XNameAccess >
 uno::Reference< awt::XBitmap > aXBitmap( 
xTarget->getPropertyValue( aProp_LinkDisplayBitmap ), uno::UNO_QUERY );
 if( aXBitmap.is() )
 {
-Image aBmp( VCLUnoHelper::GetBitmap( aXBitmap 
).GetBitmap(), aMaskColor );
+Image 
aBmp(BitmapEx(VCLUnoHelper::GetBitmap(aXBitmap).GetBitmap(), aMaskColor));
 // insert Displayname into treelist with bitmaps
 pEntry = mpLbTree->InsertEntry ( aStrDisplayname,
 aBmp, aBmp,
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 5edaf5a..6ee8f89 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -57,7 +57,6 @@ class SAL_WARN_UNUSED VCL_DLLPUBLIC Image
 public:
 Image();
 explicit Image( const BitmapEx& rBitmapEx );
-Image( const Bitmap& rBitmap, const Color& rColor );
 explicit Image( const css::uno::Reference< 
css::graphic::XGraphic >& rxGraphic );
 explicit Image( const OUString &rPNGFileUrl );
 
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index c3a7238..537865b 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -83,7 +83,7 @@ void SdInsertPagesObjsDlg::Reset()
 {
 Color aColor( COL_WHITE );
 Bitmap aBmpText( SdResId( BMP_DOC_TEXT ) );
-Image aImgText( aBmpText, aColor );
+Image aImgText(BitmapEx(aBmpText, aColor));
 m_pLbTree->InsertEntry( rName, aImgText, aImgText );
 }
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index e5b2560..6c25518 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3399,7 +3399,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent 
)
 DrawTab(*pDev, aFillColor, aPt, nStyle);
 aMenu->InsertItem(i + 1,
  ResId(RID_SVXSTR_RULER_START + i, 
DIALOG_MGR()).toString(),
- Image(pDev->GetBitmap(Point(), aSz), 
Color(COL_WHITE)));
+ Image(BitmapEx(pDev->GetBitmap(Point(), aSz), 
Color(COL_WHITE;
 aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + 
TAB_GAP].nStyle);
 pDev->SetOutputSize(aSz); // delete device
 }
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index b1d3db9..649bf15 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -49,12 +49,6 @@ Image::Image(const BitmapEx& rBitmapEx)
 ImplInit(rBitmapEx);
 }
 
-Image::Image(const Bitmap& rBitmap, const Color& rColor)
-{
-const BitmapEx aBitmapEx(rBitmap, rColor);
-ImplInit(aBitmapEx);
-}
-
 Image::Image(const css::uno::Reference< css::graphic::XGraphic >& rxGraphic)
 {
 const Graphic aGraphic(rxGraphic);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 framework/inc/macros/xinterface.hxx|   60 ---
 framework/inc/macros/xtypeprovider.hxx |   71 -
 2 files changed, 131 deletions(-)

New commits:
commit 499370e598fdf898a21ccd26544213cf9cc939fa
Author: Stephan Bergmann 
Date:   Wed Jan 25 17:53:10 2017 +0100

Remove unused macros

Change-Id: Ib3f8f6cde75b6a605052a3d941380ab27db0f326

diff --git a/framework/inc/macros/xinterface.hxx 
b/framework/inc/macros/xinterface.hxx
index d0098d2..0d85f59 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -82,34 +82,6 @@ 

 return aReturn;
 \
 }
 
-
-//  private
-//  implementation of XInterface::queryInterface() with more than 12 other 
interfaces!
-#define PRIVATE_DEFINE_XINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, 
INTERFACES_SECOND )\
-PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS )  
 \
-css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType 
) throw( css::uno::RuntimeException, std::exception )  \
-{  
 \
-/* Attention: Don't use mutex or guard in this method!!! Is a method 
of XInterface. */  \
-/* Ask for my own supported interfaces ... 
 */  \
-css::uno::Any aReturn  ( ::cppu::queryInterface INTERFACES_FIRST   
\
-); 
 \
-/* If searched interface not supported by first group ... */   
 \
-if ( !aReturn.hasValue() ) 
 \
-{  
 \
-/* ... search in second group. (cppuhelper support 12 items only!) 
*/   \
-aReturn = ::cppu::queryInterface INTERFACES_SECOND;
\
-/* If searched interface not supported by this class ... */
 \
-if ( !aReturn.hasValue() ) 
 \
-{  
 \
-/* ... ask baseclass for interfaces! */
 \
-aReturn = BASECLASS::queryInterface( aType );  
 \
-}  
 \
-}  
 \
-/* Return result of this search. */
 \
-return aReturn;
 \
-}
-
-
 //  private
 //  help macros to replace INTERFACES in queryInterface() [see before]
 
@@ -196,38 +168,6 @@ 

 )  
 \
 )
 
-//  implementation of XInterface with 22 additional interfaces for 
queryInterface()
-#define DEFINE_XINTERFACE_22( CLASS, BASECLASS, INTERFACE1, INTERFACE2, 
INTERFACE3, INT

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

[Stephan Bergmann]

 sd/source/ui/docshell/docshel4.cxx |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 03c0a7fe18a60d2bd5c7e650ccb7dc1a687c8a2c
Author: Stephan Bergmann 
Date:   Wed Jan 25 16:38:32 2017 +0100

Fall back on o3tl::make_unique for now

Change-Id: I58f688004804aed8b749b72caaa53afc06387ec7

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 2541358..2a000c5 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -23,6 +23,7 @@
 
 #include "DrawDocShell.hxx"
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -611,30 +612,30 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 
 if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
 {
-xFilter = std::make_unique(rMedium, *this);
+xFilter = o3tl::make_unique(rMedium, *this);
 }
 else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
 {
-xFilter = std::make_unique(rMedium, *this);
+xFilter = o3tl::make_unique(rMedium, *this);
 static_cast(xFilter.get())->PreSaveBasic();
 }
 else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 )
 {
-xFilter = std::make_unique(rMedium, *this);
+xFilter = o3tl::make_unique(rMedium, *this);
 }
 else if( aTypeName.indexOf( "draw8" ) >= 0 ||
  aTypeName.indexOf( "impress8" ) >= 0 )
 {
-xFilter = std::make_unique(rMedium, *this);
+xFilter = o3tl::make_unique(rMedium, *this);
 }
 else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 ||
  aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 )
 {
-xFilter = std::make_unique(rMedium, *this, 
SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60);
+xFilter = o3tl::make_unique(rMedium, *this, 
SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60);
 }
 else
 {
-xFilter = std::make_unique(rMedium, *this);
+xFilter = o3tl::make_unique(rMedium, *this);
 }
 
 if (xFilter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d7858b0d23f88a3ecec4ed7cc863ee0867086209
Author: Caolán McNamara 
Date:   Thu Jan 19 10:47:56 2017 +

Related: tdf#100813 don't crash traversing table in page 43

master has...

commit 1281bd5d87361fa516cdf247b055aeb4bb5e13fb
Author: Mike Kaganski 
Date:   Wed Jan 18 09:25:55 2017 +0300

tdf#104181 related: don't throw on this document

which is more extreme, keep it minimal for the backport,
MoveFootnoteCntFwd always derefs pOldBoss so check for null
before calling into it here

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

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index f9faba4..29e1300 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1805,7 +1805,7 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool 
bPageBreak, bool bMoveAlways )
 return false;
 if (m_rThis.IsInFootnote())
 {
-if (!m_rThis.IsContentFrame())
+if (!m_rThis.IsContentFrame() || !pOldBoss)
 {
 SAL_WARN("sw.core", "Tables in footnotes are not truly supported");
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/docshell/docshel4.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 337dc6253537c30aaf3e619700c139e35beb8bbd
Author: Stephan Bergmann 
Date:   Wed Jan 25 16:34:57 2017 +0100

Missing include

Change-Id: I60177c2b10b973e9c8f09ea7c71d44df08e50cc4

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 686ce6a..2541358 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
+
 #include "DrawDocShell.hxx"
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/breakpad scaddins/source

[Stephan Bergmann]

 external/breakpad/ExternalProject_breakpad.mk |2 +-
 scaddins/source/analysis/analysishelper.cxx   |   16 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit d97bdf10d2654851d69a726b659d68eba3d9076e
Author: Stephan Bergmann 
Date:   Wed Jan 25 16:11:14 2017 +0100

Avoid calling log10(0)

...to avoid UBSan reporting during CppunitTest_sc_addin_functions_test:

[...]
> Testing 
file:///data/sbergman/lo-san/core/sc/qa/unit/data/functions/addin/fods/imabs.fods:
> warn:xmloff.style:14186:1:xmloff/source/style/xmlstyle.cxx:300: Here is a 
duplicate Style
> scaddins/source/analysis/analysishelper.cxx:949:37: runtime error: value 
-inf is outside the range of representable values of type 'int'
> #0 0x7f77717d11d6 in sca::analysis::ParseDouble(char16_t const*&, 
double&) scaddins/source/analysis/analysishelper.cxx:949:37
> #1 0x7f77717e39e5 in 
sca::analysis::Complex::ParseString(rtl::OUString const&, 
sca::analysis::Complex&) scaddins/source/analysis/analysishelper.cxx:1690:10
> #2 0x7f77717e317f in sca::analysis::Complex::Complex(rtl::OUString 
const&) scaddins/source/analysis/analysishelper.cxx:1664:10
> #3 0x7f777167fa79 in AnalysisAddIn::getImabs(rtl::OUString const&) 
scaddins/source/analysis/analysis.cxx:912:19
> #4 0x7f78148bd16a in gcc3::callVirtualMethod(void*, unsigned int, 
void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int, 
unsigned long*, double*) 
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:77:5
> #5 0x7f78148b6b70 in 
cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*, 
bridges::cpp_uno::shared::VtableSlot, _typelib_TypeDescriptionReference*, int, 
_typelib_MethodParameter*, void*, void**, _uno_Any**) 
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:233:13
> #6 0x7f78148b3894 in 
bridges::cpp_uno::shared::unoInterfaceProxyDispatch(_uno_Interface*, 
_typelib_TypeDescription const*, void*, void**, _uno_Any**) 
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:420:13
> #7 0x7f7772bdd096 in 
stoc_corefl::IdlInterfaceMethodImpl::invoke(com::sun::star::uno::Any const&, 
com::sun::star::uno::Sequence&) 
stoc/source/corereflection/criface.cxx:697:9
> #8 0x7f7772bdf45a in non-virtual thunk to 
stoc_corefl::IdlInterfaceMethodImpl::invoke(com::sun::star::uno::Any const&, 
com::sun::star::uno::Sequence&) 
stoc/source/corereflection/criface.cxx
> #9 0x7f77d3c63f17 in 
ScUnoAddInCall::ExecuteCallWithArgs(com::sun::star::uno::Sequence&)
 sc/source/core/tool/addincol.cxx:1466:31
> #10 0x7f77d3c631da in ScUnoAddInCall::ExecuteCall() 
sc/source/core/tool/addincol.cxx:1444:9
> #11 0x7f77d484504f in ScInterpreter::ScExternal() 
sc/source/core/tool/interpr4.cxx:2999:19
[...]

Change-Id: Ie31d6374bdac3ae11784d925011c5a67802cdf56

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 5548c31..d542c04 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -946,15 +946,19 @@ bool ParseDouble( const sal_Unicode*& rp, double& rRet )
 rp = p;
 
 fInt += fFrac;
-sal_Int32   nLog10 = sal_Int32( log10( fInt ) );
 
-if( bNegExp )
-nExp = -nExp;
+if (fInt != 0.0) // exact check; log10(0.0) may entail a pole error
+{
+sal_Int32   nLog10 = sal_Int32( log10( fInt ) );
 
-if( nLog10 + nExp > nMaxExp )
-return false;
+if( bNegExp )
+nExp = -nExp;
 
-fInt = ::rtl::math::pow10Exp( fInt, nExp );
+if( nLog10 + nExp > nMaxExp )
+return false;
+
+fInt = ::rtl::math::pow10Exp( fInt, nExp );
+}
 
 if( bNegNum )
 fInt = -fInt;
commit 16bf916eee4148d66a13323aa69c1bb272c3219e
Author: Stephan Bergmann 
Date:   Wed Jan 25 16:05:23 2017 +0100

Pass gb_VISIBILITY_FLAGS into external/breakpad

...to avoid UBSan (on Linux) reporting a ODR violation between
google_breakpad::MinidumpDescriptor::kMicrodumpOnConsole (workdir/
UnpackedTarball/breakpad/src/client/linux/handler/minidump_descriptor.cc)
defined in both the crashreport and sofficeapp dynamic libs.

Change-Id: I686a6e2041c70f0aa17a774d705dc71d95d20183

diff --git a/external/breakpad/ExternalProject_breakpad.mk 
b/external/breakpad/ExternalProject_breakpad.mk
index 10fa6ce..f95b4b2 100644
--- a/external/breakpad/ExternalProject_breakpad.mk
+++ b/external/breakpad/ExternalProject_breakpad.mk
@@ -20,7 +20,7 @@ else # !ifeq($(COM),MSC)
 
 $(call gb_ExternalProject_get_state_target,breakpad,build) :
$(call gb_ExternalProject_run,build,\
-   CXX_FLAGS="-O2" ./configure \
+   ./configure CXXFLAGS="-O2 $(gb_VISIBILITY_FLAGS)" \
&& $(MAKE) \
)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedes

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

[Caolán McNamara]

 sd/source/ui/docshell/docshel4.cxx |   20 ++--
 sw/source/ui/index/cnttab.cxx  |1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 1337932c038d0a0f689e59de7c8ffd272dbdafa4
Author: Caolán McNamara 
Date:   Wed Jan 25 15:05:27 2017 +

fix index widget control positions on first view

Change-Id: Ic70006d65100b0ed8b337d43ff81577fb4579192

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 536326d..d1c630b 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2736,6 +2736,7 @@ void SwTokenWindow::setAllocation(const Size &rAllocation)
 aSize.Height() = aControlSize.Height();
 pControl->SetSizePixel(aSize);
 }
+AdjustPositions();
 }
 
 SwTokenWindow::~SwTokenWindow()
commit f08d33f87799848597e2818cd5e173ab3fdc510b
Author: Caolán McNamara 
Date:   Wed Jan 25 13:12:03 2017 +

use a std::unique_ptr

Change-Id: I1ab5e35714d6ef3358400b0805723c44678c

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 697323d..686ce6a 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -603,47 +603,45 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 {
 std::shared_ptr pMediumFilter = rMedium.GetFilter();
 const OUString aTypeName( pMediumFilter->GetTypeName() );
-SdFilter*   pFilter = nullptr;
+std::unique_ptr xFilter;
 
 if( aTypeName.indexOf( "graphic_HTML" ) >= 0 )
 {
-pFilter = new SdHTMLFilter( rMedium, *this );
+xFilter = std::make_unique(rMedium, *this);
 }
 else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 )
 {
-pFilter = new SdPPTFilter( rMedium, *this );
-static_cast(pFilter)->PreSaveBasic();
+xFilter = std::make_unique(rMedium, *this);
+static_cast(xFilter.get())->PreSaveBasic();
 }
 else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 )
 {
-pFilter = new SdCGMFilter( rMedium, *this );
+xFilter = std::make_unique(rMedium, *this);
 }
 else if( aTypeName.indexOf( "draw8" ) >= 0 ||
  aTypeName.indexOf( "impress8" ) >= 0 )
 {
-pFilter = new SdXMLFilter( rMedium, *this );
+xFilter = std::make_unique(rMedium, *this);
 }
 else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 ||
  aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 )
 {
-pFilter = new SdXMLFilter( rMedium, *this, SDXMLMODE_Normal, 
SOFFICE_FILEFORMAT_60 );
+xFilter = std::make_unique(rMedium, *this, 
SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60);
 }
 else
 {
-pFilter = new SdGRFFilter( rMedium, *this );
+xFilter = std::make_unique(rMedium, *this);
 }
 
-if( pFilter )
+if (xFilter)
 {
 const SdrSwapGraphicsMode nOldSwapMode = 
mpDoc->GetSwapGraphicsMode();
 
 mpDoc->SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP );
 
-bRet = pFilter->Export();
+bRet = xFilter->Export();
 if( !bRet )
 mpDoc->SetSwapGraphicsMode( nOldSwapMode );
-
-delete pFilter;
 }
 }
 
commit 160e11fed1ebc4df8e3ce0afdb636ef42e5b54fe
Author: Caolán McNamara 
Date:   Wed Jan 25 13:01:58 2017 +

valgrind: fix leak

since...

commit e94d5233dd7939c54eb52fff456e817cecdf0a4c
Date:   Fri Mar 11 06:43:06 2016 +0100

work on sane lifecylce for SfxFilter

which removed "delete pFilter" though it was
pMediumFilter which was in question in this method

Change-Id: I598dd44a8498ebd6b3e63d1c89147bee5ab3bb55

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index b52e137..697323d 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -642,6 +642,8 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 bRet = pFilter->Export();
 if( !bRet )
 mpDoc->SetSwapGraphicsMode( nOldSwapMode );
+
+delete pFilter;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - embeddedobj/source

[Caolán McNamara]

 embeddedobj/source/msole/oleembed.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 56f2d3728b74e39b658cd1c59a55b4b338ea230d
Author: Caolán McNamara 
Date:   Mon Jan 23 10:50:10 2017 +

Ole10Native payload truncated

Change-Id: If2c0c2788e54eb01a1b6998c81df016061a0ad6b
(cherry picked from commit da55a0e5158e14c3743b186d3b1d4022a278e4d5)
Reviewed-on: https://gerrit.libreoffice.org/33450
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index c15962c..2faed0b 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -759,11 +759,11 @@ namespace
 } while (nRead == 1 && aData[0] != 0);  // Actual string 
representing the file path
 uno::Sequence< sal_Int8 > aLenData(4);
 xIn->readBytes(aLenData, 4); //len of attachment
-sal_uInt32 nLen = static_cast
-  ((sal_uInt32)aLenData[0]
-+ ((sal_uInt32)aLenData[1] <<  8)
-+ ((sal_uInt32)aLenData[2] << 16)
-+ ((sal_uInt32)aLenData[3] << 24));
+sal_uInt32 nLen = static_cast(
+  (aLenData[0] & 0xFF) |
+  ((aLenData[1] & 0xFF) <<  8) |
+  ((aLenData[2] & 0xFF) << 16) |
+  ((aLenData[3] & 0xFF) << 24));
 
 bCopied = lcl_CopyStream(xIn, xStream->getOutputStream(), 
nLen);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - solenv/bin

[Samuel Mehrbrodt]

 solenv/bin/modules/installer/windows/msiglobal.pm |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6d689ed236f105a5f4d4c37f14d0d842ad216df9
Author: Samuel Mehrbrodt 
Date:   Wed Jan 25 15:43:31 2017 +0100

Hack: Fixed ProductCode for MSI packages

Change-Id: I71d4f0ca25c02c2795b316fabd641c03b82a4d84

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 11340fd..9c783e7 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1362,6 +1362,9 @@ sub set_global_code_variables
 $installer::globals::productcode = "\{" . ${$guidref}[0] . "\}";
 }
 
+# HACK: Fixed ProductCode
+$installer::globals::productcode = 
"{795CAACE-4CCA-479F-8BF7-176B6E12C681}";
+
 # UpgradeCode can take english as default, if not defined in specified 
language
 
 $searchstring = "UPGRADECODE";  # searching in the codes.txt file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 include/svx/sdr/table/tablecontroller.hxx|3 +
 include/svx/selectioncontroller.hxx  |4 ++
 sd/qa/unit/tiledrendering/data/tdf105502.odp |binary
 sd/qa/unit/tiledrendering/tiledrendering.cxx |   53 +++
 sd/source/ui/func/futext.cxx |   43 +
 svx/source/svdraw/selectioncontroller.cxx|4 ++
 6 files changed, 106 insertions(+), 1 deletion(-)

New commits:
commit cbc84a6599c08e5c79e544212c69c6946d0cdbf0
Author: Miklos Vajna 
Date:   Wed Jan 25 11:15:46 2017 +0100

tdf#105502 sd increase font size: handle table selection

In part of a table shape is selected, then only operate on the selected
cells, not on all of them.

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

diff --git a/include/svx/sdr/table/tablecontroller.hxx 
b/include/svx/sdr/table/tablecontroller.hxx
index ea511e7..1441c52 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -97,7 +97,8 @@ public:
 /// @see sdr::SelectionController::setCursorLogicPosition().
 SVX_DLLPRIVATE virtual bool setCursorLogicPosition(const Point& rPosition, 
bool bPoint) override;
 
-void getSelectedCells( CellPos& rFirstPos, CellPos& rLastPos );
+/// @see sdr::SelectionController::getSelectedCells().
+void getSelectedCells( CellPos& rFirstPos, CellPos& rLastPos ) override;
 void setSelectedCells( const CellPos& rFirstPos, const CellPos& rLastPos );
 void clearSelection();
 void selectAll();
diff --git a/include/svx/selectioncontroller.hxx 
b/include/svx/selectioncontroller.hxx
index 4c4a8e5..d2fb9c4 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -37,6 +37,8 @@ class Point;
 namespace sdr
 {
 
+namespace table { struct CellPos; }
+
 class SVX_DLLPUBLIC SelectionController: public cppu::OWeakObject
 {
 public:
@@ -74,6 +76,8 @@ public:
 virtual bool hasSelectedCells() const;
 /// Allows adjusting the point or mark of the selection to a document 
coordinate.
 virtual bool setCursorLogicPosition(const Point& rPosition, bool bPoint);
+/// Get the position of the first and the last selected cell.
+virtual void getSelectedCells(table::CellPos& rFirstPos, table::CellPos& 
rLastPos);
 };
 
 }
diff --git a/sd/qa/unit/tiledrendering/data/tdf105502.odp 
b/sd/qa/unit/tiledrendering/data/tdf105502.odp
new file mode 100644
index 000..6fe8180
Binary files /dev/null and b/sd/qa/unit/tiledrendering/data/tdf105502.odp differ
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 65079fc..cbb8703 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -42,6 +42,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace css;
 
@@ -84,6 +86,7 @@ public:
 void testTdf103083();
 void testTdf104405();
 void testTdf81754();
+void testTdf105502();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -116,6 +119,7 @@ public:
 CPPUNIT_TEST(testTdf103083);
 CPPUNIT_TEST(testTdf104405);
 CPPUNIT_TEST(testTdf81754);
+CPPUNIT_TEST(testTdf105502);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1505,6 +1509,55 @@ void SdTiledRenderingTest::testTdf81754()
 xDocShRef->DoClose();
 }
 
+void SdTiledRenderingTest::testTdf105502()
+{
+// Load the document.
+comphelper::LibreOfficeKit::setActive();
+SdXImpressDocument* pXImpressDocument = createDoc("tdf105502.odp");
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+sd::Window* pWindow = pViewShell->GetActiveWindow();
+CPPUNIT_ASSERT(pWindow);
+SdPage* pActualPage = pViewShell->GetActualPage();
+SdrObject* pObject = pActualPage->GetObj(0);
+auto pTableObject = dynamic_cast(pObject);
+CPPUNIT_ASSERT(pTableObject);
+
+// Select the first row.
+sd::View* pView = pViewShell->GetView();
+pView->MarkObj(pObject, pView->GetSdrPageView());
+pView->SdrBeginTextEdit(pObject);
+rtl::Reference 
xSelectionController(pView->getSelectionController());
+CPPUNIT_ASSERT(xSelectionController.is());
+SfxRequest aRequest(pViewShell->GetViewFrame(), SID_TABLE_SELECT_ROW);
+xSelectionController->Execute(aRequest);
+
+// Assert that the A1:B1 selection succeeded.
+CPPUNIT_ASSERT(xSelectionController->hasSelectedCells());
+sdr::table::CellPos aFirstCell;
+sdr::table::CellPos aLastCell;
+xSelectionController->getSelectedCells(aFirstCell, aLastCell);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aFirstCell.mnCol);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aFirstCell.mnRow);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aLastCell.mnCol);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), aLastCell.mnRow);
+
+/

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

[Caolán McNamara]

 vcl/source/gdi/metaact.cxx  |2 +-
 vcl/source/gdi/svmconverter.cxx |9 +
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 6872899cc1716f251988dfb3c86aa04c716cfda4
Author: Caolán McNamara 
Date:   Wed Jan 25 09:21:25 2017 +

ofz#463 unable to mmap

Reviewed-on: https://gerrit.libreoffice.org/33519
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f6c465bc8e7583a8321f5c881cb008b980e0e3fa)

Change-Id: I509faeda019f42bbe7cdc5fc249f2ea2076bb702
Reviewed-on: https://gerrit.libreoffice.org/33522
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 7bfa151..ac229f0 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1114,7 +1114,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& 
rStartPt,
 {
 const sal_Int32 nAryLen = pDXAry ? mnLen : 0;
 
-if( nAryLen )
+if (nAryLen > 0)
 {
 mpDXAry = new long[ nAryLen ];
 memcpy( mpDXAry, pDXAry, nAryLen * sizeof(long) );
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index b1a1c7a..3a6e961 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -908,6 +908,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 std::unique_ptr pDXAry;
 if (nAryLen > 0)
 {
+const size_t nMinRecordSize = sizeof(sal_Int32);
+const size_t nMaxRecords = rIStm.remainingSize() / 
nMinRecordSize;
+if (static_cast(nAryLen) > nMaxRecords)
+{
+SAL_WARN("vcl.gdi", "Parsing error: " << 
nMaxRecords <<
+ " max possible entries, but " << 
nAryLen << " claimed, truncating");
+nAryLen = nMaxRecords;
+}
+
 sal_Int32 nStrLen( aStr.getLength() );
 
 pDXAry.reset(new long[ std::max( nAryLen, nStrLen 
) ]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Caolán McNamara]

 vcl/source/gdi/metaact.cxx  |2 +-
 vcl/source/gdi/svmconverter.cxx |9 +
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 6ed838bfd59ae4db7822daf60ef12cb023799a75
Author: Caolán McNamara 
Date:   Wed Jan 25 09:21:25 2017 +

ofz#463 unable to mmap

Reviewed-on: https://gerrit.libreoffice.org/33519
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit f6c465bc8e7583a8321f5c881cb008b980e0e3fa)

Change-Id: I509faeda019f42bbe7cdc5fc249f2ea2076bb702
Reviewed-on: https://gerrit.libreoffice.org/33521
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 047a207..b8169cd 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1114,7 +1114,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& 
rStartPt,
 {
 const sal_Int32 nAryLen = pDXAry ? mnLen : 0;
 
-if( nAryLen )
+if (nAryLen > 0)
 {
 mpDXAry = new long[ nAryLen ];
 memcpy( mpDXAry, pDXAry, nAryLen * sizeof(long) );
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 616e5e7..d9aae46 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -909,6 +909,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 sal_Int32 nDXAryLen = 0;
 if (nAryLen > 0)
 {
+const size_t nMinRecordSize = sizeof(sal_Int32);
+const size_t nMaxRecords = rIStm.remainingSize() / 
nMinRecordSize;
+if (static_cast(nAryLen) > nMaxRecords)
+{
+SAL_WARN("vcl.gdi", "Parsing error: " << 
nMaxRecords <<
+ " max possible entries, but " << 
nAryLen << " claimed, truncating");
+nAryLen = nMaxRecords;
+}
+
 sal_Int32 nStrLen( aStr.getLength() );
 
 nDXAryLen = std::max(nAryLen, nStrLen);
___
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' - canvas/source

[Aron Budea]

 canvas/source/directx/dx_9rm.cxx |   19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 1c8f98a5fd33f02b9af0ce35b1ad0eb091c895d0
Author: Aron Budea 
Date:   Mon Jan 23 03:47:19 2017 +0100

tdf#100151: Dispose of window if DX device creation failed

Before, if the device lacked Direct3D capabilities, VclPtr
handling became compromised, and caused a crash. This was
particularly a problem in virtualized/remote desktop
connections in Windows.

Now mpWindow instance is disposed of right away if DX
device creation fails.

Change-Id: I639340380affdb31a93ce6dccd8df33a0a466df6
Reviewed-on: https://gerrit.libreoffice.org/33413
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit bb50474225f80b8aeea49f14ad66173462026a41)
Reviewed-on: https://gerrit.libreoffice.org/33487
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 6beb183..7d2867b 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -590,6 +590,14 @@ namespace dxcanvas
 // TODO(P2): get rid of those fine-grained locking
 ::osl::MutexGuard aGuard( maMutex );
 
+// TODO(F2): since we would like to share precious hardware
+// resources, the direct3d9 object should be global. each new
+// request for a canvas should only create a new swapchain.
+mpDirect3D9 = COMReference(
+Direct3DCreate9(D3D_SDK_VERSION));
+if(!mpDirect3D9.is())
+return false;
+
 maVertexCache.reserve( 1024 );
 
 mpWindow.disposeAndClear();
@@ -626,17 +634,12 @@ namespace dxcanvas
 // let the child window cover the same size as the parent window.
 mpWindow->setPosSizePixel(0,0,maSize.getX(),maSize.getY());
 
-// TODO(F2): since we would like to share precious hardware
-// resources, the direct3d9 object should be global. each new
-// request for a canvas should only create a new swapchain.
-mpDirect3D9 = COMReference(
-Direct3DCreate9(D3D_SDK_VERSION));
-if(!mpDirect3D9.is())
-return false;
-
 // create a device from the direct3d9 object.
 if(!(createDevice()))
+{
+mpWindow.disposeAndClear();
 return false;
+}
 
 mpWindow->Show();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - sc/source

[Caolán McNamara]

 sc/source/ui/condformat/condformatdlg.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 226838107364db2139363ea9617b06f74a13e122
Author: Caolán McNamara 
Date:   Wed Jan 18 14:11:11 2017 +

Resolves: tdf#105411 remove from entries before dispose

cause on dispose all the state change callbacks are
called, and all of the conditional formatting code assumes
that if there's an entry in the entries, that its not an
empty disposed one

Change-Id: I50d85128ba884a0719959f2d6e7ae83d6fb3431c
(cherry picked from commit 2fb220093f7178f75ebd582bbcd956c1ee7e03db)
Reviewed-on: https://gerrit.libreoffice.org/33476
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit cb65b1fa2ac641d0cb4c589db2f4b3a4df0d6b07)
Reviewed-on: https://gerrit.libreoffice.org/33482
Reviewed-by: Markus Mohrhard 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 8e952d7..37bf0b2 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -380,10 +380,11 @@ IMPL_LINK_NOARG( ScCondFormatList, RemoveBtnHdl, Button*, 
void )
 {
 for(EntryContainer::iterator itr = maEntries.begin(); itr != 
maEntries.end(); ++itr)
 {
-if((*itr)->IsSelected())
+auto widget = *itr;
+if (widget->IsSelected())
 {
-itr->disposeAndClear();
 maEntries.erase(itr);
+widget.disposeAndClear();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - sc/source

[Caolán McNamara]

 sc/source/ui/condformat/condformatdlg.cxx |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 60d9ffd6b6d1507aca3839cf2bfbd7e1f94354f2
Author: Caolán McNamara 
Date:   Mon Jan 23 20:44:38 2017 +

Resolves: tdf#105466 crash when changing conditional formatting condition

Change-Id: Id219a7935f83acf3924e60cb1bf02311dc5c4372
(cherry picked from commit 0b7c1dcd149cd98136e5ed3e8e0e70255d87cd16)
Reviewed-on: https://gerrit.libreoffice.org/33483
Reviewed-by: Eike Rathke 
Reviewed-by: Markus Mohrhard 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index b6e2191..8e952d7 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -187,10 +187,12 @@ void ScCondFormatList::RecalcAll()
 {
 sal_Int32 nTotalHeight = 0;
 sal_Int32 nIndex = 1;
-for(EntryContainer::iterator itr = maEntries.begin(); itr != 
maEntries.end(); ++itr)
+for (const auto& item : maEntries)
 {
-nTotalHeight += (*itr)->GetSizePixel().Height();
-(*itr)->SetIndex( nIndex );
+if (!item)
+continue;
+nTotalHeight += item->GetSizePixel().Height();
+item->SetIndex(nIndex);
 ++nIndex;
 }
 
@@ -212,17 +214,19 @@ void ScCondFormatList::RecalcAll()
 }
 
 Point aPoint(0,-1*mpScrollBar->GetThumbPos());
-for(EntryContainer::iterator itr = maEntries.begin(); itr != 
maEntries.end(); ++itr)
+for (const auto& item : maEntries)
 {
-(*itr)->SetPosPixel(aPoint);
-Size aSize = (*itr)->GetSizePixel();
+if (!item)
+continue;
+item->SetPosPixel(aPoint);
+Size aSize = item->GetSizePixel();
 if(mbHasScrollBar)
 aSize.Width() = aCtrlSize.Width() - nSrcBarSize;
 else
 aSize.Width() = aCtrlSize.Width();
-(*itr)->SetSizePixel(aSize);
+item->SetSizePixel(aSize);
 
-aPoint.Y() += (*itr)->GetSizePixel().Height();
+aPoint.Y() += item->GetSizePixel().Height();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - download.lst external/python3

[Michael Stahl]

 download.lst   |4 
 external/python3/ExternalPackage_python3.mk|1 
 external/python3/UnpackedTarball_python3.mk|   13 
 external/python3/python-3.3.0-darwin.patch.1   |4 
 external/python3/python-3.3.0-msvc-disable.patch.1 |   13 
 external/python3/python-3.3.0-ssl.patch.1  |6 
 external/python3/python-3.3.3-py17797.patch.1  |   49 
 external/python3/python-3.5.0-tcltk.disable.patch  |   16 
 external/python3/python-lsan.patch.0   |   19 
 external/python3/python-vc2013.patch.1 | 1213 -
 external/python3/ubsan.patch.0 |   27 
 11 files changed, 20 insertions(+), 1345 deletions(-)

New commits:
commit debc1a25704830de92a088f8ed13a90d2a326cc2
Author: Michael Stahl 
Date:   Tue Jan 17 15:38:11 2017 +0100

python3: upgrade to release 3.5.3

- fixes some minor CVEs
- drop python-vc2013.patch.1
- drop python-3.3.3-py17797.patch.1:
  the bug was fixed in MSVC2015 runtime so not relevant
- drop python-lsan.patch.0:
  fixed upstream
- ubsan.patch.0:
  drop hunks that were fixed upstream
- python-3.5.0-tcltk.disable.patch:
  merge into msvc-disable.patch.1

Change-Id: I2aecae446539d28eaf3eb64ee67581596019335d
Reviewed-on: https://gerrit.libreoffice.org/33225
Reviewed-by: David Ostrovsky 
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 743f9fc86f3d3b6e87bf58c0654bcdccab0ab383)
Reviewed-on: https://gerrit.libreoffice.org/33262
Reviewed-by: Miklos Vajna 
(cherry picked from commit baf09e572b377f569b00e61c10710787b1c151ba)
Reviewed-on: https://gerrit.libreoffice.org/33497
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index aaf1c80..6612282 100644
--- a/download.lst
+++ b/download.lst
@@ -140,8 +140,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
 export PYTHON_TARBALL := Python-3.3.5.tgz
 else
-export PYTHON_MD5SUM := a56c0c0b45d75a0ec9c6dee933c41c36
-export PYTHON_TARBALL := Python-3.5.0.tgz
+export PYTHON_MD5SUM := 6192f0e45f02575590760e68c621a488
+export PYTHON_TARBALL := Python-3.5.3.tgz
 endif
 
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 6cd766f..864c9cd 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -661,7 +661,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/lib2to3/fixes/fix_asserts.py \
Lib/lib2to3/fixes/fix_basestring.py \
Lib/lib2to3/fixes/fix_buffer.py \
-   Lib/lib2to3/fixes/fix_callable.py \
Lib/lib2to3/fixes/fix_dict.py \
Lib/lib2to3/fixes/fix_except.py \
Lib/lib2to3/fixes/fix_execfile.py \
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index a70005b..f84b982 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,17 +19,14 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.3-py17797.patch.1 \
+   external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
-   external/python3/python-lsan.patch.0 \
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \
-   external/python3/python-3.5.0-tcltk.disable.patch \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
@@ -44,14 +41,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 ))
 endif
 
-ifeq ($(OS)-$(COM),WNT-MSC)
-ifneq ($(filter 120,$(VCVER)),)
-$(eval $(call gb_UnpackedTarball_add_patches,python3,\
-   external/python3/python-vc2013.patch.1 \
-))
-endif
-endif
-
 ifneq ($(SYSTEM_ZLIB),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,python3, \
 external/python3/internal-zlib.patch.0 \
diff --git a/external/python3/python-3.3.0-darwin.patch.1 
b/external/python3/python-3.3.0-darwin.patch.1
index 2cf5bbb..d5cb17e 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -27,8 +27,6 @@ diff -ru python3.orig/configure python3/configure
 LIPO_

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

[aleksandar-stefanovic]

 android/source/AndroidManifest.xml   |   11 
+
 android/source/res/layout/activity_main.xml  |   16 
+--
 android/source/res/values/themes.xml |4 -
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |6 +-
 android/source/src/java/org/libreoffice/ToolbarController.java   |   22 
+++---
 5 files changed, 28 insertions(+), 31 deletions(-)

New commits:
commit 6310fa8a70db81334b710b06377e20b4ecb378da
Author: aleksandar-stefanovic 
Date:   Thu Jan 19 12:06:30 2017 +0100

Replaced empty spinner with the document title

Replaced empty spinner with the document title in the Main (viewer)
activity. Had to edit the themes to not disable title, and edit the
manifest to make the desired activities use that theme. If the theme
is set in the "application" tag, it will apply the theme globablly.
Also cleaned up and tightened the ToolbarController.

Change-Id: I5099860787b5f84d01c98c5e53ade519c2f89cc4
Reviewed-on: https://gerrit.libreoffice.org/33306
Tested-by: Jenkins 
Reviewed-by: Aleksandar Stefanović 

diff --git a/android/source/AndroidManifest.xml 
b/android/source/AndroidManifest.xml
index 55b71f6..7e35208 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -13,6 +13,7 @@
 android:allowBackup="true"
 android:icon="@mipmap/ic_launcher"
 android:label="@string/app_name"
+android:theme="@style/LibreOfficeTheme"
 android:debuggable="true"
 android:hardwareAccelerated="true"
 android:largeHeap="false">
@@ -21,8 +22,7 @@
 
+
android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize"
 >
 
 
 
@@ -98,8 +98,7 @@
 
 
 
+  android:label="@string/app_name" >
 
 
 
@@ -114,13 +113,11 @@
 
 
 
-
+
 
 
 
 
 
diff --git a/android/source/res/layout/activity_main.xml 
b/android/source/res/layout/activity_main.xml
index 625422e..923ed56 100644
--- a/android/source/res/layout/activity_main.xml
+++ b/android/source/res/layout/activity_main.xml
@@ -1,18 +1,26 @@
 
-http://schemas.android.com/apk/res/android";
 xmlns:tools="http://schemas.android.com/tools";
+xmlns:app="http://schemas.android.com/apk/res-auto";
 android:layout_width="fill_parent"
 android:layout_height="fill_parent"
 android:background="#fff"
-tools:context=".LibreOfficeMainActivity">
+tools:context=".LibreOfficeMainActivity" >
 
 
 
-
+
 
 
 
diff --git a/android/source/res/values/themes.xml 
b/android/source/res/values/themes.xml
index 3c89209..e5287a8 100644
--- a/android/source/res/values/themes.xml
+++ b/android/source/res/values/themes.xml
@@ -3,10 +3,6 @@
 
 
 
-true
-
-
-
 
 
 

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

[Miklos Vajna]

 sw/qa/extras/ww8export/data/tdf104334.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx |8 
 sw/source/filter/ww8/ww8par5.cxx  |8 
 3 files changed, 16 insertions(+)

New commits:
commit a235ea7a376959a462a285a2ad3cb7b74afe532f
Author: Miklos Vajna 
Date:   Tue Jan 24 09:09:41 2017 +0100

tdf#104334 DOC import: don't map STYLREF with switches to SwChapterField

Commit d635b351849b8b576c907abf22500d0fa89ab54f (tdf#99100 DOC import:
handle subset of STYLEREF natively, 2016-04-06) started to import the
STYLEREF field code as SwChapterField in case it had \[a-z] switches
after the field argument.

The bugdoc has a \s switch, which is not documented in ISO/IEC
29500-1:2012 17.16.5.59 "STYLEREF", nor is really clear what it would
do.

The original use-case was for the " STYLEREF 1 \* MERGEFORMAT " syntax,
so just keep using fieldmarks for the " STYLEREF  \[a-z]
" case.

(cherry picked from commit 44cb1d16f265565d6f77184f7c0d828d3d278dbf)

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

diff --git a/sw/qa/extras/ww8export/data/tdf104334.doc 
b/sw/qa/extras/ww8export/data/tdf104334.doc
new file mode 100644
index 000..877caff
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf104334.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index f2f5aa7..bf6b36f 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -57,6 +57,14 @@ DECLARE_WW8EXPORT_TEST(testTdf104805, "tdf104805.doc")
 }
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf104334, "tdf104334.doc")
+{
+// This failed with a container::NoSuchElementException: STYLEREF was
+// mapped to SwChapterField, and the field result was "This is a Heading 1"
+// instead of just "1".
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getRun(getParagraph(2), 
3)->getString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index c9a0dc5..e8b6307 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -915,6 +915,14 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 if (nRet == -2 && !aReadParam.GetResult().isEmpty())
 // Single numeric argument: this can be handled by SwChapterField.
 bHasHandler = rtl::isAsciiDigit(aReadParam.GetResult()[0]);
+
+if (bHasHandler)
+{
+nRet = aReadParam.SkipToNextToken();
+// Handle using SwChapterField only in case there is no \[a-z]
+// switch after the field argument.
+bHasHandler = nRet < 0 || nRet == '*';
+}
 }
 
 // keine Routine vorhanden
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/inc sc/source

[Eike Rathke]

 sc/inc/column.hxx|2 -
 sc/inc/document.hxx  |2 -
 sc/inc/postit.hxx|   10 +++--
 sc/inc/table.hxx |2 -
 sc/source/core/data/column4.cxx  |   12 +++
 sc/source/core/data/documen2.cxx |8 ++-
 sc/source/core/data/document.cxx |4 +--
 sc/source/core/data/postit.cxx   |   40 ---
 sc/source/core/data/table2.cxx   |4 +--
 sc/source/ui/undo/undoblk.cxx|2 -
 10 files changed, 60 insertions(+), 26 deletions(-)

New commits:
commit 6c6528828c5ca1da6a1ccc98d1aa5b42d84152a4
Author: Eike Rathke 
Date:   Wed Jan 18 22:49:08 2017 +0100

tdf#104967 preserve isolated notes data in clipboard when closing document

Change-Id: I0e263583e27c5103c0bb90e8fe00562e46a52d98
(cherry picked from commit b8b657123cc508c906622d20669507628c93e104)
Reviewed-on: https://gerrit.libreoffice.org/33289
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 5539f82..cfce9d6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -598,7 +598,7 @@ public:
 ScPostIt* ReleaseNote( SCROW nRow );
 size_t GetNoteCount() const;
 void CreateAllNoteCaptions();
-void ForgetNoteCaptions( SCROW nRow1, SCROW nRow2 );
+void ForgetNoteCaptions( SCROW nRow1, SCROW nRow2, bool bPreserveData );
 SCROW GetNotePosition( size_t nIndex ) const;
 void GetAllNoteEntries( std::vector& rNotes ) const;
 void GetNotesInRange( SCROW nStartRow, SCROW nEndRow, 
std::vector& rNotes ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 44092fd..10ce2e2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1108,7 +1108,7 @@ public:
  * code uses sdr objects to export note data.
  */
 void CreateAllNoteCaptions();
-void ForgetNoteCaptions( const ScRangeList& rRanges );
+void ForgetNoteCaptions( const ScRangeList& rRanges, bool bPreserveData );
 
 ScAddress GetNotePosition( size_t nIndex ) const;
 ScAddress GetNotePosition( size_t nIndex, SCTAB nTab ) const;
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 8835dea..87553f3 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -129,8 +129,14 @@ public:
 /** Returns the caption object of this note. Creates the caption object, if
 the note contains initial caption data instead of the caption. */
 SdrCaptionObj*  GetOrCreateCaption( const ScAddress& rPos ) const;
-/** Forgets the pointer to the note caption object. */
-voidForgetCaption();
+
+/** Forgets the pointer to the note caption object.
+
+@param  bPreserveData
+If true then the note text is remembered in maNoteData to be 
able
+to later reconstruct a caption from it.
+ */
+voidForgetCaption( bool bPreserveData = false );
 
 /** Shows or hides the note caption object. */
 voidShowCaption( const ScAddress& rPos, bool bShow );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index da69ea9..34f6e3f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -400,7 +400,7 @@ public:
 size_t GetNoteCount( SCCOL nCol ) const;
 SCROW GetNotePosition( SCCOL nCol, size_t nIndex ) const;
 void CreateAllNoteCaptions();
-void ForgetNoteCaptions( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2 );
+void ForgetNoteCaptions( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, bool bPreserveData );
 
 void GetAllNoteEntries( std::vector& rNotes ) const;
 void GetNotesInRange( const ScRange& rRange, std::vector& 
rNotes ) const;
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index e3cfb3d..234a852 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -598,11 +598,15 @@ public:
 }
 };
 
-struct NoteCaptionCleaner
+class NoteCaptionCleaner
 {
+bool mbPreserveData;
+public:
+explicit NoteCaptionCleaner( bool bPreserveData ) : 
mbPreserveData(bPreserveData) {}
+
 void operator() ( size_t /*nRow*/, ScPostIt* p )
 {
-p->ForgetCaption();
+p->ForgetCaption(mbPreserveData);
 }
 };
 
@@ -614,12 +618,12 @@ void ScColumn::CreateAllNoteCaptions()
 sc::ProcessNote(maCellNotes, aFunc);
 }
 
-void ScColumn::ForgetNoteCaptions( SCROW nRow1, SCROW nRow2 )
+void ScColumn::ForgetNoteCaptions( SCROW nRow1, SCROW nRow2, bool 
bPreserveData )
 {
 if (!ValidRow(nRow1) || !ValidRow(nRow2))
 return;
 
-NoteCaptionCleaner aFunc;
+NoteCaptionCleaner aFunc(bPreserveData);
 sc::CellNoteStoreType::iterator it = maCellNotes.begin();
 sc::ProcessNote(it, maCellNotes, nRow1, nRow2, aFunc);
 }
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f884bcd..7a41f14 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - extras/Package_palettes.mk

[heiko tietze]

 extras/Package_palettes.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fd48f44af5d888eb5f6d4fe549e5aa77ca1d5dd9
Author: heiko tietze 
Date:   Thu Dec 1 12:43:26 2016 +0100

tdf#104050 - Add Breeze palette

Amendment to gerrit 31012; makefile adjusted

Change-Id: I89b339e49e190f4269a2950799436e94f0aee665
Reviewed-on: https://gerrit.libreoffice.org/31481
Reviewed-by: jan iversen 
Tested-by: jan iversen 
(cherry picked from commit 841ef7154ba7b287666767bfa6b48f4d0bb63c10)
Reviewed-on: https://gerrit.libreoffice.org/33280
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 99c4b9effe38917eb2063d15aed0d879508c110e)
Reviewed-on: https://gerrit.libreoffice.org/33292
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 9c3e3e9..a4031d7 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -11,6 +11,7 @@ $(eval $(call 
gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palette
 
 $(eval $(call 
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,\
arrowhd.soe \
+   breeze.soc \
classic.sog \
freecolour-hlc.soc \
hatching.soh \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3-0' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr2.cxx |4 
 sc/source/core/tool/interpr4.cxx |   29 -
 2 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 4c353b6b858a6027a088dd6a4466690d3d606389
Author: Eike Rathke 
Date:   Fri Jan 20 23:21:47 2017 +0100

Resolves: tdf#105158 set date or time return type for DATEVALUE TIMEVALUE

... so adding/subtracting another date produces number of days instead of 
date,
and adding/subtracting a number produces date. But if used as the final
formula result force number type.

Change-Id: I046f5cc53d1fe8c9f6f71876787f2f19d24fe146
(cherry picked from commit b85ee27d9f8039a6442429587598426e73aeb1ba)
Reviewed-on: https://gerrit.libreoffice.org/33363
Reviewed-by: Markus Mohrhard 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 0e4245c..59e87b7 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -177,7 +177,10 @@ void ScInterpreter::ScGetDateValue()
 {
 short eType = pFormatter->GetType(nFIndex);
 if (eType == css::util::NumberFormat::DATE || eType == 
css::util::NumberFormat::DATETIME)
+{
+nFuncFmtType = css::util::NumberFormat::DATE;
 PushDouble(::rtl::math::approxFloor(fVal));
+}
 else
 PushIllegalArgument();
 }
@@ -937,6 +940,7 @@ void ScInterpreter::ScGetTimeValue()
 short eType = pFormatter->GetType(nFIndex);
 if (eType == css::util::NumberFormat::TIME || eType == 
css::util::NumberFormat::DATETIME)
 {
+nFuncFmtType = css::util::NumberFormat::TIME;
 double fDateVal = rtl::math::approxFloor(fVal);
 double fTimeVal = fVal - fDateVal;
 PushDouble(fTimeVal);
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 11a8870..4c34994 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3879,11 +3879,12 @@ StackVar ScInterpreter::Interpret()
 // so reassure exceptions are really off.
 SAL_MATH_FPEXCEPTIONS_OFF();
 
+OpCode eOp = ocNone;
 aCode.Reset();
 while( ( pCur = aCode.Next() ) != nullptr
 && (nGlobalError == FormulaError::NONE || nErrorFunction <= 
nErrorFunctionCount) )
 {
-OpCode eOp = pCur->GetOpCode();
+eOp = pCur->GetOpCode();
 cPar = pCur->GetByte();
 if ( eOp == ocPush )
 {
@@ -4454,6 +4455,21 @@ StackVar ScInterpreter::Interpret()
 
 // End: obtain result
 
+bool bForcedResultType;
+switch (eOp)
+{
+case ocGetDateValue:
+case ocGetTimeValue:
+// Force final result of DATEVALUE and TIMEVALUE to number type,
+// which so far was date or time for calculations.
+nRetTypeExpr = nFuncFmtType = css::util::NumberFormat::NUMBER;
+nRetIndexExpr = nFuncFmtIndex = 0;
+bForcedResultType = true;
+break;
+default:
+bForcedResultType = false;
+}
+
 if( sp )
 {
 pCur = pStack[ sp-1 ];
@@ -4476,9 +4492,12 @@ StackVar ScInterpreter::Interpret()
 if (pCur->GetDoubleType())
 {
 const double fVal = PopDouble();
-if (nCurFmtType != nFuncFmtType)
-nRetIndexExpr = 0;  // carry format index only 
for matching type
-nRetTypeExpr = nFuncFmtType = nCurFmtType;
+if (!bForcedResultType)
+{
+if (nCurFmtType != nFuncFmtType)
+nRetIndexExpr = 0;  // carry format index 
only for matching type
+nRetTypeExpr = nFuncFmtType = nCurFmtType;
+}
 PushTempToken( new FormulaDoubleToken( fVal));
 }
 if ( nFuncFmtType == 
css::util::NumberFormat::UNDEFINED )
@@ -4573,7 +4592,7 @@ StackVar ScInterpreter::Interpret()
 else
 SetError( FormulaError::NoCode);
 
-if( nRetTypeExpr != css::util::NumberFormat::UNDEFINED )
+if (bForcedResultType || nRetTypeExpr != 
css::util::NumberFormat::UNDEFINED)
 {
 nRetFmtType = nRetTypeExpr;
 nRetFmtIndex = nRetIndexExpr;
___
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/filter/ixpm/xpmread.cxx |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 39ced315aa6c49ea233e774a6a834df4823a1ed9
Author: Caolán McNamara 
Date:   Wed Jan 25 11:24:36 2017 +

return early

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

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index 6dc924f..dd31d97 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -280,25 +280,21 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 
 // ImplGetColor returns various colour values,
 // returns TRUE if various colours could be assigned
-
 bool XPMReader::ImplGetColor( sal_uLong nNumb )
 {
 sal_uInt8*  pString = mpStringBuf;
-sal_uInt8*  pPtr =  ( mpColMap + nNumb * ( 4 + mnCpp ) );
-boolbStatus = ImplGetString();
+if (!ImplGetString())
+return false;
 
-if ( bStatus )
-{
-for ( sal_uLong i = 0; i < mnCpp; i++ )
-*pPtr++ = *pString++;
-bStatus = ImplGetColSub ( pPtr );
-}
+sal_uInt8* pPtr =  ( mpColMap + nNumb * ( 4 + mnCpp ) );
+for (sal_uLong i = 0; i < mnCpp; ++i)
+*pPtr++ = *pString++;
+bool bStatus = ImplGetColSub(pPtr);
 return bStatus;
 }
 
 // ImpGetScanLine reads the string mpBufSize and writes the pixel in the
 // Bitmap. Parameter nY is the horizontal position.
-
 bool XPMReader::ImplGetScanLine( sal_uLong nY )
 {
 boolbStatus = ImplGetString();
___
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/filter/ixpm/xpmread.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 13a9b2045727597c1ab6fa1dc01393b1a73ef280
Author: Caolán McNamara 
Date:   Wed Jan 25 11:15:00 2017 +

appears to be a missing break here

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

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index 3be4e36..6dc924f 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -423,6 +423,7 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest )
 *pDest++ = pRGBTable[ i ].red;
 *pDest++ = pRGBTable[ i ].green;
 *pDest++ = pRGBTable[ i ].blue;
+break;
 }
 }
 i++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/view/cellsh1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0367acdcc59e14b0b067976a08202e8afef0ecf3
Author: Eike Rathke 
Date:   Wed Jan 25 13:34:43 2017 +0100

Resolves: tdf#105351 pass matching index key to conditional format dialog

Change-Id: I9d872140755c4ec0ae67349530b00f339057a356

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c0d4d4f..7dd6809 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2005,6 +2005,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
 // found a matching range, edit this conditional 
format
 bCondFormatDlg = true;
+nIndex = pCondFormat->GetKey();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/qa/extras/rtfimport/data/tdf105511.rtf |4 
 sw/qa/extras/rtfimport/rtfimport.cxx  |   27 +++
 2 files changed, 31 insertions(+)

New commits:
commit ff4f48892aca8de695709132fdeb099809db8b55
Author: Mike Kaganski 
Date:   Wed Jan 25 10:37:40 2017 +0300

tdf#105511: Unit test

Change-Id: I1b988ca629bc93ff7d29c396d463f2967ed99b54
Reviewed-on: https://gerrit.libreoffice.org/33512
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sw/qa/extras/rtfimport/data/tdf105511.rtf 
b/sw/qa/extras/rtfimport/data/tdf105511.rtf
new file mode 100644
index 000..bae99d6
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf105511.rtf
@@ -0,0 +1,4 @@
+{\rtf\ansicpg0
+Èìÿ
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c860f3d..e71be6a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include "comphelper/configuration.hxx"
 
 #include 
 
@@ -1615,6 +1616,32 @@ DECLARE_RTFIMPORT_TEST(testCp118, "cp118.rtf")
 CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange->getString());
 }
 
+class testTdf105511 : public Test {
+protected:
+virtual OUString getTestName() override { return 
OUString("testTdf105511"); }
+public:
+CPPUNIT_TEST_SUITE(testTdf105511);
+CPPUNIT_TEST(Import);
+CPPUNIT_TEST_SUITE_END();
+
+void Import() {
+struct DefaultLocale : public 
comphelper::ConfigurationProperty {
+static OUString path() { return 
OUString("/org.openoffice.Office.Linguistic/General/DefaultLocale"); }
+~DefaultLocale() = delete;
+};
+auto batch = comphelper::ConfigurationChanges::create();
+DefaultLocale::set("ru-RU", batch);
+batch->commit();
+executeImportTest("tdf105511.rtf", nullptr);
+}
+virtual void verify() override
+{
+OUString aExpected("\xd0\x98\xd0\xbc\xd1\x8f", 6, 
RTL_TEXTENCODING_UTF8);
+getParagraph(1, aExpected);
+}
+};
+CPPUNIT_TEST_SUITE_REGISTRATION(testTdf105511);
+
 #endif
 DECLARE_RTFIMPORT_TEST(testFdo94835, "fdo94835.rtf")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svx/CommonStyleManager.hxx |3 ---
 include/svx/gallery1.hxx   |1 -
 include/svx/galmisc.hxx|2 --
 include/svx/graphctl.hxx   |6 --
 include/svx/hlnkitem.hxx   |1 -
 include/svx/nbdtmg.hxx |6 --
 include/svx/tbxctl.hxx |1 -
 include/svx/xit.hxx|1 -
 svx/inc/AccessibleSvxFindReplaceDialog.hxx |2 --
 svx/inc/galobj.hxx |6 --
 svx/source/dialog/imapwnd.hxx  |2 --
 svx/source/dialog/srchdlg.cxx  |1 -
 svx/source/engine3d/scene3d.cxx|   10 --
 svx/source/gallery2/gallery1.cxx   |1 -
 svx/source/inc/fmexpl.hxx  |2 --
 svx/source/svdraw/sdrpagewindow.cxx|4 
 svx/source/svdraw/svdcrtv.cxx  |   13 -
 svx/source/svdraw/svdhdl.cxx   |5 -
 svx/source/svdraw/svdmrkv.cxx  |   12 
 svx/source/svdraw/svdsnpv.cxx  |   24 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx |5 -
 21 files changed, 16 insertions(+), 92 deletions(-)

New commits:
commit d5cd223c48667770eeec3ef18c8b1b29d8ba564c
Author: Noel Grandin 
Date:   Wed Jan 25 10:22:47 2017 +0200

loplugin: unnecessary destructor svx

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

diff --git a/include/svx/CommonStyleManager.hxx 
b/include/svx/CommonStyleManager.hxx
index 9b144c0..d28ccdd 100644
--- a/include/svx/CommonStyleManager.hxx
+++ b/include/svx/CommonStyleManager.hxx
@@ -26,9 +26,6 @@ public:
 : StyleManager(rShell)
 {}
 
-virtual ~CommonStyleManager() override
-{}
-
 virtual sfx2::StylePreviewRenderer* CreateStylePreviewRenderer(
 OutputDevice& rOutputDev, 
SfxStyleSheetBase* pStyle,
 long nMaxHeight) override;
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 9d9dcc3..1f87557 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -53,7 +53,6 @@ public:
const OUString& rName,
bool bReadOnly, bool bNewFile,
sal_uInt32 nId, bool 
bThemeNameFromResource );
-~GalleryThemeEntry() {};
 
 const OUString& GetThemeName() const { return aName; }
 
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 4031af5..df984ee 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -111,8 +111,6 @@ public:
 SdrObjUserData( SdrInventor::SgaImap, 
ID_IMAPINFO ),
 aImageMap( rImageMap ) {};
 
-virtual ~SgaIMapInfo() override {};
-
 virtual SdrObjUserData* Clone( SdrObject* ) const override
 {
 SgaIMapInfo* pInfo = new SgaIMapInfo;
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 05e7524..1cf1c9c 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -125,9 +125,6 @@ public:
 : rWin(rGraphWin)
 {}
 
-virtual ~GraphCtrlUserCall() override
-{}
-
 virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const 
Rectangle& rOldBoundRect) override;
 };
 
@@ -153,9 +150,6 @@ public:
 : SdrView(pModel, pWindow)
 , rGraphCtrl(*pWindow)
 {}
-
-virtual ~GraphCtrlView() override
-{}
 };
 
 #endif // INCLUDED_SVX_GRAPHCTL_HXX
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index fa70a26..ea27acf 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -68,7 +68,6 @@ public:
 SvxLinkInsertMode eTyp,
 HyperDialogEvent nEvents = 
HyperDialogEvent::NONE,
 SvxMacroTableDtor *pMacroTbl =nullptr );
-virtual ~SvxHyperlinkItem () override {}
 
 inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &rItem );
 
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index d79976b..e781668 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -69,7 +69,6 @@ class  SVX_DLLPUBLIC NumSettings_Impl
 , pBrushItem(nullptr)
 , aSize(0,0)
 {}
-~NumSettings_Impl(){}
 };
 
 typedef std::vector< std::shared_ptr > NumSettingsArr_Impl;
@@ -100,7 +99,6 @@ class  SVX_DLLPUBLIC NumberSettings_Impl
 nIndexDefault((sal_uInt16)0x),
 pNumSetting(nullptr)
 

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

[Michael Stahl]

 sw/inc/IDocumentSettingAccess.hxx |1 -
 sw/source/core/doc/DocumentSettingManager.cxx |7 ---
 sw/source/core/inc/DocumentSettingManager.hxx |1 -
 sw/source/filter/xml/xmlimp.cxx   |   16 
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |5 ++---
 5 files changed, 2 insertions(+), 28 deletions(-)

New commits:
commit 3e6042c2ce4613f5f200739b5842d4e38e8ec54a
Author: Michael Stahl 
Date:   Wed Jan 25 11:46:14 2017 +0100

sw: config item "OutlineLevelYieldsNumbering" has no effect

... since CWS swqbf90 in 2005, so remove it, except for the
entry in the property set.

Change-Id: I5f82d1957a15bf5141108ac9821b813dd36f1995

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index e85e7d7..ed7da12 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -54,7 +54,6 @@ enum class DocumentSettingId
 DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK,
 TREAT_SINGLE_COLUMN_BREAK_AS_PAGE_BREAK,
 DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT,
-OUTLINE_LEVEL_YIELDS_OUTLINE_RULE,
 
 DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE,
 TABLE_ROW_KEEP,
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 64644c5..22a2581 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -67,7 +67,6 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbTableRowKeep(false),
 mbIgnoreTabsAndBlanksForLineCalculation(false),
 mbDoNotCaptureDrawObjsOnPage(false),
-mbOutlineLevelYieldsOutlineRule(false),
 mbClipAsCharacterAnchoredWriterFlyFrames(false),
 mbUnixForceZeroExtLeading(false),
 mbTabRelativeToIndent(true),
@@ -159,7 +158,6 @@ bool sw::DocumentSettingManager::get(/*[in]*/ 
DocumentSettingId id) const
 case DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION: return 
mbConsiderWrapOnObjPos;
 case DocumentSettingId::DO_NOT_JUSTIFY_LINES_WITH_MANUAL_BREAK: return 
mbDoNotJustifyLinesWithManualBreak;
 case DocumentSettingId::IGNORE_FIRST_LINE_INDENT_IN_NUMBERING: return 
mbIgnoreFirstLineIndentInNumbering;
-case DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE: return 
mbOutlineLevelYieldsOutlineRule;
 case DocumentSettingId::TABLE_ROW_KEEP: return mbTableRowKeep;
 case DocumentSettingId::IGNORE_TABS_AND_BLANKS_FOR_LINE_CALCULATION: 
return mbIgnoreTabsAndBlanksForLineCalculation;
 case DocumentSettingId::DO_NOT_CAPTURE_DRAW_OBJS_ON_PAGE: return 
mbDoNotCaptureDrawObjsOnPage;
@@ -276,10 +274,6 @@ void sw::DocumentSettingManager::set(/*[in]*/ 
DocumentSettingId id, /*[in]*/ boo
 mbIgnoreFirstLineIndentInNumbering = value;
 break;
 
-case DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE:
-mbOutlineLevelYieldsOutlineRule = value;
-break;
-
 case DocumentSettingId::TABLE_ROW_KEEP:
 mbTableRowKeep = value;
 break;
@@ -554,7 +548,6 @@ void 
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
 mbIgnoreFirstLineIndentInNumbering = 
rSource.mbIgnoreFirstLineIndentInNumbering;
 mbDoNotJustifyLinesWithManualBreak = 
rSource.mbDoNotJustifyLinesWithManualBreak;
 mbDoNotResetParaAttrsForNumFont = rSource.mbDoNotResetParaAttrsForNumFont;
-mbOutlineLevelYieldsOutlineRule = rSource.mbOutlineLevelYieldsOutlineRule;
 mbTableRowKeep = rSource.mbTableRowKeep;
 mbIgnoreTabsAndBlanksForLineCalculation = 
rSource.mbIgnoreTabsAndBlanksForLineCalculation;
 mbDoNotCaptureDrawObjsOnPage = rSource.mbDoNotCaptureDrawObjsOnPage;
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx 
b/sw/source/core/inc/DocumentSettingManager.hxx
index c4dcd47..ae835d7 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -133,7 +133,6 @@ class DocumentSettingManager :
 bool mbTableRowKeep : 1;
 bool mbIgnoreTabsAndBlanksForLineCalculation: 1;   // #i3952#
 bool mbDoNotCaptureDrawObjsOnPage   : 1;   // #i62875#
-bool mbOutlineLevelYieldsOutlineRule: 1;
 bool mbClipAsCharacterAnchoredWriterFlyFrames   : 1;
 bool mbUnixForceZeroExtLeading  : 1;   // #i60945#
 bool mbTabRelativeToIndent  : 1;   // #i24363# tab 
stops relative to indent
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 41929fd..880d96f 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1100,7 +1100,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence 
< PropertyValue > & aC
 // below, and set them if not found
 bool bPrinterIndependentLayout = false;
 bool bUseOldNumbering = false;
-bool bOutlineLevelYieldsOutlineRule = false;
 bool bAddExternalLe

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/source

[Caolán McNamara]

 vcl/source/filter/wmf/winmtf.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 033b47dd2ace4d43bf0be1a6983717adf044b0c2
Author: Caolán McNamara 
Date:   Sat Jan 21 17:13:47 2017 +

ofz#439 protect against 0 len text

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

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 36aae28..6bc8b7d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -1457,9 +1457,9 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& 
rText, long* pDXArry, b
 sal_Int32 nTextWidth;
 pVDev->SetMapMode( MapMode( MapUnit::Map100thMM ) );
 pVDev->SetFont( maFont );
-if( pDXArry )
+const sal_uInt32 nLen = pDXArry ? rText.getLength() : 0;
+if (nLen)
 {
-sal_uInt32 nLen = rText.getLength();
 nTextWidth = pVDev->GetTextWidth( OUString(rText[ nLen - 1 ]) );
 if( nLen > 1 )
 nTextWidth += pDXArry[ nLen - 2 ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - basic/source

[Pierre Lepage]

 basic/source/comp/exprtree.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 65e294e221e0ad1d37c6667eecb995817ace870d
Author: Pierre Lepage 
Date:   Sat Nov 5 14:52:44 2016 -0400

tdf#80731 Closing parenthesis is now detected (Mid statement and functions).

Change-Id: I5efdb6c3ce71148672a8b76d3f1cc87b0fe04994
Reviewed-on: https://gerrit.libreoffice.org/30593
Tested-by: Julien Nabet 
Reviewed-by: Noel Grandin 
(cherry picked from commit 379b7ffb68bed5bc376a91032a781be147a6eff1)
Reviewed-on: https://gerrit.libreoffice.org/33341
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index e7a2210..008976f 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -1055,6 +1055,11 @@ SbiExprListPtr SbiExprList::ParseParameters( SbiParser* 
pParser, bool bStandalon
 {
 if( ( pExprList->bBracket && eTok == RPAREN ) || 
SbiTokenizer::IsEoln( eTok ) )
 {
+if ( SbiTokenizer::IsEoln( eTok ) && pExprList->bBracket)
+{
+pParser->Error( ERRCODE_BASIC_EXPECTED, RPAREN );
+pExprList->bError = true;
+}
 break;
 }
 pParser->Error( pExprList->bBracket ? ERRCODE_BASIC_BAD_BRACKETS : 
ERRCODE_BASIC_EXPECTED, COMMA );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sd/source/ui/unoidl/unolayer.cxx |   36 +---
 sd/source/ui/unoidl/unolayer.hxx |9 -
 2 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit 8a87bf1b693fe44ffdc3b773ee0244bbf1bdeda3
Author: Noel Grandin 
Date:   Wed Jan 25 13:30:07 2017 +0200

use rtl::Reference in SdLayer

instead of storing both a raw pointer and an uno::Reference

Change-Id: Id608c50cb4cb3a7cf7ad972303a3c5f9fc8e79b0

diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index d40cd0c..3b287a5 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -133,8 +133,7 @@ OUString SdLayer::convertToExternalName( const OUString& 
rName )
 }
 
 SdLayer::SdLayer( SdLayerManager* pLayerManager_, SdrLayer* pSdrLayer_ ) 
throw()
-: pLayerManager(pLayerManager_)
-, mxLayerManager(pLayerManager_)
+: mxLayerManager(pLayerManager_)
 , pLayer(pSdrLayer_)
 , pPropSet(ImplGetSdLayerPropertySet())
 {
@@ -181,7 +180,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& 
aPropertyName, const un
 {
 SolarMutexGuard aGuard;
 
-if(pLayer == nullptr || pLayerManager == nullptr)
+if(pLayer == nullptr || mxLayerManager == nullptr)
 throw lang::DisposedException();
 
 const SfxItemPropertySimpleEntry* pEntry = 
pPropSet->getPropertyMapEntry(aPropertyName);
@@ -210,7 +209,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& 
aPropertyName, const un
 throw lang::IllegalArgumentException();
 
 pLayer->SetName(SdLayer::convertToInternalName( aName ) );
-pLayerManager->UpdateLayerView();
+mxLayerManager->UpdateLayerView();
 break;
 }
 
@@ -238,8 +237,8 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& 
aPropertyName, const un
 throw beans::UnknownPropertyException( aPropertyName, 
static_cast(this));
 }
 
-if( pLayerManager->GetDocShell() )
-pLayerManager->GetDocShell()->SetModified();
+if( mxLayerManager->GetDocShell() )
+mxLayerManager->GetDocShell()->SetModified();
 }
 
 uno::Any SAL_CALL SdLayer::getPropertyValue( const OUString& PropertyName )
@@ -247,7 +246,7 @@ uno::Any SAL_CALL SdLayer::getPropertyValue( const 
OUString& PropertyName )
 {
 SolarMutexGuard aGuard;
 
-if(pLayer == nullptr || pLayerManager == nullptr)
+if(pLayer == nullptr || mxLayerManager == nullptr)
 throw lang::DisposedException();
 
 const SfxItemPropertySimpleEntry* pEntry = 
pPropSet->getPropertyMapEntry(PropertyName);
@@ -291,10 +290,10 @@ void SAL_CALL SdLayer::removeVetoableChangeListener( 
const OUString& , const uno
 
 bool SdLayer::get( LayerAttribute what ) throw()
 {
-if(pLayer&&pLayerManager)
+if(pLayer && mxLayerManager.is())
 {
 // Try 1. is an arbitrary page open?
-::sd::View *pView = pLayerManager->GetView();
+::sd::View *pView = mxLayerManager->GetView();
 SdrPageView* pSdrPageView = nullptr;
 if(pView)
 pSdrPageView = pView->GetSdrPageView();
@@ -311,9 +310,9 @@ bool SdLayer::get( LayerAttribute what ) throw()
 }
 
 // Try 2. get info from FrameView
-if(pLayerManager->GetDocShell())
+if(mxLayerManager->GetDocShell())
 {
-::sd::FrameView *pFrameView = 
pLayerManager->GetDocShell()->GetFrameView();
+::sd::FrameView *pFrameView = 
mxLayerManager->GetDocShell()->GetFrameView();
 if(pFrameView)
 switch(what)
 {
@@ -328,10 +327,10 @@ bool SdLayer::get( LayerAttribute what ) throw()
 
 void SdLayer::set( LayerAttribute what, bool flag ) throw()
 {
-if(pLayer&&pLayerManager)
+if(pLayer && mxLayerManager.is())
 {
 // Try 1. is an arbitrary page open?
-::sd::View *pView = pLayerManager->GetView();
+::sd::View *pView = mxLayerManager->GetView();
 SdrPageView* pSdrPageView = nullptr;
 if(pView)
 pSdrPageView = pView->GetSdrPageView();
@@ -351,9 +350,9 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw()
 }
 
 // Try 2. get info from FrameView
-if(pLayerManager->GetDocShell())
+if(mxLayerManager->GetDocShell())
 {
-::sd::FrameView *pFrameView = 
pLayerManager->GetDocShell()->GetFrameView();
+::sd::FrameView *pFrameView = 
mxLayerManager->GetDocShell()->GetFrameView();
 
 if(pFrameView)
 {
@@ -392,10 +391,10 @@ uno::Reference SAL_CALL 
SdLayer::getParent()
 {
 SolarMutexGuard aGuard;
 
-if( pLayerManager == nullptr )
+if( !mxLayerManager.is() )
 throw lang::DisposedException();
 
-return uno::Reference (mxLayerManager, uno::UNO_QUERY);
+return uno::Reference 
(static_cast(mxLayerManager.get()), uno::UNO_QUERY);
 }
 
 void SAL_CALL SdLayer::setParent (const uno::Reference& )
@@ -408,8 +407,7 @@ void SAL_CALL SdLayer::setParent (const 
uno::Refer

[Libreoffice-commits] online.git: Changes to 'feature/deduplication'

[Jan Holesovsky]

New branch 'feature/deduplication' available with the following commits:
commit ce44c1cb274db73506fb3765180641613369f323
Author: Jan Holesovsky 
Date:   Wed Jan 25 12:21:38 2017 +0100

Deduplicate the .uno: command state changes too.

Change-Id: Iaf9204d39d90cb9289d279e35a4609fa68c2cce8

commit 76342e6eef09c0efca5c1339fd9bfd691eca8604
Author: Jan Holesovsky 
Date:   Tue Jan 24 14:53:17 2017 +0100

Merge the LOK_CALLBACK_INVALIDATE_VIEW_CURSOR messages together.

And LOK_CALLBACK_CELL_VIEW_CURSOR too - though that ones are not that
expensive.

Change-Id: I5f116c66b1ce4426694d5d58851e104f9061bf53

commit 825fe557aa8de22bd3e52288de50f4ee5f8f264f
Author: Jan Holesovsky 
Date:   Tue Jan 24 12:41:55 2017 +0100

Make the broadcasting actually work.

Change-Id: I35ba20a45fdfe9fc0182c30648693d76a3e10f8a

commit c2237c404c92db5b35e5465c5ab3e6867e77b9b2
Author: Jan Holesovsky 
Date:   Tue Jan 24 12:40:30 2017 +0100

Squash the invalidation messages coming from various view into one.

Change-Id: I65f7e4eb0b82a8c76eef372548ad3298ac70bdd7

commit 30b9b99151145d61e263a2b832ce16714a9dc155
Author: Jan Holesovsky 
Date:   Fri Jan 20 15:56:47 2017 +0100

Remove obsolete cursor positions from the message queue.

Change-Id: Ie54aa4a475f0a55baaf6a40a99ed341c8f941a04

commit a087595756da4b04592e70d8d56b593390d3
Author: Jan Holesovsky 
Date:   Mon Jan 23 17:22:39 2017 +0100

Revert "wsd: batched user-input processing"

This reverts commit 27e1428088905e0a48b59038f52f3469c1a8da6e.

commit 7127dc7a2157ef24d2b76bb8c56db3ea7c8fec3f
Author: Jan Holesovsky 
Date:   Mon Jan 23 17:22:15 2017 +0100

Revert "wsd: cap batches by duration"

This reverts commit 0fe580d9ab3abe198e3143d30c83f1cffb589832.

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

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

[Noel Grandin]

 include/svl/cintitem.hxx   |8 
 include/svl/custritm.hxx   |2 --
 include/svl/flagitem.hxx   |4 +---
 include/svl/inethist.hxx   |1 -
 include/svl/intitem.hxx|2 --
 include/svl/metitem.hxx|1 -
 include/svl/nfkeytab.hxx   |1 -
 include/svl/ondemand.hxx   |9 -
 include/svl/poolitem.hxx   |1 -
 include/svl/ptitem.hxx |3 +--
 include/svl/rectitem.hxx   |1 -
 include/svl/szitem.hxx |3 +--
 include/svl/visitem.hxx|2 --
 include/svl/zforlist.hxx   |1 -
 include/svtools/ServerDetailsControls.hxx  |4 
 include/svtools/imapcirc.hxx   |1 -
 include/svtools/imappoly.hxx   |1 -
 include/svtools/imaprect.hxx   |1 -
 include/svtools/ivctrl.hxx |1 -
 include/svtools/svparser.hxx   |1 -
 svl/source/items/slstitm.cxx   |5 -
 svl/source/items/stylepool.cxx |4 
 svl/source/misc/inethist.cxx   |5 -
 svl/source/undo/undo.cxx   |4 
 svtools/source/config/accessibilityoptions.cxx |6 --
 svtools/source/control/ruler.cxx   |4 
 svtools/source/control/scriptedtext.cxx|6 --
 svtools/source/dialogs/addresstemplate.cxx |4 
 svtools/source/graphic/grfcache.cxx|3 ---
 svtools/source/misc/embedhlp.cxx   |4 
 30 files changed, 3 insertions(+), 90 deletions(-)

New commits:
commit 58868eb9edb819db1684ae04988a77897c62ab59
Author: Noel Grandin 
Date:   Wed Jan 25 10:21:25 2017 +0200

loplugin: unnecessary destructor svl..svtools

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

diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index e6b404c..2ccfd94 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -37,8 +37,6 @@ public:
 SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
 {}
 
-virtual ~CntByteItem() override {}
-
 virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
 virtual bool GetPresentation(SfxItemPresentation,
@@ -86,8 +84,6 @@ public:
 SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
 {}
 
-virtual ~CntUInt16Item() override {}
-
 virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
 virtual bool GetPresentation(SfxItemPresentation,
@@ -135,8 +131,6 @@ public:
 SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
 {}
 
-virtual ~CntInt32Item() override {}
-
 virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
 virtual bool GetPresentation(SfxItemPresentation,
@@ -184,8 +178,6 @@ public:
 SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
 {}
 
-virtual ~CntUInt32Item() override {}
-
 virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
 virtual bool GetPresentation(SfxItemPresentation,
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index 84b2db1..66f65a8 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -41,8 +41,6 @@ public:
 SfxPoolItem(rItem), m_aValue(rItem.m_aValue)
 {}
 
-virtual ~CntUnencodedStringItem() override {}
-
 virtual bool operator ==(const SfxPoolItem & rItem) const override;
 
 virtual bool GetPresentation(SfxItemPresentation,
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index f9fd4c0..3edb95e 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -33,9 +33,7 @@ public:
 explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 
nValue = 0 );
  SfxFlagItem( const SfxFlagItem& );
 
- virtual ~SfxFlagItem() override {}
-
-virtual sal_uInt8GetFlagCount() const;
+virtual sal_uInt8GetFlagCount() const;
 
 virtual bool operator==( const SfxPoolItem& ) const override;
 virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const 
override;
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index e983d1d..f595997 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -105,7 +105,6 @@ class SVL_DLLPUBLIC INetURLHistoryHint: public SfxHint
 const INetURLObject* pObj;
 public:
 explicit INetURLHistoryHint( const INetURLObject* Object ) : pObj(Object) 
{}
-virtual ~INetURLHistoryHint() override {}
 const INetURLObject* GetObject() const { return pObj; }
 };
 
diff --git a/include/svl

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

[Justin Luth]

 sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   24 ++
 2 files changed, 24 insertions(+)

New commits:
commit 0e726874b4bd111f84483f4a4f6592c8ecec6112
Author: Justin Luth 
Date:   Wed Jan 18 21:20:51 2017 +0300

uiwriter: unit test for tabOverMargin

related to tdf#35021 and n#793998 to test
the tab_over_margin compatibility setting
for doc and docx.

Change-Id: I00f932957b59a7ff1a55e69f4fdfae4fc1d17163
Reviewed-on: https://gerrit.libreoffice.org/33278
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc 
b/sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc
new file mode 100755
index 000..22c79e8
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data/tdf35021_tabOverMarginDemo.doc differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 2161ca8..681248d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -223,6 +223,7 @@ public:
 void testTdf104425();
 void testTdf104814();
 void testTdf66405();
+void testTdf35021_tabOverMarginDemo();
 void testTdf104492();
 void testTdf105417();
 
@@ -342,6 +343,7 @@ public:
 CPPUNIT_TEST(testTdf104425);
 CPPUNIT_TEST(testTdf104814);
 CPPUNIT_TEST(testTdf66405);
+CPPUNIT_TEST(testTdf35021_tabOverMarginDemo);
 CPPUNIT_TEST(testTdf104492);
 CPPUNIT_TEST(testTdf105417);
 CPPUNIT_TEST_SUITE_END();
@@ -4211,6 +4213,28 @@ void SwUiWriterTest::testTdf66405()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nTopMargin);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nBottomMargin);
 }
+
+void SwUiWriterTest::testTdf35021_tabOverMarginDemo()
+{
+createDoc("tdf35021_tabOverMarginDemo.doc");
+calcLayout();
+xmlDocPtr pXmlDoc = parseLayoutDump();
+// Tabs should go past the margin @ ~3381
+sal_Int32 nMargin = getXPath(pXmlDoc, "//body/txt[1]/infos/prtBounds", 
"width").toInt32();
+// left tab was 3381 because it got its own full line
+sal_Int32 nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABLEFT']", 
"nWidth").toInt32();
+CPPUNIT_ASSERT_MESSAGE("Left Tab width is ~4479", nMargin < nWidth);
+// center tab was 842
+nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABCENTER']", 
"nWidth").toInt32();
+CPPUNIT_ASSERT_MESSAGE("Center Tab width is ~3521", nMargin < nWidth);
+// right tab was probably the same as center tab.
+nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABRIGHT']", 
"nWidth").toInt32();
+CPPUNIT_ASSERT_MESSAGE("Right Tab width is ~2907", sal_Int32(2500) < 
nWidth);
+// decimal tab was 266
+nWidth = getXPath(pXmlDoc, "//Text[@nType='POR_TABDECIMAL']", 
"nWidth").toInt32();
+CPPUNIT_ASSERT_MESSAGE("Decimal Tab width is ~4096", nMargin < nWidth);
+}
+
 void SwUiWriterTest::testTdf104492()
 {
 createDoc("tdf104492.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source include/xmloff sc/source xmloff/Library_xof.mk xmloff/source

[Mohammed Abdul Azeem]

 filter/source/odfflatxml/OdfFlatXml.cxx|8 
 filter/source/xsltfilter/XSLTFilter.cxx|8 
 include/xmloff/xmlimp.hxx  |1 
 include/xmloff/xmlmetai.hxx|3 
 include/xmloff/xmltoken.hxx|4 
 sc/source/filter/xml/XMLEmptyContext.cxx   |   18 -
 sc/source/filter/xml/XMLEmptyContext.hxx   |   12 
 sc/source/filter/xml/importcontext.cxx |   20 +
 sc/source/filter/xml/importcontext.hxx |   12 
 sc/source/filter/xml/xmlbodyi.cxx  |  108 +--
 sc/source/filter/xml/xmlbodyi.hxx  |   19 +
 sc/source/filter/xml/xmlcelli.cxx  |  231 -
 sc/source/filter/xml/xmlcelli.hxx  |8 
 sc/source/filter/xml/xmlimprt.cxx  |  197 --
 sc/source/filter/xml/xmlimprt.hxx  |9 
 sc/source/filter/xml/xmlrowi.cxx   |  146 +-
 sc/source/filter/xml/xmlrowi.hxx   |   31 +-
 sc/source/filter/xml/xmltabi.cxx   |  145 ++
 sc/source/filter/xml/xmltabi.hxx   |   13 
 sc/source/filter/xml/xmlwrap.cxx   |8 
 xmloff/Library_xof.mk  |4 
 xmloff/source/core/xmlictxt.cxx|6 
 xmloff/source/core/xmltoken.cxx|4 
 xmloff/source/meta/xmlmetai.cxx|   13 
 xmloff/source/token/tokens.txt |4 
 xmloff/source/transform/ChartPlotAreaOASISTContext.cxx |4 
 xmloff/source/transform/ControlOASISTContext.cxx   |4 
 xmloff/source/transform/ControlOOoTContext.cxx |4 
 xmloff/source/transform/EventOOoTContext.cxx   |5 
 xmloff/source/transform/FormPropOASISTContext.cxx  |4 
 xmloff/source/transform/FormPropOOoTContext.cxx|5 
 xmloff/source/transform/FrameOASISTContext.cxx |5 
 xmloff/source/transform/FrameOOoTContext.cxx   |4 
 xmloff/source/transform/MetaTContext.cxx   |6 
 xmloff/source/transform/NotesTContext.cxx  |4 
 xmloff/source/transform/OOo2Oasis.cxx  |   12 
 xmloff/source/transform/Oasis2OOo.cxx  |4 
 xmloff/source/transform/PersAttrListTContext.cxx   |4 
 xmloff/source/transform/ProcAddAttrTContext.cxx|2 
 xmloff/source/transform/ProcAttrTContext.cxx   |4 
 xmloff/source/transform/RenameElemTContext.cxx |4 
 xmloff/source/transform/StyleOASISTContext.cxx |   10 
 xmloff/source/transform/StyleOOoTContext.cxx   |9 
 xmloff/source/transform/TransformerBase.cxx|   57 
 xmloff/source/transform/TransformerBase.hxx|   15 +
 xmloff/source/transform/TransformerContext.cxx |4 
 46 files changed, 789 insertions(+), 413 deletions(-)

New commits:
commit 8154953add163554c00935486a1cf5677cef2609
Author: Mohammed Abdul Azeem 
Date:   Mon Sep 5 14:38:30 2016 +0530

ScXMLTableRowCellContext implements fast interfaces:

Implementation of fast interfaces for contexts in path from
ScXMLImport::CreateFastContext to ScXMLTableRowCellContext.
FastParser is enabled and duplicates are avoided at all
possible places.
OOoXML filters still need those legacy paths we removed,
so I had to temporarily map them to fast elements, which
would increase their load time, but hopefully it should
help us in the long run.

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

diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx 
b/filter/source/odfflatxml/OdfFlatXml.cxx
index f8744ee..f39fc00 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -142,6 +143,8 @@ OdfFlatXml::importer(
 inputSource.sSystemId = url;
 inputSource.sPublicId = url;
 inputSource.aInputStream = inputStream;
+css::uno::Reference< css::xml::sax::XFastParser > xFastParser = 
dynamic_cast<
+css::xml::sax::XFastParser* >( docHandler.get() );
 saxParser->setDocumentHandler(docHandler);
 try
 {
@@ -149,7 +152,10 @@ OdfFlatXml::importer(
 if ( xSeekable.is() )
 xSeekable->seek( 0 );
 
-saxParser->parseStream(inputSource);
+if( xFastParser.is() )
+xFastParser->parseStream( inputSource );
+else
+saxParser->parseStream(inputSource);
 }
 catch (const Exception &exc)
 {
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx 
b/filter/source/xslt

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

[Eike Rathke]

 sc/source/core/data/colorscale.cxx |5 -
 sc/source/core/data/conditio.cxx   |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 657eea01046c7f39ee8ca4545241372177385946
Author: Eike Rathke 
Date:   Wed Jan 25 11:40:52 2017 +0100

Resolves: tdf#104675 ScConditionalFormat ranges needed to start listening

Conditional format manager dialog holds a cloned list of
ScConditionalFormat and sets that at the document on OK. The ranges of a
format need to be set before ScFormatEntry/ScConditionEntry are added to
start their listeners.

Change-Id: I903553b1f6a8298838ee8753315a6ea263b29b08

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 0f8764b..6657dcf 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1776,6 +1776,7 @@ ScConditionalFormat* 
ScConditionalFormat::Clone(ScDocument* pNewDoc) const
 pNewDoc = pDoc;
 
 ScConditionalFormat* pNew = new ScConditionalFormat(nKey, pNewDoc);
+pNew->SetRange( maRanges ); // prerequisite for listeners
 
 for (CondFormatContainer::const_iterator itr = maEntries.begin(); itr != 
maEntries.end(); ++itr)
 {
@@ -1783,7 +1784,6 @@ ScConditionalFormat* 
ScConditionalFormat::Clone(ScDocument* pNewDoc) const
 pNew->maEntries.push_back( std::unique_ptr(pNewEntry) );
 pNewEntry->SetParent(pNew);
 }
-pNew->SetRange( maRanges );
 
 return pNew;
 }
commit 81845445de26111eb0b7e30f45b3708389fd76cf
Author: Eike Rathke 
Date:   Tue Jan 24 21:23:22 2017 +0100

ScFormulaListener: do not start listening to clipboard or Undo docs

Change-Id: Ic00e30eccc64cc85ee877572ef8df042899f45f5

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 2690be1..dbce784 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -36,7 +36,7 @@ ScFormulaListener::ScFormulaListener(ScDocument* pDoc):
 
 void ScFormulaListener::startListening(ScTokenArray* pArr, const ScRange& 
rRange)
 {
-if (!pArr)
+if (!pArr || mpDoc->IsClipOrUndo())
 return;
 
 pArr->Reset();
@@ -123,6 +123,9 @@ private:
 
 void ScFormulaListener::stopListening()
 {
+if (mpDoc->IsClipOrUndo())
+return;
+
 std::for_each(maCells.begin(), maCells.end(), StopListeningCell(mpDoc, 
this));
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source slideshow/source sot/source starmath/inc starmath/source store/source

[Noel Grandin]

 include/sfx2/Metadatable.hxx |2 --
 include/sfx2/emojiview.hxx   |2 --
 include/sfx2/itemwrapper.hxx |4 
 include/sfx2/sidebar/UnoDeck.hxx |1 -
 include/sfx2/sidebar/UnoDecks.hxx|3 +--
 include/sfx2/sidebar/UnoPanel.hxx|1 -
 include/sfx2/sidebar/UnoPanels.hxx   |1 -
 include/sfx2/templatelocalview.hxx   |2 --
 sfx2/source/appl/linksrc.cxx |   11 ---
 sfx2/source/appl/lnkbase2.cxx|3 ---
 sfx2/source/dialog/backingwindow.cxx |1 -
 sfx2/source/dialog/securitypage.cxx  |6 --
 sfx2/source/dialog/tabdlg.cxx|3 ---
 sfx2/source/inc/docundomanager.hxx   |3 ---
 sfx2/source/inc/templatesearchviewitem.hxx   |3 ---
 sfx2/source/view/impframe.hxx|2 --
 sfx2/source/view/impviewframe.hxx|4 
 sfx2/source/view/printer.cxx |1 -
 sfx2/source/view/viewprn.cxx |1 -
 slideshow/source/engine/opengl/Operation.hxx |6 --
 slideshow/source/inc/animation.hxx   |2 --
 slideshow/source/inc/shapeattributelayer.hxx |1 -
 slideshow/source/inc/vieweventhandler.hxx|2 --
 sot/source/sdstor/stgstrms.hxx   |1 -
 starmath/inc/cursor.hxx  |4 
 starmath/source/mathmlexport.hxx |1 -
 store/source/storcach.cxx|3 ---
 27 files changed, 1 insertion(+), 73 deletions(-)

New commits:
commit 2608523b69fd6f1d888a74674a6ec795b4ad3aad
Author: Noel Grandin 
Date:   Wed Jan 25 10:19:59 2017 +0200

loplugin: unnecessary destructor sfx2..store

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

diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index b838c9f..f0289d9 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -141,8 +141,6 @@ class SFX2_DLLPUBLIC MetadatableMixin :
 public:
 MetadatableMixin() {};
 
-virtual ~MetadatableMixin() override {}
-
 // css::rdf::XNode:
 virtual OUString SAL_CALL getStringValue()
 throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx
index 30245cf..adb8306 100644
--- a/include/sfx2/emojiview.hxx
+++ b/include/sfx2/emojiview.hxx
@@ -42,8 +42,6 @@ public:
 : mCategory(rCategory)
 {}
 
-~ViewFilter_Category () {}
-
 bool operator () (const ThumbnailViewItem *pItem);
 
 static bool isFilteredCategory(FILTER_CATEGORY filter, const OUString 
&rCategory);
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 64fbf6d..0633bf2 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -134,8 +134,6 @@ public:
 inline explicit ValueItemWrapper( sal_uInt16 nSlot ) :
 SingleItemWrapper< ItemT, ValueT >( nSlot ) {}
 
-virtual ~ValueItemWrapper() {}
-
 virtual ValueT  GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
 { return static_cast< ValueT >( rItem.GetValue() 
); }
 virtual voidSetItemValue( ItemT& rItem, ValueT aValue ) const 
SAL_OVERRIDE
@@ -156,8 +154,6 @@ public:
 inline explicit IdentItemWrapper( sal_uInt16 nSlot ) :
 SingleItemWrapper< ItemT, const ItemT& >( nSlot ) 
{}
 
-virtual ~IdentItemWrapper() {}
-
 virtual const ItemT& GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE
 { return rItem; }
 virtual voidSetItemValue( ItemT& rItem, const ItemT& rValue ) 
const SAL_OVERRIDE
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx
index 43d57b2..9e4d052 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/include/sfx2/sidebar/UnoDeck.hxx
@@ -29,7 +29,6 @@ class SfxUnoDeck : public cppu::WeakImplHelper
 public:
 
 SfxUnoDeck(const css::uno::Reference& , const 
OUString&);
-virtual ~SfxUnoDeck() override {};
 
 virtual OUString SAL_CALL getId()
 throw(css::uno::RuntimeException, 
std::exception) override;
diff --git a/include/sfx2/sidebar/UnoDecks.hxx 
b/include/sfx2/sidebar/UnoDecks.hxx
index e17b7a3..34cf6ff 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/include/sfx2/sidebar/UnoDecks.hxx
@@ -31,7 +31,6 @@ class SfxUnoDecks : public 
cppu::WeakImplHelper
 public:
 
 SfxUnoDecks(const css::uno::Reference&);
-virtual ~SfxUnoDecks() override {};
 
 // XNameAccess
 
@@ -71,4 +70,4 @@ private:
 
 #endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sidebar/UnoPan

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

[Miklos Vajna]

 sfx2/source/view/classificationhelper.cxx |   28 +-
 sw/source/filter/ww8/docxtablestyleexport.cxx |2 -
 sw/source/filter/ww8/docxtablestyleexport.hxx |2 -
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   12 ++-
 writerfilter/source/rtftok/rtfreferenceproperties.cxx |   10 +++---
 writerfilter/source/rtftok/rtfreferenceproperties.hxx |4 +-
 6 files changed, 22 insertions(+), 36 deletions(-)

New commits:
commit cb55ffa649e73eb12e8edf79950a2494ac5e94b1
Author: Miklos Vajna 
Date:   Wed Jan 25 09:06:59 2017 +0100

sw: various small cleanups

Change-Id: I1eb56649fb9913cb32397c1ef49634a0d202f1a1

diff --git a/sfx2/source/view/classificationhelper.cxx 
b/sfx2/source/view/classificationhelper.cxx
index 614ec98..33323d6 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -100,22 +100,22 @@ public:
 std::vector m_aCategories;
 
 OUString m_aPolicyAuthorityName;
-bool m_bInPolicyAuthorityName;
+bool m_bInPolicyAuthorityName = false;
 OUString m_aPolicyName;
-bool m_bInPolicyName;
+bool m_bInPolicyName = false;
 OUString m_aProgramID;
-bool m_bInProgramID;
+bool m_bInProgramID = false;
 OUString m_aScale;
-bool m_bInScale;
+bool m_bInScale = false;
 OUString m_aConfidentalityValue;
-bool m_bInConfidentalityValue;
+bool m_bInConfidentalityValue = false;
 OUString m_aIdentifier;
-bool m_bInIdentifier;
+bool m_bInIdentifier = false;
 OUString m_aValue;
-bool m_bInValue;
+bool m_bInValue = false;
 
 /// Pointer to a value in m_aCategories, the currently parsed category.
-SfxClassificationCategory* m_pCategory;
+SfxClassificationCategory* m_pCategory = nullptr;
 
 SfxClassificationParser();
 
@@ -138,17 +138,7 @@ public:
 throw (xml::sax::SAXException, uno::RuntimeException, std::exception) 
override;
 };
 
-SfxClassificationParser::SfxClassificationParser()
-: m_bInPolicyAuthorityName(false)
-, m_bInPolicyName(false)
-, m_bInProgramID(false)
-, m_bInScale(false)
-, m_bInConfidentalityValue(false)
-, m_bInIdentifier(false)
-, m_bInValue(false)
-, m_pCategory(nullptr)
-{
-}
+SfxClassificationParser::SfxClassificationParser() = default;
 
 void SAL_CALL SfxClassificationParser::startDocument() throw 
(xml::sax::SAXException, uno::RuntimeException, std::exception)
 {
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx 
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index d87e805..210be35 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -684,7 +684,7 @@ void DocxTableStyleExport::SetSerializer(const 
sax_fastparser::FSHelperPtr& pSer
 m_pImpl->m_pSerializer = pSerializer;
 }
 
-DocxTableStyleExport::DocxTableStyleExport(SwDoc* pDoc, 
sax_fastparser::FSHelperPtr pSerializer)
+DocxTableStyleExport::DocxTableStyleExport(SwDoc* pDoc, const 
sax_fastparser::FSHelperPtr& pSerializer)
 : m_pImpl(o3tl::make_unique())
 {
 m_pImpl->m_pDoc = pDoc;
diff --git a/sw/source/filter/ww8/docxtablestyleexport.hxx 
b/sw/source/filter/ww8/docxtablestyleexport.hxx
index cf73a4b..3746203 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.hxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.hxx
@@ -33,7 +33,7 @@ public:
 void CnfStyle(css::uno::Sequence& 
rAttributeList);
 
 void SetSerializer(const sax_fastparser::FSHelperPtr& pSerializer);
-DocxTableStyleExport(SwDoc* pDoc, sax_fastparser::FSHelperPtr pSerializer);
+DocxTableStyleExport(SwDoc* pDoc, const sax_fastparser::FSHelperPtr& 
pSerializer);
 ~DocxTableStyleExport();
 };
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 615bcb6..3094229 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -484,12 +484,10 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& 
rNode, sal_Int32 /*nPos*/,
 long nHeight;
 if (pFormat)
 {
-const SvxFontItem& rFont = ItemGet< SvxFontItem >(*pFormat,
-   
GetWhichOfScript(RES_CHRATR_FONT,nRubyScript));
+const auto& rFont = ItemGet(*pFormat, 
GetWhichOfScript(RES_CHRATR_FONT,nRubyScript));
 sFamilyName = rFont.GetFamilyName();
 
-const SvxFontHeightItem& rHeight = ItemGet< SvxFontHeightItem 
>(*pFormat,
-   
GetWhichOfScript(RES_CHRATR_FONTSIZE, nRubyScript));
+const auto& rHeight = ItemGet(*pFormat, 
GetWhichOfScript(RES_CHRATR_FONTSIZE, nRubyScript));
 nHeight = rHeight.GetHeight();
 }
 else
@@ -499,12 +497,10 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& 
rNode, sal_Int32 /*nPos*/,
 const SfxItemPool* pPool = rNode.GetSwAttrSet().GetPool();
 pPool = pPool ? pPool : &m_rExport.m_pDoc->GetAttrPool();
 
- 

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

[Caolán McNamara]

 vcl/unx/gtk/salnativewidgets-gtk.cxx  |   14 ++
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   14 ++
 2 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit 19663d39f400dac3682228f3f0146807bbbebe74
Author: Caolán McNamara 
Date:   Wed Jan 25 10:02:54 2017 +

Resolves: tdf#104598 make bright theme shadow the same as it always was

The shadow color was originally set via StyleSettings::Set3DColors taking 
the
background color as the input, and doing DecreaseLuminance(64) on it to make
the shadow color

So, continue to follow that mode if the "dark shadow" is darker than the
foreground, and IncreaseLuminance the equal amount the other direction for 
dark
themes.

This way under a dark theme the problem of impossible to see rulers of
tdf#90214 is still fixed, while the bright theme colors are the same as they
always were, which avoid the wearing-on-the-nerves "regression" problem.

Change-Id: I33133ff180ecadce3a14ee45bd33db73c56c0225

diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 5e07ade..e8e8cdd 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -3943,14 +3943,12 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 Color aDarkShadowColor = getColor( pStyle->fg[GTK_STATE_INSENSITIVE] );
 aStyleSet.SetDarkShadowColor( aDarkShadowColor );
 
-int nRedDiff = aBackFieldColor.GetRed() - aDarkShadowColor.GetRed();
-int nGreenDiff = aBackFieldColor.GetGreen() - aDarkShadowColor.GetGreen();
-int nBlueDiff = aBackFieldColor.GetBlue() - aDarkShadowColor.GetBlue();
-
-Color aShadowColor(aBackFieldColor.GetRed() + nRedDiff / 2,
-   aBackFieldColor.GetGreen() + nGreenDiff / 2,
-   aBackFieldColor.GetBlue() + nBlueDiff / 2);
-aStyleSet.SetShadowColor( aShadowColor );
+::Color aShadowColor(aBackColor);
+if (aDarkShadowColor.GetLuminance() > aBackColor.GetLuminance())
+aShadowColor.IncreaseLuminance(64);
+else
+aShadowColor.DecreaseLuminance(64);
+aStyleSet.SetShadowColor(aShadowColor);
 
 // highlighting colors
 Color aHighlightColor = getColor( pStyle->base[GTK_STATE_SELECTED] );
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 48edf22..e036c20 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2585,14 +2585,12 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 ::Color aDarkShadowColor = getColor( color );
 aStyleSet.SetDarkShadowColor( aDarkShadowColor );
 
-int nRedDiff = aBackFieldColor.GetRed() - aDarkShadowColor.GetRed();
-int nGreenDiff = aBackFieldColor.GetGreen() - 
aDarkShadowColor.GetGreen();
-int nBlueDiff = aBackFieldColor.GetBlue() - aDarkShadowColor.GetBlue();
-
-::Color aShadowColor(aBackFieldColor.GetRed() + nRedDiff / 2,
- aBackFieldColor.GetGreen() + nGreenDiff / 2,
- aBackFieldColor.GetBlue() + nBlueDiff / 2);
-aStyleSet.SetShadowColor( aShadowColor );
+::Color aShadowColor(aBackColor);
+if (aDarkShadowColor.GetLuminance() > aBackColor.GetLuminance())
+aShadowColor.IncreaseLuminance(64);
+else
+aShadowColor.DecreaseLuminance(64);
+aStyleSet.SetShadowColor(aShadowColor);
 
 g_object_unref( pCStyle );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/source/uibase/inc/uivwimp.hxx|   19 ++-
 sw/source/uibase/uiview/uivwimp.cxx |   24 +++-
 2 files changed, 21 insertions(+), 22 deletions(-)

New commits:
commit cd28eb89d779091fafba0cf6c39a75498d4eab22
Author: Noel Grandin 
Date:   Wed Jan 25 11:05:59 2017 +0200

use rtl::Reference in SwView_Impl

instead of storing both raw pointers and uno::Reference

Change-Id: I75fbb279c5698a1d29b989a03c7daf5d279e869e

diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index edf2f05..903af9a 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -89,24 +89,25 @@ class SwMailMergeConfigItem;
 
 class SwView_Impl
 {
-css::uno::Reference< css::lang::XEventListener >  xScanEvtLstnr;
-css::uno::Reference< css::lang::XEventListener >  xClipEvtLstnr;
 css::uno::Reference< css::frame::XDispatchProviderInterceptor >   
xDisProvInterceptor;
 css::uno::Reference< css::view::XSelectionSupplier >  
mxXTextView;   // UNO object
-css::uno::WeakReference< css::lang::XUnoTunnel > xTransferable;
+css::uno::WeakReference< css::lang::XUnoTunnel >  
xTransferable;
 
 // temporary document for printing text of selection / multi selection
 // in PDF export.
-SfxObjectShellLock   xTmpSelDocSh;
+SfxObjectShellLock  xTmpSelDocSh;
 
-SwView* pView;
-SwScannerEventListener* pScanEvtLstnr;
-SwClipboardChangeListener*  pClipEvtLstnr;
+SwView* pView;
+rtl::Reference
+mxScanEvtLstnr;
+rtl::Reference
+mxClipEvtLstnr;
 ShellModes  eShellMode;
 
 #if HAVE_FEATURE_DBCONNECTIVITY
-std::shared_ptr xConfigItem;
-sal_uInt16  nMailMergeRestartPage;
+std::shared_ptr
+xConfigItem;
+sal_uInt16  nMailMergeRestartPage;
 #endif
 
 sfx2::DocumentInserter* m_pDocInserter;
diff --git a/sw/source/uibase/uiview/uivwimp.cxx 
b/sw/source/uibase/uiview/uivwimp.cxx
index bdd224f..0c2af38 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -55,8 +55,6 @@ using namespace ::com::sun::star::datatransfer::clipboard;
 SwView_Impl::SwView_Impl(SwView* pShell)
 : mxXTextView()
 , pView(pShell)
-, pScanEvtLstnr(nullptr)
-, pClipEvtLstnr(nullptr)
 , eShellMode(SHELL_MODE_TEXT)
 #if HAVE_FEATURE_DBCONNECTIVITY
 , nMailMergeRestartPage(0)
@@ -85,12 +83,12 @@ SwView_Impl::~SwView_Impl()
 view::XSelectionSupplier* pTextView = mxXTextView.get();
 static_cast(pTextView)->Invalidate();
 mxXTextView.clear();
-if( xScanEvtLstnr.is() )
-   pScanEvtLstnr->ViewDestroyed();
-if( xClipEvtLstnr.is() )
+if( mxScanEvtLstnr.is() )
+   mxScanEvtLstnr->ViewDestroyed();
+if( mxClipEvtLstnr.is() )
 {
-pClipEvtLstnr->AddRemoveListener( false );
-pClipEvtLstnr->ViewDestroyed();
+mxClipEvtLstnr->AddRemoveListener( false );
+mxClipEvtLstnr->ViewDestroyed();
 }
 #if HAVE_FEATURE_DBCONNECTIVITY
 xConfigItem.reset();
@@ -195,17 +193,17 @@ void SwView_Impl::ExecuteScan( SfxRequest& rReq )
 
 SwScannerEventListener& SwView_Impl::GetScannerEventListener()
 {
-if(!xScanEvtLstnr.is())
-xScanEvtLstnr = pScanEvtLstnr = new SwScannerEventListener(*pView);
-return *pScanEvtLstnr;
+if(!mxScanEvtLstnr.is())
+mxScanEvtLstnr = new SwScannerEventListener(*pView);
+return *mxScanEvtLstnr;
 }
 
 void SwView_Impl::AddClipboardListener()
 {
-if(!xClipEvtLstnr.is())
+if(!mxClipEvtLstnr.is())
 {
-xClipEvtLstnr = pClipEvtLstnr = new SwClipboardChangeListener( *pView 
);
-pClipEvtLstnr->AddRemoveListener( true );
+mxClipEvtLstnr = new SwClipboardChangeListener( *pView );
+mxClipEvtLstnr->AddRemoveListener( true );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 compilerplugins/clang/test/stringconstant.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 907a9ce8b8c0d2fe8564e3bfab8dcbd4347f916d
Author: Tor Lillqvist 
Date:   Wed Jan 25 11:56:54 2017 +0200

Bypass some lines that cause problems with Clang 3.8.1 at least

Change-Id: I05202ee6b2f083e8aacf0a2a8f8d7b8b361a5df8

diff --git a/compilerplugins/clang/test/stringconstant.cxx 
b/compilerplugins/clang/test/stringconstant.cxx
index 259b506..ec7bbdd 100644
--- a/compilerplugins/clang/test/stringconstant.cxx
+++ b/compilerplugins/clang/test/stringconstant.cxx
@@ -31,9 +31,10 @@ int main() {
 sb.append(s1);
 sb.append(s2); // expected-error {{in call of 'rtl::OStringBuffer::append' 
with non-array string constant argument, turn the non-array string constant 
into an array [loplugin:stringconstant]}}
 sb.append("foo", std::strlen("foo")); // expected-error {{rewrite call of 
'rtl::OStringBuffer::append' with string constant and matching length arguments 
as call of 'rtl::OStringBuffer::append' [loplugin:stringconstant]}}
+#if 0
 sb.append(s1, std::strlen(s1)); // expected-error {{rewrite call of 
'rtl::OStringBuffer::append' with string constant and matching length arguments 
as call of 'rtl::OStringBuffer::append' [loplugin:stringconstant]}}
 sb.append(s2, std::strlen(s2)); // expected-error {{rewrite call of 
'rtl::OStringBuffer::append' with string constant and matching length arguments 
as call of 'rtl::OStringBuffer::append', and turn the non-array string constant 
into an array [loplugin:stringconstant]}}
-
+#endif
 sb.insert(0, OString()); // expected-error {{in call of 
'rtl::OStringBuffer::insert', replace empty 'OString' constructor with empty 
string literal [loplugin:stringconstant]}}
 sb.insert(0, OString("foo")); // expected-error {{in call of 
'rtl::OStringBuffer::insert', elide explicit 'OString' constructor 
[loplugin:stringconstant]}}
 sb.insert(0, OString(s1)); // expected-error {{in call of 
'rtl::OStringBuffer::insert', elide explicit 'OString' constructor 
[loplugin:stringconstant]}}
@@ -45,8 +46,10 @@ int main() {
 sb.insert(0, s1);
 sb.insert(0, s2); // expected-error {{in call of 
'rtl::OStringBuffer::insert' with non-array string constant argument, turn the 
non-array string constant into an array [loplugin:stringconstant]}}
 sb.insert(0, "foo", std::strlen("foo")); // expected-error {{rewrite call 
of 'rtl::OStringBuffer::insert' with string constant and matching length 
arguments as call of 'rtl::OStringBuffer::insert' [loplugin:stringconstant]}}
+#if 0
 sb.insert(0, s1, std::strlen(s1)); // expected-error {{rewrite call of 
'rtl::OStringBuffer::insert' with string constant and matching length arguments 
as call of 'rtl::OStringBuffer::insert' [loplugin:stringconstant]}}
 sb.insert(0, s2, std::strlen(s2)); // expected-error {{rewrite call of 
'rtl::OStringBuffer::insert' with string constant and matching length arguments 
as call of 'rtl::OStringBuffer::insert', and turn the non-array string constant 
into an array [loplugin:stringconstant]}}
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 embedserv/source/embed/docholder.cxx |2 
 embedserv/source/inc/xwin.hxx|  235 ---
 2 files changed, 237 deletions(-)

New commits:
commit da1b98197a020fdebac0084a7c8200191a9c00de
Author: Stephan Bergmann 
Date:   Wed Jan 25 10:25:00 2017 +0100

embedserv/source/embed/xwin.cxx is gone

...since f2abfdb94e111ba551bb97ec06fa5b57be3f6299 "embedserv: convert to 
gbuild"

Change-Id: I932da3595e0d7150ef320c2fa892ea8d5286991c

diff --git a/embedserv/source/embed/docholder.cxx 
b/embedserv/source/embed/docholder.cxx
index 538cd5a..650fe66 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -20,8 +20,6 @@
 #pragma warning(disable : 4917 4555)
 #endif
 
-
-#include "xwin.hxx"
 #include "docholder.hxx"
 #include "embeddoc.hxx"
 #include "intercept.hxx"
diff --git a/embedserv/source/inc/xwin.hxx b/embedserv/source/inc/xwin.hxx
deleted file mode 100644
index 4883429..000
--- a/embedserv/source/inc/xwin.hxx
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_XWIN_HXX
-#define INCLUDED_EMBEDSERV_SOURCE_INC_XWIN_HXX
-
-
-#include "common.h"
-#include 
-#include 
-#include 
-#include 
-#include 
-
-
-class ContainerWindowWrapper:
-public ::cppu::WeakImplHelper<
- css::awt::XWindow,
- css::awt::XSystemDependentWindowPeer>
-{
-public:
-
-ContainerWindowWrapper(HWND aHwnd);
-
-~ ContainerWindowWrapper() override;
-
-
-// XComponent
-
-virtual void SAL_CALL
-dispose(
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-addEventListener(
-const css::uno::Reference< css::lang::XEventListener >& xListener
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-removeEventListener(
-const css::uno::Reference< css::lang::XEventListener >& aListener
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-
-// XSystemDependentWindowPeer
-
-virtual css::uno::Any SAL_CALL
-getWindowHandle(
-const css::uno::Sequence< sal_Int8 >& ProcessId,
-sal_Int16 SystemType
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-// XWindow
-
-virtual void SAL_CALL
-setPosSize(
-sal_Int32 X,
-sal_Int32 Y,
-sal_Int32 Width,
-sal_Int32 Height,
-sal_Int16 Flags
-)
-throw (
-css::uno::RuntimeException) override;
-
-virtual css::awt::Rectangle SAL_CALL
-getPosSize(
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-setVisible(
-sal_Bool Visible
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-setEnable(
-sal_Bool Enable
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-setFocus(
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-addWindowListener(
-const css::uno::Reference< css::awt::XWindowListener >& xListener
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-removeWindowListener(
-const css::uno::Reference< css::awt::XWindowListener >& xListener
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-addFocusListener(
-const css::uno::Reference< css::awt::XFocusListener >& xListener
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-removeFocusListener(
-const css::uno::Reference< css::awt::XFocusListener >& xListener
-)
-throw (
-css::uno::RuntimeException
-) override;
-
-virtual void SAL_CALL
-addKey

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

[Caolán McNamara]

 vcl/source/gdi/metaact.cxx  |2 +-
 vcl/source/gdi/svmconverter.cxx |9 +
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit f6c465bc8e7583a8321f5c881cb008b980e0e3fa
Author: Caolán McNamara 
Date:   Wed Jan 25 09:21:25 2017 +

ofz#463 unable to mmap

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

diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 15de163..3ef9692 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1110,7 +1110,7 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& 
rStartPt,
 {
 const sal_Int32 nAryLen = pDXAry ? mnLen : 0;
 
-if( nAryLen )
+if (nAryLen > 0)
 {
 mpDXAry.reset( new long[ nAryLen ] );
 memcpy( mpDXAry.get(), pDXAry, nAryLen * sizeof(long) );
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 2fba137..9d963f4 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -905,6 +905,15 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, 
GDIMetaFile& rMtf )
 std::unique_ptr pDXAry;
 if (nAryLen > 0)
 {
+const size_t nMinRecordSize = sizeof(sal_Int32);
+const size_t nMaxRecords = rIStm.remainingSize() / 
nMinRecordSize;
+if (static_cast(nAryLen) > nMaxRecords)
+{
+SAL_WARN("vcl.gdi", "Parsing error: " << 
nMaxRecords <<
+ " max possible entries, but " << nAryLen 
<< " claimed, truncating");
+nAryLen = nMaxRecords;
+}
+
 sal_Int32 nStrLen( aStr.getLength() );
 
 pDXAry.reset(new long[ std::max( nAryLen, nStrLen ) ]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[aleksandar-stefanovic]

 android/source/AndroidManifest.xml|
1 
 android/source/src/java/org/libreoffice/InvalidationHandler.java  |   
44 
 android/source/src/java/org/libreoffice/LOKitShell.java   |   
50 ++
 android/source/src/java/org/libreoffice/LOKitThread.java  |   
38 +++
 android/source/src/java/org/libreoffice/LOKitTileProvider.java|   
13 +-
 android/source/src/java/org/libreoffice/LibreOfficeApplication.java   |   
35 +++
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java  |   
24 +---
 android/source/src/java/org/libreoffice/SearchController.java |
4 
 android/source/src/java/org/libreoffice/ThumbnailCreator.java |
2 
 android/source/src/java/org/libreoffice/TileProviderFactory.java  |
4 
 android/source/src/java/org/libreoffice/canvas/GraphicSelection.java  |
7 +
 android/source/src/java/org/libreoffice/canvas/SelectionHandle.java   |
8 +
 android/source/src/java/org/libreoffice/canvas/SelectionHandleEnd.java|
6 -
 android/source/src/java/org/libreoffice/canvas/SelectionHandleMiddle.java |
6 -
 android/source/src/java/org/libreoffice/canvas/SelectionHandleStart.java  |
6 -
 android/source/src/java/org/libreoffice/overlay/DocumentOverlay.java  |
4 
 android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java  |
9 +
 android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java  |   
10 +-
 android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java   |
2 
 android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java  |
7 -
 android/source/src/java/org/mozilla/gecko/gfx/LayerView.java  |
5 -
 android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java  |
5 -
 22 files changed, 147 insertions(+), 143 deletions(-)

New commits:
commit 96b2aa3f820f4cc65904195cde12e305434a732c
Author: aleksandar-stefanovic 
Date:   Sat Jan 14 17:54:45 2017 +0100

Reduce usage of memory-leaking Context object

Huge refactoring of the methods to use the passed instance of the
Context object instead of using the static one. I couldn't completely
remove the static object, because it requires restructuring of the
workflow so that it originates from the activity, and not from some
other random place. The way it was refactored is:

1. Find a place where the static object
(LibreOfficeMainActivity.mAppContext) is used.
2. Add a LibreOfficeMainActivity object to the method signature.
3. Repeat the process with a method that calls it, and repeat until
the LibreOfficeMainActivity object isn't available, so that it can be
passed through all the methods, to the place where the static object
was used.
4. Replace that static object with the parameter of the function.

The commit looks pretty huge, but it's basically just the simple
refactoring explained above. The memory leak isn't completely gone,
but this a progress towards it. Also moved the "global" objects of
Handler and LOKitThread from an Activity to an Application, which
is the correct place for "global" variables. Can someone explain why
Handler and LOKitThread are used? They seem to mostly do nothing, but
steeply increasing the complexity of the application.

Change-Id: Ib2be77fa3adea94d6b7849d0e2afa90bf318d68b
Reviewed-on: https://gerrit.libreoffice.org/33073
Tested-by: Jenkins 
Reviewed-by: Aleksandar Stefanović 

diff --git a/android/source/AndroidManifest.xml 
b/android/source/AndroidManifest.xml
index 2c395c1..55b71f6 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -9,6 +9,7 @@
 
 
  mEventQueue = new 
LinkedBlockingQueue();
 
-private LibreOfficeMainActivity mApplication;
 private TileProvider mTileProvider;
 private InvalidationHandler mInvalidationHandler;
 private ImmutableViewportMetrics mViewportMetrics;
@@ -159,22 +159,22 @@ public class LOKitThread extends Thread {
  */
 
 private void resumeDocument(String filename, int partIndex){
-if (mApplication == null) {
-mApplication = LibreOfficeMainActivity.mAppContext;
-}
 
-mLayerClient = LibreOfficeMainActivity.getLayerClient();
+LibreOfficeMainActivity mainActivity = 
LibreOfficeMainActivity.mAppContext;
+
+
+mLayerClient = mainActivity.getLayerClient();
 
-mInvalidationHandler = new 
InvalidationHandler(LibreOfficeMainActivity.mAppContext);
-mTileProvider = TileProviderFactory.create(mLayerClient, 
mInvalidationHandler, filename);
+mInvalidationHandler = new InvalidationHandler(mainActivity);
+mTileProvider = TileProviderFactory.create(mainActivity, 
mInvalidationHandler, filename);
 
 if (mTileProvider.isReady()) {
-LOKitSh

Re: helpful stuff

[Dennis Roczek]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Slacka,

On 25.01.2017 03:57, slacka wrote:
> How are spammers getting malicious messages like this on the list. It'
s
> showing up in both our Archive and Nabble. 
Well at least the spam is deleted in Nabble by me.

> There seems to be a moderations system that blocks non-subscribers. Do
 we
> need more mods or just stricter controls to make it harder to circumve
nt. If
> you need more mods, who should I approach?
-BEGIN PGP SIGNATURE-
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJYiGpFAAoJEM4+Qf3OKrbZylQP/0J96vrYM7QvPuATvQd52bvb
ygePWyYEKZhpCDWgpvht1DpaXM5mzwKhvMlRzYpBByKJrZnMA19OpG7Zua9vVL8U
iCXob+qOXvWIjaMcf2fXavcGEXOwMIz4fcGFL8Lr4oZPbeK76QQ1WRZ/KeoiWPMc
OPnScYF/pKZD2wg37scUdm6dF/EqZEgIwu2Ur3W5zhryF/ShoPGHzX87Uta9PcB+
m/8K+EgYOja3LT/oqUVSWAQbSHPszRQ/J29Lw/wfOvq6DGEgsMtSWbfNfHhbtUOd
+wnkkx0XnpKHSenGtSSAKIx1MwTsgF2w8ISVAuhb1ur7fqO3LlEG0L6fwMuxDVd6
ZL9KMXASkT2Q11RdWAXORWDwlqNJf/R1EOJZ7r+HIB3bacd6vOYvo7hDZtXfhaLH
kJh97P6CYCBX0gtYKmyAQ6cB2D/2Xp+E0iB55Rpm1s2eJY6wwDmSDb7ZsDhtC1iG
SmVXVfd7BqCHqkoEbryOhIPCHmwtuwiii6hSv7zd62znij8xORDgevXyp06QWTaP
yUHtux/zZVR+GGOt7SuJmiw007VJFg5IxKKsn1g+AuRKWKnfSyEQGp3xZxp6bdwg
OzUIR+20ndijQivcuIZEJESjxSclFEnwCe7+pELKrOg3qwlRHJbXP16rzL0NKxI9
lm4vTUYTuoVJoIjUtE8g
=+YGk
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/6ebf8368a5cdec0d0e5a44dc5191d2b7c040240f/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


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

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

[Noel Grandin]

 sw/inc/unotxdoc.hxx   |4 ++--
 sw/source/uibase/uno/unotxdoc.cxx |   17 +++--
 2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit d49e497a6bd07e487149d65ab63138ce4aff73a4
Author: Noel Grandin 
Date:   Wed Jan 25 10:16:58 2017 +0200

use rtl::Reference in SwXTextDocument

instead of storing both a raw pointer and an uno::Reference

Change-Id: I94746e7fafcc7d2206ac0c1a6481e6006421529b

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 36ef233..e4aa5206 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -174,8 +175,7 @@ private:
 
 //temporary frame to enable PDF export if no valid view is available
 SfxViewFrame*   m_pHiddenViewFrame;
-css::uno::Reference< css::uno::XInterface>  xPropertyHelper;
-SwXDocumentPropertyHelper*  pPropertyHelper;
+rtl::Reference   mxPropertyHelper;
 
 SwPrintUIOptions *  m_pPrintUIOptions;
 SwRenderData *  m_pRenderData;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 2c81a20..a1ca0a0 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -422,7 +422,6 @@ SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
 mxLinkTargetSupplier(),
 mxXRedlines(),
 m_pHiddenViewFrame(nullptr),
-pPropertyHelper(nullptr),
 m_pPrintUIOptions( nullptr ),
 m_pRenderData( nullptr ),
 // #i117783#
@@ -452,12 +451,11 @@ SwXTextDocument::~SwXTextDocument()
 
 SwXDocumentPropertyHelper * SwXTextDocument::GetPropertyHelper ()
 {
-if(!xPropertyHelper.is())
+if(!mxPropertyHelper.is())
 {
-pPropertyHelper = new SwXDocumentPropertyHelper(*pDocShell->GetDoc());
-xPropertyHelper = static_cast(pPropertyHelper);
+mxPropertyHelper = new SwXDocumentPropertyHelper(*pDocShell->GetDoc());
 }
-return pPropertyHelper;
+return mxPropertyHelper.get();
 }
 
 void SwXTextDocument::GetNumberFormatter()
@@ -1600,11 +1598,10 @@ voidSwXTextDocument::InitNewDoc()
 static_cast(pMarks)->Invalidate();
 mxXRedlines.clear();
 }
-if(xPropertyHelper.is())
+if(mxPropertyHelper.is())
 {
-pPropertyHelper->Invalidate();
-xPropertyHelper = nullptr;
-pPropertyHelper = nullptr;
+mxPropertyHelper->Invalidate();
+mxPropertyHelper.clear();
 }
 }
 
@@ -2064,7 +2061,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& 
rPropertyName)
 case WID_DOC_FORBIDDEN_CHARS:
 {
 GetPropertyHelper();
-Reference xRet(xPropertyHelper, UNO_QUERY);
+Reference 
xRet(static_cast(mxPropertyHelper.get()), UNO_QUERY);
 aAny <<= xRet;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/oox include/registry oox/inc oox/source package/source registry/source reportdesign/source rsc/inc sal/qa sax/source

[Noel Grandin]

 include/oox/drawingml/chart/modelbase.hxx   |3 ---
 include/oox/drawingml/shape.hxx |1 -
 include/registry/refltype.hxx   |3 ---
 oox/inc/drawingml/chart/chartcontextbase.hxx|2 --
 oox/source/core/xmlfilterbase.cxx   |5 -
 oox/source/drawingml/chart/plotareaconverter.cxx|1 -
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |   11 ---
 package/source/manifest/ManifestImport.hxx  |3 ---
 package/source/xstor/xstorage.cxx   |6 --
 registry/source/reflread.cxx|   12 
 registry/source/reflwrit.cxx|   15 ---
 reportdesign/source/core/api/ReportDefinition.cxx   |6 --
 reportdesign/source/core/inc/ReportDrawPage.hxx |1 -
 reportdesign/source/core/sdr/ModuleHelper.cxx   |6 --
 rsc/inc/rsclex.hxx  |1 -
 sal/qa/osl/process/osl_Thread.cxx   |1 -
 sal/qa/rtl/random/rtl_random.cxx|1 -
 sax/source/fastparser/fastparser.cxx|9 -
 sax/source/tools/CachedOutputStream.hxx |1 -
 sax/source/tools/fastserializer.hxx |1 -
 20 files changed, 89 deletions(-)

New commits:
commit ef2b4342e9f8a887bb840d8a6c875125139d433a
Author: Noel Grandin 
Date:   Wed Jan 25 08:21:03 2017 +0200

loplugin: unnecessary destructor oox..sax

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

diff --git a/include/oox/drawingml/chart/modelbase.hxx 
b/include/oox/drawingml/chart/modelbase.hxx
index d27d139..312d3e3 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -39,7 +39,6 @@ class ModelRef : public std::shared_ptr< ModelType >
 public:
  ModelRef() {}
  ModelRef( const std::shared_ptr< ModelType >& rxModel ) : 
std::shared_ptr< ModelType >( rxModel ) {}
- ~ModelRef() {}
 
 bool is() const { return this->get() != 0; }
 
@@ -62,7 +61,6 @@ public:
 typedef typename RefVector< ModelType >::size_type  size_type;
 
  ModelVector() {}
- ~ModelVector() {}
 
 ModelType&   create() { return append( new ModelType ); }
 template< typename Param1Type >
@@ -83,7 +81,6 @@ public:
 typedef typename RefMap< KeyType, ModelType >::value_type   value_type;
 
  ModelMap() {}
- ~ModelMap() {}
 
 ModelType&   create( KeyType eKey ) { return insert( eKey, new ModelType 
); }
 
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 67f9a9b..1bc3fb7b 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -92,7 +92,6 @@ struct LinkedTxbxAttr
 sal_Int32 id;
 sal_Int32 seq;
 LinkedTxbxAttr(): id(0),seq(0){};
-~LinkedTxbxAttr(){};
 };
 
 class OOX_DLLPUBLIC Shape
diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx
index 3e3beda..f2a7db2 100644
--- a/include/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
@@ -53,9 +53,6 @@ public:
 {
 m_value.aDouble = 0.0;
 }
-
-/// Destructor
-~RTConstValue() {}
 };
 
 /** deprecated.
diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx 
b/oox/inc/drawingml/chart/chartcontextbase.hxx
index 2639e08..c5e194a 100644
--- a/oox/inc/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/drawingml/chart/chartcontextbase.hxx
@@ -34,7 +34,6 @@ class ContextBase : public ::oox::core::ContextHandler2
 public:
 explicitContextBase( ::oox::core::ContextHandler2Helper& 
rParent, ModelType& rModel ) :
 ::oox::core::ContextHandler2( rParent ), mrModel( 
rModel ) {}
-virtual ~ContextBase() override {}
 
 protected:
 ModelType&  mrModel;
@@ -46,7 +45,6 @@ class FragmentBase : public ::oox::core::FragmentHandler2
 public:
 explicitFragmentBase( ::oox::core::XmlFilterBase& rFilter, 
const OUString& rFragmentPath, ModelType& rModel ) :
 ::oox::core::FragmentHandler2( rFilter, 
rFragmentPath, false ), mrModel( rModel ) {}
-virtual ~FragmentBase() override {}
 
 protected:
 ModelType&  mrModel;
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 21f0b50..7d1651c 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -183,7 +183,6 @@ struct XmlFilterBaseImpl
 
 /// @throws RuntimeException
 explicitXmlFilterBaseImpl( const Reference< XComponentContext 
>& rxContext ) throw( RuntimeException );
-~XmlFilterBaseImpl();
 };
 
 XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContex

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

[Noel Grandin]

 sc/inc/chgtrack.hxx|1 -
 sc/inc/columniterator.hxx  |1 -
 sc/inc/conditio.hxx|1 -
 sc/inc/detdata.hxx |1 -
 sc/inc/dpfilteredcache.hxx |2 --
 sc/inc/dptabres.hxx|1 -
 sc/inc/fillinfo.hxx|3 ---
 sc/inc/formulagroup.hxx|1 -
 sc/inc/importfilterdata.hxx|1 -
 sc/inc/lookupcache.hxx |3 ---
 sc/inc/rangeutl.hxx|2 --
 sc/inc/stlalgorithm.hxx|1 -
 sc/inc/token.hxx   |2 --
 sc/inc/validat.hxx |1 -
 sc/source/core/data/dptabres.cxx   |3 ---
 sc/source/core/data/dptabsrc.cxx   |1 -
 sc/source/core/data/segmenttree.cxx|6 --
 sc/source/core/inc/scrdata.hxx |1 -
 sc/source/core/opencl/formulagroupcl.cxx   |3 ---
 sc/source/core/opencl/opbase.hxx   |1 -
 sc/source/core/tool/callform.cxx   |1 -
 sc/source/core/tool/chartlis.cxx   |1 -
 sc/source/filter/excel/xilink.cxx  |5 -
 sc/source/filter/excel/xltoolbar.hxx   |3 ---
 sc/source/filter/html/htmlpars.cxx |5 -
 sc/source/filter/inc/htmlpars.hxx  |1 -
 sc/source/filter/inc/qproform.hxx  |1 -
 sc/source/filter/inc/xecontent.hxx |1 -
 sc/source/filter/inc/xestyle.hxx   |1 -
 sc/source/filter/xml/XMLStylesImportHelper.hxx |2 --
 sc/source/filter/xml/xmlcondformat.hxx |   16 
 sc/source/filter/xml/xmlstyle.hxx  |1 -
 sc/source/ui/dbgui/consdlg.cxx |2 --
 sc/source/ui/inc/AccessibleText.hxx|2 --
 sc/source/ui/inc/checklistmenu.hxx |2 --
 sc/source/ui/inc/dbdocfun.hxx  |1 -
 sc/source/ui/inc/docfunc.hxx   |1 -
 sc/source/ui/inc/olinefun.hxx  |1 -
 sc/source/ui/inc/pfuncache.hxx |1 -
 sc/source/ui/inc/validate.hxx  |1 -
 sc/source/ui/unoobj/cellsuno.cxx   |1 -
 sc/source/ui/unoobj/chart2uno.cxx  |4 
 sc/source/ui/vba/vbaborders.hxx|1 -
 sc/source/ui/vba/vbacharacters.hxx |1 -
 sc/source/ui/vba/vbacomment.hxx|2 --
 sc/source/ui/vba/vbacomments.hxx   |2 --
 sc/source/ui/vba/vbadialog.hxx |1 -
 sc/source/ui/vba/vbadialogs.hxx|1 -
 sc/source/ui/vba/vbaformat.hxx |1 -
 sc/source/ui/vba/vbainterior.hxx   |2 --
 sc/source/ui/vba/vbaoutline.hxx|1 -
 sc/source/ui/vba/vbapagebreak.hxx  |3 ---
 sc/source/ui/vba/vbapagebreaks.hxx |1 -
 sc/source/ui/vba/vbapagesetup.hxx  |1 -
 sc/source/ui/vba/vbapivottables.hxx|1 -
 sc/source/ui/vba/vbastyle.hxx  |1 -
 sc/source/ui/vba/vbatextframe.hxx  |1 -
 sc/source/ui/vba/vbawindows.hxx|1 -
 sc/source/ui/vba/vbaworkbook.hxx   |1 -
 sc/source/ui/vba/vbaworkbooks.hxx  |1 -
 sc/source/ui/vba/vbaworksheets.hxx |1 -
 sc/source/ui/vba/vbawsfunction.hxx |1 -
 sc/source/ui/view/output2.cxx  |5 -
 63 files changed, 120 deletions(-)

New commits:
commit 3c6b7c8b43d23dd7de46c02ee2cfa5bd2a97f168
Author: Noel Grandin 
Date:   Wed Jan 25 08:35:37 2017 +0200

loplugin: unnecessary destructor sc

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

diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 1539ed3..0c6b3c7 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -52,7 +52,6 @@ private:
 
 public:
 ScActionColorChanger( const ScChangeTrack& rTrack );
-~ScActionColorChanger() {}
 voidUpdate( const ScChangeAction& rAction );
 ColorData   GetColor() const{ return nColor; }
 };
diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx
index 4e8c951..b36df3d 100644
--- a/sc/inc/columniterator.hxx
+++ b/sc/inc/columniterator.hxx
@@ -25,7 +25,6 @@ class ScColumnTextWidthIterator
 public:
 ScColumnTextWidthIterator(const ScColumnTextWidthIterator&) = delete;
 const ScColumnTextWidthIterator& operator=(const 
ScColumnTextWidthIterator&) = delete;
-~ScColumnTextWidthIterator() = default;
 ScColumnTextWidthIterator(ScColumn& rCol, SCROW nStartRow, SCROW nEndRow);
 
 /**
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index e3a19d0..27

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - cui/source external_deps.lst LICENSE_ALv2 NOTICE solenv/gbuild

[Damjan Jovanovic]

 LICENSE_ALv2  |2 +-
 NOTICE|2 +-
 cui/source/dialogs/about.cxx  |2 +-
 external_deps.lst |6 +++---
 solenv/gbuild/platform/freebsd.mk |8 ++--
 5 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 23578f63821e340dc1718dc1ed0d046d63efe523
Author: Damjan Jovanovic 
Date:   Wed Jan 25 04:02:55 2017 +

Fix a FreeBSD regression in the gbuild gb_CPUDEFS variable caused by

r1773166, where it was always set to POWERPC64 due to a swapped if-else.

This needs further work, on all platforms!

Patch by: me

diff --git a/solenv/gbuild/platform/freebsd.mk 
b/solenv/gbuild/platform/freebsd.mk
index d576df1..5c53e9e 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -68,14 +68,10 @@ gb_COMPILERDEFS := \
 
 ifeq ($(CPUNAME),X86_64)
 gb_CPUDEFS := -D$(CPUNAME)
-else
-gb_CPUDEFS := -DX86
-endif
-
-ifeq ($(CPUNAME),POWERPC64)
+else ifeq ($(CPUNAME),POWERPC64)
 gb_CPUDEFS := -D$(CPUNAME)
 else
-gb_CPUDEFS := -DPOWERPC64
+gb_CPUDEFS := -DX86
 endif
 
 gb_CFLAGS := \
commit 765f7daa65e8f8fa0fe54f23c16bbbea8e81880e
Author: Ariel Constenla-Haile 
Date:   Tue Jan 24 02:34:25 2017 +

i127295 - Update the Copyright year to 2017

diff --git a/LICENSE_ALv2 b/LICENSE_ALv2
index 729d018..6e6b456 100644
--- a/LICENSE_ALv2
+++ b/LICENSE_ALv2
@@ -187,7 +187,7 @@
   same "printed page" as the copyright notice for easier
   identification within third-party archives.
 
-   Copyright 2011, 2012, 2013, 2014, 2015, 2016 Apache Software Foundation
+   Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017 Apache Software 
Foundation
 
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index ab6cfe8..f9f89c7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,7 +1,7 @@
 $HeadURL$
 
 Apache OpenOffice (http://www.openoffice.org)
-Copyright 2011, 2016 The Apache Software Foundation
+Copyright 2011, 2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c002ded..ff944f6 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & 
rId ) :
 sbcopyright.appendAscii("Copyright ");
 sbcopyright.append((sal_Unicode)0x00a9);
 sbcopyright.appendAscii(" ");
-rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2016") );
+rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2017") );
 if (vendor.EqualsAscii("Apache Software Foundation")) {
 sbcopyright.append(sYear);
 sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
commit 5e052c8193a5e7c8b57f1b11e4e25e2fe11663d2
Author: Pedro Giffuni 
Date:   Mon Jan 23 22:55:59 2017 +

Update Hunspell to version 1.3.3 (minor)

This is the last version available on sourceforge, new versions are
available through github.

Main changes are:

2014-06-02: Hunspell 1.3.3 release:
- OpenDocument (ODF and Flat ODF) support (ODF needs unzip program)
- various bug fixes

diff --git a/external_deps.lst b/external_deps.lst
index 5a02e6a..6988e73 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -296,9 +296,9 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
-name = hunspell-1.3.2.tar.gz
-MD5 = 3121aaf3e13e5d88dfff13fb4a5f1ab8
-URL1 = 
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.2/hunspell-1.3.2.tar.gz/download
+name = hunspell-1.3.3.tar.gz
+MD5 = 4967da60b23413604c9e563beacc63b4
+URL1 = 
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.3/hunspell-1.3.3.tar.gz/download
 URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && ENABLE_JAVASCRIPT==YES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits