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

[Stephan Bergmann]

 vcl/source/filter/ipdf/pdfread.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit b8b5baefa9ead7a3360e0249224fd9beaa9b2bb0
Author: Stephan Bergmann 
Date:   Fri Nov 17 10:20:49 2017 +0100

loplugin:casttovoid (--disable-pdfium)

Change-Id: I38017e3b191ef210facf46323c9a3bb5f54bf0a3

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 5c3413227fd7..b1e85f6816de 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -180,14 +180,9 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& 
rOutStream,
 return rOutStream.good();
 }
 #else
-bool generatePreview(SvStream& rStream, Bitmap& rBitmap,
- sal_uInt64 nPos, sal_uInt64 nSize)
+bool generatePreview(SvStream&, Bitmap&,
+ sal_uInt64, sal_uInt64)
 {
-(void)rStream;
-(void)rBitmap;
-(void)nPos;
-(void)nSize;
-
 return true;
 }
 
___
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' - e2/c1be67b8bf8513e58b80aed1ad7e9a2fe3d5e6

[Caolán McNamara]

 e2/c1be67b8bf8513e58b80aed1ad7e9a2fe3d5e6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4a7dd93dfd1b28ad04972127681d0947c3335076
Author: Caolán McNamara 
Date:   Fri Nov 17 11:17:48 2017 +

Notes added by 'git notes add'

diff --git a/e2/c1be67b8bf8513e58b80aed1ad7e9a2fe3d5e6 
b/e2/c1be67b8bf8513e58b80aed1ad7e9a2fe3d5e6
new file mode 100644
index ..01dd5b3d7ea2
--- /dev/null
+++ b/e2/c1be67b8bf8513e58b80aed1ad7e9a2fe3d5e6
@@ -0,0 +1 @@
+prefer: 19ef5bcc8d9dbcf965f79495e1afd86ac0f22c31
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/text/txtftn.cxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit c2ea797abf377c4a6a1d01de93a638aa5f068183
Author: Miklos Vajna 
Date:   Thu Nov 16 21:57:33 2017 +0100

sw: remove temporary debug code in txtftn that no longer builds anyway

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

diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 49d202c830d3..d50d9acb76d1 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -607,10 +607,6 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote 
*pFootnote, const SwTwips nDea
 
 SwFootnoteBossFrame *pBoss = pContent->FindFootnoteBossFrame( !bEnd );
 
-#if OSL_DEBUG_LEVEL > 1
-SwTwips nRstHeight = GetRstHeight();
-#endif
-
 pSect = pBoss->FindSctFrame();
 bool bDocEnd = bEnd ? !( pSect && pSect->IsEndnAtEnd() ) :
( !( pSect && pSect->IsFootnoteAtEnd() ) &&
@@ -771,17 +767,6 @@ void SwTextFrame::ConnectFootnote( SwTextFootnote 
*pFootnote, const SwTwips nDea
 ValidateFrame();
 }
 
-#if OSL_DEBUG_LEVEL > 1
-// pFootnoteFrame may have changed due to Calc ...
-SwFootnoteFrame *pFootnoteFrame = pBoss->FindFootnote( this, pFootnote );
-if( pFootnoteFrame && pBoss != pFootnoteFrame->FindFootnoteBossFrame( 
!bEnd ) )
-{
-int bla = 5;
-(void)bla;
-}
-nRstHeight = GetRstHeight();
-(void)nRstHeight;
-#endif
 mbInFootnoteConnect = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/filter/inc/formel.hxx |   30 +-
 1 file changed, 25 insertions(+), 5 deletions(-)

New commits:
commit 6ba9b72cff5a761f36b2b9b892b572bc7cb5ae18
Author: Eike Rathke 
Date:   Fri Nov 10 10:52:19 2017 +0100

ofz#4123 do not read past end of file

Change-Id: I1fa3543d541ea084a43a1a11f62680fa798f5647
(cherry picked from commit 78bcc5ddca186f0009124a697184f332405d3e1e)
Reviewed-on: https://gerrit.libreoffice.org/44586
Tested-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx
index 433ba0809a94..aa7944161439 100644
--- a/sc/source/filter/inc/formel.hxx
+++ b/sc/source/filter/inc/formel.hxx
@@ -143,31 +143,51 @@ inline void LotusConverterBase::Ignore( const long 
nSeekRel )
 inline void LotusConverterBase::Read( sal_uInt8& nByte )
 {
 aIn.ReadUChar( nByte );
-nBytesLeft--;
+if (aIn.good())
+nBytesLeft--;
+else
+{
+// SvStream::ReadUChar() does not init a single char on failure. This
+// behaviour is even tested in a unit test.
+nByte = 0;
+nBytesLeft = -1;// bail out early
+}
 }
 
 inline void LotusConverterBase::Read( sal_uInt16& nUINT16 )
 {
 aIn.ReadUInt16( nUINT16 );
-nBytesLeft -= 2;
+if (aIn.good())
+nBytesLeft -= 2;
+else
+nBytesLeft = -1;// bail out early
 }
 
 inline void LotusConverterBase::Read( sal_Int16& nINT16 )
 {
 aIn.ReadInt16( nINT16 );
-nBytesLeft -= 2;
+if (aIn.good())
+nBytesLeft -= 2;
+else
+nBytesLeft = -1;// bail out early
 }
 
 inline void LotusConverterBase::Read( double& fDouble )
 {
 aIn.ReadDouble( fDouble );
-nBytesLeft -= 8;
+if (aIn.good())
+nBytesLeft -= 8;
+else
+nBytesLeft = -1;// bail out early
 }
 
 inline void LotusConverterBase::Read( sal_uInt32& nUINT32 )
 {
 aIn.ReadUInt32( nUINT32 );
-nBytesLeft -= 4;
+if (aIn.good())
+nBytesLeft -= 4;
+else
+nBytesLeft = -1;// bail out early
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some points on clang-format usage

[Stephan Bergmann]

On 11/17/2017 10:54 AM, Miklos Vajna wrote:

Thanks for mentioning this. I also noticed something similar with
initializer lists, where

Foo::Foo()
 : foo(1), // foo
   bar(2) // bar
{
}

gets reformatted to:

Foo::Foo()
 : foo(1)
 , // foo
 bar(2) // bar
{
}

but the ideal form is probably

Foo::Foo()
 : foo(1) // foo
 , bar(2) // bar
{
}

instead.


...which might be reason enough to still revisit the .clang-format rule 
that causes leading commas, if that wrecks such havoc with comments?

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

Re: Regarding subscription to mailing list

[Eike Rathke]

Hi Yash,

On Friday, 2017-11-17 00:07:51 +0530, Yash Bansal wrote:

> I am not able to subscribe to mailing list of Libre office. I have given my
> email but got no response. Can anyone help me regarding this.

Check your gmail account for spam/hidden mails. If nothing else helps
then use another email address to subscribe and change your subscription
address later on the member options page.

Btw..
>  Sent with Mailtrack
> 
and the tracking .png

If you write to mailing lists I strongly suggest to get rid of such
tracking nonsense and send mails in plain text instead of html.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Re: Some points on clang-format usage

[Miklos Vajna]

Hi Stephan,

On Fri, Nov 17, 2017 at 11:16:13AM +0100, Stephan Bergmann 
 wrote:
> ...which might be reason enough to still revisit the .clang-format rule that
> causes leading commas, if that wrecks such havoc with comments?

I think BreakConstructorInitializersBeforeComma is the relevant key.
Setting it to false would not be controversial, it would just mean we
leave that area alone, I believe.

Regards,

Miklos


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

Re: New Defects reported by Coverity Scan for LibreOffice

[Eike Rathke]

Hi,

On Friday, 2017-11-17 11:11:07 +, scan-ad...@coverity.com wrote:

> ** CID 1422192:  Memory - corruptions  (OVERRUN)
> /sc/source/core/tool/token.cxx: 361 in ScRawToken::SetExternal(const char16_t 
> *)()

A fallout from
https://cgit.freedesktop.org/libreoffice/core/commit/?id=280a5166ad4032a618c5e29db701330f7dbdfbff
fixed with
https://cgit.freedesktop.org/libreoffice/core/commit/?id=2337797936eb53ac088ad7b5243d5fd8dfbfa31e

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

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

[Bartosz Kosiorek]

 drawinglayer/source/tools/emfphelperdata.cxx |   25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

New commits:
commit 262bc4387970106f4fa9bf0b85cf82cbf645bcf8
Author: Bartosz Kosiorek 
Date:   Fri Nov 17 01:23:23 2017 +0100

tdf#113451 Fix misplacing of lines by adding mappingChanged

Change-Id: I9b381f456d4c96369fdf7e94f161fde2723ebead
Reviewed-on: https://gerrit.libreoffice.org/44842
Tested-by: Jenkins 
Reviewed-by: Bartosz Kosiorek 

diff --git a/drawinglayer/source/tools/emfphelperdata.cxx 
b/drawinglayer/source/tools/emfphelperdata.cxx
index d9accffe80af..b9b60d021504 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -324,16 +324,11 @@ namespace emfplushelper
 
 if ( iter != map.end() )
 {
-wmfemfhelper::PropertyHolder state = iter->second;
 map.erase( iter );
-
 SAL_INFO("drawinglayer", "stack index: " << index << " found and 
erased");
 }
 
-wmfemfhelper::PropertyHolder state;
-
-state = mrPropertyHolders.Current();
-
+wmfemfhelper::PropertyHolder state = mrPropertyHolders.Current();
 map[ index ] = state;
 }
 
@@ -343,12 +338,12 @@ namespace emfplushelper
 
 if ( iter != map.end() )
 {
-SAL_INFO("drawinglayer", "stack index: " << index << " found");
-
 wmfemfhelper::PropertyHolder state = iter->second;
 
 maWorldTransform = state.getTransformation();
 rState.setClipPolyPolygon( state.getClipPolyPolygon() );
+mappingChanged();
+SAL_INFO("drawinglayer", "stack index: " << index << " found, 
maWorldTransform: " << maWorldTransform);
 }
 }
 
@@ -382,7 +377,7 @@ namespace emfplushelper
 }
 
 // transform and compare to 5 (the value 5 is determined by 
comparison to MSO)
-const double transformedPenWidth = std::max( 
MapSize(adjustedPenWidth,0).getX() , 5.);
+const double transformedPenWidth = std::max( 
MapSize(adjustedPenWidth, 0).getX(), 5.);
 drawinglayer::attribute::LineAttribute 
lineAttribute(pen->GetColor().getBColor(),
 
transformedPenWidth,
 lineJoin,
@@ -627,7 +622,7 @@ namespace emfplushelper
 {
 basegfx::B2DPoint aStartPoint = 
Map(brush->areaX,brush->areaY);
 aStartPoint = aPolygonTransformation * aStartPoint;
-basegfx::B2DPoint aEndPoint = Map(brush->areaX + 
brush->areaWidth ,brush->areaY + brush->areaHeight);
+basegfx::B2DPoint aEndPoint = Map(brush->areaX + 
brush->areaWidth, brush->areaY + brush->areaHeight);
 aEndPoint = aPolygonTransformation * aEndPoint;
 
 // create the same one used for SVG
@@ -1234,7 +1229,7 @@ namespace emfplushelper
 {
 break;
 }
-
mrPropertyHolders.Current().setFont(vcl::Font(font->family , 
Size(font->emSize,font->emSize)));
+
mrPropertyHolders.Current().setFont(vcl::Font(font->family, Size(font->emSize, 
font->emSize)));
 // done reading
 
 // transform to TextSimplePortionPrimitive2D
@@ -1461,8 +1456,8 @@ namespace emfplushelper
 transform.set(0, 0, eSx);
 transform.set(1, 1, eSy);
 
-SAL_INFO("drawinglayer", "EMF+ ScaleWorldTransform Sx: 
" << transform.get(0,0) <<
- " Sy: " << transform.get(1,1) << ", Post 
multiply:" << (flags & 0x2000));
+SAL_INFO("drawinglayer", "EMF+ ScaleWorldTransform Sx: 
" << eSx <<
+ " Sy: " << eSy << ", Post multiply:" << 
(flags & 0x2000));
 SAL_INFO("drawinglayer",
  "EMF+\t World transform matrix: " << 
maWorldTransform);
 
@@ -1613,9 +1608,7 @@ namespace emfplushelper
 if (hasMatrix)
 {
 readXForm(rMS, transform);
-SAL_INFO("drawinglayer", "EMF+\tmatrix: " << 
transform.get(0,0) << ", " << transform.get(1,0) <<
-", " << transform.get(0,1) << ", " << 
transform.get(1,1) <<
-", " << transform.get(0,2) << ", " << 
transform.get(1,2));
+SAL_INFO("drawinglayer", "EMF+\tmatrix: " << 
transform);
 }
 
 // get the font from the flags

Some points on clang-format usage

[Stephan Bergmann]

Some random points regarding our recently introduced use of clang-format:


* clang-format cannot automatically reformat code

Most comments in the code are written by humans, for humans.  They are 
often placed in a way that makes it technically unclear what code they 
pertain to, relying on humans to nevertheless easily discern that.  For 
example, in



void f(int x) { g(x + 1); } // long comment explaining how g internally 
subtracts one


the comment clearly pertains to the call to g.  Yet, clang-format will 
reformat this to something like



void f(int x)
{
g(x + 1);
} // long comment explaining how g internally subtracts one


instead of


void f(int x)
{
g(x + 1); // long comment explaining how g internally subtracts one
}


thereby obscuring things.  Always review automatically reformatted code 
for glitches like this.



* Don't reformat when moving an existing file

When moving an old file that is listed in solenv/clang-format/blacklist 
(so doesn't automatically get reformatted upon commit), adapt 
solenv/clang-format/blacklist to contain the new name, instead of 
provoking a reformat upon commit.  Otherwise, if the reformatted code 
looks sufficiently different from the original, it's hard to impossible 
to keep track in the git history of which file was moved where.



* Keep your local .clang-format up to date

There's been changes to it, and there might be more coming (though 
that's hopefully getting less and less likely).  If you create commits 
involving new files on an old master revision, you risk wrongly 
formatted code (and thus the need for reformatting follow-up commits) 
when that commit is eventually cherry-picked into the upstream git repo. 
 "Pull early, pull often."

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

[Libreoffice-commits] core.git: chart2/source editeng/source include/editeng sc/source sd/qa sd/source svx/source sw/source

[Noel Grandin]

 chart2/source/controller/main/ChartTransferable.cxx |6 -
 editeng/source/editeng/editdoc.cxx  |   28 ++---
 editeng/source/editeng/editview.cxx |2 
 editeng/source/editeng/impedit3.cxx |8 -
 editeng/source/editeng/impedit4.cxx |   15 +-
 editeng/source/uno/unofdesc.cxx |4 
 include/editeng/eeitem.hxx  |   87 +---
 sc/source/core/data/documen9.cxx|2 
 sc/source/filter/excel/xehelper.cxx |6 -
 sc/source/filter/excel/xistyle.cxx  |2 
 sc/source/filter/oox/stylesbuffer.cxx   |   34 +++---
 sc/source/ui/Accessibility/AccessibleText.cxx   |1 
 sc/source/ui/app/drwtrans.cxx   |4 
 sc/source/ui/app/inputwin.cxx   |4 
 sc/source/ui/dbgui/csvgrid.cxx  |3 
 sc/source/ui/drawfunc/drtxtob.cxx   |   34 ++
 sc/source/ui/pagedlg/tphfedit.cxx   |1 
 sc/source/ui/unoobj/textuno.cxx |1 
 sc/source/ui/view/editsh.cxx|   29 ++---
 sc/source/ui/view/output2.cxx   |6 -
 sc/source/ui/view/printfun.cxx  |1 
 sd/qa/unit/import-tests.cxx |2 
 sd/qa/unit/tiledrendering/tiledrendering.cxx|4 
 sd/source/core/sdpage.cxx   |   12 +-
 sd/source/core/stlsheet.cxx |4 
 sd/source/filter/html/htmlex.cxx|   10 -
 sd/source/ui/annotations/annotationmanager.cxx  |8 -
 sd/source/ui/annotations/annotationwindow.cxx   |8 -
 sd/source/ui/func/fuhhconv.cxx  |2 
 sd/source/ui/func/futext.cxx|1 
 sd/source/ui/table/TableDesignPane.cxx  |2 
 sd/source/ui/view/drtxtob.cxx   |5 
 sd/source/ui/view/drtxtob1.cxx  |   40 ++-
 sd/source/ui/view/drviews2.cxx  |8 -
 sd/source/ui/view/drviewsf.cxx  |4 
 svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |8 -
 svx/source/engine3d/view3d.cxx  |2 
 svx/source/table/tablertfexporter.cxx   |6 -
 svx/source/toolbars/fontworkbar.cxx |4 
 sw/source/uibase/dochdl/swdtflvr.cxx|4 
 sw/source/uibase/shells/annotsh.cxx |   12 +-
 sw/source/uibase/shells/drwtxtex.cxx|   12 +-
 42 files changed, 221 insertions(+), 215 deletions(-)

New commits:
commit c690d38b066bb9cda3e6af790c36fb37d2e0dea3
Author: Noel Grandin 
Date:   Thu Nov 16 13:09:02 2017 +0200

TypedWhichId for EE_CHAR* constants

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

diff --git a/chart2/source/controller/main/ChartTransferable.cxx 
b/chart2/source/controller/main/ChartTransferable.cxx
index 8fb95fa29de6..2eeb46a764f2 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -122,8 +122,7 @@ bool ChartTransferable::WriteObject( 
tools::SvRef& rxOStm, voi
 // for the changed pool defaults from drawing layer pool 
set those
 // attributes as hard attributes to preserve them for 
saving
 const SfxItemPool& rItemPool = 
pMarkedObjModel->GetItemPool();
-const SvxFontHeightItem& rDefaultFontHeight = static_cast< 
const SvxFontHeightItem& >(
-rItemPool.GetDefaultItem( EE_CHAR_FONTHEIGHT ) );
+const SvxFontHeightItem& rDefaultFontHeight = 
rItemPool.GetDefaultItem( EE_CHAR_FONTHEIGHT );
 sal_uInt16 nCount = pMarkedObjModel->GetPageCount();
 for ( sal_uInt16 i = 0; i < nCount; ++i )
 {
@@ -132,8 +131,7 @@ bool ChartTransferable::WriteObject( 
tools::SvRef& rxOStm, voi
 while ( aIter.IsMore() )
 {
 SdrObject* pObj = aIter.Next();
-const SvxFontHeightItem& rItem = static_cast< 
const SvxFontHeightItem& >(
-pObj->GetMergedItem( EE_CHAR_FONTHEIGHT ) );
+const SvxFontHeightItem& rItem = 
pObj->GetMergedItem( EE_CHAR_FONTHEIGHT );
 if ( rItem.GetHeight() == 
rDefaultFontHeight.GetHeight() )
 {
  

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

[Caolán McNamara]

 sw/source/core/text/porlay.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 6e686439291b4047a8c522ebf78d25632d349f62
Author: Caolán McNamara 
Date:   Thu Nov 16 14:19:16 2017 +

Resolves: tdf#113871 bounds check kashida pos

the inner loop checks the kashida validity so reuse the
same check outside to avoid index 3 into vector of len 3

Change-Id: I27c30aec1a61ccc8ca6611498d3281eddb4b54eb
Reviewed-on: https://gerrit.libreoffice.org/44831
Tested-by: Jenkins 
Reviewed-by: Martin Hosken 

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 2d23d2aa9710..f075d2efb93d 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1731,11 +1731,10 @@ sal_Int32 SwScriptInfo::KashidaJustify( long* 
pKernArray,
 if ( nCntKash < CountKashida() )
 {
 // skip any invalid kashidas
-while ( ! IsKashidaValid ( nCntKash ) && nCntKash < nCntKashEnd )
+while (nCntKash < nCntKashEnd && !IsKashidaValid(nCntKash))
 ++nCntKash;
 
-sal_Int32 nKashidaPos = GetKashida( nCntKash );
-sal_Int32 nIdx = nKashidaPos;
+sal_Int32 nIdx = nCntKash < nCntKashEnd && IsKashidaValid(nCntKash) ? 
GetKashida(nCntKash) : nEnd;
 long nKashAdd = nSpaceAdd;
 
 while ( nIdx < nEnd )
@@ -1744,10 +1743,10 @@ sal_Int32 SwScriptInfo::KashidaJustify( long* 
pKernArray,
 
 // next kashida position
 ++nCntKash;
-while ( ! IsKashidaValid ( nCntKash ) && nCntKash < nCntKashEnd )
+while (nCntKash < nCntKashEnd && !IsKashidaValid(nCntKash))
 ++nCntKash;
 
-nIdx = nCntKash < CountKashida() && IsKashidaValid ( nCntKash ) ? 
GetKashida( nCntKash ) : nEnd;
+nIdx = nCntKash < nCntKashEnd && IsKashidaValid(nCntKash) ? 
GetKashida(nCntKash) : nEnd;
 if ( nIdx > nEnd )
 nIdx = nEnd;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source include/vcl sfx2/Library_sfx.mk sfx2/source sw/uiconfig

[Szymon Kłos]

 extras/source/glade/libreoffice-catalog.xml.in   |6 
 include/vcl/IPrioritable.hxx |1 
 sfx2/Library_sfx.mk  |3 
 sfx2/source/notebookbar/DropdownBox.cxx  |   90 -
 sfx2/source/notebookbar/DropdownBox.hxx  |6 
 sfx2/source/notebookbar/NotebookbarPopup.cxx |   85 +
 sfx2/source/notebookbar/NotebookbarPopup.hxx |   55 +++
 sfx2/source/notebookbar/OptionalBox.cxx  |   68 
 sfx2/source/notebookbar/OptionalBox.hxx  |   48 ++
 sfx2/source/notebookbar/PriorityHBox.cxx |  241 ---
 sfx2/source/notebookbar/PriorityHBox.hxx |   67 
 sfx2/source/notebookbar/PriorityMergedHBox.cxx   |  111 ++
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui |   16 
 13 files changed, 593 insertions(+), 204 deletions(-)

New commits:
commit 713f579283279aa1dfadf476d37b38753e5f398f
Author: Szymon Kłos 
Date:   Thu Nov 2 15:32:18 2017 +0100

Notebookbar: PriorityMergedHBox, OptionalBox

Change-Id: I7822fb1b6a342065d66a3fd62f1277e43c2562dd
Reviewed-on: https://gerrit.libreoffice.org/44694
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index a3f9cc6e770f..3f7c5a71dc9c 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -841,6 +841,9 @@
 
+
 
@@ -850,6 +853,9 @@
 
+
 
diff --git a/include/vcl/IPrioritable.hxx b/include/vcl/IPrioritable.hxx
index dda8bbd31fa8..29b2fd708008 100644
--- a/include/vcl/IPrioritable.hxx
+++ b/include/vcl/IPrioritable.hxx
@@ -39,6 +39,7 @@ public:
 
 virtual void HideContent() = 0;
 virtual void ShowContent() = 0;
+virtual bool IsHidden() = 0;
 
 private:
 int m_nPriority;
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 0d9dc14113c3..3dd3d892ed4c 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -241,8 +241,11 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/inet/inettbc \
 sfx2/source/notebookbar/ContextVBox \
 sfx2/source/notebookbar/DropdownBox \
+sfx2/source/notebookbar/OptionalBox \
 sfx2/source/notebookbar/PriorityHBox \
+sfx2/source/notebookbar/PriorityMergedHBox \
 sfx2/source/notebookbar/SfxNotebookBar \
+sfx2/source/notebookbar/NotebookbarPopup \
 sfx2/source/notebookbar/NotebookbarTabControl \
 sfx2/source/notify/eventsupplier \
 sfx2/source/notify/globalevents \
diff --git a/sfx2/source/notebookbar/DropdownBox.cxx 
b/sfx2/source/notebookbar/DropdownBox.cxx
index aba34a36ab72..473e5c98be40 100644
--- a/sfx2/source/notebookbar/DropdownBox.cxx
+++ b/sfx2/source/notebookbar/DropdownBox.cxx
@@ -26,87 +26,6 @@
 #define NOTEBOOK_HEADER_HEIGHT 30
 
 /*
- * Popup - shows hidden content, controls are moved to this popup
- * and after close moved to the original parent
- */
-
-class Popup : public FloatingWindow
-{
-private:
-VclPtr m_pBox;
-ScopedVclPtr m_pParent;
-
-public:
-explicit Popup(const VclPtr& pParent)
-: FloatingWindow(pParent, "Popup", "sfx/ui/notebookbarpopup.ui")
-, m_pParent(pParent)
-{
-get(m_pBox, "box");
-m_pBox->SetSizePixel(Size(100, 75));
-}
-
-virtual ~Popup() override
-{
-disposeOnce();
-}
-
-VclHBox* getBox()
-{
-return m_pBox.get();
-}
-
-virtual void PopupModeEnd() override
-{
-hideSeparators(false);
-for (int i = 0; i < m_pBox->GetChildCount(); i++)
-{
-m_pBox->GetChild(i)->Hide();
-m_pBox->GetChild(i)->SetParent(m_pParent);
-}
-FloatingWindow::PopupModeEnd();
-}
-
-void hideSeparators(bool bHide = true)
-{
-// separator on the beginning
-Window* pWindow = m_pBox->GetChild(0);
-while (pWindow && pWindow->GetType() == WindowType::CONTAINER)
-{
-pWindow = pWindow->GetChild(0);
-}
-if (pWindow && pWindow->GetType() == WindowType::FIXEDLINE)
-{
-if (bHide)
-pWindow->Hide();
-else
-pWindow->Show();
-}
-
-// separator on the end
-pWindow = m_pBox->GetChild(m_pBox->GetChildCount() - 1);
-while (pWindow && pWindow->GetType() == WindowType::CONTAINER)
-{
-pWindow = pWindow->GetChild(pWindow->GetChildCount() - 1);
-}
-if (pWindow && pWindow->GetType() == WindowType::FIXEDLINE)
-{
-if (bHide)
-pWindow->Hide();
-else
-pWindow->Show();
-}
-}
-
-void dispose() override
-{
-m_pBox.disposeAndClear();
-   

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a4/8c71085e3c2df62295b49250d0b116cfb4b3c4

[Caolán McNamara]

 a4/8c71085e3c2df62295b49250d0b116cfb4b3c4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 51f56b7b5ef1b5c23a930e4692712ac6922066be
Author: Caolán McNamara 
Date:   Fri Nov 17 11:12:49 2017 +

Notes added by 'git notes add'

diff --git a/a4/8c71085e3c2df62295b49250d0b116cfb4b3c4 
b/a4/8c71085e3c2df62295b49250d0b116cfb4b3c4
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/a4/8c71085e3c2df62295b49250d0b116cfb4b3c4
@@ -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: sc/inc

[Eike Rathke]

 sc/inc/compiler.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2337797936eb53ac088ad7b5243d5fd8dfbfa31e
Author: Eike Rathke 
Date:   Fri Nov 17 12:30:11 2017 +0100

coverity#1422192 include param field in string field

Change-Id: Ia2ef910fd9b4b74c8cf227717fde93c562bbb1b6

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 6d1db7e8c1e1..b763f2d4d326 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -131,7 +131,7 @@ public:
 } sharedstring;
 ScMatrix*pMat;
 FormulaError nError;
-sal_Unicode  cStr[ MAXSTRLEN+1 ];   // string (up to MAXSTRLEN 
characters + 0)
+sal_Unicode  cStr[ 1+MAXSTRLEN+1 ];   // string (byteparam + up to 
MAXSTRLEN characters + 0)
 shortnJump[ FORMULA_MAXJUMPCOUNT + 1 ]; // If/Chose token
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 vcl/inc/impfontmetricdata.hxx  |1 +
 vcl/source/font/fontmetric.cxx |   33 ++---
 vcl/source/outdev/font.cxx |1 +
 3 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit b843db1a8e3f50bc88e4278cd330bba86a62a206
Author: Mark Hung 
Date:   Tue Nov 14 02:35:32 2017 +0800

vcl: clean ImplFontMetricData::ImplInitTextLineSize a little bit.

Move initialization of FullstopCenteredFlag out
of ImplFontMetricData::ImplInitTextLineSize since it has
nothing to do with text lines.

Change-Id: I1c2e383d980514c8727d736a3158325c1e0ccfda
Reviewed-on: https://gerrit.libreoffice.org/44712
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index fd15e5765164..f08e86fdc914 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -90,6 +90,7 @@ public:
 
 voidImplInitTextLineSize( const OutputDevice* pDev );
 voidImplInitAboveTextLineSize();
+voidImplInitFlags( const OutputDevice* pDev );
 voidImplCalcLineSpacing(const std::vector& rHhea,
 const std::vector& rOS_2,
 int nUPEM);
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index d2de3917604e..cd23756f0f97 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -320,21 +320,6 @@ void ImplFontMetricData::ImplInitTextLineSize( const 
OutputDevice* pDev )
 mnDStrikeoutOffset1= nStrikeoutOffset - n2LineDY2 - n2LineHeight;
 mnDStrikeoutOffset2= mnDStrikeoutOffset1 + n2LineDY + n2LineHeight;
 
-const vcl::Font& rFont ( pDev->GetFont() );
-bool bCentered = true;
-if (MsLangId::isCJK(rFont.GetLanguage()))
-{
-const OUString sFullstop( u'\x3001' ); // Fullwidth fullstop
-tools::Rectangle aRect;
-pDev->GetTextBoundRect( aRect, sFullstop );
-const sal_uInt16 nH = rFont.GetFontSize().Height();
-const sal_uInt16 nB = aRect.Left();
-// Use 18.75% as a threshold to define a centered fullwidth fullstop.
-// In general, nB/nH < 5% for most Japanese fonts.
-bCentered = nB > (((nH >> 1)+nH)>>3);
-}
-SetFullstopCenteredFlag( bCentered );
-
 mnBulletOffset = ( pDev->GetTextWidth( OUString( u' ' ) ) - 
pDev->GetTextWidth( OUString( u'\x00b7' ) ) ) >> 1 ;
 
 }
@@ -390,6 +375,24 @@ void ImplFontMetricData::ImplInitAboveTextLineSize()
 mnAboveWUnderlineOffset = nCeiling + (nIntLeading + 1) / 2;
 }
 
+void ImplFontMetricData::ImplInitFlags( const OutputDevice* pDev )
+{
+const vcl::Font& rFont ( pDev->GetFont() );
+bool bCentered = true;
+if (MsLangId::isCJK(rFont.GetLanguage()))
+{
+const OUString sFullstop( u'\x3001' ); // Fullwidth fullstop
+tools::Rectangle aRect;
+pDev->GetTextBoundRect( aRect, sFullstop );
+const sal_uInt16 nH = rFont.GetFontSize().Height();
+const sal_uInt16 nB = aRect.Left();
+// Use 18.75% as a threshold to define a centered fullwidth fullstop.
+// In general, nB/nH < 5% for most Japanese fonts.
+bCentered = nB > (((nH >> 1)+nH)>>3);
+}
+SetFullstopCenteredFlag( bCentered );
+}
+
 /*
  * Calculate line spacing:
  *
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 2a5d88852fb2..9a44a10fb469 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1078,6 +1078,7 @@ bool OutputDevice::ImplNewFont() const
 
 pFontInstance->mxFontMetric->ImplInitTextLineSize( this );
 pFontInstance->mxFontMetric->ImplInitAboveTextLineSize();
+pFontInstance->mxFontMetric->ImplInitFlags( this );
 
 pFontInstance->mnLineHeight = 
pFontInstance->mxFontMetric->GetAscent() + 
pFontInstance->mxFontMetric->GetDescent();
 
___
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' - 0a/382157b19c8b1a818e98c826613c99335a05ec

[Caolán McNamara]

 0a/382157b19c8b1a818e98c826613c99335a05ec |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30a5897aa33ac187415bda98d686fe40953cb8c8
Author: Caolán McNamara 
Date:   Fri Nov 17 11:15:44 2017 +

Notes added by 'git notes add'

diff --git a/0a/382157b19c8b1a818e98c826613c99335a05ec 
b/0a/382157b19c8b1a818e98c826613c99335a05ec
new file mode 100644
index ..01dd5b3d7ea2
--- /dev/null
+++ b/0a/382157b19c8b1a818e98c826613c99335a05ec
@@ -0,0 +1 @@
+prefer: 19ef5bcc8d9dbcf965f79495e1afd86ac0f22c31
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sw/uiconfig/swriter/ui/numparapage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a3c981015da76dbda8626993da30c467a3e1c799
Author: Yousuf Philips 
Date:   Thu Nov 16 19:13:46 2017 +0400

tdf#113880 a11y: Link 'Numbering style:' label to drop-down list

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

diff --git a/sw/uiconfig/swriter/ui/numparapage.ui 
b/sw/uiconfig/swriter/ui/numparapage.ui
index 4969d202e024..3da2286cc78e 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -141,6 +141,7 @@
 0
 _Numbering style:
 True
+comboLB_NUMBER_STYLE
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-parallel' - 2 commits - include/svl sc/inc sc/source svl/source

[Dennis Francis]

 include/svl/zforlist.hxx |2 ++
 sc/inc/column.hxx|2 +-
 sc/inc/document.hxx  |9 ++---
 sc/inc/formulacell.hxx   |2 +-
 sc/inc/interpretercontext.hxx|   14 +-
 sc/inc/table.hxx |2 +-
 sc/source/core/data/column2.cxx  |2 +-
 sc/source/core/data/documen2.cxx |1 +
 sc/source/core/data/documen8.cxx |2 +-
 sc/source/core/data/formulacell.cxx  |7 ++-
 sc/source/core/data/table1.cxx   |2 +-
 sc/source/core/inc/interpre.hxx  |7 ++-
 sc/source/core/tool/formulagroup.cxx |   15 +++
 sc/source/core/tool/interpr4.cxx |   22 +++---
 svl/source/numbers/zforlist.cxx  |2 ++
 15 files changed, 52 insertions(+), 39 deletions(-)

New commits:
commit a50e4be42932985e78864a710836d1b3abbeca33
Author: Dennis Francis 
Date:   Fri Nov 17 18:20:31 2017 +0530

Share SvNumberFormatter across worker threads...

... and use a mutex to protect SvNumberFormatter::IsNumberFormat()

Change-Id: I6a015609062da1a92b84e514de7b304ece92052e

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 969d0007380a..e5bac1dfc896 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -829,6 +829,8 @@ private:
 SVL_DLLPRIVATE static sal_uInt16nSystemCurrencyPosition;
 SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
 
+::osl::Mutex maInstanceMutex;
+
 // get the registry, create one if none exists
 SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl& 
GetFormatterRegistry();
 
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index d8f0483f2f54..dde15e97ad0e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4399,10 +4399,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
 
 virtual void doWork() override
 {
-std::unique_ptr pFormatterForThisThread
-(new SvNumberFormatter(mpFormatter->GetComponentContext(),
-   mpFormatter->GetLanguage()));
-ScInterpreterContext aContext(*mpDocument, 
pFormatterForThisThread.get());
+ScInterpreterContext aContext(*mpDocument, mpFormatter);
 
 mpDocument->CalculateInColumnInThread(aContext, mrTopPos, 
mnLength, mnThisThread, 
mnThreadsTotal).MergeBackIntoNonThreadedData(mpDocument->maNonThreaded);
 }
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f4c236827a01..e7d23daa2a70 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1077,6 +1077,8 @@ bool SvNumberFormatter::IsNumberFormat(const OUString& 
sString,
sal_uInt32& F_Index,
double& fOutNumber)
 {
+::osl::MutexGuard aGuard( maInstanceMutex );
+
 short FType;
 const SvNumberformat* pFormat = ImpSubstituteEntry( 
GetFormatEntry(F_Index));
 if (!pFormat)
commit 0572b9f65efbc5036aec99348fe263330717bc4f
Author: Dennis Francis 
Date:   Fri Nov 17 15:30:35 2017 +0530

Move token-cache for doubles to ScInterpreterContext...

...from ScInterpreter and in the s/w interpreter, create
a ScInterpreterContext for each thread for passing into
per thread ScInterpreter constructor.

Change-Id: I4e0abce043c7e1e70859efb2e5001fc284f416a9

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 44bee716bf18..acd899e7658a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -583,7 +583,7 @@ public:
 void SetFormulaResults( SCROW nRow, const double* pResults, size_t nLen );
 void SetFormulaResults( SCROW nRow, const formula::FormulaConstTokenRef* 
pResults, size_t nLen );
 
-void CalculateInThread( const ScInterpreterContext& rContext, SCROW nRow, 
size_t nLen, unsigned nThisThread, unsigned nThreadsTotal );
+void CalculateInThread( ScInterpreterContext& rContext, SCROW nRow, size_t 
nLen, unsigned nThisThread, unsigned nThreadsTotal );
 void HandleStuffAfterParallelCalculation( SCROW nRow, size_t nLen );
 
 void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 04544fe5a64e..0061f5a1e47f 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -462,6 +462,8 @@ private:
 // plain thread_local static member.
 thread_local static ScDocumentThreadSpecific maThreadSpecific;
 
+mutable ScInterpreterContext maInterpreterContext;
+
 sal_uInt16  nSrcVer;// file version 
(load/save)
 sal_uInt16  nFormulaTrackCount;
 HardRecalcState eHardRecalcState;   // off, temporary, 
eternal
@@ -564,10 +566,11 

[Libreoffice-commits] core.git: Branch 'feature/calc-parallel' - sc/source

[Dennis Francis]

 sc/source/core/tool/formulagroup.cxx |   25 +++--
 1 file changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 67d17c60529f41e422db4565dc5a136e02ec48ed
Author: Dennis Francis 
Date:   Fri Nov 17 14:05:56 2017 +0530

Type check the tokens before reuse

If the exisiting token is of wrong type, create and use a fresh new
token instead.

Change-Id: I348b0972306497dfe7eae0655c9b93d5830cb740

diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index e77554d89805..326392f6099e 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -206,13 +206,26 @@ public:
 if ( !pTargetTok )
 aCode2.AddString(rPool.intern(OUString(pStr)));
 else
-
pTargetTok->SetString(rPool.intern(OUString(pStr)));
+{
+if ( pTargetTok->GetType() == 
formula::svString )
+
pTargetTok->SetString(rPool.intern(OUString(pStr)));
+else
+{
+formula::FormulaStringToken* pStrTok = new 
formula::FormulaStringToken(rPool.intern(OUString(pStr)));
+aCode2.ReplaceToken(nTokIdx, pStrTok, 
formula::FormulaTokenArray::CODE_ONLY);
+}
+}
 }
 else if (rtl::math::isNan(fVal))
 {
 // Value of NaN represents an empty cell.
 if ( !pTargetTok )
 aCode2.AddToken(ScEmptyCellToken(false, 
false));
+else if ( pTargetTok->GetType() != 
formula::svEmptyCell )
+{
+ScEmptyCellToken* pEmptyTok = new 
ScEmptyCellToken(false, false);
+aCode2.ReplaceToken(nTokIdx, pEmptyTok, 
formula::FormulaTokenArray::CODE_ONLY);
+}
 }
 else
 {
@@ -220,7 +233,15 @@ public:
 if ( !pTargetTok )
 aCode2.AddDouble(fVal);
 else
-pTargetTok->GetDoubleAsReference() = fVal;
+{
+if ( pTargetTok->GetType() == 
formula::svDouble )
+pTargetTok->GetDoubleAsReference() = fVal;
+else
+{
+formula::FormulaDoubleToken* pDoubleTok = 
new formula::FormulaDoubleToken( fVal );
+aCode2.ReplaceToken(nTokIdx, pDoubleTok, 
formula::FormulaTokenArray::CODE_ONLY);
+}
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some points on clang-format usage

[Miklos Vajna]

Hi Stephan,

On Fri, Nov 17, 2017 at 10:03:11AM +0100, Stephan Bergmann 
 wrote:
> Some random points regarding our recently introduced use of clang-format:
> 
> 
> * clang-format cannot automatically reformat code
> 
> Most comments in the code are written by humans, for humans.  They are often
> placed in a way that makes it technically unclear what code they pertain to,
> relying on humans to nevertheless easily discern that.  For example, in
> 
> > void f(int x) { g(x + 1); } // long comment explaining how g internally 
> > subtracts one
> 
> the comment clearly pertains to the call to g.  Yet, clang-format will
> reformat this to something like
> 
> > void f(int x)
> > {
> > g(x + 1);
> > } // long comment explaining how g internally subtracts one
> 
> instead of
> 
> > void f(int x)
> > {
> > g(x + 1); // long comment explaining how g internally subtracts one
> > }
> 
> thereby obscuring things.  Always review automatically reformatted code for
> glitches like this.

Thanks for mentioning this. I also noticed something similar with
initializer lists, where

Foo::Foo()
: foo(1), // foo
  bar(2) // bar
{
}

gets reformatted to:

Foo::Foo()
: foo(1)
, // foo
bar(2) // bar
{
}

but the ideal form is probably

Foo::Foo()
: foo(1) // foo
, bar(2) // bar
{
}

instead.

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: cui/uiconfig

[Yousuf Philips]

 cui/uiconfig/ui/paratabspage.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a2ed9435273d880e41b4d9196a37bfbf7f43d068
Author: Yousuf Philips 
Date:   Fri Nov 17 10:27:13 2017 +0400

l10n: dont translate non-text character tab fill characters

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

diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index 56344137082e..39bf028120d1 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -331,7 +331,7 @@
 
 
   
-_
+_
 True
 True
 False
@@ -348,7 +348,7 @@
 
 
   
-_
+_
 True
 True
 False
@@ -365,7 +365,7 @@
 
 
   
-__
+__
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/core/tool/compiler.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 701e1ec3a2e38a7b0bd2cdd3511a2a50578ea74e
Author: Caolán McNamara 
Date:   Wed Nov 15 11:48:47 2017 +

ofz: special case max index for cSymbol

Change-Id: Ia5fb036196b0cff0739789e691a36d294660540b
Reviewed-on: https://gerrit.libreoffice.org/44759
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit a5550289a37950195b7a7e5b22cba79ce5b5a673)
Reviewed-on: https://gerrit.libreoffice.org/44803

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 417523ad5514..d4eda96b2cae 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3270,6 +3270,8 @@ bool ScCompiler::IsReference( const OUString& rName, 
const OUString* pErrRef )
 return true;
 // Now try with a symbol up to the range operator, rewind source
 // position.
+if (mnRangeOpPosInSymbol == MAXSTRLEN-1)
+return false;
 sal_Int32 nLen = mnRangeOpPosInSymbol;
 while (cSymbol[++nLen])
 ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 sw/source/core/edit/edfcol.cxx |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 18bc47d6e0eedd4b2e4dc977ae445d60b41eb122
Author: Tomaž Vajngerl 
Date:   Fri Nov 17 12:06:13 2017 +0900

TSCP: convert the class. ID to name, fix class. change on save

Change-Id: Ic829ebeb488f41f3189170e6fdeebd80b28ae8c5
Reviewed-on: https://gerrit.libreoffice.org/44855
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 59f9183340a4..cccf2ab539a2 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -2028,16 +2028,21 @@ bool 
SwEditShell::RemoveParagraphMetadataFieldAtCursor(const bool bBackspaceNotD
 return false;
 }
 
-OUString lcl_GetParagraphClassification(sfx::ClassificationKeyCreator const & 
rKeyCreator, const uno::Reference& xModel, const 
uno::Reference& xParagraph)
+OUString lcl_GetParagraphClassification(SfxClassificationHelper & rHelper, 
sfx::ClassificationKeyCreator const & rKeyCreator,
+const uno::Reference& 
xModel, const uno::Reference& xParagraph)
 {
-
-uno::Reference xTextField = 
lcl_FindParagraphClassificationField(xModel, xParagraph, 
rKeyCreator.makeCategoryNameKey());
-if (!xTextField.is())
-xTextField = lcl_FindParagraphClassificationField(xModel, xParagraph, 
rKeyCreator.makeCategoryIdentifierKey());
-
+uno::Reference xTextField;
+xTextField = lcl_FindParagraphClassificationField(xModel, xParagraph, 
rKeyCreator.makeCategoryIdentifierKey());
 if (xTextField.is())
 {
 const std::pair rdfValuePair = lcl_getRDF(xModel, 
xTextField, ParagraphClassificationValueRDFName);
+return rHelper.GetBACNameForIdentifier(rdfValuePair.second);
+}
+
+xTextField = lcl_FindParagraphClassificationField(xModel, xParagraph, 
rKeyCreator.makeCategoryNameKey());
+if (xTextField.is())
+{
+const std::pair rdfValuePair = lcl_getRDF(xModel, 
xTextField, ParagraphClassificationNameRDFName);
 return rdfValuePair.second;
 }
 
@@ -2068,7 +2073,8 @@ OUString 
lcl_GetHighestClassificationParagraphClass(SwPaM* pCursor)
 while (xParagraphs->hasMoreElements())
 {
 uno::Reference 
xParagraph(xParagraphs->nextElement(), uno::UNO_QUERY);
-sHighestClass = aHelper.GetHigherClass(sHighestClass, 
lcl_GetParagraphClassification(aKeyCreator, xModel, xParagraph));
+OUString sCurrentClass = lcl_GetParagraphClassification(aHelper, 
aKeyCreator, xModel, xParagraph);
+sHighestClass = aHelper.GetHigherClass(sHighestClass, sCurrentClass);
 }
 
 return sHighestClass;
@@ -2106,6 +2112,7 @@ void SwEditShell::ClassifyDocPerHighestParagraphClass()
 if (sfx::getCreationOriginProperty(xPropertyContainer, aKeyCreator) == 
sfx::ClassificationCreationOrigin::MANUAL)
 {
 aHelper.SetBACName(sHighestClass, eHighestClassType);
+ApplyAdvancedClassification(CollectAdvancedClassification());
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 sw/source/core/edit/edfcol.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit ef5fc3adfd73ea0a12fbc07083a9e37b2d02798b
Author: Tomaž Vajngerl 
Date:   Fri Nov 17 11:29:33 2017 +0900

TSCP: add or delete watermark when set through class. dialog

Change-Id: Iedcf0ee7292b447bc2e2030335234aeb4eb14752
Reviewed-on: https://gerrit.libreoffice.org/44854
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 48329c85a51e..59f9183340a4 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -833,6 +833,11 @@ void 
SwEditShell::ApplyAdvancedClassification(std::vectorgetPropertyValue(UNO_NAME_FOOTER_TEXT) >>= xFooterText;
 equaliseNumberOfParagraph(rResults, xFooterText);
 
+// SET/DELETE WATERMARK
+SfxWatermarkItem aWatermarkItem;
+aWatermarkItem.SetText(aHelper.GetDocumentWatermark());
+SetWatermark(aWatermarkItem);
+
 uno::Reference 
xHeaderParagraphCursor(xHeaderText->createTextCursor(), uno::UNO_QUERY);
 uno::Reference 
xFooterParagraphCursor(xFooterText->createTextCursor(), uno::UNO_QUERY);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 sd/source/ui/animations/CustomAnimationDialog.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 666dc76e0426927c5f8e70fcfa5bce25171a0722
Author: Katarina Behrens 
Date:   Thu Nov 16 10:25:17 2017 +0100

tdf#108450: The shrink part of grow/shrink animation finally works

this automagically fixes also ODF export i.e. shrink to 25% in both
directions gets saved as smil:by="-0.75,-0.75"

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

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 4c9f3a59ee82..28f96d559121 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -828,6 +828,15 @@ void ScalePropertyBox::setValue( const Any& rValue, const 
OUString& )
 else
 mnDirection = 3;
 
+// Shrink animation is represented by negative value
+// Shrink factor is calculated as (1 + $fValue)
+// e.g 1 + (-0.75) = 0.25 => shrink to 25% of the size
+// 0.25 = -0.75 + 1
+if ( fValue1 < 0.0 )
+fValue1 += 1;
+if ( fValue2 < 0.0 )
+fValue2 += 1;
+
 long nValue;
 if( fValue1 )
 nValue = (long)(fValue1 * 100.0);
@@ -841,6 +850,14 @@ void ScalePropertyBox::setValue( const Any& rValue, const 
OUString& )
 Any ScalePropertyBox::getValue()
 {
 double fValue1 = (double)mpMetric->GetValue() / 100.0;
+
+// Shrink animation is represented by value < 1 (< 100%)
+// Shrink factor is calculated as (1 + $fValue)
+// e.g shrink to 25% of the size: 0.25 = 1 + $fValue =>
+// $fValue = -0.75; -0.75 = 0.25 -1
+if ( fValue1 < 1.0 )
+fValue1 -= 1;
+
 double fValue2 = fValue1;
 
 if( mnDirection == 1 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame3' - editeng/source include/editeng sw/source

[Armin Le Grand]

 editeng/source/items/frmitems.cxx |   16 +++
 include/editeng/brushitem.hxx |2 +
 sw/source/core/doc/notxtfrm.cxx   |   36 +++--
 sw/source/core/layout/fly.cxx |   54 +-
 sw/source/core/layout/flylay.cxx  |   29 
 5 files changed, 111 insertions(+), 26 deletions(-)

New commits:
commit 09bbeba1df1f9951a0446d5806cba780d71a5c80
Author: Armin Le Grand 
Date:   Fri Nov 17 13:23:02 2017 +0100

RotateFlyFrame3: Enhancements to AutoContour

Added several conditions for AutoContour, need to
work on reaction on changes to these. Corrected
needed transform adaptions to Countour(s)

Change-Id: Ia3d7845fd5d50c8a413d592ae07ce2041ccc91b9

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index c2bfc5e290fb..bb61ccaccc86 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3157,6 +3157,22 @@ SvxBrushItem::~SvxBrushItem()
 {
 }
 
+bool SvxBrushItem::isUsed() const
+{
+if (GPOS_NONE != GetGraphicPos())
+{
+// graphic used
+return true;
+}
+else if (0xff != GetColor().GetTransparency())
+{
+// color used
+return true;
+}
+
+return false;
+}
+
 sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
 return BRUSH_GRAPHIC_VERSION;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 516abdacd467..8aa177aa2adb 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -79,6 +79,8 @@ public:
 virtual ~SvxBrushItem() override;
 
 public:
+// check if it's used
+bool isUsed() const;
 
 virtual bool GetPresentation( SfxItemPresentation ePres,
   MapUnit eCoreMetric,
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 93103489af70..1ebb9aaf0944 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1308,15 +1308,47 @@ void SwNoTextFrame::PaintPicture( vcl::RenderContext* 
pOut, const SwRect 
 bool SwNoTextFrame::IsTransparent() const
 {
 const SwViewShell* pSh = getRootFrame()->GetCurrShell();
+
 if ( !pSh || !pSh->GetViewOptions()->IsGraphic() )
+{
 return true;
+}
 
 const SwGrfNode *pNd;
+
 if( nullptr != (pNd = GetNode()->GetGrfNode()) )
-return pNd->IsTransparent();
+{
+if(pNd->IsTransparent())
+{
+return true;
+}
+}
+
+// RotateFlyFrame3: If we are transformed, there are 'free' areas between
+// the Graphic and the Border/Padding stuff - at least as long as those
+// (Border and Padding) are not transformed, too
+if(isTransformableSwFrame())
+{
+// we can be more specific - rotations of multiples of
+// 90 degrees will leave no gaps. Go from [0.0 .. F_2PI]
+// to [0 .. 360] and check modulo 90
+const long nRot(static_cast(getLocalFrameRotation() / F_PI180));
+const bool bMultipleOf90(0 == (nRot % 90));
+
+if(!bMultipleOf90)
+{
+return true;
+}
+}
 
 //#29381# OLE are always transparent
-return true;
+if(nullptr != GetNode()->GetOLENode())
+{
+return true;
+}
+
+// return false by default to avoid background paint
+return false;
 }
 
 void SwNoTextFrame::StopAnimation( OutputDevice* pOut ) const
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 4e7639411062..569a0ec86282 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2447,6 +2447,8 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon&   
rContour,
 
 if(bIsCandidate)
 {
+const SwFlyFreeFrame* pSwFlyFreeFrame(static_cast< const 
SwFlyFreeFrame* >(this));
+
 if(GetFormat()->GetSurround().IsContour())
 {
 SwNoTextNode *pNd = const_cast(static_cast(static_cast(Lower())->GetNode()));
@@ -2541,38 +2543,42 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon&   
rContour,
 }
 else
 {
-const SwFlyFreeFrame* pSwFlyFreeFrame(static_cast< const 
SwFlyFreeFrame* >(this));
-
-if(nullptr != pSwFlyFreeFrame && 
pSwFlyFreeFrame->supportsAutoContour())
+if(nullptr != pSwFlyFreeFrame &&
+pSwFlyFreeFrame->supportsAutoContour() &&
+// isTransformableSwFrame already used in 
supportsAutoContour(), but
+// better check twice when it may get changed there...
+pSwFlyFreeFrame->isTransformableSwFrame())
 {
 // RotateFlyFrame: use untransformed SwFrame to allow text 
floating around.
 // Will be transformed below
 const TransformableSwFrame* 
pTransformableSwFrame(pSwFlyFreeFrame->getTransformableSwFrame());
 

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

[Tomaž Vajngerl]

 include/svx/ClassificationDialog.hxx   |4 +++-
 svx/source/dialog/ClassificationDialog.cxx |   25 +
 svx/uiconfig/ui/classificationdialog.ui|   27 +--
 3 files changed, 41 insertions(+), 15 deletions(-)

New commits:
commit 7ff24c6619648164a8642642217709f1a29c89c1
Author: Tomaž Vajngerl 
Date:   Fri Nov 17 13:14:59 2017 +0900

TSCP: change bold button to a toolbox button as bold icon

Change-Id: Ic1a96544c4b3a1f8d631535c8a5f43b6680539f4
Reviewed-on: https://gerrit.libreoffice.org/44860
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index 0033126f5e93..64a5206924e4 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -40,7 +41,7 @@ private:
 VclPtr m_pOkButton;
 VclPtr m_pEditWindow;
 VclPtr m_pSignButton;
-VclPtr m_pBoldButton;
+VclPtr m_pToolBox;
 VclPtr m_pClassificationListBox;
 VclPtr m_pRecentlyUsedListBox;
 VclPtr m_pInternationalClassificationListBox;
@@ -61,6 +62,7 @@ private:
 sal_Int32 m_nCurrentSelectedCategory;
 
 DECL_LINK(ButtonClicked, Button*, void);
+DECL_LINK(SelectToolboxHdl, ToolBox*, void);
 DECL_LINK(SelectClassificationHdl, ListBox&, void);
 DECL_LINK(SelectMarkingHdl, ListBox&, void);
 DECL_LINK(SelectIPPartNumbersHdl, ListBox&, void);
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index f7c3edf068cf..fa4ef3e03084 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -174,7 +174,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 get(m_pOkButton, "ok");
 get(m_pEditWindow, "classificationEditWindow");
 get(m_pSignButton, "signButton");
-get(m_pBoldButton, "boldButton");
+get(m_pToolBox, "toolbox");
 get(m_pRecentlyUsedListBox, "recentlyUsedCB");
 get(m_pClassificationListBox, "classificationCB");
 get(m_pInternationalClassificationListBox, 
"internationalClassificationCB");
@@ -190,7 +190,8 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 m_pSignButton->SetClickHdl(LINK(this, ClassificationDialog, 
ButtonClicked));
 m_pSignButton->Show(m_bPerParagraph);
 
-m_pBoldButton->SetClickHdl(LINK(this, ClassificationDialog, 
ButtonClicked));
+m_pToolBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectToolboxHdl));
+
 m_pIntellectualPropertyPartAddButton->SetClickHdl(LINK(this, 
ClassificationDialog, ButtonClicked));
 
 m_pClassificationListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectClassificationHdl));
@@ -244,7 +245,7 @@ void ClassificationDialog::dispose()
 m_pOkButton.clear();
 m_pEditWindow.clear();
 m_pSignButton.clear();
-m_pBoldButton.clear();
+m_pToolBox.clear();
 m_pRecentlyUsedListBox.clear();
 m_pClassificationListBox.clear();
 m_pInternationalClassificationListBox.clear();
@@ -685,11 +686,7 @@ IMPL_LINK(ClassificationDialog, SelectIPPartHdl, ListBox&, 
rBox, void)
 
 IMPL_LINK(ClassificationDialog, ButtonClicked, Button*, pButton, void)
 {
-if (pButton == m_pBoldButton)
-{
-m_pEditWindow->InvertSelectionWeight();
-}
-else if (pButton == m_pSignButton)
+if (pButton == m_pSignButton)
 {
 m_aParagraphSignHandler();
 }
@@ -700,6 +697,18 @@ IMPL_LINK(ClassificationDialog, ButtonClicked, Button*, 
pButton, void)
 }
 }
 
+
+IMPL_LINK_NOARG(ClassificationDialog, SelectToolboxHdl, ToolBox*, void)
+{
+sal_uInt16 nId = m_pToolBox->GetCurItemId();
+const OUString sCommand = m_pToolBox->GetItemCommand(nId);
+if (sCommand == "bold")
+{
+m_pEditWindow->InvertSelectionWeight();
+}
+}
+
+
 IMPL_LINK_NOARG(ClassificationDialog, EditWindowModifiedHdl, LinkParamNone*, 
void)
 {
 toggleWidgetsDependingOnCategory();
diff --git a/svx/uiconfig/ui/classificationdialog.ui 
b/svx/uiconfig/ui/classificationdialog.ui
index ab4f449726a3..a4469611c80c 100644
--- a/svx/uiconfig/ui/classificationdialog.ui
+++ b/svx/uiconfig/ui/classificationdialog.ui
@@ -1,7 +1,7 @@
 
-
+
 
-  
+  
   
   
 False
@@ -213,11 +213,23 @@
 6
 True
 
-  
-Bold
+  
 True
-True
-True
+False
+
+  
+True
+False
+bold
+Bold
+True
+  

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

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

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


** CID 1422192:  Memory - corruptions  (OVERRUN)
/sc/source/core/tool/token.cxx: 361 in ScRawToken::SetExternal(const char16_t 
*)()



*** CID 1422192:  Memory - corruptions  (OVERRUN)
/sc/source/core/tool/token.cxx: 361 in ScRawToken::SetExternal(const char16_t 
*)()
355 eType = svExternal;
356 sal_Int32 nLen = GetStrLen( pStr ) + 1;
357 if( nLen > MAXSTRLEN )
358 nLen = MAXSTRLEN;
359 // Leave space for byte parameter!
360 memcpy( cStr+1, pStr, nLen * sizeof(sal_Unicode) );
>>> CID 1422192:  Memory - corruptions  (OVERRUN)
>>> Overrunning array "(*this).cStr" of 1025 2-byte elements at element 
>>> index 1025 (byte offset 2050) using index "nLen + 1" (which evaluates to 
>>> 1025).
361 cStr[ nLen+1 ] = 0;
362 }
363 
364 bool ScRawToken::IsValidReference() const
365 {
366 switch (eType)



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpywv9lPUd-2B6VylT8WRwLWGXaQBtlBs1fPXn7p64Y10JvK8YFkrTv6NPbmEhqm3sN6aFlQfSiks3Z3tc6u0osL612aFbsrFn9Rj8xJf5PFbZ6Y-2BaNH9BzPJwANGcBB-2BInWftQuMTPPt2TzbSINb-2BcPtk4knsu-2FraPvAasxKEInWRjU-3D

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5lwWgMDuK-2FivqaohkU3M9kT-2Fww10Qt2GoaCJAOQCa0Wv4ijH4oV8jCt0XXa7QeAwh_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpywv9lPUd-2B6VylT8WRwLWGXSerh7O1tz96SyeZQZtgW-2B4-2Bhes3HdNMVFOzS4y-2BIfVZL5NibSm-2FKEZK-2F9CrC926wD7djVCMlqnjhl0F-2F58TDonzSPgo5Q83WpLJoCUBkXxPpUWIl4nFt28B8tc0cHU31rb4y-2B5CxVIWCfdvt0u0S-2FM-3D

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

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

[Noel Grandin]

 xmlhelp/source/treeview/tvread.cxx |   38 -
 1 file changed, 17 insertions(+), 21 deletions(-)

New commits:
commit 4b69497e36b941d4db62ae8d5bad863d032fdc50
Author: Noel Grandin 
Date:   Fri Nov 17 10:31:00 2017 +0200

loplugin:useuniqueptr in TVDom

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

diff --git a/xmlhelp/source/treeview/tvread.cxx 
b/xmlhelp/source/treeview/tvread.cxx
index af03833bc58e..5339a93117d7 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace treeview {
 
@@ -54,23 +55,17 @@ namespace treeview {
 {
 }
 
-~TVDom()
-{
-for(TVDom* p : children)
-delete p;
-}
-
 TVDom* newChild()
 {
-children.push_back( new TVDom( this ) );
-return children.back();
+children.emplace_back( new TVDom( this ) );
+return children.back().get();
 }
 
 TVDom* newChild(TVDom* p)
 {
-children.push_back( p );
+children.emplace_back( p );
 p->parent = this;
-return children.back();
+return children.back().get();
 }
 
 TVDom* getParent() const
@@ -158,7 +153,7 @@ namespace treeview {
 OUString  targetURL;
 
 TVDom *parent;
-std::vector< TVDom* > children;
+std::vector< std::unique_ptr > children;
 };
 
 }
@@ -382,7 +377,7 @@ TVChildTarget::TVChildTarget( const ConfigData& 
configData,TVDom* tvDom )
 {
 Elements.resize( tvDom->children.size() );
 for( size_t i = 0; i < Elements.size(); ++i )
-Elements[i] = new TVRead( configData,tvDom->children[i] );
+Elements[i] = new TVRead( configData,tvDom->children[i].get() );
 }
 
 TVChildTarget::TVChildTarget( const Reference< XComponentContext >& xContext )
@@ -428,7 +423,7 @@ TVChildTarget::TVChildTarget( const Reference< 
XComponentContext >& xContext )
 
 Elements.resize( tvDom.children.size() );
 for( size_t i = 0; i < Elements.size(); ++i )
-Elements[i] = new TVRead( configData,tvDom.children[i] );
+Elements[i] = new TVRead( configData,tvDom.children[i].get() );
 }
 
 TVChildTarget::~TVChildTarget()
@@ -450,11 +445,11 @@ void TVChildTarget::Check(TVDom* tvDom)
 if (((tvDom->children[i])->application == 
(tvDom->children[tvDom->children.size()-1])->application) &&
 ((tvDom->children[i])->id == 
(tvDom->children[tvDom->children.size()-1])->id))
 {
-TVDom* p = tvDom->children[tvDom->children.size()-1];
+TVDom* p = tvDom->children.back().get();
 
-for(TVDom* k : p->children)
-if (!SearchAndInsert(k, tvDom->children[i]))
-tvDom->children[i]->newChild(k);
+for(auto & k : p->children)
+if (!SearchAndInsert(k.get(), tvDom->children[i].get()))
+tvDom->children[i]->newChild(k.get());
 
 tvDom->children.pop_back();
 h = true;
@@ -470,7 +465,7 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
 bool h = false;
 sal_Int32 max = 0;
 
-std::vector< TVDom* >::iterator max_It, i;
+std::vector< std::unique_ptr >::iterator max_It, i;
 max_It = tvDom->children.begin();
 
 sal_Int32 c_int;
@@ -486,7 +481,7 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
 
 if (p_int==c_int)
 {
-(*(tvDom->children.insert(i+1, p)))->parent = tvDom;
+(*(tvDom->children.insert(i+1, 
std::unique_ptr(p->parent = tvDom;
 return true;
 }
 else if(c_int>max && c_int < p_int)
@@ -495,13 +490,14 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* 
tvDom)
 max_It = i+1;
 }
 }
-if (h) (*(tvDom->children.insert(max_It, p)))->parent = tvDom;
+if (h)
+(*(tvDom->children.insert(max_It, std::unique_ptr(p->parent 
= tvDom;
 else
 {
 i = tvDom->children.begin();
 while ((i!=tvDom->children.end()) && (!h))
 {
-h = SearchAndInsert(p, *i);
+h = SearchAndInsert(p, i->get());
 ++i;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 sw/inc/strings.hrc |6 ++
 sw/source/core/edit/edfcol.cxx |7 +++
 2 files changed, 13 insertions(+)

New commits:
commit 3b501c4478e5da43ea092c51e5afdb66790d028a
Author: Tomaž Vajngerl 
Date:   Fri Nov 17 12:34:22 2017 +0900

TSCP: show "OK" dialog when doc. classification changes on save

Change-Id: If0b24ceb5789ce505dc329d17fdad114749374d7
Reviewed-on: https://gerrit.libreoffice.org/44859
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 75f64148a4e5..76388ee520ca 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1338,6 +1338,12 @@
 #define STR_MENU_DOWN   NC_("STR_MENU_DOWN", 
"Do~wnwards")
 
 /*
+Description: Classification strings
+ */
+
+#define STR_CLASSIFICATION_LEVEL_CHANGED
NC_("STR_CLASSIFICATION_LEVEL_CHANGED", "Document classification has changed 
because a paragraph classification level is higher")
+
+/*
 Description: Paragraph Signature
  */
 #define STR_VALID   NC_("STR_VALID", " Valid ")
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index cccf2ab539a2..d76ab5a2120e 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2105,6 +2106,12 @@ void SwEditShell::ClassifyDocPerHighestParagraphClass()
 sHighestClass = aHelper.GetHigherClass(sHighestClass, 
aClassificationCategory);
 }
 
+if (aClassificationCategory != sHighestClass)
+{
+ScopedVclPtrInstance aQueryBox(nullptr, MessBoxStyle::Ok, 
SwResId(STR_CLASSIFICATION_LEVEL_CHANGED));
+aQueryBox->Execute();
+}
+
 const SfxClassificationPolicyType eHighestClassType = 
SfxClassificationHelper::stringToPolicyType(sHighestClass);
 
 // Check the origin, if "manual" (created via advanced classification 
dialog),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/workben/ww2fuzzer.cxx |4 
 vcl/workben/ww6fuzzer.cxx |4 
 vcl/workben/ww8fuzzer.cxx |4 
 3 files changed, 12 insertions(+)

New commits:
commit 01cc5c2bc927fa1515d04cb509e420b86a02e74d
Author: Caolán McNamara 
Date:   Fri Nov 17 12:10:39 2017 +

ofz#4245 need more components

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

diff --git a/vcl/workben/ww2fuzzer.cxx b/vcl/workben/ww2fuzzer.cxx
index 75dc001109b8..6ec5be024623 100644
--- a/vcl/workben/ww2fuzzer.cxx
+++ b/vcl/workben/ww2fuzzer.cxx
@@ -17,6 +17,7 @@
 extern "C" {
 void * unoxml_component_getFactory( const char* , void* , void* );
 void * i18npool_component_getFactory( const char* , void* , void* );
+void * ucb_component_getFactory( const char* , void* , void* );
 void * emfio_component_getFactory( const char* , void* , void* );
 
 void * com_sun_star_comp_framework_Desktop_get_implementation( void *, void * 
);
@@ -33,6 +34,7 @@ void * IndexedPropertyValuesContainer_get_implementation( 
void *, void * );
 void * com_sun_star_comp_uui_UUIInteractionHandler_get_implementation( void *, 
void * );
 void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * );
 void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, 
void * );
+void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, 
void * );
 }
 
 const lib_to_factory_mapping *
@@ -42,6 +44,7 @@ lo_get_factory_map(void)
 { "libunoxmllo.a", unoxml_component_getFactory },
 { "libi18npoollo.a", i18npool_component_getFactory },
 { "libemfiolo.a", emfio_component_getFactory },
+{ "libucb1.a", ucb_component_getFactory },
 { 0, 0 }
 };
 
@@ -66,6 +69,7 @@ lo_get_constructor_map(void)
 { "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation", 
com_sun_star_comp_uui_UUIInteractionHandler_get_implementation },
 { "com_sun_star_i18n_Transliteration_get_implementation", 
com_sun_star_i18n_Transliteration_get_implementation },
 { "com_sun_star_text_DefaultNumberingProvider_get_implementation", 
com_sun_star_text_DefaultNumberingProvider_get_implementation },
+{ "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", 
com_sun_star_comp_uri_UriReferenceFactory_get_implementation},
 { 0, 0 }
 };
 
diff --git a/vcl/workben/ww6fuzzer.cxx b/vcl/workben/ww6fuzzer.cxx
index bccfb87da72d..c92951aa 100644
--- a/vcl/workben/ww6fuzzer.cxx
+++ b/vcl/workben/ww6fuzzer.cxx
@@ -17,6 +17,7 @@
 extern "C" {
 void * unoxml_component_getFactory( const char* , void* , void* );
 void * i18npool_component_getFactory( const char* , void* , void* );
+void * ucb_component_getFactory( const char* , void* , void* );
 void * emfio_component_getFactory( const char* , void* , void* );
 
 void * com_sun_star_comp_framework_Desktop_get_implementation( void *, void * 
);
@@ -34,6 +35,7 @@ void * 
com_sun_star_comp_uui_UUIInteractionHandler_get_implementation( void *, v
 void * com_sun_star_comp_comphelper_OPropertyBag( void *, void * );
 void * com_sun_star_i18n_Transliteration_get_implementation( void *, void * );
 void * com_sun_star_text_DefaultNumberingProvider_get_implementation( void *, 
void * );
+void * com_sun_star_comp_uri_UriReferenceFactory_get_implementation( void *, 
void * );
 }
 
 const lib_to_factory_mapping *
@@ -43,6 +45,7 @@ lo_get_factory_map(void)
 { "libunoxmllo.a", unoxml_component_getFactory },
 { "libi18npoollo.a", i18npool_component_getFactory },
 { "libemfiolo.a", emfio_component_getFactory },
+{ "libucb1.a", ucb_component_getFactory },
 { 0, 0 }
 };
 
@@ -68,6 +71,7 @@ lo_get_constructor_map(void)
 { "com_sun_star_comp_comphelper_OPropertyBag", 
com_sun_star_comp_comphelper_OPropertyBag },
 { "com_sun_star_i18n_Transliteration_get_implementation", 
com_sun_star_i18n_Transliteration_get_implementation },
 { "com_sun_star_text_DefaultNumberingProvider_get_implementation", 
com_sun_star_text_DefaultNumberingProvider_get_implementation },
+{ "com_sun_star_comp_uri_UriReferenceFactory_get_implementation", 
com_sun_star_comp_uri_UriReferenceFactory_get_implementation},
 { 0, 0 }
 };
 
diff --git a/vcl/workben/ww8fuzzer.cxx b/vcl/workben/ww8fuzzer.cxx
index ea2bcdd31c62..16f49f119e15 100644
--- a/vcl/workben/ww8fuzzer.cxx
+++ b/vcl/workben/ww8fuzzer.cxx
@@ -17,6 +17,7 @@
 extern "C" {
 void * unoxml_component_getFactory( const char* , void* , void* );
 void * i18npool_component_getFactory( const char* , void* , void* );
+void * ucb_component_getFactory( const char* , void* , void* );
 void * emfio_component_getFactory( const char* , void* , void* );
 
 void * com_sun_star_comp_framework_Desktop_get_implementation( void *, void * 
);
@@ -34,6 

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

[Caolán McNamara]

 vcl/source/window/winproc.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ff8722507473328e811cdcd6293f091afe6aa7d3
Author: Caolán McNamara 
Date:   Fri Nov 17 13:08:44 2017 +

Resolves: tdf#112943 don't close popups on resize if size didn't change

Change-Id: If5331248f69098570c87da060595f5a85721c2d2
Reviewed-on: https://gerrit.libreoffice.org/44882
Tested-by: Xisco Faulí 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 81cf9f67765f..bed6fcc45854 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1574,7 +1574,8 @@ static void KillOwnPopups( vcl::Window const * pWindow )
 
 void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight )
 {
-if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) )
+const bool bChanged = (nNewWidth != pWindow->GetOutputWidthPixel()) || 
(nNewHeight != pWindow->GetOutputHeightPixel());
+if (bChanged && pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE))
 {
 KillOwnPopups( pWindow );
 if( pWindow->ImplGetWindow() != ImplGetSVData()->maHelpData.mpHelpWin )
@@ -1586,7 +1587,7 @@ void ImplHandleResize( vcl::Window* pWindow, long 
nNewWidth, long nNewHeight )
  pWindow->ImplGetWindow()->ImplGetWindowImpl()->mbAllResize
)
 {
-if ( (nNewWidth != pWindow->GetOutputWidthPixel()) || (nNewHeight != 
pWindow->GetOutputHeightPixel()) )
+if (bChanged)
 {
 pWindow->mnOutWidth  = nNewWidth;
 pWindow->mnOutHeight = nNewHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 drawinglayer/source/tools/emfpbrush.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit c1c868003e129ff286ccd787e22f1a64a75de58a
Author: Bartosz Kosiorek 
Date:   Fri Nov 17 09:56:00 2017 +0100

tdf#111486 Use buildin methods for displaying matrix

Change-Id: I0f40f7178be126229c8963b56e6a15313acc19a7
Reviewed-on: https://gerrit.libreoffice.org/44868
Tested-by: Jenkins 
Reviewed-by: Bartosz Kosiorek 

diff --git a/drawinglayer/source/tools/emfpbrush.cxx 
b/drawinglayer/source/tools/emfpbrush.cxx
index 4d743d10b684..68ec151a6fe8 100644
--- a/drawinglayer/source/tools/emfpbrush.cxx
+++ b/drawinglayer/source/tools/emfpbrush.cxx
@@ -210,14 +210,9 @@ namespace emfplushelper
 
 if (additionalFlags & 0x02)
 {
-SAL_INFO("drawinglayer", "EMF+\tuse transformation");
 EmfPlusHelperData::readXForm(s, brush_transformation);
 hasTransformation = true;
-SAL_INFO("drawinglayer",
-"EMF+\tm11: " << brush_transformation.get(0,0) 
<< " m12: " << brush_transformation.get(1,0) <<
-"\nEMF+\tm21: " << 
brush_transformation.get(0,1) << " m22: " << brush_transformation.get(1,1) <<
-"\nEMF+\tdx: " << 
brush_transformation.get(0,2) << " dy: " << brush_transformation.get(1,2));
-
+SAL_INFO("drawinglayer", "EMF+\tuse brush transformation: 
" << brush_transformation);
 }
 
 if (additionalFlags & 0x08)
@@ -296,13 +291,9 @@ namespace emfplushelper
 
 if (additionalFlags & 0x02)
 {
-SAL_INFO("drawinglayer", "EMF+\tuse transformation");
 EmfPlusHelperData::readXForm(s, brush_transformation);
 hasTransformation = true;
-SAL_INFO("drawinglayer",
-"EMF+\tm11: " << brush_transformation.get(0,0) << " 
m12: " << brush_transformation.get(1,0) <<
-"\nEMF+\tm21: " << brush_transformation.get(0,1) << " 
m22: " << brush_transformation.get(1,1) <<
-"\nEMF+\tdx: " << brush_transformation.get(0,2) << " 
dy: " << brush_transformation.get(1,2));
+SAL_INFO("drawinglayer", "EMF+\tuse brush transformation: 
" << brush_transformation);
 }
 
 if (additionalFlags & 0x08)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 sd/source/ui/sidebar/SlideBackground.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 605b01dc591eaa72788be255baf1f9b9dde76414
Author: Xisco Fauli 
Date:   Thu Nov 16 00:47:09 2017 +0100

tdf#113660: show Master Slide label in handout view

Change-Id: Ib26837fe8eab9f024a15e5b6a48e4d9dfa7252a5
Reviewed-on: https://gerrit.libreoffice.org/44797
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 72954fcf6582..8b2e15dc7671 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -255,6 +255,7 @@ void SlideBackground::HandleContextChange(
 }
 else if ( maContext == maImpressHandoutContext )
 {
+SetPanelTitle(SdResId(STR_MASTERSLIDE_NAME));
 mpCloseMaster->Hide();
 mpEditMaster->Hide();
 mpMasterSlide->Disable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Manfred Blume]

 vcl/win/window/salframe.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit f53b3b547b04dc112076d8323b5b24ae178d6260
Author: Manfred Blume 
Date:   Thu Nov 16 13:55:26 2017 +0100

revert "tdf#95761 All Hotkeys with CTRL+ALT+ not worked"

This was breaking keyboard functions in other locales, by essentially
disabling use of left Ctrl-Alt as AltGr equivalent - fixes tdf#97908

This reverts commit 3ac9942c624cb627c8b09122498b45b05cf455f6

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

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 83c96b69c15c..0715c88f33c0 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -3360,10 +3360,8 @@ static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
 nModCode |= KEY_SHIFT;
 if ( GetKeyState( VK_CONTROL ) & 0x8000 )
 nModCode |= KEY_MOD1;
-if ( GetKeyState( VK_LMENU ) & 0x8000 )
+if (GetKeyState(VK_MENU) & 0x8000)
 nModCode |= KEY_MOD2;
-if ( GetKeyState( VK_RMENU ) & 0x8000 )  // this is the ALTGR-Key in this 
case
-nModCode &= ~KEY_MOD1;   // remove the Control flag
 
 if ( (nMsg == WM_CHAR) || (nMsg == WM_SYSCHAR) )
 {
@@ -3567,6 +3565,13 @@ static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
 aKeyEvt.mnCode |= nModCode;
 aKeyEvt.mnRepeat= nRepeat;
 
+if ((nModCode & (KEY_MOD1 | KEY_MOD2)) == (KEY_MOD1 | 
KEY_MOD2) &&
+aKeyEvt.mnCharCode)
+{
+// this is actually AltGr and should not be handled as Alt
+aKeyEvt.mnCode &= ~(KEY_MOD1 | KEY_MOD2);
+}
+
 bIgnoreCharMsg = bCharPeek ? TRUE : FALSE;
 bool nRet = pFrame->CallCallback( nEvent,  );
 // independent part only reacts on keyup but Windows does not 
send
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Copyright infringement and future of Hunspell

[Caolán McNamara]

On Wed, 2017-11-15 at 18:03 +, Димитриј Мијоски wrote:
> Hello Nemeth Laszlo,
> 
> I don't see any copyright infringement, as Hunspell allowed LGPLv2.1
> or later, which safely allows us to put out derivative work to
> LGPLv3.

Sure, if you were forking hunspell to create something else and decided
to use that provision for the new work. But it's another thing to
modify the license of the preexisting hunspell over against the wishes
of the author.

I suggest a possible approach here. Currently hunspell has two main
dirs in it, src/hunspell for the classic code and src/hunspell2 for
your proposed successor with a shared toplevel dir with the license
statement, etc. While https://github.com/hunspell lists the current
hunspell related repositories of hunspell, myspell and mythes.

Why not add hunspell2 (or junspell) as a new work in a new repository
at that higher level, move src/hunspell2 from hunspell to the new repo
and copy whatever shared stuff is needed. Restore the old license stuff
for the classic hunspell repository and work away on the successor in
the separate repo under the hunspell umbrella.

> As for the license, I really don't see what is the problem with
> LGPLv3.

IANAL, but the existing consumers are known to work with the classic
license situation. Some of these consumers (e.g. the static linked and
unknowns of https://en.wikipedia.org/wiki/Hunspell) may be unable or
unwilling (as a general policy) to use LGPLv2 vs the current
possibility of the MPL.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - Makefile.am

[Andras Timar]

 Makefile.am |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fba8488b2549f531fcc0d4e1e7228a7345c2f57d
Author: Andras Timar 
Date:   Fri Nov 17 14:53:15 2017 +0100

add missing files to dist tarball

Change-Id: If3fb19ad16c4a0b35f17b7d7be36ff7b8e1513cb

diff --git a/Makefile.am b/Makefile.am
index 7f8d0ca0..ae34e8bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -203,6 +203,8 @@ dist-hook:
 EXTRA_DIST = discovery.xml \
  favicon.ico \
  loolkitconfig.xcu \
+ loolwsd.init.rhel6 \
+ loolwsd.init.sle11 \
  loolwsd.spec \
  loolwsd.xml.in \
  loolwsd.service \
@@ -218,6 +220,7 @@ EXTRA_DIST = discovery.xml \
  debian/changelog \
  debian/control \
  debian/loolwsd.postinst \
+ debian/loolwsd.postrm \
  etc/key.pem \
  etc/cert.pem \
  etc/ca-chain.cert.pem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sdext/source/pdfimport/filterdet.cxx   |6 +-
 sdext/source/pdfimport/inc/pdfparse.hxx|4 -
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |   61 +++--
 sdext/source/pdfimport/pdfparse/pdfparse.cxx   |   10 ++--
 sdext/source/pdfimport/test/pdfunzip.cxx   |8 +--
 5 files changed, 41 insertions(+), 48 deletions(-)

New commits:
commit 328cdfd4a75f5e29c3a1b3ba4ee0ed9475603442
Author: Noel Grandin 
Date:   Fri Nov 17 10:53:06 2017 +0200

loplugin:useuniqueptr in PDFContainer

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

diff --git a/sdext/source/pdfimport/filterdet.cxx 
b/sdext/source/pdfimport/filterdet.cxx
index 57e8681544e8..5ca60e4282e5 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -486,7 +486,7 @@ uno::Reference< io::XStream > getAdditionalStream( const 
OUString&
 unsigned int nElements = pPDFFile->m_aSubElements.size();
 while( nElements-- > 0 )
 {
-pdfparse::PDFTrailer* pTrailer = 
dynamic_cast(pPDFFile->m_aSubElements[nElements]);
+pdfparse::PDFTrailer* pTrailer = 
dynamic_cast(pPDFFile->m_aSubElements[nElements].get());
 if( pTrailer && pTrailer->m_pDict )
 {
 // search document checksum entry
@@ -527,8 +527,8 @@ uno::Reference< io::XStream > getAdditionalStream( const 
OUString&
 continue;
 
 // extract addstream and mimetype
-pdfparse::PDFName* pMimeType = 
dynamic_cast(pStreams->m_aSubElements[0]);
-pdfparse::PDFObjectRef* pStreamRef = 
dynamic_cast(pStreams->m_aSubElements[1]);
+pdfparse::PDFName* pMimeType = 
dynamic_cast(pStreams->m_aSubElements[0].get());
+pdfparse::PDFObjectRef* pStreamRef = 
dynamic_cast(pStreams->m_aSubElements[1].get());
 
 SAL_WARN_IF( !pMimeType, "sdext.pdfimport", "error: no 
mimetype element" );
 SAL_WARN_IF( !pStreamRef, "sdext.pdfimport", "error: no 
stream ref element" );
diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx 
b/sdext/source/pdfimport/inc/pdfparse.hxx
index 462cf46955fa..90aaeab292ae 100644
--- a/sdext/source/pdfimport/inc/pdfparse.hxx
+++ b/sdext/source/pdfimport/inc/pdfparse.hxx
@@ -157,14 +157,14 @@ struct PDFObject;
 struct PDFContainer : public PDFEntry
 {
 sal_Int32  m_nOffset;
-std::vector m_aSubElements;
+std::vector m_aSubElements;
 
 // this is an abstract base class for identifying
 // entries that can contain sub elements besides comments
 PDFContainer() : PDFEntry(), m_nOffset( 0 ) {}
 virtual ~PDFContainer() override;
 bool emitSubElements( EmitContext& rWriteContext ) const;
-void cloneSubElements( std::vector& rNewSubElements ) const;
+void cloneSubElements( std::vector& 
rNewSubElements ) const;
 
 PDFObject* findObject( unsigned int nNumber, unsigned int nGeneration ) 
const;
 PDFObject* findObject( PDFObjectRef const * pRef ) const
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx 
b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 7a4f457fe0a4..16563868f25c 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -442,9 +442,6 @@ PDFEntry* PDFObjectRef::clone() const
 
 PDFContainer::~PDFContainer()
 {
-int nEle = m_aSubElements.size();
-for( int i = 0; i < nEle; i++ )
-delete m_aSubElements[i];
 }
 
 bool PDFContainer::emitSubElements( EmitContext& rWriteContext ) const
@@ -454,7 +451,7 @@ bool PDFContainer::emitSubElements( EmitContext& 
rWriteContext ) const
 {
 if( rWriteContext.m_bDecrypt )
 {
-const PDFName* pName = dynamic_cast(m_aSubElements[i]);
+const PDFName* pName = 
dynamic_cast(m_aSubElements[i].get());
 if (pName && pName->m_aName == "Encrypt")
 {
 i++;
@@ -467,11 +464,11 @@ bool PDFContainer::emitSubElements( EmitContext& 
rWriteContext ) const
 return true;
 }
 
-void PDFContainer::cloneSubElements( std::vector& rNewSubElements ) 
const
+void PDFContainer::cloneSubElements( std::vector& 
rNewSubElements ) const
 {
 int nEle = m_aSubElements.size();
 for( int i = 0; i < nEle; i++ )
-rNewSubElements.push_back( m_aSubElements[i]->clone() );
+rNewSubElements.emplace_back( m_aSubElements[i]->clone() );
 }
 
 PDFObject* 

Re: Copyright infringement and future of Hunspell

[Thorsten Behrens]

Hi guys,

Димитриј Мијоски wrote:
> I don't see any copyright infringement, as Hunspell allowed LGPLv2.1
> or later, which safely allows us to put out derivative work to
> LGPLv3. And also, ALL copyright notices were kept.
> 
With LibreOffice being one of the major downstream consumers of
hunspell, we are concerned about this - so _if_ you're pondering to
reduce the number of licenses (which at any rate should be agreed on
amicably between the project maintainers), why not pick the MPL
instead?

Cheers,

-- Thorsten


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

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

[Caolán McNamara]

 sc/source/ui/app/inputwin.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit d90dcf3554a84b5600800ee6deb3cde879c62b8d
Author: Caolán McNamara 
Date:   Fri Nov 17 12:43:00 2017 +

tdf#113894 release ctrl of ctrl+v in input line should strip formatting

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

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b77266912b62..6572e0b01d95 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1366,13 +1366,6 @@ void ScTextWnd::MouseButtonUp( const MouseEvent& rMEvt )
 
 void ScTextWnd::Command( const CommandEvent& rCEvt )
 {
-//pass alt press/release to parent impl
-if (rCEvt.GetCommand() == CommandEventId::ModKeyChange)
-{
-Window::Command(rCEvt);
-return;
-}
-
 bInputMode = true;
 CommandEventId nCommand = rCEvt.GetCommand();
 if ( mpEditView /* && nCommand == CommandEventId::StartDrag */ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Some points on clang-format usage

[Stephan Bergmann]

On 11/17/2017 12:19 PM, Miklos Vajna wrote:

On Fri, Nov 17, 2017 at 11:16:13AM +0100, Stephan Bergmann 
 wrote:

...which might be reason enough to still revisit the .clang-format rule that
causes leading commas, if that wrecks such havoc with comments?


I think BreakConstructorInitializersBeforeComma is the relevant key.
Setting it to false would not be controversial, it would just mean we
leave that area alone, I believe.


So among 
BreakConstructorInitializers:{BeforeColon,BeforeComma,AfterColon} and 
ConstructorInitializerAllOnOneLineOrOnePerLine:{false,true} there 
appears to be no setting that both (a) consistently places each 
initializer on a line of its own (the current behaviour IIUC; beneficial 
for small diffs when modifying an initializer list) and (b) puts the 
comma after the initializer (which would be beneficial for preserving 
trailing comment placement).


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

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

[Caolán McNamara]

 vcl/source/gdi/pngread.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1890b577d99d571e52570fa6b3e8b36b46a0bbba
Author: Caolán McNamara 
Date:   Mon Nov 6 09:55:42 2017 +

ofz#4076 bad palette READ

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

diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index a29ed669d048..f2169e01d337 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -126,6 +126,7 @@ private:
 boolmbGrayScale : 1;
 boolmbzCodecInUse : 1;
 boolmbStatus : 1;
+boolmbIDATStarted : 1;  // true if IDAT seen
 boolmbIDATComplete : 1; // true if finished with enough 
IDAT chunks
 boolmbpHYs : 1; // true if physical size of pixel 
available
 boolmbIgnoreGammaChunk : 1;
@@ -205,6 +206,7 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream )
 mbGrayScale( false ),
 mbzCodecInUse   ( false ),
 mbStatus( true ),
+mbIDATStarted( false ),
 mbIDATComplete( false ),
 mbpHYs  ( false ),
 mbIgnoreGammaChunk  ( false ),
@@ -360,7 +362,7 @@ BitmapEx PNGReaderImpl::GetBitmapEx( const Size& 
rPreviewSizeHint )
 
 case PNGCHUNK_PLTE :
 {
-if ( !mbPalette )
+if (!mbPalette && !mbIDATStarted)
 mbStatus = ImplReadPalette();
 }
 break;
@@ -479,7 +481,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& 
rPreviewSizeHint )
 }
 
 mbPalette = true;
-mbIDATComplete = mbAlphaChannel = mbTransparent = false;
+mbIDATStarted = mbIDATComplete = mbAlphaChannel = mbTransparent = false;
 mbGrayScale = mbRGBTriple = false;
 mnTargetDepth = mnPngDepth;
 sal_uInt64 nScansize64 = ( ( static_cast< sal_uInt64 >( maOrigSize.Width() 
) * mnPngDepth ) + 7 ) >> 3;
@@ -892,6 +894,8 @@ void PNGReaderImpl::ImplReadIDAT()
 {
 if( mnChunkLen > 0 )
 {
+mbIDATStarted = true;
+
 if ( !mbzCodecInUse )
 {
 mbzCodecInUse = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 cui/inc/strings.hrc|1 +
 cui/source/inc/optdict.hxx |1 +
 cui/source/options/optdict.cxx |   29 ++---
 linguistic/source/dicimp.cxx   |   36 +++-
 4 files changed, 59 insertions(+), 8 deletions(-)

New commits:
commit 95d9f596336ebf19dc367f618b3788a4ce0ba542
Author: László Németh 
Date:   Thu Nov 9 16:03:21 2017 +0100

tdf#113739 add "Grammar By" feature to user dictionaries

Language-specific user dictionaries (en-US, de-DE, etc.)
have got a new "Grammar By" field to specify
optional automatic affixation and compounding of the
new words by adding an example dictionary word.

Test example:

Create an en-US user dictionary. Add the new word
"crowdfund" to it, also an example, the Hunspell
en-US dictionary word "fund" in the optional
"Grammar By" field.

This way, the word "crowdfund" will be recognized
by the spell checker with suffixes of the word "fund",
too: crowdfund’s, crowdfunds, crowdfunder, crowdfunders
and crowdfunding.

Hunspell dictionaries with compound flag usage (German,
Hungarian, etc.) can support automatic compounding of
the new words, too.

Change-Id: Id70dbee4544643967153f730ae64938e5cee0c82
Reviewed-on: https://gerrit.libreoffice.org/44562
Tested-by: Jenkins 
Reviewed-by: László Németh 

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 40270de92037..5909ef647c74 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -268,6 +268,7 @@
 #define RID_SVXSTR_CHG_SMARTART 
NC_("RID_SVXSTR_CHG_SMARTART", "SmartArt to %PRODUCTNAME shapes or reverse")
 
 #define RID_SVXSTR_OPT_DOUBLE_DICTS 
NC_("RID_SVXSTR_OPT_DOUBLE_DICTS", "The specified name already exists.\nPlease 
enter a new name.")
+#define RID_SVXSTR_OPT_GRAMMAR_BY   
NC_("RID_SVXSTR_OPT_GRAMMAR_BY", "~Grammar By")
 #define STR_MODIFY  NC_("STR_MODIFY", 
"~Replace")
 #define RID_SVXSTR_CONFIRM_SET_LANGUAGE 
NC_("RID_SVXSTR_CONFIRM_SET_LANGUAGE", "Do you want to change the '%1' 
dictionary language?")
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index fb8cd6deb364..e2dc53bf9e6e 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -109,6 +109,7 @@ private:
 
 OUStringsModify;
 OUStringsNew;
+OUStringsReplaceFT_Text;
 
 css::uno::Sequence<
 css::uno::Reference<
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index c04584f08bb4..8b23f40c5445 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -227,6 +227,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
 
 get(pWordED,"word");
 get(pReplaceFT,"replace_label");
+sReplaceFT_Text = pReplaceFT->GetText();
 get(pReplaceED,"replace");
 get(pWordsLB,"words");
 pWordsLB->set_height_request(pWordsLB->GetTextHeight() * 8);
@@ -484,7 +485,22 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 
nId )
 pWordED->SetText(aStr);
 pReplaceED->SetText(aStr);
 
-if(xDic->getDictionaryType() != DictionaryType_POSITIVE)
+bool bIsNegative = xDic->getDictionaryType() != DictionaryType_POSITIVE;
+bool bLangNone = LanguageTag(
+xDic->getLocale() ).getLanguageType() == LANGUAGE_NONE;
+
+// The label is "Replace By" only in negative dictionaries (forbidden
+// words), otherwise "Grammar By" in language-specific dictionaries
+// (where the optional second word is the sample word for
+// the Hunspell based affixation/compounding of the new dictionary word)
+if (bIsNegative)
+{
+pReplaceFT->SetText(sReplaceFT_Text);
+} else if (!bLangNone) {
+pReplaceFT->SetText(CuiResId(RID_SVXSTR_OPT_GRAMMAR_BY));
+}
+
+if(bIsNegative || !bLangNone)
 {
 nStaticTabs[0]=2;
 
@@ -525,7 +541,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 
nId )
 {
 aStr = pEntry[i]->getDictionaryWord();
 sal_uLong nPos = GetLBInsertPos( aStr );
-if(pEntry[i]->isNegative())
+if(!pEntry[i]->getReplacementText().isEmpty())
 {
 aStr += "\t" + pEntry[i]->getReplacementText();
 }
@@ -608,11 +624,10 @@ bool SvxEditDictionaryDialog::NewDelHdl(void const * pBtn)
 {
 // make changes in dic
 
-//! ...IsVisible should reflect whether the dictionary is a 
negativ
-//! or not (hopefully...)
-bool bIsNegEntry = pReplaceFT->IsVisible();
+bool bIsNegEntry = xDic->getDictionaryType() == 
DictionaryType_NEGATIVE;
+
 OUString aRplcText;
-if(bIsNegEntry)
+if(!aReplaceStr.isEmpty())

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

[Justin Luth]

 sc/qa/extras/testdocuments/vba_findFunction.xls |binary
 sc/source/ui/vba/vbarange.cxx   |   17 +++--
 2 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit ac116d190da9e59b6a8cc541bba652183fccc5b3
Author: Justin Luth 
Date:   Sat Nov 11 07:54:01 2017 +0300

ScVbaRange::Find - allow empty string as What to search for

Excel's find macro is able to search for an empty string
and find an empty cell, without giving a script error.

LibreOffice was raising a "missing params" error if it was passed
an empty string to search for, causing execution failure,
a misleading error code, and failing to find an empty cell.

Also fixed the other copy/paste error codes to indicate
that this is the find function, not the replace function.

Also added a sanity control line to the VBA test.  First select
cell A1 - instead of assuming that no one has touched the
file.

Change-Id: Iabbac7333c37886a667ab5670af819b1cd53c086
Reviewed-on: https://gerrit.libreoffice.org/44618
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 
Tested-by: Jenkins 

diff --git a/sc/qa/extras/testdocuments/vba_findFunction.xls 
b/sc/qa/extras/testdocuments/vba_findFunction.xls
index 2ea964ee290f..bb0f450b1ac8 100644
Binary files a/sc/qa/extras/testdocuments/vba_findFunction.xls and 
b/sc/qa/extras/testdocuments/vba_findFunction.xls differ
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 1f078b5408af..c8bc5ac351a8 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3127,10 +3127,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 
 // string.
 if( What >>= sWhat )
-{
-if( sWhat.isEmpty() )
-throw uno::RuntimeException("Range::Find, missing params" );
-}
+{}
 else if( What >>= nWhat )
 {
 sWhat = OUString::number( nWhat );
@@ -3140,7 +3137,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 sWhat = OUString::number( fWhat );
 }
 else
-throw uno::RuntimeException("Range::Find, missing params" );
+throw uno::RuntimeException("Range::Find, missing search-for-what 
param" );
 
 OUString sSearch = VBAToRegexp( sWhat );
 
@@ -3184,7 +3181,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 nSearchType = SvxSearchCellType::VALUE;
 break;
 default:
-throw uno::RuntimeException("Range::Replace, illegal 
value for LookIn." );
+throw uno::RuntimeException("Range::Find, illegal 
value for LookIn." );
 }
 newOptions.SetCellType( nSearchType );
 xDescriptor->setPropertyValue( "SearchType", uno::makeAny( 
static_cast(nSearchType) ) );
@@ -3201,7 +3198,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 else if ( nLookAt == excel::XlLookAt::xlWhole )
 bSearchWords = true;
 else
-throw uno::RuntimeException("Range::Replace, illegal value for 
LookAt" );
+throw uno::RuntimeException("Range::Find, illegal value for 
LookAt" );
 newOptions.SetWordOnly( bSearchWords );
 xDescriptor->setPropertyValue( SC_UNO_SRCHWORDS, uno::makeAny( 
bSearchWords ) );
 }
@@ -3216,7 +3213,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 else if ( nSearchOrder == excel::XlSearchOrder::xlByRows )
 bSearchByRow = true;
 else
-throw uno::RuntimeException("Range::Replace, illegal value for 
SearchOrder" );
+throw uno::RuntimeException("Range::Find, illegal value for 
SearchOrder" );
 
 newOptions.SetRowDirection( bSearchByRow );
 xDescriptor->setPropertyValue( SC_UNO_SRCHBYROW, uno::makeAny( 
bSearchByRow ) );
@@ -3234,7 +3231,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 else if( nSearchDirection == 
excel::XlSearchDirection::xlPrevious )
 bSearchBackwards = true;
 else
-throw uno::RuntimeException("Range::Replace, illegal value 
for SearchDirection" );
+throw uno::RuntimeException("Range::Find, illegal value 
for SearchDirection" );
 newOptions.SetBackward( bSearchBackwards );
 xDescriptor->setPropertyValue( "SearchBackwards", 
uno::makeAny( bSearchBackwards ) );
 }
@@ -3246,7 +3243,7 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& 
After, const uno::Any& L
 {
 // SearchCaseSensitive
 

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

[László Németh]

 
external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
 |   40 ++
 external/hunspell/UnpackedTarball_hunspell.mk  
   |1 
 2 files changed, 41 insertions(+)

New commits:
commit a7ec994689f8ea5985f6c8f94f17a4417978ff41
Author: László Németh 
Date:   Thu Nov 9 15:49:46 2017 +0100

apply patch for run-time Hunspell dictionary extension

to use in new "Affixation/Compounding By" feature of
language-specific LibreOffice user dictionaries.

Change-Id: Icb4181717f0ff1145ac5acc130266b165132cfe9
Reviewed-on: https://gerrit.libreoffice.org/44561
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git 
a/external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
 
b/external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
new file mode 100644
index ..c17d168b2478
--- /dev/null
+++ 
b/external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
@@ -0,0 +1,40 @@
+From 643bd113f5dbfa6e8ffa61aae6ab7ccc4f63bccc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= 
+Date: Thu, 9 Nov 2017 13:22:55 +0100
+Subject: [PATCH] add SPELLML support for run-time dictionary extension
+
+to use in new "Affixation/Compounding By" feature
+of language-specific LibreOffice user dictionaries.
+---
+ src/hunspell/hunspell.cxx | 15 +++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx
+index b271750..09fd6ee 100644
+--- a/src/hunspell/hunspell.cxx
 b/src/hunspell/hunspell.cxx
+@@ -1733,6 +1733,21 @@ std::vector HunspellImpl::spellml(const 
std::string& in_word) {
+ }
+   }
+ }
++  } else if (check_xml_par(q, "type=", "add")) {
++std::string cw = get_xml_par(strchr(q2, '>'));
++if (cw.empty())
++  return slst;
++const char* q3 = strstr(q2 + 1, "'));
++  if (!cw2.empty()) {
++add_with_affix(cw, cw2);
++  } else {
++add(cw);
++  }
++} else {
++add(cw);
++}
+   }
+   return slst;
+ }
+-- 
+2.7.4
+
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk 
b/external/hunspell/UnpackedTarball_hunspell.mk
index 23d3aca47131..87f12446427c 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell, \

external/hunspell/0001-Remove-forbidden-words-from-dash-suggestion-list.patch \

external/hunspell/0001-fix-compound-handling-for-new-Hungarian-orthography.patch
 \
external/hunspell/0001-fix-compound-word-part-pa.patch \
+   
external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
 \
 ))
 
 # vim: set noet sw=4 ts=4:
___
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/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkframe.hxx   |4 +++-
 vcl/inc/unx/gtk/gtksalmenu.hxx |2 ++
 vcl/unx/gtk/gtksalframe.cxx|7 ++-
 vcl/unx/gtk3/gtk3gtkframe.cxx  |   13 -
 4 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit 33b194c2b8eb51facc452f5f7e2b4cef7ee34339
Author: Caolán McNamara 
Date:   Fri Nov 10 13:48:54 2017 +

Related: tdf#112549 gtk3 hide/show menubar on enter/exit fullscreen

Change-Id: I0436d0f3404a88abd81c4eedea09b16c81536b61
Reviewed-on: https://gerrit.libreoffice.org/44599
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 97d09553425b59d030fd4d8f039a4a9994b674cf)
Reviewed-on: https://gerrit.libreoffice.org/44809
Reviewed-by: Yousuf Philips 

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 1f28dd0804bf..cf644b281c77 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -68,6 +68,8 @@ class GtkDnDTransferable;
 typedef void GDBusConnection;
 #endif
 
+class GtkSalMenu;
+
 class GtkSalFrame : public SalFrame
   , public NativeWindowHandleProvider
 {
@@ -221,7 +223,7 @@ class GtkSalFrame : public SalFrame
 boolm_bSetFocusOnMap;
 #endif
 
-SalMenu*m_pSalMenu;
+GtkSalMenu* m_pSalMenu;
 
 #if ENABLE_DBUS && ENABLE_GIO
 private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 9a5ef3ed67ab..c4d3b7246660 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -121,6 +121,8 @@ public:
 GtkSalMenu* GetTopLevel();
 voidSetNeedsUpdate();
 
+GtkWidget*  GetMenuBarContainerWidget() const { return 
mpMenuBarContainerWidget; }
+
 void CreateMenuBarWidget();
 void DestroyMenuBarWidget();
 gboolean SignalKey(GdkEventKey* pEvent);
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 5a06b220adad..f352af4fdf19 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1422,11 +1423,7 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon )
 
 void GtkSalFrame::SetMenu( SalMenu* pSalMenu )
 {
-//if(m_pSalMenu)
-//{
-//static_cast(m_pSalMenu)->DisconnectFrame();
-//}
-m_pSalMenu = pSalMenu;
+m_pSalMenu = static_cast(pSalMenu);
 }
 
 SalMenu* GtkSalFrame::GetMenu()
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index cff6e2d0b577..c69aa3f71b13 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1398,11 +1398,7 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon )
 
 void GtkSalFrame::SetMenu( SalMenu* pSalMenu )
 {
-//if(m_pSalMenu)
-//{
-//static_cast(m_pSalMenu)->DisconnectFrame();
-//}
-m_pSalMenu = pSalMenu;
+m_pSalMenu = static_cast(pSalMenu);
 }
 
 SalMenu* GtkSalFrame::GetMenu()
@@ -1929,8 +1925,11 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, 
SetType eType, tools::Rect
 gdk_window_set_fullscreen_mode( widget_get_window(m_pWindow), 
m_bSpanMonitorsWhenFullscreen
 ? GDK_FULLSCREEN_ON_ALL_MONITORS : GDK_FULLSCREEN_ON_CURRENT_MONITOR );
 #endif
+GtkWidget* pMenuBarContainerWidget = m_pSalMenu ? 
m_pSalMenu->GetMenuBarContainerWidget() : nullptr;
 if( eType == SetType::Fullscreen )
 {
+if (pMenuBarContainerWidget)
+gtk_widget_hide(pMenuBarContainerWidget);
 if (m_bSpanMonitorsWhenFullscreen)
 gtk_window_fullscreen(GTK_WINDOW(m_pWindow));
 else
@@ -1944,7 +1943,11 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, 
SetType eType, tools::Rect
 
 }
 else if( eType == SetType::UnFullscreen )
+{
+if (pMenuBarContainerWidget)
+gtk_widget_show(pMenuBarContainerWidget);
 gtk_window_unfullscreen( GTK_WINDOW( m_pWindow ) );
+}
 
 if( eType == SetType::UnFullscreen &&
 !(m_nStyle & SalFrameStyleFlags::SIZEABLE) )
___
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 sd/uiconfig

[Henry Castro]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |4 +-
 sd/source/ui/docshell/docshel3.cxx   |3 -
 sd/source/ui/docshell/docshell.cxx   |   54 +++
 sd/source/ui/view/ViewShellBase.cxx  |   15 +++
 sd/uiconfig/simpress/statusbar/statusbar.xml |1 
 5 files changed, 41 insertions(+), 36 deletions(-)

New commits:
commit 44badb1175dbe7906aec993e8f2cc90c81ae71fd
Author: Henry Castro 
Date:   Thu Nov 16 22:13:27 2017 -0400

sd: enable language status bar item

Change-Id: I7cb725cdcfc92366694fc8cb24c1443dd74d102e
Reviewed-on: https://gerrit.libreoffice.org/44851
Tested-by: Jenkins 
Reviewed-by: Henry Castro 

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 9622946a4743..b4110b79a4aa 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1856,8 +1856,8 @@ void SdTiledRenderingTest::testLanguageStatus()
 std::unique_ptr pItem2;
 pView1->GetViewFrame()->GetBindings().QueryState(SID_LANGUAGE_STATUS, 
pItem1);
 pView2->GetViewFrame()->GetBindings().QueryState(SID_LANGUAGE_STATUS, 
pItem2);
-CPPUNIT_ASSERT(dynamic_cast< const SfxStringListItem* >(pItem1.get()));
-CPPUNIT_ASSERT(dynamic_cast< const SfxStringListItem* >(pItem2.get()));
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem* >(pItem1.get()));
+CPPUNIT_ASSERT(dynamic_cast< const SfxStringItem* >(pItem2.get()));
 }
 
 comphelper::LibreOfficeKit::setActive(false);
diff --git a/sd/source/ui/docshell/docshel3.cxx 
b/sd/source/ui/docshell/docshel3.cxx
index ab1cb41a1668..b7e1c5b33feb 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -314,8 +314,6 @@ void DrawDocShell::Execute( SfxRequest& rReq )
 else
 lcl_setLanguage( pDoc, aNewLangTxt );
 
-mpViewShell->GetFrame()->GetBindings().Invalidate( 
SID_LANGUAGE_STATUS );
-
 if ( pDoc->GetOnlineSpell() )
 {
 pDoc->StartOnlineSpelling();
@@ -323,6 +321,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
 }
 }
 }
+Broadcast(SfxHint(SfxHintId::LanguageChanged));
 }
 break;
 
diff --git a/sd/source/ui/docshell/docshell.cxx 
b/sd/source/ui/docshell/docshell.cxx
index 94a66e9bb18d..967f22552eaa 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -275,47 +275,37 @@ void DrawDocShell::GetState(SfxItemSet )
 break;
 case SID_LANGUAGE_STATUS:
 {
-if ( comphelper::LibreOfficeKit::isActive() )
+SdrObject* pObj = nullptr;
+bool bLanguageFound = false;
+OutlinerParaObject* pParaObj = nullptr;
+LanguageType eLanguage( LANGUAGE_DONTKNOW );
+sal_uInt16 nCount = mpDoc->GetPageCount();
+for ( sal_uInt16 itPage = 0; itPage < nCount && 
!bLanguageFound; itPage++ )
 {
-SdrObject* pObj = nullptr;
-bool bLanguageFound = false;
-OutlinerParaObject* pParaObj = nullptr;
-LanguageType eLanguage( LANGUAGE_DONTKNOW );
-sal_uInt16 nCount = mpDoc->GetPageCount();
-for ( sal_uInt16 itPage = 0; itPage < nCount && 
!bLanguageFound; itPage++ )
+SdrObjListIter aListIter(*mpDoc->GetPage(itPage), 
SdrIterMode::DeepWithGroups);
+while ( aListIter.IsMore() && !bLanguageFound )
 {
-SdrObjListIter aListIter(*mpDoc->GetPage(itPage), 
SdrIterMode::DeepWithGroups);
-while ( aListIter.IsMore() && !bLanguageFound )
+pObj = aListIter.Next();
+if ( pObj )
 {
-pObj = aListIter.Next();
-if ( pObj )
+pParaObj = pObj->GetOutlinerParaObject();
+if ( pParaObj )
 {
-pParaObj = pObj->GetOutlinerParaObject();
-if ( pParaObj )
-{
-SdrOutliner aOutliner(>GetPool(), 
OutlinerMode::TextObject);
-aOutliner.SetText(*pParaObj);
-eLanguage = aOutliner.GetLanguage(0, 0);
-bLanguageFound = eLanguage != 
LANGUAGE_DONTKNOW;
-}
+SdrOutliner aOutliner(>GetPool(), 

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

[Caolán McNamara]

 filter/source/graphicfilter/icgm/class7.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 9aa68d323cac29ac37e9d6fee4795ba2e361e5a8
Author: Caolán McNamara 
Date:   Mon Nov 13 16:03:28 2017 +

ofz#4204 compare against available data len

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

diff --git a/filter/source/graphicfilter/icgm/class7.cxx 
b/filter/source/graphicfilter/icgm/class7.cxx
index 67888f819247..1e56cf544f86 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -30,16 +30,23 @@ void CGM::ImplDoClass7()
 case 0x01 : /*Message */break;
 case 0x02 :
 {
-sal_uInt8*  pAppData = mpSource + 12;
+if (mpEndValidSource - mpSource < 12)
+throw css::uno::Exception("attempt to read past end of input", 
nullptr);
+
 sal_uInt16* pTemp = reinterpret_cast(mpSource);
 sal_uInt16 nOpcode = pTemp[ 4 ];
 
+sal_uInt8* pAppData = mpSource + 12;
+
 if ( mpChart || ( nOpcode == 0 ) )
 {
 switch ( nOpcode )
 {
 case 0x000 : /*AppData - Beginning of File Opcodes*/
 {
+if (mpEndValidSource - pAppData < 4)
+throw css::uno::Exception("attempt to read past 
end of input", nullptr);
+
 if ( mpChart == nullptr )
 mpChart = new CGMChart;
 mpChart->mnCurrentFileType = pAppData[ 3 ];
@@ -68,6 +75,9 @@ void CGM::ImplDoClass7()
 case 0x262 : /*AppData - ENDGROUP */break;
 case 0x264 : /*AppData - DATANODE*/
 {
+if (static_cast(mpEndValidSource - pAppData) < 
sizeof(DataNode))
+throw css::uno::Exception("attempt to read past 
end of input", nullptr);
+
 mpChart->mDataNode[ 0 ] = 
*reinterpret_cast( pAppData );
 sal_Int8 nZoneEnum = mpChart->mDataNode[ 0 ].nZoneEnum;
 if ( nZoneEnum && ( nZoneEnum <= 6 ) )
@@ -76,6 +86,9 @@ void CGM::ImplDoClass7()
 break;
 case 0x2BE : /*AppData - SHWSLIDEREC*/
 {
+if (mpEndValidSource - pAppData < 16)
+throw css::uno::Exception("attempt to read past 
end of input", nullptr);
+
 if ( pAppData[ 16 ] == 0 )  // a blank template ?
 {
 if ( pAppData[ 2 ] == 46 )
@@ -101,6 +114,9 @@ void CGM::ImplDoClass7()
 case 0x2CA : /*AppData - SHWAPP */break;
 case 0x320 : /*AppData - TEXT*/
 {
+if (mpEndValidSource - pAppData < 9)
+throw css::uno::Exception("attempt to read past 
end of input", nullptr);
+
 TextEntry* pTextEntry = new TextEntry;
 pTextEntry->nTypeOfText = 
*reinterpret_cast( pAppData );
 pTextEntry->nRowOrLineNum = 
*reinterpret_cast( pAppData + 2 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

sw_ww8import

[Xavier van wijmeersch]

[CUT] sw_ww8export
[CUT] sw_ww8export2
[CUT] sw_ww8import
[DEP] LNK:CppunitTest/libtest_sw_uiwriter.so
[LNK] CppunitTest/libtest_sw_uiwriter.so
testObjectCrossReference::Import finished in: 81ms
File tested,Execution Time (ms)
object_cross_reference.odt:
1808
testObjectCrossReference::Import_Export_Import finished in: 1818ms
testTableCrossReferenceCustomFormat::Import finished in: 0ms
File tested,Execution Time (ms)
table_cross_reference_custom_format.odt:
417
testTableCrossReferenceCustomFormat::Import_Export_Import finished in: 421ms
testTableCrossReference::Import finished in: 0ms
File tested,Execution Time (ms)
table_cross_reference.odt:
322
testTableCrossReference::Import_Export_Import finished in: 326ms
testActiveXCheckbox::Import finished in: 0ms
File tested,Execution Time (ms)
checkbox_control.odt:
405
testActiveXCheckbox::Import_Export_Import finished in: 410ms
File tested,Execution Time (ms)
tdf111480.doc:
168
testTdf111480::Import finished in: 174ms
File tested,Execution Time (ms)
tdf111480.doc:
247
testTdf111480::Import_Export_Import finished in: 253ms
File tested,Execution Time (ms)
tdf91687.doc:
/home/libreofficekde4/sw/qa/extras/ww8export/ww8export2.cxx:276:testTdf91687::Import
equality assertion failed
- Expected: 5172
- Actual  : 5171

testTdf91687::Import finished in: 283ms
File tested,Execution Time (ms)
tdf91687.doc:
/home/libreofficekde4/sw/qa/extras/ww8export/ww8export2.cxx:276:testTdf91687::Import_Export_Import
equality assertion failed
- Expected: 5172
- Actual  : 5171

testTdf91687::Import_Export_Import finished in: 229ms
File tested,Execution Time (ms)
tdf108072.doc:
187
testTdf108072::Import finished in: 193ms
File tested,Execution Time (ms)
tdf108072.doc:
190
testTdf108072::Import_Export_Import finished in: 197ms
File tested,Execution Time (ms)
tdf104334.doc:
60
testTdf104334::Import finished in: 66ms
File tested,Execution Time (ms)
tdf104334.doc:
265
testTdf104334::Import_Export_Import finished in: 271ms
File tested,Execution Time (ms)
tdf104805.doc:
70
testTdf104805::Import finished in: 76ms
File tested,Execution Time (ms)
tdf104805.doc:
278
testTdf104805::Import_Export_Import finished in: 285ms
File tested,Execution Time (ms)
tdf112074_RTLtableJustification.doc:
96
testTdf112074_RTLtableJustification::Import finished in: 108ms
File tested,Execution Time (ms)
tdf112074_RTLtableJustification.doc:
375
testTdf112074_RTLtableJustification::Import_Export_Import finished in: 381ms
testTdf108448_endNote::Import finished in: 0ms
File tested,Execution Time (ms)
tdf108448_endNote.odt:
264
testTdf108448_endNote::Import_Export_Import finished in: 269ms
File tested,Execution Time (ms)
tdf112517_maxSprms.doc:
171
testTdf112517_maxSprms::Import finished in: 178ms
File tested,Execution Time (ms)
tdf112517_maxSprms.doc:
404
testTdf112517_maxSprms::Import_Export_Import finished in: 411ms
File tested,Execution Time (ms)
bnc863018b.doc:
150
testBnc863018b::Import finished in: 155ms
File tested,Execution Time (ms)
bnc863018b.doc:
235
testBnc863018b::Import_Export_Import finished in: 240ms
File tested,Execution Time (ms)
tdf96277.doc:
244
testTdf96277::Import finished in: 252ms
File tested,Execution Time (ms)
tdf96277.doc:
422
testTdf96277::Import_Export_Import finished in: 430ms
File tested,Execution Time (ms)
tdf89377_tableWithBreakBeforeParaStyle.doc:
118
testTdf89377::Import finished in: 124ms
File tested,Execution Time (ms)
tdf89377_tableWithBreakBeforeParaStyle.doc:
241
testTdf89377::Import_Export_Import finished in: 253ms
File tested,Execution Time (ms)
testTdf107931_KERN_enabledDefStyle.doc:
64
testTdf107931_KERN_enabledDefStyle::Import finished in: 70ms
File tested,Execution Time (ms)
testTdf107931_KERN_enabledDefStyle.doc:
227
testTdf107931_KERN_enabledDefStyle::Import_Export_Import finished in: 232ms
File tested,Execution Time (ms)
testTdf107931_KERN_DocEnabled_disabledDefStyle.doc:
88
testTdf107931_KERN_DocEnabled_disabledDefStyle::Import finished in: 94ms
File tested,Execution Time (ms)
testTdf107931_KERN_DocEnabled_disabledDefStyle.doc:
4343
testTdf107931_KERN_DocEnabled_disabledDefStyle::Import_Export_Import
finished in: 4348ms
testTdf55427_footnote2endnote::Import finished in: 0ms
File tested,Execution Time (ms)
tdf55427_footnote2endnote.odt:
335
testTdf55427_footnote2endnote::Import_Export_Import finished in: 342ms
File tested,Execution Time (ms)
tdf49102_mergedCellNumbering.doc:
150
testTdf49102_mergedCellNumbering::Import finished in: 159ms
File tested,Execution Time (ms)
tdf49102_mergedCellNumbering.doc:
271
testTdf49102_mergedCellNumbering::Import_Export_Import finished in: 277ms
File tested,Execution Time (ms)
tdf37153_considerWrapOnObjPos.doc:
107
testTdf37153::Import finished in: 113ms
File tested,Execution Time (ms)
tdf37153_considerWrapOnObjPos.doc:
280
testTdf37153::Import_Export_Import finished in: 287ms
File tested,Execution Time (ms)
tdf55528_relativeTableWidth.doc:
125
testTdf55528_relativeTableWidth::Import finished in: 132ms
File tested,Execution Time (ms)

Re: Copyright infringement and future of Hunspell

[Rene Engelhard]

On Wed, Nov 15, 2017 at 06:03:30PM +, Димитриј Мијоски wrote:
>I don't see any copyright infringement, as Hunspell allowed LGPLv2.1 or
>later, which safely allows us to put out derivative work to LGPLv3. And
>also, ALL copyright notices were kept.

But you didn't ask the copyrigh holders.

>As for the license, I really don't see what is the problem with LGPLv3. It
>is a very open license which allows the library to be used pretty much
>everywhere, including application with more stricter licenses like GPL and
>proprietary licenses, and in more liberal licenses like BSD and MIT.

But not Apache, for example.

>Again, the library is in good hands. If you want I can even show you my
>computer science degree with the grades.

That does prove what?

Regards,

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

[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame3' - 133 commits - android/source basegfx/source basic/source bin/update chart2/source cli_ure/source compilerplugins/clang configure.ac c

[Armin Le Grand]

Rebased ref, commits from common ancestor:
commit 8c103b56b91a3b5037300036b57e3d9f96d7255a
Author: Armin Le Grand 
Date:   Fri Nov 17 18:47:07 2017 +0100

RotateFlyFrame3: Corrected wrong static_cast

Change-Id: Ia3e0748d0b4ba11ec84a85e823472cdac9bf987a

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 569a0ec86282..8f440743b736 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2447,8 +2447,6 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon&   
rContour,
 
 if(bIsCandidate)
 {
-const SwFlyFreeFrame* pSwFlyFreeFrame(static_cast< const 
SwFlyFreeFrame* >(this));
-
 if(GetFormat()->GetSurround().IsContour())
 {
 SwNoTextNode *pNd = const_cast(static_cast(static_cast(Lower())->GetNode()));
@@ -2543,6 +2541,8 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon&   
rContour,
 }
 else
 {
+const SwFlyFreeFrame* pSwFlyFreeFrame(dynamic_cast< const 
SwFlyFreeFrame* >(this));
+
 if(nullptr != pSwFlyFreeFrame &&
 pSwFlyFreeFrame->supportsAutoContour() &&
 // isTransformableSwFrame already used in 
supportsAutoContour(), but
@@ -2558,27 +2558,29 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon&   
rContour,
 }
 }
 
-if(bRet &&
-0 != rContour.Count() &&
-nullptr != pSwFlyFreeFrame &&
-pSwFlyFreeFrame->isTransformableSwFrame())
+if(bRet && 0 != rContour.Count())
 {
-// Need to adapt contour to transformation
-basegfx::B2DVector aScale, aTranslate;
-double fRotate, fShearX;
-getFrameAreaTransformation().decompose(aScale, aTranslate, 
fRotate, fShearX);
+const SwFlyFreeFrame* pSwFlyFreeFrame(dynamic_cast< const 
SwFlyFreeFrame* >(this));
 
-if(!basegfx::fTools::equalZero(fRotate))
+if(nullptr != pSwFlyFreeFrame && 
pSwFlyFreeFrame->isTransformableSwFrame())
 {
-basegfx::B2DPolyPolygon aSource(rContour.getB2DPolyPolygon());
-const basegfx::B2DPoint aCenter(getFrameAreaTransformation() * 
basegfx::B2DPoint(0.5, 0.5));
-const basegfx::B2DHomMatrix aRotateAroundCenter(
-basegfx::utils::createRotateAroundPoint(
-aCenter.getX(),
-aCenter.getY(),
-fRotate));
-aSource.transform(aRotateAroundCenter);
-rContour = tools::PolyPolygon(aSource);
+// Need to adapt contour to transformation
+basegfx::B2DVector aScale, aTranslate;
+double fRotate, fShearX;
+getFrameAreaTransformation().decompose(aScale, aTranslate, 
fRotate, fShearX);
+
+if(!basegfx::fTools::equalZero(fRotate))
+{
+basegfx::B2DPolyPolygon 
aSource(rContour.getB2DPolyPolygon());
+const basegfx::B2DPoint 
aCenter(getFrameAreaTransformation() * basegfx::B2DPoint(0.5, 0.5));
+const basegfx::B2DHomMatrix aRotateAroundCenter(
+basegfx::utils::createRotateAroundPoint(
+aCenter.getX(),
+aCenter.getY(),
+fRotate));
+aSource.transform(aRotateAroundCenter);
+rContour = tools::PolyPolygon(aSource);
+}
 }
 }
 }
commit 001048900b8cbaa40675d15023f08a693e7f27a4
Author: Armin Le Grand 
Date:   Thu Nov 16 18:47:29 2017 +0100

RotateFlyFrame3: add support for AutoContour

For transformed FlyFrames with no Border and no Padding it
would be nice to immediately start using AutoContour, added
first implementation to do so.
Added several conditions for AutoContour, need to
work on reaction on changes to these. Corrected
needed transform adaptions to Contour(s)

Change-Id: Ia3d7845fd5d50c8a413d592ae07ce2041ccc91b9

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index c2bfc5e290fb..bb61ccaccc86 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3157,6 +3157,22 @@ SvxBrushItem::~SvxBrushItem()
 {
 }
 
+bool SvxBrushItem::isUsed() const
+{
+if (GPOS_NONE != GetGraphicPos())
+{
+// graphic used
+return true;
+}
+else if (0xff != GetColor().GetTransparency())
+{
+// color used
+return true;
+}
+
+return false;
+}
+
 sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
 return BRUSH_GRAPHIC_VERSION;
diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index 516abdacd467..8aa177aa2adb 100644
--- a/include/editeng/brushitem.hxx
+++ 

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

[Caolán McNamara]

 vcl/unx/gtk/gtksalframe.cxx  |7 ---
 vcl/unx/gtk/xid_fullscreen_on_all_monitors.c |4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 946ff7a6768f8207a7d26dfec0f090c08aeabbb9
Author: Caolán McNamara 
Date:   Fri Nov 17 09:58:24 2017 +

Resolves: tdf#112549 use gtk3 to set gtk2 window fullscreen...

for current monitor mode as well as all-monitors mode

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

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 2df53d72d878..4d039a0d0759 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3014,8 +3014,8 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, 
GdkEvent*, gpointer frame )
 GtkSalFrame* pThis = static_cast(frame);
 
 //Spawn off a helper program that will attempt to set this fullscreen
-//window to span all displays.
-if (pThis->m_bFullscreen && pThis->m_bSpanMonitorsWhenFullscreen)
+//window either to span all displays or the current monitor
+if (pThis->m_bFullscreen)
 {
 GdkWindow* gdkwin = widget_get_window(pThis->m_pWindow);
 if (gdkwin)
@@ -3026,7 +3026,8 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, 
GdkEvent*, gpointer frame )
 if (osl::FileBase::getSystemPathFromFileURL(sProgramURL, sProgram) 
== osl::File::E_None)
 {
 OString sFinalProgram(OUStringToOString(sProgram, 
osl_getThreadTextEncoding())
-+ " " + OString::number((int)GDK_WINDOW_XID(gdkwin)));
++ " " + OString::number((int)GDK_WINDOW_XID(gdkwin))
++ " " + 
OString::number((int)pThis->m_bSpanMonitorsWhenFullscreen));
 OString sDisplay(getDisplayString());
 if (!sDisplay.isEmpty())
 {
diff --git a/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c 
b/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
index 00554b1df021..558ede597a48 100644
--- a/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
+++ b/vcl/unx/gtk/xid_fullscreen_on_all_monitors.c
@@ -37,6 +37,7 @@ int main(int argc, char *argv[])
 GdkEvent *event;
 GdkWindow *window;
 int windowid;
+int spanmonitors;
 
 handle = dlopen("libgtk-3.so.0", RTLD_LAZY);
 if( NULL == handle )
@@ -75,6 +76,7 @@ int main(int argc, char *argv[])
 gtk_init(, );
 
 windowid = atoi(argv[1]);
+spanmonitors = atoi(argv[2]);
 
 window = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), 
windowid);
 if (!window)
@@ -83,7 +85,7 @@ int main(int argc, char *argv[])
 return -1;
 }
 
-gdk_window_set_fullscreen_mode(window, GDK_FULLSCREEN_ON_ALL_MONITORS);
+gdk_window_set_fullscreen_mode(window, spanmonitors ? 
GDK_FULLSCREEN_ON_ALL_MONITORS : GDK_FULLSCREEN_ON_CURRENT_MONITOR);
 gdk_window_fullscreen(window);
 
 while ((event = gdk_event_get()) != NULL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 vcl/source/font/fontmetric.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 025b5f75c657ffd54f11209da9bc8a6ebdbcc81e
Author: Mark Hung 
Date:   Tue Nov 14 20:26:03 2017 +0800

tdf#111717 consider CJK vertical writing for underline offset

Textline offset was based on horizontal font metrics.
In vertical writing for CJK fonts, use descent
as its underline offset so that the line is drawn at the edge
of the bounding box to prevent overlap the CJK glyphs.

Change-Id: Iaa01bdf3cbb694dcf925975cde3f0f7ba7b97dac
Reviewed-on: https://gerrit.libreoffice.org/44720
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index cd23756f0f97..cd0b9f8557e9 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -282,7 +282,9 @@ void ImplFontMetricData::ImplInitTextLineSize( const 
OutputDevice* pDev )
 if ( !n2LineDY2 )
 n2LineDY2 = 1;
 
-long nUnderlineOffset = mnDescent/2 + 1;
+const vcl::Font& rFont ( pDev->GetFont() );
+bool bCJKVertical = MsLangId::isCJK(rFont.GetLanguage()) && 
rFont.IsVertical();
+long nUnderlineOffset = bCJKVertical ? mnDescent : (mnDescent/2 + 1);
 long nStrikeoutOffset = -((mnAscent - mnIntLeading) / 3);
 
 mnUnderlineSize= nLineHeight;
@@ -306,6 +308,7 @@ void ImplFontMetricData::ImplInitTextLineSize( const 
OutputDevice* pDev )
 else
 mnWUnderlineSize = ((nWCalcSize*50)+50) / 100;
 
+
 // Don't assume that wavelines are never placed below the descent, because 
for most fonts the waveline
 // is drawn into the text
 mnWUnderlineOffset = nUnderlineOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 odk/examples/java/Text/TextReplace.java |2 +-
 sw/source/core/text/porlay.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e6e5cd3b6320de24953f275281780ff25f17110
Author: Andrea Gelmini 
Date:   Fri Nov 17 20:48:08 2017 +0100

Fix typos

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

diff --git a/odk/examples/java/Text/TextReplace.java 
b/odk/examples/java/Text/TextReplace.java
index 3a94178980ef..a43799ffadb9 100644
--- a/odk/examples/java/Text/TextReplace.java
+++ b/odk/examples/java/Text/TextReplace.java
@@ -119,7 +119,7 @@ public class TextReplace {
 xTextCursor.gotoEnd(false);
 xCPS.setPropertyValue( "CharColor", Integer.valueOf( 0 ) );
 
-xText.insertString( xTextCursor, "in the alley. Like lightening he 
darted off to the left and disappeared between the two warehouses almost 
falling over the trash can lying in the ", false  );
+xText.insertString( xTextCursor, "in the alley. Like lightning he 
darted off to the left and disappeared between the two warehouses almost 
falling over the trash can lying in the ", false  );
 
 xText.insertString( xTextCursor, "centre ", true );
 xCPS = UnoRuntime.queryInterface(
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index f075d2efb93d..e115bbe2d402 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -257,7 +257,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
 {
 if( pPos->IsFlyPortion() )
 {
-// The FlyPortion get's sucked out ...
+// The FlyPortion gets sucked out...
 pLeft->Join( static_cast(pPos) );
 pPos = pLeft->GetPortion();
 if( GetpKanaComp() && !GetKanaComp().empty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/filter/jpeg/jpegc.cxx |  130 +--
 1 file changed, 70 insertions(+), 60 deletions(-)

New commits:
commit 0b31768cb1b3d409cea3dafc5b1f8d5d11333e81
Author: Caolán McNamara 
Date:   Fri Nov 17 17:16:24 2017 +

ofz#4291 Direct-leak

can't reproduce this, but throw a guess at it

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

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index ede057805b72..e120fc304228 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -124,39 +124,41 @@ private:
 jpeg_compress_struct *m_cinfo = nullptr;
 };
 
-void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
-   Size const & previewSize, GraphicFilterImportFlags nImportFlags,
-   Bitmap::ScopedWriteAccess* ppAccess )
+struct JpegStuff
 {
 jpeg_decompress_struct cinfo;
 ErrorManagerStruct jerr;
-
 JpegDecompressOwner aOwner;
 std::unique_ptr pScopedAccess;
 std::vector pScanLineBuffer;
 std::vector pCYMKBuffer;
+};
 
-if ( setjmp( jerr.setjmp_buffer ) )
+void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
+  Size const & previewSize, GraphicFilterImportFlags nImportFlags,
+  Bitmap::ScopedWriteAccess* ppAccess)
+{
+if (setjmp(rContext.jerr.setjmp_buffer))
 {
 return;
 }
 
-cinfo.err = jpeg_std_error(  );
-jerr.pub.error_exit = errorExit;
-jerr.pub.output_message = outputMessage;
-jerr.pub.emit_message = emitMessage;
+rContext.cinfo.err = jpeg_std_error();
+rContext.jerr.pub.error_exit = errorExit;
+rContext.jerr.pub.output_message = outputMessage;
+rContext.jerr.pub.emit_message = emitMessage;
 
-jpeg_create_decompress(  );
-aOwner.set();
-jpeg_svstream_src( , pInputStream );
-SourceManagerStruct *source = 
reinterpret_cast(cinfo.src);
-jpeg_read_header( , TRUE );
+jpeg_create_decompress();
+rContext.aOwner.set();
+jpeg_svstream_src(, pInputStream);
+SourceManagerStruct *source = 
reinterpret_cast(rContext.cinfo.src);
+jpeg_read_header(, TRUE);
 
-cinfo.scale_num = 1;
-cinfo.scale_denom = 1;
-cinfo.output_gamma = 1.0;
-cinfo.raw_data_out = FALSE;
-cinfo.quantize_colors = FALSE;
+rContext.cinfo.scale_num = 1;
+rContext.cinfo.scale_denom = 1;
+rContext.cinfo.output_gamma = 1.0;
+rContext.cinfo.raw_data_out = FALSE;
+rContext.cinfo.quantize_colors = FALSE;
 
 /* change scale for preview import */
 long nPreviewWidth = previewSize.Width();
@@ -165,7 +167,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
 {
 if( nPreviewWidth == 0 )
 {
-nPreviewWidth = ( cinfo.image_width * nPreviewHeight ) / 
cinfo.image_height;
+nPreviewWidth = (rContext.cinfo.image_width * nPreviewHeight) / 
rContext.cinfo.image_height;
 if( nPreviewWidth <= 0 )
 {
 nPreviewWidth = 1;
@@ -173,44 +175,44 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* 
pInputStream, long* pLines,
 }
 else if( nPreviewHeight == 0 )
 {
-nPreviewHeight = ( cinfo.image_height * nPreviewWidth ) / 
cinfo.image_width;
+nPreviewHeight = (rContext.cinfo.image_height * nPreviewWidth) / 
rContext.cinfo.image_width;
 if( nPreviewHeight <= 0 )
 {
 nPreviewHeight = 1;
 }
 }
 
-for( cinfo.scale_denom = 1; cinfo.scale_denom < 8; cinfo.scale_denom 
*= 2 )
+for (rContext.cinfo.scale_denom = 1; rContext.cinfo.scale_denom < 8; 
rContext.cinfo.scale_denom *= 2)
 {
-if( cinfo.image_width < nPreviewWidth * cinfo.scale_denom )
+if (rContext.cinfo.image_width < nPreviewWidth * 
rContext.cinfo.scale_denom)
 break;
-if( cinfo.image_height < nPreviewHeight * cinfo.scale_denom )
+if (rContext.cinfo.image_height < nPreviewHeight * 
rContext.cinfo.scale_denom)
 break;
 }
 
-if( cinfo.scale_denom > 1 )
+if (rContext.cinfo.scale_denom > 1)
 {
-cinfo.dct_method= JDCT_FASTEST;
-cinfo.do_fancy_upsampling   = FALSE;
-cinfo.do_block_smoothing= FALSE;
+rContext.cinfo.dct_method= JDCT_FASTEST;
+rContext.cinfo.do_fancy_upsampling   = FALSE;
+rContext.cinfo.do_block_smoothing= FALSE;
 }
 }
 
-jpeg_calc_output_dimensions();
+jpeg_calc_output_dimensions();
 
-long nWidth = cinfo.output_width;
-long 

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

[Caolán McNamara]

 sw/source/filter/ww8/ww8scan.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f05130c20c90c47f98941c06f056563315b2c1e4
Author: Caolán McNamara 
Date:   Fri Nov 17 16:16:36 2017 +

ofz: Integer-overflow

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 1b24c6686aad..a561a702f324 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1300,7 +1300,17 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC 
nStartPos )
 if (nStartPos >= nFcEnd)
 nStartPos = nFcEnd - (1 * nUnicodeFactor);
 
-return nCpStart + (nStartPos - nFcStart) / nUnicodeFactor;
+WW8_FC nFcDiff = (nStartPos - nFcStart) / nUnicodeFactor;
+
+WW8_FC nCpRet;
+bFail = o3tl::checked_add(nCpStart, nFcDiff, nCpRet);
+if (bFail)
+{
+SAL_WARN("sw.ww8", "broken offset, ignoring");
+return WW8_CP_MAX;
+}
+
+return nCpRet;
 }
 
 //  Helper routines for all
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/3.0-beta1'

[Andras Timar]

Tag '3.0-beta1' created by Andras Timar  at 
2017-11-17 20:31 +

3.0-beta1

Changes since collabora-online-3-0-branch-point-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Copyright infringement and future of Hunspell

[Димитриј Мијоски]

Reverted.
https://github.com/hunspell/hunspell/commit/58dfe79637982c5c49658c57c3b01d4f44c07c19
I guess everybody should be happy now. Life goes on. I won't touch 
version 1 code any more.

On 17.11.2017 15:21, Rene Engelhard wrote:
>
> But not Apache, for example.
>
Can you explain how is this? LGPL library can be linked dynamically to 
any application with "incompatible" license (not sure if that was the 
wording).


On 17.11.2017 16:23, Thorsten Behrens wrote:
> With LibreOffice being one of the major downstream consumers of
> hunspell, we are concerned about this - so_if_  you're pondering to
> reduce the number of licenses (which at any rate should be agreed on
> amicably between the project maintainers), why not pick the MPL
> instead?
I will see at later stages if LGPLv3/MPLv2 is a good option, for V2.


On 17.11.2017 16:54, Caolán McNamara wrote:
> Why not add hunspell2 (or junspell) as a new work in a new repository
> at that higher level, move src/hunspell2 from hunspell to the new repo
> and copy whatever shared stuff is needed. Restore the old license stuff
> for the classic hunspell repository and work away on the successor in
> the separate repo under the hunspell umbrella.
I will see later.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Mark Hung]

 vcl/source/gdi/CommonSalLayout.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 58af692e28146a1ecb4fbeef89e839baa1a1b39d
Author: Mark Hung 
Date:   Fri Nov 10 00:24:26 2017 +0800

tdf#111967 translate offsets so it is relative to v origin

The offsets were 0 in HarfBuzz 1.3.3 but the value became
something else and made text offsets toward upper-right
after upgrading to HarfBuzz 1.4.8. Those values are offsets
relative to the horizontal origin.  But underlying renderer
expect positionos relative to the vertical origin. Translate
them back by adding the horizontal origin.

Change-Id: If58d2c082b198bfd8789efb3df2be49869a04bf9
Reviewed-on: https://gerrit.libreoffice.org/44556
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 9b2d7e492a29..08842283f908 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -734,6 +734,13 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 {
 nGlyphFlags |= GlyphItem::IS_VERTICAL;
 
+// We have glyph offsets that is relative to h origin now,
+// add the origin back so it is relative to v origin.
+hb_font_add_glyph_origin_for_direction( mpHbFont,
+nGlyphIndex,
+HB_DIRECTION_TTB,
+[i].x_offset ,
+[i].y_offset );
 nAdvance = -pHbPositions[i].y_advance;
 nXOffset =  pHbPositions[i].y_offset;
 nYOffset =  pHbPositions[i].x_offset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 cppu/source/threadpool/jobqueue.hxx   |5 --
 cppu/source/threadpool/thread.cxx |   16 +++--
 cppu/source/threadpool/threadpool.cxx |   60 ++
 cppu/source/threadpool/threadpool.hxx |8 ++--
 4 files changed, 30 insertions(+), 59 deletions(-)

New commits:
commit 7db6878a9d3e534583f9c22709f0eee96eff849f
Author: Julien Nabet 
Date:   Fri Nov 17 20:19:56 2017 +0100

Replace lists by vector or deque (cppu)

+ use for range loops

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

diff --git a/cppu/source/threadpool/jobqueue.hxx 
b/cppu/source/threadpool/jobqueue.hxx
index d4a26c7709cc..9dc20f3cd75e 100644
--- a/cppu/source/threadpool/jobqueue.hxx
+++ b/cppu/source/threadpool/jobqueue.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
 #define INCLUDED_CPPU_SOURCE_THREADPOOL_JOBQUEUE_HXX
 
-#include 
 #include 
 #include 
 #include 
@@ -38,8 +37,6 @@ namespace cppu_threadpool
 RequestFun * doRequest;
 };
 
-typedef std::list < struct Job > JobList;
-
 class DisposedCallerAdmin;
 typedef std::shared_ptr DisposedCallerAdminHolder;
 
@@ -62,7 +59,7 @@ namespace cppu_threadpool
 
 private:
 mutable ::osl::Mutex m_mutex;
-JobList  m_lstJob;
+std::deque < struct Job > m_lstJob;
 std::deque  m_lstCallstack;
 sal_Int32 m_nToDo;
 bool m_bSuspended;
diff --git a/cppu/source/threadpool/thread.cxx 
b/cppu/source/threadpool/thread.cxx
index 8dfa93bd443f..ad37fa3072a8 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -39,7 +39,7 @@ namespace cppu_threadpool {
 
 ThreadAdmin::~ThreadAdmin()
 {
-SAL_WARN_IF(m_lst.size(), "cppu.threadpool", m_lst.size() << "Threads 
left");
+SAL_WARN_IF(m_deque.size(), "cppu.threadpool", m_deque.size() << 
"Threads left");
 }
 
 bool ThreadAdmin::add( rtl::Reference< ORequestThread > const & p )
@@ -49,17 +49,13 @@ namespace cppu_threadpool {
 {
 return false;
 }
-m_lst.push_back( p );
+m_deque.push_back( p );
 return true;
 }
 
 void ThreadAdmin::remove_locked( rtl::Reference< ORequestThread > const & 
p )
 {
-std::list< rtl::Reference< ORequestThread > >::iterator ii = 
std::find( m_lst.begin(), m_lst.end(), p );
-if( ii != m_lst.end() )
-{
-m_lst.erase( ii );
-}
+m_deque.erase(std::find( m_deque.begin(), m_deque.end(), p ), 
m_deque.end());
 }
 
 void ThreadAdmin::remove( rtl::Reference< ORequestThread > const & p )
@@ -79,12 +75,12 @@ namespace cppu_threadpool {
 rtl::Reference< ORequestThread > pCurrent;
 {
 MutexGuard aGuard( m_mutex );
-if( m_lst.empty() )
+if( m_deque.empty() )
 {
 break;
 }
-pCurrent = m_lst.front();
-m_lst.pop_front();
+pCurrent = m_deque.front();
+m_deque.pop_front();
 }
 if (pCurrent->getIdentifier()
 != osl::Thread::getCurrentIdentifier())
diff --git a/cppu/source/threadpool/threadpool.cxx 
b/cppu/source/threadpool/threadpool.cxx
index b54036d2cfd2..a3a3eab51d01 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -60,43 +60,25 @@ namespace cppu_threadpool
 
 DisposedCallerAdmin::~DisposedCallerAdmin()
 {
-SAL_WARN_IF( !m_lst.empty(), "cppu.threadpool", "DisposedCallerList :  
" << m_lst.size() << " left");
+SAL_WARN_IF( !m_vector.empty(), "cppu.threadpool", "DisposedCallerList 
:  " << m_vector.size() << " left");
 }
 
 void DisposedCallerAdmin::dispose( sal_Int64 nDisposeId )
 {
 MutexGuard guard( m_mutex );
-m_lst.push_back( nDisposeId );
+m_vector.push_back( nDisposeId );
 }
 
 void DisposedCallerAdmin::destroy( sal_Int64 nDisposeId )
 {
 MutexGuard guard( m_mutex );
-for( auto it = m_lst.begin() ;
- it != m_lst.end() ;
- ++ it )
-{
-if( (*it) == nDisposeId )
-{
-m_lst.erase( it );
-break;
-}
-}
+m_vector.erase(std::remove(m_vector.begin(), m_vector.end(), 
nDisposeId), m_vector.end());
 }
 
 bool DisposedCallerAdmin::isDisposed( sal_Int64 nDisposeId )
 {
 MutexGuard guard( m_mutex );
-for( auto it = m_lst.begin() ;
- it != m_lst.end() ;
- ++ it )
-{
-if( (*it) == nDisposeId )
-{
-return true;
-}
-}
-return false;
+

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

[Julien Nabet]

 binaryurp/source/bridge.cxx|   27 
 binaryurp/source/bridge.hxx|3 --
 binaryurp/source/bridgefactory.cxx |   40 ++---
 binaryurp/source/bridgefactory.hxx |8 +++
 4 files changed, 38 insertions(+), 40 deletions(-)

New commits:
commit 9d1f61a61893435b26f7239136ad92b7354545a8
Author: Julien Nabet 
Date:   Fri Nov 17 19:05:44 2017 +0100

Replace some lists by vectors in binaryurp

+ use for range loops

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

diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx
index 4460de1d3c60..92a1665d8a45 100644
--- a/binaryurp/source/bridge.cxx
+++ b/binaryurp/source/bridge.cxx
@@ -313,21 +313,23 @@ void Bridge::terminate(bool final) {
 osl::MutexGuard g(mutex_);
 s.swap(stubs_);
 }
-for (Stubs::iterator i(s.begin()); i != s.end(); ++i) {
-for (Stub::iterator j(i->second.begin()); j != i->second.end(); 
++j)
+for (auto & stub : s)
+{
+for (auto & item : stub.second)
 {
 SAL_INFO(
 "binaryurp",
-"stub '" << i->first << "', '" << toString(j->first)
+"stub '" << stub.first << "', '" << toString(item.first)
 << "' still mapped at Bridge::terminate");
 binaryUno_.get()->pExtEnv->revokeInterface(
-binaryUno_.get()->pExtEnv, j->second.object.get());
+binaryUno_.get()->pExtEnv, item.second.object.get());
 }
 }
 factory_->removeBridge(this);
-for (Listeners::iterator i(ls.begin()); i != ls.end(); ++i) {
+for (auto const& listener : ls)
+{
 try {
-(*i)->disposing(
+listener->disposing(
 css::lang::EventObject(
 static_cast< cppu::OWeakObject * >(this)));
 } catch (const css::uno::RuntimeException & e) {
@@ -464,11 +466,12 @@ css::uno::UnoInterfaceReference Bridge::findStub(
 if (j != i->second.end()) {
 return j->second.object;
 }
-for (j = i->second.begin(); j != i->second.end(); ++j) {
+for (auto const& item : i->second)
+{
 if (typelib_typedescription_isAssignableFrom(
-type.get(), j->first.get()))
+type.get(), item.first.get()))
 {
-return j->second.object;
+return item.second.object;
 }
 }
 }
@@ -924,11 +927,7 @@ void Bridge::removeEventListener(
 css::uno::Reference< css::lang::XEventListener > const & aListener)
 {
 osl::MutexGuard g(mutex_);
-Listeners::iterator i(
-std::find(listeners_.begin(), listeners_.end(), aListener));
-if (i != listeners_.end()) {
-listeners_.erase(i);
-}
+listeners_.erase(std::remove(listeners_.begin(), listeners_.end(), 
aListener), listeners_.end());
 }
 
 void Bridge::sendCommitChangeRequest() {
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 476d4af1cf22..a258f331639e 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -23,7 +23,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
@@ -221,7 +220,7 @@ private:
 void checkDisposed();
 
 typedef
-std::list<
+std::vector<
 com::sun::star::uno::Reference<
 com::sun::star::lang::XEventListener > >
 Listeners;
diff --git a/binaryurp/source/bridgefactory.cxx 
b/binaryurp/source/bridgefactory.cxx
index 7da9ccd39aa0..b1e3be93ea74 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -64,17 +64,15 @@ void BridgeFactory::removeBridge(
 assert(bridge.is());
 OUString n(bridge->getName());
 osl::MutexGuard g(m_aMutex);
-if (n.isEmpty()) {
-BridgeList::iterator i(
-std::find(unnamed_.begin(), unnamed_.end(), bridge));
-if (i != unnamed_.end()) {
-unnamed_.erase(i);
-}
-} else {
+if (n.isEmpty())
+{
+unnamed_.erase(std::remove(unnamed_.begin(), unnamed_.end(), bridge), 
unnamed_.end());
+}
+else
+{
 BridgeMap::iterator i(named_.find(n));
-if (i != named_.end() && i->second == bridge) {
+if (i != named_.end() && i->second == bridge)
 named_.erase(i);
-}
 }
 }
 
@@ -161,35 +159,37 @@ BridgeFactory::getExistingBridges() {
 n = static_cast< sal_Int32 >(n + named_.size());
 css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > > s(n);
 sal_Int32 i = 0;
-for (BridgeList::iterator 

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

[Julien Nabet]

 extensions/source/bibliography/framectr.cxx |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit c197573d5e89156eeca1e1cdf481d9437237e31a
Author: Julien Nabet 
Date:   Fri Nov 17 18:34:02 2017 +0100

Replace list by vector in framectr (extensions)

+ use for range loop

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

diff --git a/extensions/source/bibliography/framectr.cxx 
b/extensions/source/bibliography/framectr.cxx
index 6fc72513f34f..ff842f87b64e 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -295,7 +295,7 @@ uno::Sequence< frame::DispatchInformation > SAL_CALL 
BibFrameController_Impl::ge
 const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();
 
 frame::DispatchInformation  aDispatchInfo;
-std::list< frame::DispatchInformation > aDispatchInfoList;
+std::vector< frame::DispatchInformation >   aDispatchInfoVector;
 
 if (( nCommandGroup == frame::CommandGroup::EDIT ) ||
 ( nCommandGroup == frame::CommandGroup::DOCUMENT ) ||
@@ -303,24 +303,21 @@ uno::Sequence< frame::DispatchInformation > SAL_CALL 
BibFrameController_Impl::ge
 ( nCommandGroup == frame::CommandGroup::VIEW ))
 {
 bool bGroupFound = false;
-CmdToInfoCache::const_iterator pIter = rCmdCache.begin();
-while ( pIter != rCmdCache.end() )
+for (auto const& item : rCmdCache)
 {
-if ( pIter->second.nGroupId == nCommandGroup )
+if ( item.second.nGroupId == nCommandGroup )
 {
 bGroupFound = true;
-aDispatchInfo.Command = pIter->first;
-aDispatchInfo.GroupId = pIter->second.nGroupId;
-aDispatchInfoList.push_back( aDispatchInfo );
+aDispatchInfo.Command = item.first;
+aDispatchInfo.GroupId = item.second.nGroupId;
+aDispatchInfoVector.push_back( aDispatchInfo );
 }
 else if ( bGroupFound )
 break;
-
-++pIter;
 }
 }
 
-return comphelper::containerToSequence( aDispatchInfoList );
+return comphelper::containerToSequence( aDispatchInfoVector );
 }
 
 bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: toolkit/source ucb/source unoxml/source vbahelper/source writerfilter/source

[Noel Grandin]

 toolkit/source/awt/vclxtabpagecontainer.cxx   |   37 -
 toolkit/source/controls/dialogcontrol.cxx |  100 +--
 toolkit/source/controls/tabpagemodel.cxx  |   96 +--
 toolkit/source/controls/unocontrol.cxx|  704 +++---
 ucb/source/ucp/package/pkguri.cxx |  277 
 ucb/source/ucp/tdoc/tdoc_uri.cxx  |  151 ++--
 ucb/source/ucp/webdav-neon/NeonSession.cxx|  203 +++---
 unoxml/source/dom/characterdata.cxx   |  135 ++--
 vbahelper/source/vbahelper/vbahelper.cxx  |   66 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |  220 +++---
 10 files changed, 1002 insertions(+), 987 deletions(-)

New commits:
commit 5e69b3619d3a2b05930c5b8b8521d7f2938c709d
Author: Noel Grandin 
Date:   Fri Nov 17 11:18:40 2017 +0200

loplugin:flatten in toolkit..writerfilter

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

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index df730e9adfcf..24d2d309665f 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -179,24 +179,25 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( 
const css::container::Conta
 SolarMutexGuard aGuard;
 VclPtr pTabCtrl = GetAs();
 Reference< css::awt::tab::XTabPage > 
xTabPage(Event.Element,uno::UNO_QUERY);
-if ( pTabCtrl && xTabPage.is() )
-{
-Reference< awt::XControl > xControl(xTabPage,UNO_QUERY );
-Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), 
UNO_QUERY );
-sal_Int16 nPageID = xP->getTabPageID();
-
-VclPtr pWindow = 
VCLUnoHelper::GetWindow(xControl->getPeer());
-TabPage* pPage = static_cast(pWindow.get());
-pTabCtrl->InsertPage(nPageID,pPage->GetText());
-
-pPage->Hide();
-pTabCtrl->SetTabPage(nPageID,pPage);
-pTabCtrl->SetHelpText(nPageID,xP->getToolTip());
-
pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
-pTabCtrl->SelectTabPage(nPageID);
-pTabCtrl->EnablePage(nPageID,xP->getEnabled());
-m_aTabPages.push_back(xTabPage);
-}
+if ( !pTabCtrl || !xTabPage.is() )
+return;
+
+Reference< awt::XControl > xControl(xTabPage,UNO_QUERY );
+Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY );
+sal_Int16 nPageID = xP->getTabPageID();
+
+VclPtr pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
+TabPage* pPage = static_cast(pWindow.get());
+pTabCtrl->InsertPage(nPageID,pPage->GetText());
+
+pPage->Hide();
+pTabCtrl->SetTabPage(nPageID,pPage);
+pTabCtrl->SetHelpText(nPageID,xP->getToolTip());
+
pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
+pTabCtrl->SelectTabPage(nPageID);
+pTabCtrl->EnablePage(nPageID,xP->getEnabled());
+m_aTabPages.push_back(xTabPage);
+
 }
 void SAL_CALL VCLXTabPageContainer::elementRemoved( const 
css::container::ContainerEvent& Event )
 {
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 2a27b237ee57..8ca31adf47d3 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -488,65 +488,67 @@ void SAL_CALL UnoDialogControl::windowResized( const 
css::awt::WindowEvent& e )
 {
 OutputDevice*pOutDev = Application::GetDefaultDevice();
 DBG_ASSERT( pOutDev, "Missing Default Device!" );
-if ( pOutDev && !mbSizeModified )
-{
-// Currentley we are simply using MapUnit::MapAppFont
-::Size aAppFontSize( e.Width, e.Height );
+if ( !pOutDev || mbSizeModified )
+return;
 
-Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
-Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), 
UNO_QUERY );
-OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no 
peer, but a windowResized event?" );
+// Currentley we are simply using MapUnit::MapAppFont
+::Size aAppFontSize( e.Width, e.Height );
 
-// #i87592 In design mode the drawing layer works with sizes with 
decoration.
-// Therefore we have to subtract them before writing back to the 
properties (model).
-if ( xDialogDevice.is() && mbDesignMode )
-{
-DeviceInfo aDeviceInfo( xDialogDevice->getInfo() );
-aAppFontSize.Width() -= aDeviceInfo.LeftInset + 
aDeviceInfo.RightInset;
-aAppFontSize.Height() -= aDeviceInfo.TopInset + 
aDeviceInfo.BottomInset;
-}
+Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
+Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), 

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

[Noel Grandin]

 svx/source/gallery2/gallery1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1d097883541b9d244e50ced7fe49a4d7a0f65cfd
Author: Noel Grandin 
Date:   Fri Nov 17 16:02:17 2017 +0200

tdf#113855 Assertion while customizing Bullets and Numbering

can't find an easy way of removing the duplication, even though
that BeginLocking() stuff looks ripe for simplification.

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

diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c089ba034e44..c3d32d6f1971 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -763,7 +763,7 @@ GalleryTheme* Gallery::AcquireTheme( const OUString& 
rThemeName, SfxListener& rL
 GalleryThemeEntry*  pThemeEntry = ImplGetThemeEntry( rThemeName );
 
 if( pThemeEntry && ( ( pTheme = ImplGetCachedTheme( pThemeEntry ) ) != 
nullptr ) )
-rListener.StartListening( *pTheme );
+rListener.StartListening( *pTheme, true );
 
 return pTheme;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 dbaccess/source/ext/macromigration/macromigrationdialog.cxx |   42 +---
 1 file changed, 19 insertions(+), 23 deletions(-)

New commits:
commit e36c468dab4006afcfae76b1676df7cedbb82f1d
Author: Julien Nabet 
Date:   Fri Nov 17 21:03:24 2017 +0100

Replace list by vector in macromigrationdialog (dbaccess)

+ use for range loops

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

diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx 
b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 7fffb394e49b..e30bd2652daf 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -44,7 +44,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 namespace dbmm
 {
@@ -88,7 +88,7 @@ namespace dbmm
 
 // helper
 static void lcl_getControllers_throw(const Reference< XModel2 >& 
_rxDocument,
-std::list< Reference< XController2 > >& _out_rControllers )
+std::vector< Reference< XController2 > >& _out_rControllers )
 {
 _out_rControllers.clear();
 Reference< XEnumeration > xControllerEnum( 
_rxDocument->getControllers(), UNO_SET_THROW );
@@ -311,16 +311,13 @@ namespace dbmm
 try
 {
 // collect all controllers of our document
-std::list< Reference< XController2 > > aControllers;
+std::vector< Reference< XController2 > > aControllers;
 lcl_getControllers_throw( m_pData->xDocumentModel, aControllers );
 
 // close all sub documents of all controllers
-for (   std::list< Reference< XController2 > >::const_iterator pos 
= aControllers.begin();
-pos != aControllers.end() && bSuccess;
-++pos
-)
+for (auto const& controller : aControllers)
 {
-Reference< XDatabaseDocumentUI > xController( *pos, UNO_QUERY 
);
+Reference< XDatabaseDocumentUI > xController( controller, 
UNO_QUERY );
 OSL_ENSURE( xController.is(), 
"MacroMigrationDialog::impl_closeSubDocs_nothrow: unexpected: controller is 
missing an important interface!" );
 // at the moment, only one implementation for a DBDoc's 
controller exists, which should
 // support this interface
@@ -328,6 +325,8 @@ namespace dbmm
 continue;
 
 bSuccess = xController->closeSubComponents();
+if (!bSuccess)
+break;
 }
 }
 catch( const Exception& )
@@ -423,7 +422,7 @@ namespace dbmm
 void MacroMigrationDialog::impl_reloadDocument_nothrow( bool 
_bMigrationSuccess )
 {
 typedef std::pair< Reference< XFrame >, OUString > ViewDescriptor;
-std::list< ViewDescriptor > aViews;
+std::vector< ViewDescriptor > aViews;
 
 try
 {
@@ -449,14 +448,13 @@ namespace dbmm
 aDocumentArgs.remove( "URL" );
 
 // collect all controllers of our document
-std::list< Reference< XController2 > > aControllers;
+std::vector< Reference< XController2 > > aControllers;
 lcl_getControllers_throw( m_pData->xDocumentModel, aControllers );
 
 // close all those controllers
-while ( !aControllers.empty() )
+for (auto const& controller : aControllers)
 {
-Reference< XController2 > xController( aControllers.front(), 
UNO_SET_THROW );
-aControllers.pop_front();
+Reference< XController2 > xController( controller, 
UNO_SET_THROW );
 
 Reference< XFrame > xFrame( xController->getFrame(), 
UNO_SET_THROW );
 OUString sViewName( xController->getViewControllerName() );
@@ -474,6 +472,7 @@ namespace dbmm
 xFrame->setComponent( nullptr, nullptr );
 xController->dispose();
 }
+aControllers.clear();
 
 // Note the document is closed now - disconnecting the last 
controller
 // closes it automatically.
@@ -481,14 +480,11 @@ namespace dbmm
 Reference< XOfficeDatabaseDocument > xNewDocument;
 
 // re-create the views
-while ( !aViews.empty() )
+for (auto const& view : aViews)
 {
-ViewDescriptor aView( aViews.front() );
-aViews.pop_front();
-
 // load the document into this frame
-Reference< XComponentLoader > xLoader( aView.first, 
UNO_QUERY_THROW );
-aDocumentArgs.put( "ViewName", aView.second );
+Reference< XComponentLoader > xLoader( view.first, 
UNO_QUERY_THROW );
+  

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

[Tamas Bunth]

 sw/source/core/tox/ToxTextGenerator.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2a63ffd4d51d0e643d569a8d43b81bb691e45916
Author: Tamas Bunth 
Date:   Mon Oct 23 20:10:40 2017 +0200

tdf#113284 Check vector length before use

Change-Id: I52b5e6712ba34de0a73bc45ce2262b211b5ac50e
Reviewed-on: https://gerrit.libreoffice.org/43725
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 
(cherry picked from commit 090e9ecd0960e6027cfaaf4600e95dc311524143)
Reviewed-on: https://gerrit.libreoffice.org/44849
Reviewed-by: Aron Budea 

diff --git a/sw/source/core/tox/ToxTextGenerator.cxx 
b/sw/source/core/tox/ToxTextGenerator.cxx
index c748bdb42041..2aa7f657d82d 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -300,6 +300,9 @@ ToxTextGenerator::HandleTextToken(const SwTOXSortTabBase& 
source, SwAttrPool& po
 ToxWhitespaceStripper stripper(source.GetText().sText);
 result.text = stripper.GetStrippedString();
 
+if( source.aTOXSources.empty() )
+return result;
+
 const SwTextNode* pSrc = source.aTOXSources.at(0).pNd->GetTextNode();
 if (!pSrc->HasHints()) {
 return result;
___
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

[Caolán McNamara]

 vcl/source/window/winproc.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a0527cf1105ca1e58d8ae510d7ff6ae870743771
Author: Caolán McNamara 
Date:   Fri Nov 17 13:08:44 2017 +

Resolves: tdf#112943 don't close popups on resize if size didn't change

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

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index b37395ad9bd0..7a612ac0a494 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1599,7 +1599,8 @@ static void KillOwnPopups( vcl::Window* pWindow )
 
 void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight )
 {
-if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) )
+const bool bChanged = (nNewWidth != pWindow->GetOutputWidthPixel()) || 
(nNewHeight != pWindow->GetOutputHeightPixel());
+if (bChanged && pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE))
 {
 KillOwnPopups( pWindow );
 if( pWindow->ImplGetWindow() != ImplGetSVData()->maHelpData.mpHelpWin )
@@ -1611,7 +1612,7 @@ void ImplHandleResize( vcl::Window* pWindow, long 
nNewWidth, long nNewHeight )
  pWindow->ImplGetWindow()->ImplGetWindowImpl()->mbAllResize
)
 {
-if ( (nNewWidth != pWindow->GetOutputWidthPixel()) || (nNewHeight != 
pWindow->GetOutputHeightPixel()) )
+if (bChanged)
 {
 pWindow->mnOutWidth  = nNewWidth;
 pWindow->mnOutHeight = nNewHeight;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 framework/uiconfig/startmodule/menubar/menubar.xml |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit e8871a5ec9fc9b58ee688c9f1d9b3769ea57
Author: Yousuf Philips 
Date:   Fri Nov 17 06:06:39 2017 +0400

Add templates menu and remove macro recording in start center

Change-Id: I91c61047dcae3882f6f80279469963957c621138
Reviewed-on: https://gerrit.libreoffice.org/44838
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml 
b/framework/uiconfig/startmodule/menubar/menubar.xml
index 17deb149722d..63162f294566 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -25,8 +25,18 @@
 
 
 
+
+
+
+
+
+
 
-
+
+
+
+
+
 
 
 
@@ -35,7 +45,6 @@
 
 
 
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/Rdb_services.mk sccomp/CppunitTest_sccomp_swarmsolvertest.mk sccomp/inc sccomp/Library_solver.mk sccomp/Module_sccomp.mk sccomp/qa sccomp/source

[Tomaž Vajngerl]

 postprocess/Rdb_services.mk|1 
 sccomp/CppunitTest_sccomp_swarmsolvertest.mk   |   71 ++
 sccomp/Library_solver.mk   |3 
 sccomp/Module_sccomp.mk|1 
 sccomp/inc/strings.hrc |2 
 sccomp/qa/unit/SwarmSolverTest.cxx |  399 ++
 sccomp/qa/unit/data/MultiVariable.ods  |binary
 sccomp/qa/unit/data/Simple.ods |binary
 sccomp/qa/unit/data/TwoVariables.ods   |binary
 sccomp/source/solver/DifferentialEvolution.hxx |  164 +
 sccomp/source/solver/ParticelSwarmOptimization.hxx |  178 ++
 sccomp/source/solver/SwarmSolver.cxx   |  591 +
 sccomp/source/solver/swarmsolver.component |   15 
 13 files changed, 1425 insertions(+)

New commits:
commit 08404bbb90a8978b70698ef057a4a46ad4fceae3
Author: Tomaž Vajngerl 
Date:   Mon Nov 6 00:54:25 2017 +0100

Swarm based (uses PSO or DE) experimental non-linear solver

This is a new, simple non-linear solver that uses a swarm
(population) to do global optimization. It uses two algoritms -
Particle Swarm Optimization (PSO) or Differential Evolution (DE)
to find a (non-optimal) solution.

It is experimental as not all functions are implemented and it
needs a lot more testing so that it performs well.

Change-Id: If55dad7eda17394851a9d178ad892de771eca7c9
Reviewed-on: https://gerrit.libreoffice.org/44382
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index c0bd871fb1ba..d83b30819ccd 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_LPSOLVE), \
sccomp/source/solver/lpsolvesolver \
) \
+   sccomp/source/solver/swarmsolver \
writerfilter/util/writerfilter \
writerperfect/source/draw/wpftdraw \
writerperfect/source/impress/wpftimpress \
diff --git a/sccomp/CppunitTest_sccomp_swarmsolvertest.mk 
b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk
new file mode 100644
index ..f4114b2cd5e7
--- /dev/null
+++ b/sccomp/CppunitTest_sccomp_swarmsolvertest.mk
@@ -0,0 +1,71 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,swarm_solver_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,swarm_solver_test,\
+   sccomp/qa/unit/SwarmSolverTest \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,swarm_solver_test,\
+   boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,swarm_solver_test,\
+   basegfx \
+   comphelper \
+   cppu \
+   cppuhelper \
+   drawinglayer \
+   editeng \
+   for \
+   forui \
+   i18nlangtag \
+   msfilter \
+   oox \
+   sal \
+   salhelper \
+   sax \
+   sb \
+   sc \
+   scqahelper \
+   sfx \
+   sot \
+   subsequenttest \
+   svl \
+   svt \
+   svx \
+   svxcore \
+   test \
+   tk \
+   tl \
+   ucbhelper \
+   unotest \
+   utl \
+   vbahelper \
+   vcl \
+   xo \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,swarm_solver_test,\
+   -I$(SRCDIR)/sc/inc \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,swarm_solver_test))
+
+$(eval $(call gb_CppunitTest_use_ure,swarm_solver_test))
+$(eval $(call gb_CppunitTest_use_vcl,swarm_solver_test))
+
+$(eval $(call gb_CppunitTest_use_rdb,swarm_solver_test,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,swarm_solver_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index 3339c0ed70df..e23ecac7a5bb 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -22,6 +22,8 @@ $(eval $(call gb_Library_Library,solver))
 $(if $(ENABLE_COINMP),$(eval $(call 
gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver)))
 $(if $(ENABLE_LPSOLVE),$(eval $(call 
gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver)))
 
+$(eval $(call 
gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver))
+
 $(eval $(call gb_Library_use_sdk_api,solver))
 
 $(eval $(call gb_Library_set_include,solver,\
@@ -45,6 +47,7 @@ $(eval $(call gb_Library_use_externals,solver,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
+   sccomp/source/solver/SwarmSolver \

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

[Tomaž Vajngerl]

 include/svx/ClassificationDialog.hxx   |2 +-
 svx/source/dialog/ClassificationDialog.cxx |7 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 133d617a7758acb342d82e5d446e165cd87e2cac
Author: Tomaž Vajngerl 
Date:   Fri Nov 17 21:36:44 2017 +0900

TSCP: remember the state of IP section expander state

Change-Id: I899c05a4260324fa4c5648d7164821eddb1ead08
Reviewed-on: https://gerrit.libreoffice.org/44879
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index 64a5206924e4..d98f516d2015 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -69,7 +69,7 @@ private:
 DECL_LINK(SelectRecentlyUsedHdl, ListBox&, void);
 DECL_LINK(SelectIPPartHdl, ListBox&, void);
 DECL_LINK(EditWindowModifiedHdl, LinkParamNone*, void);
-
+DECL_LINK(ExpandedHdl, VclExpander&, void);
 
 void insertField(ClassificationType eType, OUString const & rString, 
OUString const & rFullString, OUString const & rIdentifier = OUString());
 
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 4484d765d0bf..ad6d6ded5074 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -231,6 +231,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 
 bool bExpand = 
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get();
 m_pIntellectualPropertyExpander->set_expanded(bExpand);
+m_pIntellectualPropertyExpander->SetExpandedHdl(LINK(this, 
ClassificationDialog, ExpandedHdl));
 
 m_pEditWindow->SetModifyHdl(LINK(this, ClassificationDialog, 
EditWindowModifiedHdl));
 }
@@ -697,6 +698,12 @@ IMPL_LINK_NOARG(ClassificationDialog, 
EditWindowModifiedHdl, LinkParamNone*, voi
 toggleWidgetsDependingOnCategory();
 }
 
+IMPL_LINK(ClassificationDialog, ExpandedHdl, VclExpander&, rExpander, void)
+{
+std::shared_ptr 
aConfigurationChanges(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::set(rExpander.get_expanded(),
 aConfigurationChanges);
+aConfigurationChanges->commit();
+}
 
 } // end svx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 svx/source/dialog/ClassificationDialog.cxx |   17 -
 1 file changed, 17 deletions(-)

New commits:
commit 7d469172132ba5a1d11eb1200e996019ce645f0c
Author: Tomaž Vajngerl 
Date:   Fri Nov 17 18:38:49 2017 +0900

TSCP: allow to add multiple markings in the document

Change-Id: Iae8fd98b678acdd3667eeb35b110b4e405c1167b
Reviewed-on: https://gerrit.libreoffice.org/44878
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index fa4ef3e03084..4484d765d0bf 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -630,23 +630,6 @@ IMPL_LINK(ClassificationDialog, SelectMarkingHdl, 
ListBox&, rBox, void)
 sal_Int32 nSelected = rBox.GetSelectedEntryPos();
 if (nSelected >= 0)
 {
-std::unique_ptr 
pEditText(m_pEditWindow->pEdEngine->CreateTextObject());
-std::vector aSections;
-pEditText->GetAllSections(aSections);
-
-for (editeng::Section const & rSection : aSections)
-{
-const SvxFieldItem* pFieldItem = findField(rSection);
-if (pFieldItem)
-{
-const ClassificationField* pClassificationField = 
dynamic_cast(pFieldItem->GetField());
-if (pClassificationField && pClassificationField->meType == 
ClassificationType::MARKING)
-{
-
m_pEditWindow->pEdView->SetSelection(ESelection(rSection.mnParagraph, 
rSection.mnStart, rSection.mnParagraph, rSection.mnEnd));
-}
-}
-}
-
 const OUString aString = maHelper.GetMarkings()[nSelected];
 insertField(ClassificationType::MARKING, aString, aString);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Looking for TextPortion, TextField clarifications

[Jens Tröger]

Some clarification:

> It seems that reference strings have somewhat different spaces: 
> “_Ref498096146 “ and “ _Ref498096146” are the same reference (space after, 
> space before) I assume?

The spacing seems to be inserted by calling getPresentation(). Using the 
SourceName and CurrentPresentation properties works ok.

> In MS Word, a field’s “code” can be something like { PAGEREF _Ref498098146\h} 
> (or NOTEREF, or REF). How are these reference kinds represented in the OO 
> object model?

I think a TextField’s GetReference service 
,
 if available, contains the appropriate reference field sources 
.
 Although I don’t quite understand the difference between “bookmark” and 
“reference mark”.

Still trying to find information on the other questions though…
Jens___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[heiko tietze]

 cui/source/tabpages/page.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 637d96a25926e299fff5b4cf5a0055b1d171b23b
Author: heiko tietze 
Date:   Fri Nov 17 13:23:08 2017 +0100

tdf#106890 Page orientation of User page size

Radio buttons are adjusted when width/height is modified

Change-Id: Ia660a25314a46f2bb04b248a4fef937f10c4941d
Reviewed-on: https://gerrit.libreoffice.org/44876
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index bc83dcfc3f57..f1de9a5e2185 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -996,8 +996,19 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, 
Edit&, void)
 MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich );
 Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ),
 GetCoreValue( *m_pPaperHeightEdit, eUnit ) );
-Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, eUnit );
 
+if ( aSize.Width() > aSize.Height() )
+{
+m_pLandscapeBtn->Check(true);
+bLandscape = true;
+}
+else
+{
+m_pPortraitBtn->Check(true);
+bLandscape = false;
+}
+
+Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, eUnit );
 m_pPaperSizeBox->SetSelection( ePaper );
 UpdateExample_Impl( true );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 sw/uiconfig/swriter/ui/notebookbar.ui |  403 +-
 1 file changed, 210 insertions(+), 193 deletions(-)

New commits:
commit 257f62bb18aa745b50414b955ab285a04a7cfa41
Author: andreas kainz 
Date:   Thu Nov 16 00:27:34 2017 +0100

Update Tabbed Notebookbar remove placeholder img

Change-Id: Ibb90096f85dfab277be7888ec6762624686df85b
Reviewed-on: https://gerrit.libreoffice.org/44796
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index a65a4c806b21..bc5f397d32e7 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -9,11 +9,21 @@
 False
 cmd/lc_accepttrackedchanges.png
   
+  
+True
+False
+cmd/lc_bibliographycomponent.png
+  
   
 True
 False
 cmd/lc_bringtofront.png
   
+  
+True
+False
+cmd/lc_browseview.png
+  
   
 True
 False
@@ -119,6 +129,11 @@
 False
 cmd/lc_insertsymbol.png
   
+  
+True
+False
+cmd/lc_mergedocuments.png
+  
   
 True
 False
@@ -184,6 +199,11 @@
 False
 cmd/lc_print.png
   
+  
+True
+False
+cmd/lc_printlayout.png
+  
   
 True
 False
@@ -192,7 +212,7 @@
   
 True
 False
-svx/res/time.png
+cmd/sc_recentfilelist.png
   
   
 True
@@ -214,6 +234,11 @@
 False
 cmd/lc_sendtoback.png
   
+  
+True
+False
+cmd/lc_showannotations.png
+  
   
 True
 False
@@ -2595,6 +2620,7 @@
 True
 False
 center
+True
 
   
 True
@@ -2674,38 +2700,90 @@
   
 
 
-  
+  
 True
 False
-vertical
+
+  
+True
+False
+vertical
+  
+  
+False
+True
+6
+0
+  
+
+
+  
+True
+False
+center
+both
+False
+3
+
+  
+False
+True
+False
+True
+.uno:InsertTable
+True
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
   
   
 False
 True
-6
 1
   
 
 
-  
+  
 True
 False
-center
-both
-False
-3
 
-  
-False
+  
 True
 False
-True
-.uno:InsertTable
-True
+vertical
   
   
 False
-True
+True
+6
+0
+  
+
+
+  
+True
+True
+True
+.uno:InsertGraphic
+InsertGraphicImg
+none
+top
+True
+  
+  
+False
+True
+1
   
 
   
@@ -2716,36 +2794,6 @@
   
 
 
-  
-True
-False
-vertical
-  
-  
-False
-True
-6
- 

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/xspreadsheetview.hxx  |   33 
 qadevOOo/Jar_OOoRunner.mk|1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv |2 
 qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java |   83 ---
 sc/qa/extras/sctabviewobj.cxx|   14 +
 test/Library_subsequenttest.mk   |1 
 test/source/sheet/xspreadsheetview.cxx   |   41 +
 7 files changed, 87 insertions(+), 88 deletions(-)

New commits:
commit 6d24213d55df33c7bb5f10d511dcfc82b745db38
Author: Jens Carl 
Date:   Thu Oct 12 06:43:20 2017 +

tdf#45904 Move _XSpreadsheetView Java tests to C++

Change-Id: I1e5346e2f014b412a2f8be08553c8eeff37920f9
Reviewed-on: https://gerrit.libreoffice.org/44840
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/xspreadsheetview.hxx 
b/include/test/sheet/xspreadsheetview.hxx
new file mode 100644
index ..144b54ac128b
--- /dev/null
+++ b/include/test/sheet/xspreadsheetview.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XSPREADSHEETVIEW_HXX
+#define INCLUDED_TEST_SHEET_XSPREADSHEETVIEW_HXX
+
+#include 
+#include 
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XSpreadsheetView
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetSetActiveSheet();
+
+protected:
+~XSpreadsheetView() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_XSPREADSHEETVIEW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 229bef198f03..9faab8d10327 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -613,7 +613,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationAnchor \
 qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \
 qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
-qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \
 qadevOOo/tests/java/ifc/style/_CharacterProperties \
 qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian \
 qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
index 6a366ee450cc..bd00af8e020d 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTabViewObj.csv
@@ -61,8 +61,6 @@
 
"ScTabViewObj";"com::sun::star::view::XFormLayerAccess#optional";"isFormDesignMode()"
 
"ScTabViewObj";"com::sun::star::view::XFormLayerAccess#optional";"setFormDesignMode()"
 
"ScTabViewObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
-"ScTabViewObj";"com::sun::star::sheet::XSpreadsheetView";"getActiveSheet()"
-"ScTabViewObj";"com::sun::star::sheet::XSpreadsheetView";"setActiveSheet()"
 "ScTabViewObj";"com::sun::star::frame::XController";"attachFrame()"
 "ScTabViewObj";"com::sun::star::frame::XController";"attachModel()"
 "ScTabViewObj";"com::sun::star::frame::XController";"suspend()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java 
b/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java
deleted file mode 100644
index 947d55a0de63..
--- a/qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.sheet;
-
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetView;
-
-/**
-* Testing 

[Libreoffice-bugs] [Bug 100920] FILEOPEN DOCX Text box positioned over table

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=100920

--- Comment #5 from krishna [:kr1shna]  ---
Created attachment 137822
  --> https://bugs.documentfoundation.org/attachment.cgi?id=137822=edit
Expected behaviour

just in case if link [ https://tinytake.mangoapps.com/sf/ODI5OTdfMzQ4MDQ5Mg ]
dies

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 40575] Maximum date value in Base is 27/06/9957

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=40575

--- Comment #28 from Alex Thurgood  ---
(In reply to Eike Rathke from comment #23)
> Internal tools' class Date representation is now (since 5.2) capable to
> handle dates between -32768-01-01 and 32767-12-31, including conversion
> from/to css::util::Date
> 
> However, connectivity/source/commontools/dbconversion.cxx still has its own
> date implementation that probably interferes here. Someone familiar with
> Base should check what the consequences were if that was eliminated and the
> common tools Date routines be used. My guess is that various database
> related things can't cope with years >  because year might be stored
> using 4 characters, so some extra handling will still be needed there.

@Eike :

Does any of this affect the DateAdd() function in LOBasic ?
Someone has just reported on the German M-L that the help is incorrect when
describing how to enter the string for the date (indeed, it does seem wrong,
but that is tangential to what is to follow):

Sub example_dateadd
MsgBox DateAdd("m", 1, 31012004) &" - "& DateAdd("M", 1, 31012005)
End Sub

Using the above:

- if use double quote characters around the date string, I get other error
messages, such as "unsuported type", or "unsupported operation" depending on
which way I type the string separators (dots or slashes);

- if I use as in the above example, i.e. no quotes around what is essentially
an integer, I get a MsgBox that displays "31/0/1/32767 - 31/01/32767" which is
obviously incorrect.

Is this behaviour related to the changes in date representation support of
css::util::Date or does DateAdd() rely on the Database date functions ?

Should I open a separate report for this ?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113897] New: Invert tab and enter for completion

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113897

Bug ID: 113897
   Summary: Invert tab and enter for completion
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: LibreOffice
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: jean-bapti...@holcroft.fr

Hi, it is really confusing when every software and websites uses 
for completion while LibreOffice uses .

It also is the oppose from what Microsoft Office does, making the transition
more difficult.

Any hope to change this some day?

I see this bug:
https://bugs.documentfoundation.org/show_bug.cgi?id=33684

But I'm talking here about usability and ergonomy in Linux, while this one
looks like to be Mac OS related.

I don't know how it behave in Windows.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113901] UI: Comments for distant rows and columns are drawn shifted

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113901

Vasily Melenchuk (CIB)  changed:

   What|Removed |Added

 Status|UNCONFIRMED |ASSIGNED
   Assignee|libreoffice-b...@lists.free |vasily.melenc...@cib.de
   |desktop.org |
 Ever confirmed|0   |1

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 100980] FILEOPEN DOCX Title is shown empty in some documents

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=100980

--- Comment #4 from krishna [:kr1shna]  ---
Created attachment 137823
  --> https://bugs.documentfoundation.org/attachment.cgi?id=137823=edit
Expected behaviour

just in case if link [ https://tinytake.mangoapps.com/sf/ODI5OThfMzQ4MDQ5Mw ]
dies

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103182] [META] GTK3-specific bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=103182

Caolán McNamara  changed:

   What|Removed |Added

 Depends on|113815  |


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=113815
[Bug 113815] Arrow shape is rendered incorrectly in some buttons
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 112286] [META] gtk3 themeing

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=112286

Caolán McNamara  changed:

   What|Removed |Added

 Depends on||113815


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=113815
[Bug 113815] Arrow shape is rendered incorrectly in some buttons
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113815] Arrow shape is rendered incorrectly in some buttons

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113815

Caolán McNamara  changed:

   What|Removed |Added

 Blocks|103182  |112286


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103182
[Bug 103182] [META] GTK3-specific bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=112286
[Bug 112286] [META] gtk3 themeing
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113863] MAILMERGE App crashes when adding unsupported files in Select Adress List when no Java installed

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113863

Buovjaga  changed:

   What|Removed |Added

Summary|MAILMERGE App crashes when  |MAILMERGE App crashes when
   |adding unsupported files in |adding unsupported files in
   |Select Adress List  |Select Adress List when no
   ||Java installed

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113894] [Regression] Pasting text from Writer in Calc formula field doesn't strip formatting

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113894

raal  changed:

   What|Removed |Added

   Keywords||bibisected, bisected,
   ||regression
 Status|UNCONFIRMED |NEW
 CC||caol...@redhat.com,
   ||r...@post.cz
 Ever confirmed|0   |1

--- Comment #2 from raal  ---
This seems to have begun at the below commit.
Adding Cc: to Caolán McNamara ; Could you possibly take a look at this one?
Thanks

author  Caolán McNamara 2016-07-30 20:29:48 (GMT)
committer   Caolán McNamara 2016-08-02 09:22:33
(GMT)
commit  0321dbb9be72f92c02919457cdc3c4e76cfbd11d (patch)
treeda8db09d364c072899f7707d42144ed2ab2389ec
parent  6d40c515fdf86d807c199ff4179b9c862a9fe5b2 (diff)
Resolves: tdf#99324 let sidebar toggle auto-mnemonics on/off with alt
this returns things to passing the alt to the thing with the focus
and depends on ::Command handlers passing the alt-press/release back
up through the Command hierarchy to get to the default top-level
handler eventually

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 108567] [META] Splash screen and initialization related bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108567

Heiko Tietze  changed:

   What|Removed |Added

 Depends on||113899


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=113899
[Bug 113899] Splash screen of 6.0 alpha shows motif from 5.0
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113899] New: Splash screen of 6.0 alpha shows motif from 5.0

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113899

Bug ID: 113899
   Summary: Splash screen of 6.0 alpha shows motif from 5.0
   Product: LibreOffice
   Version: 6.0.0.0.alpha0+
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Installation
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: tietze.he...@gmail.com
CC: cl...@documentfoundation.org
Blocks: 108567

Both images have been updated to the new motif 

icon-themes/galaxy/brand/intro.png 
icon-themes/galaxy/brand_dev/intro.png.

Version: 6.0.0.0.alpha1
Build ID: c1d1f859b268f650143d48f294999cda0fa57350
CPU threads: 8; OS: Linux 4.13; UI render: default; VCL: gtk2; 
Locale: en-US (en_US.UTF-8); Calc: group


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=108567
[Bug 108567] [META] Splash screen and initialization related bugs and
enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 108928] Branding for 6.0

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108928

Heiko Tietze  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=11
   ||3899

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise

[Libreoffice-bugs] [Bug 113900] New: Equations are mixed after reopening odt document

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113900

Bug ID: 113900
   Summary: Equations are mixed after reopening odt document
   Product: LibreOffice
   Version: 5.4.0.3 release
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: gt...@agt.bme.hu

Description:
LibreOffice Math equations appear mixed and distorted after reopening an odt
document with lots of math equations.

Steps to Reproduce:
1. Create a document with lots of equations
2. Save
3. Re-open saved document

Actual Results:  
Some of the equations as objects are mixed and appear at the wrong place, hence
distorted (too wide or too tall or too short). I can send screenshots.

Expected Results:
Equations should not be mixed and should appear correctly.


Reproducible: Always


User Profile Reset: Yes


OpenGL enabled: Yes

Additional Info:
[Information automatically included from LibreOffice]
Locale: en-US
Module: TextDocument
[Information guessed from browser]
OS: Linux (All)
OS is 64bit: yes


User-Agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:54.0) Gecko/20100101
Firefox/54.0

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113894] [Regression] Pasting text from Writer in Calc formula field doesn't strip formatting

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113894

Caolán McNamara  changed:

   What|Removed |Added

 Status|NEW |ASSIGNED
   Assignee|libreoffice-b...@lists.free |caol...@redhat.com
   |desktop.org |

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 87029] Save Image... context menu item in Impress does not respond to WMF, EMF, or EPS images -- SVG are handled.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=87029

--- Comment #7 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 80543] SIDEBAR: Paragraph Property panel keyboard navigation hangs at the horizontalalignment toolbox--when AT has been activated (a11y)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=80543

--- Comment #6 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 53485] FILEOPEN particular .emf: shown incomplete, without colored area

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=53485

--- Comment #10 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 100037] Image arrangement (in Z dimension) not respected in docx ( EMF included)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=100037

--- Comment #6 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 45136] PC freezes with math document including grids created with Sinequanon in WMF image format

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=45136

--- Comment #9 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 102140] Sidebar content panel title's "more options" button not accessible with shift tab

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=102140

--- Comment #3 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 102031] Sidebar should open deck when pressing key after arriving with F6

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=102031

--- Comment #3 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 102046] Split and group buttons not exposed correctly on Linux

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=102046

--- Comment #2 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 102158] Accessible status not updated correctly for Recent Files and Templates Buttons in Start dialog

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=102158

--- Comment #4 from QA Administrators  ---
** Please read this message in its entirety before responding **

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
http://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs