date:20170918

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

2017-09-18 Thread Stephan Bergmann

 svl/source/config/languageoptions.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 382c9174b38b96a7d890dd72ab00567a8b687e10
Author: Stephan Bergmann 
Date:   Tue Sep 19 08:33:07 2017 +0200

Clean up the code by using LOWORD

 documents:  "The low word contains a Language 
Identifier
for the input language and the high word contains a device handle to the
physical layout of the keyboard.

Change-Id: I0b35e7a0f2bf5570dcf57cffe59ed2e2db361d2e

diff --git a/svl/source/config/languageoptions.cxx 
b/svl/source/config/languageoptions.cxx
index bb256d9f70f3..abc2c7630fb3 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -239,7 +239,7 @@ bool 
SvtSystemLanguageOptions::isKeyboardLayoutTypeInstalled(sal_Int16 scriptTyp
 
 for(int i = 0; i < nLayouts; ++i)
 {
-LCID lang = 
MAKELCID((WORD)(reinterpret_cast(lpList[i]) & 0x), SORT_DEFAULT);
+LCID lang = MAKELCID(LOWORD(lpList[i]), SORT_DEFAULT);
 if (MsLangId::getScriptType(LanguageType(lang)) == scriptType)
 {
 isInstalled = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Stephan Bergmann

 comphelper/source/windows/windows_process.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6df0b51fb8141e11dec63b48ef98a40401f9c8e8
Author: Stephan Bergmann 
Date:   Tue Sep 19 08:30:34 2017 +0200

Put back one more #include

...like 74cd94a17b3922bdcd44ab6460232297fbf665d0 "Put back some #include 
(needed
for e.g. --disable-pch)" (this one having caused loplugin:unreffun with
clang-cl)

Change-Id: I1a888ca754365232663fed0b99535d91fded040a

diff --git a/comphelper/source/windows/windows_process.cxx 
b/comphelper/source/windows/windows_process.cxx
index e8fd4a01c8b8..c58a0d52d7f4 100644
--- a/comphelper/source/windows/windows_process.cxx
+++ b/comphelper/source/windows/windows_process.cxx
@@ -8,6 +8,8 @@
 #include 
 #include 
 
+#include 
+
 // Needed for CreateEnvironmentBlock
 #include 
 #pragma comment(lib, "userenv.lib")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Stephan Bergmann

 tools/source/datetime/ttime.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b4278534125b0d73695146df4ede32273e2afbfb
Author: Stephan Bergmann 
Date:   Tue Sep 19 08:29:38 2017 +0200

-Werror,-Wmissing-field-initializers (clang-cl)

Change-Id: I049c5569344ccf74726ec429efefdd9119406488

diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index d02cf20ac257..cf8108306e06 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -422,7 +422,7 @@ sal_uInt64 tools::Time::GetSystemTicks()
 #ifdef _WIN32
 static LARGE_INTEGER initPerformanceFrequency()
 {
-LARGE_INTEGER nTicksPerSecond = { 0 };
+LARGE_INTEGER nTicksPerSecond = { 0, 0 };
 if (!QueryPerformanceFrequency(&nTicksPerSecond))
 nTicksPerSecond.QuadPart = 0;
 return nTicksPerSecond;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Introduction to LibreOffice Document Project Team

2017-09-18 Thread koushik . sekhar

Hi Shinnok,

Thank you for the introductory guide. I have started with the setup of
libreOffice Development on windows platform. I will keep you updated on
the same and reach out to you if I face any issues.

Thank you.

Regards,
Koushik Sekhar


On Thu, September 14, 2017 1:37 am, Shinnok wrote:
> Hi Koushik,
>
>
> Thank you for introducing yourself to the list. Based on our
> communication so far here's an easy getting started guide for you.
>
> Getting involved overview:
> https://wiki.documentfoundation.org/Development/GetInvolved
>
>
> Instructions on how to setup a build as well as other useful starter info
> can be found on the Wiki: https://wiki.documentfoundation.org/Development
> 
>
>
> More specifically, for Windows you can follow:
> https://wiki.documentfoundation.org/Development/BuildingOnWindows
> 
>
>
> The next step would be to pick one of the many unassigned issues in our
> Bugzilla that have been tagged with easyHack, which is described here:
> https://wiki.documentfoundation.org/Development/EasyHacks
>
>
> Once you assigned an issue to yourself in Bugzilla and you have a
> workable patch for us you need to register on our Gerrit and submit it
> for review: https://wiki.documentfoundation.org/Development/gerrit
>
>
> Developer central page provides a bird eye view of the development tools
> and infrastucture around LibreOffice: http://devcentral.libreoffice.org/
>
>
> This is just a quick primer, let us know of your progress and if you get
> stuck, need help or anything in between please e-mail the dev list or hop
> on to irc at freenode.net on channel #libreoffice-dev.
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
> Regards,
> Shinnok
>
>
>
>> On Sep 13, 2017, at 11:24 PM, koushik.sek...@ssrlabs.com wrote:
>>
>>
>> Hi Everyone,
>>
>>
>> I am Koushik Sekhar, who recently joined SSRLabs as an Independent
>> Contractor. I would be working for LibreOffice Document project going
>> forward. Thank you for having me in the team and I hope to contribute as
>>  much as I can to the LibreOffice Document Foundation Project.
>>
>> Regards,
>> Koushik Sekhar
>>
>>
>>
>>
>
>


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

[Libreoffice-commits] core.git: solenv/gcc-wrappers

2017-09-18 Thread David Ostrovsky

 solenv/gcc-wrappers/wrapper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bef91f7e5f3121dced360d4b90a09c334f12e56e
Author: David Ostrovsky 
Date:   Tue Sep 19 01:20:04 2017 +0200

gpg4libre: have gcc-wrapper handle linking properly

Change-Id: I83305f504f7d492195f07f11f06d2c9855d92400
Reviewed-on: https://gerrit.libreoffice.org/42441
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 6e3fe1393fdb..800687ad65a6 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -142,7 +142,7 @@ string processccargs(vector rawargs) {
 else if(!(*i).compare(0,2,"-L")) {
 linkargs.append(" -LIBPATH:"+(*i).substr(2));
 }
-else if(!(*i).compare(0,2,"-l")) {
+else if(!(*i).compare(0,2,"-l") && (*i).compare(0,5,"-link")) {
 linkargs.append(" "+(*i).substr(2)+".lib");
 }
 else if(!(*i).compare(0,5,"-def:") || !(*i).compare(0,5,"/def:")) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Infra call on Tue, Sep 19 at 16:30 UTC

2017-09-18 Thread Guilhem Moulin

On Wed, 13 Sep 2017 at 23:20:36 +0200, Guilhem Moulin wrote:
> The next infra call will take place at `date -d 'Tue Sep 19 16:30:00 UTC 
> 2017'`
> (18:30:00 Berlin time).

Reminder: that's tomorrow!
 
> See https://pad.documentfoundation.org/p/infra for details; agenda TBA.

Here is what we currently have in the pad:  

  

  * Salt refactoring
+ G. didn't find time to review Brett's branch unfortunately, will try
  to make it happen before LibOCon
+ Refactoring of base/mail vs. tdf/postfix is blocking on rdm#2256 hence
  postponed to after the conference
  * LDAP/SSO
+ deployed LDAP-based auth on the wiki and silverstripe test instances
+ deployed per-service ACLs (groups) for fine-grained access control
+ deployed an internal access log to audit DIT modifications and auth
  attempts
  * Pootle migration
  * LibOCon preparation

-- 
Guilhem.


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

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

2017-09-18 Thread Bernhard Widl

 sw/inc/swabstdlg.hxx  |   18 +++---
 sw/source/ui/dialog/swdlgfact.cxx |   28 -
 sw/source/ui/dialog/swdlgfact.hxx |   18 +++---
 sw/source/ui/fldui/DropDownFieldDialog.cxx|   48 ++--
 sw/source/ui/fldui/inpdlg.cxx |   31 +-
 sw/source/uibase/docvw/edtwin.cxx |2 
 sw/source/uibase/inc/DropDownFieldDialog.hxx  |   15 +++--
 sw/source/uibase/inc/inpdlg.hxx   |   10 +++
 sw/source/uibase/inc/wrtsh.hxx|6 +-
 sw/source/uibase/shells/textfld.cxx   |2 
 sw/source/uibase/wrtsh/wrtsh2.cxx |   76 --
 sw/uiconfig/swriter/ui/dropdownfielddialog.ui |   27 +++--
 sw/uiconfig/swriter/ui/inputfielddialog.ui|   27 +++--
 13 files changed, 248 insertions(+), 60 deletions(-)

New commits:
commit 7d5245848c28f5786258476cd7aa2a4523645de3
Author: Bernhard Widl 
Date:   Fri Sep 15 17:39:48 2017 +0200

tdf#79877 revert to old behavior when clicking on input fields.

doubleclick on input field brings up old input fields dialog
that dialog now starts at current field and has previous/next navigation

Change-Id: Ie3eec38d62cbf8a8248acb4fd84731c078ebadd4
Reviewed-on: https://gerrit.libreoffice.org/42333
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index ba607870619d..c582500ac0b0 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -111,9 +111,11 @@ protected:
 virtual ~AbstractFieldInputDlg() override = default;
 public:
 //from class SalFrame
-virtual void SetWindowState( const OString & rStr ) = 0;
-virtual OString  GetWindowState() const = 0;
-virtual void EndDialog(sal_Int32 nResult) override = 0;
+virtual void  SetWindowState( const OString & rStr ) = 0;
+virtual OString   GetWindowState() const = 0;
+virtual void  EndDialog(sal_Int32 nResult) override = 0;
+virtual bool  PrevButtonPressed() const = 0;
+virtual bool  NextButtonPressed() const = 0;
 };
 
 class AbstractInsFootNoteDlg : public VclAbstractDialog
@@ -282,8 +284,10 @@ class AbstractDropDownFieldDialog : public 
VclAbstractDialog
 protected:
 virtual ~AbstractDropDownFieldDialog() override = default;
 public:
-virtual OString GetWindowState() const = 0; //this method inherit from 
SystemWindow
-virtual voidSetWindowState( const OString & rStr ) = 0; //this method 
inherit from SystemWindow
+virtual OString   GetWindowState() const = 0; //this method inherit 
from SystemWindow
+virtual void  SetWindowState( const OString & rStr ) = 0; //this 
method inherit from SystemWindow
+virtual bool  PrevButtonPressed() const = 0;
+virtual bool  NextButtonPressed() const = 0;
 };
 
 class AbstractSwLabDlg  : public SfxAbstractTabDialog
@@ -404,7 +408,7 @@ public:
 virtual VclPtr CreateSwFootNoteOptionDlg(vcl::Window 
*pParent, SwWrtShell &rSh) = 0;
 
 virtual VclPtr 
CreateDropDownFieldDialog(SwWrtShell &rSh,
-SwField* pField, bool bNextButton) = 0;
+SwField* pField, bool bPrevButton, bool bNextButton) = 0;
 virtual VclPtr CreateSwEnvDlg ( vcl::Window* 
pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool 
bInsert ) = 0;
 
 virtual VclPtr CreateSwLabDlg(const SfxItemSet& rSet,
@@ -463,7 +467,7 @@ public:
 SwGlossaryHdl* pGlosHdl,
 SwWrtShell *pWrtShell) = 0;
 virtual VclPtr
CreateFieldInputDlg(vcl::Window *pParent,
-SwWrtShell &rSh, SwField* pField, bool bNextButton) = 0;
+SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton) 
= 0;
 virtual VclPtr 
CreateInsFootNoteDlg(vcl::Window * pParent,
 SwWrtShell &rSh, bool bEd = false) = 0;
 virtual VclPtr  CreateTitlePageDlg ( 
vcl::Window * pParent ) = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 9d6f17de3971..12f2ce433673 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -239,6 +239,16 @@ void AbstractDropDownFieldDialog_Impl::SetWindowState( 
const OString& rStr )
 pDlg->SetWindowState(rStr);
 }
 
+bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
+{
+return pDlg->PrevButtonPressed();
+}
+
+bool AbstractDropDownFieldDialog_Impl::NextButtonPressed() const
+{
+return pDlg->NextButtonPressed();
+}
+
 void AbstractSwLabDlg_Impl::SetCurPageId( sal_uInt16 nId )
 {
 pDlg->SetCurPageId( nId );
@@ -411,6 +421,16 @@ void AbstractFieldInputDlg_Impl::EndDialog(sal_Int32 n)
 pDlg->EndDialog(n);
 }
 
+bool AbstractFieldInputDlg_Impl::PrevButtonPressed() const
+{
+return pDlg->PrevButtonPressed();
+}
+
+bool AbstractFieldInputDlg_Impl::

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

2017-09-18 Thread Ulrich Gemkow

 svtools/source/control/tabbar.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c686dc4f33c7461a28df95603d06591a3a0171cd
Author: Ulrich Gemkow 
Date:   Sun Sep 10 20:12:14 2017 +0200

tdf#43157 Replace DBG_ASSERT() with assert() in tabbar.cxx

Change-Id: I6a7cc500c973b09236d90a3bfb044407c58fc2ef
Reviewed-on: https://gerrit.libreoffice.org/42142
Reviewed-by: Teodor Mircea Ionita 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index ead6835e73c9..86b2f3587b80 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1610,10 +1610,9 @@ void TabBar::AddTabClick()
 void TabBar::InsertPage(sal_uInt16 nPageId, const OUString& rText,
 TabBarPageBits nBits, sal_uInt16 nPos)
 {
-DBG_ASSERT(nPageId, "TabBar::InsertPage(): PageId == 0");
-DBG_ASSERT(GetPagePos( nPageId ) == PAGE_NOT_FOUND,
-"TabBar::InsertPage(): PageId already exists");
-assert ((nBits <= TPB_DISPLAY_NAME_ALLFLAGS) && "TabBar::InsertPage(): 
Invalid flag set in in nBits");
+assert (nPageId && "TabBar::InsertPage(): PageId must not be 0");
+assert ((GetPagePos(nPageId) == PAGE_NOT_FOUND) && "TabBar::InsertPage(): 
Page already exists");
+assert ((nBits <= TPB_DISPLAY_NAME_ALLFLAGS) && "TabBar::InsertPage(): 
Invalid flag set in nBits");
 
 // create PageItem and insert in the item list
 ImplTabBarItem* pItem = new ImplTabBarItem( nPageId, rText, nBits );
___
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

2017-09-18 Thread Michael Stahl

 sw/source/core/doc/DocumentRedlineManager.cxx |   66 --
 sw/source/core/inc/DocumentRedlineManager.hxx |1 
 2 files changed, 31 insertions(+), 36 deletions(-)

New commits:
commit a562be54f3127f4e22a3a38e62db2b38d48499f3
Author: Michael Stahl 
Date:   Fri Sep 15 13:51:04 2017 +0200

ofz#3301 sw: DeleteAndJoin found yet another way to delete new redline

Not only can that happen in CompressRedlines(), it can also happen
in the SwComparePosition::Outside case when the DeleteRedline()
decides in particular circumstances to split up the inserted
new redline.

Arguably it's wrong to split up the new redline in this case;
not sure if that ever happens in a legitimate use case though.

Avoid this by removing the hack to temporarily insert the new redline
and instead create a temporary SwUnoCursor that will be corrected
on behalf of the new redline, while the new redline is parked on a
safe node.

This not only avoids the crash on this file but also makes the
"corrupted redline table" assertions go away.

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

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index f2d51192759d..c5da74836240 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -575,6 +576,32 @@ namespace
 }
 }
 }
+
+/// in case some text is deleted, ensure that the not-yet-inserted
+/// SwRangeRedline has its positions corrected not to point to deleted node
+class TemporaryRedlineUpdater
+{
+private:
+SwRangeRedline & m_rRedline;
+std::shared_ptr m_pCursor;
+public:
+TemporaryRedlineUpdater(SwDoc & rDoc, SwRangeRedline & rRedline)
+: m_rRedline(rRedline)
+, m_pCursor(rDoc.CreateUnoCursor(*rRedline.GetPoint(), false))
+{
+if (m_rRedline.HasMark())
+{
+m_pCursor->SetMark();
+*m_pCursor->GetMark() = *m_rRedline.GetMark();
+*m_rRedline.GetMark() = 
SwPosition(rDoc.GetNodes().GetEndOfContent());
+}
+*m_rRedline.GetPoint() = 
SwPosition(rDoc.GetNodes().GetEndOfContent());
+}
+~TemporaryRedlineUpdater()
+{
+static_cast(m_rRedline) = *m_pCursor;
+}
+};
 }
 
 namespace sw
@@ -1223,19 +1250,11 @@ bool DocumentRedlineManager::AppendRedline( 
SwRangeRedline* pNewRedl, bool bCall
 {
 mpRedlineTable->Remove( n );
 bDec = true;
-// We insert temporarily so that pNew is
-// also dealt with when moving the indices.
 if( bCallDelete )
 {
-::comphelper::FlagGuard 
g(m_isForbidCompressRedlines);
-mpRedlineTable->Insert( pNewRedl );
+TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
-if( !mpRedlineTable->Remove( pNewRedl ) )
-{
-assert(false); // can't happen
-pNewRedl = nullptr;
-}
-bCompress = true; // delayed compress
+n = 0;  // re-initialize
 }
 delete pRedl;
 }
@@ -1257,17 +1276,8 @@ bool DocumentRedlineManager::AppendRedline( 
SwRangeRedline* pNewRedl, bool bCall
 
 if( bCallDelete )
 {
-// We insert temporarily so that pNew is
-// also dealt with when moving the indices.
-::comphelper::FlagGuard 
g(m_isForbidCompressRedlines);
-mpRedlineTable->Insert( pNewRedl );
+TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
-if( !mpRedlineTable->Remove( pNewRedl ) )
-{
-assert(false); // can't happen

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

2017-09-18 Thread Michael Stahl

 sw/source/core/doc/DocumentRedlineManager.cxx |   69 +++---
 sw/source/core/inc/DocumentRedlineManager.hxx |1 
 2 files changed, 31 insertions(+), 39 deletions(-)

New commits:
commit aa67a58c114338e90c589e5916f94a77f89cd727
Author: Michael Stahl 
Date:   Fri Sep 15 13:51:04 2017 +0200

ofz#3301 sw: DeleteAndJoin found yet another way to delete new redline

Not only can that happen in CompressRedlines(), it can also happen
in the SwComparePosition::Outside case when the DeleteRedline()
decides in particular circumstances to split up the inserted
new redline.

Arguably it's wrong to split up the new redline in this case;
not sure if that ever happens in a legitimate use case though.

Avoid this by removing the hack to temporarily insert the new redline
and instead create a temporary SwUnoCursor that will be corrected
on behalf of the new redline, while the new redline is parked on a
safe node.

This not only avoids the crash on this file but also makes the
"corrupted redline table" assertions go away.

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

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 90cc40202ab8..de092e9b2a0c 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -575,6 +576,32 @@ namespace
 }
 }
 }
+
+/// in case some text is deleted, ensure that the not-yet-inserted
+/// SwRangeRedline has its positions corrected not to point to deleted node
+class TemporaryRedlineUpdater
+{
+private:
+SwRangeRedline & m_rRedline;
+std::shared_ptr m_pCursor;
+public:
+TemporaryRedlineUpdater(SwDoc & rDoc, SwRangeRedline & rRedline)
+: m_rRedline(rRedline)
+, m_pCursor(rDoc.CreateUnoCursor(*rRedline.GetPoint(), false))
+{
+if (m_rRedline.HasMark())
+{
+m_pCursor->SetMark();
+*m_pCursor->GetMark() = *m_rRedline.GetMark();
+*m_rRedline.GetMark() = 
SwPosition(rDoc.GetNodes().GetEndOfContent());
+}
+*m_rRedline.GetPoint() = 
SwPosition(rDoc.GetNodes().GetEndOfContent());
+}
+~TemporaryRedlineUpdater()
+{
+static_cast(m_rRedline) = *m_pCursor;
+}
+};
 }
 
 namespace sw
@@ -1223,20 +1250,11 @@ bool DocumentRedlineManager::AppendRedline( 
SwRangeRedline* pNewRedl, bool bCall
 {
 mpRedlineTable->Remove( n );
 bDec = true;
-// We insert temporarily so that pNew is
-// also dealt with when moving the indices.
 if( bCallDelete )
 {
-::comphelper::FlagGuard 
g(m_isForbidCompressRedlines);
-//Insert may delete pNewRedl, in which 
case it sets pNewRedl to nullptr
-mpRedlineTable->Insert( pNewRedl );
+TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
-if (pNewRedl && 
!mpRedlineTable->Remove(pNewRedl))
-{
-assert(false); // can't happen
-pNewRedl = nullptr;
-}
-bCompress = true; // delayed compress
+n = 0;  // re-initialize
 }
 delete pRedl;
 }
@@ -1258,18 +1276,8 @@ bool DocumentRedlineManager::AppendRedline( 
SwRangeRedline* pNewRedl, bool bCall
 
 if( bCallDelete )
 {
-// We insert temporarily so that pNew is
-// also dealt with when moving the indices.
-::comphelper::FlagGuard 
g(m_isForbidCompressRedlines);
-//Insert may delete pNewRedl, in which 
case it sets pNewRedl to nullptr
-mpRedlineTable->Insert( pNewRedl );
+TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentCo

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

2017-09-18 Thread Caolán McNamara

 sot/qa/cppunit/data/pass/tdf112399-1.compound |binary
 sot/source/sdstor/stgelem.cxx |   12 
 2 files changed, 12 insertions(+)

New commits:
commit fc5513f40acc56410651a147e4b03dc614ea6183
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 21:17:32 2017 +0100

tdf#112399 ignore size of unknown/unused ole2 entries

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

diff --git a/sot/qa/cppunit/data/fail/fdo41642-2.compound 
b/sot/qa/cppunit/data/pass/fdo41642-2.compound
similarity index 100%
rename from sot/qa/cppunit/data/fail/fdo41642-2.compound
rename to sot/qa/cppunit/data/pass/fdo41642-2.compound
diff --git a/sot/qa/cppunit/data/pass/tdf112399-1.compound 
b/sot/qa/cppunit/data/pass/tdf112399-1.compound
new file mode 100644
index ..d3628def0c01
Binary files /dev/null and b/sot/qa/cppunit/data/pass/tdf112399-1.compound 
differ
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 4e18d0e1b4d0..a178ff45f603 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -424,6 +424,18 @@ bool StgEntry::Load(const void* pFrom, sal_uInt32 
nBufSize, sal_uInt64 nUnderlyi
 //bad pageid
 return false;
 }
+if (m_cType == STG_EMPTY)
+{
+/*
+ tdf#112399 opens fine in MSOffice 2013 despite a massive m_nSize 
field
+
+ Free (unused) directory entries are marked with Object Type 0x0
+ (unknown or unallocated). The entire directory entry must consist 
of
+ all zeroes except for the child, right sibling, and left sibling
+ pointers, which must be initialized to NOSTREAM (0x).
+*/
+m_nSize = 0;
+}
 if (m_nSize < 0)
 {
 // the size makes no sense for the substorage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Gabor Kelemen

 officecfg/registry/data/org/openoffice/Office/Common.xcu   |6 --
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 --
 2 files changed, 16 deletions(-)

New commits:
commit e38d2f05cb16e981381434a940aa5c89e910cc78
Author: Gabor Kelemen 
Date:   Sun Aug 13 23:13:46 2017 +0200

Drop unused TemplateRepository config keys

Unused since 2016:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=77725bf4df6e9cf63469c1d7fea339575b5e

Change-Id: Iada86089666ad530318536b2c3d9a8e794de3e17
Reviewed-on: https://gerrit.libreoffice.org/41123
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 746553f17dd7..a3fb32d76b2b 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -433,12 +433,6 @@
 
   true
 
-
-  
-
-
-  
-
 
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 8b04f2a2400e..118700782343 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5524,16 +5524,6 @@
 
 true
   
-  
-
-  List of template repositories URLs bookmarked in the Templates 
dialog.
-
-  
-  
-
-  List of template repositories names bookmarked in the 
Templates dialog.
-
-  
   
 
   List of URLs of the places the user bookmarked in the file 
picker dialog.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Gabor Kelemen

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 
 1 file changed, 8 deletions(-)

New commits:
commit 3ffdccae3ba95752a4debc2c593558cae5658306
Author: Gabor Kelemen 
Date:   Mon Aug 14 00:12:15 2017 +0200

Drop unused IsSystemFont config property

Unused since 2014:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=324de04a408a77656a473cbfd2cc1ce77664b0c0
and

https://cgit.freedesktop.org/libreoffice/core/commit/?id=6c415f735bbf9201a18288e2ea16eacad4d635cd

Change-Id: I06f7a6510312307d3ab4a94c45e7f882630c8408
Reviewed-on: https://gerrit.libreoffice.org/41126
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 3becc3494ec6..8b04f2a2400e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6080,14 +6080,6 @@
 
 false
   
-  
-
-  Allows the user to change the UI font to the system
-  default.
-  Use system default user interface font
-
-true
-  
   
 
   Indicates whether the cursor is displayed in read-only
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Bjoern Michaelsen

 sw/source/core/unocore/unotext.cxx |   67 ++---
 1 file changed, 27 insertions(+), 40 deletions(-)

New commits:
commit e8f36a820c610efdc748d222609550563cd8f8e0
Author: Bjoern Michaelsen 
Date:   Mon Sep 18 00:57:54 2017 +0200

remove boilerplate, use C++11 (convertToTable)

- extract constants from loop
- warn on index mismatch

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

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index b0e0f051aed7..3298d00c7eea 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1970,10 +1970,18 @@ lcl_ApplyRowProperties(
 }
 }
 
+static sal_Int32 lcl_GetLeftPos(sal_Int32 nCell, TableColumnSeparators const& 
rRowSeparators)
+{
+if(!nCell)
+return 0;
+if (rRowSeparators.getLength() < nCell)
+return -1;
+return rRowSeparators[nCell - 1].Position;
+}
+
 static void
 lcl_ApplyCellProperties(
-const sal_Int32 nCell,
-TableColumnSeparators const& rRowSeparators,
+const sal_Int32 nLeftPos,
 const uno::Sequence< beans::PropertyValue >& rCellProperties,
 const uno::Reference< uno::XInterface >& xCell,
 std::vector & rMergedCells)
@@ -1990,17 +1998,6 @@ lcl_ApplyCellProperties(
 // add the cell to a queue of merged cells
 bool bMerge = false;
 rValue >>= bMerge;
-sal_Int32 nLeftPos = -1;
-if (!nCell)
-{
-nLeftPos = 0;
-}
-else if (rRowSeparators.getLength() >= nCell)
-{
-const text::TableColumnSeparator* pSeparators =
-rRowSeparators.getConstArray();
-nLeftPos = pSeparators[nCell - 1].Position;
-}
 if (bMerge)
 {
 // 'close' all the cell with the same left position
@@ -2168,53 +2165,43 @@ SwXText::convertToTable(
 try
 {
 //apply table properties
-const beans::PropertyValue* pTableProperties =
-rTableProperties.getConstArray();
-for (sal_Int32 nProperty = 0; nProperty < rTableProperties.getLength();
- ++nProperty)
+for(const auto& rTableProperty : rTableProperties)
 {
 try
 {
-xPrSet->setPropertyValue( pTableProperties[nProperty].Name,
-pTableProperties[nProperty].Value );
+xPrSet->setPropertyValue(rTableProperty.Name, 
rTableProperty.Value);
 }
 catch (const uno::Exception& e)
 {
 SAL_WARN( "sw.uno", "Exception when setting property: "
-+ pTableProperties[nProperty].Name + ". Message: " + 
e.Message );
++ rTableProperty.Name + ". Message: " + e.Message );
 }
 }
 
 //apply row properties
-const uno::Reference< table::XTableRows >  xRows = xRet->getRows();
-
-const beans::PropertyValues* pRowProperties =
-rRowProperties.getConstArray();
-for (sal_Int32 nRow = 0; nRow < xRows->getCount(); ++nRow)
-{
-if( nRow >= rRowProperties.getLength())
-{
-break;
-}
-lcl_ApplyRowProperties(pRowProperties[nRow],
-xRows->getByIndex(nRow), aRowSeparators[nRow]);
-}
+const auto xRows = xRet->getRows();
+const sal_Int32 nLast = std::min(xRows->getCount(), 
rRowProperties.getLength());
+SAL_WARN_IF(nLast != rRowProperties.getLength(), "sw.uno", "not enough 
rows for properties");
+for(sal_Int32 nCnt = 0; nCnt < nLast; ++nCnt)
+lcl_ApplyRowProperties(rRowProperties[nCnt], 
xRows->getByIndex(nCnt), aRowSeparators[nCnt]);
 
 uno::Reference const xCR(xRet, 
uno::UNO_QUERY_THROW);
 //apply cell properties
-for (sal_Int32 nRow = 0; nRow < rCellProperties.getLength(); ++nRow)
+sal_Int32 nRow = 0;
+for(const auto& rCellPropertiesForRow : rCellProperties)
 {
-const uno::Sequence< beans::PropertyValues > aCurrentRow =
-rCellProperties[nRow];
-sal_Int32 nCells = aCurrentRow.getLength();
-for (sal_Int32  nCell = 0; nCell < nCells; ++nCell)
+sal_Int32 nCell = 0;
+for(const auto& rCellProps : rCellPropertiesForRow)
 {
-lcl_ApplyCellProperties(nCell,
-aRowSeparators[nRow], aCurrentRow[nCell],
+lcl_ApplyCellProperties(lcl_GetLeftPos(nCell, 
aRowSeparators[nRow]),
+rCellProps,
 xCR->getCellByPosition(nCell, nRow),
 aMergedCells);
+++nCell;
 }
+++nRow;
 }
+

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

2017-09-18 Thread Bjoern Michaelsen

 sw/source/core/unocore/unotext.cxx |   38 +++--
 1 file changed, 12 insertions(+), 26 deletions(-)

New commits:
commit e6b7ad06c6c99ff9bc3f814cfe9a5d44714a4ac1
Author: Bjoern Michaelsen 
Date:   Sun Sep 17 23:13:39 2017 +0200

use some C++11 and check for incomplete merges (lcl_MergeCells)

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

diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 70d3b682deb9..b0e0f051aed7 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2070,35 +2070,21 @@ lcl_ApplyCellProperties(
 static void
 lcl_MergeCells(std::vector & rMergedCells)
 {
-if (rMergedCells.size())
+for(auto& aMergedCell : rMergedCells)
 {
-std::vector::iterator aMergedIter =
-rMergedCells.begin();
-while (aMergedIter != rMergedCells.end())
+// the first of the cells gets the number of cells set as RowSpan
+// the others get the inverted number of remaining merged cells
+// (3,-2,-1)
+sal_Int32 nCellCount = 
static_cast(aMergedCell.aCells.size());
+if(nCellCount<2)
 {
-sal_Int32 nCellCount =
-static_cast(aMergedIter->aCells.size());
-std::vector >::iterator
-aCellIter = aMergedIter->aCells.begin();
-bool bFirstCell = true;
-// the first of the cells gets the number of cells set as RowSpan
-// the others get the inverted number of remaining merged cells
-// (3,-2,-1)
-while (aCellIter != aMergedIter->aCells.end())
-{
-(*aCellIter)->setPropertyValue(
-UNO_NAME_ROW_SPAN,
-uno::makeAny(nCellCount));
-if (bFirstCell)
-{
-nCellCount *= -1;
-bFirstCell = false;
-}
-++nCellCount;
-++aCellIter;
-}
-++aMergedIter;
+SAL_WARN("sw.uno", "incomplete vertical cell merge");
+continue;
 }
+aMergedCell.aCells.front()->setPropertyValue(UNO_NAME_ROW_SPAN, 
uno::makeAny(nCellCount--));
+nCellCount*=-1;
+for(auto pxPSet = aMergedCell.aCells.begin()+1; nCellCount<0; 
++pxPSet, ++nCellCount)
+(*pxPSet)->setPropertyValue(UNO_NAME_ROW_SPAN, 
uno::makeAny(nCellCount));
 }
 }
 
___
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.3' - sw/inc sw/source

2017-09-18 Thread Szymon Kłos

 sw/inc/dbmgr.hxx|9 +
 sw/source/core/doc/docnew.cxx   |7 +++
 sw/source/uibase/dbui/dbmgr.cxx |   33 -
 3 files changed, 44 insertions(+), 5 deletions(-)

New commits:
commit e63edbb765169da8d4aca09adfff904891cebe98
Author: Szymon KÅos 
Date:   Sat Sep 16 17:01:08 2017 +0200

tdf#108572 remove connection also if not saved

Change-Id: Iddce37c3ad187f4a5572cb3cc2362535134c28e8
Reviewed-on: https://gerrit.libreoffice.org/42357
Tested-by: Jenkins 
Reviewed-by: Szymon KÅos 
(cherry picked from commit 29bd193146b40cf90bda5db04b136987f3c7c94d)
Reviewed-on: https://gerrit.libreoffice.org/42369
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b80f051a4d55..d32e1843f8f8 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -261,6 +261,12 @@ friend class SwConnectionDisposedListener_Impl;
 /// Store last registrations to revoke or commit
 static std::vector> 
m_aUncommitedRegistrations;
 
+/// Not used connections.
+std::vector m_aNotUsedConnections;
+
+/// Set connection as used.
+void SetAsUsed(const OUString& rName);
+
 /// The document that owns this manager.
 SwDoc* m_pDoc;
 
@@ -487,6 +493,9 @@ public:
 
 /// Accept not commited registrations
 void CommitLastRegistrations();
+
+/// Remove not used connections.
+void RevokeNotUsedConnections();
 };
 
 #endif
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index f665c032ccf1..d20203002e16 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -531,6 +531,13 @@ SwDoc::~SwDoc()
 mpDBManager->releaseRevokeListener();
 SwDBManager::RevokeDataSource(maDBData.sDataSource);
 }
+else if (!mpDBManager->getEmbeddedName().isEmpty())
+{
+// Remove the revoke listener here first, so that we don't remove the 
data source from the document.
+mpDBManager->releaseRevokeListener();
+// Remove connections which was committed but not used.
+mpDBManager->RevokeNotUsedConnections();
+}
 
 DELETEZ( mpDBManager );
 #endif
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index b959a5d7b5f5..838e0fa0888d 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2529,6 +2529,7 @@ SwDSParam*  SwDBManager::FindDSConnection(const OUString& 
rDataSource, bool bCre
 //prefer merge data if available
 if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource )
 {
+SetAsUsed(rDataSource);
  return pImpl->pMergeData;
 }
 SwDSParam* pFound = nullptr;
@@ -2536,6 +2537,7 @@ SwDSParam*  SwDBManager::FindDSConnection(const OUString& 
rDataSource, bool bCre
 {
 if(rDataSource == pParam->sDataSource)
 {
+SetAsUsed(rDataSource);
 pFound = pParam.get();
 break;
 }
@@ -2545,6 +2547,7 @@ SwDSParam*  SwDBManager::FindDSConnection(const OUString& 
rDataSource, bool bCre
 SwDBData aData;
 aData.sDataSource = rDataSource;
 pFound = new SwDSParam(aData);
+SetAsUsed(rDataSource);
 m_DataSourceParams.push_back(std::unique_ptr(pFound));
 try
 {
@@ -3240,12 +3243,32 @@ void SwDBManager::RevokeLastRegistrations()
 
 void SwDBManager::CommitLastRegistrations()
 {
-auto predicate = [this](const std::pair& x)
-{ return x.first == this->m_pDoc->GetDocShell(); };
+for (auto aIt = m_aUncommitedRegistrations.begin(); aIt != 
m_aUncommitedRegistrations.end();)
+{
+if (aIt->first == m_pDoc->GetDocShell())
+{
+m_aNotUsedConnections.push_back(aIt->second);
+aIt = m_aUncommitedRegistrations.erase(aIt);
+}
+else
+aIt++;
+}
+}
 
-m_aUncommitedRegistrations.erase(
-std::remove_if(m_aUncommitedRegistrations.begin(), 
m_aUncommitedRegistrations.end(), predicate),
-m_aUncommitedRegistrations.end());
+void SwDBManager::SetAsUsed(const OUString& rName)
+{
+auto aFound = std::find(m_aNotUsedConnections.begin(), 
m_aNotUsedConnections.end(), rName);
+if (aFound != m_aNotUsedConnections.end())
+m_aNotUsedConnections.erase(aFound);
+}
+
+void SwDBManager::RevokeNotUsedConnections()
+{
+for (auto aIt = m_aNotUsedConnections.begin(); aIt != 
m_aNotUsedConnections.end();)
+{
+RevokeDataSource(*aIt);
+aIt = m_aNotUsedConnections.erase(aIt);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 7 commits - include/oox oox/source sax/source sc/source solenv/gbuild starmath/source svtools/source vcl/source

2017-09-18 Thread Miklos Vajna

 include/oox/vml/vmlshapecontainer.hxx  |8 +++---
 include/oox/vml/vmlshapecontext.hxx|9 ---
 oox/source/vml/vmlshapecontainer.cxx   |4 +--
 oox/source/vml/vmlshapecontext.cxx |   30 +++--
 sax/source/expatwrap/xml2utf.cxx   |8 ++
 sc/source/ui/docshell/impex.cxx|   20 
 solenv/gbuild/platform/filter-showIncludes.awk |7 +
 starmath/source/smdetect.cxx   |2 -
 svtools/source/svrtf/svparser.cxx  |3 +-
 vcl/source/gdi/jobset.cxx  |   22 --
 10 files changed, 77 insertions(+), 36 deletions(-)

New commits:
commit 60d15ebbc75c224d016316c7a1a6acf93804d359
Author: Miklos Vajna 
Date:   Wed Jul 26 15:50:09 2017 +0200

gbuild: strip away unexpected CR char at the end of Windows filenames

As reported at e.g.

,
sometimes MSVC (seen with 2013 on libreoffice-5-2, but there is no
indication that 2015 on master would be different) emits CR characters
at the end of filenames, resulting in unnecessary rebuilds at per-module
builds, and actually to an infinite loop when doing toplevel make.

Given that CR characters are unexpected in any filenames, it should be
safe to just strip those away unconditionally.

Change-Id: I3d56670b4d930a32489f889085711bfd436de82a
Reviewed-on: https://gerrit.libreoffice.org/40452
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit e9b9a456221b4b0660f90efa1ee092ea00c2c728)

diff --git a/solenv/gbuild/platform/filter-showIncludes.awk 
b/solenv/gbuild/platform/filter-showIncludes.awk
index 6ec13e2fdb4c..3b19f34dc786 100755
--- a/solenv/gbuild/platform/filter-showIncludes.awk
+++ b/solenv/gbuild/platform/filter-showIncludes.awk
@@ -45,6 +45,13 @@ BEGIN {
 if (index($0, showincludes_prefix) == 1) {
 $0 = substr($0, length(showincludes_prefix) + 1)
 sub(/^ */, "")
+
+# The output from MSVC may contain a carriage return character at the
+# end of filenames, in which case the translation unit will depend on a
+# non-existing header, resulting in constant rebuild of all files,
+# prevent that.
+sub(/
/, "")
+
 gsub(/\\/, "/")
 gsub(/ /, "\\ ")
 if ($0 ~ whitelist) { # filter out system headers
commit 1cfbe83729e8db88b7e20b383f3ff2de3581a2e0
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 17 17:38:39 2017 +0100

detect corrupted job setup

Change-Id: I0d3b4850c3d4c015a0a7e5d36d87113a749c7e0f
Reviewed-on: https://gerrit.libreoffice.org/42385
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 1eb3822d74f535f75aa336b27568ee8a6084c4dd)

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index f80e246a5c68..31ee4f08dca5 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -239,7 +239,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 
 sal_uInt16 nSystem = 0;
 rIStream.ReadUInt16( nSystem );
-const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
 if (nRead > rIStream.remainingSize())
 {
 SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
@@ -248,7 +248,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 sal_uInt64 const nFirstPos = rIStream.Tell();
 std::unique_ptr pTempBuf(new char[nRead]);
-rIStream.ReadBytes(pTempBuf.get(), nRead);
+nRead = rIStream.ReadBytes(pTempBuf.get(), nRead);
 if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = 
reinterpret_cast(pTempBuf.get());
@@ -278,11 +278,19 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 rJobData.SetPaperHeight( (long)SVBT32ToUInt32( 
pOldJobData->nPaperHeight ) );
 if ( rJobData.GetDriverDataLen() )
 {
-const sal_uInt8* pDriverData = 
reinterpret_cast(pOldJobData) + nOldJobDataSize;
-sal_uInt8* pNewDriverData = static_cast(
-rtl_allocateMemory( rJobData.GetDriverDataLen() ));
-memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
-rJobData.SetDriverData( pNewDriverData );
+const char* pDriverData = reinterpret_cast(pOldJobData) + nOldJobDataSize;
+const char* pDriverDataEnd = pDriverData + 
rJobData.GetDriverDataLen();
+if (pDriverDataEnd > pTempBuf.get() + nRead)
+{
+SAL_WARN("vcl", "corrupted job setup");
+}
+

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

2017-09-18 Thread Caolán McNamara

 sax/source/fastparser/fastparser.cxx  |9 
 sw/inc/iodetect.hxx   |2 
 sw/qa/extras/uiwriter/data/threadedException.fodt |  530 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   13 
 4 files changed, 553 insertions(+), 1 deletion(-)

New commits:
commit 5e381ffbe7069a454dc807113ab4058fad005c55
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 10:47:25 2017 +0100

allow events to accumulate past limit if an exception is pending

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

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 59dd995ce0f5..5281ca14920e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -550,6 +550,13 @@ Event& Entity::getEvent( CallbackType aType )
 return maSharedEvent;
 
 EventList& rEventList = getEventList();
+if (mnProducedEventsSize == rEventList.maEvents.size())
+{
+SAL_WARN_IF(!maSavedException.hasValue(), "sax",
+"Event vector should only exceed " << mnEventListSize <<
+" temporarily while an exception is pending");
+rEventList.maEvents.resize(mnProducedEventsSize + 1);
+}
 Event& rEvent = rEventList.maEvents[mnProducedEventsSize++];
 rEvent.maType = aType;
 return rEvent;
@@ -927,7 +934,7 @@ void FastSaxParserImpl::produce( bool bForceFlush )
 {
 Entity& rEntity = getEntity();
 if (bForceFlush ||
-rEntity.mnProducedEventsSize == Entity::mnEventListSize)
+rEntity.mnProducedEventsSize >= Entity::mnEventListSize)
 {
 osl::ResettableMutexGuard aGuard(rEntity.maEventProtector);
 
diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx
index df3d4aa64a04..a92ad13d3221 100644
--- a/sw/inc/iodetect.hxx
+++ b/sw/inc/iodetect.hxx
@@ -103,6 +103,8 @@ public:
 static const OUString GetSubStorageName( const SfxFilter& rFltr );
 };
 
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream 
&rStream);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/uiwriter/data/threadedException.fodt 
b/sw/qa/extras/uiwriter/data/threadedException.fodt
new file mode 100644
index ..0c0312d2a464
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/threadedException.fodt
@@ -0,0 +1,530 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  2014-10-12T18:41:05.34
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  PT5M19S
+  
+  
+  
+  
+  3
+  
+  
+  
+  
+  LibreOfficeDev/4.4.0.0.alpha0$Windows_x86 
LibreOffice_project/86a3fe47a66950e26d23d7d7f2680fa7d4fb0839
+  
+  
+  
+  
+  writerInfo
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  Regina 
Henschel2014-10-12T18:46:53.23800Regina
 Henschel
+ 
+  
+   4403
+   0
+   36747
+   15475
+   true
+   false
+   
+
+ view2
+ 14095
+ 8774
+ 0
+ 4403
+ 36745
+ 19876
+ 0
+ 0
+ false
+ 100
+ false

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

2017-09-18 Thread Caolán McNamara

 sc/source/ui/docshell/impex.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 13e0a30a00fb5c5bc3873a2422dea080236361af
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 15:40:16 2017 +0100

ofz#3412 SYLK import: check ;X;Y;C;R col/row validity early

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

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 62b6663d50bf..1496e66deffd 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1893,9 +1893,19 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 case 'X':
 nCol = static_cast(OUString(p).toInt32()) + 
nStartCol - 1;
+if (nCol < 0 || MAXCOL < nCol)
+{
+SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;X invalid nCol=" << nCol);
+nCol = std::max( 0, std::min( 
nCol, MAXCOL));
+}
 break;
 case 'Y':
 nRow = OUString(p).toInt32() + nStartRow - 1;
+if (nRow < 0 || MAXROW < nRow)
+{
+SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;Y invalid nRow=" << nRow);
+nRow = std::max( 0, std::min( 
nRow, MAXROW));
+}
 break;
 case 'P' :
 if ( bData )
___
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

2017-09-18 Thread Caolán McNamara

 sc/source/ui/docshell/impex.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 51854f5432de42bcc1154469edb5395328870613
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 15:40:16 2017 +0100

ofz#3412 SYLK import: check ;X;Y;C;R col/row validity early

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

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 7aa39d385a9c..a65f985541e6 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1917,9 +1917,19 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 case 'X':
 nCol = static_cast(OUString(p).toInt32()) + 
nStartCol - 1;
+if (nCol < 0 || MAXCOL < nCol)
+{
+SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;X invalid nCol=" << nCol);
+nCol = std::max( 0, std::min( 
nCol, MAXCOL));
+}
 break;
 case 'Y':
 nRow = OUString(p).toInt32() + nStartRow - 1;
+if (nRow < 0 || MAXROW < nRow)
+{
+SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;Y invalid nRow=" << nRow);
+nRow = std::max( 0, std::min( 
nRow, MAXROW));
+}
 break;
 case 'P' :
 if ( bData )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/boost solenv/flatpak-manifest.in

2017-09-18 Thread Stephan Bergmann

 download.lst   |4 ++--
 external/boost/UnpackedTarball_boost.mk|6 --
 external/boost/boost.type_index.Wundef.warnings.patch  |   12 
 external/boost/boost_1_60_0.undef.warning.patch|   13 ++---
 external/boost/boost_1_63_0.msvs2017.3.warning.patch.1 |   14 --
 external/boost/clang-cl.patch.0|   11 ---
 solenv/flatpak-manifest.in |6 +++---
 7 files changed, 11 insertions(+), 55 deletions(-)

New commits:
commit 9d837f19d1bf4cfbdee528e027f5b72d9b1da73d
Author: Stephan Bergmann 
Date:   Mon Sep 18 17:00:55 2017 +0200

Upgrade to Boost 1.65.1


....
One reason to upgrade is that with 1.63 CppunitTest_tools_test started to 
fail
with -fsanitize=signed-integer-overflow after
331e2e5ed3bf4e0b2c1fab3b7bca836170317827 "long->sal_Int32 in Fraction",

> workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:300:5: 
runtime error: negation of -2147483648 cannot be represented in type 'int'; 
cast to an unsigned type to negate this value to itself
> #0 0x7f0f99bea71b in 
boost::integer::detail::gcd_optimal_evaluator::operator()(int, int) const 
workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:300:5
> #1 0x7f0f99bea52a in int boost::integer::detail::gcd_optimal(int 
const&, int const&) 
workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:372:16
> #2 0x7f0f99be7d70 in int boost::integer::gcd(int const&, int 
const&) workdir/UnpackedTarball/boost/boost/integer/common_factor_rt.hpp:435:12
> #3 0x7f0f99be7620 in boost::rational::normalize() 
workdir/UnpackedTarball/boost/boost/rational.hpp:559:17
> #4 0x7f0f99bdff29 in rational_FromDouble(double) 
tools/source/generic/fract.cxx:449:12
> #5 0x7f0f99bdf8b4 in Fraction::Fraction(double) 
tools/source/generic/fract.cxx:93:25
> #6 0x7f0f9a1bb987 in tools::FractionTest::testMinLongDouble() 
tools/qa/cppunit/test_fract.cxx:79:18
> #7 0x7f0f9a1bddd2 in void std::_Bind (tools::FractionTest*)>::__call(std::tuple<>&&, std::_Index_tuple<0ul>) 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:933:11
> #8 0x7f0f9a1bdbe9 in void std::_Bind (tools::FractionTest*)>::operator()<, void>() 
/usr/lib/gcc/x86_64-redhat-linux/6.4.1/../../../../include/c++/6.4.1/functional:991:17
> #9 0x7f0fa5eb53b0 in CppUnit::TestCaseMethodFunctor::operator()() 
const workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:32:5
> #10 0x7f0fa5e1bd1b in 
CppUnit::DefaultProtector::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/DefaultProtector.cpp:15:12
> #11 0x7f0fa5e8653d in 
CppUnit::ProtectorChain::ProtectFunctor::operator()() const 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:20:25
> #12 0x7f0fa5e7fb7c in 
CppUnit::ProtectorChain::protect(CppUnit::Functor const&, 
CppUnit::ProtectorContext const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/ProtectorChain.cpp:86:18
> #13 0x7f0fa5f17fe0 in CppUnit::TestResult::protect(CppUnit::Functor 
const&, CppUnit::Test*, std::__cxx11::basic_string, std::allocator > const&) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:182:28
> #14 0x7f0fa5eb398c in CppUnit::TestCase::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestCase.cpp:91:13
> #15 0x7f0fa5eb7887 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
> #16 0x7f0fa5eb6a78 in 
CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
> #17 0x7f0fa5eb7887 in 
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:64:30
> #18 0x7f0fa5eb6a78 in 
CppUnit::TestComposite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestComposite.cpp:23:3
> #19 0x7f0fa5f46655 in 
CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:47:27
> #20 0x7f0fa5f16a66 in CppUnit::TestResult::runTest(CppUnit::Test*) 
workdir/UnpackedTarball/cppunit/src/cppunit/TestResult.cpp:149:9
> #21 0x7f0fa5f475c6 in CppUnit::TestRunner::run(CppUnit::TestResult&, 
std::__cxx11::basic_string, std::allocator > 
const&) workdir/UnpackedTarball/cppunit/src/cppunit/TestRunner.cpp:96:14
> #22 0x534a01 in (anonymous namespace)::ProtectedFixtureFunctor::run() 
const sal/cppunittester/cppunittester.cxx:316:20
> #23 0x532ac4 in sal_main() sal/cppunittester/cppunittester.cxx:466:20
> #24 0x5324f2 in main sal/cppu

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

2017-09-18 Thread Caolán McNamara

 include/sfx2/objsh.hxx   |1 +
 sfx2/source/doc/objmisc.cxx  |5 +
 sfx2/source/doc/sfxbasemodel.cxx |4 ++--
 sw/source/filter/xml/xmlimp.cxx  |4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit bdd797267b1e9e664b64e1c1525d1dde520a7063
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 15:39:31 2017 +0100

make fuzzer work

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

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index bc33bb1dd33d..b514989055bc 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -460,6 +460,7 @@ public:
 virtual voidSetFormatSpecificCompatibilityOptions( const 
OUString& /*rFilterTypeName*/ ) { /* Do not do anything here; Derived classes 
must overload to do actual work */ };
 
 voidTemplateDisconnectionAfterLoad();
+voidSetLoading(SfxLoadedFlags nFlags);
 boolIsLoading() const;
 boolIsLoadingFinished() const;
 voidSetAutoLoad( const INetURLObject&, sal_uInt32 
nTime, bool bReload );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6b7f5a89cc09..d0cce800325e 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1002,6 +1002,11 @@ void SfxObjectShell::SetAutoLoad(
 }
 }
 
+void SfxObjectShell::SetLoading(SfxLoadedFlags nFlags)
+{
+pImpl->nLoadedFlags = nFlags;
+}
+
 bool SfxObjectShell::IsLoadingFinished() const
 {
 return ( pImpl->nLoadedFlags == SfxLoadedFlags::ALL );
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 88d7e866d335..2e48c03e90f4 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2248,7 +2248,7 @@ Reference< script::XStorageBasedLibraryContainer > 
SAL_CALL SfxBaseModel::getBas
 
 Reference< script::XStorageBasedLibraryContainer > xBasicLibraries;
 if ( m_pData->m_pObjectShell.is() )
-xBasicLibraries.set( m_pData->m_pObjectShell->GetBasicContainer(), 
UNO_QUERY_THROW );
+xBasicLibraries.set(m_pData->m_pObjectShell->GetBasicContainer(), 
UNO_QUERY);
 return xBasicLibraries;
 }
 
@@ -2258,7 +2258,7 @@ Reference< script::XStorageBasedLibraryContainer > 
SAL_CALL SfxBaseModel::getDia
 
 Reference< script::XStorageBasedLibraryContainer > xDialogLibraries;
 if ( m_pData->m_pObjectShell.is() )
-xDialogLibraries.set( m_pData->m_pObjectShell->GetDialogContainer(), 
UNO_QUERY_THROW );
+xDialogLibraries.set(m_pData->m_pObjectShell->GetDialogContainer(), 
UNO_QUERY);
 return xDialogLibraries;
 }
 
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 4ea3cebeef1e..fba57d39370a 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1588,9 +1588,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL 
TestImportFODT(SvStream &rStream)
 //by the xml filter and during the init, while its considered 
uninitialized,
 //setting a property will inform the document its modified, which attempts
 //to update the properties, which throws cause the properties are 
uninitialized
-//xDocSh->SetLoading(SfxLoadedFlags::NONE);
+xDocSh->SetLoading(SfxLoadedFlags::NONE);
 bool ret = xFilter->filter(aArgs);
-//xDocSh->SetLoading(SfxLoadedFlags::ALL);
+xDocSh->SetLoading(SfxLoadedFlags::ALL);
 
 return ret;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Report for 09/18/2017

2017-09-18 Thread namitha . ninan

Hi Shinnok

Thank you for the suggestion on the easy hack. I have registered with
bugzilla and have joined the #libreoffice-dev channel. I am working on the
easy hack for 'add support for user icon themes via extension manager' and
will hopefully be done soon.

Thank You
Namitha

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

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

2017-09-18 Thread Pranav Kant

 loleaflet/src/core/Socket.js |8 
 loleaflet/src/map/Map.js |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit fcffb01725c10fe0294fd669a8c16948a93f7e01
Author: Pranav Kant 
Date:   Mon Sep 18 21:35:34 2017 +0530

Don't forget reconnecting the socket in these cases

This regressed with 7c1e1120c63661d84a5696c5b10a961477228e19

Calling .initialize() on socket object is not enough anymore after above
mentioned commit; it doesn't re-establish the socket connection as
was the intent earlier in following cases.

Change-Id: Icd0a87a875eb275ed3c914474cdc502b460e2d16
Reviewed-on: https://gerrit.libreoffice.org/42431
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 155494e2..c0929ffd 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -91,7 +91,7 @@ L.Socket = L.Class.extend({
 
var socketState = this.socket.readyState;
if (socketState === 2 || socketState === 3) {
-   this.initialize(this._map);
+   this._map.loadDocument();
}
 
if (socketState === 1) {
@@ -297,7 +297,7 @@ L.Socket = L.Class.extend({
}
 
try {
-   socket.initialize(map);
+   map.loadDocument(map);
} catch (error) {
}
}, timeoutMs);
@@ -514,10 +514,10 @@ L.Socket = L.Class.extend({
callback: L.bind(function(data) {
if (data) {
this._map._docPassword 
= data.password;
-   
this.initialize(this._map);
+   
this._map.loadDocument();
} else if (passwordType === 
'to-modify') {
this._map._docPassword 
= '';
-   
this.initialize(this._map);
+   
this._map.loadDocument();
} else {
this._map.hideBusy();
}
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 25eeae39..79856073 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -845,7 +845,7 @@ L.Map = L.Evented.extend({
return vex.close(id);
}
} else {
-   this._socket.initialize(this);
+   this.loadDocument();
}
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libjpeg-turbo

2017-09-18 Thread Michael Stahl

 external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5e8904920d4189819836f7abc002898322bb061
Author: Michael Stahl 
Date:   Mon Sep 18 12:56:24 2017 +0200

libjpeg-turbo: fix 32-bit Linux build

If invoked with --build=x86_64-unknown-linux-gnu, its configure will use
the same for the host platform, so pass --host too.

Change-Id: I4548c48db1811f31c7c78b2c0c74c1abb79784ba

diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk 
b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
index 3175c433b0bf..a86b474e719e 100644
--- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk
@@ -26,7 +26,7 @@ $(call 
gb_ExternalProject_get_state_target,libjpeg-turbo,configure) :
$(call gb_ExternalProject_run,configure,\
MAKE=$(MAKE) ./configure \
--build=$(if $(filter WNT,$(OS)),$(if $(filter 
INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \
-   $(if $(CROSS_COMPILING),--host=$(HOST_PLATFORM)) \
+   --host=$(if $(filter WNT,$(OS)),$(if $(filter 
INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(HOST_PLATFORM)) \
--with-pic \
--enable-static \
--disable-shared \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

2017-09-18 Thread Markus Mohrhard

On Mon, Sep 18, 2017 at 7:44 PM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

>
>
> On Mon, Sep 18, 2017 at 6:10 PM, Michael Meeks <
> michael.me...@collabora.com> wrote:
>
>> Hi Markus,
>>
>> On 18/09/17 16:26, Markus Mohrhard wrote:
>> > * Crash Reporter (Xisco)
>> > + http://crashreport.libreoffice.org/stats/?days=128
>> ...
>> > I already spent more than a day looking into that issue. It is not a
>> > problem in LibreOffice or our tooling. Merged libraries generarted with
>> > MSVC 2015 seem to store pdb info differently and DIA (the MS API that
>> > breakpad uses to access pdb info) is not able to extract any useful
>> > information. The uploaded symbol information don't contain anything
>> > useful so that breakpad is not able to generate useful backtraces for
>> > the merged library.
>>
>> Oh - interesting. So - did I understand right from the above that
>> the
>> problem is in the client-side up-load of the stack / symbol information ?
>>
>
> Yes. The problem is already during the collection of the symbol
> information after the build as part of make symbols. [1] and [2] show two
> mergedlo.dll symbol files that show that a significant part is already
> missing. As a result there is no way to recover the stacktrace after a
> crash happens.
>
>
>> I'm curious what Mozilla are doing here since they default to
>> VS2015 -
>> and also have some "put everything in one big DLL" approach.
>>
>
> I have not looked at that. I checked if a newer breakpad version might
> help but there was no solution. Additionally I had a test if the
> incremental linking flag that we use would be the problem but that was also
> not helping. The next step would be to debug the dump_syms executable from
> breakpad and try to understand what is going wrong.
>
> Regards,
> Markus
>

[1] http://dev-www.libreoffice.org/tmp/msvc2013_mergedlo.zip
[2] http://dev-www.libreoffice.org/tmp/msvc2015_mergedlo.zip
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] minutes of ESC call ...

2017-09-18 Thread Markus Mohrhard

On Mon, Sep 18, 2017 at 6:10 PM, Michael Meeks 
wrote:

> Hi Markus,
>
> On 18/09/17 16:26, Markus Mohrhard wrote:
> > * Crash Reporter (Xisco)
> > + http://crashreport.libreoffice.org/stats/?days=128
> ...
> > I already spent more than a day looking into that issue. It is not a
> > problem in LibreOffice or our tooling. Merged libraries generarted with
> > MSVC 2015 seem to store pdb info differently and DIA (the MS API that
> > breakpad uses to access pdb info) is not able to extract any useful
> > information. The uploaded symbol information don't contain anything
> > useful so that breakpad is not able to generate useful backtraces for
> > the merged library.
>
> Oh - interesting. So - did I understand right from the above that
> the
> problem is in the client-side up-load of the stack / symbol information ?
>

Yes. The problem is already during the collection of the symbol information
after the build as part of make symbols. [1] and [2] show two mergedlo.dll
symbol files that show that a significant part is already missing. As a
result there is no way to recover the stacktrace after a crash happens.

> I'm curious what Mozilla are doing here since they default to
> VS2015 -
> and also have some "put everything in one big DLL" approach.
>

I have not looked at that. I checked if a newer breakpad version might help
but there was no solution. Additionally I had a test if the incremental
linking flag that we use would be the problem but that was also not
helping. The next step would be to debug the dump_syms executable from
breakpad and try to understand what is going wrong.

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

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

2017-09-18 Thread Pranav Kant

 wsd/DocumentBroker.cpp |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 7b4f734b32afc40efb1ecfa9db1a55b08541e46b
Author: Pranav Kant 
Date:   Mon Sep 18 23:00:19 2017 +0530

Broadcast closing documents in same thread

... instead of handing it over the Document broker polling thread which
can lead to race conditions, and hence not giving desired behavior when
document is changed externally.

Change-Id: Ib0821d4ae931c357bc4d4c526865eefc090ddc23

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 9154abab..91d61c57 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -540,16 +540,12 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
  << "Actual: " << fileInfo._modifiedTime << Log::end;
 
 _documentChangedInStorage = true;
+std::string message = "close: documentconflict";
 if (_isModified)
-{
-const std::string errorMsg = "error: cmd=storage 
kind=documentconflict";
-session->sendTextFrame(errorMsg);
-broadcastMessage(errorMsg);
-}
-else
-{
-closeDocument("documentconflict");
-}
+message = "error: cmd=storage kind=documentconflict";
+
+session->sendTextFrame(message);
+broadcastMessage(message);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source basic/qa bridges/source chart2/source cli_ure/source connectivity/source dbaccess/win32 desktop/source dtrans/source embeddedobj/source embeddedobj/test

2017-09-18 Thread Mike Kaganski

 avmedia/source/vlc/wrapper/SymbolLoader.hxx|3 +++
 basic/qa/cppunit/test_vba.cxx  |3 +++
 bridges/source/cpp_uno/msvc_win32_intel/dllinit.cxx|3 +++
 bridges/source/cpp_uno/msvc_win32_intel/msci.hxx   |3 +++
 chart2/source/view/charttypes/GL3DBarChart.cxx |3 +++
 cli_ure/source/native/native_bootstrap.cxx |3 +++
 cli_ure/source/uno_bridge/cli_bridge.cxx   |3 +++
 cli_ure/source/uno_bridge/cli_data.cxx |4 
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |3 +++
 dbaccess/win32/source/odbcconfig/odbcconfig.cxx|3 +++
 desktop/source/app/cmdlinehelp.cxx |3 +++
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |3 +++
 desktop/source/deployment/misc/lockfile.cxx|3 +++
 dtrans/source/win32/clipb/WinClipbImpl.cxx |3 +++
 dtrans/source/win32/clipb/WinClipbImpl.hxx |3 +++
 dtrans/source/win32/dtobj/DTransHelper.hxx |4 
 dtrans/source/win32/dtobj/DataFmtTransl.cxx|3 +++
 dtrans/source/win32/dtobj/DataFmtTransl.hxx|4 
 dtrans/source/win32/dtobj/Fetc.hxx |4 
 dtrans/source/win32/dtobj/FetcList.hxx |3 +++
 dtrans/source/win32/dtobj/FmtFilter.hxx|4 
 dtrans/source/win32/dtobj/XNotifyingDataObject.hxx |5 -
 dtrans/source/win32/dtobj/XTDataObject.cxx |3 +++
 dtrans/source/win32/dtobj/XTDataObject.hxx |3 +++
 dtrans/source/win32/ftransl/ftransl.hxx|8 
 dtrans/source/win32/misc/ImplHelper.cxx|3 +++
 dtrans/source/win32/misc/ImplHelper.hxx|4 
 embeddedobj/source/msole/platform.h|4 
 embeddedobj/test/Container1/nativelib/nativeview.c |3 +++
 embedserv/source/embed/docholder.cxx   |6 +-
 embedserv/source/inc/syswinwrapper.hxx |3 +++
 embedserv/source/inprocserv/advisesink.hxx |4 
 embedserv/source/inprocserv/inprocembobj.h |3 +++
 extensions/test/ole/OleConverterVar1/convTest.cxx  |3 +++
 extensions/test/ole/cpnt/cpnt.cxx  |3 +++
 extensions/test/ole/cppToUno/testcppuno.cxx|3 +++
 fpicker/source/win32/filepicker/FilterContainer.cxx|3 +++
 fpicker/source/win32/filepicker/afxres.h   |3 +++
 fpicker/source/win32/filepicker/workbench/Test_fps.cxx |3 +++
 fpicker/source/win32/folderpicker/workbench/Test_fops.cxx  |3 +++
 fpicker/source/win32/misc/WinImplHelper.hxx|3 +++
 include/LibreOfficeKit/LibreOfficeKitInit.h|3 +++
 include/comphelper/windowsStart.hxx|3 +++
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx|3 +++
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |3 +++
 jvmfwk/source/fwkutil.cxx  |3 +++
 odk/source/unoapploader/win/unoapploader.c |3 +++
 odk/source/unowinreg/win/unowinreg.cxx |3 +++
 sal/cppunittester/cppunittester.cxx|3 +++
 sal/osl/w32/file_url.hxx   |4 +++-
 sal/qa/osl/file/osl_File.cxx   |3 +++
 sal/qa/osl/process/osl_Thread.cxx  |3 +++
 sal/qa/osl/process/osl_process.cxx |3 +++
 sal/qa/osl/security/osl_Security.cxx   |3 +++
 sal/qa/rtl/doublelock/rtl_doublelocking.cxx|3 +++
 sal/qa/rtl/uuid/rtl_Uuid.cxx   |3 +++
 shell/qa/zip/ziptest.cxx   |3 +++
 testtools/source/performance/ubtest.cxx|3 +++
 58 files changed, 182 insertions(+), 11 deletions(-)

New commits:
commit aaa26a58ba0f14eab652e0ba7f8d8e66fa479582
Author: Mike Kaganski 
Date:   Mon Sep 18 17:34:28 2017 +0300

Some more WIN32_LEAN_AND_MEAN

Change-Id: Iadb0ebb66809c192fb817b8c7cf2f8cdb4d0b874
Reviewed-on: https://gerrit.libreoffice.org/42419
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx 
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index b26afe376615..a4e941f60afe 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -10,6 +10,9 @@
 #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
 #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_SYMBOLLOADER_HXX
 #if defined(_WIN32)
+#if !defined WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#end

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

2017-09-18 Thread Tamás Zolnai

 chart2/qa/extras/chart2dump/chart2dump.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3c1f44c91091205512098bb4f1d56333c20a1f8b
Author: TamÃ¡s Zolnai 
Date:   Mon Sep 18 16:47:03 2017 +0200

Fix chart dump test recent failures on MAC

Change-Id: I066ecea1e32cec10696dab3a3e4fac78894088a2
Reviewed-on: https://gerrit.libreoffice.org/42420
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 56bf59ecca31..067343276ed4 100755
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -393,7 +393,7 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false)
 
 DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
 {
-const double fLocalEPS = 700.1;
+const double fLocalEPS = 1000.1;
 const std::vector aTestFiles =
 {
 "legend_on_right_side.odp",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Eike Rathke

 filter/Configuration_filter.mk |1 
 filter/source/config/fragments/filters/calc_jpg_Export.xcu |   20 +
 2 files changed, 21 insertions(+)

New commits:
commit 52a6c68fb2fc817fc58419835cca73f6cd20b8fe
Author: Eike Rathke 
Date:   Mon Sep 18 18:46:21 2017 +0200

Calc: support export to JPEG, just because we can.. tdf#108317 related

Change-Id: I7b78fe3efe97267eca7bf2f085d8375ba7b483ca

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 4406d197fa5b..7b39020f8e7a 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -801,6 +801,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_calcgraphics_typ
 ))
 
 $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_calcgraphics_filters.xcu,filter/source/config/fragments/filters,\
+   calc_jpg_Export \
calc_png_Export \
 ))
 
diff --git a/filter/source/config/fragments/filters/calc_jpg_Export.xcu 
b/filter/source/config/fragments/filters/calc_jpg_Export.xcu
new file mode 100644
index ..80a72878f8b4
--- /dev/null
+++ b/filter/source/config/fragments/filters/calc_jpg_Export.xcu
@@ -0,0 +1,20 @@
+
+
+EXPORT ALIEN 3RDPARTYFILTER 
SUPPORTSSELECTION
+com.sun.star.svtools.SvFilterOptionsDialog
+com.sun.star.comp.GraphicExportFilter
+
+
+JPEG - Joint Photographic Experts 
Group
+
+0
+jpg_JPEG
+
+com.sun.star.sheet.SpreadsheetDocument
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

2017-09-18 Thread Michael Meeks

Hi Markus,

On 18/09/17 16:26, Markus Mohrhard wrote:
> * Crash Reporter (Xisco)
>     + http://crashreport.libreoffice.org/stats/?days=128
...
> I already spent more than a day looking into that issue. It is not a
> problem in LibreOffice or our tooling. Merged libraries generarted with
> MSVC 2015 seem to store pdb info differently and DIA (the MS API that
> breakpad uses to access pdb info) is not able to extract any useful
> information. The uploaded symbol information don't contain anything
> useful so that breakpad is not able to generate useful backtraces for
> the merged library.

Oh - interesting. So - did I understand right from the above that the
problem is in the client-side up-load of the stack / symbol information ?

I'm curious what Mozilla are doing here since they default to VS2015 -
and also have some "put everything in one big DLL" approach.

Thanks !

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-09-18 Thread Eike Rathke

 filter/source/config/fragments/filters/calc_png_Export.xcu |2 
 filter/source/graphic/GraphicExportFilter.cxx  |   63 +++--
 filter/source/graphic/GraphicExportFilter.hxx  |5 +
 svtools/source/filter/SvFilterOptionsDialog.cxx|   22 +++-
 svtools/source/filter/exportdialog.cxx |   45 +++--
 svtools/source/filter/exportdialog.hxx |3 
 6 files changed, 119 insertions(+), 21 deletions(-)

New commits:
commit b149201a076ed2d39fb95dd1c3d1367c9ef6924d
Author: Eike Rathke 
Date:   Mon Sep 18 16:47:59 2017 +0200

Export to PNG: use proper dialog and filter options, tdf#108317

... and not the crude JPG ones.

The com.sun.star.svtools.SvFilterOptionsDialog service has all we need,
so teach it to cope with non-Graphics source documents and let
ExportDialog handle that as well, just the actual rendering needs to go
via GraphicExportFilter (and effectively DocumentToGraphicRenderer), so
don't let that overwrite the properties set by the filter dialog.
Switching to the dialog then is just a matter of changing the
UIComponent in filter/source/config/fragments/filters/calc_png_Export

The same mechanism probably could be used by Writer as well by adjusting
filter/source/config/fragments/filters/writer_png_Export.xcu and maybe
filter/source/config/fragments/filters/writer_jpg_Export.xcu
in which case the GraphicExportOptionsDialog likely would be moot
then.

Also, it looks like a
filter/source/config/fragments/filters/calc_jpg_Export.xcu
(which doesn't exist yet) could be possible using the same mechanism.

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

diff --git a/filter/source/config/fragments/filters/calc_png_Export.xcu 
b/filter/source/config/fragments/filters/calc_png_Export.xcu
index c78a3a63bf5a..a67677abed5e 100644
--- a/filter/source/config/fragments/filters/calc_png_Export.xcu
+++ b/filter/source/config/fragments/filters/calc_png_Export.xcu
@@ -7,7 +7,7 @@
 -->
 
 EXPORT ALIEN 3RDPARTYFILTER 
SUPPORTSSELECTION
-com.sun.star.comp.GraphicExportDialog
+com.sun.star.svtools.SvFilterOptionsDialog
 com.sun.star.comp.GraphicExportFilter
 
 
diff --git a/filter/source/graphic/GraphicExportFilter.cxx 
b/filter/source/graphic/GraphicExportFilter.cxx
index e4279513416e..bfc9e231ec72 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -73,6 +73,22 @@ void GraphicExportFilter::gatherProperties( const 
Sequence& rProp
 {
 mFilterDataSequence[i].Value >>= mTargetHeight;
 }
+else if ( mFilterDataSequence[i].Name == "Compression" )
+{
+maCompression = mFilterDataSequence[i].Value;
+}
+else if ( mFilterDataSequence[i].Name == "Interlaced" )
+{
+maInterlaced = mFilterDataSequence[i].Value;
+}
+else if ( mFilterDataSequence[i].Name == "Translucent" )
+{
+maTranslucent = mFilterDataSequence[i].Value;
+}
+else if ( mFilterDataSequence[i].Name == "Quality" )
+{
+maQuality = mFilterDataSequence[i].Value;
+}
 }
 
 if ( !aInternalFilterName.isEmpty() )
@@ -111,13 +127,46 @@ sal_Bool SAL_CALL GraphicExportFilter::filter( const 
Sequence& rD
 
 GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
 
-Sequence< PropertyValue > aFilterData( 3 );
-aFilterData[ 0 ].Name = "Interlaced";
-aFilterData[ 0 ].Value <<= (sal_Int32) 0;
-aFilterData[ 1 ].Name = "Compression";
-aFilterData[ 1 ].Value <<= (sal_Int32) 9;
-aFilterData[ 2 ].Name = "Quality";
-aFilterData[ 2 ].Value <<= (sal_Int32) 99;
+Sequence< PropertyValue > aFilterData( mFilterDataSequence );
+sal_Int32 nAdd = 0;
+if (!maCompression.hasValue())
+++nAdd;
+if (!maInterlaced.hasValue())
+++nAdd;
+if (!maTranslucent.hasValue())
+++nAdd;
+if (!maQuality.hasValue())
+++nAdd;
+if (nAdd)
+{
+sal_Int32 nLen = aFilterData.getLength();
+aFilterData.realloc( nLen + nAdd);
+if (!maCompression.hasValue())
+{   // PNG,JPG
+aFilterData[ nLen ].Name = "Compression";
+aFilterData[ nLen ].Value <<= (sal_Int32) 9;
+++nLen;
+}
+if (!maInterlaced.hasValue())
+{   // PNG,JPG
+aFilterData[ nLen ].Name = "Interlaced";
+aFilterData[ nLen ].Value <<= (sal_Int32) 0;
+++nLen;
+}
+if (!maTranslucent.hasValue())
+{   // PNG
+aFilterData[ nLen ].Name = "Translucent";
+aFilterData[ nLen ].Value <<= (sal_Int32) 0;
+++nLen;
+}
+

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

2017-09-18 Thread Caolán McNamara

 bin/oss-fuzz-build.sh |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7654183a53cd221e54a10a1bf5497df0c788860d
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 17 21:18:00 2017 +0100

ofz: add dicts to outdir

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

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 577d73753a0d..eafdd0f9d467 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -33,3 +33,9 @@ popd
 
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
+#fuzzing dictionaries
+cp $SRC/gif.dict $OUT/giffuzzer.dict
+cp $SRC/jpeg.dict $OUT/jpgfuzzer.dict
+cp $SRC/png.dict $OUT/pngfuzzer.dict
+cp $SRC/tiff.dict $OUT/tiffuzzer.dict
+cp $SRC/xml.dict $OUT/fodtfuzzer.dict
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Caolán McNamara

 sw/source/filter/xml/xmltexti.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 121b4ce8919c8ce33bf50e6528a8c6637d21dfd8
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 16:19:30 2017 +0100

through->throw

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

diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index 062ae2938c95..0776fc9fb8aa 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -158,7 +158,7 @@ SwXMLTextImportHelper::SwXMLTextImportHelper(
 SwXMLTextImportHelper::~SwXMLTextImportHelper()
 {
 // the redline helper destructor sets properties on the document
-// and may through an exception while doing so... catch this
+// and may throw an exception while doing so... catch this
 try
 {
 delete pRedlineHelper;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

2017-09-18 Thread Markus Mohrhard

>
>
> * Crash Reporter (Xisco)
> + http://crashreport.libreoffice.org/stats/?days=128
> + http://crashreport.libreoffice.org/stats/version/5.3.4.2
> + 2121 (last 7 days)
> + http://crashreport.libreoffice.org/stats/version/5.3.5.2
> + 516 (last 7 days)
> + http://crashreport.libreoffice.org/stats/version/5.3.6.1
> + 285 (lasy 7 days)
> + http://crashreport.libreoffice.org/stats/version/5.4.0.3
> + 1834 (last 7 days)
> + http://crashreport.libreoffice.org/stats/version/5.4.1.2
> + 1407 (last 7 days)
> + top bug – missing symbols from merged.dll ? (Michael)
> + http://crashreport.libreoffice.org/stats/crash_
> details/6ed34f4e-7836-4afd-9bd8-ffa9eb1db28a#allthreads
> + http://crashreport.libreoffice.org/stats/crash_
> details/1b36c17c-1209-4d1b-9381-0e71a4044069
> + are we up-loading symbols or ? …
> + symbols are up-loaded & correct (Cloph)
> + processing from the minidump is not working
> + is it the crash-report-side processing ?
> + if you do the debugging yourself it works.
>+ Markus suggested - problems with MSVC 2015 install ? (Xisco)
>+ remaining top crashes don’t have good traces (no surprise)
> (Michael)
> AI: + look into that (Cloph)
>
>
I already spent more than a day looking into that issue. It is not a
problem in LibreOffice or our tooling. Merged libraries generarted with
MSVC 2015 seem to store pdb info differently and DIA (the MS API that
breakpad uses to access pdb info) is not able to extract any useful
information. The uploaded symbol information don't contain anything useful
so that breakpad is not able to generate useful backtraces for the merged
library.

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

ODFF1.2 interpretation of function WEEKNUM

2017-09-18 Thread Winfried Donkers


Hi Eike,


I'm working on tdf112320 and I think that ODFF1.2 may be ambiguous with 
respect to WEEKNUM 
(http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#WEEKNUM)


My interpretation of the Semantics for Mode 1,2,11-17 was that

'every week starts on Sunday..Saturday, depending on the value of Mode. 
The week containing 1 January is week 1'.


So, WEEKNUM(DATE(2014,12,29),1) returns 1, as it is a Monday, the week 
starts on Sunday 28 December and 1 January is on the Thursday. All weeks 
have 7 days.



However, both Excel and Gnumeric use

'every week starts on Sunday..Saturday, depending on the value of Mode, 
_or_ on 1 January (with the week number 1)'.


So, WEEKNUM(DATE(2014,12,29),1) returns 53, as it is a Monday, following 
week 52 and WEEKNUM(DATE(2015,1,1),1) returns 1. Week 53 has 4 days and 
week 1 has 3 days.



When I read ODFF1.2 again (and again) I read the first interpretation 
(WEEKNUM(DATE(2014,12,29),1)=1). But is that correct??


As it is now, Calc produces different results when compared to Excel and 
Gnumeric.


What is your interpretation?


Winfried

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

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

2017-09-18 Thread Caolán McNamara

 sw/source/filter/ww8/ww8par.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ba73b1996e9797aa4f6884b95333759044416f0d
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 16:07:41 2017 +0100

ofz#3404 avoid oom

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a68b9a640dd6..1de95d3a4067 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4656,7 +4656,9 @@ void SwWW8ImplReader::StoreMacroCmds()
 {
 if (m_xWwFib->m_lcbCmds)
 {
-m_pTableStream->Seek(m_xWwFib->m_fcCmds);
+bool bValidPos = checkSeek(*m_pTableStream, m_xWwFib->m_fcCmds);
+if (!bValidPos)
+return;
 
 uno::Reference < embed::XStorage > xRoot(m_pDocShell->GetStorage());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Caolán McNamara

 sc/source/ui/docshell/impex.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 227d9d3fe598c089aee4421f0ad503acb85f3c4c
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 15:40:16 2017 +0100

ofz#3412 SYLK import: check ;X;Y;C;R col/row validity early

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

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index cd92f13e0586..3fe47e3ef4ee 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1893,9 +1893,19 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 {
 case 'X':
 nCol = static_cast(OUString(p).toInt32()) + 
nStartCol - 1;
+if (nCol < 0 || MAXCOL < nCol)
+{
+SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;X invalid nCol=" << nCol);
+nCol = std::max( 0, std::min( 
nCol, MAXCOL));
+}
 break;
 case 'Y':
 nRow = OUString(p).toInt32() + nStartRow - 1;
+if (nRow < 0 || MAXROW < nRow)
+{
+SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - 
;Y invalid nRow=" << nRow);
+nRow = std::max( 0, std::min( 
nRow, MAXROW));
+}
 break;
 case 'P' :
 if ( bData )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Miklos Vajna

 AllLangHelp_shared.mk |1 
 source/text/shared/01/ref_epub_export.xhp |   53 ++
 2 files changed, 54 insertions(+)

New commits:
commit 11f56aad32f761d6ff5f86c5beaa173bf13f01df
Author: Miklos Vajna 
Date:   Mon Sep 18 17:05:49 2017 +0200

EPUB export: add initial help page for the EPUB export dialog

Change-Id: I255e7993f1ef7a7e1b156bdd72f91954ebc68b94

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 7a5a3736e..09a07ef48 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -344,6 +344,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/01/password_dlg \
 helpcontent2/source/text/shared/01/password_main \
 helpcontent2/source/text/shared/01/profile_safe_mode \
+helpcontent2/source/text/shared/01/ref_epub_export \
 helpcontent2/source/text/shared/01/ref_pdf_export \
 helpcontent2/source/text/shared/01/ref_pdf_send_as \
 helpcontent2/source/text/shared/01/securitywarning \
diff --git a/source/text/shared/01/ref_epub_export.xhp 
b/source/text/shared/01/ref_epub_export.xhp
new file mode 100644
index 0..4c1241546
--- /dev/null
+++ b/source/text/shared/01/ref_epub_export.xhp
@@ -0,0 +1,53 @@
+
+
+
+
+
+  
+Export as EPUB
+/text/shared/01/ref_epub_export.xhp
+  
+
+
+
+
+
+
+  EPUB;export
+  electornic publication
+  exporting;to EPUB
+
+
+Export as 
EPUB
+Saves the 
current file to EPUB. An EPUB file can be viewed and printed on any platform, 
provided that supporting software is installed.
+
+
+
+
+Version
+Sets the 
version of the resulting EPUB file.
+
+
+Split 
method
+Determines if 
a next EPUB section will start on page breaks or on paragraphs with the Heading 
1 style.
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-09-18 Thread Miklos Vajna

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

New commits:
commit 9887c7ffc1a6060095496b2227460bad57e76d8e
Author: Miklos Vajna 
Date:   Mon Sep 18 17:05:49 2017 +0200

Updated core
Project: help  11f56aad32f761d6ff5f86c5beaa173bf13f01df

EPUB export: add initial help page for the EPUB export dialog

Change-Id: I255e7993f1ef7a7e1b156bdd72f91954ebc68b94

diff --git a/helpcontent2 b/helpcontent2
index b4f3b5bbe19d..11f56aad32f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b4f3b5bbe19d8361492c023e3ca0ee53fc0ab9b0
+Subproject commit 11f56aad32f761d6ff5f86c5beaa173bf13f01df
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - drawinglayer/source include/svx svx/source sw/source

2017-09-18 Thread Armin Le Grand

 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx |  121 -
 include/svx/framelink.hxx |   82 +++
 svx/source/dialog/framelink.cxx   |  320 ++
 svx/source/dialog/framelinkarray.cxx  |   78 +--
 svx/source/table/viewcontactoftableobj.cxx|   20 
 sw/source/core/layout/paintfrm.cxx|   46 +-
 6 files changed, 417 insertions(+), 250 deletions(-)

New commits:
commit 5a11b5cc191ebe90e23cab9f101c4d5a601c0eac
Author: Armin Le Grand 
Date:   Mon Sep 18 16:54:43 2017 +0200

borderline: Added missing BorderLinePrimitive2D::create2DDecomposition

Was somehow lost in adaption to lo52, added now

Change-Id: I0759a9d36343b4d830047162389f28d0db379305

diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 11926329ebc2..413d1bdd51c9 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -159,15 +159,118 @@ namespace drawinglayer
 if(!candidate.isGap())
 {
 const basegfx::B2DVector aDeltaY(aPerpendicular * 
(fOffset + (fWidth * 0.5)));
-const basegfx::B2DPoint aStart(getStart() - (aVector * 
candidate.getStartAverage()) + aDeltaY);
-const basegfx::B2DPoint aEnd(getEnd() + (aVector * 
candidate.getEndAverage()) + aDeltaY);
-
-addPolygonStrokePrimitive2D(
-aContainer,
-aStart,
-aEnd,
-candidate.getLineAttribute(),
-getStrokeAttribute());
+const basegfx::B2DPoint aStart(getStart() + aDeltaY);
+const basegfx::B2DPoint aEnd(getEnd() + aDeltaY);
+const bool 
bStartPerpendicular(rtl::math::approxEqual(candidate.getStartLeft(), 
candidate.getStartRight()));
+const bool 
bEndPerpendicular(rtl::math::approxEqual(candidate.getEndLeft(), 
candidate.getEndRight()));
+
+if(bStartPerpendicular && bEndPerpendicular)
+{
+// start and end extends lead to an edge 
perpendicular to the line, so we can just use
+// a PolygonStrokePrimitive2D for representation
+addPolygonStrokePrimitive2D(
+aContainer,
+aStart - (aVector * candidate.getStartLeft()),
+aEnd + (aVector * candidate.getEndLeft()),
+candidate.getLineAttribute(),
+getStrokeAttribute());
+}
+else
+{
+// start and/or end extensions lead to a 
lineStart/End that is *not*
+// perpendicular to the line itself
+if(getStrokeAttribute().isDefault() || 0.0 == 
getStrokeAttribute().getFullDotDashLen())
+{
+// without stroke, we can simply represent 
that using a filled polygon
+const basegfx::B2DVector 
aHalfLineOffset(aPerpendicular * (candidate.getLineAttribute().getWidth() * 
0.5));
+basegfx::B2DPolygon aPolygon;
+
+aPolygon.append(aStart - aHalfLineOffset - 
(aVector * candidate.getStartLeft()));
+aPolygon.append(aEnd - aHalfLineOffset + 
(aVector * candidate.getEndLeft()));
+aPolygon.append(aEnd + aHalfLineOffset + 
(aVector * candidate.getEndRight()));
+aPolygon.append(aStart + aHalfLineOffset - 
(aVector * candidate.getStartRight()));
+
+aContainer.push_back(
+new PolyPolygonColorPrimitive2D(
+basegfx::B2DPolyPolygon(aPolygon),
+
candidate.getLineAttribute().getColor()));
+}
+else
+{
+// with stroke, we have a problem - a filled 
polygon would lose the
+// stroke. Let's represent the start and/or 
end as triangles, the main
+// line still as PolygonStrokePrimitive2D.
+// Fill default line Start/End for stroke, so 
we need no adaptions in else paths
+basegfx::B2DPoint aStrokeStart(aStart - 
(aVector * candidate.getStartLeft()));
+

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

2017-09-18 Thread Eike Rathke

 svtools/source/filter/exportdialog.cxx |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit bd352d6e1c434f2b917c53a84a1e89578f72bc80
Author: Eike Rathke 
Date:   Mon Sep 18 16:51:23 2017 +0200

Move initialization to where it belongs

Change-Id: Ifff6cf6a9849b4089f6aabe56bb5de7a414e939a

diff --git a/svtools/source/filter/exportdialog.cxx 
b/svtools/source/filter/exportdialog.cxx
index bd5254c0449f..cd2e84e2cd95 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -453,21 +453,6 @@ void ExportDialog::GetGraphicStream()
 }
 else
 {
-uno::Reference < io::XStream > xStream( new 
utl::OStreamWrapper( *mpTempStream ) );
-uno::Reference < io::XOutputStream > xOutputStream( 
xStream->getOutputStream() );
-
-uno::Reference< drawing::XGraphicExportFilter > 
xGraphicExporter =
-drawing::GraphicExportFilter::create( mxContext );
-
-OUString sFormat( maExt );
-uno::Sequence< beans::PropertyValue > aDescriptor( 3 );
-aDescriptor[0].Name = "OutputStream";
-aDescriptor[0].Value <<= xOutputStream;
-aDescriptor[1].Name = "FilterName";
-aDescriptor[1].Value <<= sFormat;
-aDescriptor[2].Name = "FilterData";
-aDescriptor[2].Value <<= aNewFilterData;
-
 uno::Reference< lang::XComponent > xSourceDoc;
 if ( mxPage.is() )
 xSourceDoc.set( mxPage, uno::UNO_QUERY_THROW );
@@ -477,6 +462,21 @@ void ExportDialog::GetGraphicStream()
 xSourceDoc.set( mxShape, uno::UNO_QUERY_THROW );
 if ( xSourceDoc.is() )
 {
+uno::Reference < io::XStream > xStream( new 
utl::OStreamWrapper( *mpTempStream ) );
+uno::Reference < io::XOutputStream > xOutputStream( 
xStream->getOutputStream() );
+
+OUString sFormat( maExt );
+uno::Sequence< beans::PropertyValue > aDescriptor( 3 );
+aDescriptor[0].Name = "OutputStream";
+aDescriptor[0].Value <<= xOutputStream;
+aDescriptor[1].Name = "FilterName";
+aDescriptor[1].Value <<= sFormat;
+aDescriptor[2].Name = "FilterData";
+aDescriptor[2].Value <<= aNewFilterData;
+
+uno::Reference< drawing::XGraphicExportFilter > 
xGraphicExporter =
+drawing::GraphicExportFilter::create( mxContext );
+
 xGraphicExporter->setSourceDocument( xSourceDoc );
 xGraphicExporter->filter( aDescriptor );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Aron Budea

 sd/qa/unit/data/pptx/tdf111863.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   15 +++
 sd/source/filter/eppt/pptx-epptooxml.cxx |4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 1ea4496f3b2defaf51391e816d159717c55f2929
Author: Aron Budea 
Date:   Thu Sep 14 07:59:15 2017 +0200

tdf#111863: Animations turned from out to in during PPTX export

animEffect element's transition attribute was filled from
XTransitionFilter's Direction attribute, while it should have
been Mode.

Change-Id: I40be0311a7b7ffc64ac3a97a92a3ea835faa5293
Reviewed-on: https://gerrit.libreoffice.org/42261
Tested-by: Jenkins 
Reviewed-by: TamÃ¡s Zolnai 

diff --git a/sd/qa/unit/data/pptx/tdf111863.pptx 
b/sd/qa/unit/data/pptx/tdf111863.pptx
new file mode 100644
index ..19579ada5aaf
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf111863.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 820f02723c52..38d39ead02c8 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -101,6 +101,7 @@ public:
 void testPptmContentType();
 void testTdf111798();
 void testPptmVBAStream();
+void testTdf111863();
 void testTdf111518();
 void testTdf100387();
 void testRotateFlip();
@@ -135,6 +136,7 @@ public:
 CPPUNIT_TEST(testPptmContentType);
 CPPUNIT_TEST(testTdf111798);
 CPPUNIT_TEST(testPptmVBAStream);
+CPPUNIT_TEST(testTdf111863);
 CPPUNIT_TEST(testTdf111518);
 CPPUNIT_TEST(testTdf100387);
 CPPUNIT_TEST(testRotateFlip);
@@ -909,6 +911,19 @@ void SdOOXMLExportTest2::testPptmVBAStream()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf111863()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf111863.pptx"), 
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+// check that transition attribute didn't change from 'out' to 'in'
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent, 
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animEffect",
+"transition", "out");
+}
+
 void SdOOXMLExportTest2::testTdf111518()
 {
 sd::DrawDocShellRef xShell = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf111518.pptx"), 
PPTX);
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 62b0c4c1440b..f5d39c36ba0c 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1482,10 +1482,10 @@ void PowerPointExport::WriteAnimationNodeEffect(const 
FSHelperPtr& pFS, const Re
 if (xFilter.is())
 {
 const char* pFilter = 
::ppt::AnimationExporter::FindTransitionName(xFilter->getTransition(), 
xFilter->getSubtype(), xFilter->getDirection());
-const char* pDirection = xFilter->getDirection() ? "in" : "out";
+const char* pMode = xFilter->getMode() ? "in" : "out";
 pFS->startElementNS(XML_p, XML_animEffect,
 XML_filter, pFilter,
-XML_transition, pDirection,
+XML_transition, pMode,
 FSEND);
 
 WriteAnimationNodeAnimateInside(pFS, rXNode, bMainSeqChild, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Arkadiy Illarionov

 cui/source/options/optcolor.cxx  |   64 
 cui/uiconfig/ui/colorconfigwin.ui|  552 ---
 cui/uiconfig/ui/optappearancepage.ui |   12 
 3 files changed, 13 insertions(+), 615 deletions(-)

New commits:
commit 5b4314ccb5ae21b7414d85f4b3bebbe972694b1b
Author: Arkadiy Illarionov 
Date:   Sat Sep 16 23:30:04 2017 +0300

tdf#108139 Remove Preview column from Application Colors config page

Change-Id: Id342814f3a724a0534cd6fd43b49139af52c1d03
Reviewed-on: https://gerrit.libreoffice.org/42362
Reviewed-by: TamÃ¡s Zolnai 
Tested-by: TamÃ¡s Zolnai 

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 998ceaedbdfa..eb47a81dee74 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -90,18 +90,16 @@ struct
 const char *pText;
 //color listbox
 const char *pColor;
-//preview box
-const char *pPreview;
 // has checkbox?
 bool bCheckBox;
 }
 const vEntryInfo[] =
 {
 #define IDS(Name) \
-SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), 
SAL_STRINGIFY(Name##_wn), false
+SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), false
 
 #define IDS_CB(Name) \
-SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), 
SAL_STRINGIFY(Name##_wn), true
+SAL_STRINGIFY(Name), SAL_STRINGIFY(Name##_lb), true
 
 // The list of these entries (enum ColorConfigEntry) are in colorcfg.hxx.
 
@@ -203,7 +201,7 @@ private:
 };
 
 // Entry -- a color config entry:
-// text (checkbox) + color list box + preview box
+// text (checkbox) + color list box
 class Entry
 {
 public:
@@ -218,12 +216,12 @@ private:
 void SetTextColor (Color C) { m_pText->SetTextColor(C); }
 public:
 void SetLinks (Link const&, Link 
const&, Link const&);
-void Update (ColorConfigEntry, ColorConfigValue const&);
+void Update (ColorConfigValue const&);
 void Update (ExtendedColorConfigValue const&);
-void ColorChanged (ColorConfigEntry, ColorConfigValue&);
+void ColorChanged (ColorConfigValue&);
 void ColorChanged (ExtendedColorConfigValue&);
 public:
-long GetTop () const { return m_pPreview->GetPosPixel().Y(); }
+long GetTop () const { return m_pColorList->GetPosPixel().Y(); }
 unsigned GetHeight () const { return 
m_pColorList->GetSizePixel().Height(); }
 public:
 bool Is (CheckBox const * pBox) const { return m_pText.get() == pBox; }
@@ -232,7 +230,6 @@ private:
 {
 m_pText.disposeAndClear();
 m_pColorList.disposeAndClear();
-m_pPreview.disposeAndClear();
 }
 private:
 bool m_bOwnsWidgets;
@@ -240,12 +237,8 @@ private:
 VclPtr m_pText;
 // color list box
 VclPtr m_pColorList;
-// color preview box
-VclPtr m_pPreview;
 // default color
 Color m_aDefaultColor;
-private:
-void SetColor (Color);
 };
 
 // vChapters -- groups (group headers)
@@ -331,7 +324,6 @@ 
ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned i
 nCheckBoxLabelOffset);
 }
 rParent.get(m_pColorList, vEntryInfo[iEntry].pColor);
-rParent.get(m_pPreview, vEntryInfo[iEntry].pPreview);
 
 if (!bShow)
 Hide();
@@ -353,11 +345,6 @@ ColorConfigWindow_Impl::Entry::Entry( vcl::Window *pGrid, 
unsigned nYPos,
 m_pColorList->set_grid_left_attach(1);
 m_pColorList->set_grid_top_attach(nYPos);
 
-m_pPreview = VclPtr::Create(pGrid, WB_BORDER);
-m_pPreview->set_grid_left_attach(2);
-m_pPreview->set_grid_top_attach(nYPos);
-m_pPreview->set_margin_right(6);
-
 Show();
 }
 
@@ -367,7 +354,6 @@ ColorConfigWindow_Impl::Entry::~Entry()
 {
 m_pText.disposeAndClear();
 m_pColorList.disposeAndClear();
-m_pPreview.disposeAndClear();
 }
 }
 
@@ -375,14 +361,12 @@ void ColorConfigWindow_Impl::Entry::Show()
 {
 m_pText->Show();
 m_pColorList->Show();
-m_pPreview->Show();
 }
 
 void ColorConfigWindow_Impl::Entry::Hide()
 {
 m_pText->Hide();
 m_pColorList->Hide();
-m_pPreview->Hide();
 }
 
 // SetAppearance()
@@ -393,8 +377,6 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(Wallpaper 
const& rTextWall)
 {
 // text (and optionally checkbox)
 m_pText->SetBackground(rTextWall);
-// preview
-m_pPreview->SetBorderStyle(WindowBorderStyle::MONO);
 // color list
 m_pColorList->SetSlotId(SID_ATTR_CHAR_COLOR);
 m_pColorList->SetAutoDisplayColor(m_aDefaultColor);
@@ -416,13 +398,10 @@ void ColorConfigWindow_Impl::Entry::SetLinks(
 
 // updates a default color config entry
 void ColorConfigWindow_Impl::Entry::Update (
-ColorConfigEntry aColorEntry, ColorConfigValue const& rValue
+ColorConfigValue const& rValue
 ) {
 Color aColor(rValue.nColor);
 m_pColorList->SelectEntry(aColor);
-if (aColor.GetColor() =

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

2017-09-18 Thread Caolán McNamara

 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3e8ef0e1a40a14d1c2bdb5345ed59941c765356b
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 15:10:49 2017 +0100

ofz#3419 Null-dereference READ

Change-Id: I32c5d5039034ac76262223e42a1f27d6f1b84cb5

diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 36ddf3df64cd..9b251804dfd2 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -621,14 +621,16 @@ void FreetypeFont::InitGlyphData(const GlyphItem& rGlyph, 
GlyphData& rGD ) const
 
 FT_Error rc = FT_Load_Glyph(maFaceFT, rGlyph.maGlyphId, mnLoadFlags);
 
-if( rc != FT_Err_Ok )
+if (rc != FT_Err_Ok)
 return;
 
 if (mbArtBold)
 FT_GlyphSlot_Embolden(maFaceFT->glyph);
 
 FT_Glyph pGlyphFT;
-FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );
+rc = FT_Get_Glyph(maFaceFT->glyph, &pGlyphFT);
+if (rc != FT_Err_Ok)
+return;
 
 ApplyGlyphTransform(rGlyph.IsVertical(), pGlyphFT);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2017-09-18 Thread Michael Meeks

And apologies again for forgetting to send these out immediately:

* Present
+ Stephan, Jan-Marek, Xisco, Olivier, Sophie, Michael M, Christian, Heiko
  Caolan, Eike, Kendy, Teodor, Michael S, Bubli

* Completed Action Items:
+ restore commit bit + mail (Kendy, Michael)
+ font issues (Xisco)
 [ http://bugs.documentfoundation.org/attachment.cgi?id=136092
 + picture comes from Thomas – but nothing reported (Xisco)
  + suspend this then.
 + telegram guy says “everything solved” (Heiko)
  + want to buy flowers for Caolan ]

* Pending Action Items:
+ fix scripts producing junk numbers for crash testing (7 and 7) (Shinnok)
[ pending – making the scripts work again. ]
+ fwd build details on Mac / CVE build / test failure to the list (Shinnok)
[ still working on this, hope to have it done today,
  add - enable/disable doxygen / gettext in the wiki ?
  do we recommend a check build for newcomers ?
  + yes – unit testing is important (Michael)
 + will send details on failing CVE test to the list (Shinnok)
 + compiling on Linux – no problems with default (Heiko)
+ on Mac he has to build with –no-build-check
+ also see this regularly (Stephan)
  + got a configuration from Caolan’s tinderbox
  + have pending Mac fix patches (Jmux)
 + pending monotonic ticks patch
  + can we add homebrew in parallel to MacPorts ? (Shinnok)
  + easy to link against homebrew by mistake (Cloph)
 + only autoconf/automake/make etc.
 + if we have macports already, not against homebrew
  + don’t we recommend LODE on Mac ? (Stephan)
 + surely why we created LODE in the 1st instance.
  => if we invest time – invest it in improving LODE on Mac ]

* Release Engineering update (Christian)
+ 5.4.2 RC1 status
+ branch & creating RC1
+ https://gerrit.libreoffice.org/#/q/status:open+branch:libreoffice-5-4 
+ 5.3.7 - 1st week of October as initially scheduled
+ 6.0 Alpha1 – moved to after the conference
+ Android
+ not rendering anything except blankness & white-ness
+ some fixes went in nevertheless, but blocking a new release.
+ Tomaz may have a clue – bisected to a specific commit
+ should we build a bibisect repo ? (Michael)
+ compression and/or signature a problem (Kendy)
+ Online
+ create an RC2 later.

* Documentation (Olivier)
 + unexpected surgery early this week, recovering well
 + helponline now with tweaked custom search by Google
 + Language segmentation
 + No ads
 + all results in the LibreOffice domain
 + Doc team working on the 6.0 Guides. 
 + revisions and proofreading
 + monitoring Release notes 6.0 for additions.
 + Initial discussion on a rich text XHP editor (Jean Spiteri).
 + how far are we from using the HTML for off-line help (Kendy)
 + alpha is getting close.
 + we are quite close (Olivier)
+ need some skills in C++ to invoke off-line pages in the software
+ can help out with this (Kendy)
+ more worried about packaging, installation etc.
+ a tree of HTML pages that will be compressed & packaged
+ 40MB of disk-space
+ could be an MSI file, or an extension
+ don’t have the knowledge of how to build the files.
+ need to tweak vnd.com.star.sun to a browser understood 
protocol
AI:  + research the best way to build this (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
254(254) (topicUI) bugs open, 407(407) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added  6(0) 18(-1)34(2)  130(-3) 
 commented 86(46)   222(42)   537(62)2927(-25)
   removed  1(1)  1(1)  5(1)   40(-3) 
  resolved  6(1) 21(-1)72(4)  289(4)  
+ top 10 contributors:
  Tietze, Heiko made 107 changes in 1 month, and 1586 changes in 1 year
  Thomas Lendo made 68 changes in 1 month, and 463 changes in 1 year
  Philips, Yousuf made 54 changes in 1 month, and 1350 changes in 1 year
  Foote, V Stuart made 46 changes in 1 month, and 570 changes in 1 year
  Cor Nouws made 36 changes in 1 month, and 300 changes in 1 year
  Buovjaga made 36 changes in 1 month, and 379 changes in 1 year
  Adolfo Jayme Barrientos made 33 changes in 1 month, and 70 changes in 
1 y
  Faulí Tarazona, Xisco made 30 changes in 1 month, and 490 changes in 
1 y
  dieterp made 14 changes in 1 month, and 50 changes in 1 year

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

2017-09-18 Thread Damjan Jovanovic

 ridljar/com/sun/star/uno/UnoRuntime.java |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit ce2712be6e755c50fb611430bc5899a9a80552dd
Author: Damjan Jovanovic 
Date:   Sun Aug 20 06:22:29 2017 +

i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably

In the Java UNO bridge, UnoRuntime.generateOid() generated the
object-specific part of the OID using java.lang.Object.hashCode(),
which is only 32 bits long, and is commonly overriden and could thus
return values from an even smaller range, so OID collisions were quite
likely.

This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
object-specific part of the OID, and store these in an object => oid
java.util.WeakHashMap, making OID collisions almost impossible.

Patch by: me
Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
googlemail dot com)

(cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118)

Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95
Reviewed-on: https://gerrit.libreoffice.org/41576
Reviewed-by: Stephan Bergmann 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
(cherry picked from commit 3f84390f585cf71331a77ab5ca632cacaf3ad7b9)

diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java 
b/ridljar/com/sun/star/uno/UnoRuntime.java
index 4bedc275c451..2b70ed92ea8b 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.UUID;
+import java.util.WeakHashMap;
 
 import com.sun.star.lib.uno.typedesc.FieldDescription;
 import com.sun.star.lib.uno.typedesc.TypeDescription;
@@ -106,7 +108,16 @@ public class UnoRuntime {
 if (object instanceof IQueryInterface) {
 oid = ((IQueryInterface) object).getOid();
 }
-return oid == null ? object.hashCode() + oidSuffix : oid;
+if (oid == null) {
+synchronized (oidMap) {
+ oid = oidMap.get(object);
+ if (oid == null) {
+ oid = UUID.randomUUID().toString() + oidSuffix;
+ oidMap.put(object, oid);
+ }
+}
+}
+return oid;
 }
 
 /**
@@ -690,6 +701,7 @@ public class UnoRuntime {
 private final IBridge bridge;
 }
 
+private static final WeakHashMap oidMap = new 
WeakHashMap();
 private static final String uniqueKeyHostPrefix
 = Integer.toString(new Object().hashCode(), 16) + ":";
 private static final Object uniqueKeyLock = new Object();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Michael Stahl

 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 60a70ea286279f58de8a0ba5de389330994c7eb2
Author: Michael Stahl 
Date:   Mon Sep 18 15:43:11 2017 +0200

dbaccess: [loplugin:casttovoid]

Change-Id: Ie1f63b6495997d518457fcac195fcfa903bc6af0

diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 302139afd27a..27fbfe63a38e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -675,8 +675,6 @@ using namespace ::com::sun::star;
 catch(css::uno::Exception&)
 {
 }
-#else
-(void) bSuccess;
 #endif
 const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : 
STR_JDBCDRIVER_NO_SUCCESS;
 ScopedVclPtrInstance aMsg(this, DBA_RES(pMessage), 
OUString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Armin Le Grand

 include/svx/framelink.hxx  |   82 ++-
 svx/source/dialog/framelink.cxx|  315 +
 svx/source/dialog/framelinkarray.cxx   |   78 ---
 svx/source/table/viewcontactoftableobj.cxx |   20 +
 sw/source/core/layout/paintfrm.cxx |   46 ++--
 5 files changed, 301 insertions(+), 240 deletions(-)

New commits:
commit b86a3aa00dbaf94398cccfe3af312f123edc6093
Author: Armin Le Grand 
Date:   Mon Sep 18 12:31:45 2017 +0200

borderline: restuctured used classes

Restructuring for more efficcient usage of helper
values, some obstacles removed with that

Change-Id: Ia8c4b2d4c423db9500cda507107d87913b79e23c
Reviewed-on: https://gerrit.libreoffice.org/42409
Reviewed-by: Armin Le Grand 
Tested-by: Armin Le Grand 

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 414f23aaaca7..771bc1e6dc7f 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -214,29 +214,87 @@ public:
 inline bool operator>( const Style& rL, const Style& rR ) { return 
rR.operator<(rL); }
 
 // Drawing functions
-
 class SAL_WARN_UNUSED SVX_DLLPUBLIC StyleVectorCombination
 {
 private:
-const Style&mrStyle;
-const basegfx::B2DVectormaB2DVector;
-const bool  mbMirrored;
+struct OffsetAndHalfWidthAndColor
+{
+double  mfOffset;
+double  mfHalfWidth;
+Color   maColor;
+
+OffsetAndHalfWidthAndColor(double offset, double halfWidth, Color 
color) :
+mfOffset(offset),
+mfHalfWidth(halfWidth),
+maColor(color)
+{}
+};
 
+double  mfRefModeOffset;
+basegfx::B2DVector  maB2DVector;
+std::vector< OffsetAndHalfWidthAndColor >   maOffsets;
 
 public:
-StyleVectorCombination(const Style& rStyle, const basegfx::B2DVector& 
rB2DVector, bool bMirrored) :
-mrStyle(rStyle),
-maB2DVector(rB2DVector),
-mbMirrored(bMirrored)
+StyleVectorCombination(
+const Style& rStyle,
+const basegfx::B2DVector& rB2DVector,
+bool bMirrored,
+const Color* pForceColor = nullptr);
+
+double getRefModeOffset() const { return mfRefModeOffset; }
+const basegfx::B2DVector& getB2DVector() const { return maB2DVector; }
+
+bool empty() const { return maOffsets.empty(); }
+size_t size() const { return maOffsets.size(); }
+
+void getColorAndOffsetAndHalfWidth(size_t nIndex, Color& rColor, double& 
rfOffset, double& rfHalfWidth) const
 {
+if(nIndex >= maOffsets.size())
+return;
+const OffsetAndHalfWidthAndColor& rCandidate(maOffsets[nIndex]);
+rfOffset = rCandidate.mfOffset;
+rfHalfWidth = rCandidate.mfHalfWidth;
+rColor = rCandidate.maColor;
 }
 
-const Style& getStyle() const { return mrStyle; }
-const basegfx::B2DVector& getB2DVector() const { return maB2DVector; }
-bool isMirrored() const { return mbMirrored; }
+bool operator<(const StyleVectorCombination& rOther) const
+{
+return getB2DVector().cross(rOther.getB2DVector()) < 0.0;
+}
 };
 
-typedef std::vector< StyleVectorCombination > StyleVectorTable;
+class SAL_WARN_UNUSED SVX_DLLPUBLIC StyleVectorTable
+{
+private:
+std::vector< StyleVectorCombination >   maEntries;
+
+public:
+StyleVectorTable()
+:   maEntries()
+{
+}
+
+void add(
+const Style& rStyle,
+const basegfx::B2DVector& rMyVector,
+const basegfx::B2DVector& rOtherVector,
+bool bMirrored)
+{
+if(rStyle.IsUsed() && !basegfx::areParallel(rMyVector, rOtherVector))
+{
+maEntries.emplace_back(rStyle, rOtherVector, bMirrored);
+}
+}
+
+void sort()
+{
+std::sort(maEntries.begin(), maEntries.end());
+}
+
+bool empty() const { return maEntries.empty(); }
+size_t size() const { return maEntries.size(); }
+const std::vector< StyleVectorCombination >& getEntries() const{ return 
maEntries; }
+};
 
 SVX_DLLPUBLIC void CreateBorderPrimitives(
 drawinglayer::primitive2d::Primitive2DContainer&rTarget,/// 
target for created primitives
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index e205560df33c..2c58e3c28528 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -338,19 +338,6 @@ bool Style::operator<( const Style& rOther) const
 }
 
 // Drawing functions
-struct OffsetAndHalfWidthAndColor
-{
-double  mfOffset;
-double  mfHalfWidth;
-Color   maColor;
-
-OffsetAndHalfWidthAndColor(double offset, double halfWidth, Color color) :
-mfOffset(offset),
-mfHalfWidth(halfWidth),
-maColor(color)
-{}
-};
-
 struct CutSet
 {
 double  mfOLML;
@@ -367,108 +354,6 @@ struct Extend

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

2017-09-18 Thread Szymon Kłos

 oox/inc/drawingml/fillproperties.hxx|2 +-
 oox/source/drawingml/fillproperties.cxx |   17 -
 oox/source/drawingml/misccontexts.cxx   |3 ++-
 oox/source/drawingml/shape.cxx  |2 +-
 oox/source/vml/vmlformatting.cxx|   23 +--
 sd/qa/unit/data/pptx/tdf112088.pptx |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   14 ++
 7 files changed, 47 insertions(+), 14 deletions(-)

New commits:
commit 89879b0051529cb8d16da6c8b4b1203679f8f734
Author: Szymon KÅos 
Date:   Tue Sep 12 13:26:35 2017 +0200

tdf#112088 gradient stop map -> multimap

When two gradientstops were set to position 50%
only one was stored and the exported file was
detected as broken by MSO.

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

diff --git a/oox/inc/drawingml/fillproperties.hxx 
b/oox/inc/drawingml/fillproperties.hxx
index 15b503161440..affd8e1602eb 100644
--- a/oox/inc/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -48,7 +48,7 @@ class ShapePropertyMap;
 
 struct GradientFillProperties
 {
-typedef ::std::map< double, Color > GradientStopMap;
+typedef ::std::multimap< double, Color > GradientStopMap;
 
 GradientStopMap maGradientStops;/// Gradient stops 
(colors/transparence).
 OptValue< css::geometry::IntegerRectangle2D > moFillToRect;
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 925db22fb5f9..d18f6249b0fc 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -379,18 +379,20 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 
 // Add a fake gradient stop at 0% and 100% if 
necessary, so that the gradient always starts
 // at 0% and ends at 100%, to make following logic 
clearer (?).
-if( aGradientStops.find(0.0) == aGradientStops.end() )
+auto a0 = aGradientStops.find( 0.0 );
+if( a0 == aGradientStops.end() )
 {
 // temp variable required
 Color aFirstColor(aGradientStops.begin()->second);
-aGradientStops[0.0] = aFirstColor;
+aGradientStops.emplace( 0.0, aFirstColor );
 }
 
-if( aGradientStops.find(1.0) == aGradientStops.end() )
+auto a1 = aGradientStops.find( 1.0 );
+if( a1 == aGradientStops.end() )
 {
 // ditto
 Color aLastColor(aGradientStops.rbegin()->second);
-aGradientStops[1.0] = aLastColor;
+aGradientStops.emplace( 1.0, aLastColor );
 }
 
 // Check if the gradient is symmetric, which we will 
emulate with an "axial" gradient.
@@ -421,7 +423,12 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 if( aItA->first != aItZ->first )
 {
 Color aMiddleColor = aItZ->second;
-aGradientStops[0.5] = aMiddleColor;
+auto a05 = aGradientStops.find( 0.5 );
+
+if( a05 != aGradientStops.end() )
+a05->second = aMiddleColor;
+else
+aGradientStops.emplace( 0.5, 
aMiddleColor );
 }
 // Drop the rest of the stops
 while( aGradientStops.rbegin()->first > 0.5 )
diff --git a/oox/source/drawingml/misccontexts.cxx 
b/oox/source/drawingml/misccontexts.cxx
index 499d5137b8b2..6e0d7651bcc5 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -63,7 +63,8 @@ ContextHandlerRef GradientFillContext::onCreateContext(
 if( rAttribs.hasAttribute( XML_pos ) )
 {
 double fPosition = getLimitedValue< double >( 
rAttribs.getDouble( XML_pos, 0.0 ) / 10.0, 0.0, 1.0 );
-return new ColorContext( *this, 
mrGradientProps.maGradientStops[ fPosition ] );
+auto aElement = mrGradientProps.maGradientStops.emplace( 
fPosition, Color() );
+return new ColorContext( *this, aElement->second );
 }
 break;
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index e75f6e8ca3d1..ddf829bcea5a 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawi

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

2017-09-18 Thread Stephan Bergmann

 sal/osl/unx/thread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f3b52bc2c289dd5684b6661bf335e9aa92d48db
Author: Stephan Bergmann 
Date:   Mon Sep 18 14:56:06 2017 +0200

The '<= 0' check can go now

...after 0083b33650c2f584ceff6eeaf9ef6993bfe0ae9b "sal: 
-Werror,-Wsign-compare
(32-bit)" cast the check against SAL_MAX_UINT32 to unsigned, anyway.  (And 
the
check for == 0 is already handled in the platform-generic part below.)

Change-Id: I0d0354cb9368bffef5d3aa835f865524d106a6f3

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index c2705c8c08cc..639e8b6cec26 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -625,7 +625,7 @@ static oslThreadIdentifier insertThreadId (pthread_t 
hThread)
 
 #if defined LINUX && ! defined __FreeBSD_kernel__
 long lin_tid = syscall(SYS_gettid);
-if (lin_tid <= 0 || SAL_MAX_UINT32 < static_cast(lin_tid))
+if (SAL_MAX_UINT32 < static_cast(lin_tid))
 std::abort();
 pEntry->Ident = static_cast(lin_tid);
 #elif defined MACOSX || defined IOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

2017-09-18 Thread Stephan Bergmann

 solenv/flatpak-manifest.in |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit e7b900855b785a73b5318e16d7f190422f97475e
Author: Stephan Bergmann 
Date:   Mon Sep 18 14:54:12 2017 +0200

Reflect recent download.lst changes to flatpak-manifest.in

Change-Id: I5df5e2384670a5ca10ad8ed30a2f6d76a0f7b906

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ee7e8f87dc56..ee9489d96d1b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -184,10 +184,10 @@
 "dest-filename": "external/tarballs/libabw-0.1.1.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2";,
-"sha256": 
"5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d",
+"url": 
"https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";,
+"sha256": 
"e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d",
 "type": "file",
-"dest-filename": "external/tarballs/libcdr-0.1.3.tar.bz2"
+"dest-filename": "external/tarballs/libcdr-0.1.4.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";,
@@ -214,10 +214,10 @@
 "dest-filename": 
"external/tarballs/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2";,
-"sha256": 
"45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877",
+"url": 
"https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";,
+"sha256": 
"0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac",
 "type": "file",
-"dest-filename": 
"external/tarballs/libfreehand-0.1.1.tar.bz2"
+"dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz";,
@@ -286,10 +286,10 @@
 "dest-filename": "external/tarballs/libvisio-0.1.5.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2";,
-"sha256": 
"efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d",
+"url": 
"https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz";,
+"sha256": 
"323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610",
 "type": "file",
-"dest-filename": "external/tarballs/libwpd-0.10.1.tar.bz2"
+"dest-filename": "external/tarballs/libwpd-0.10.2.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz";,
@@ -304,10 +304,10 @@
 "dest-filename": "external/tarballs/libwps-0.4.7.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2";,
-"sha256": 
"b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b",
+"url": 
"https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz";,
+"sha256": 
"27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22",
 "type": "file",
-"dest-filename": "external/tarballs/libzmf-0.0.1.tar.bz2"
+"dest-filename": "external/tarballs/libzmf-0.0.2.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";,
___
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' - 36/0607aa95921d0d3cde5dddbebbb39a530e7e78

2017-09-18 Thread Caolán McNamara

 36/0607aa95921d0d3cde5dddbebbb39a530e7e78 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4cc8f8713a367a6d9de838ae917bf8f62daf7976
Author: CaolÃ¡n McNamara 
Date:   Mon Sep 18 13:45:29 2017 +0100

Notes added by 'git notes add'

diff --git a/36/0607aa95921d0d3cde5dddbebbb39a530e7e78 
b/36/0607aa95921d0d3cde5dddbebbb39a530e7e78
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/36/0607aa95921d0d3cde5dddbebbb39a530e7e78
@@ -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: sw/source vcl/workben

2017-09-18 Thread Caolán McNamara

 sw/source/filter/xml/xmlimp.cxx   |   57 +-
 sw/source/uibase/app/swdll.cxx|4 +-
 sw/source/uibase/app/swmodule.cxx |4 +-
 sw/source/uibase/uiview/view0.cxx |3 +-
 vcl/workben/fftester.cxx  |   14 +
 5 files changed, 76 insertions(+), 6 deletions(-)

New commits:
commit 91c9026917ef930ab5f532ca62383a4dd6c0537c
Author: CaolÃ¡n McNamara 
Date:   Fri Sep 8 10:36:35 2017 +0100

add fodt fuzzer

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

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 5960e4092650..4ea3cebeef1e 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -53,15 +55,20 @@
 #include 
 #include "xmlimp.hxx"
 #include "xmltexti.hxx"
+#include "swdll.hxx"
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -71,6 +78,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -397,7 +405,6 @@ SwXMLImport::SwXMLImport(
 m_pDoc( nullptr )
 {
 InitItemImport();
-
 }
 
 SwXMLImport::~SwXMLImport() throw ()
@@ -1540,4 +1547,52 @@ 
com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation(css::uno::X
 return cppu::acquire(new SwXMLImport(context, 
"com.sun.star.comp.Writer.XMLOasisSettingsImporter",
 SvXMLImportFlags::SETTINGS));
 }
+
+extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportFODT(SvStream &rStream)
+{
+SwGlobals::ensure();
+
+SfxObjectShellLock xDocSh(new SwDocShell(SfxObjectCreateMode::INTERNAL));
+xDocSh->DoInitNew();
+uno::Reference xModel(xDocSh->GetModel());
+
+uno::Reference 
xMultiServiceFactory(comphelper::getProcessServiceFactory());
+uno::Reference xStream(new 
::utl::OSeekableInputStreamWrapper(rStream));
+uno::Reference 
xInterface(xMultiServiceFactory->createInstance("com.sun.star.comp.Writer.XmlFilterAdaptor"),
 uno::UNO_QUERY_THROW);
+
+css::uno::Sequence aUserData(7);
+aUserData[0] = "com.sun.star.comp.filter.OdfFlatXml";
+aUserData[2] = "com.sun.star.comp.Writer.XMLOasisImporter";
+aUserData[3] = "com.sun.star.comp.Writer.XMLOasisExporter";
+aUserData[6] = "true";
+uno::Sequence 
aAdaptorArgs(comphelper::InitPropertySequence(
+{
+{ "UserData", uno::Any(aUserData) },
+}));
+css::uno::Sequence aOuterArgs(1);
+aOuterArgs[0] <<= aAdaptorArgs;
+
+uno::Reference xInit(xInterface, 
uno::UNO_QUERY_THROW);
+xInit->initialize(aOuterArgs);
+
+uno::Reference xImporter(xInterface, 
uno::UNO_QUERY_THROW);
+uno::Sequence aArgs(comphelper::InitPropertySequence(
+{
+{ "InputStream", uno::Any(xStream) },
+{ "URL", uno::Any(OUString("private:stream")) },
+}));
+xImporter->setTargetDocument(xModel);
+
+uno::Reference xFilter(xInterface, 
uno::UNO_QUERY_THROW);
+//SetLoading hack because the document properties will be re-initted
+//by the xml filter and during the init, while its considered 
uninitialized,
+//setting a property will inform the document its modified, which attempts
+//to update the properties, which throws cause the properties are 
uninitialized
+//xDocSh->SetLoading(SfxLoadedFlags::NONE);
+bool ret = xFilter->filter(aArgs);
+//xDocSh->SetLoading(SfxLoadedFlags::ALL);
+
+return ret;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index d47a700af7a2..5bbee4388b53 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -89,7 +89,7 @@ SwDLL::SwDLL()
 xOpt.reset(new SvtModuleOptions);
 SfxObjectFactory* pDocFact = nullptr;
 SfxObjectFactory* pGlobDocFact = nullptr;
-if (xOpt && xOpt->IsWriter())
+if (!xOpt || xOpt->IsWriter())
 {
 pDocFact = &SwDocShell::Factory();
 pGlobDocFact = &SwGlobalDocShell::Factory();
@@ -103,7 +103,7 @@ SwDLL::SwDLL()
 
 pWDocFact->SetDocumentServiceName("com.sun.star.text.WebDocument");
 
-if (xOpt && xOpt->IsWriter())
+if (!xOpt || xOpt->IsWriter())
 {
 
pGlobDocFact->SetDocumentServiceName("com.sun.star.text.GlobalDocument");
 pDocFact->SetDocumentServiceName("com.sun.star.text.TextDocument");
diff --git a/sw/source/uibase/app/swmodule.cxx 
b/sw/source/uibase/app/swmodule.cxx
index 962f7e7f14f1..72af465176a9 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -235,13 +235,13 @@ void SwDLL::RegisterFactories()
 {
 // These Id's must not be changed. Through these Id's the View (resume 
Documentview)
 // is created by S

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

2017-09-18 Thread Sabin Frandes

 cui/source/options/tsaurls.cxx |   15 +++
 cui/source/options/tsaurls.hxx |3 +++
 2 files changed, 18 insertions(+)

New commits:
commit 2b74f20c67bc23f3321d8d9425300d363646f594
Author: Sabin Frandes 
Date:   Fri Sep 15 16:51:36 2017 +0200

tdf#106945 TSA Dialog: Disable delete button

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

diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index ea206fb44fd8..215a63454919 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -32,6 +32,7 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
 m_pAddBtn->SetClickHdl( LINK( this, TSAURLsDialog, AddHdl_Impl ) );
 m_pDeleteBtn->SetClickHdl( LINK( this, TSAURLsDialog, DeleteHdl_Impl ) );
 m_pOKBtn->SetClickHdl( LINK( this, TSAURLsDialog, OKHdl_Impl ) );
+m_pURLListBox->SetSelectHdl( LINK( this, TSAURLsDialog, SelectHdl ) );
 
 try
 {
@@ -49,6 +50,11 @@ TSAURLsDialog::TSAURLsDialog(vcl::Window* pParent)
 {
 SAL_WARN("cui.options", "TSAURLsDialog::TSAURLsDialog(): caught 
exception" << e.Message);
 }
+
+if ( m_pURLListBox->GetSelectEntryCount() == 0 )
+{
+m_pDeleteBtn->Disable();
+}
 }
 
 IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl, Button*, void)
@@ -106,6 +112,13 @@ IMPL_LINK_NOARG(TSAURLsDialog, AddHdl_Impl, Button*, void)
 AddTSAURL(aURL);
 m_pOKBtn->Enable();
 }
+// After operations in a ListBox we have nothing selected
+m_pDeleteBtn->Disable();
+}
+
+IMPL_LINK_NOARG(TSAURLsDialog, SelectHdl, ListBox&, void)
+{
+m_pDeleteBtn->Enable();
 }
 
 IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl, Button*, void)
@@ -117,6 +130,8 @@ IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl, Button*, 
void)
 
 m_aURLs.erase(m_pURLListBox->GetEntry(nSel));
 m_pURLListBox->RemoveEntry(nSel);
+// After operations in a ListBox we have nothing selected
+m_pDeleteBtn->Disable();
 m_pOKBtn->Enable();
 }
 
diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx
index 0ab0cf81d0b0..6fc28b0b83e8 100644
--- a/cui/source/options/tsaurls.hxx
+++ b/cui/source/options/tsaurls.hxx
@@ -24,6 +24,9 @@ private:
 DECL_LINK(AddHdl_Impl, Button*, void);
 DECL_LINK(DeleteHdl_Impl, Button*, void);
 DECL_LINK(OKHdl_Impl, Button*, void);
+// After operations in a ListBox we have nothing selected
+// Is Selected element handler for the ListBox
+DECL_LINK(SelectHdl, ListBox&, void);
 
 std::set m_aURLs;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Text on OLE objects?

2017-09-18 Thread Regina Henschel


Hi all,


Regina Henschel schrieb:

Hi all,

Currently there is muddle in the UI and in code.

Insert a chart or Math object or an OLE to a foreign application, then
click on it so that is gets green handles, then press F2 and enter text.
That is the same behavior as for normal shapes, where you can add text
to the shape that way. But when you save and reload the document, the
text on the OLE is gone. (I think, there is no bug report yet.)


The missing text error is in in 
https://bugs.documentfoundation.org/show_bug.cgi?id=106262


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

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

2017-09-18 Thread Michael Stahl

 hwpfilter/source/grammar.cxx |9 +++--
 vcl/inc/unx/cpdmgr.hxx   |6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit f7c3d1a1a75c68147641caee805d36b847c23fab
Author: Michael Stahl 
Date:   Mon Sep 18 14:03:25 2017 +0200

vcl: [loplugin:reservedid]

Change-Id: I47d4322f094456761e497b3ca5feb5a5dfc73704

diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index de8aab4547ce..dea353384f1b 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -25,6 +25,9 @@
 
 #if ENABLE_DBUS && ENABLE_GIO
 #include 
+#else
+typedef struct _GDBusProxy GDBusProxy;
+typedef struct _GDBusConnection GDBusConnection;
 #endif
 
 #include "printerinfomanager.hxx"
@@ -34,9 +37,6 @@
 #define FRONTEND_INTERFACE 
"/usr/share/dbus-1/interfaces/org.openprinting.Frontend.xml"
 #define BACKEND_INTERFACE 
"/usr/share/dbus-1/interfaces/org.openprinting.Backend.xml"
 
-typedef struct _GDBusProxy GDBusProxy;
-typedef struct _GDBusConnection GDBusConnection;
-
 namespace psp
 {
 
commit 629661de4a804bebaf2368adb865d14d04fa81ce
Author: Michael Stahl 
Date:   Mon Sep 18 13:51:21 2017 +0200

hwpfilter: [loplugin:redundantcast]

Change-Id: Ib8fbe3babc9eb2b0b1125de62b0b8012ac710889

diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index a3ce4d3a8253..8c593a01315a 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -572,15 +572,12 @@ yynewstate:
 yystacksize = YYMAXDEPTH;
   yyfree_stacks = 1;
   yyss = static_cast(malloc (yystacksize * sizeof (*yyssp)));
-  memcpy (yyss, yyss1,
-   size * (unsigned int) sizeof (*yyssp));
+  memcpy (yyss, yyss1, size * sizeof (*yyssp));
   yyvs = static_cast(malloc (yystacksize * sizeof (*yyvsp)));
-  memcpy (yyvs, yyvs1,
-   size * (unsigned int) sizeof (*yyvsp));
+  memcpy (yyvs, yyvs1, size * sizeof (*yyvsp));
 #ifdef YYLSP_NEEDED
   yyls = (YYLTYPE *) malloc (yystacksize * sizeof (*yylsp));
-  memcpy ((char *)yyls, (char *)yyls1,
-   size * (unsigned int) sizeof (*yylsp));
+  memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
 #endif
 #endif /* no yyoverflow */
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 11 commits - accessibility/source drawinglayer/source editeng/source framework/inc framework/Library_fwe.mk framework/source include/drawinglayer include/editeng includ

2017-09-18 Thread Noel Grandin

 accessibility/source/extended/accessiblelistboxentry.cxx|4 -
 drawinglayer/source/processor3d/shadow3dextractor.cxx   |5 -
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |   20 -
 editeng/source/items/numitem.cxx|6 +
 framework/Library_fwe.mk|1 
 framework/inc/uielement/menubarmanager.hxx  |1 
 framework/source/fwe/classes/menuextensionsupplier.cxx  |   47 
 framework/source/uielement/menubarmanager.cxx   |   32 
 include/drawinglayer/processor3d/shadow3dextractor.hxx  |5 -
 include/editeng/AccessibleEditableTextPara.hxx  |2 
 include/editeng/numitem.hxx |1 
 include/framework/menuextensionsupplier.hxx |   43 --
 include/linguistic/lngprophelp.hxx  |3 
 include/sfx2/sidebar/ControllerItem.hxx |3 
 include/svtools/accessibleruler.hxx |5 -
 include/svtools/editbrowsebox.hxx   |1 
 include/svtools/treelistbox.hxx |3 
 include/svx/dlgctrl.hxx |1 
 include/ucbhelper/resultsetmetadata.hxx |   18 
 linguistic/source/lngprophelp.cxx   |5 -
 sfx2/source/sidebar/ControllerItem.cxx  |   14 ---
 svtools/source/brwbox/ebbcontrols.cxx   |4 -
 svtools/source/contnr/treelistbox.cxx   |   37 -
 svtools/source/control/accessibleruler.cxx  |3 
 svx/source/dialog/dlgctrl.cxx   |2 
 ucbhelper/source/provider/resultsetmetadata.cxx |   44 ++-
 26 files changed, 31 insertions(+), 279 deletions(-)

New commits:
commit 1f38a0fe112c6293d04357ad2082255aaaf7e7b3
Author: Noel Grandin 
Date:   Mon Sep 18 13:43:47 2017 +0200

unused nResMaxNumberOfSuggestions in PropertyHelper_Spell

since

commit a111044babf3ee929baf548b7ad29df0a419293b
Date:   Wed Jul 15 10:49:17 2015 +0200
loplugin:unusedmethods linguistic

Change-Id: I329c53b739395e9332b767562a138b52ce2fe588

diff --git a/include/linguistic/lngprophelp.hxx 
b/include/linguistic/lngprophelp.hxx
index 6a52633f681b..f8613deb454e 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -175,7 +175,6 @@ class LNG_DLLPUBLIC PropertyHelper_Spell :
 boolbIsSpellCapitalization;
 
 // return values, will be set to default value or current temporary value
-sal_Int16   nResMaxNumberOfSuggestions; // special value that is not part 
of the property set and thus needs to be handled differently
 boolbResIsSpellUpperCase;
 boolbResIsSpellWithDigits;
 boolbResIsSpellCapitalization;
@@ -202,8 +201,6 @@ public:
 virtual void SAL_CALL
 propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
 
-static sal_Int16 GetDefaultNumberOfSuggestions() { return 16; }
-
 boolIsSpellUpperCase() const{ return 
bResIsSpellUpperCase; }
 boolIsSpellWithDigits() const   { return 
bResIsSpellWithDigits; }
 boolIsSpellCapitalization() const   { return 
bResIsSpellCapitalization; }
diff --git a/linguistic/source/lngprophelp.cxx 
b/linguistic/source/lngprophelp.cxx
index 0bf1a52db3fc..475b9c505525 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -342,8 +342,6 @@ PropertyHelper_Spell::PropertyHelper_Spell(
 AddPropNames( aSP, SAL_N_ELEMENTS(aSP) );
 SetDefaultValues();
 GetCurrentValues();
-
-nResMaxNumberOfSuggestions = GetDefaultNumberOfSuggestions();
 }
 
 
@@ -474,7 +472,6 @@ void PropertyHelper_Spell::SetTmpPropVals( const 
PropertyValues &rPropVals )
 
 // return value is default value unless there is an explicitly supplied
 // temporary value
-nResMaxNumberOfSuggestions  = GetDefaultNumberOfSuggestions();
 bResIsSpellWithDigits   = bIsSpellWithDigits;
 bResIsSpellCapitalization   = bIsSpellCapitalization;
 bResIsSpellUpperCase= bIsSpellUpperCase;
@@ -487,7 +484,7 @@ void PropertyHelper_Spell::SetTmpPropVals( const 
PropertyValues &rPropVals )
 {
 if ( pVal[i].Name == UPN_MAX_NUMBER_OF_SUGGESTIONS )
 {
-pVal[i].Value >>= nResMaxNumberOfSuggestions;
+// special value that is not part of the property set and thus 
needs to be handled differently
 }
 else
 {
commit feddb8cb73db799e89b84ea8fd8c2057fdebca91
Author: Noel Grandin 
Date:   Mon Sep 18 13:38:17 2017 +0200

maPrimitiveColor in Shadow3DExtractingProcessor unused

since

commit 9927e1ca23c8353c880a3ae0a196caabdf747c4

[Libreoffice-commits] core.git: 2 commits - bridges/source solenv/CompilerTest_compilerplugins_clang.mk

2017-09-18 Thread Michael Stahl

 bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx |2 +-
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx |2 +-
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx   |2 +-
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx|2 +-
 bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx |2 +-
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx   |2 +-
 bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx  |2 +-
 bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx  |2 +-
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx |2 +-
 bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx  |2 +-
 bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx  |2 +-
 bridges/source/cpp_uno/gcc3_linux_mips64/uno2cpp.cxx|2 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx   |2 +-
 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |2 +-
 bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx  |2 +-
 bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx |2 +-
 bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx |2 +-
 bridges/source/cpp_uno/gcc3_linux_sparc64/uno2cpp.cxx   |2 +-
 bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx   |2 +-
 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx   |2 +-
 bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx |2 +-
 solenv/CompilerTest_compilerplugins_clang.mk|2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 1c92a7fa0ae96724a08ac5f6dd22154b60484f6a
Author: Michael Stahl 
Date:   Mon Sep 18 13:33:43 2017 +0200

clang plugins: this test fails on 32-bit Linux

... where sal_uIntPtr and sal_uInt32 are both "unsigned long";
 disable test for now.

Change-Id: I8357bf425ab5d9166cd45ba5fb81ec6c1fac957a
error: 'error' diagnostics expected but not seen:
  File compilerplugins/clang/test/convertuintptr.cxx Line 15: cast from 
'sal_uIntPtr' (aka 'unsigned {{.+}}') to 'sal_uInt32' (aka 'unsigned {{.+}}') 
[loplugin:convertuintptr]
  File compilerplugins/clang/test/convertuintptr.cxx Line 16: cast from 
'sal_uIntPtr' (aka 'unsigned {{.+}}') to 'sal_uInt32' (aka 'unsigned {{.+}}') 
[loplugin:convertuintptr]

diff --git a/solenv/CompilerTest_compilerplugins_clang.mk 
b/solenv/CompilerTest_compilerplugins_clang.mk
index 1a6001eb6a9f..02d6155d3dd5 100644
--- a/solenv/CompilerTest_compilerplugins_clang.mk
+++ b/solenv/CompilerTest_compilerplugins_clang.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_CompilerTest_CompilerTest,compilerplugins_clang))
 $(eval $(call gb_CompilerTest_add_exception_objects,compilerplugins_clang, \
 compilerplugins/clang/test/casttovoid \
 compilerplugins/clang/test/constparams \
-compilerplugins/clang/test/convertuintptr \
+$(if $(filter-out INTEL,$(CPU)),compilerplugins/clang/test/convertuintptr) 
\
 compilerplugins/clang/test/cppunitassertequals \
 compilerplugins/clang/test/datamembershadow \
 compilerplugins/clang/test/droplong \
commit 5581ab4a1376f9c0353a00c9191839773143a942
Author: Michael Stahl 
Date:   Mon Sep 18 13:33:20 2017 +0200

bridges: [loplugin:stringconstant]

Change-Id: I07501ac3593cd5df713b74e04ea64d22365958b9

diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
index 5996460314a2..6024ceed5cae 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx
@@ -470,7 +470,7 @@ void unoInterfaceProxyDispatch(
 default:
 {
 ::com::sun::star::uno::RuntimeException aExc(
-OUString("illegal member type description!"),
+"illegal member type description!",
 ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >() );
 
 Type const & rExcType = cppu::UnoType::get();
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
index 40bd6212fd6b..b11e4bdd1cce 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx
@@ -670,7 +670,7 @@ void unoInterfaceProxyDispatch(
 default:
 {
 ::com::sun::star::uno::RuntimeException aExc(
-OUString("illegal member type description!"),
+"illegal member type description!",
 ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XInterface >() );
 
 Type const & rExcType = cppu::UnoType::get();
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
index 45491094ceb6..7915fa7a9513 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx
@@ -540,7 +540,7 @@ void unoInterfaceProxyDispatch(
 def

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

2017-09-18 Thread Serge Krot

 sw/uiconfig/swform/toolbar/mailmerge.xml   |3 +++
 sw/uiconfig/swreport/toolbar/mailmerge.xml |3 +++
 sw/uiconfig/swriter/toolbar/mailmerge.xml  |3 +++
 sw/uiconfig/swxform/toolbar/mailmerge.xml  |3 +++
 4 files changed, 12 insertions(+)

New commits:
commit 2c60cc41e6990cbc0812c299a70cffc07c581175
Author: Serge Krot 
Date:   Fri Sep 15 17:43:17 2017 +0200

tdf#109118 Added new buttons into Mail Merge toolbar

New buttons are:
- uno:ViewDataSourceBrowser
- uno:AddressBookSource

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

diff --git a/sw/uiconfig/swform/toolbar/mailmerge.xml 
b/sw/uiconfig/swform/toolbar/mailmerge.xml
index ff9773d5eab4..8ae9c2f40b27 100644
--- a/sw/uiconfig/swform/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swform/toolbar/mailmerge.xml
@@ -22,4 +22,7 @@
   
   
   
+  
+  
+  
 
diff --git a/sw/uiconfig/swreport/toolbar/mailmerge.xml 
b/sw/uiconfig/swreport/toolbar/mailmerge.xml
index ff9773d5eab4..8ae9c2f40b27 100644
--- a/sw/uiconfig/swreport/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swreport/toolbar/mailmerge.xml
@@ -22,4 +22,7 @@
   
   
   
+  
+  
+  
 
diff --git a/sw/uiconfig/swriter/toolbar/mailmerge.xml 
b/sw/uiconfig/swriter/toolbar/mailmerge.xml
index ff9773d5eab4..8ae9c2f40b27 100644
--- a/sw/uiconfig/swriter/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swriter/toolbar/mailmerge.xml
@@ -22,4 +22,7 @@
   
   
   
+  
+  
+  
 
diff --git a/sw/uiconfig/swxform/toolbar/mailmerge.xml 
b/sw/uiconfig/swxform/toolbar/mailmerge.xml
index ff9773d5eab4..8ae9c2f40b27 100644
--- a/sw/uiconfig/swxform/toolbar/mailmerge.xml
+++ b/sw/uiconfig/swxform/toolbar/mailmerge.xml
@@ -22,4 +22,7 @@
   
   
   
+  
+  
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Git help needed: update local repo to specific branch or tag

2017-09-18 Thread Stephan Bergmann


On 09/18/2017 11:20 AM, Miklos Vajna wrote:

Depending on 'git remote add' was invoked with the --mirror=fetch
option (either directly or via 'git clone --mirror') .git/config
contains something like:


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

[Libreoffice-commits] dev-tools.git: flatpak/build.sh

2017-09-18 Thread Stephan Bergmann

 flatpak/build.sh |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit ae839720577de1c717cbad20c305ba592183096d
Author: Stephan Bergmann 
Date:   Mon Sep 18 13:15:34 2017 +0200

Reliably accept both tags and branches

The original code would not have fast-forwarded branches.  The new code 
avoids
that by not doing a local checkout anyway.  Additionally, --mirror ensures 
that
branch names don't need to be prefixed with "origin/" in the 'git show' 
command.

diff --git a/flatpak/build.sh b/flatpak/build.sh
index fab02d7..3e8fffa 100755
--- a/flatpak/build.sh
+++ b/flatpak/build.sh
@@ -47,17 +47,16 @@ my_gpgkeyid="${5?}"
 
 mkdir -p "${my_dir?}"
 
-if [ -e "${my_dir?}"/lo ]; then
- git -C "${my_dir?}"/lo fetch --tags
- git -C "${my_dir?}"/lo checkout "${my_gitbranch?}"
-else
- git clone --branch "${my_gitbranch?}" git://gerrit.libreoffice.org/core \
-  "${my_dir?}"/lo
+if [ ! -e "${my_dir?}"/lo ]; then
+ git clone --mirror git://gerrit.libreoffice.org/core "${my_dir?}"/lo
 fi
 
+rm -f "${my_dir?}"/manifest.in
+git -C "${my_dir?}"/lo show "${my_gitbranch?}":solenv/flatpak-manifest.in \
+ > "${my_dir?}"/manifest.in
+
 rm -f "${my_dir?}"/manifest.json
-sed "s/@BRANCH@/${my_gitbranch?}/" \
- < "${my_dir?}"/lo/solenv/flatpak-manifest.in > "${my_dir?}"/manifest.json
+sed "s!@BRANCH@!${my_gitbranch?}!" < manifest.in > "${my_dir?}"/manifest.json
 
 flatpak-builder --default-branch="${my_flatpakbranch?}" \
  --repo="${my_dir?}"/repository --gpg-homedir="${my_gpghomedir?}" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source filter/source include/editeng oox/source sc/source sd/inc sd/source

2017-09-18 Thread Noel Grandin

 editeng/source/items/flditem.cxx |   43 +---
 editeng/source/uno/unofield.cxx  |7 +--
 filter/source/msfilter/svdfppt.cxx   |   16 +++
 filter/source/svg/svgexport.cxx  |   74 +--
 filter/source/svg/svgfilter.hxx  |5 +-
 include/editeng/flditem.hxx  |   29 +++--
 oox/source/export/drawingml.cxx  |   13 +++---
 sc/source/ui/unoobj/fielduno.cxx |2 
 sd/inc/sdpage.hxx|4 +
 sd/source/core/sdpage.cxx|6 +-
 sd/source/filter/eppt/eppt.cxx   |8 +--
 sd/source/filter/ppt/pptin.cxx   |3 -
 sd/source/ui/app/sdmod2.cxx  |3 -
 sd/source/ui/app/sdpopup.cxx |   16 +++
 sd/source/ui/dlg/dlgfield.cxx|   18 
 sd/source/ui/dlg/headerfooterdlg.cxx |   56 ++
 sd/source/ui/unoidl/unomodel.cxx |4 +
 sd/source/ui/unoidl/unopage.cxx  |9 +++-
 18 files changed, 171 insertions(+), 145 deletions(-)

New commits:
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
Author: Noel Grandin 
Date:   Fri Sep 15 13:55:39 2017 +0200

convert SvxDateFormat to scoped enum

And simplify the code in sd/headerfooterdlg, no
need for the complex encoding of date and time when we
can just index into a static array.

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

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 50061b0d4bef..f69fcf4fbb12 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -71,7 +71,8 @@ SvxFieldData* SvxFieldData::Create(const 
uno::Reference& xTe
 SvxDateField* pData = new SvxDateField(aDate, bIsFixed 
? SvxDateType::Fix : SvxDateType::Var);
 sal_Int32 nNumFmt = -1;
 xPropSet->getPropertyValue(UNO_TC_PROP_NUMFORMAT) >>= 
nNumFmt;
-if (nNumFmt >= SVXDATEFORMAT_APPDEFAULT && nNumFmt <= 
SVXDATEFORMAT_F)
+if (static_cast(nNumFmt) >= 
SvxDateFormat::AppDefault &&
+static_cast(nNumFmt) <= 
SvxDateFormat::F)
 
pData->SetFormat(static_cast(nNumFmt));
 
 return pData;
@@ -314,7 +315,7 @@ SvxDateField::SvxDateField()
 {
 nFixDate = Date( Date::SYSTEM ).GetDate();
 eType = SvxDateType::Var;
-eFormat = SVXDATEFORMAT_STDSMALL;
+eFormat = SvxDateFormat::StdSmall;
 }
 
 
@@ -358,50 +359,50 @@ OUString SvxDateField::GetFormatted( SvNumberFormatter& 
rFormatter, LanguageType
 
 OUString SvxDateField::GetFormatted( Date const & aDate, SvxDateFormat 
eFormat, SvNumberFormatter& rFormatter, LanguageType eLang )
 {
-if ( eFormat == SVXDATEFORMAT_SYSTEM )
+if ( eFormat == SvxDateFormat::System )
 {
-OSL_FAIL( "SVXDATEFORMAT_SYSTEM not implemented!" );
-eFormat = SVXDATEFORMAT_STDSMALL;
+OSL_FAIL( "SvxDateFormat::System not implemented!" );
+eFormat = SvxDateFormat::StdSmall;
 }
-else if ( eFormat == SVXDATEFORMAT_APPDEFAULT )
+else if ( eFormat == SvxDateFormat::AppDefault )
 {
-OSL_FAIL( "SVXDATEFORMAT_APPDEFAULT: take them from where? ");
-eFormat = SVXDATEFORMAT_STDSMALL;
+OSL_FAIL( "SvxDateFormat::AppDefault: take them from where? ");
+eFormat = SvxDateFormat::StdSmall;
 }
 
 sal_uInt32 nFormatKey;
 
 switch( eFormat )
 {
-case SVXDATEFORMAT_STDSMALL:
+case SvxDateFormat::StdSmall:
 // short
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYSTEM_SHORT, 
eLang );
 break;
-case SVXDATEFORMAT_STDBIG:
+case SvxDateFormat::StdBig:
 // long
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYSTEM_LONG, eLang 
);
 break;
-case SVXDATEFORMAT_A:
+case SvxDateFormat::A:
 // 13.02.96
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYS_DDMMYY, eLang 
);
 break;
-case SVXDATEFORMAT_B:
+case SvxDateFormat::B:
 // 13.02.1996
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYS_DDMM, 
eLang );
 break;
-case SVXDATEFORMAT_C:
+case SvxDateFormat::C:
 // 13. Feb 1996
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYS_DMMM, 
eLang );
 break;
-case SVXDATEFORMAT_D:
+case SvxDateFormat::D:
 // 13. February 1996
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYS_D, 
eLang );
 break;
-case SVXDATEFORMAT_E:
+case SvxDateFormat::E:
 // The, 13. February 1996
 nFormatKey = rFormatter.GetFormatIndex( NF_DATE_SYS_NND, 
eLang );
 break;
-case SVX

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

2017-09-18 Thread Michael Stahl

 sal/osl/unx/thread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0083b33650c2f584ceff6eeaf9ef6993bfe0ae9b
Author: Michael Stahl 
Date:   Mon Sep 18 12:44:24 2017 +0200

sal: -Werror,-Wsign-compare (32-bit)

Change-Id: I204716eea112a1c99f6ac4df0d138c4c7d8b68e3

diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx
index 9c7bb372d592..c2705c8c08cc 100644
--- a/sal/osl/unx/thread.cxx
+++ b/sal/osl/unx/thread.cxx
@@ -625,7 +625,7 @@ static oslThreadIdentifier insertThreadId (pthread_t 
hThread)
 
 #if defined LINUX && ! defined __FreeBSD_kernel__
 long lin_tid = syscall(SYS_gettid);
-if (lin_tid <= 0 || lin_tid > SAL_MAX_UINT32)
+if (lin_tid <= 0 || SAL_MAX_UINT32 < static_cast(lin_tid))
 std::abort();
 pEntry->Ident = static_cast(lin_tid);
 #elif defined MACOSX || defined IOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Caolán McNamara

 vcl/source/gdi/jobset.cxx |   22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit f68b66891fea7599e84395325c12cd845a308315
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 17 17:38:39 2017 +0100

detect corrupted job setup

Change-Id: I0d3b4850c3d4c015a0a7e5d36d87113a749c7e0f
Reviewed-on: https://gerrit.libreoffice.org/42384
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index ecea840d2393..57c02b95b557 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -236,7 +236,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 
 sal_uInt16 nSystem = 0;
 rIStream.ReadUInt16( nSystem );
-const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
 if (nRead > rIStream.remainingSize())
 {
 SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
@@ -245,7 +245,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 sal_uInt64 const nFirstPos = rIStream.Tell();
 std::unique_ptr pTempBuf(new char[nRead]);
-rIStream.ReadBytes(pTempBuf.get(), nRead);
+nRead = rIStream.ReadBytes(pTempBuf.get(), nRead);
 if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = 
reinterpret_cast(pTempBuf.get());
@@ -275,11 +275,19 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 rJobData.SetPaperHeight( (long)SVBT32ToUInt32( 
pOldJobData->nPaperHeight ) );
 if ( rJobData.GetDriverDataLen() )
 {
-const sal_uInt8* pDriverData = 
reinterpret_cast(pOldJobData) + nOldJobDataSize;
-sal_uInt8* pNewDriverData = static_cast(
-rtl_allocateMemory( rJobData.GetDriverDataLen() ));
-memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
-rJobData.SetDriverData( pNewDriverData );
+const char* pDriverData = reinterpret_cast(pOldJobData) + nOldJobDataSize;
+const char* pDriverDataEnd = pDriverData + 
rJobData.GetDriverDataLen();
+if (pDriverDataEnd > pTempBuf.get() + nRead)
+{
+SAL_WARN("vcl", "corrupted job setup");
+}
+else
+{
+sal_uInt8* pNewDriverData = static_cast(
+rtl_allocateMemory( rJobData.GetDriverDataLen() ));
+memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
+rJobData.SetDriverData( pNewDriverData );
+}
 }
 if( nSystem == JOBSET_FILE605_SYSTEM )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Caolán McNamara

 starmath/source/smdetect.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e577828583bbebc1fbfdb8960aa45a0b634cd5f8
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 17 14:22:45 2017 +0100

valgrind: Conditional jump or move depends on uninitialised value

 Conditional jump or move depends on uninitialised value(s)
at 0x4C3535E: strstr (vg_replace_strmem.c:1623)
by 0x4FCD9E59: 
SmFilterDetect::detect(com::sun::star::uno::Sequence&)
 (smdetect.cxx:102)
by 0x41A1A774: 
filter::config::TypeDetection::impl_askDetectService(rtl::OUString const&, 
utl::MediaDescriptor&) (typedetection.cxx:1038)

Change-Id: I2f98fd3f7799f34cb5bd9242379ce6440645034d
Reviewed-on: https://gerrit.libreoffice.org/42381
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 64aa36e8b999ea4dcad69904da941705effad618)
Reviewed-on: https://gerrit.libreoffice.org/42386
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 55283530e86a..8e2953b34227 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -93,12 +93,12 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< 
PropertyValue >& lDescriptor
 // stuff I hope?
 static const sal_uInt16 nBufferSize = 200;
 char aBuffer[nBufferSize+1];
-aBuffer[nBufferSize] = 0;
 pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
 pInStrm->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW ); // 
avoid BOM marker
 sal_uLong nBytesRead = pInStrm->ReadBytes( aBuffer, nBufferSize );
 if (nBytesRead >= 6)
 {
+aBuffer[nBytesRead] = 0;
 bool bIsMathType = false;
 if (0 == strncmp( "" ) ||
___
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

2017-09-18 Thread Caolán McNamara

 vcl/source/gdi/jobset.cxx |   22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 1eb3822d74f535f75aa336b27568ee8a6084c4dd
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 17 17:38:39 2017 +0100

detect corrupted job setup

Change-Id: I0d3b4850c3d4c015a0a7e5d36d87113a749c7e0f
Reviewed-on: https://gerrit.libreoffice.org/42385
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index f80e246a5c68..31ee4f08dca5 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -239,7 +239,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 
 sal_uInt16 nSystem = 0;
 rIStream.ReadUInt16( nSystem );
-const size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
+size_t nRead = nLen - sizeof(nLen) - sizeof(nSystem);
 if (nRead > rIStream.remainingSize())
 {
 SAL_WARN("vcl", "Parsing error: " << rIStream.remainingSize() <<
@@ -248,7 +248,7 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 }
 sal_uInt64 const nFirstPos = rIStream.Tell();
 std::unique_ptr pTempBuf(new char[nRead]);
-rIStream.ReadBytes(pTempBuf.get(), nRead);
+nRead = rIStream.ReadBytes(pTempBuf.get(), nRead);
 if (nRead >= sizeof(ImplOldJobSetupData))
 {
 ImplOldJobSetupData* pData = 
reinterpret_cast(pTempBuf.get());
@@ -278,11 +278,19 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& 
rJobSetup )
 rJobData.SetPaperHeight( (long)SVBT32ToUInt32( 
pOldJobData->nPaperHeight ) );
 if ( rJobData.GetDriverDataLen() )
 {
-const sal_uInt8* pDriverData = 
reinterpret_cast(pOldJobData) + nOldJobDataSize;
-sal_uInt8* pNewDriverData = static_cast(
-rtl_allocateMemory( rJobData.GetDriverDataLen() ));
-memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
-rJobData.SetDriverData( pNewDriverData );
+const char* pDriverData = reinterpret_cast(pOldJobData) + nOldJobDataSize;
+const char* pDriverDataEnd = pDriverData + 
rJobData.GetDriverDataLen();
+if (pDriverDataEnd > pTempBuf.get() + nRead)
+{
+SAL_WARN("vcl", "corrupted job setup");
+}
+else
+{
+sal_uInt8* pNewDriverData = static_cast(
+rtl_allocateMemory( rJobData.GetDriverDataLen() ));
+memcpy( pNewDriverData, pDriverData, 
rJobData.GetDriverDataLen() );
+rJobData.SetDriverData( pNewDriverData );
+}
 }
 if( nSystem == JOBSET_FILE605_SYSTEM )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Red Line (Track Changes) Geometry

2017-09-18 Thread Aud Wyvern


Hi,

I'm trying to change the thickness of the 'redline' that appears in the 
margin to show a line that has changed. I've altered the geometries in 
SwMarkPreview::Paint() in optpage.cxx but this does not seem to be the 
right place as even placing a return at the start of this method seems 
to have no effect on the output. I'd appreciate a pointer to the correct 
area in the code.


Thanks.

A


Background:

The track changes red line in the margins is perfectly visible on my 
screen, but when printed or converted to pdf, it outputs very thinly, I 
think as a 'hairline'. I suspect my printer printer driver interprets 
this literally and the resulting line is barely visible on paper, and 
hence not much use. I thought others might have this problem, so I 
thought I'd try hacking the code to fix it, by allowing the line style 
to be adjusted (or at least hacked to 2pt). Sorry, it's my first time 
editing libreoffice.


I'm using Ubuntu 17.04;
Help About says: Version: 6.0.0.0.alpha0+
I run the compiled code using: instdir/program/soffice --writer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2017-09-18 Thread Rene Engelhard

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

New commits:
commit 050b1d0924aeaec6be5ca520617c5e511d99571a
Author: Rene Engelhard 
Date:   Mon Sep 18 11:43:51 2017 +0200

use pkg-config --modversion to check for ICU version

... since icu-config is removed at least in Debians icu 59.1 packages.
icu-i18n exists since exactly 4.6 (which we require anyway) so we can
remove that check, too

Change-Id: I28bd1509dcc2c52e22f91fb26421fcd585323b24

diff --git a/configure.ac b/configure.ac
index 5f72318268ce..b4932349a165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8872,23 +8872,14 @@ if test "$with_system_icu" = "yes"; then
 AC_LANG_POP([C++])
 
 if test "$cross_compiling" != "yes"; then
-AC_PATH_PROG(ICUCONFIG,icu-config)
-
-AC_MSG_CHECKING([ICU version])
-ICU_VERSION=`$ICUCONFIG --noverify --version 2>/dev/null || $ICUCONFIG 
--version`
+PKG_CHECK_MODULES(ICU, icu-i18n >= 4.6)
+ICU_VERSION=`$PKG_CONFIG --modversion icu-i18n 2>/dev/null`
 ICU_MAJOR=`echo $ICU_VERSION | cut -d"." -f1`
 ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2`
-
-if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" 
-ge "6" \); then
-AC_MSG_RESULT([OK, $ICU_VERSION])
-else
-AC_MSG_ERROR([not suitable, only >= 4.6 supported currently])
-fi
 fi
 
 if test "$cross_compiling" = "yes" -a \( "$with_system_icu_for_build" = 
"yes" -o "$with_system_icu_for_build" = "force" \); then
-AC_PATH_PROG([ICUCONFIG_FOR_BUILD], [icu-config], [], 
[$PATH:/usr/sbin:/sbin])
-ICU_VERSION_FOR_BUILD=`$ICUCONFIG_FOR_BUILD --noverify --version 
2>/dev/null || $ICUCONFIG_FOR_BUILD --version`
+ICU_VERSION_FOR_BUILD=`$PKG_CONFIG --modversion icu-i18n 2>/dev/null`
 ICU_MAJOR_FOR_BUILD=`echo $ICU_VERSION_FOR_BUILD | cut -d"." -f1`
 ICU_MINOR_FOR_BUILD=`echo $ICU_VERSION_FOR_BUILD | cut -d"." -f2`
 AC_MSG_CHECKING([if MinGW and system versions of ICU are compatible])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com wizards/source writerfilter/source xmloff/source

2017-09-18 Thread Johnny_M

 wizards/com/sun/star/wizards/db/CommandName.java |2 +-
 wizards/com/sun/star/wizards/db/DBMetaData.java  |2 +-
 wizards/com/sun/star/wizards/db/FieldColumn.java |4 ++--
 wizards/com/sun/star/wizards/db/RecordParser.java|2 +-
 wizards/com/sun/star/wizards/table/FieldDescription.java |2 +-
 wizards/source/formwizard/Layouter.xba   |2 +-
 wizards/source/gimmicks/GetTexts.xba |2 +-
 wizards/source/tools/Misc.xba|8 
 wizards/source/tutorials/Functions.xba   |2 +-
 writerfilter/source/dmapper/PropertyMap.cxx  |2 +-
 xmloff/source/text/txtexppr.cxx  |4 ++--
 11 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 510b9557c37c666016c55e6ed2be7a50dbd1b67f
Author: Johnny_M 
Date:   Sun Sep 17 14:23:46 2017 +0200

Translate German comments and debug strings (leftovers in dirs w... and 
x...)

Translates leftovers found using a custom regex in directories beginning 
with "w" and "x".

Additionally:
- A few corrections of previous translations

Change-Id: Ic30cf6792748a6bea8782a9a3711fa468b80bdaf
Reviewed-on: https://gerrit.libreoffice.org/42378
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/wizards/com/sun/star/wizards/db/CommandName.java 
b/wizards/com/sun/star/wizards/db/CommandName.java
index 91e54ed3ba25..4768018ef3b5 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -87,7 +87,7 @@ public class CommandName
 this.DisplayName = _DisplayName;
 int iIndex;
 if 
(oCommandMetaData.xDBMetaData.supportsCatalogsInDataManipulation())
-{ // ...dann Catalog mit in TableName
+{ // ...then Catalog also in TableName
 iIndex = _DisplayName.indexOf(sCatalogSep);
 if (iIndex >= 0)
 {
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java 
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 8d90126d3e5e..1a720b0ac3a5 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -351,7 +351,7 @@ public class DBMetaData
 WidthList[4][0] = DataType.LONGVARCHAR; // ==  -1;
 WidthList[5][0] = DataType.CHAR; // ==   1;
 WidthList[6][0] = DataType.NUMERIC; // ==   2;
-WidthList[7][0] = DataType.DECIMAL; // ==   3;  [mit Nachkommastellen]
+WidthList[7][0] = DataType.DECIMAL; // ==   3;  [with fractional part]
 WidthList[8][0] = DataType.INTEGER; // ==   4;
 WidthList[9][0] = DataType.SMALLINT; // ==   5;
 WidthList[10][0] = DataType.FLOAT; // ==   6;
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java 
b/wizards/com/sun/star/wizards/db/FieldColumn.java
index 29e4b3939194..dd8b85a9207e 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -266,7 +266,7 @@ public class FieldColumn
 bIsNumberFormat = true;
 break;
 
-case DataType.DECIMAL: // ==   3;  [mit Nachkommastellen]
+case DataType.DECIMAL: // ==   3;  [with fractional part]
 case DataType.FLOAT: // ==   6;
 case DataType.REAL: // ==   7;
 case DataType.DOUBLE: // ==   8;
@@ -369,7 +369,7 @@ public class FieldColumn
 break;
 
 case DataType.NUMERIC: // ==   2;
-case DataType.DECIMAL: // ==   3;  [mit Nachkommastellen]
+case DataType.DECIMAL: // ==   3;  [with fractional part]
 case DataType.FLOAT: // ==   6;
 case DataType.REAL: // ==   7;
 case DataType.DOUBLE: // ==   8;
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java 
b/wizards/com/sun/star/wizards/db/RecordParser.java
index c06566874cef..bb35b041fe97 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -127,7 +127,7 @@ public class RecordParser extends QueryMetaData
 case DataType.NUMERIC: // ==   2;
 case DataType.INTEGER: // ==   4;
 case DataType.SMALLINT: // ==   5;
-case DataType.DECIMAL: // ==   3;  [mit Nachkommastellen]
+case DataType.DECIMAL: // ==   3;  [with fractional part]
 case DataType.FLOAT: // ==   6;
 case DataType.REAL: // ==   7;
 case DataType.DOUBLE: // ==   8;
diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java 
b/wizards/com/sun/star/wizards/table/FieldDescription.java
index 2128a760eabe..95a847136360 100644
--- a/wizards/com/sun/star/wizards/table/FieldDescription.java
+++ b/wizards/com/sun/star/wizards/table/FieldDescription.java
@@ -130,7 +130,7 @@ public clas

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

2017-09-18 Thread Caolán McNamara

 starmath/source/smdetect.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 256a405d4b1feeafd8a09e98bce9fb0c9125ee3d
Author: CaolÃ¡n McNamara 
Date:   Sun Sep 17 14:22:45 2017 +0100

valgrind: Conditional jump or move depends on uninitialised value

 Conditional jump or move depends on uninitialised value(s)
at 0x4C3535E: strstr (vg_replace_strmem.c:1623)
by 0x4FCD9E59: 
SmFilterDetect::detect(com::sun::star::uno::Sequence&)
 (smdetect.cxx:102)
by 0x41A1A774: 
filter::config::TypeDetection::impl_askDetectService(rtl::OUString const&, 
utl::MediaDescriptor&) (typedetection.cxx:1038)

Change-Id: I2f98fd3f7799f34cb5bd9242379ce6440645034d
Reviewed-on: https://gerrit.libreoffice.org/42381
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 64aa36e8b999ea4dcad69904da941705effad618)
Reviewed-on: https://gerrit.libreoffice.org/42387
Reviewed-by: Michael Stahl 

diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 18dfa736bd51..91c8733bf13c 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -93,12 +93,12 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence< 
PropertyValue >& lDescriptor
 // stuff I hope?
 static const sal_uInt16 nBufferSize = 200;
 char aBuffer[nBufferSize+1];
-aBuffer[nBufferSize] = 0;
 pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
 pInStrm->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW ); // 
avoid BOM marker
 sal_uLong nBytesRead = pInStrm->ReadBytes( aBuffer, nBufferSize );
 if (nBytesRead >= 6)
 {
+aBuffer[nBytesRead] = 0;
 bool bIsMathType = false;
 if (0 == strncmp( "" ) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Takeshi Abe

 svx/source/svdraw/svdmark.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3af68b14791118868e410133ea5a2b555bbac6eb
Author: Takeshi Abe 
Date:   Sun Sep 17 12:18:13 2017 +0900

svx: Assert that GetMarkedSdrObj() cannot be null here

as such invalid ones have been removed already in advance.
This could come togeher with c0e9968b4bbda9563213589bcb0472f8797bb553.

Change-Id: I914031390d13dd4ad91d2ead61db7f2d53c78004
Reviewed-on: https://gerrit.libreoffice.org/42365
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index e82bc794a14c..bf31cea26892 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -36,6 +36,8 @@
 #include 
 #include 
 
+#include 
+
 void SdrMark::setTime()
 {
 TimeValue aNow;
@@ -183,7 +185,8 @@ void SdrMarkList::ImpForceSort()
 {
 size_t i = count - 1;
 SdrMark* pCmp = maList[i];
-if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj() && 
pAkt->GetMarkedSdrObj())
+assert(pAkt->GetMarkedSdrObj());
+if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj())
 {
 // Con1/Con2 Merging
 if(pCmp->IsCon1())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Stephan Bergmann

 external/nss/asan.patch.1 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69e62bbebc1f4809101df0c694a930b07dbc194d
Author: Stephan Bergmann 
Date:   Mon Sep 18 11:35:23 2017 +0200

Adapt external/nss/asan.patch.1

...to a52ca01f6ae27a86cae6e82b3c5ae6601f3ea398 "nss: no rpath/origin flag 
for
Android (unused DT entry/DT_FLAGS warnings)"

Change-Id: I60e4ba1af572aa702a355e26dec58142209f8655

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 6acbb04d233d..7dfd6ed4e782 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -7,6 +7,6 @@ diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
  # against the libsanitizer runtime built into the main executable.
 -ZDEFS_FLAG= -Wl,-z,defs
 +ZDEFS_FLAG=
- DSO_LDOPTS  += $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ DSO_LDOPTS+= $(if $(findstring 2.11.90.0.8,$(shell ld 
-v)),,$(ZDEFS_FLAG)) $(if $(filter-out 
$(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN')
  LDFLAGS   += $(ARCHFLAG) -z noexecstack
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools tools/source vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win

2017-09-18 Thread Stephan Bergmann

 include/tools/poly.hxx   |1 +
 tools/source/generic/poly.cxx|5 +
 vcl/headless/svpgdi.cxx  |2 +-
 vcl/inc/headless/svpgdi.hxx  |2 +-
 vcl/inc/openglgdiimpl.hxx|2 +-
 vcl/inc/quartz/salgdi.h  |2 +-
 vcl/inc/salgdi.hxx   |4 ++--
 vcl/inc/salgdiimpl.hxx   |2 +-
 vcl/inc/unx/genpspgraphics.h |2 +-
 vcl/inc/unx/salgdi.h |2 +-
 vcl/inc/win/salgdi.h |2 +-
 vcl/opengl/gdiimpl.cxx   |2 +-
 vcl/quartz/salgdicommon.cxx  |2 +-
 vcl/source/gdi/salgdilayout.cxx  |2 +-
 vcl/source/outdev/curvedshapes.cxx   |8 
 vcl/source/outdev/line.cxx   |4 ++--
 vcl/source/outdev/polyline.cxx   |6 +++---
 vcl/source/outdev/rect.cxx   |4 ++--
 vcl/unx/generic/gdi/gdiimpl.cxx  |2 +-
 vcl/unx/generic/gdi/gdiimpl.hxx  |2 +-
 vcl/unx/generic/gdi/salgdi.cxx   |2 +-
 vcl/unx/generic/print/genpspgraphics.cxx |4 ++--
 vcl/win/gdi/gdiimpl.cxx  |4 ++--
 vcl/win/gdi/gdiimpl.hxx  |2 +-
 vcl/win/gdi/salgdi.cxx   |2 +-
 25 files changed, 39 insertions(+), 33 deletions(-)

New commits:
commit 80363950fda5eeef9830f61e57899d1805c91751
Author: Stephan Bergmann 
Date:   Mon Sep 18 10:37:17 2017 +0200

Acknowledge that WinSalGraphicsImpl::drawPolyLine modifies pPtAry

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

diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 40a129414a38..044bafe3f3e2 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -171,6 +171,7 @@ public:
 voidRead( SvStream& rIStream );
 voidWrite( SvStream& rOStream ) const;
 
+Point * GetPointAry();
 const Point*GetConstPointAry() const;
 const PolyFlags*GetConstFlagAry() const;
 
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 0cdc61f91b65..217565a1ae60 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -796,6 +796,11 @@ Polygon::~Polygon()
 }
 }
 
+Point * Polygon::GetPointAry()
+{
+return mpImplPolygon->mpPointAry;
+}
+
 const Point* Polygon::GetConstPointAry() const
 {
 return mpImplPolygon->mpPointAry;
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index dea4185abea8..08b6ad2522f9 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -577,7 +577,7 @@ void SvpSalGraphics::drawRect( long nX, long nY, long 
nWidth, long nHeight )
 m_aLineColor = aOrigLineColor;
 }
 
-void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, const SalPoint* pPtAry)
+void SvpSalGraphics::drawPolyLine(sal_uInt32 nPoints, SalPoint* pPtAry)
 {
 basegfx::B2DPolygon aPoly;
 aPoly.append(basegfx::B2DPoint(pPtAry->mnX, pPtAry->mnY), nPoints);
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 56ed365339f2..5879c1bfdf44 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -178,7 +178,7 @@ public:
   basegfx::B2DLineJoin,
   css::drawing::LineCap,
   double fMiterMinimumAngle) override;
-virtual voiddrawPolyLine( sal_uInt32 nPoints, const SalPoint* 
pPtAry ) override;
+virtual voiddrawPolyLine( sal_uInt32 nPoints, SalPoint* pPtAry 
) override;
 virtual voiddrawPolygon( sal_uInt32 nPoints, const SalPoint* 
pPtAry ) override;
 virtual voiddrawPolyPolygon( sal_uInt32 nPoly,
  const sal_uInt32* pPoints,
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 7bc6644fdc48..67efca02924e 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -244,7 +244,7 @@ public:
 
 virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) 
override;
 
-virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) 
override;
+virtual void drawPolyLine( sal_uInt32 nPoints, SalPoint* pPtAry ) override;
 
 virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) 
override;
 
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 12356fb57767..9a9626719169 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -228,7 +228,7 @@ public:
 virtual voiddrawPixel( long nX, long nY, SalColor nSalColor ) 
override;
 virtual voiddrawLine( long nX1, long nY1, long nX2, long nY2 ) 
override;
 virtual voiddrawRect( long nX, long nY, lon

Text on OLE objects?

2017-09-18 Thread Regina Henschel


Hi all,

Currently there is muddle in the UI and in code.

Insert a chart or Math object or an OLE to a foreign application, then 
click on it so that is gets green handles, then press F2 and enter text. 
That is the same behavior as for normal shapes, where you can add text 
to the shape that way. But when you save and reload the document, the 
text on the OLE is gone. (I think, there is no bug report yet.)


With AOO #i118485# the feature "text on Draw OLE shape" was introduced. 
But that has problems in file format, because it puts the text as 
 inside the  element, which is not valid.
That was changed by moving the  one level up to the  
object. But there it neither valid.
So with fdo#58571 the element was put into loext namespace, which 
results in a  child element of the  element. But in 
ODF1.2 strict, you now get a  element without any namespace, so still 
not valid.


In the meantime it has been introduced, that the attribute 
draw:notify-on-update-of-ranges of the  element is used. 
But currently it does not go to the  element, but it goes 
to the  element. The same happens with the draw:class-id 
attribute of the  element. That is tdf#112005. 
https://gerrit.libreoffice.org/#/c/42401/ has a fix for that. But it 
does not solve the problem, that you can enter text, which is gone after 
reload.


I wonder, whether it is good to allow at all text (via F2) on OLE 
objects. And in consequence, whether it would be better to remove this 
feature than to get all aspects fixed?


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

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

2017-09-18 Thread Justin Luth

 sw/qa/extras/ooxmlexport/data/tdf109310_endnoteStyleForMSO.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |7 +++
 sw/source/filter/ww8/attributeoutputbase.hxx|2 -
 sw/source/filter/ww8/docxattributeoutput.cxx|   18 
--
 sw/source/filter/ww8/docxattributeoutput.hxx|2 -
 sw/source/filter/ww8/wrtw8nds.cxx   |8 +++-
 6 files changed, 32 insertions(+), 5 deletions(-)

New commits:
commit ac1081170c5bc2234b14ce99b7ea8e583bac82b5
Author: Justin Luth 
Date:   Wed Sep 6 19:29:40 2017 -0400

tdf#109310 ooxmlexport: write Xnote character style

LibreOffice will just ignore the defined style on import
(since that is statically defined by the footnote code).

Microsoft Office, however, requires the character style be
provided for the footnote number. It doesn't have any
built-in formatting for footnotes.

So, this patch is strictly for MSO's benefit.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf109310_endnoteStyleForMSO.docx 
b/sw/qa/extras/ooxmlexport/data/tdf109310_endnoteStyleForMSO.docx
new file mode 100644
index ..9949b98d5f68
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf109310_endnoteStyleForMSO.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a89799b87e39..24016d38c43c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -420,6 +420,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103975_notPageBreakE, 
"tdf103975_notPageBreakE.d
 CPPUNIT_ASSERT_EQUAL(style::BreakType_COLUMN_BEFORE, 
getProperty(getParagraph(2), "BreakType"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf109310_endnoteStyleForMSO, 
"tdf109310_endnoteStyleForMSO.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/endnotes.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, 
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "w:val");
+}
 
 DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
 {
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 2322b2f2..00ab40dcb88a 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -181,7 +181,7 @@ public:
 virtual void EndRunProperties( const SwRedlineData* pRedlineData ) = 0;
 
 /// docx requires footnoteRef/endnoteRef tag at the beginning of each of 
them
-virtual void FootnoteEndnoteRefTag() {};
+virtual bool FootnoteEndnoteRefTag() { return false; };
 
 /// for docx footnotePr/endnotePr inside sectPr
 virtual void SectFootnoteEndnotePr() {};
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1d0a3dfed712..3d7d8b53957e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2096,12 +2096,26 @@ void DocxAttributeOutput::WritePostponedDiagram()
 m_pPostponedDiagrams.reset(nullptr);
 }
 
-void DocxAttributeOutput::FootnoteEndnoteRefTag()
+bool DocxAttributeOutput::FootnoteEndnoteRefTag()
 {
 if( m_footnoteEndnoteRefTag == 0 )
-return;
+return false;
+
+// output the character style for MS Word's benefit
+const SwEndNoteInfo& rInfo = m_footnoteEndnoteRefTag == XML_footnoteRef ?
+m_rExport.m_pDoc->GetFootnoteInfo() : 
m_rExport.m_pDoc->GetEndNoteInfo();
+const SwCharFormat* pCharFormat = rInfo.GetCharFormat( *m_rExport.m_pDoc );
+if ( pCharFormat )
+{
+const OString 
aStyleId(m_rExport.m_pStyles->GetStyleId(m_rExport.GetId(pCharFormat)));
+m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
+m_pSerializer->singleElementNS( XML_w, XML_rStyle, FSNS( XML_w, 
XML_val ), aStyleId.getStr(), FSEND );
+m_pSerializer->endElementNS( XML_w, XML_rPr );
+}
+
 m_pSerializer->singleElementNS( XML_w, m_footnoteEndnoteRefTag, FSEND );
 m_footnoteEndnoteRefTag = 0;
+return true;
 }
 
 /** Output sal_Unicode* as a run text (the text).
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index d06486403a07..8024566433f6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -174,7 +174,7 @@ public:
 /// Called after we end outputting the attributes.
 virtual void EndRunProperties( const SwRedlineData* pRedlineData ) 
override;
 
-virtual void FootnoteEndnoteRefTag() override;
+virtual bool FootnoteEndnoteRefTag() override;
 
 virtual void SectFootnoteEndnotePr() override;
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx

Re: Git help needed: update local repo to specific branch or tag

2017-09-18 Thread Miklos Vajna

Hi,

On Fri, Sep 15, 2017 at 06:33:17PM +0200, Stephan Bergmann 
 wrote:
> >if [ ... ]; then
> >   git fetch --prune --tags origin
> >   # cleanup all patched stuff - probably not needed
> >   git reset --hard
> >   git checkout --detached "origin/${my_gitbranch?}"

Whether the above git fetch will put origin's master branch to
origin/master or master (the later case is what you call "tags and
branches behave the same way") depends on the refspec of the remote
named "origin", which is configured when the "origin" remote is created.

Depending on 'git remote add' was invoked with the --mirror=fetch
option (either directly or via 'git clone --mirror') .git/config
contains something like:

[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*

(normal case, master is available as origin/master)

or

[remote "origin"]
fetch = +refs/*:refs/*

(mirror case)

So if the refspec is set up correctly, you should be able to
transparently use tags/branches the same way.

(Normally it's valuable that origin's master is written to
origin/master, so your local master branch does not change when you do
'git fetch', that's why --mirror=fetch is not the default.)

Regards,

Miklos


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

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

2017-09-18 Thread Michael Stahl

 sw/source/uibase/uiview/viewtab.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 79ceef1dd0970055a8de0f0676e1cd992a484ee1
Author: Michael Stahl 
Date:   Fri Sep 15 23:28:02 2017 +0200

related: tdf#111967 fix assertions about silly column positions

ImplLogicToPixel() is called with ~LONG_MIN value, which comes from
SwView::StateTabWin() where we have:

(rr) p aTabCols
$12 = {
  nLeftMin = 1134,
  nLeft = 0,
  nRight = 4618,
  nRightMax = 9223372036854775807,
  bLastRowAllowedToChange = true,
  aData = std::__debug::vector of length 9, capacity 16 = {{
  nPos = 387,
  nMin = 0,
  nMax = 9223372036854775807,
  bHidden = false
}, {

The problem is that the "aTabCols.GetRight() - rEntry.nMax"
becomes negative, which is probably wrong, so enforce a minimum of 0.

(regression from 4c60f722afdc0be5c129ce5f5ed6786d09d0051e, which
 removed a cast of the value to sal_uInt16, which also didn't look
 right to me, but perhaps wouldn't cause this assert?)

Change-Id: Ia1aa2cd100ac25a8c34902cc992d54954fead284

diff --git a/sw/source/uibase/uiview/viewtab.cxx 
b/sw/source/uibase/uiview/viewtab.cxx
index ef8b0752eeb6..7d969e5430fd 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1959,8 +1959,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 {
 nEnd = aTabCols.GetRight() - rEntry.nPos;
 SvxColumnDescription aColDesc( nStart, nEnd,
-aTabCols.GetRight() - 
rEntry.nMax,
-aTabCols.GetRight() - 
rEntry.nMin,
+std::max(0L, aTabCols.GetRight() - 
rEntry.nMax),
+std::max(0L, aTabCols.GetRight() - 
rEntry.nMin),
 !aTabCols.IsHidden(i) );
 aColItem.Append(aColDesc);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Miklos Vajna

 sw/source/uibase/dbui/dbmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6fa56459f1b3ddd7667585d18952cf409f5f8c4c
Author: Miklos Vajna 
Date:   Mon Sep 18 11:04:41 2017 +0200

sw dbmgr: fix indent of these statements

Change-Id: I4eae19f5a724c44ec382053ace2f3fcd586fd6f3

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 1d0d8a31c4f1..e4aaa658b707 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2471,7 +2471,7 @@ SwDSParam* SwDBManager::FindDSData(const SwDBData& rData, 
bool bCreate)
 (rData.nCommandType == -1 || rData.nCommandType == 
pImpl->pMergeData->nCommandType ||
 (bCreate && pImpl->pMergeData->nCommandType == -1)))
 {
- return pImpl->pMergeData;
+return pImpl->pMergeData;
 }
 
 SwDSParam* pFound = nullptr;
@@ -2518,7 +2518,7 @@ SwDSParam*  SwDBManager::FindDSConnection(const OUString& 
rDataSource, bool bCre
 if(pImpl->pMergeData && rDataSource == pImpl->pMergeData->sDataSource )
 {
 SetAsUsed(rDataSource);
- return pImpl->pMergeData;
+return pImpl->pMergeData;
 }
 SwDSParam* pFound = nullptr;
 for (auto & pParam : m_DataSourceParams)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Placement of addon toolbar

2017-09-18 Thread Stephan Bergmann


On 09/17/2017 09:46 AM, Jan Rheinländer wrote:

my Addon defines a toolbar with the following xml. The user can place
this toolbar anywhere on the screen, e.g. on the side.

But after every update of the Addon ("unopkg add"), the toolbar is back
at the top of the screen. Is there a way to prevent that?


http://openoffice.org/2001/registry";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
  oor:name="WriterWindowState" oor:package="org.openoffice.Office.UI">
  
   



If you use oor:op="fuse" instead of "replace", an already existing set 
element will not be replaced completely.  Only the props given 
explicitly here will take on their new values.  Any other props ("Pos", 
"Size", etc.) will keep the values already set (if any).  (The latter 
may or may not be a problem for your actual use case.  There's 
unfortunately no way to add the set element with the given props only if 
the set element does not yet exist, and otherwise leave it completely 
alone.)



 
  false
 
 
  iMath
  iMath
 
 
  true
 
 
  true
 

   
  


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

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

2017-09-18 Thread Miklos Vajna

 sw/inc/fmtflcnt.hxx |   10 +-
 sw/source/core/txtnode/atrflyin.cxx |   16 
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit a577f6fb33eb83f44370cf648b799ef808e97247
Author: Miklos Vajna 
Date:   Mon Sep 18 09:58:03 2017 +0200

sw: prefix members of SwFormatFlyCnt

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

diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 57873510d8b0..18ba66c2fb48 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -32,8 +32,8 @@ class SwTextFlyCnt;
 class SwFormatFlyCnt : public SfxPoolItem
 {
 friend class SwTextFlyCnt;
-SwTextFlyCnt* pTextAttr;
-SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format.
+SwTextFlyCnt* m_pTextAttr;
+SwFrameFormat* m_pFormat; ///< My Fly/DrawFrame-format.
 SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) = delete;
 
 public:
@@ -42,11 +42,11 @@ public:
 virtual booloperator==( const SfxPoolItem& ) const override;
 virtual SfxPoolItem*Clone( SfxItemPool* pPool = nullptr ) const 
override;
 
-SwFrameFormat *GetFrameFormat() const { return pFormat; }
+SwFrameFormat *GetFrameFormat() const { return m_pFormat; }
 /// For Undo: delete the FlyFrameFormat "logically"; it is kept in 
Undo-object.
-void SetFlyFormat( SwFrameFormat* pNew = nullptr )   { pFormat = pNew; }
+void SetFlyFormat( SwFrameFormat* pNew = nullptr )   { m_pFormat = pNew; }
 
-const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
+const SwTextFlyCnt *GetTextFlyCnt() const { return m_pTextAttr; }
 };
 
 #endif
diff --git a/sw/source/core/txtnode/atrflyin.cxx 
b/sw/source/core/txtnode/atrflyin.cxx
index b4ca1e96e704..26d34a1740d5 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -37,28 +37,28 @@
 
 SwFormatFlyCnt::SwFormatFlyCnt( SwFrameFormat *pFrameFormat )
 : SfxPoolItem( RES_TXTATR_FLYCNT ),
-pTextAttr( nullptr ),
-pFormat( pFrameFormat )
+m_pTextAttr( nullptr ),
+m_pFormat( pFrameFormat )
 {
 }
 
 bool SwFormatFlyCnt::operator==( const SfxPoolItem& rAttr ) const
 {
 assert(SfxPoolItem::operator==(rAttr));
-return( pTextAttr && static_cast(rAttr).pTextAttr &&
-pTextAttr->GetStart() == static_cast(rAttr).pTextAttr->GetStart() &&
-pFormat == static_cast(rAttr).GetFrameFormat() );
+return( m_pTextAttr && static_cast(rAttr).m_pTextAttr &&
+m_pTextAttr->GetStart() == static_cast(rAttr).m_pTextAttr->GetStart() &&
+m_pFormat == static_cast(rAttr).GetFrameFormat() );
 }
 
 SfxPoolItem* SwFormatFlyCnt::Clone( SfxItemPool* ) const
 {
-return new SwFormatFlyCnt( pFormat );
+return new SwFormatFlyCnt( m_pFormat );
 }
 
 SwTextFlyCnt::SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStartPos )
 : SwTextAttr( rAttr, nStartPos )
 {
-rAttr.pTextAttr = this;
+rAttr.m_pTextAttr = this;
 SetHasDummyChar(true);
 }
 
@@ -214,7 +214,7 @@ SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame_( const 
SwFrame *pCurrFrame )
 return nullptr;
 }
 
-SwIterator aIter( *GetFlyCnt().pFormat );
+SwIterator aIter( *GetFlyCnt().m_pFormat );
 assert(pCurrFrame->IsTextFrame());
 SwFrame* pFrame = aIter.First();
 if ( pFrame )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

2017-09-18 Thread Xisco Fauli

 esc-reporting/esc-analyze.py |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 252dd394b1df99035c80a3b3da9c53dac3bdaf86
Author: Xisco Fauli 
Date:   Mon Sep 18 10:43:28 2017 +0200

This code changes things in Bugzilla on my behalf

and I don't like it. Removing it.
The assigned issues are already covered by qa-tools

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 756de84..458178e 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -615,10 +615,7 @@ def analyze_reports():
 automateList['gerrit']['to_abandon_abandon'] = {}
 automateList['gerrit']['to_abandon_comment'] = {}
 automateList['gerrit']['to_review'] = {}
-automateList['bugzilla']['assign_problem_status'] = {}
-automateList['bugzilla']['assign_problem_user'] = {}
 automateList['bugzilla']['missing_cc'] = {}
-automateList['bugzilla']['missing_ui_cc'] = {}
 automateList['bugzilla']['remove_cc'] = {}
 automateList['bugzilla']['to_unassign_comment'] = {}
 automateList['bugzilla']['to_unassign_unassign'] = {}
@@ -750,10 +747,6 @@ def analyze_reports():
 automateList['bugzilla']['to_unassign_unassign'][key]= 0
   else:
 automateList['bugzilla']['to_unassign_comment'][key] = 0
-  if row['status'] == 'ASSIGNED' and (row['assigned_to'] == '' or 
row['assigned_to'] == 'libreoffice-b...@lists.freedesktop.org'):
-automateList['bugzilla']['assign_problem_status'][key] = 0
-  if row['status'] != 'CLOSED' and row['status'] != 'ASSIGNED' and 
row['assigned_to'] != '' and row['assigned_to'] != 
'libreoffice-b...@lists.freedesktop.org':
-  automateList['bugzilla']['assign_problem_user'][key] = 0
   if len(row['comments']) >= 5:
 statList['reportList']['too_many_comments'].append(key)
   if not 'mentor...@documentfoundation.org' in row['cc']:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: src/conv src/lib

2017-09-18 Thread Miklos Vajna

 src/conv/raw/vsd2raw.cpp|2 +-
 src/conv/raw/vss2raw.cpp|2 +-
 src/conv/svg/vsd2xhtml.cpp  |2 +-
 src/conv/svg/vss2xhtml.cpp  |2 +-
 src/conv/text/vsd2text.cpp  |2 +-
 src/conv/text/vss2text.cpp  |2 +-
 src/lib/VDXParser.cpp   |6 +++---
 src/lib/VSD5Parser.cpp  |2 +-
 src/lib/VSDContentCollector.cpp |   16 
 src/lib/VSDContentCollector.h   |4 ++--
 src/lib/VSDFieldList.cpp|2 +-
 src/lib/VSDGeometryList.cpp |2 +-
 src/lib/VSDInternalStream.cpp   |4 ++--
 src/lib/VSDInternalStream.h |6 +++---
 src/lib/VSDLayerList.cpp|6 +++---
 src/lib/VSDMetaData.cpp |2 +-
 src/lib/VSDParser.cpp   |   14 +++---
 src/lib/VSDParser.h |2 +-
 src/lib/VSDStencils.cpp |   32 
 src/lib/VSDXMLHelper.cpp|   10 +-
 src/lib/VSDXMLParserBase.cpp|8 
 src/lib/VSDXMetaData.cpp|2 +-
 src/lib/VSDXParser.cpp  |   12 ++--
 src/lib/VSDXTheme.cpp   |2 +-
 src/lib/VisioDocument.cpp   |2 +-
 src/lib/libvisio_xml.h  |2 +-
 26 files changed, 74 insertions(+), 74 deletions(-)

New commits:
commit 7cf4bf3b624fadb327a54c63d880ee664e8434b5
Author: Miklos Vajna 
Date:   Mon Sep 18 10:34:05 2017 +0200

Convert 0 to nullptr where it's used as a pointer value

To make the code easier to read, because this means the remaining zeros
all mean numbers.

Change-Id: I677df217aae81e15496d47a93daaab633d8b903f

diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index b9ffde9..ce15260 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -54,7 +54,7 @@ int printVersion()
 int main(int argc, char *argv[])
 {
   bool printIndentLevel = false;
-  char *file = 0;
+  char *file = nullptr;
 
   if (argc < 2)
 return printUsage();
diff --git a/src/conv/raw/vss2raw.cpp b/src/conv/raw/vss2raw.cpp
index 4af8e3c..8f1b311 100644
--- a/src/conv/raw/vss2raw.cpp
+++ b/src/conv/raw/vss2raw.cpp
@@ -54,7 +54,7 @@ int printVersion()
 int main(int argc, char *argv[])
 {
   bool printIndentLevel = false;
-  char *file = 0;
+  char *file = nullptr;
 
   if (argc < 2)
 return printUsage();
diff --git a/src/conv/svg/vsd2xhtml.cpp b/src/conv/svg/vsd2xhtml.cpp
index cc91c85..7801eee 100644
--- a/src/conv/svg/vsd2xhtml.cpp
+++ b/src/conv/svg/vsd2xhtml.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
   if (argc < 2)
 return printUsage();
 
-  char *file = 0;
+  char *file = nullptr;
 
   for (int i = 1; i < argc; i++)
   {
diff --git a/src/conv/svg/vss2xhtml.cpp b/src/conv/svg/vss2xhtml.cpp
index f466988..edfeea5 100644
--- a/src/conv/svg/vss2xhtml.cpp
+++ b/src/conv/svg/vss2xhtml.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
   if (argc < 2)
 return printUsage();
 
-  char *file = 0;
+  char *file = nullptr;
 
   for (int i = 1; i < argc; i++)
   {
diff --git a/src/conv/text/vsd2text.cpp b/src/conv/text/vsd2text.cpp
index e5fe090..1d9d5fb 100644
--- a/src/conv/text/vsd2text.cpp
+++ b/src/conv/text/vsd2text.cpp
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
   if (argc < 2)
 return printUsage();
 
-  char *file = 0;
+  char *file = nullptr;
 
   for (int i = 1; i < argc; i++)
   {
diff --git a/src/conv/text/vss2text.cpp b/src/conv/text/vss2text.cpp
index dd8148e..f1e80f9 100644
--- a/src/conv/text/vss2text.cpp
+++ b/src/conv/text/vss2text.cpp
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
   if (argc < 2)
 return printUsage();
 
-  char *file = 0;
+  char *file = nullptr;
 
   for (int i = 1; i < argc; i++)
   {
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 2a3304b..ef6f7c6 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -75,7 +75,7 @@ bool 
libvisio::VDXParser::processXmlDocument(librevenge::RVNGInputStream *input)
 return false;
 
   const std::shared_ptr reader(
-xmlReaderForStream(input, 0, 0, 
XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER),
+xmlReaderForStream(input, nullptr, nullptr, 
XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER),
 xmlFreeTextReader);
   if (!reader)
 return false;
@@ -920,7 +920,7 @@ xmlChar 
*libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
   return stringValue;
 }
   }
-  return 0;
+  return nullptr;
 }
 
 int libvisio::VDXParser::getElementToken(xmlTextReaderPtr reader)
@@ -1032,7 +1032,7 @@ void libvisio::VDXParser::readTabs(xmlTextReaderPtr 
reader)
 }
 while ((XML_TABS != tokenId || XML_READER_TYPE_END_ELEMENT != tokenType) 
&& 1 == ret && (!m_watcher || !m_watcher->isError()));
   }
-  m_currentTabSet = 0;
+  m_currentTabSet = nullptr;
 }
 
 void libvisio::VDXParser::readTab(xmlTextReaderPtr reader)
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index fd5b298..c3f80fd 100644
--- a/src/lib/VSD5Parser.cpp

[Libreoffice-commits] dev-tools.git: esc-reporting/qa-tools.py

2017-09-18 Thread Xisco Fauli

 esc-reporting/qa-tools.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81e104ee6a7c1d0c08e718969fa792b3e27ebc64
Author: Xisco Fauli 
Date:   Mon Sep 18 10:14:42 2017 +0200

Fix issue with metabugs removed

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index 13a0970..fa301f7 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -391,7 +391,7 @@ def analyze_bugzilla(statList, bugzillaData, cfg, lIgnore):
 #TODO
 #util_increase_user_actions(statList, key, 
actionMail, bugTargets, 'metabug_added', actionDate)
 
-if actionDate >= cfg[reportPeriod] and 
int(metabug) in row['blocks']:
+if actionDate >= cfg[reportPeriod] and 
int(metabug) not in row['blocks']:
 if metabug not in 
statList['detailedReport']['metabug_removed']:
 
statList['detailedReport']['metabug_removed'][metabug] = 0
 
statList['detailedReport']['lists']['metabug_removed'][metabug] = [[],[]]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/Socket.hpp

2017-09-18 Thread Miklos Vajna

 net/Socket.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f375a9d5de400b0da00b7065eac8927ab8ed891e
Author: Miklos Vajna 
Date:   Mon Sep 18 10:15:49 2017 +0200

Socket: mark setNoDelay() as non-virtual

No derived classes override it, and if they would, that would be a
problem, as setNoDelay() is called from init(), which is called from the
Socket ctor. Calling virtual functions from the base class ctor is not a
good idea, since the object is not fully constructed yet.

Change-Id: I4993e26d09f5d3429c7e2afae7688b84c0061c9d

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 3442fdb1..62a743b5 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -135,7 +135,7 @@ public:
 int events) = 0;
 
 /// manage latency issues around packet aggregation
-virtual void setNoDelay()
+void setNoDelay()
 {
 const int val = 1;
 ::setsockopt(_fd, IPPROTO_TCP, TCP_NODELAY,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Weekly QA Report (W37-2017)

2017-09-18 Thread Xisco Fauli

Hello,

What have happened in QA in the last 7 days?

  * 142 have been created, of which, 50 are still unconfirmed ( Total
Unconfirmed bugs: 410 )
    Link: http://tinyurl.com/yadx4hq9

  * 1054 comments have been written.

== STATUS CHANGED ==
  * 18 bugs have been changed to 'ASSIGNED'.
    Link: http://tinyurl.com/y793sbnu
    Done by: Xisco Faulí ( 4 ), Julien Nabet ( 3 ), Winfried Donkers ( 2
), serge.krot ( 2 ), Sabin.Frandes ( 2 ), Miklos Vajna ( 1 ), Regina
Henschel ( 1 ), Maxim Monastirsky ( 1 ), Dennis Francis ( 1 ), Aron
Budea ( 1 )

  * 2 bugs have been changed to 'CLOSED'.
    Link: http://tinyurl.com/ybxj6cdz
    Done by: Eike Rathke ( 2 )

  * 27 bugs have been changed to 'NEEDINFO'.
    Link: http://tinyurl.com/yamec8ev
    Done by: Xisco Faulí ( 11 ), Alex Thurgood ( 3 ), Julien Nabet ( 2
), Jean-Baptiste Faure ( 2 ), Jacques Guilleron ( 2 ), Dieter Praas ( 2
), V Stuart Foote ( 1 ), Buovjaga ( 1 ), raal ( 1 ), m.a.riosv ( 1 ),
Kevin Evans ( 1 )

  * 102 bugs have been changed to 'NEW'.
    Link: http://tinyurl.com/yat9nsln
    Done by: Xisco Faulí ( 52 ), Buovjaga ( 8 ), raal ( 7 ), Dieter
Praas ( 5 ), Aron Budea ( 5 ), Yousuf Philips (jay) ( 4 ), V Stuart
Foote ( 3 ), Thomas Lendo ( 3 ), Jacques Guilleron ( 3 ), Heiko Tietze (
2 ), Winfried Donkers ( 1 ), Andras Timar ( 1 ), Thorsten Behrens (CIB)
( 1 ), Muhammet Kara ( 1 ), m.a.riosv ( 1 ), Michael Meeks ( 1 ), Khaled
Hosny ( 1 ), Bartosz ( 1 ), Eike Rathke ( 1 ), kompilainenn ( 1 )

  * 4 bugs have been changed to 'REOPENED'.
    Link: http://tinyurl.com/y9hnecr9
    Done by: Sierk Bornemann ( 1 ), Jim Raykowski ( 1 ), Hamid ( 1 ),
ajimady ( 1 )

  * 33 bugs have been changed to 'RESOLVED DUPLICATE'.
    Link: http://tinyurl.com/y8gdmaqg
    Done by: Xisco Faulí ( 9 ), Alex Thurgood ( 4 ), V Stuart Foote ( 3
), Telesto ( 3 ), Buovjaga ( 2 ), Julien Nabet ( 2 ), Yousuf Philips
(jay) ( 2 ), Regina Henschel ( 1 ), raal ( 1 ), Maxim Monastirsky ( 1 ),
m.a.riosv ( 1 ), Timur ( 1 ), Dieter Praas ( 1 ), Cor Nouws ( 1 ), Aron
Budea ( 1 )

  * 31 bugs have been changed to 'RESOLVED FIXED'.
    Link: http://tinyurl.com/ybzjc3zu
    Done by: Tamás Zolnai ( 5 ), Julien Nabet ( 3 ), Muhammet Kara ( 2
), Michael Stahl ( 2 ), Caolán McNamara ( 2 ), Armin Le Grand (CIB) ( 2
), Xisco Faulí ( 1 ), Winfried Donkers ( 1 ), V Stuart Foote ( 1 ),
Miklos Vajna ( 1 ), Heiko Tietze ( 1 ), Thorsten Behrens (CIB) ( 1 ),
Szymon Kłos ( 1 ), serge.krot ( 1 ), Olivier Hallot ( 1 ), Mike Kaganski
( 1 ), Jan Holesovsky ( 1 ), Timur ( 1 ), Adolfo Jayme ( 1 ), Dennis
Francis ( 1 ), Andreas Brandner ( 1 )

  * 2 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
    Link: http://tinyurl.com/ya3ztr4k
    Done by: V Stuart Foote ( 2 )

  * 2 bugs have been changed to 'RESOLVED INVALID'.
    Link: http://tinyurl.com/y7eoafoh
    Done by: Telesto ( 1 ), alex.wies ( 1 )

  * 4 bugs have been changed to 'RESOLVED NOTABUG'.
    Link: http://tinyurl.com/y6uhtcmr
    Done by: Xisco Faulí ( 1 ), Telesto ( 1 ), ludwig Lichtenberg ( 1 ),
Adolfo Jayme ( 1 )

  * 9 bugs have been changed to 'RESOLVED WONTFIX'.
    Link: http://tinyurl.com/y8q9ythl
    Done by: V Stuart Foote ( 5 ), Buovjaga ( 2 ), Olivier Hallot ( 1 ),
Markus Mohrhard ( 1 )

  * 21 bugs have been changed to 'RESOLVED WORKSFORME'.
    Link: http://tinyurl.com/ycxjgt6t
    Done by: Bartosz ( 3 ), Xisco Faulí ( 2 ), Heiko Tietze ( 2 ),
Thomas Lendo ( 2 ), Yousuf Philips (jay) ( 2 ), V Stuart Foote ( 1 ),
Buovjaga ( 1 ), Julien Nabet ( 1 ), raal ( 1 ), Markus Mohrhard ( 1 ),
Michal Janoušek ( 1 ), Jesper Laugesen ( 1 ), Harald Koester ( 1 ),
Timur ( 1 ), lukash256 ( 1 )

  * 15 bugs have been changed to 'UNCONFIRMED'.
    Link: http://tinyurl.com/y7qmt7qq
    Done by: Xisco Faulí ( 4 ), PaulJayD ( 2 ), m.a.riosv ( 2 ),
lobaluna ( 1 ), Jim Raykowski ( 1 ), Joseph Conner ( 1 ), Jean-Baptiste
Faure ( 1 ), H3xag0n ( 1 ), Eric ( 1 ), Dereck Wonnacott ( 1 )

  * 11 bugs have been changed to 'VERIFIED FIXED'.
    Link: http://tinyurl.com/ybpxzsn6
    Done by: Thomas Lendo ( 3 ), Xisco Faulí ( 1 ), Julien Nabet ( 1 ),
Terrence Enger ( 1 ), Alex Thurgood ( 1 ), Jacques Guilleron ( 1 ),
Timur ( 1 ), Passiflora ( 1 ), Cor Nouws ( 1 )

== KEYWORDS ADDED ==
  * 'accessibility' has been added to 1 bug.
    Link: http://tinyurl.com/yackhop3
    Done by: Alex ARNAUD ( 1 )

  * 'bibisectRequest' has been added to 7 bugs.
    Link: http://tinyurl.com/ya94qt3u
    Done by: Xisco Faulí ( 5 ), Buovjaga ( 1 ), Yousuf Philips (jay) ( 1 )

  * 'bibisected' has been added to 10 bugs.
    Link: http://tinyurl.com/y758hnyz
    Done by: Xisco Faulí ( 6 ), Aron Budea ( 3 ), raal ( 1 )

  * 'bisected' has been added to 10 bugs.
    Link: http://tinyurl.com/ya29f8u5
    Done by: Xisco Faulí ( 7 ), raal ( 1 ), Terrence Enger ( 1 ), Aron
Budea ( 1 )

  * 'easyHack' has been added to 1 bug.
    Link: http://tinyurl.com/ydfm5ock
    Done by: Michael Meeks ( 1 )

  * 'filter:docx' has been added to 7 bugs.
    Link: http://tinyurl.com/y8343vff
    Done

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

2017-09-18 Thread Stephan Bergmann

 sal/osl/w32/file.cxx|8 
 sal/osl/w32/file_dirvol.cxx |1 +
 sal/osl/w32/procimpl.cxx|2 ++
 sal/osl/w32/signal.cxx  |3 +++
 4 files changed, 14 insertions(+)

New commits:
commit 74cd94a17b3922bdcd44ab6460232297fbf665d0
Author: Stephan Bergmann 
Date:   Mon Sep 18 09:59:33 2017 +0200

Put back some #include (needed for e.g. --disable-pch)

...that had been removed too eagerly with
1f543b817a7e8bdef9482c4c61bc1672bf04e39f "osl/w32: don't use 8-bit string
functions"

Change-Id: I9d16cc5ff9b779457d8d70c7f206d5e684342c63

diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index f654c1add897..a211464aa2cd 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -19,9 +19,17 @@
 
 #include 
 
+#include 
+#include 
+#include 
+
 #include "file_url.hxx"
 #include "file_error.hxx"
 
+#include 
+#include 
+#include 
+
 #ifdef max /* conflict w/ std::numeric_limits::max() */
 #undef max
 #endif
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 752d6470ec67..46f185d0554e 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -27,6 +27,7 @@
 
 #include "rtl/alloc.h"
 #include "rtl/ustring.hxx"
+#include 
 
 static const wchar_t UNC_PREFIX[] = L"";
 static const wchar_t BACKSLASH = '\\';
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index af5b75e5891f..bc7617f3a834 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -34,8 +34,10 @@
 #include 
 #include 
 #include "secimpl.hxx"
+#include 
 
 #include 
+#include 
 
 namespace /* private */
 {
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index 0f6bc08dc9dc..5f11b8a6bcf6 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+#include 
+
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Takeshi Abe

 sax/source/expatwrap/xml2utf.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 44815f1439bb36e9fb5f0181c541fc4d0c9422f1
Author: Takeshi Abe 
Date:   Tue Jul 18 22:44:33 2017 +0900

sax: Check if it starts with 5 bytes of "https://gerrit.libreoffice.org/40139
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit b64e564492220b34c14f069e8e1f42675bd9abe6)

ofz: string has to be at least 5 chars long

Reviewed-on: https://gerrit.libreoffice.org/42379
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

this should presumably be 5, rather than 4

Change-Id: Iec5b748b188c7b1bf61e8137faf4b3f2d480d7f1
98c50a59c03fc886d50362b9c5dd8c84f60e0b62
20c6a6fb34485f42c2a828618e8918d8a441860a
Reviewed-on: https://gerrit.libreoffice.org/42395
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 361e02fc99b0..017a3b1c96e9 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -126,7 +126,7 @@ XMLFile2UTFConverter::~XMLFile2UTFConverter()
 void XMLFile2UTFConverter::removeEncoding( Sequence &seq )
 {
 const sal_Int8 *pSource = seq.getArray();
-if( ! strncmp( reinterpret_cast(pSource), "= 5 && !strncmp(reinterpret_cast(pSource), " &seq )
 &( seq.getArray()[nStop+1]) ,
 seq.getLength() - nStop -1);
 seq.realloc( seq.getLength() - ( nStop+1 - nFound ) );
-//  str = String( (char * ) seq.getArray() , seq.getLen() );
 }
 }
 }
@@ -178,7 +177,7 @@ bool XMLFile2UTFConverter::isEncodingRecognizable( const 
Sequence< sal_Int8 > &s
 return false;
 }
 
-if( ! strncmp( reinterpret_cast(pSource), "(pSource), " &seq )
 }
 
 // first level : detect possible file formats
-if( ! strncmp( reinterpret_cast(pSource), "= 5 && !strncmp(reinterpret_cast(pSource), "(pSource), seq.getLength() 
);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Takeshi Abe

 sax/source/expatwrap/xml2utf.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 6ac9555d133a5aa67641b3927547cf9199cd938e
Author: Takeshi Abe 
Date:   Tue Jul 18 22:44:33 2017 +0900

sax: Check if it starts with 5 bytes of "https://gerrit.libreoffice.org/40139
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit b64e564492220b34c14f069e8e1f42675bd9abe6)

ofz: string has to be at least 5 chars long

Reviewed-on: https://gerrit.libreoffice.org/42379
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

this should presumably be 5, rather than 4

Change-Id: Iec5b748b188c7b1bf61e8137faf4b3f2d480d7f1
98c50a59c03fc886d50362b9c5dd8c84f60e0b62
20c6a6fb34485f42c2a828618e8918d8a441860a
Reviewed-on: https://gerrit.libreoffice.org/42394
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 6ccecc684983..c37f7d3a0c8e 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -125,7 +125,7 @@ XMLFile2UTFConverter::~XMLFile2UTFConverter()
 void XMLFile2UTFConverter::removeEncoding( Sequence &seq )
 {
 const sal_Int8 *pSource = seq.getArray();
-if( ! strncmp( reinterpret_cast(pSource), "= 5 && !strncmp(reinterpret_cast(pSource), " &seq )
 &( seq.getArray()[nStop+1]) ,
 seq.getLength() - nStop -1);
 seq.realloc( seq.getLength() - ( nStop+1 - nFound ) );
-//  str = String( (char * ) seq.getArray() , seq.getLen() );
 }
 }
 }
@@ -177,7 +176,7 @@ bool XMLFile2UTFConverter::isEncodingRecognizable( const 
Sequence< sal_Int8 > &s
 return false;
 }
 
-if( ! strncmp( reinterpret_cast(pSource), "(pSource), " &seq )
 }
 
 // first level : detect possible file formats
-if( ! strncmp( reinterpret_cast(pSource), "= 5 && !strncmp(reinterpret_cast(pSource), "(pSource), seq.getLength() 
);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-18 Thread Noel Grandin

 compilerplugins/clang/test/unusedfields.cxx  |   33 +
 compilerplugins/clang/unusedfields.cxx   |   15 
 compilerplugins/clang/unusedfields.py|   15 
 compilerplugins/clang/unusedfields.readonly.results  |  372 ---
 compilerplugins/clang/unusedfields.untouched.results |   20 -
 compilerplugins/clang/unusedfields.writeonly.results |  236 ++--
 6 files changed, 354 insertions(+), 337 deletions(-)

New commits:
commit 1ff0f0ba29cc14c265fd74c49710a079e67ee943
Author: Noel Grandin 
Date:   Mon Sep 18 09:43:18 2017 +0200

improve unusedfields loplugin

(*) IsPassedByNonConst was completely wrong, not even sure why it worked
before.
(*) treat a field passed to operator>>= as being written to, but not
read

Change-Id: Id3a5f2f35222986fe5edba3f5a58215a1815d401

diff --git a/compilerplugins/clang/test/unusedfields.cxx 
b/compilerplugins/clang/test/unusedfields.cxx
index ff1eee5ad94c..71489b018843 100644
--- a/compilerplugins/clang/test/unusedfields.cxx
+++ b/compilerplugins/clang/test/unusedfields.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 
 struct Foo
 // expected-error@-1 {{read m_foo1 [loplugin:unusedfields]}}
@@ -23,13 +24,15 @@ struct Bar
 // expected-error@-4 {{read m_bar6 [loplugin:unusedfields]}}
 // expected-error@-5 {{read m_barfunctionpointer [loplugin:unusedfields]}}
 // expected-error@-6 {{read m_bar8 [loplugin:unusedfields]}}
-// expected-error@-7 {{write m_bar1 [loplugin:unusedfields]}}
-// expected-error@-8 {{write m_bar2 [loplugin:unusedfields]}}
-// expected-error@-9 {{write m_bar3 [loplugin:unusedfields]}}
-// expected-error@-10 {{write m_bar3b [loplugin:unusedfields]}}
-// expected-error@-11 {{write m_bar4 [loplugin:unusedfields]}}
-// expected-error@-12 {{write m_bar7 [loplugin:unusedfields]}}
-// expected-error@-13 {{write m_barfunctionpointer [loplugin:unusedfields]}}
+// expected-error@-7 {{read m_bar10 [loplugin:unusedfields]}}
+// expected-error@-8 {{write m_bar1 [loplugin:unusedfields]}}
+// expected-error@-9 {{write m_bar2 [loplugin:unusedfields]}}
+// expected-error@-10 {{write m_bar3 [loplugin:unusedfields]}}
+// expected-error@-11 {{write m_bar3b [loplugin:unusedfields]}}
+// expected-error@-12 {{write m_bar4 [loplugin:unusedfields]}}
+// expected-error@-13 {{write m_bar7 [loplugin:unusedfields]}}
+// expected-error@-14 {{write m_barfunctionpointer [loplugin:unusedfields]}}
+// expected-error@-15 {{write m_bar9 [loplugin:unusedfields]}}
 {
 int  m_bar1;
 int  m_bar2 = 1;
@@ -42,6 +45,8 @@ struct Bar
 int m_bar7[5];
 int m_bar8;
 int m_barstream;
+int m_bar9;
+int m_bar10;
 
 // check that we see reads of fields like m_foo1 when referred to via 
constructor initializer
 Bar(Foo const & foo) : m_bar1(foo.m_foo1) {}
@@ -81,6 +86,20 @@ struct Bar
 char tmp[5];
 return tmp[m_bar8];
 }
+
+// check that we don't see reads when calling operator>>=
+void bar9()
+{
+css::uno::Any any;
+any >>= m_bar9;
+}
+
+// check that we see don't see writes when calling operator<<=
+void bar10()
+{
+css::uno::Any any;
+any <<= m_bar10;
+}
 };
 
 // check that we __dont__ see a read of m_barstream
diff --git a/compilerplugins/clang/unusedfields.cxx 
b/compilerplugins/clang/unusedfields.cxx
index b8af5aa7d896..69ea4be9c8b2 100644
--- a/compilerplugins/clang/unusedfields.cxx
+++ b/compilerplugins/clang/unusedfields.cxx
@@ -493,11 +493,16 @@ void UnusedFields::checkWriteOnly(const FieldDecl* 
fieldDecl, const Expr* member
 {
 // check for calls to ReadXXX() type methods and the operator>>= 
methods on Any.
 const FunctionDecl * calleeFunctionDecl = 
callExpr->getDirectCallee();
-if (calleeFunctionDecl && calleeFunctionDecl->getIdentifier())
+if (calleeFunctionDecl)
 {
+// FIXME perhaps a better solution here would be some kind of 
SAL_PARAM_WRITEONLY attribute
+// which we could scatter around.
 std::string name = calleeFunctionDecl->getNameAsString();
 std::transform(name.begin(), name.end(), name.begin(), 
easytolower);
-if (startswith(name, "read") || name.find(">>=") != 
std::string::npos)
+if (startswith(name, "read"))
+// this is a write-only call
+;
+else if (name.find(">>=") != std::string::npos && 
callExpr->getArg(1) == child)
 // this is a write-only call
 ;
 else if (name == "clear" || name == "dispose" || name == 
"disposeAndClear" || name == "swap")
@@ -650,7 +655,9 @@ void UnusedFields::checkReadOnly(const FieldDecl* 
fieldDecl, const Expr* memberE
 bPotentiallyWrittenTo = true;
 }
 else if (IsPassedByNonConst(fieldDecl, child, 
operatorCallExpr, calleeF

Re: clang compiler gives warnings expecting errors

2017-09-18 Thread Alex Kempshall


Hi Stephan

That worked a treat.

Thanks

Alex



On 15/09/17 09:18, Stephan Bergmann wrote:
You need to configure LO with --enable-werror.  (Which developers 
should do anyway, independent of Clang/loplugin.) 


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

92 matches

Mail list logo