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

[Caolán McNamara]

 svx/source/table/tablelayouter.cxx |   31 +--
 1 file changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 8deb8ccdcfc06099a8a293a1ad16d1966f131007
Author: Caolán McNamara 
Date:   Fri Mar 31 11:23:04 2017 +0100

ofz#974 check SetBorder bounds like the other maHorizontalBorders users

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

diff --git a/svx/source/table/tablelayouter.cxx 
b/svx/source/table/tablelayouter.cxx
index ae87f5044ad3..0328adaea4d1 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -916,36 +916,40 @@ bool TableLayouter::HasPriority( const SvxBorderLine* 
pThis, const SvxBorderLine
 }
 }
 
-
 void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool 
bHorizontal, const SvxBorderLine* pLine )
 {
-if( pLine == nullptr )
+if (!pLine)
 pLine = 
 
-SvxBorderLine *pOld = bHorizontal ? maHorizontalBorders[nCol][nRow] : 
maVerticalBorders[nCol][nRow];
+BorderLineMap& rMap = bHorizontal ? maHorizontalBorders : 
maVerticalBorders;
 
-if( HasPriority( pLine, pOld ) )
+if( (nCol >= 0) && (nCol < sal::static_int_cast(rMap.size())) &&
+(nRow >= 0) && (nRow < 
sal::static_int_cast(rMap[nCol].size())) )
 {
-if( (pOld != nullptr) && (pOld != ) )
-delete pOld;
+SvxBorderLine *pOld = rMap[nCol][nRow];
 
-SvxBorderLine* pNew = ( pLine !=  ) ?  new 
SvxBorderLine(*pLine) : 
+if (HasPriority(pLine, pOld))
+{
+if (pOld && pOld != )
+delete pOld;
 
-if( bHorizontal )
-maHorizontalBorders[nCol][nRow] = pNew;
-else
-maVerticalBorders[nCol][nRow]  = pNew;
+SvxBorderLine* pNew = (pLine != ) ?  new 
SvxBorderLine(*pLine) : 
+
+rMap[nCol][nRow] = pNew;
+}
+}
+else
+{
+OSL_FAIL( "sdr::table::TableLayouter::SetBorder(), invalid border!" );
 }
 }
 
-
 void TableLayouter::ClearBorderLayout()
 {
 ClearBorderLayout(maHorizontalBorders);
 ClearBorderLayout(maVerticalBorders);
 }
 
-
 void TableLayouter::ClearBorderLayout(BorderLineMap& rMap)
 {
 const sal_Int32 nColCount = rMap.size();
@@ -967,7 +971,6 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap)
 }
 }
 
-
 void TableLayouter::ResizeBorderLayout()
 {
 ClearBorderLayout();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 svx/source/stbctrls/stbctrls.src |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 558c3d3c83c85c4392eae491165143736477216b
Author: Christian Lohmaier 
Date:   Mon Feb 27 13:11:19 2017 +0100

tdf#106082 fix missing statusbar translations (l10ntool is picky about 
syntax)

having the ; on a separate line made all strings following that have the
string-ID of the next unit, altering the msgctx and thus translations
wouldn't apply anymore

Change-Id: Ia1e3c36a9d2a57725c90e6c3f33de99bed85ec41
(cherry picked from commit 9eaa17e6bb35a2cb71ec59c96ea4a39466789667)

diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 2be3e63..6ffb182 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -119,8 +119,7 @@ String RID_SVXSTR_DOC_LOAD
 String RID_SVXSTR_FIT_SLIDE
 {
 Text [ en-US ] = "Fit slide to current window.";
-}
-;
+};
 
 String RID_SVXSTR_WARN_MISSING_SMARTART
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/accessibility/charmapacc.cxx |   29 ++---
 svx/source/inc/charmapacc.hxx   |1 +
 2 files changed, 19 insertions(+), 11 deletions(-)

New commits:
commit 2247313b0aec80306e7f67926810cf004d5b4d1d
Author: Caolán McNamara 
Date:   Wed Feb 15 16:52:53 2017 +

Related: tdf#105712 inconsistency with num of a11y children in special char

with no visible scrollbar it claims 1 child, but trying to get child at
index 0 throws

(cherry picked from commit b3098d239f46c8d5965754f275bc62216dcb4f4f)

Change-Id: Icf1a0afc4a6f6090e3f14f30b4380db477955561
Reviewed-on: https://gerrit.libreoffice.org/34314
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/accessibility/charmapacc.cxx 
b/svx/source/accessibility/charmapacc.cxx
index 80d0e51..c65d58c 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -71,11 +71,16 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent(
 m_pTable->fireEvent(_nEventId,_rOldValue,_rNewValue);
 }
 
-sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  ) throw 
(RuntimeException, std::exception)
+sal_Int32 SvxShowCharSetVirtualAcc::getImplAccessibleChildCount() const
+{
+return mpParent->getScrollBar().IsVisible() ? 2 : 1;
+}
+
+sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount() throw 
(RuntimeException, std::exception)
 {
 OExternalLockGuard aGuard( this );
 ensureAlive();
-return ( mpParent->getScrollBar().IsVisible() ) ? 2 : 1;
+return getImplAccessibleChildCount();
 }
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL 
SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint )
@@ -117,18 +122,20 @@ Reference< XAccessible > SAL_CALL 
SvxShowCharSetVirtualAcc::getAccessibleChild(
 {
 OExternalLockGuard aGuard( this );
 ensureAlive();
-if ( mpParent->getScrollBar().IsVisible() && i == 0 )
+
+sal_Int32 nCount = getImplAccessibleChildCount();
+if (i >= nCount)
+throw IndexOutOfBoundsException();
+
+if (i == 0 && mpParent->getScrollBar().IsVisible())
 return mpParent->getScrollBar().GetAccessible();
-else if ( i == 1 )
+
+if ( !m_xAcc.is() )
 {
-if ( !m_xAcc.is() )
-{
-m_pTable = new SvxShowCharSetAcc(this);
-m_xAcc = m_pTable;
-}
+m_pTable = new SvxShowCharSetAcc(this);
+m_xAcc = m_pTable;
 }
-else
-throw IndexOutOfBoundsException();
+
 return m_xAcc;
 }
 
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 2169e96..bfb4fb7 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -44,6 +44,7 @@ namespace svx
 VclPtr mpParent; // the vcl control
 SvxShowCharSetAcc*  m_pTable; // the table, which holds the characters 
shown by the vcl control
 css::uno::Reference< css::accessibility::XAccessible > m_xAcc; // the 
ref to the table
+sal_Int32 getImplAccessibleChildCount() const;
 protected:
 virtual ~SvxShowCharSetVirtualAcc();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

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

New commits:
commit 61d5ff8fd96809a285f0e64817ef6fe4b8cdaa75
Author: Tor Lillqvist 
Date:   Tue Feb 14 22:53:53 2017 +0200

tdf#106011: The "swing angle" is negative when counter-clockwise

Change-Id: I1ef77e4c8cf0a6d31b36411a79b576115c32c644
(cherry picked from commit 34d8dc19a08e2752a4b8d3b3d83b7cf3ac341f1c)
Reviewed-on: https://gerrit.libreoffice.org/34284
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 4bad1d5..d630954 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1780,7 +1780,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& 
rSrcPt, sal_uInt16& rSegm
 << aStartPoint.Y() << " end: "
 << aEndPoint.X() << ", " << aEndPoint.Y()
 << " clockwise: " << int(bClockwise));
-basegfx::B2DPolygon aArc = CreateArc( aRect, 
bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, 
bClockwise, aStartPoint == aEndPoint && fSwingAngle > F_PI);
+basegfx::B2DPolygon aArc = CreateArc( aRect, 
bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, 
bClockwise, aStartPoint == aEndPoint && ((bClockwise && fSwingAngle > F_PI) || 
(!bClockwise && fSwingAngle < -F_PI)));
 // Now that we have the arc, move it to 
aStartPointB2D.
 basegfx::B2DHomMatrix aMatrix = 
basegfx::tools::createTranslateB2DHomMatrix(aStartPointB2D.getX(), 
aStartPointB2D.getY());
 aArc.transform(aMatrix);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |   39 +++--
 1 file changed, 22 insertions(+), 17 deletions(-)

New commits:
commit 98fd1628178a9c6ac119a72c5f43257c129ba72b
Author: Caolán McNamara 
Date:   Thu Jan 12 16:42:05 2017 +

Resolves: tdf#101187 colossal page width wraps around if doubled

when trying to generate a reasonable upper bound clipping region

Change-Id: I53f8ea1bd6c52c88284e1f41369f83492d078b5d
(cherry picked from commit 2fd88ab1cbb4690a770ca2ca5d66157ec4906a2e)
Reviewed-on: https://gerrit.libreoffice.org/33009
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 2b0e78a..78455f4 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -99,23 +99,28 @@ namespace sdr
 sal_Int32 nPageWidth = pPage ? pPage->GetWdt() : 0;
 sal_Int32 nPageHeight = pPage ? pPage->GetHgt() : 0;
 
-//But, see tdf#97276 and tdf#98366. Don't clip too much if the
-//underlying page dimension is unknown or a paste document
-//where the page sizes use the odd default of 10x10
-nPageWidth = std::max(21000, nPageWidth);
-nPageHeight = std::max(29700, nPageHeight);
-basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
- nPageWidth*2, nPageHeight*2);
-
-aUnitPolyPolygon = 
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
-   aClipRange, 
true, true);
-nPolyCount = ensureGeometry(aUnitPolyPolygon);
-
-// re-check that we have't been clipped out to oblivion
-bIsLine =
-!aUnitPolyPolygon.areControlPointsUsed()
-&& 1 == nPolyCount
-&& 2 == aUnitPolyPolygon.getB2DPolygon(0).count();
+//But, see tdf#101187, only do this if our generous clip region
+//would not over flow into a tiny clip region
+if (nPageWidth < SAL_MAX_INT32/2 && nPageHeight < 
SAL_MAX_INT32/2)
+{
+//But, see tdf#97276 and tdf#98366. Don't clip too much if 
the
+//underlying page dimension is unknown or a paste document
+//where the page sizes use the odd default of 10x10
+nPageWidth = std::max(21000, nPageWidth);
+nPageHeight = std::max(29700, nPageHeight);
+basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
+ nPageWidth*2, nPageHeight*2);
+
+aUnitPolyPolygon = 
basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon,
+   
aClipRange, true, true);
+nPolyCount = ensureGeometry(aUnitPolyPolygon);
+
+// re-check that we have't been clipped out to oblivion
+bIsLine =
+!aUnitPolyPolygon.areControlPointsUsed()
+&& 1 == nPolyCount
+&& 2 == aUnitPolyPolygon.getB2DPolygon(0).count();
+}
 }
 
 if(bIsLine)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 svx/source/svdraw/svdotextdecomposition.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit ed5e0a90aa445f5380a245a203caee6518d483cd
Author: Tamás Zolnai 
Date:   Sat Dec 17 16:11:06 2016 +0100

tdf#104722: Wrong text alignment when text box is smaller than the text 
inside

The default TextHorizontalAlignment is block. Setting
paragraph alignment (on UI) works when this text
alignment property is set to block (otherwise has no effect).
In general this works on this way, but the existing
algorithm did not work in those cases when the
text was bigger than the container shape.

Change-Id: I02dba76f8e3033a465bb14dc826521966bb30987
Reviewed-on: https://gerrit.libreoffice.org/32123
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 5694b4970e3af096130e172ac6968b10ed587a6f)
Reviewed-on: https://gerrit.libreoffice.org/32127
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index d822a71..9b6a8c9 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1009,7 +1010,14 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 // else the alignment is wanted.
 if(SDRTEXTHORZADJUST_BLOCK == eHAdj)
 {
-eHAdj = SDRTEXTHORZADJUST_CENTER;
+SvxAdjust eAdjust = static_cast(GetObjectItemSet().Get(EE_PARA_JUST)).GetAdjust();
+switch(eAdjust)
+{
+case SVX_ADJUST_LEFT:   eHAdj = SDRTEXTHORZADJUST_LEFT; 
break;
+case SVX_ADJUST_RIGHT:  eHAdj = SDRTEXTHORZADJUST_RIGHT; 
break;
+case SVX_ADJUST_CENTER: eHAdj = SDRTEXTHORZADJUST_CENTER; 
break;
+default: break;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

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

New commits:
commit 41fc6366c53323c46769f2c367d8f8d6cf02878b
Author: Julien Nabet 
Date:   Sun Nov 20 10:22:56 2016 +0100

tdf#88351: Revert "coverity#704341 Logically dead code"

This reverts commit 7b1f5cc16fdbc0c53d0b7f9e3f45decd1136f4fa.

Change-Id: I85d4c45025817914d6b78458f24a343f3b05879c
Reviewed-on: https://gerrit.libreoffice.org/31017
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 5507b741ccf018c06fb29694d13837abcac4486a)
Reviewed-on: https://gerrit.libreoffice.org/31023
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 5119b88..0115331 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2728,7 +2728,7 @@ bool SvxTableController::ApplyFormatPaintBrush( 
SfxItemSet& rFormatSet, bool bNo
 {
 if( (*pRanges != EE_PARA_START) && (*pRanges != EE_CHAR_START) )
 {
-bTextOnly = false;
+bTextOnly = true;
 break;
 }
 pRanges += 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/sdr/properties/textproperties.cxx |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 6218637c2a9b64793bee5654b8f2948293d0ec03
Author: Caolán McNamara 
Date:   Mon Nov 21 12:42:09 2016 +

drawing shapes aren't tracking style name changes correctly

in draw, create a box, enter some text, exit and select box
F11 for style navigator, new style, set font to e.g. 88
apply this style to the box. All ok.

If you modify the style and changes its font to e.g. bold
the text in the box tracks it as expected. All ok.

If you modify the style and change its name, the box resets
to something different and there's loads of warnings about
unknown styles. Not ok.

The style modification fires, but the style name gets overwritten
by the style stuck in a OutlinerParaObject that gets overlaid
over the editengine.

All the rTextProvider.getTextCount uses that don't iterate over all entries
look dubious to me, but I'll initially fix this one that I have hard 
evidence
for as broken.

All this is probably broken since...

commit 838c0fa8228f4ca656a264f6a5610c337ebf4fef
Author: Rüdiger Timm 
Date:   Wed Mar 12 08:47:30 2008 +

INTEGRATION: CWS impresstables2 (1.14.72); FILE MERGED

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

diff --git a/svx/source/sdr/properties/textproperties.cxx 
b/svx/source/sdr/properties/textproperties.cxx
index de35ec3..09ebfc7 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -82,13 +82,13 @@ namespace sdr
 void TextProperties::ItemSetChanged(const SfxItemSet& rSet)
 {
 SdrTextObj& rObj = static_cast(GetSdrObject());
-const svx::ITextProvider& rTextProvider(getTextProvider());
-sal_Int32 nText = rTextProvider.getTextCount();
 
 // #i101556# ItemSet has changed -> new version
 maVersion++;
 
-while( --nText >= 0 )
+const svx::ITextProvider& rTextProvider(getTextProvider());
+sal_Int32 nText = rTextProvider.getTextCount();
+while (nText--)
 {
 SdrText* pText = rTextProvider.getText( nText );
 
@@ -173,7 +173,7 @@ namespace sdr
 
 const svx::ITextProvider& rTextProvider(getTextProvider());
 sal_Int32 nCount = rTextProvider.getTextCount();
-while( nCount-- )
+while (nCount--)
 {
 SdrText* pText = rTextProvider.getText( nCount );
 OutlinerParaObject* pParaObj = 
pText->GetOutlinerParaObject();
@@ -246,8 +246,7 @@ namespace sdr
 
 const svx::ITextProvider& rTextProvider(getTextProvider());
 sal_Int32 nText = rTextProvider.getTextCount();
-
-while( --nText >= 0 )
+while (nText--)
 {
 SdrText* pText = rTextProvider.getText( nText );
 
@@ -408,8 +407,7 @@ namespace sdr
 Outliner* pOutliner = 
SdrMakeOutliner(OutlinerMode::OutlineObject, *rObj.GetModel());
 const svx::ITextProvider& rTextProvider(getTextProvider());
 sal_Int32 nText = rTextProvider.getTextCount();
-
-while( --nText >= 0 )
+while (nText--)
 {
 SdrText* pText = rTextProvider.getText( nText );
 
@@ -564,7 +562,7 @@ namespace sdr
 rObj.SetPortionInfoChecked(false);
 
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText > 0 )
+while (nText--)
 {
 OutlinerParaObject* pParaObj = 
rTextProvider.getText( nText )->GetOutlinerParaObject();
 if( pParaObj )
@@ -587,7 +585,7 @@ namespace sdr
 {
 rObj.SetPortionInfoChecked(false);
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText > 0 )
+while (nText--)
 {
 OutlinerParaObject* pParaObj = 
rTextProvider.getText( nText )->GetOutlinerParaObject();
 if( pParaObj )
@@ -609,7 +607,7 @@ namespace sdr
 if(aOldName != aNewName)
 {
 sal_Int32 nText = rTextProvider.getTextCount();
-while( --nText > 0 )
+while (nText--)
 {
 

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

[Maxim Monastirsky]

 svx/source/tbxctrls/tbcontrl.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 92e983f3eb22737eca04fc32ec61e1d9159cc10c
Author: Maxim Monastirsky 
Date:   Tue Nov 8 10:07:18 2016 +0200

tdf#103087 Border widget must not have focus initially

... unless it was opened using the keyboard.

(based on 66b75b4ba9f0a1c8003fa52c7a29575e374644a2)

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

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b711eb5..28684f4 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -259,7 +259,6 @@ private:
 protected:
 virtual voidResize() override;
 virtual boolClose() override;
-virtual voidGetFocus() override;
 
 public:
 SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, 
vcl::Window* pParentWindow );
@@ -271,6 +270,7 @@ public:
 virtual voidStateChanged( sal_uInt16 nSID, SfxItemState eState,
   const SfxPoolItem* pState ) override;
 virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
+virtual voidKeyInput( const KeyEvent& rKEvt ) override;
 };
 
 class SvxLineWindow_Impl : public SfxPopupWindow
@@ -1664,10 +1664,10 @@ void SvxFrameWindow_Impl::dispose()
 SfxPopupWindow::dispose();
 }
 
-void SvxFrameWindow_Impl::GetFocus()
+void SvxFrameWindow_Impl::KeyInput( const KeyEvent& rKEvt )
 {
-if (aFrameSet)
-aFrameSet->GrabFocus();
+aFrameSet->GrabFocus();
+aFrameSet->KeyInput( rKEvt );
 }
 
 void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
@@ -2930,6 +2930,13 @@ VclPtr 
SvxFrameToolBoxControl::CreatePopupWindow()
FloatWinPopupFlags::AllowTearOff |
FloatWinPopupFlags::NoAppFocusClose );
 pFrameWin->StartSelection();
+
+if ( GetToolBox().IsKeyEvent() )
+{
+KeyEvent aEvent( 0, vcl::KeyCode( KEY_HOME ) );
+pFrameWin->KeyInput( aEvent );
+}
+
 SetPopupWindow( pFrameWin );
 
 return pFrameWin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 svx/source/sidebar/tools/Popup.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae8226a2166d6a25dd5b711b0f004ad5da1ba90e
Author: Maxim Monastirsky 
Date:   Wed Oct 19 16:27:26 2016 +0300

tdf#76002 Grab focus to sidebar dropdowns

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

diff --git a/svx/source/sidebar/tools/Popup.cxx 
b/svx/source/sidebar/tools/Popup.cxx
index eb1f3da..df064d8 100644
--- a/svx/source/sidebar/tools/Popup.cxx
+++ b/svx/source/sidebar/tools/Popup.cxx
@@ -74,7 +74,7 @@ void Popup::Show (ToolBox& rToolBox)
 
 mxContainer->StartPopupMode(
 aRect,
-FloatWinPopupFlags::NoFocusClose|FloatWinPopupFlags::Down);
+FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::Down);
 mxContainer->SetPopupModeFlags(
 mxContainer->GetPopupModeFlags()
 | FloatWinPopupFlags::NoAppFocusClose);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit b73a8e115d9afaf7cc00906d158d1c2f1ba8829c
Author: Caolán McNamara 
Date:   Mon Oct 3 10:15:56 2016 +0100

Resolves: tdf#101470 don't restore last value when submenu appears

Change-Id: Ia0cce8607334289b619b1f59dbdd67b000a06e01
(cherry picked from commit b72593fac6addd571158bd37deb0045104a8)
Reviewed-on: https://gerrit.libreoffice.org/29475
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4a94e8a..b711eb5 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -523,7 +523,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
 else if ( MouseNotifyEvent::LOSEFOCUS == nType )
 {
 // don't handle before our Select() is called
-if ( !HasFocus() && !HasChildPathFocus() )
+if (!HasFocus() && !HasChildPathFocus() && !IsChild(rNEvt.GetWindow()))
 SetText( GetSavedValue() );
 }
 return ComboBox::PreNotify( rNEvt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/dialog/frmsel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d0f2707c2a649778fe8bc47a187ceb2e6a90aaf7
Author: Caolán McNamara 
Date:   Tue Sep 27 20:47:16 2016 +0100

Resolves: tdf#101884 keyboard navigation in User defined border control

Change-Id: I92ea37754f057c560d19b41f814a1d649ea74876
(cherry picked from commit f20996450e409406f4f55f9eb7ca9bfe1e455c35)
Reviewed-on: https://gerrit.libreoffice.org/29330
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 9f5e9cf..e89 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -1176,6 +1176,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt )
 DeselectAllBorders();
 SelectBorder( eBorder );
 }
+bHandled = true;
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 svx/source/dialog/srchdlg.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3dad1d0628af49e61b34a050a83346805d8f8766
Author: Markus Mohrhard 
Date:   Tue Aug 2 14:04:15 2016 +0200

add missing nullptr check

See

http://crashreport.libreoffice.org/stats/crash_details/173c2c82-7241-44b4-8394-2b5635f7f938

Change-Id: I2a03c6d6a77e3c872b8507c72b47a05db20fd564
Reviewed-on: https://gerrit.libreoffice.org/27791
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit dadd4abdadb970dd4912caaa56b7250c3a30cc9e)
Reviewed-on: https://gerrit.libreoffice.org/27799
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index de310ce..d63c90f 100755
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2377,8 +2377,12 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
 
 static vcl::Window* lcl_GetSearchLabelWindow()
 {
+SfxViewFrame* pViewFrame = SfxViewFrame::Current();
+if (!pViewFrame)
+return nullptr;
+
 css::uno::Reference< css::beans::XPropertySet > xPropSet(
-SfxViewFrame::Current()->GetFrame().GetFrameInterface(), 
css::uno::UNO_QUERY_THROW);
+pViewFrame->GetFrame().GetFrameInterface(), 
css::uno::UNO_QUERY_THROW);
 css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
 xPropSet->getPropertyValue("LayoutManager") >>= xLayoutManager;
 css::uno::Reference< css::ui::XUIElement > xUIElement =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/fmcomp/gridcell.cxx |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit bab808ca04f8c79a98e8133b09ac1a3934c6d339
Author: Caolán McNamara 
Date:   Wed Jul 20 13:04:54 2016 +0100

Resolves: tdf#100845 exception during vcl painting -> std::terminate

GetText throws under the circumstances described in the bug where
the record is missing

Change-Id: I03b0ce9a19d93a7eb8842831b433b80a20628541
(cherry picked from commit d8e225304b7c8465f5e7f038ec02270445e1b600)
Reviewed-on: https://gerrit.libreoffice.org/27340
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b14cdd1..d2861c0 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3542,17 +3542,24 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
 nStyle |= DrawTextFlags::Left;
 }
 
-Color* pColor = nullptr;
-OUString aText = GetText(_rxField, xFormatter, );
-if (pColor != nullptr)
+try
 {
-Color aOldTextColor( rDev.GetTextColor() );
-rDev.SetTextColor( *pColor );
-rDev.DrawText(rRect, aText, nStyle);
-rDev.SetTextColor( aOldTextColor );
+Color* pColor = nullptr;
+OUString aText = GetText(_rxField, xFormatter, );
+if (pColor != nullptr)
+{
+Color aOldTextColor( rDev.GetTextColor() );
+rDev.SetTextColor( *pColor );
+rDev.DrawText(rRect, aText, nStyle);
+rDev.SetTextColor( aOldTextColor );
+}
+else
+rDev.DrawText(rRect, aText, nStyle);
+}
+catch (const Exception& e)
+{
+SAL_WARN("svx.form", "PaintFieldToCell: caught an exception: " << 
e.Message);
 }
-else
-rDev.DrawText(rRect, aText, nStyle);
 }
 
 FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit b46fbedb4d41750b72b76b12350904d344100811
Author: Caolán McNamara 
Date:   Sat Jul 9 21:01:08 2016 +0100

Resolves: tdf#100809 Paragraph styles drop-down list

Change-Id: I9453c3c877dcd39268f7c910e8918947bdeb8fd4
(cherry picked from commit 563dd59cdf84be980f4e0e2fb12566dd7e4a1633)
Reviewed-on: https://gerrit.libreoffice.org/27075
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 17a4f3f..4a94e8a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -399,14 +399,16 @@ void SvxStyleBox_Impl::ReleaseFocus()
 IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool)
 {
 OUString sEntry = GetSelectEntry();
+sal_uInt16 nMenuId = pMenu->GetCurItemId();
 ReleaseFocus(); // It must be after getting entry pos!
+if (IsInDropDown())
+ToggleDropDown();
 Sequence< PropertyValue > aArgs( 2 );
 aArgs[0].Name   = "Param";
 aArgs[0].Value  = makeAny( sEntry );
 aArgs[1].Name   = "Family";
 aArgs[1].Value  = makeAny( sal_Int16( eStyleFamily ));
 
-sal_uInt16 nMenuId = pMenu->GetCurItemId();
 switch(nMenuId) {
 case RID_SVX_UPDATE_STYLE:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 svx/source/dialog/crashreportdlg.cxx |   20 ++--
 svx/source/dialog/crashreportdlg.hxx |6 +-
 svx/uiconfig/ui/crashreportdlg.ui|   27 +--
 3 files changed, 44 insertions(+), 9 deletions(-)

New commits:
commit 505b83487ff82e400d1467a3ee0c6112506d7a3f
Author: Markus Mohrhard 
Date:   Fri Jun 17 18:49:26 2016 +0200

better message for crash report dialog

Change-Id: I02903cda46809798ec7664cf620c06ea7687e54e
Reviewed-on: https://gerrit.libreoffice.org/26443
Reviewed-by: Markus Mohrhard 
Tested-by: Jenkins 
(cherry picked from commit fabd384e1596d8a5d8753985cca9a4c14c49a1fc)
Reviewed-on: https://gerrit.libreoffice.org/26488

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 973a593..acb3ccf 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -26,10 +26,14 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
 get(mpBtnClose, "btn_close");
 get(mpEditPreUpload, "ed_pre");
 get(mpEditPostUpload, "ed_post");
+get(mpFtBugReport, "ed_bugreport");
+
+maSuccessMsg = mpEditPostUpload->GetText();
 
 mpBtnSend->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
 mpBtnCancel->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
 mpBtnClose->SetClickHdl(LINK(this, CrashReportDialog, BtnHdl));
+mpEditPostUpload->SetReadOnly(true);
 }
 
 CrashReportDialog::~CrashReportDialog()
@@ -44,6 +48,7 @@ void CrashReportDialog::dispose()
 mpBtnClose.clear();
 mpEditPreUpload.clear();
 mpEditPostUpload.clear();
+mpFtBugReport.clear();
 
 Dialog::dispose();
 }
@@ -60,15 +65,26 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, 
void)
 OUString aCrashID = OUString::createFromAscii(response.c_str());
 
 if (bSuccess)
-mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " " + 
aCrashID);
+{
+OUString aProcessedMessage = maSuccessMsg.replaceAll("%CRASHID", 
aCrashID.replaceAll("Crash-ID=",""));
+
+// vclbuilder seems to replace _ with ~ even in text
+mpEditPostUpload->SetText(aProcessedMessage.replaceAll("~", "_"));
+}
 else
-mpEditPostUpload->SetText(mpEditPostUpload->GetText() + " Error!");
+mpEditPostUpload->SetText("Error!");
 
 mpBtnClose->Show();
+mpFtBugReport->Show();
 mpEditPreUpload->Hide();
 mpEditPostUpload->Show();
 mpBtnSend->Hide();
+mpBtnSend->Disable();
 mpBtnCancel->Hide();
+mpBtnCancel->Disable();
+mpBtnClose->GrabFocus();
+
+this->setOptimalLayoutSize();
 }
 else if (pBtn == mpBtnCancel.get())
 {
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index f090af1..3f3cb40 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class CrashReportDialog : public Dialog
 {
@@ -31,7 +32,10 @@ private:
 VclPtr mpBtnCancel;
 VclPtr mpBtnClose;
 VclPtr mpEditPreUpload;
-VclPtr mpEditPostUpload;
+VclPtr mpEditPostUpload;
+VclPtr mpFtBugReport;
+
+OUString maSuccessMsg;
 
 DECL_LINK_TYPED(BtnHdl, Button*, void);
 };
diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index d483d61..240b334 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -62,16 +62,16 @@
   
 False
 False
-3
+4
   
 
 
   
 True
 False
-We are sorry but it 
seems that LibreOffice crashed the last time.
+We are sorry but it 
seems that %PRODUCTNAME crashed the last time.
 
-You can help us fix this issue by sending the crash report to the LibreOffice 
crash reporting server.
+You can help us fix this issue by sending the crash report to the %PRODUCTNAME 
crash reporting server.
 True
   
   
@@ -81,14 +81,15 @@ You can help us fix this issue by sending the crash report 
to the LibreOffice cr
   
 
 
-  
+  
 False
 center
 0
 The crash report was 
successfully uploaded.
-You can soon find the report on crashreport.libreoffice.org.
-The report can be found by
+You can soon find the report on:
+crashreport.libreoffice.org/stats/crash_details/%CRASHID
 True
+True
   
   
 False
@@ -96,6 +97,20 @@ The report can be found by
 1
   
 
+
+  
+False
+Please check the report 
and if no bug report is connected to the crash report yet, 

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

[Stephan Bergmann]

 svx/source/table/tablecolumn.cxx |2 +-
 svx/source/table/tablecolumn.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee5644f3df0e727e9f31398e21d72727641193e5
Author: Stephan Bergmann 
Date:   Wed Jun 8 16:53:37 2016 +0200

loplugin:passstuffbyref

Change-Id: I637e1c9d5af1f9d8ad5141c8d07ea72232656070
(cherry picked from commit 46c7ecf760bbea6541507c319e8e722f9b4ec712)
Reviewed-on: https://gerrit.libreoffice.org/26097
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index c5ceade..44536f5 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -283,7 +283,7 @@ rtl::Reference< FastPropertySetInfo > 
TableColumn::getStaticPropertySetInfo()
 return xInfo;
 }
 
-TableModelRef TableColumn::getModel() const
+TableModelRef const & TableColumn::getModel() const
 {
 return mxTableModel;
 }
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 0c5083d..320b384 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -59,7 +59,7 @@ public:
 virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) 
throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, 
css::uno::RuntimeException, std::exception) override;
 
 /// Get the table that owns this column.
-TableModelRef getModel() const;
+TableModelRef const & getModel() const;
 /// Get the width of this column.
 sal_Int32 getWidth() const;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 svx/source/dialog/crashreportdlg.cxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit fa4298e9b649e21d9fb309d66fabce89813143d4
Author: Michael Stahl 
Date:   Mon Jun 6 15:13:44 2016 +0200

svx: -Werror=unused-function

Change-Id: Ifa7e36e44ac1f2bdfb91e9b4bf29e7436dc68509
(cherry picked from commit 55a07417c8df1f451cac33d5dfc6a2ef450fa544)
Reviewed-on: https://gerrit.libreoffice.org/25977
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 00dcedd..8cb5c29 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -48,18 +48,6 @@ void CrashReportDialog::dispose()
 Dialog::dispose();
 }
 
-namespace {
-
-OUString getLibDir()
-{
-OUString aOriginal = "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER;
-rtl::Bootstrap::expandMacros(aOriginal);
-
-return aOriginal;
-}
-
-}
-
 IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 {
 if (pBtn == mpBtnSend.get())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 22d4a2f8a6dbbd15ad7236a6c094804e0211bdad
Author: Caolán McNamara 
Date:   Sat Jun 4 20:43:44 2016 +0100

Resolves: tdf#100201 crash on apply custom color

regression from...

commit 789055bc2acb4c71483fd60ea258d158bd5aec10
Date:   Tue Apr 12 16:39:03 2016 +0200

clang-tidy performance-unnecessary-copy-initialization

probably not much performance benefit, but it sure is good at
identifying leftover intermediate variables from previous
refactorings.

This case has a comment explaining the problem that appeared post
change.

Change-Id: Ib0c0883c57f103656cda00e3a94399a515d7fe41
(cherry picked from commit 301a87c861842a616e3e5593c664980466d58ffe)

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 4acf2e4..535134f 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -227,7 +227,7 @@ void PaletteManager::SetColorSelectFunction(const 
std::function

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

[Eike Rathke]

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

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

actually list additional builtin formats NF_FRACTION_3, NF_FRACTION_4

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

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

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