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

[TiagoSantos]

 editeng/source/misc/svxacorr.cxx |   40 ---
 1 file changed, 29 insertions(+), 11 deletions(-)

New commits:
commit 6bfe94a631b5c5029a1f96a52b000d25e33bad4a
Author: TiagoSantos 
Date:   Tue Nov 22 14:41:33 2016 +

extend markup support (/italic/ and -strikeout-)

* adds to LibreOffice markup support for /italics/ and -strikeout-
* TODO update strings in the Options dialog (they only refer *bold* and
_underline_)
* TODO update documentation with new feature

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

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index fafb4be..ccb6e26 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -44,6 +44,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -237,7 +239,7 @@ bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar )
 cChar == '*'  || cChar == '_'  || cChar == '%' ||
 cChar == '.'  || cChar == ','  || cChar == ';' ||
 cChar == ':'  || cChar == '?' || cChar == '!' ||
-cChar == '/';
+cChar == '/'  || cChar == '-';
 }
 
 namespace
@@ -735,10 +737,10 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& 
rDoc, const OUString& rT
 sal_Int32 , sal_Int32 nEndPos )
 {
 // Condition:
-//  at the beginning:   _ or * after Space with the following !Space
-//  at the end: _ or * before Space (word delimiter?)
+//  at the beginning:   _, *, / or ~ after Space with the following !Space
+//  at the end: _, *, / or ~ before Space (word delimiter?)
 
-sal_Unicode cInsChar = rTxt[ nEndPos ];  // underline or bold
+sal_Unicode cInsChar = rTxt[ nEndPos ];  // underline, bold, italic or 
strikeout
 if( ++nEndPos != rTxt.getLength() &&
 !IsWordDelim( rTxt[ nEndPos ] ) )
 return false;
@@ -755,6 +757,8 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& 
rDoc, const OUString& rT
 switch( sal_Unicode c = rTxt[ --nPos ] )
 {
 case '_':
+case '-':
+case '/':
 case '*':
 if( c == cInsChar )
 {
@@ -787,17 +791,31 @@ bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& 
rDoc, const OUString& rT
 {
 SvxWeightItem aSvxWeightItem( WEIGHT_BOLD, SID_ATTR_CHAR_WEIGHT );
 rDoc.SetAttr( nFndPos, nEndPos - 1,
-SID_ATTR_CHAR_WEIGHT,
-aSvxWeightItem);
+  SID_ATTR_CHAR_WEIGHT,
+  aSvxWeightItem);
 }
-else// underline
+else if( '/' == cInsChar )   // Italic
+{
+SvxPostureItem aSvxPostureItem( ITALIC_NORMAL, 
SID_ATTR_CHAR_POSTURE );
+rDoc.SetAttr( nFndPos, nEndPos - 1,
+  SID_ATTR_CHAR_POSTURE,
+  aSvxPostureItem);
+}
+else if( '-' == cInsChar )   // Strikeout
+{
+SvxCrossedOutItem aSvxCrossedOutItem( STRIKEOUT_SINGLE, 
SID_ATTR_CHAR_STRIKEOUT );
+rDoc.SetAttr( nFndPos, nEndPos - 1,
+  SID_ATTR_CHAR_STRIKEOUT,
+  aSvxCrossedOutItem);
+}
+else// Underline
 {
 SvxUnderlineItem aSvxUnderlineItem( LINESTYLE_SINGLE, 
SID_ATTR_CHAR_UNDERLINE );
 rDoc.SetAttr( nFndPos, nEndPos - 1,
-SID_ATTR_CHAR_UNDERLINE,
-aSvxUnderlineItem);
+  SID_ATTR_CHAR_UNDERLINE,
+  aSvxUnderlineItem);
 }
-}
+  }
 
 return -1 != nFndPos;
 }
@@ -1304,7 +1322,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, 
const OUString& rTxt,
 break;
 
 // Set bold or underline automatically?
-if (('*' == cChar || '_' == cChar) && (nPos+1 < rTxt.getLength()))
+if (('*' == cChar || '_' == cChar || '/' == cChar || '-' == cChar) && 
(nPos+1 < rTxt.getLength()))
 {
 if( IsAutoCorrFlag( ChgWeightUnderl ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Christina Acchione License Statement

[Jan Iversen]

Sorry wrong mail.

WELCOME

Thanks for your license statement.

We suggest you add yourself to our wiki (remark this is not a demand)
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

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

Re: Christina Acchione License Statement

[Jan Iversen]

WELCOME mail



WELCOME
Thanks for your license statement.

I have added you to our wiki:
https://wiki.documentfoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.


> On 23 Nov 2016, at 19:04, Christina Acchione  wrote:
> 
> All of my past & future contributions to LibreOffice may be licensed under 
> the MPLv2/LGPLv3+ dual license.
> 
> Signed
> Christina Acchione
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

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

[Khaled Hosny]

 vcl/inc/CommonSalLayout.hxx  |2 -
 vcl/inc/unx/genpspgraphics.h |2 -
 vcl/source/gdi/CommonSalLayout.cxx   |7 +++
 vcl/unx/generic/print/genpspgraphics.cxx |   61 +++
 4 files changed, 64 insertions(+), 8 deletions(-)

New commits:
commit 04f89a0ed1da6bd671007b725bd49e740d0d
Author: Khaled Hosny 
Date:   Wed Nov 23 21:42:47 2016 +0200

Make PS on Unix printing use the new layout engine

I’d rather kill PS printing entirely, but this will do for now.

Change-Id: I112cc4855ab722ac07d31231f2a1ea8842b4159a
Reviewed-on: https://gerrit.libreoffice.org/31133
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit f337e95fb50c9edc10aca859aaf08baab5294d2e)
Reviewed-on: https://gerrit.libreoffice.org/31140
Tested-by: Khaled Hosny 

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 31b9dca..e5345d7 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -64,7 +64,6 @@ class CommonSalLayout : public GenericSalLayout
 public:
 #if defined(_WIN32)
 explicitCommonSalLayout(HDC, WinFontInstance&, const 
WinFontFace&);
-voidInitFont() const override { SelectObject(mhDC, 
mhFont); };
 const FontSelectPattern& getFontSelData() const { return mrFontSelData; };
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
@@ -74,6 +73,7 @@ public:
 const FreetypeFont& getFontData() const { return mrFreetypeFont; };
 #endif
 
+virtual voidInitFont() const override;
 voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
 voidAdjustLayout(ImplLayoutArgs&) override;
 boolLayoutText(ImplLayoutArgs&) override;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 1700267..792e44f 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -132,7 +132,7 @@ public:
 virtual boolGetGlyphBoundRect( sal_GlyphId, Rectangle& ) 
override;
 virtual boolGetGlyphOutline( sal_GlyphId, 
basegfx::B2DPolyPolygon& ) override;
 virtual SalLayout*  GetTextLayout( ImplLayoutArgs&, int nFallbackLevel 
) override;
-virtual voidDrawSalLayout( const CommonSalLayout& ) override 
{};
+virtual voidDrawSalLayout( const CommonSalLayout& ) override;
 virtual voidDrawServerFontLayout( const GenericSalLayout&, 
const FreetypeFont& ) override;
 virtual boolsupportsOperation( OutDevSupportType ) const 
override;
 virtual voiddrawPixel( long nX, long nY ) override;
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index cf6a53a..ea7093d 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -261,6 +261,13 @@ CommonSalLayout::CommonSalLayout(FreetypeFont& 
rFreetypeFont)
 }
 #endif
 
+void CommonSalLayout::InitFont() const
+{
+#if defined(_WIN32)
+SelectObject(mhDC, mhFont);
+#endif
+}
+
 struct SubRun
 {
 int32_t mnMin;
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx 
b/vcl/unx/generic/print/genpspgraphics.cxx
index 0a7c849..b64ca91 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -57,6 +57,7 @@
 #include "PhysicalFontFace.hxx"
 #include "salbmp.hxx"
 #include "salprn.hxx"
+#include "CommonSalLayout.hxx"
 
 #include 
 #if ENABLE_GRAPHITE
@@ -695,9 +696,45 @@ void PspServerFontLayout::InitFont() const
   mnOrientation, mbVertical, mbArtItalic, mbArtBold );
 }
 
+class PspCommonSalLayout : public CommonSalLayout
+{
+public:
+PspCommonSalLayout(psp::PrinterGfx&, FreetypeFont& rFont);
+
+virtual voidInitFont() const override;
+
+private:
+::psp::PrinterGfx&  mrPrinterGfx;
+sal_IntPtr  mnFontID;
+int mnFontHeight;
+int mnFontWidth;
+boolmbVertical;
+boolmbArtItalic;
+boolmbArtBold;
+};
+
+PspCommonSalLayout::PspCommonSalLayout(::psp::PrinterGfx& rGfx, FreetypeFont& 
rFont)
+:   CommonSalLayout(rFont)
+,   mrPrinterGfx(rGfx)
+{
+mnFontID = mrPrinterGfx.GetFontID();
+mnFontHeight = mrPrinterGfx.GetFontHeight();
+mnFontWidth  = mrPrinterGfx.GetFontWidth();
+mbVertical   = mrPrinterGfx.GetFontVertical();
+mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
+mbArtBold= mrPrinterGfx.GetArtificialBold();
+}
+
+void PspCommonSalLayout::InitFont() const
+{
+CommonSalLayout::InitFont();
+mrPrinterGfx.SetFont(mnFontID, mnFontHeight, mnFontWidth,
+ mnOrientation, mbVertical, mbArtItalic, mbArtBold);
+}
+
 static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& 
rGfx, bool bIsPsp

[Libreoffice-commits] core.git: 3 commits - basctl/source basic/source include/basic include/sfx2 sc/source sd/source sfx2/source starmath/source svx/source sw/source

[Noel Grandin]

 basctl/source/basicide/baside2.cxx|   16 
 basctl/source/basicide/baside2.hxx|2 -
 basctl/source/basicide/basides1.cxx   |4 +-
 basctl/source/basicide/iderdll.cxx|6 +--
 basctl/source/basicide/iderdll2.hxx   |2 -
 basctl/source/inc/basidesh.hxx|2 -
 basctl/source/inc/bastypes.hxx|5 +-
 basic/source/classes/sb.cxx   |   10 ++---
 basic/source/classes/sbxmod.cxx   |   20 +-
 basic/source/inc/runtime.hxx  |   68 +-
 basic/source/inc/sbintern.hxx |4 +-
 basic/source/runtime/runtime.cxx  |   30 ++-
 include/basic/sbdef.hxx   |   17 ++--
 include/basic/sbmeth.hxx  |8 ++--
 include/basic/sbstar.hxx  |   14 +++
 include/sfx2/new.hxx  |7 ++-
 include/sfx2/objface.hxx  |5 +-
 include/sfx2/shell.hxx|   23 ++-
 sc/source/ui/app/scmod.cxx|3 +
 sc/source/ui/drawfunc/chartsh.cxx |3 +
 sc/source/ui/drawfunc/drawsh.cxx  |3 +
 sc/source/ui/drawfunc/drformsh.cxx|3 +
 sc/source/ui/drawfunc/drtxtob.cxx |3 +
 sc/source/ui/drawfunc/graphsh.cxx |3 +
 sc/source/ui/drawfunc/mediash.cxx |2 -
 sc/source/ui/drawfunc/oleobjsh.cxx|3 +
 sc/source/ui/view/cellsh.cxx  |3 +
 sc/source/ui/view/formatsh.cxx|3 +
 sc/source/ui/view/prevwsh.cxx |3 +
 sc/source/ui/view/tabvwsh.cxx |3 +
 sd/source/ui/dlg/sdpreslt.cxx |2 -
 sd/source/ui/view/outlnvsh.cxx|4 +-
 sd/source/ui/view/presvish.cxx|8 ++--
 sfx2/source/appl/workwin.cxx  |   61 ++
 sfx2/source/control/dispatch.cxx  |   35 +
 sfx2/source/control/objface.cxx   |   51 ++---
 sfx2/source/doc/new.cxx   |   16 
 sfx2/source/inc/workwin.hxx   |   26 ++---
 sfx2/source/view/viewfrm.cxx  |4 +-
 starmath/source/view.cxx  |3 +
 svx/source/form/fmshell.cxx   |   12 +++---
 svx/source/toolbars/extrusionbar.cxx  |2 -
 svx/source/toolbars/fontworkbar.cxx   |2 -
 sw/source/ui/dbui/mmdocselectpage.cxx |2 -
 sw/source/uibase/app/apphdl.cxx   |3 +
 sw/source/uibase/app/docsh2.cxx   |2 -
 sw/source/uibase/shells/annotsh.cxx   |2 -
 sw/source/uibase/shells/beziersh.cxx  |2 -
 sw/source/uibase/shells/drawsh.cxx|2 -
 sw/source/uibase/shells/drformsh.cxx  |2 -
 sw/source/uibase/shells/drwtxtsh.cxx  |2 -
 sw/source/uibase/shells/frmsh.cxx |2 -
 sw/source/uibase/shells/grfsh.cxx |2 -
 sw/source/uibase/shells/listsh.cxx|2 -
 sw/source/uibase/shells/mediash.cxx   |2 -
 sw/source/uibase/shells/olesh.cxx |2 -
 sw/source/uibase/shells/tabsh.cxx |2 -
 sw/source/uibase/shells/textsh.cxx|2 -
 sw/source/uibase/uiview/pview.cxx |3 +
 sw/source/uibase/uiview/srcview.cxx   |3 +
 sw/source/uibase/uiview/view0.cxx |2 -
 sw/source/uibase/web/wformsh.cxx  |2 -
 sw/source/uibase/web/wfrmsh.cxx   |2 -
 sw/source/uibase/web/wgrfsh.cxx   |2 -
 sw/source/uibase/web/wlistsh.cxx  |2 -
 sw/source/uibase/web/wolesh.cxx   |2 -
 sw/source/uibase/web/wtabsh.cxx   |2 -
 sw/source/uibase/web/wtextsh.cxx  |2 -
 sw/source/uibase/web/wview.cxx|2 -
 69 files changed, 299 insertions(+), 260 deletions(-)

New commits:
commit 5af0071d42e5962ed849261134ef0630c7ec3b45
Author: Noel Grandin 
Date:   Wed Nov 23 15:42:47 2016 +0200

convert SFX_VISIBILITY constants to scoped enum

* split the position and the flags information
* remove unused DESKTOP constant

Change-Id: Ibfccb44c7567e89d4527bfd36b3915a73682e6e2

diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index ac93da6..3805d2f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -64,13 +64,14 @@ public:
 
 const SfxInterface* GetGenoType() const { return pGenoType; }
 
-voidRegisterObjectBar(sal_uInt16, sal_uInt32 nResId);
-voidRegisterObjectBar(sal_uInt16, sal_uInt32 nResId, 
SfxShellFeature nFeature);
+voidRegisterObjectBar(sal_uInt16, SfxVisibilityFlags 
nFlags, sal_uInt32 nResId);
+voidRegisterObjectBar(sal_uInt16, SfxVisibilityFlags 
nFlags, sal_uInt32 nResId, SfxShellFeature nFeature);
 voidRegisterChildWindow(sal_uInt16, bool bContext = 
false);
 voidRegisterChildWindow(sal_uInt16, bool bContext, 
SfxShellFeature nFeature);
 voidRegisterStatusBar(sal_uInt32 nResId);
 sal_uInt32  GetObjectBarId(sal_uInt16 nNo) const;
 sal_uInt16  GetObjectBarPos( sal_uInt16 nNo ) const;
+SfxVisibilityFlag

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.

3 new defect(s) introduced to LibreOffice found with Coverity Scan.


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


** CID 1394670:  Uninitialized members  (UNINIT_CTOR)
/sc/qa/unit/range.cxx: 75 in ScRangeTest::ScRangeTest()()



*** CID 1394670:  Uninitialized members  (UNINIT_CTOR)
/sc/qa/unit/range.cxx: 75 in ScRangeTest::ScRangeTest()()
69 CPPUNIT_TEST(testRangeParsing);
70 CPPUNIT_TEST_SUITE_END();
71 
72 void testRangeParsing();
73 
74 private:
>>> CID 1394670:  Uninitialized members  (UNINIT_CTOR)
>>> The compiler-generated constructor for this class does not initialize 
>>> "m_pDoc".
75 ScDocument *m_pDoc;
76 ScDocShellRef m_xDocShRef;
77 };
78 
79 void ScRangeTest::testRangeParsing()
80 {

** CID 1394669:  Uninitialized members  (UNINIT_CTOR)
/sc/qa/unit/range.cxx: 32 in ScAddressTest::ScAddressTest()()



*** CID 1394669:  Uninitialized members  (UNINIT_CTOR)
/sc/qa/unit/range.cxx: 32 in ScAddressTest::ScAddressTest()()
26 CPPUNIT_TEST(testAddressParsing);
27 CPPUNIT_TEST_SUITE_END();
28 
29 void testAddressParsing();
30 
31 private:
>>> CID 1394669:  Uninitialized members  (UNINIT_CTOR)
>>> The compiler-generated constructor for this class does not initialize 
>>> "m_pDoc".
32 ScDocument *m_pDoc;
33 ScDocShellRef m_xDocShRef;
34 };
35 
36 void ScAddressTest::testAddressParsing()
37 {

** CID 1394668:(MIXED_ENUMS)
/sc/source/core/tool/interpr1.cxx: 6771 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6769 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6770 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6775 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6773 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6776 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6774 in ScInterpreter::ScAggregate()()
/sc/source/core/tool/interpr1.cxx: 6772 in ScInterpreter::ScAggregate()()



*** CID 1394668:(MIXED_ENUMS)
/sc/source/core/tool/interpr1.cxx: 6771 in ScInterpreter::ScAggregate()()
6765 case SUBTOTAL_FUNC_STDP : ScStDevP();  break;
6766 case SUBTOTAL_FUNC_SUM  : ScSum(); break;
6767 case SUBTOTAL_FUNC_VAR  : ScVar(); break;
6768 case SUBTOTAL_FUNC_VARP : ScVarP();break;
6769 case AGGREGATE_FUNC_MEDIAN  : ScMedian();
break;
6770 case AGGREGATE_FUNC_MODSNGL : ScModalValue();
break;
>>> CID 1394668:(MIXED_ENUMS)
>>> But this case, "AGGREGATE_FUNC_LARGE", is of different type 
>>> "ScAggregateFunc".
6771 case AGGREGATE_FUNC_LARGE   : ScLarge(); 
break;
6772 case AGGREGATE_FUNC_SMALL   : ScSmall(); 
break;
6773 case AGGREGATE_FUNC_PERCINC : ScPercentile( true );  
break;
6774 case AGGREGATE_FUNC_QRTINC  : ScQuartile( true );
break;
6775 case AGGREGATE_FUNC_PERCEXC : ScPercentile( false ); 
break;
6776 case AGGREGATE_FUNC_QRTEXC  : ScQuartile( false );   
break;
/sc/source/core/tool/interpr1.cxx: 6769 in ScInterpreter::ScAggregate()()
6763 case SUBTOTAL_FUNC_PROD : ScProduct(); break;
6764 case SUBTOTAL_FUNC_STD  : ScStDev();   break;
6765 case SUBTOTAL_FUNC_STDP : ScStDevP();  break;
6766 case SUBTOTAL_FUNC_SUM  : ScSum(); break;
6767 case SUBTOTAL_FUNC_VAR  : ScVar(); break;
6768 case SUBTOTAL_FUNC_VARP : ScVarP();break;
>>> CID 1394668:(MIXED_ENUMS)
>>> But this case, "AGGREGATE_FUNC_MEDIAN", is of different type 
>>> "ScAggregateFunc".
6769 case AGGREGATE_FUNC_MEDIAN  : ScMedian();
break;
6770 case AGGREGATE_FUNC_MODSNGL : ScModalValue();
break;
6771 case AGGREGATE_FUNC_LARGE   : ScLarge(); 
break;
6772 case AGGREGATE_FUNC_SMALL   : ScSmall(); 
break;
6773 case AGGREGATE_FUNC_PERCINC : ScPercentile( true );  
break;
6774 case AGGREGATE_FUNC_QRTINC  : ScQuartile( true );
break;
/sc/source/core/tool/interpr1.cxx: 6770 in ScInterpreter::ScAgg

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

[Jochen Nitschke]

 tools/source/inet/inetmime.cxx |   49 +
 1 file changed, 16 insertions(+), 33 deletions(-)

New commits:
commit b367c81d06f64e500063ebb814eda5e8d55309ca
Author: Jochen Nitschke 
Date:   Wed Nov 23 19:49:21 2016 +0100

replace custom list with std::forward_list

cppcheck warns with publicAllocationError in
INetMIMECharsetList_Impl::prepend(...)
> { m_pFirst = new Node(rCharset, m_pFirst); }<--- Possible leak
> in public function. The pointer 'm_pFirst' is not deallocated before
> it is allocated.

We got a single linked list here which is correctly deallocated
in dtor.

But with C++11 std::forward_list there is no reason to implement or own
list.

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

diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 34fb6aa..05ae7cb 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 
@@ -429,20 +430,19 @@ class INetMIMECharsetList_Impl
 {
 Charset m_aCharset;
 bool m_bDisabled;
-Node * m_pNext;
 
-inline Node(const Charset & rTheCharset, Node * pTheNext);
+explicit Node(const Charset & rCharset)
+:m_aCharset(rCharset), m_bDisabled(false)
+{}
 };
 
-Node * m_pFirst;
+std::forward_list m_aList;
 
 public:
-INetMIMECharsetList_Impl(): m_pFirst(nullptr) {}
-
-~INetMIMECharsetList_Impl();
-
 void prepend(const Charset & rCharset)
-{ m_pFirst = new Node(rCharset, m_pFirst); }
+{
+m_aList.emplace_front(rCharset);
+}
 
 void includes(sal_uInt32 nChar);
 
@@ -452,13 +452,6 @@ public:
 void reset();
 };
 
-inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset,
-Node * pTheNext):
-m_aCharset(rTheCharset),
-m_bDisabled(false),
-m_pNext(pTheNext)
-{}
-
 struct Parameter
 {
 Parameter * m_pNext;
@@ -539,36 +532,26 @@ void appendISO88591(OUString & rText, sal_Char const * 
pBegin,
 
 //  INetMIMECharsetList_Impl
 
-INetMIMECharsetList_Impl::~INetMIMECharsetList_Impl()
-{
-while (m_pFirst)
-{
-Node * pRemove = m_pFirst;
-m_pFirst = m_pFirst->m_pNext;
-delete pRemove;
-}
-}
-
 void INetMIMECharsetList_Impl::includes(sal_uInt32 nChar)
 {
-for (Node * p = m_pFirst; p; p = p->m_pNext)
-if (!(p->m_bDisabled || p->m_aCharset.contains(nChar)))
-p->m_bDisabled = true;
+for (Node& rNode : m_aList)
+if (!(rNode.m_bDisabled || rNode.m_aCharset.contains(nChar)))
+rNode.m_bDisabled = true;
 }
 
 rtl_TextEncoding 
INetMIMECharsetList_Impl::getPreferredEncoding(rtl_TextEncoding eDefault)
 const
 {
-for (Node * p = m_pFirst; p; p = p->m_pNext)
-if (!p->m_bDisabled)
-return p->m_aCharset.getEncoding();
+for (const Node& rNode : m_aList)
+if (!rNode.m_bDisabled)
+return rNode.m_aCharset.getEncoding();
 return eDefault;
 }
 
 void INetMIMECharsetList_Impl::reset()
 {
-for (Node * p = m_pFirst; p; p = p->m_pNext)
-p->m_bDisabled = false;
+for (Node& rNode : m_aList)
+rNode.m_bDisabled = false;
 }
 
 //  ParameterList
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/source/filter/xml/XMLDetectiveContext.hxx |1 
 sc/source/filter/xml/XMLExportIterator.cxx   |  102 +++
 sc/source/filter/xml/XMLExportIterator.hxx   |   12 ---
 sc/source/filter/xml/xmlexprt.cxx|   12 +--
 4 files changed, 37 insertions(+), 90 deletions(-)

New commits:
commit 50106435e9a5bbc067e9beeabc5147ed9f305286
Author: Bartosz Kosiorek 
Date:   Thu Nov 24 00:02:45 2016 +0100

tdf#48140 Change types of variables and remove uneeded code

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

diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx 
b/sc/source/filter/xml/XMLDetectiveContext.hxx
index fc98754..22ddc9b 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_FILTER_XML_XMLDETECTIVECONTEXT_HXX
 
 #include 
-#include 
 #include "detfunc.hxx"
 #include "detdata.hxx"
 #include "xmlimprt.hxx"
diff --git a/sc/source/filter/xml/XMLExportIterator.cxx 
b/sc/source/filter/xml/XMLExportIterator.cxx
index b0660c9..b680dd9 100644
--- a/sc/source/filter/xml/XMLExportIterator.cxx
+++ b/sc/source/filter/xml/XMLExportIterator.cxx
@@ -50,14 +50,9 @@ void ScMyIteratorBase::UpdateAddress( ScAddress& 
rCellAddress )
 }
 }
 
-bool ScMyShape::operator<(const ScMyShape& aShape) const
+inline bool ScMyShape::operator<(const ScMyShape& aShape) const
 {
-if( aAddress.Tab() != aShape.aAddress.Tab() )
-return ( aAddress.Tab() < aShape.aAddress.Tab() );
-else if( aAddress.Row() != aShape.aAddress.Row() )
-return ( aAddress.Row() < aShape.aAddress.Row( ));
-else
-return ( aAddress.Col() < aShape.aAddress.Col() );
+return ( aAddress < aShape.aAddress );
 }
 
 ScMyShapesContainer::ScMyShapesContainer()
@@ -76,7 +71,7 @@ void ScMyShapesContainer::AddNewShape( const ScMyShape& 
aShape )
 
 bool ScMyShapesContainer::GetFirstAddress( ScAddress& rCellAddress )
 {
-sal_Int32 nTable( rCellAddress.Tab() );
+SCTAB nTable( rCellAddress.Tab() );
 if( !aShapeList.empty() )
 {
 rCellAddress = aShapeList.begin()->aAddress;
@@ -111,14 +106,9 @@ void ScMyShapesContainer::Sort()
 aShapeList.sort();
 }
 
-bool ScMyNoteShape::operator<(const ScMyNoteShape& aNote) const
+inline bool ScMyNoteShape::operator<(const ScMyNoteShape& aNote) const
 {
-if( aPos.Tab() != aNote.aPos.Tab() )
-return ( aPos.Tab() < aNote.aPos.Tab() );
-else if( aPos.Row() != aNote.aPos.Row() )
-return ( aPos.Row() < aNote.aPos.Row() );
-else
-return ( aPos.Col() < aNote.aPos.Col() );
+return ( aPos < aNote.aPos );
 }
 
 ScMyNoteShapesContainer::ScMyNoteShapesContainer()
@@ -137,7 +127,7 @@ void ScMyNoteShapesContainer::AddNewNote( const 
ScMyNoteShape& aNote )
 
 bool ScMyNoteShapesContainer::GetFirstAddress( ScAddress& rCellAddress )
 {
-sal_Int16 nTable = rCellAddress.Tab();
+SCTAB nTable = rCellAddress.Tab();
 if( !aNoteShapeList.empty() )
 {
 rCellAddress = aNoteShapeList.begin()->aPos;
@@ -167,14 +157,9 @@ void ScMyNoteShapesContainer::Sort()
 aNoteShapeList.sort();
 }
 
-bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const
+inline bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const
 {
-if( aCellRange.aStart.Tab() != aRange.aCellRange.aStart.Tab() )
-return ( aCellRange.aStart.Tab() < aRange.aCellRange.aStart.Tab() );
-else if( aCellRange.aStart.Row() != aRange.aCellRange.aStart.Row() )
-return ( aCellRange.aStart.Row() < aRange.aCellRange.aStart.Row() );
-else
-return ( aCellRange.aStart.Col() < aRange.aCellRange.aStart.Col() );
+return ( aCellRange.aStart < aRange.aCellRange.aStart );
 }
 
 ScMyMergedRangesContainer::ScMyMergedRangesContainer()
@@ -188,8 +173,8 @@ ScMyMergedRangesContainer::~ScMyMergedRangesContainer()
 
 void ScMyMergedRangesContainer::AddRange(const ScRange& rMergedRange)
 {
-sal_Int32 nStartRow( rMergedRange.aStart.Row() );
-sal_Int32 nEndRow( rMergedRange.aEnd.Row() );
+SCROW nStartRow( rMergedRange.aStart.Row() );
+SCROW nEndRow( rMergedRange.aEnd.Row() );
 
 ScMyMergedRange aRange;
 aRange.bIsFirst = true;
@@ -202,7 +187,7 @@ void ScMyMergedRangesContainer::AddRange(const ScRange& 
rMergedRange)
 
 aRange.bIsFirst = false;
 aRange.nRows = 0;
-for( sal_Int32 nRow = nStartRow + 1; nRow <= nEndRow; ++nRow )
+for( SCROW nRow = nStartRow + 1; nRow <= nEndRow; ++nRow )
 {
 aRange.aCellRange.aStart.SetRow( nRow );
 aRange.aCellRange.aEnd.SetRow( nRow );
@@ -212,7 +197,7 @@ void ScMyMergedRangesContainer::AddRange(const ScRange& 
rMergedRange)
 
 bool ScMyMergedRangesContainer::GetFirstAddress( ScAddress& rCellAddress )
 {
-sal_Int32 nTable( rCellAddress.Tab() );
+SCTAB nTable( rCellAddress.Tab() );
 if( !aRa

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

[Jochen Nitschke]

 sd/source/filter/eppt/pptx-epptooxml.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit adeb91e69de33f09b154ccd7f5cdc0ac6c2cfb0c
Author: Jochen Nitschke 
Date:   Wed Nov 23 21:07:22 2016 +0100

don't use memset on std::vector

cppcheck warns:
>memset( mLayoutInfo, 0, sizeof(mLayoutInfo) );<--- Using 'memset'
> on struct that contains a 'std::vector'. [-]
mLayoutInfo is an array of LayoutInfo,
the struct LayoutInfo holds only a std::vector.

remove the memset, as non-POD type LayoutInfo is default initialized.

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

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 8069c7a..e88be43 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -319,7 +319,6 @@ PowerPointExport::PowerPointExport( const Reference< 
XComponentContext > & rxCtx
 , mnAnimationNodeIdMax(1)
 , mbCreateNotes(false)
 {
-memset( mLayoutInfo, 0, sizeof(mLayoutInfo) );
 }
 
 PowerPointExport::~PowerPointExport()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Community communication

[Tommy]

Tor Lillqvist wrote:


I would like to advise to create a group to make easier our
communication, something like slack or a telegram group.

Facebook?

Oh, I forgot, nobody has ever heard of that.

--tml





@Tor
somebody should collect these pearls and make an e-book out of them...
:-)


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

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

[Kohei Yoshida]

 sc/source/ui/app/inputhdl.cxx |  256 +-
 sc/source/ui/inc/inputhdl.hxx |3 
 2 files changed, 131 insertions(+), 128 deletions(-)

New commits:
commit c3433b87985486bfe5352fda381bb9683d82b1a5
Author: Kohei Yoshida 
Date:   Wed Nov 23 20:31:50 2016 -0500

Use std::unique_ptr for the edit engine member of ScInputHandler.

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

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e0712c4..1264eb9 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "inputwin.hxx"
 #include "tabvwsh.hxx"
@@ -371,17 +372,17 @@ handle_r1c1:
 
 if (!nCount)
 {
-pEngine->SetUpdateMode( false );
+mpEditEngine->SetUpdateMode( false );
 pRangeFindList = new ScRangeFindList( pDocSh->GetTitle() );
 }
 
 ColorData nColorData = pRangeFindList->Insert( 
ScRangeFindData( aRange, nFlags, nStart, nPos ) );
 
 ESelection aSel( 0, nStart, 0, nPos );
-SfxItemSet aSet( pEngine->GetEmptyItemSet() );
+SfxItemSet aSet( mpEditEngine->GetEmptyItemSet() );
 aSet.Put( SvxColorItem( Color( nColorData ),
 EE_CHAR_COLOR ) );
-pEngine->QuickSetAttribs( aSet, aSel );
+mpEditEngine->QuickSetAttribs( aSet, aSel );
 ++nCount;
 }
 }
@@ -391,7 +392,7 @@ handle_r1c1:
 
 if (nCount)
 {
-pEngine->SetUpdateMode( true );
+mpEditEngine->SetUpdateMode( true );
 
 pDocSh->Broadcast( SfxHint( SC_HINT_SHOWRANGEFINDER ) );
 }
@@ -440,14 +441,14 @@ void ScInputHandler::UpdateRange( sal_uInt16 nIndex, 
const ScRange& rNew )
 const ScAddress::Details aAddrDetails( pDoc, aCursorPos );
 OUString aNewStr(aJustified.Format(rData.nFlags, pDoc, aAddrDetails));
 ESelection aOldSel( 0, nOldStart, 0, nOldEnd );
-SfxItemSet aSet( pEngine->GetEmptyItemSet() );
+SfxItemSet aSet( mpEditEngine->GetEmptyItemSet() );
 
 DataChanging();
 
 lcl_Replace( pTopView, aNewStr, aOldSel );
 lcl_Replace( pTableView, aNewStr, aOldSel );
 aSet.Put( SvxColorItem( Color( nNewColor ), EE_CHAR_COLOR ) );
-pEngine->QuickSetAttribs( aSet, aOldSel );
+mpEditEngine->QuickSetAttribs( aSet, aOldSel );
 
 bInRangeUpdate = true;
 DataChanged();
@@ -598,7 +599,7 @@ static sal_Int32 lcl_MatchParenthesis( const OUString& 
rStr, sal_Int32 nPos )
 
 ScInputHandler::ScInputHandler()
 :   pInputWin( nullptr ),
-pEngine( nullptr ),
+mpEditEngine( nullptr ),
 pTableView( nullptr ),
 pTopView( nullptr ),
 pColumnData( nullptr ),
@@ -661,7 +662,7 @@ ScInputHandler::~ScInputHandler()
 
 delete pRangeFindList; pRangeFindList = nullptr;
 delete pEditDefaults;  pEditDefaults = nullptr;
-delete pEngine;pEngine = nullptr;
+mpEditEngine.reset();
 delete pLastState; pLastState = nullptr;
 delete pDelayTimer;pDelayTimer = nullptr;
 delete pColumnData;pColumnData = nullptr;
@@ -675,68 +676,69 @@ void ScInputHandler::SetRefScale( const Fraction& rX, 
const Fraction& rY )
 {
 aScaleX = rX;
 aScaleY = rY;
-if (pEngine)
+if (mpEditEngine)
 {
 MapMode aMode( MapUnit::Map100thMM, Point(), aScaleX, aScaleY );
-pEngine->SetRefMapMode( aMode );
+mpEditEngine->SetRefMapMode( aMode );
 }
 }
 }
 
 void ScInputHandler::UpdateRefDevice()
 {
-if (!pEngine)
+if (!mpEditEngine)
 return;
 
 bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg();
 bool bInPlace = pActiveViewSh && 
pActiveViewSh->GetViewFrame()->GetFrame().IsInPlace();
-EEControlBits nCtrl = pEngine->GetControlWord();
+EEControlBits nCtrl = mpEditEngine->GetControlWord();
 if ( bTextWysiwyg || bInPlace )
 nCtrl |= EEControlBits::FORMAT100;// EditEngine default: always 
format for 100%
 else
 nCtrl &= ~EEControlBits::FORMAT100;   // when formatting for screen, 
use the actual MapMode
-pEngine->SetControlWord( nCtrl );
+mpEditEngine->SetControlWord( nCtrl );
 if ( bTextWysiwyg && pActiveViewSh )
-pEngine->SetRefDevice( 
pActiveViewSh->GetViewData().GetDocument()->GetPrinter() );
+mpEditEngine->SetRefDevice( 
pActiveViewSh->GetViewData().GetDocument()->GetPrinter() );
 else
-pEngine->SetRefDevice( nullptr );
+mpEditEngine->SetRefDevice( nullptr );
 
 MapMode aMode( MapUnit::Map100thMM, Point(), aScaleX, aScaleY );
-

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

[Kohei Yoshida]

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

New commits:
commit d33a81c24ec0b4a05eb0b69fa85c5fd7eb8ec5a7
Author: Kohei Yoshida 
Date:   Wed Nov 23 17:30:46 2016 -0500

Reduce the indirection count...

... by getting the input handler instance directly from the view
shell that owns it.

Change-Id: I3b6e74285f64457d694db05d591461b291fa34c5

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d290deb..902c1f7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1107,7 +1107,9 @@ void ScTextWnd::StartEditEngine()
 InitEditEngine();
 }
 
-SC_MOD()->SetInputMode( SC_INPUT_TOP );
+ScInputHandler* pHdl = mpViewShell->GetInputHandler();
+if (pHdl)
+pHdl->SetMode(SC_INPUT_TOP);
 
 SfxViewFrame* pViewFrm = SfxViewFrame::Current();
 if (pViewFrm)
@@ -1557,8 +1559,10 @@ void ScTextWnd::StopEditEngine( bool bAll )
 mpEditView.reset();
 mpEditEngine.reset();
 
-if ( pScMod->IsEditMode() && !bAll )
-pScMod->SetInputMode(SC_INPUT_TABLE);
+ScInputHandler* pHdl = mpViewShell->GetInputHandler();
+
+if (pHdl && pHdl->IsEditMode() && !bAll)
+pHdl->SetMode(SC_INPUT_TABLE);
 
 SfxViewFrame* pViewFrm = SfxViewFrame::Current();
 if (pViewFrm)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/source/ui/inc/tabvwsh.hxx   |5 +++--
 sc/source/ui/view/tabvwsh4.cxx |   15 ---
 sc/source/ui/view/tabvwsha.cxx |6 +++---
 3 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 7fe08af6b1c579dc12da836b6bcfa2f84734328a
Author: Kohei Yoshida 
Date:   Wed Nov 23 16:59:23 2016 -0500

Use std::unique_ptr for the input handler instance here.

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

diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 5b4dc42..4ec942b 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -115,7 +115,7 @@ private:
 
 FmFormShell*pFormShell;
 
-ScInputHandler* pInputHandler;  // for OLE input cell
+std::unique_ptr mpInputHandler;  // for OLE 
input cell
 
 ::editeng::SvxBorderLine*   pCurFrameLine;
 
@@ -236,7 +236,8 @@ public:
 boolIsRefInputMode() const;
 voidExecuteInputDirect();
 
-ScInputHandler* GetInputHandler() const { return pInputHandler;}
+const ScInputHandler* GetInputHandler() const { return 
mpInputHandler.get(); }
+ScInputHandler* GetInputHandler() { return mpInputHandler.get(); }
 voidUpdateInputHandler( bool bForce = false, bool bStopEditing 
= true );
 voidUpdateInputHandlerCellAdjust( SvxCellHorJustify eJust );
 boolTabKeyInput(const KeyEvent& rKEvt);
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index f3b4666..edf2953 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "tabvwsh.hxx"
 #include "sc.hrc"
@@ -126,7 +127,7 @@ void ScTabViewShell::Activate(bool bMDI)
 // RegisterNewTargetNames does not exist anymore
 
 SfxViewFrame* pThisFrame  = GetViewFrame();
-if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) 
)
+if ( mpInputHandler && 
pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) )
 {
 // actually only required for Reload (last version):
 // The InputWindow remains, but the View along with the 
InputHandler is newly created,
@@ -151,7 +152,7 @@ void ScTabViewShell::Activate(bool bMDI)
 pSh = SfxViewShell::GetNext( *pSh, true, 
checkSfxViewShell );
 }
 
-pWin->SetInputHandler( pInputHandler );
+pWin->SetInputHandler( mpInputHandler.get() );
 }
 }
 }
@@ -1502,7 +1503,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode 
)
 // As an intermediate solution each View gets its own InputHandler,
 // which only yields problems if two Views are in one task window.
 
-pInputHandler = new ScInputHandler;
+mpInputHandler = o3tl::make_unique();
 
 // old version:
 //  if ( !GetViewFrame()->ISA(SfxTopViewFrame) )// OLE or Plug-In
@@ -1655,7 +1656,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
 pExtrusionBarShell(nullptr),
 pFontworkBarShell(nullptr),
 pFormShell(nullptr),
-pInputHandler(nullptr),
+mpInputHandler(nullptr),
 pCurFrameLine(nullptr),
 aTarget(this),
 pDialogDPObject(nullptr),
@@ -1765,8 +1766,8 @@ ScTabViewShell::~ScTabViewShell()
 
 // all to NULL, in case the TabView-dtor tries to access them
 //! (should not really! ??!?!)
-if (pInputHandler)
-pInputHandler->SetDocumentDisposing(true);
+if (mpInputHandler)
+mpInputHandler->SetDocumentDisposing(true);
 
 DELETEZ(pFontworkBarShell);
 DELETEZ(pExtrusionBarShell);
@@ -1783,7 +1784,7 @@ ScTabViewShell::~ScTabViewShell()
 DELETEZ(pPivotShell);
 DELETEZ(pAuditingShell);
 DELETEZ(pCurFrameLine);
-DELETEZ(pInputHandler);
+mpInputHandler.reset();
 DELETEZ(pPivotSource);
 DELETEZ(pDialogDPObject);
 DELETEZ(pNavSettings);
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index e9055fd..a567210 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -617,7 +617,7 @@ void ScTabViewShell::ExecuteInputDirect()
 
 void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool 
bStopEditing /* = sal_True */ )
 {
-ScInputHandler* pHdl = pInputHandler ? pInputHandler : 
SC_MOD()->GetInputHdl();
+ScInputHandler* pHdl = mpInputHandler ? mpInputHandler.get() : 
SC_MOD()->GetInputHdl();
 
 if ( pHdl )
 {
@@ -694,7 +694,7 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = 
sal_False */, bool bSt
 
 //  if using the view's local input handler, this view can always be 
set
 //  as current view inside NotifyChange.
-ScTabViewShell* pSourceSh = pInputHandler ? thi

Re: tdf#100826: replacing command-line help dialog with console under Windows

[Tor Lillqvist]

> I think what Eike suggests is to use guistdio.exe (perhaps rename it
> appropriately, to something like soffice.com), and use _that_ when
> calling soffice from the command line.
>

If I recall correctly from when I a long time ago had a look, Windows
nowadays (well, since XP at least) has APIs that make whatever tricks it
was that the guistdio program had to do as a separate process unnecessary.
It is more than enough to have soffice.exe and soffice.bin. (Could we at
some stage please rename soffice.bin to something with a normal .exe file
name extension? That would be no API break, would it?)

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

Re: tdf#100826: replacing command-line help dialog with console under Windows

[Thorsten Behrens]

Kaganski Mike wrote:
> Unfortunately, the solution in the guistdio.inc is to make the
> application a console application (having SUBSYSTEM=CONSOLE [1]) by
> providing main instead of WinMain. This has the drawback of flashing
> console that is always created by OS when launching such programs,
> as I explained in the first message...
> 
I think what Eike suggests is to use guistdio.exe (perhaps rename it
appropriately, to something like soffice.com), and use _that_ when
calling soffice from the command line.

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: vcl/headless vcl/inc vcl/unx

[Caolán McNamara]

 vcl/headless/svpgdi.cxx   |   11 ++
 vcl/headless/svpinst.cxx  |2 -
 vcl/headless/svpvd.cxx|   31 +++---
 vcl/inc/headless/svpgdi.hxx   |2 +
 vcl/inc/headless/svpvd.hxx|4 ++-
 vcl/inc/unx/gtk/gtkdata.hxx   |2 +
 vcl/unx/gtk/gtkdata.cxx   |1 
 vcl/unx/gtk/gtkinst.cxx   |6 +++--
 vcl/unx/gtk3/gtk3gtkdata.cxx  |2 +
 vcl/unx/gtk3/gtk3gtkframe.cxx |9 
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |2 -
 11 files changed, 44 insertions(+), 28 deletions(-)

New commits:
commit d9a6e0023c9a192850b9db00f8120fbcc4256ec9
Author: Caolán McNamara 
Date:   Tue Nov 22 15:35:16 2016 +

Resolves: tdf#99508 ensure sufficient size for hidpi backing surface

and match virtual device scale with widget device scale

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 1f861e7..46d8a8a 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -374,6 +374,7 @@ bool SvpSalGraphics::drawAlphaRect(long nX, long nY, long 
nWidth, long nHeight,
 
 SvpSalGraphics::SvpSalGraphics()
 : m_pSurface(nullptr)
+, m_fScale(1.0)
 , m_aLineColor(MAKE_SALCOLOR(0x00, 0x00, 0x00))
 , m_aFillColor(MAKE_SALCOLOR(0xFF, 0xFF, 0XFF))
 , m_ePaintMode(OVERPAINT)
@@ -388,6 +389,7 @@ SvpSalGraphics::~SvpSalGraphics()
 void SvpSalGraphics::setSurface(cairo_surface_t* pSurface)
 {
 m_pSurface = pSurface;
+cairo_surface_get_device_scale(pSurface, &m_fScale, nullptr);
 ResetClipRegion();
 }
 
@@ -981,14 +983,15 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
 #if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 12, 0)
 pCopy = cairo_surface_create_similar(source,
 
cairo_surface_get_content(m_pSurface),
-aTR.mnSrcWidth,
-aTR.mnSrcHeight);
+aTR.mnSrcWidth * m_fScale,
+aTR.mnSrcHeight * m_fScale);
 #else
 pCopy = cairo_surface_create_similar_image(source,
 
cairo_image_surface_get_format(m_pSurface),
-aTR.mnSrcWidth,
-aTR.mnSrcHeight);
+aTR.mnSrcWidth * m_fScale,
+aTR.mnSrcHeight * m_fScale);
 #endif
+cairo_surface_set_device_scale(pCopy, m_fScale, m_fScale);
 
 cairo_t* cr = cairo_create(pCopy);
 cairo_set_source_surface(cr, source, -aTR.mnSrcX, -aTR.mnSrcY);
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 53072d6..39ad727 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -281,7 +281,7 @@ SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( 
SalGraphics* /* pGraphics
DeviceFormat eFormat,
const 
SystemGraphicsData* /* pData */ )
 {
-SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice(eFormat);
+SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice(eFormat, 1);
 pNew->SetSize( nDX, nDY );
 return pNew;
 }
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index f356d7d..f0d31f8 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -57,14 +57,16 @@ bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY 
)
 bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
 sal_uInt8 *const pBuffer)
 {
-B2IVector aDevSize( nNewDX, nNewDY );
-if( aDevSize.getX() == 0 )
-aDevSize.setX( 1 );
-if( aDevSize.getY() == 0 )
-aDevSize.setY( 1 );
-
-if (!m_pSurface || cairo_image_surface_get_width(m_pSurface) != 
aDevSize.getX() ||
-   cairo_image_surface_get_height(m_pSurface) != 
aDevSize.getY() )
+if (nNewDX == 0)
+nNewDX = 1;
+if (nNewDY == 0)
+nNewDY = 1;
+
+nNewDX *= m_fScale;
+nNewDY *= m_fScale;
+
+if (!m_pSurface || cairo_image_surface_get_width(m_pSurface) != nNewDX ||
+   cairo_image_surface_get_height(m_pSurface) != nNewDY )
 {
 if (m_pSurface)
 {
@@ -74,22 +76,21 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, 
long nNewDY,
 if (m_eFormat == DeviceFormat::BITMASK)
 {
 m_pSurface = cairo_image_surface_create(CAIRO_FORMAT_A1,
-aDevSize.getX(),
-aDevSize.getY(

Re: Community communication

[Beatriz Fonseca]

Thank you for the answer. I've joined to the channel :)

2016-11-23 17:08 GMT-02:00 Italo Vignoli :

> The Telegram group is not supposed to cover technical communications or
> development related issues. For these topics, we have enough tools in
> our (TDF) infrastructure.
>
> On 23/11/2016 19:57, Necdet Yücel wrote:
>
> > https://telegram.me/libreoffice
>
> --
> Italo Vignoli - it...@italovignoli.com
> mobile/signal +39.348.5653829 - skype italovignoli
> hangout/jabber italo.vign...@gmail.com
> GPG Key ID - 0xAAB8D5C0
> DB75 1534 3FD0 EA5F 56B5 FDA6 DE82 934C AAB8 D5C0
>



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

[Libreoffice-commits] core.git: 4 commits - binaryurp/source bridges/source desktop/qa desktop/source helpcompiler/source include/o3tl oox/source ucb/source vcl/unx

[Stephan Bergmann]

 binaryurp/source/incomingrequest.cxx |7 -
 binaryurp/source/proxy.cxx   |6 -
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |   19 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx|   18 
 desktop/qa/desktop_app/test_desktop_app.cxx  |2 
 desktop/qa/desktop_lib/test_desktop_lib.cxx  |4 
 desktop/source/app/app.cxx   |3 
 desktop/source/app/cmdlineargs.cxx   |2 
 desktop/source/app/officeipcthread.cxx   |2 
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx   |9 --
 desktop/source/deployment/gui/dp_gui_service.cxx |7 -
 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |5 -
 desktop/source/deployment/manager/dp_informationprovider.cxx |7 -
 desktop/source/deployment/manager/dp_managerfac.cxx  |7 -
 desktop/source/deployment/misc/dp_descriptioninfoset.cxx |9 --
 helpcompiler/source/HelpIndexer.cxx  |3 
 include/o3tl/runtimetooustring.hxx   |   48 +++
 oox/source/drawingml/chart/plotareaconverter.cxx |5 -
 oox/source/drawingml/diagram/layoutnodecontext.cxx   |4 
 oox/source/ole/olestorage.cxx|5 -
 oox/source/ppt/customshowlistcontext.cxx |6 -
 oox/source/ppt/timenodelistcontext.cxx   |   27 --
 ucb/source/sorter/sortresult.cxx |5 -
 ucb/source/ucp/cmis/cmis_content.cxx |   15 +--
 ucb/source/ucp/expand/ucpexpand.cxx  |7 -
 ucb/source/ucp/file/prov.cxx |8 -
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |8 -
 vcl/unx/gtk3/gtk3gtkframe.cxx|3 
 28 files changed, 76 insertions(+), 175 deletions(-)

New commits:
commit d689ad29c28ad7f077c2239a8fa4c2b6307a6aa1
Author: Stephan Bergmann 
Date:   Wed Nov 23 23:10:29 2016 +0100

New o3tl::runtimeToOUString to convert from C++ runtime NTBS to OUString

Change-Id: I613bb70b6828f615fd45af38b2d873ece55ace60

diff --git a/binaryurp/source/incomingrequest.cxx 
b/binaryurp/source/incomingrequest.cxx
index cf66f9c..a1c4ef3 100644
--- a/binaryurp/source/incomingrequest.cxx
+++ b/binaryurp/source/incomingrequest.cxx
@@ -25,6 +25,7 @@
 
 #include "com/sun/star/bridge/XInstanceProvider.hpp"
 #include "cppuhelper/exc_hlp.hxx"
+#include "o3tl/runtimetooustring.hxx"
 #include "rtl/byteseq.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
@@ -77,10 +78,8 @@ void IncomingRequest::execute() const {
 isExc = !execute_throw(&ret, &outArgs);
 } catch (const std::exception & e) {
 throw css::uno::RuntimeException(
-"caught C++ exception: " +
-OStringToOUString(
- OString(e.what()), RTL_TEXTENCODING_ASCII_US));
-// best-effort string conversion
+"caught C++ exception: "
++ o3tl::runtimeToOUString(e.what()));
 }
 } catch (const css::uno::RuntimeException &) {
 css::uno::Any exc(cppu::getCaughtException());
diff --git a/binaryurp/source/proxy.cxx b/binaryurp/source/proxy.cxx
index 5f23b46..1834968 100644
--- a/binaryurp/source/proxy.cxx
+++ b/binaryurp/source/proxy.cxx
@@ -24,6 +24,7 @@
 #include 
 
 #include "cppuhelper/exc_hlp.hxx"
+#include "o3tl/runtimetooustring.hxx"
 #include "rtl/ref.hxx"
 #include "rtl/ustring.hxx"
 #include "sal/types.h"
@@ -100,10 +101,7 @@ void Proxy::do_dispatch(
 do_dispatch_throw(member, returnValue, arguments, exception);
 } catch (const std::exception & e) {
 throw css::uno::RuntimeException(
-"caught C++ exception: " +
-OStringToOUString(
-OString(e.what()), RTL_TEXTENCODING_ASCII_US));
-// best-effort string conversion
+"caught C++ exception: " + o3tl::runtimeToOUString(e.what()));
 }
 } catch (const css::uno::RuntimeException &) {
 css::uno::Any exc(cppu::getCaughtException());
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 71e76a9..fb7bf08 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -23,10 +23,10 @@
 #include 
 
 #include "rtl/alloc.h"
-#include "rtl/ustrbuf.hxx"
 
 #include 
 #include "com/sun/star/uno/RuntimeException.hpp"
+#include 
 #include 
 
 #include 
@@ -95,14 +95,6 @@ void INSERT_INT8(
 *pDS++ = *static_cast( pSV );
 }
 
-void appendCString(OUStringBuffer & buffer, char const * text) {
-if (te

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit b193e45600fe1445deb6ac5d7a2129b965cc9d2e
Author: Olivier Hallot 
Date:   Wed Nov 23 19:07:19 2016 -0200

Updated core
Project: help  6025b3e9288965cebf6d5ee7bff8bf4338d1391e

tdf#97745 (part) tweaks in CSS & XSLT

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

diff --git a/helpcontent2 b/helpcontent2
index 131ce3a..6025b3e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 131ce3ad3e75ddc1f6ecdee3ecb637972dda0a7f
+Subproject commit 6025b3e9288965cebf6d5ee7bff8bf4338d1391e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/default.css source/online_transform.xsl

[Olivier Hallot]

 source/default.css  |9 +
 source/online_transform.xsl |   10 --
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 6025b3e9288965cebf6d5ee7bff8bf4338d1391e
Author: Olivier Hallot 
Date:   Wed Nov 23 19:07:19 2016 -0200

tdf#97745 (part) tweaks in CSS & XSLT

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

diff --git a/source/default.css b/source/default.css
index 99f738c..1076e58 100644
--- a/source/default.css
+++ b/source/default.css
@@ -161,10 +161,11 @@ left: 5px;
 border:solid 1px;
 }
 
-#centerdiv {
-position: fixed;
-top: 25%;
-left:25%;
+#mediadiv {
+}
+
+.mediabutton{
+background-color:cyan;
 }
 
 .tintro {
diff --git a/source/online_transform.xsl b/source/online_transform.xsl
index 14c3dea..3f629d7 100644
--- a/source/online_transform.xsl
+++ b/source/online_transform.xsl
@@ -843,13 +843,17 @@
   
   
 
+  
 
+  
 
 
+  
 
+  
 
 
-   
+   
 
   
 
@@ -889,7 +893,9 @@

 

-   
+
+
+  

 

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

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/tdf103982.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   10 ++
 sw/source/filter/ww8/docxsdrexport.cxx   |   13 +
 3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 3cf2b5e0e8edc9d6044f8bc29ca9374f75b498a5
Author: Miklos Vajna 
Date:   Tue Nov 22 09:23:28 2016 +0100

tdf#103982 DOCX export: make sure SdrObject margin is non-negative

Regression from commit a5a836d8c43dc9cebbbf8af39bf0142de603a7c6 (DOCX
filter: effect extent should be part of the margin, 2014-12-04), the
effect extent is added to the nominal margin in DOCX, so we exclude that
from the margin in our document model. But it shouldn't be ever
negative, ST_WrapDistance is a restriction of the W3C XML Schema
unsignedInt datatype.

(cherry picked from commit f9f7a4ddaed85427522834597271967ee494b436)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf103982.docx 
b/sw/qa/extras/ooxmlexport/data/tdf103982.docx
new file mode 100644
index 000..13e6453
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf103982.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 90cef9f..3d9d749 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -832,6 +832,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf44986, "tdf44986.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty< 
uno::Sequence >(xTableRows->getByIndex(0), 
"TableColumnSeparators").getLength());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+sal_Int32 nDistB = getXPath(pXmlDoc, "//wp:anchor", "distB").toInt32();
+// This was -260350, which is not a valid value for an unsigned type.
+CPPUNIT_ASSERT(nDistB >= 0);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index 1eecce9..a8160a3 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -364,10 +364,15 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 lclMovePositionWithRotation(aPos, rSize, pObj->GetRotateAngle());
 }
 attrList->add(XML_behindDoc, bOpaque ? "0" : "1");
-attrList->add(XML_distT, 
OString::number(TwipsToEMU(aULSpaceItem.GetUpper()) - nTopExt).getStr());
-attrList->add(XML_distB, 
OString::number(TwipsToEMU(aULSpaceItem.GetLower()) - nBottomExt).getStr());
-attrList->add(XML_distL, 
OString::number(TwipsToEMU(aLRSpaceItem.GetLeft()) - nLeftExt).getStr());
-attrList->add(XML_distR, 
OString::number(TwipsToEMU(aLRSpaceItem.GetRight()) - nRightExt).getStr());
+// The type of dist* attributes is unsigned, so make sure no negative 
value is written.
+sal_Int64 nDistT = std::max(static_cast(0), 
TwipsToEMU(aULSpaceItem.GetUpper()) - nTopExt);
+attrList->add(XML_distT, OString::number(nDistT).getStr());
+sal_Int64 nDistB = std::max(static_cast(0), 
TwipsToEMU(aULSpaceItem.GetLower()) - nBottomExt);
+attrList->add(XML_distB, OString::number(nDistB).getStr());
+sal_Int64 nDistL = std::max(static_cast(0), 
TwipsToEMU(aLRSpaceItem.GetLeft()) - nLeftExt);
+attrList->add(XML_distL, OString::number(nDistL).getStr());
+sal_Int64 nDistR = std::max(static_cast(0), 
TwipsToEMU(aLRSpaceItem.GetRight()) - nRightExt);
+attrList->add(XML_distR, OString::number(nDistR).getStr());
 attrList->add(XML_simplePos, "0");
 attrList->add(XML_locked, "0");
 attrList->add(XML_layoutInCell, "1");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/inc/unx/cairotextrender.hxx|3 +++
 vcl/unx/generic/gdi/cairotextrender.cxx|2 --
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ff180af5cb4f0c527cdf5c5cf18bbf6db0cea14c
Author: Stephan Bergmann 
Date:   Wed Nov 23 22:00:59 2016 +0100

loplugin:externandnotdefined

Change-Id: Ic7866850453a26501e957747bf68f6ffd1b84907

diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index 1aeaf06..0735d059 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -26,6 +26,7 @@
 
 #include 
 
+class FontConfigFontOptions;
 class FreetypeFont;
 class GlyphCache;
 typedef struct _cairo cairo_t;
@@ -94,6 +95,8 @@ public:
 #endif
 };
 
+FontConfigFontOptions* GetFCFontOptions( const FontAttributes& 
rFontAttributes, int nSize);
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 9bbfaa7..55d5e49 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -148,8 +148,6 @@ bool CairoTextRender::setFont( const FontSelectPattern 
*pEntry, int nFallbackLev
 return false;
 }
 
-FontConfigFontOptions* GetFCFontOptions( const FontAttributes& 
rFontAttributes, int nSize);
-
 void FreetypeFontInstance::HandleFontOptions()
 {
 if( !mpFreetypeFont )
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index f8dc3da..9a72bf3 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -20,6 +20,7 @@
 
 #include 
 
+#include 
 #include "unx/freetype_glyphcache.hxx"
 
 #include 
@@ -588,8 +589,6 @@ void FreetypeFont::SetFontOptions(const 
std::shared_ptr&
 mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
 
-extern FontConfigFontOptions* GetFCFontOptions( const FontAttributes& 
rFontAttributes, int nSize);
-
 const std::shared_ptr& FreetypeFont::GetFontOptions() 
const
 {
 if (!mxFontOptions)
___
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' - starmath/source

[Takeshi Abe]

 starmath/source/node.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e7145b142d21af4d23a21a8490dcbbd0fb42685a
Author: Takeshi Abe 
Date:   Thu Nov 17 20:26:24 2016 +0900

tdf#84650 Fix X-coordinate of SmMatrixNode's elements

which are aligned to left or right against the column.

Change-Id: Ie2b6944bc0dddb0e1589842472298f787fabf596
Reviewed-on: https://gerrit.libreoffice.org/30929
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 
(cherry picked from commit 395295a40c24a49c12415ec803860a888d734515)
Reviewed-on: https://gerrit.libreoffice.org/30943
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index da9d861..47b27fc 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2380,7 +2380,6 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 
 // align all baselines in that row if possible
 aPos = rNodeRect.AlignTo(aLineRect, RectPos::Right, 
RectHorAlign::Center, RectVerAlign::Baseline);
-aPos.X() += nHorDist;
 
 // get horizontal alignment
 const SmNode *pCoNode   = pTmpNode->GetLeftMost();
@@ -2390,7 +2389,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
 // and horizontal alignment
 switch (eHorAlign)
 {   case RectHorAlign::Left:
-aPos.X() = rNodeRect.GetLeft() + aColLeft[j];
+aPos.X() = aColLeft[j];
 break;
 case RectHorAlign::Center:
 aPos.X() = rNodeRect.GetLeft() + aColLeft[j]
@@ -2398,7 +2397,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const 
SmFormat &rFormat)
- rNodeRect.GetItalicCenterX();
 break;
 case RectHorAlign::Right:
-aPos.X() = rNodeRect.GetLeft() + aColLeft[j]
+aPos.X() = aColLeft[j]
+ aColWidth[j] - rNodeRect.GetItalicWidth();
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/opengl/gdiimpl.cxx|4 +---
 vcl/source/components/dtranscomp.cxx  |   20 
 vcl/source/components/fontident.cxx   |5 -
 vcl/source/control/notebookbar.cxx|1 -
 vcl/source/edit/textview.cxx  |5 -
 vcl/source/filter/graphicfilter.cxx   |1 -
 vcl/source/gdi/pdfwriter_impl.cxx |5 -
 vcl/source/helper/commandinfoprovider.cxx |4 +---
 vcl/source/uitest/uno/uitest_uno.cxx  |5 -
 vcl/unx/generic/app/wmadaptor.cxx |   16 
 vcl/unx/generic/dtrans/config.cxx |9 -
 vcl/unx/generic/print/genpspgraphics.cxx  |5 -
 vcl/unx/gtk3/gtk3gtkframe.cxx |   17 -
 13 files changed, 18 insertions(+), 79 deletions(-)

New commits:
commit aafc083257203d09fb15cbc16dd86539a7df5856
Author: Stephan Bergmann 
Date:   Wed Nov 23 21:48:33 2016 +0100

loplugin:unnecessaryoverride (dtors) in vcl

Change-Id: I38e24991308bf52e75259a30d332145aef9a757b

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b487468..58f03f3 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -56,9 +56,7 @@ public:
 // We don't want to be swapping before we've painted.
 SetPriority( SchedulerPriority::POST_PAINT );
 }
-virtual ~OpenGLFlushIdle() override
-{
-}
+
 virtual void Invoke() override
 {
 m_pImpl->doFlush();
diff --git a/vcl/source/components/dtranscomp.cxx 
b/vcl/source/components/dtranscomp.cxx
index 9456ca5..fcdf217 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -68,7 +68,6 @@ public:
 XServiceInfo
 >( m_aMutex )
 {}
-virtual ~GenericClipboard() override;
 
 /*
  * XServiceInfo
@@ -114,10 +113,6 @@ public:
 throw(RuntimeException, std::exception) override;
 };
 
-GenericClipboard::~GenericClipboard()
-{
-}
-
 Sequence< OUString > GenericClipboard::getSupportedServiceNames_static()
 {
 Sequence< OUString > aRet { 
"com.sun.star.datatransfer.clipboard.SystemClipboard" };
@@ -203,7 +198,6 @@ class ClipboardFactory : public 
::cppu::WeakComponentImplHelper<
 osl::Mutex m_aMutex;
 public:
 ClipboardFactory();
-virtual ~ClipboardFactory() override;
 
 /*
  *  XSingleServiceFactory
@@ -219,10 +213,6 @@ ClipboardFactory::ClipboardFactory() :
 {
 }
 
-ClipboardFactory::~ClipboardFactory()
-{
-}
-
 Reference< XInterface > ClipboardFactory::createInstance() 
throw(std::exception)
 {
 return createInstanceWithArguments( Sequence< Any >() );
@@ -265,7 +255,6 @@ class GenericDragSource : public 
cppu::WeakComponentImplHelper<
 osl::Mutex  m_aMutex;
 public:
 GenericDragSource() : WeakComponentImplHelper( m_aMutex ) {}
-virtual ~GenericDragSource() override;
 
 // XDragSource
 virtual sal_BoolSAL_CALL isDragImageSupported() throw(std::exception) 
override;
@@ -299,10 +288,6 @@ public:
 }
 };
 
-GenericDragSource::~GenericDragSource()
-{
-}
-
 sal_Bool GenericDragSource::isDragImageSupported() throw(std::exception)
 {
 return false;
@@ -372,7 +357,6 @@ class GenericDropTarget : public 
cppu::WeakComponentImplHelper<
 public:
 GenericDropTarget() : WeakComponentImplHelper( m_aMutex )
 {}
-virtual ~GenericDropTarget() override;
 
 // XInitialization
 virtual voidSAL_CALL initialize( const Sequence< Any >& args ) 
throw ( Exception, std::exception ) override;
@@ -404,10 +388,6 @@ public:
 }
 };
 
-GenericDropTarget::~GenericDropTarget()
-{
-}
-
 void GenericDropTarget::initialize( const Sequence< Any >& ) throw( Exception, 
std::exception )
 {
 }
diff --git a/vcl/source/components/fontident.cxx 
b/vcl/source/components/fontident.cxx
index 11d4418..9568c4c 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -50,7 +50,6 @@ class FontIdentificator : public ::cppu::WeakAggImplHelper3< 
XMaterialHolder, XI
 Fontm_aFont;
 public:
 FontIdentificator() {}
-virtual ~FontIdentificator() override;
 
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName(  ) throw 
(RuntimeException, std::exception) override;
@@ -65,10 +64,6 @@ FontIdentificator() {}
 
 };
 
-FontIdentificator::~FontIdentificator()
-{
-}
-
 void SAL_CALL FontIdentificator::initialize( const Sequence& i_rArgs ) 
throw(Exception,RuntimeException, std::exception)
 {
 if( !ImplGetSVData() )
diff --git a/vcl/source/control/notebookbar.cxx 
b/vcl/source/control/notebookbar.cxx
index 2ff1c3e..40e3f84 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -21,7 +21,6 @@ class NotebookBarContextChangeEventListener : public 
::cppu::WeakImplHelper mpParent;
 public:
 explicit NotebookBarContextChangeEventListener(NotebookBar *p) : 
mpParent(p) {}
-virtual ~NotebookBarContextChangeEventListener() override

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

[Stephan Bergmann]

 dev/null|binary
 sal/workben/clipboardwben/testcopy/StdAfx.cpp   |   29 
 sal/workben/clipboardwben/testcopy/StdAfx.h |   33 
 sal/workben/clipboardwben/testcopy/XTDataObject.cxx |  388 ---
 sal/workben/clipboardwben/testcopy/XTDataObject.hxx |  108 
 sal/workben/clipboardwben/testcopy/cbcpytest.cxx|  348 --
 sal/workben/clipboardwben/testcopy/cbcpytest.rc |  140 -
 sal/workben/clipboardwben/testcopy/makefile.mk  |   58 
 sal/workben/clipboardwben/testcopy/resource.h   |   34 
 sal/workben/clipboardwben/testpaste/StdAfx.cpp  |   29 
 sal/workben/clipboardwben/testpaste/StdAfx.h|   33 
 sal/workben/clipboardwben/testpaste/cbptest.cxx |  404 ---
 sal/workben/clipboardwben/testpaste/cbptest.rc  |  138 -
 sal/workben/clipboardwben/testpaste/makefile.mk |   58 
 sal/workben/clipboardwben/testpaste/resource.h  |   31 
 sal/workben/clipboardwben/testviewer/StdAfx.cpp |   29 
 sal/workben/clipboardwben/testviewer/StdAfx.h   |   33 
 sal/workben/clipboardwben/testviewer/cbvtest.cxx|  326 --
 sal/workben/clipboardwben/testviewer/cbvtest.rc |  145 -
 sal/workben/clipboardwben/testviewer/makefile.mk|   58 
 sal/workben/clipboardwben/testviewer/resource.h |   53 
 sal/workben/export.exp  |1 
 sal/workben/getlocaleinfotest.cxx   |   39 
 sal/workben/makefile.mk |  215 -
 sal/workben/measure_oustrings.cxx   |  262 --
 sal/workben/t_cipher.c  |  392 ---
 sal/workben/t_digest.c  |  366 --
 sal/workben/t_ojp_exe.cxx   |   44 
 sal/workben/t_osl_getVolInfo.cxx|  115 
 sal/workben/t_osl_joinProcess.cxx   |  223 -
 sal/workben/t_random.c  |   54 
 sal/workben/t_readline.c|   70 
 sal/workben/test.cxx|   55 
 sal/workben/testfile.cxx| 2550 
 sal/workben/testpip2.cxx|   79 
 sal/workben/testpipe.cxx|  150 -
 sal/workben/testproc.cxx|   55 
 37 files changed, 7145 deletions(-)

New commits:
commit b73abe292eda22c2332ff819a1ca5f66d0ee7d9f
Author: Stephan Bergmann 
Date:   Wed Nov 23 21:41:21 2016 +0100

Remove dead sal/workben/ stuff

All this is probably dead for ages, yet it repeatedly got modified over the
years by clean-up commits, be they driven by cppunit or grep.

Change-Id: I69443f5b25f24bb5735e7179c915f27b4742fcb5

diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.cpp 
b/sal/workben/clipboardwben/testcopy/StdAfx.cpp
deleted file mode 100644
index bac4b51..000
--- a/sal/workben/clipboardwben/testcopy/StdAfx.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// stdafx.cpp : source file which only includes the standard header files
-// TestWin32.pch is a pre-compiled header file
-// stdafx.obj contains the pre-compiled type information
-
-#include "stdafx.h"
-
-// TO DO: Reference all additional header files required by STDAFX.H
-// rather than by this file
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/workben/clipboardwben/testcopy/StdAfx.h 
b/sal/workben/clipboardwben/testcopy/StdAfx.h
deleted file mode 100644
index 10768f6..000
--- a/sal/workben/clipboardwben/testcopy/StdAfx.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-// stdafx.h : Include-Datei für Standard-System-Include-Dateien,
-//  oder projektspezifische Include-Dateien, die häufig benutzt, aber
-//  in unregelmässigen Abständen geandert werden.
-
-#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_44455354__INCLUDED_)
-#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_44455354__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define WIN32_LEAN_AND_MEAN // Selten 

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

[Khaled Hosny]

 vcl/inc/CommonSalLayout.hxx  |2 -
 vcl/inc/unx/genpspgraphics.h |2 -
 vcl/source/gdi/CommonSalLayout.cxx   |7 +++
 vcl/unx/generic/print/genpspgraphics.cxx |   61 +++
 4 files changed, 64 insertions(+), 8 deletions(-)

New commits:
commit f337e95fb50c9edc10aca859aaf08baab5294d2e
Author: Khaled Hosny 
Date:   Wed Nov 23 21:42:47 2016 +0200

Make PS on Unix printing use the new layout engine

I’d rather kill PS printing entirely, but this will do for now.

Change-Id: I112cc4855ab722ac07d31231f2a1ea8842b4159a
Reviewed-on: https://gerrit.libreoffice.org/31133
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index 31b9dca..e5345d7 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -64,7 +64,6 @@ class CommonSalLayout : public GenericSalLayout
 public:
 #if defined(_WIN32)
 explicitCommonSalLayout(HDC, WinFontInstance&, const 
WinFontFace&);
-voidInitFont() const override { SelectObject(mhDC, 
mhFont); };
 const FontSelectPattern& getFontSelData() const { return mrFontSelData; };
 #elif defined(MACOSX) || defined(IOS)
 explicitCommonSalLayout(const CoreTextStyle&);
@@ -74,6 +73,7 @@ public:
 const FreetypeFont& getFontData() const { return mrFreetypeFont; };
 #endif
 
+virtual voidInitFont() const override;
 voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
 voidAdjustLayout(ImplLayoutArgs&) override;
 boolLayoutText(ImplLayoutArgs&) override;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 1700267..792e44f 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -132,7 +132,7 @@ public:
 virtual boolGetGlyphBoundRect( sal_GlyphId, Rectangle& ) 
override;
 virtual boolGetGlyphOutline( sal_GlyphId, 
basegfx::B2DPolyPolygon& ) override;
 virtual SalLayout*  GetTextLayout( ImplLayoutArgs&, int nFallbackLevel 
) override;
-virtual voidDrawSalLayout( const CommonSalLayout& ) override 
{};
+virtual voidDrawSalLayout( const CommonSalLayout& ) override;
 virtual voidDrawServerFontLayout( const GenericSalLayout&, 
const FreetypeFont& ) override;
 virtual boolsupportsOperation( OutDevSupportType ) const 
override;
 virtual voiddrawPixel( long nX, long nY ) override;
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index cf6a53a..ea7093d 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -261,6 +261,13 @@ CommonSalLayout::CommonSalLayout(FreetypeFont& 
rFreetypeFont)
 }
 #endif
 
+void CommonSalLayout::InitFont() const
+{
+#if defined(_WIN32)
+SelectObject(mhDC, mhFont);
+#endif
+}
+
 struct SubRun
 {
 int32_t mnMin;
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx 
b/vcl/unx/generic/print/genpspgraphics.cxx
index 8c73ec14..455f186 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -54,6 +54,7 @@
 #include "PhysicalFontFace.hxx"
 #include "salbmp.hxx"
 #include "salprn.hxx"
+#include "CommonSalLayout.hxx"
 
 #include 
 #if ENABLE_GRAPHITE
@@ -692,9 +693,45 @@ void PspServerFontLayout::InitFont() const
   mnOrientation, mbVertical, mbArtItalic, mbArtBold );
 }
 
+class PspCommonSalLayout : public CommonSalLayout
+{
+public:
+PspCommonSalLayout(psp::PrinterGfx&, FreetypeFont& rFont);
+
+virtual voidInitFont() const override;
+
+private:
+::psp::PrinterGfx&  mrPrinterGfx;
+sal_IntPtr  mnFontID;
+int mnFontHeight;
+int mnFontWidth;
+boolmbVertical;
+boolmbArtItalic;
+boolmbArtBold;
+};
+
+PspCommonSalLayout::PspCommonSalLayout(::psp::PrinterGfx& rGfx, FreetypeFont& 
rFont)
+:   CommonSalLayout(rFont)
+,   mrPrinterGfx(rGfx)
+{
+mnFontID = mrPrinterGfx.GetFontID();
+mnFontHeight = mrPrinterGfx.GetFontHeight();
+mnFontWidth  = mrPrinterGfx.GetFontWidth();
+mbVertical   = mrPrinterGfx.GetFontVertical();
+mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
+mbArtBold= mrPrinterGfx.GetArtificialBold();
+}
+
+void PspCommonSalLayout::InitFont() const
+{
+CommonSalLayout::InitFont();
+mrPrinterGfx.SetFont(mnFontID, mnFontHeight, mnFontWidth,
+ mnOrientation, mbVertical, mbArtItalic, mbArtBold);
+}
+
 static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& 
rGfx, bool bIsPspServerFontLayout )
 {
-const int nMaxGlyphs = 200;
+const int nMaxGlyphs = 1;
 sal_GlyphId aGlyphAry[ nMaxGlyphs ];
 DeviceCoordinate aWidt

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

[Christina Accione]

 AllLangHelp_simpress.mk|1 
 source/text/simpress/guide/photo_album.xhp |  106 +
 2 files changed, 107 insertions(+)

New commits:
commit 131ce3ad3e75ddc1f6ecdee3ecb637972dda0a7f
Author: Christina Accione 
Date:   Tue Nov 22 16:44:04 2016 -0200

tdf#83289 help page for Impress Photo Album

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

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 633fd53..0146ac6 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -188,6 +188,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/guide/orgchart \
 helpcontent2/source/text/simpress/guide/page_copy \
 helpcontent2/source/text/simpress/guide/palette_files \
+helpcontent2/source/text/simpress/guide/photo_album \
 helpcontent2/source/text/simpress/guide/print_tofit \
 helpcontent2/source/text/simpress/guide/printing \
 helpcontent2/source/text/simpress/guide/rehearse_timings \
diff --git a/source/text/simpress/guide/photo_album.xhp 
b/source/text/simpress/guide/photo_album.xhp
new file mode 100644
index 000..c844554
--- /dev/null
+++ b/source/text/simpress/guide/photo_album.xhp
@@ -0,0 +1,106 @@
+
+
+
+
+
+  
+Impress Photo Album
+/text/simpress/guide/photo_album.xhp
+  
+
+
+
+
+
+
+
+
+  Photo Album
+  Impress Photo Album
+  Multimedia show;Impress Photo Album
+  Kiosk;Impress Photo Album
+  Slideshow;Impress Photo Album
+  Album;Impress Photo Album
+
+
+
+Impress Photo 
Album
+Inserts a photo album into your presentation 
document.
+
+The 
Impress photo album is a quick way to insert several pictures into a 
presentation and create a document suitable to run continuously in a kiosk or 
multimedia show.
+
+Choose Insert – Media – Photo Album 

+
+To insert a photo album into your presentation
+
+
+  
+Open an existing or blank presentation.
+  
+  
+Go to the slide that precede the photo album.
+  
+  
+Choose Insert – Media – Photo 
Album. 
+  
+  
+In the Create Photo Album dialog, click Add.
+  
+  
+Locate the files you want to insert. 
+  
+
+Note: If 
several images are in the same folder, you can select a group of photos using 
the Shift or Ctrl keys while clicking on their filenames.
+
+
+  
+Click Open to add the files to 
the Photo Album.
+  
+
+Tip: 
Click on a file name to display it in the Preview 
area
+
+
+  
+Select the number of images per slide in the Slide layout list box.
+  
+  
+Mark Add caption to each slide 
checkbox if necessary, to insert a text box for the caption.
+  
+  
+Mark Keep aspect ratio checkbox 
to avoid distorting the images when laying them in the slide. The image will be 
fully contained in the slide.
+  
+  
+Mark Fill screen to make the 
image fill the whole presentation screen. The resulting image may be larger 
than the slide.
+  
+  
+Mark Link images to create a link 
to the image location in your file system or internet. This option will not 
embed the images in the presentation document.
+  
+  
+Click Insert Slides.
+  
+
+
+Warning: Clicking Undo will not delete a photo album. 
Right-click the slides on the slide panel and select Delete to delete the 
slides.
+
+Slide 
Shows
+Insert 
images
+
+
+
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Christina Accione]

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

New commits:
commit 4bb623d9bf545058e6bda2bbc54ef29459e43f2f
Author: Christina Accione 
Date:   Tue Nov 22 16:44:04 2016 -0200

Updated core
Project: help  131ce3ad3e75ddc1f6ecdee3ecb637972dda0a7f

tdf#83289 help page for Impress Photo Album

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

diff --git a/helpcontent2 b/helpcontent2
index edf19a7..131ce3a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit edf19a7a141e1be811be43fab68d630653b9f8c2
+Subproject commit 131ce3ad3e75ddc1f6ecdee3ecb637972dda0a7f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/inc/unx/fc_fontoptions.hxx |3 ++-
 vcl/inc/unx/glyphcache.hxx |2 +-
 vcl/unx/generic/fontmanager/fontconfig.cxx |8 ++--
 vcl/unx/generic/gdi/cairotextrender.cxx|6 +++---
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |8 
 5 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit 4129da25f71f9082c54a3e53dd96927c2bbbe45e
Author: Caolán McNamara 
Date:   Wed Nov 23 16:01:37 2016 +

reorg a bit and ensure FontConfigFontOptions is always available

Change-Id: Ie671be765ea1d188480a399ae201081a774cb0c0

diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index 340df27..48661de 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -51,7 +51,8 @@ public:
 boolDontUseEmbeddedBitmaps() const { return 
meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
 boolDontUseAntiAlias() const { return meAntiAlias == 
ANTIALIAS_FALSE; }
 boolDontUseHinting() const { return (meHinting == 
FontHinting::No) || (GetHintStyle() == FontHintStyle::NONE); }
-FcPattern*  GetPattern(const OString& rFileName, int nFontFace, 
bool bEmbolden) const;
+voidSyncPattern(const OString& rFileName, int nFontFace, 
bool bEmbolden);
+FcPattern*  GetPattern() const;
 private:
 FcPattern* mpPattern;
 };
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 15afbcd..9d3f011 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -230,7 +230,7 @@ private:
 FT_FaceRec_*maFaceFT;
 FT_SizeRec_*maSizeFT;
 
-std::shared_ptr mxFontOptions;
+mutable std::shared_ptr mxFontOptions;
 
 boolmbFaceOk;
 boolmbArtItalic;
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 6b4c8e6..81285eb 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1154,7 +1154,12 @@ FontConfigFontOptions::~FontConfigFontOptions()
 FcPatternDestroy(mpPattern);
 }
 
-FcPattern *FontConfigFontOptions::GetPattern(const OString& rFileName, int 
nIndex, bool bEmbolden) const
+FcPattern *FontConfigFontOptions::GetPattern() const
+{
+return mpPattern;
+}
+
+void FontConfigFontOptions::SyncPattern(const OString& rFileName, int nIndex, 
bool bEmbolden)
 {
 FcPatternDel(mpPattern, FC_FILE);
 FcPatternAddString(mpPattern, FC_FILE, reinterpret_cast(rFileName.getStr()));
@@ -1162,7 +1167,6 @@ FcPattern *FontConfigFontOptions::GetPattern(const 
OString& rFileName, int nInde
 FcPatternAddInteger(mpPattern, FC_INDEX, nIndex);
 FcPatternDel(mpPattern, FC_EMBOLDEN);
 FcPatternAddBool(mpPattern, FC_EMBOLDEN, bEmbolden ? FcTrue : FcFalse);
-return mpPattern;
 }
 
 FontConfigFontOptions* PrintFontManager::getFontOptions(
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index cce0312..9bbfaa7 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -64,7 +64,7 @@ public:
 struct CacheId
 {
 FT_Face maFace;
-const void *mpOptions;
+const FontConfigFontOptions *mpOptions;
 bool mbEmbolden;
 bool mbVerticalMetrics;
 bool operator ==(const CacheId& rOther) const
@@ -288,8 +288,8 @@ void CairoTextRender::DrawServerFontLayout( const 
GenericSalLayout& rLayout, con
 cairo_font_face_t* font_face = 
static_cast(CairoFontsCache::FindCachedFont(aId));
 if (!font_face)
 {
-const FontConfigFontOptions *pOptions = 
rFont.GetFontOptions().get();
-FcPattern *pPattern = 
pOptions->GetPattern(rFont.GetFontFileName(), rFont.GetFontFaceIndex(), 
aId.mbEmbolden);
+const FontConfigFontOptions *pOptions = aId.mpOptions;
+FcPattern *pPattern = pOptions->GetPattern();
 font_face = cairo_ft_font_face_create_for_pattern(pPattern);
 CairoFontsCache::CacheFont(font_face, aId);
 }
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 0bacb94..f8dc3da 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -588,8 +588,16 @@ void FreetypeFont::SetFontOptions(const 
std::shared_ptr&
 mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
 
+extern FontConfigFontOptions* GetFCFontOptions( const FontAttributes& 
rFontAttributes, int nSize);
+
 const std::shared_ptr& FreetypeFont::GetFontOptions() 
const
 {
+if (!mxFontOptions)
+{
+SAL_WARN("vcl", "this doesn't happen in practice I believe");
+mxFontOptions.reset(GetFCFontOptions(mpFontInfo->GetFontAttributes(), 
maFontSelData.mnHeight));
+}
+mxFontOptions->SyncPattern(GetFontF

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

[Khaled Hosny]

 vcl/unx/generic/print/genprnpsp.cxx  |   17 +++--
 vcl/unx/generic/print/genpspgraphics.cxx |   28 
 vcl/unx/generic/print/glyphset.cxx   |6 --
 3 files changed, 3 insertions(+), 48 deletions(-)

New commits:
commit b49611a7cde3607446ad224ff2824c722b17e204
Author: Khaled Hosny 
Date:   Wed Nov 23 21:15:36 2016 +0200

This code is only ever compiled on Unix

Remove what seems like incomplete attempt to make it cross platform.

Change-Id: I551fa091a3143925a15fced1de44f7f45929b21e
Reviewed-on: https://gerrit.libreoffice.org/31131
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/unx/generic/print/genprnpsp.cxx 
b/vcl/unx/generic/print/genprnpsp.cxx
index d0cedec..73ac666 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -30,11 +30,9 @@
  */
 
 // For spawning PDF and FAX generation
-#if defined( UNX )
-#  include 
-#  include 
-#  include 
-#endif
+#include 
+#include 
+#include 
 
 #include 
 #include "rtl/ustring.hxx"
@@ -253,7 +251,6 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, 
JobData& rData )
 }
 
 // Needs a cleaner abstraction ...
-#if defined( UNX )
 static bool passFileToCommandLine( const OUString& rFilename, const OUString& 
rCommandLine )
 {
 bool bSuccess = false;
@@ -337,7 +334,6 @@ static bool passFileToCommandLine( const OUString& 
rFilename, const OUString& rC
 
 return bSuccess;
 }
-#endif
 
 static std::vector getFaxNumbers()
 {
@@ -360,15 +356,10 @@ static std::vector getFaxNumbers()
 
 static bool createPdf( const OUString& rToFile, const OUString& rFromFile, 
const OUString& rCommandLine )
 {
-#if defined( UNX )
 OUString aCommandLine(
 rCommandLine.replaceAll("(OUTFILE)", rToFile));
 
 return passFileToCommandLine( rFromFile, aCommandLine );
-#else
-(void)rToFile; (void)rFromFile; (void)rCommandLine;
-return false;
-#endif
 }
 
 /*
@@ -904,7 +895,6 @@ bool PspSalPrinter::StartJob(
 }
 
 int nMode = 0;
-#if defined( UNX )
 // check whether this printer is configured as fax
 sal_Int32 nIndex = 0;
 const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( 
m_aJobData.m_aPrinterName ) );
@@ -928,7 +918,6 @@ bool PspSalPrinter::StartJob(
 break;
 }
 }
-#endif
 m_aPrinterGfx.Init( m_aJobData );
 
 return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile : 
m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect );
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx 
b/vcl/unx/generic/print/genpspgraphics.cxx
index 0a7c849..8c73ec14 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -23,14 +23,11 @@
 
 #include 
 
-// for mmap etc.
-#if defined( UNX )
 #include 
 #include 
 #include 
 #include 
 #include 
-#endif
 
 #include 
 #include 
@@ -1267,13 +1264,8 @@ bool GenPspGraphics::supportsOperation( 
OutDevSupportType ) const
 
 void GenPspGraphics::DoFreeEmbedFontData( const void* pData, long nLen )
 {
-#if defined( UNX )
 if( pData )
 munmap( const_cast(pData), nLen );
-#else
-(void)nLen;
-rtl_freeMemory( (void *)pData );
-#endif
 }
 
 const void* GenPspGraphics::DoGetEmbedFontData( psp::fontID aFont, const 
sal_Ucs* pUnicodes, sal_Int32* pWidths, size_t nLen, FontSubsetInfo& rInfo, 
long* pDataLen )
@@ -1306,7 +1298,6 @@ const void* GenPspGraphics::DoGetEmbedFontData( 
psp::fontID aFont, const sal_Ucs
 
 OString aSysPath = rMgr.getFontFileSysPath( aFont );
 
-#if defined( UNX )
 int fd = open( aSysPath.getStr(), O_RDONLY );
 if( fd < 0 )
 return nullptr;
@@ -1321,25 +1312,6 @@ const void* GenPspGraphics::DoGetEmbedFontData( 
psp::fontID aFont, const sal_Ucs
 if( pFile == MAP_FAILED )
 return nullptr;
 *pDataLen = aStat.st_size;
-#else
-// FIXME: test me ! ...
-OUString aURL;
-if( osl::File::getFileURLFromSystemPath( OStringToOUString( aSysPath, 
osl_getThreadTextEncoding() ), aURL ) != osl::File::E_None )
-return NULL;
-osl::File aFile( aURL );
-if( aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_NoLock ) != 
osl::File::E_None )
-return NULL;
-
-osl::DirectoryItem aItem;
-osl::DirectoryItem::get( aURL, aItem );
-osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize );
-aItem.getFileStatus( aFileStatus );
-
-void *pFile = rtl_allocateMemory( aFileStatus.getFileSize() );
-sal_uInt64 nRead = 0;
-aFile.read( pFile, aFileStatus.getFileSize(), nRead );
-*pDataLen = (long) nRead;
-#endif
 
 rInfo.m_aFontBBox   = Rectangle( Point( xMin, yMin ), Size( xMax-xMin, 
yMax-yMin ) );
 rInfo.m_nCapHeight  = yMax; // Well ...
diff --git a/vcl/unx/generic/print/glyphset.cxx 
b/vcl/unx/generic/print/glyphset.cxx
index 65079bf..56decb7 100644
--- a/vcl/unx/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -726,7 

Re: Community communication

[Tor Lillqvist]

>
>
> I would like to advise to create a group to make easier our communication,
> something like slack or a telegram group.
>
Facebook?

Oh, I forgot, nobody has ever heard of that.

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

Re: Community communication

[Necdet Yücel]

Hi,

https://telegram.me/libreoffice

regards


---
Necdet Yücel
http://about.me/nyucel

2016-11-23 21:55 GMT+03:00 Beatriz Fonseca :

> Hi, everyone.
>
> I would like to advise to create a group to make easier our communication,
> something like slack or a telegram group.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Community communication

[Beatriz Fonseca]

Hi, everyone.

I would like to advise to create a group to make easier our communication,
something like slack or a telegram group.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Christina Acchione License Statement

[Christina Acchione]

All of my past & future contributions to LibreOffice may be licensed
under the MPLv2/LGPLv3+ dual license.

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

[Libreoffice-commits] core.git: 4 commits - animations/source basctl/source basic/qa basic/source chart2/source

[Stephan Bergmann]

 animations/source/animcore/animcore.cxx
|   10 --
 basctl/source/basicide/basidesh.cxx
|4 
 basic/qa/cppunit/test_vba.cxx  
|1 
 basic/source/classes/errobject.cxx 
|7 -
 basic/source/classes/sbunoobj.cxx  
|9 -
 basic/source/classes/sbxmod.cxx
|5 -
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx  
|   25 -
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
|   19 ---
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
|   45 -
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx 
|4 
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx  
|8 -
 
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx 
   |4 
 
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
 |   15 ---
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx  
|4 
 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx 
|2 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
|5 -
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx   
|6 -
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
|   49 --
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
|   14 --
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx   
|   19 ---
 chart2/source/controller/dialogs/dlg_DataSource.cxx
|4 
 chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx 
|5 -
 chart2/source/controller/main/ConfigurationAccess.cxx  
|5 -
 chart2/source/tools/ConfigColorScheme.cxx  
|1 
 chart2/source/tools/ExplicitCategoriesProvider.cxx 
|2 
 chart2/source/tools/InternalDataProvider.cxx   
|2 
 chart2/source/view/axes/VCartesianAxis.cxx 
|5 -
 chart2/source/view/axes/VCartesianCoordinateSystem.cxx 
|3 
 chart2/source/view/charttypes/PieChart.cxx 
|5 -
 29 files changed, 1 insertion(+), 286 deletions(-)

New commits:
commit 705af606f75d870edcaa7fa01e360ae3dd31661b
Author: Stephan Bergmann 
Date:   Wed Nov 23 18:37:35 2016 +0100

loplugin:unnecessaryoverride (dtors) in chart2

Change-Id: I013fd81467b353262e8de554a06a0b24e4deca6d

diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx 
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index f6b1f22..4f46ea8 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -272,7 +272,6 @@ class WrappedDataSourceLabelsInFirstRowProperty : public 
WrappedProperty
 {
 public:
 explicit WrappedDataSourceLabelsInFirstRowProperty(const 
std::shared_ptr& spChart2ModelContact);
-virtual ~WrappedDataSourceLabelsInFirstRowProperty() override;
 
 virtual void setPropertyValue( const css::uno::Any& rOuterValue, const 
css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
 throw (css::beans::UnknownPropertyException, 
css::beans::PropertyVetoException, css::lang::IllegalArgumentException, 
css::lang::WrappedTargetException, css::uno::RuntimeException) override;
@@ -296,10 +295,6 @@ 
WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProp
 m_aOuterValue = 
WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( nullptr );
 }
 
-WrappedDataSourceLabelsInFirstRowProperty::~WrappedDataSourceLabelsInFirstRowProperty()
-{
-}
-
 void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& 
rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) 
const
 throw (beans::UnknownPropertyException, 
beans::PropertyVetoException, lang::IllegalArgumentException, 
lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -370,7 +365,6 @@ class WrappedDataSourceLabelsInFirstColumnProperty : public 
WrappedProperty
 {
 public:
 explicit WrappedDataSourceLabelsInFirstColumnProperty(const 
std::shared_ptr& spChart2ModelContact);
-virtual ~WrappedDataSourceLabelsInFirstColumnProperty() override;
 
 virtual void setPropertyValue( const css::uno::Any& rOu

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

[Caolán McNamara]

 vcl/inc/unx/fc_fontoptions.hxx |2 +-
 vcl/inc/unx/freetype_glyphcache.hxx|1 +
 vcl/inc/unx/glyphcache.hxx |1 +
 vcl/unx/generic/fontmanager/fontconfig.cxx |   25 ++---
 vcl/unx/generic/gdi/cairotextrender.cxx|7 ++-
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |   10 +-
 6 files changed, 20 insertions(+), 26 deletions(-)

New commits:
commit 8c3e1465223bd8c824c4cecfd0e6fc387583e592
Author: Caolán McNamara 
Date:   Wed Nov 23 14:54:50 2016 +

with wayland scaling cairo is meddling with our font

so I see mixed large scaled and small unscaled letters in the writer 
header/footer
widget among other places

so don't give it our FreeType font face (FC_FT_FACE), keep that for 
ourselves,
but instead set the filename and face index and let it make a new one 
itself.

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

diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index e5dc491..340df27 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -51,7 +51,7 @@ public:
 boolDontUseEmbeddedBitmaps() const { return 
meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; }
 boolDontUseAntiAlias() const { return meAntiAlias == 
ANTIALIAS_FALSE; }
 boolDontUseHinting() const { return (meHinting == 
FontHinting::No) || (GetHintStyle() == FontHintStyle::NONE); }
-void*   GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const;
+FcPattern*  GetPattern(const OString& rFileName, int nFontFace, 
bool bEmbolden) const;
 private:
 FcPattern* mpPattern;
 };
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx 
b/vcl/inc/unx/freetype_glyphcache.hxx
index 304a090..119dcda 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -72,6 +72,7 @@ public:
 void  ReleaseFaceFT();
 
 const OString&GetFontFileName() const   { return 
mpFontFile->GetFileName(); }
+int   GetFontFaceIndex() const  { return mnFaceNum; }
 sal_IntPtrGetFontId() const { return mnFontId; }
 bool  IsSymbolFont() const  { return 
maDevFontAttributes.IsSymbolFont(); }
 const FontAttributes& GetFontAttributes() const { return 
maDevFontAttributes; }
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 366bd2a..15afbcd 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -151,6 +151,7 @@ public:
~FreetypeFont();
 
 const OString&  GetFontFileName() const;
+int GetFontFaceIndex() const;
 boolTestFont() const { return mbFaceOk;}
 FT_Face GetFtFace() const;
 int GetLoadFlags() const { return (mnLoadFlags & 
~FT_LOAD_IGNORE_TRANSFORM); }
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index a8731401..6b4c8e6 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1154,21 +1154,16 @@ FontConfigFontOptions::~FontConfigFontOptions()
 FcPatternDestroy(mpPattern);
 }
 
-void *FontConfigFontOptions::GetPattern(void * face, bool bEmbolden) const
-{
-FcValue value;
-value.type = FcTypeFTFace;
-value.u.f = face;
-FcPatternDel(mpPattern, FC_FT_FACE);
-FcPatternAdd (mpPattern, FC_FT_FACE, value, FcTrue);
-FcPatternDel(mpPattern, FC_EMBOLDEN);
-FcPatternAddBool(mpPattern, FC_EMBOLDEN, bEmbolden ? FcTrue : FcFalse);
-#if 0
-FcPatternDel(mpPattern, FC_VERTICAL_LAYOUT);
-FcPatternAddBool(mpPattern, FC_VERTICAL_LAYOUT, bVerticalLayout ? 
FcTrue : FcFalse);
-#endif
-return mpPattern;
-}
+FcPattern *FontConfigFontOptions::GetPattern(const OString& rFileName, int 
nIndex, bool bEmbolden) const
+{
+FcPatternDel(mpPattern, FC_FILE);
+FcPatternAddString(mpPattern, FC_FILE, reinterpret_cast(rFileName.getStr()));
+FcPatternDel(mpPattern, FC_INDEX);
+FcPatternAddInteger(mpPattern, FC_INDEX, nIndex);
+FcPatternDel(mpPattern, FC_EMBOLDEN);
+FcPatternAddBool(mpPattern, FC_EMBOLDEN, bEmbolden ? FcTrue : FcFalse);
+return mpPattern;
+}
 
 FontConfigFontOptions* PrintFontManager::getFontOptions(
 const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*))
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index 3c571f7..cce0312 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -289,11 +289,8 @@ void CairoTextRender::DrawServerFontLay

[Libreoffice-commits] core.git: desktop/qa desktop/source desktop/uiconfig desktop/UIConfig_deployment.mk l10ntools/source

[Mike Kaganski]

 desktop/UIConfig_deployment.mk|1 
 desktop/qa/unit/data/desktop-dialogs-test.txt |1 
 desktop/source/app/cmdlinehelp.cxx|  310 +++---
 desktop/source/app/cmdlinehelp.hxx|   21 -
 desktop/uiconfig/ui/cmdlinehelp.ui|  137 ---
 l10ntools/source/gRun.sh  |2 
 6 files changed, 134 insertions(+), 338 deletions(-)

New commits:
commit 24a24e65cafffe137d76de0a6eb5270ea88ebffd
Author: Mike Kaganski 
Date:   Tue Nov 22 02:59:29 2016 +0300

tdf#100826: use console for -h and --version also on Windows

This removes the dialog used to show version information and
command line help on Windows. Now, selecting and scrolling becomes
possible, code is simplified and unified under all platforms.

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

diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk
index d5cb72c..a1e08c8 100644
--- a/desktop/UIConfig_deployment.mk
+++ b/desktop/UIConfig_deployment.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_UIConfig_UIConfig,desktop))
 
 $(eval $(call gb_UIConfig_add_uifiles,desktop,\
-desktop/uiconfig/ui/cmdlinehelp \
 desktop/uiconfig/ui/dependenciesdialog \
 desktop/uiconfig/ui/extensionmanager \
 desktop/uiconfig/ui/installforalldialog \
diff --git a/desktop/qa/unit/data/desktop-dialogs-test.txt 
b/desktop/qa/unit/data/desktop-dialogs-test.txt
index b07bff1..cdcf922 100644
--- a/desktop/qa/unit/data/desktop-dialogs-test.txt
+++ b/desktop/qa/unit/data/desktop-dialogs-test.txt
@@ -35,7 +35,6 @@
 # test case since they need some document and model data to work
 # desktop/ui/extensionmanager.ui
 
-desktop/ui/cmdlinehelp.ui
 desktop/ui/dependenciesdialog.ui
 desktop/ui/updaterequireddialog.ui
 desktop/ui/showlicensedialog.ui
diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index aaa6af9..122238c 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -19,213 +19,167 @@
 
 
 #include 
-#ifdef UNX
 #include 
-#endif
 #include 
 #include 
-#include 
-#include 
 #include 
 
-#include "desktopresid.hxx"
-#include "desktop.hrc"
 #include "cmdlinehelp.hxx"
 
+#ifdef _WIN32
+#include "windows.h"
+#include "io.h"
+#include "Fcntl.h"
+#endif
+
 namespace desktop
 {
-// to be able to display the help nicely in a dialog box with proportional 
font,
-// we need to split it in chunks...
-//  ___HEAD___
-//  LEFT RIGHT
-//  LEFT RIGHT
-//  LEFT RIGHT
-//  __BOTTOM__
-// [OK]
-
 const char aCmdLineHelp_version[] =
-"%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION %BUILDID\n"\
+"%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION %BUILDID\n"
 "\n";
-const char aCmdLineHelp_head[] =
-"Usage: %CMDNAME [options] [documents...]\n"\
-"\n"\
-"Options:\n";
-const char aCmdLineHelp_left[] =
-"--minimized\n"\
-"--invisible\n"\
-"--norestore\n"\
-"--quickstart   \n"\
-"--safe-mode\n"\
-"--nologo   \n"\
-"--nolockcheck  \n"\
-"--nodefault\n"\
-"--headless \n"\
-"--help/-h/-?   \n"\
-"--version  \n"\
-"--writer   \n"\
-"--calc \n"\
-"--draw \n"\
-"--impress  \n"\
-"--base \n"\
-"--math \n"\
-"--global   \n"\
-"--web  \n"\
-"-o \n"\
-"-n \n";
-const char aCmdLineHelp_right[] =
-"keep startup bitmap minimized.\n"\
-"no startup screen, no default document and no UI.\n"\
-"suppress restart/restore after fatal errors.\n"\
-"starts the quickstart service\n"\
-"starts the safe mode\n"\
-"don't show startup screen.\n"\
-"don't check for remote instances using the installation\n"\
-"don't start with an empty document\n"\
-"like invisible but no user interaction at all.\n"\
-"show this message and exit.\n"\
-"display the version information.\n"\
-"create new text document.\n"\
-"create new spreadsheet document.\n"\
-"create new drawing.\n"\
-"create new presentation.\n"\
-"create new database.\n"\
-"create new formula.\n"\
-"create new global document.\n"\
-"create new HTML document.\n"\
-"open documents regardless whether they are templates or not.\n"\
-"always open documents as new files (use as template).\n";
-const char aCmdLineHelp_bottom[] =
-"--display \n"\
+const char aCmdLineHelp[] =
+"Usage: %CMDNAME [options] [documents...]\n"
+"\n"
+"Options:\n"
+"--minimizedkeep startup bitmap minimized

[Libreoffice-commits] core.git: sc/CppunitTest_sc_range_test.mk sc/Module_sc.mk sc/qa

[Markus Mohrhard]

 sc/CppunitTest_sc_range_test.mk |  120 
 sc/Module_sc.mk |1 
 sc/qa/unit/range.cxx|  110 
 3 files changed, 231 insertions(+)

New commits:
commit 4be1a9f9797fece0de236d26d10246853b4df850
Author: Markus Mohrhard 
Date:   Wed Nov 23 15:49:56 2016 +0100

add initial test case for ScAddress/ScRange tests

Change-Id: Idefa5a9fd9e6e2342bb0ccb9d88c5ca3094991c5
Reviewed-on: https://gerrit.libreoffice.org/31122
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/CppunitTest_sc_range_test.mk b/sc/CppunitTest_sc_range_test.mk
new file mode 100644
index 000..0fdbd3c
--- /dev/null
+++ b/sc/CppunitTest_sc_range_test.mk
@@ -0,0 +1,120 @@
+# -*- 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,sc_range_test))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_range_test, \
+   boost_headers \
+icu_headers \
+icui18n \
+icuuc \
+   libxml2 \
+   mdds_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_range_test, \
+sc/qa/unit/range \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_range_test, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sb \
+sc \
+scqahelper \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tk \
+tl \
+ucbhelper \
+   unotest \
+utl \
+vbahelper \
+vcl \
+xo \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_range_test,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_range_test,\
+offapi \
+oovbaapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_range_test))
+$(eval $(call gb_CppunitTest_use_vcl,sc_range_test))
+
+$(eval $(call gb_CppunitTest_use_components,sc_range_test,\
+basic/util/sb \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+embeddedobj/util/embobj \
+eventattacher/source/evtatt \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scaddins/source/analysis/analysis \
+scaddins/source/datefunc/date \
+scripting/source/basprov/basprov \
+scripting/util/scriptframe \
+sc/util/sc \
+sc/util/scd \
+sc/util/scfilt \
+$(call gb_Helper_optional,SCRIPTING, \
+   sc/util/vbaobj) \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+svl/util/svl \
+svx/util/svx \
+svx/util/svxcore \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_range_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 5493c09..ce7e4c1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
CppunitTest_sc_bugfix_test \
CppunitTest_sc_filters_test \
CppunitTest_sc_rangelst_test \
+   CppunitTest_sc_range_test \
CppunitTest_sc_mark_test \
CppunitTest_sc_core \
 ))
diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/range.cxx
new file mode 100644
index 000..c1e4214
--- /dev/null
+++ b/sc/qa/unit/range.cxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include "helper/qahelper.hxx"
+#include "document.hxx"
+#include "docsh.hxx"
+
+#include "address.hxx"
+
+class ScAddressTest : public test::BootstrapFixture
+{
+public:
+
+virtual void setUp() override;
+virtual void tearDown() override;
+
+CPPUNIT_TEST_SUITE(ScAddressTest);
+CPPUNIT_TEST(testAddressParsing);
+CPPUNIT_TEST_SUITE_END();
+
+void testAddressParsing(

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

[Stephan Bergmann]

 sc/qa/unit/screenshots/screenshots.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit dfba3f9fb94ce18a0c0044bf21637bd0fc48fc80
Author: Stephan Bergmann 
Date:   Wed Nov 23 17:11:36 2016 +0100

mpStream's content needs to outlive mpStream

Change-Id: I70e95c540b8649ee022b26202f866b57a831b277

diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index 8271561..764885d 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -53,6 +53,7 @@ private:
 ScDocShellRef   mxDocSh;
 ScTabViewShell* mpViewShell;
 ScAbstractDialogFactory*mpFact;
+OUStringmCsv; // needs to outlive mpStream
 std::unique_ptr mpStream;
 std::unique_ptr mpItemSet;
 
@@ -84,6 +85,7 @@ ScScreenshotTest::ScScreenshotTest()
 mxDocSh(),
 mpViewShell(nullptr),
 mpFact(nullptr),
+mCsv("some, strings, here, separated, by, commas"),
 mpStream(),
 mpItemSet()
 {
@@ -112,8 +114,7 @@ void ScScreenshotTest::initialize()
 mpFact = ScAbstractDialogFactory::Create();
 CPPUNIT_ASSERT_MESSAGE("Failed to create dialog factory", mpFact);
 
-const OUString aCsv("some, strings, here, separated, by, commas");
-SvMemoryStream* pNewMemStream = new SvMemoryStream(const_cast(aCsv.getStr()), aCsv.getLength() * sizeof(sal_Unicode), StreamMode::READ);
+SvMemoryStream* pNewMemStream = new SvMemoryStream(const_cast(mCsv.getStr()), mCsv.getLength() * sizeof(sal_Unicode), StreamMode::READ);
 pNewMemStream->SetStreamCharSet( RTL_TEXTENCODING_UNICODE );
 #ifdef OSL_BIGENDIAN
 pNewMemStream->SetEndian(SvStreamEndian::BIG);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/inc/address.hxx  |   26 --
 sc/source/core/tool/address.cxx |   10 +-
 sc/source/filter/excel/xestream.cxx |6 --
 sc/source/filter/excel/xetable.cxx  |5 -
 sc/source/filter/inc/xestream.hxx   |2 +-
 5 files changed, 38 insertions(+), 11 deletions(-)

New commits:
commit 342fc09784f01c1068d00a28af0ba196692e856b
Author: Bartosz Kosiorek 
Date:   Fri Nov 18 12:36:21 2016 +0100

OOXML: Write dimension range in full address notation

In every sheet.xml there is information about dimensions, like:
. During export by LibreOffice to .xlsx,
when row or column has maximum value, the dimension was
truncated. For example given "A1:AMJ177" it's saves .
It was caused problems with Office 2007 import.
This patch is fixing that by always using full address notation
for dimension range,  and allow open documents exported by LO
properly by MS Office.

Change-Id: Idda1455d1f9db08ade0871110fe40be2667c176c
Reviewed-on: https://gerrit.libreoffice.org/30960
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 71862564df1422f84340e421bbef9060c4e41a71)
Reviewed-on: https://gerrit.libreoffice.org/31112
Reviewed-by: Bartosz Kosiorek 

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 63d8371..d801d05 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -542,8 +542,30 @@ public:
 const 
css::uno::Sequence* pExternalLinks = nullptr,
 const OUString* pErrRef = nullptr );
 
-SC_DLLPUBLIC OUString Format(ScRefFlags nFlags = ScRefFlags::ZERO, const 
ScDocument* pDocument = nullptr,
- const ScAddress::Details& rDetails = 
ScAddress::detailsOOOa1) const;
+/** Returns string with formatted cell range from aStart to aEnd,
+according to provided address convention.
+@param nFlags
+Cell reference flags
+@param pDocument
+Pointer to document which is used for example to get tab names.
+@param rDetails
+Provide information about required address convention.
+Supported address conventions are:
+CONV_OOO  'doc'#sheet.A1:sheet2.B2
+CONV_XL_A1,   [doc]sheet:sheet2!A1:B2
+CONV_XL_OOX,  [#]sheet:sheet2!A1:B2
+CONV_XL_R1C1, [doc]sheet:sheet2!R1C1:R2C2
+@param bFullAddressNotation
+If TRUE, the full address notation will be used.
+For example in case all columns are used, "A1:AMJ177" is full 
address notation
+and "1:177" is shortened address notation.
+@returns
+String contains formatted cell range in address convention
+ */
+SC_DLLPUBLIC OUString Format( ScRefFlags nFlags = ScRefFlags::ZERO,
+  const ScDocument* pDocument = nullptr,
+  const ScAddress::Details& rDetails = 
ScAddress::detailsOOOa1,
+  bool bFullAddressNotation = false ) const;
 
 inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
  SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index bb2c9e2..0a7a2a9 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2197,7 +2197,7 @@ static inline bool lcl_RowAbsFlagDiffer(const ScRefFlags 
nFlags)
 }
 
 OUString ScRange::Format( ScRefFlags nFlags, const ScDocument* pDoc,
-  const ScAddress::Details& rDetails ) const
+  const ScAddress::Details& rDetails, bool 
bFullAddressNotation ) const
 {
 if( !( nFlags & ScRefFlags::VALID ) )
 {
@@ -2232,14 +2232,14 @@ OUString ScRange::Format( ScRefFlags nFlags, const 
ScDocument* pDoc,
 case formula::FormulaGrammar::CONV_XL_A1:
 case formula::FormulaGrammar::CONV_XL_OOX:
 lcl_ScRange_Format_XL_Header( r, *this, nFlags, pDoc, rDetails );
-if( aStart.Col() == 0 && aEnd.Col() >= MAXCOL )
+if( aStart.Col() == 0 && aEnd.Col() >= MAXCOL && !bFullAddressNotation 
)
 {
 // Full col refs always require 2 rows (2:2)
 lcl_a1_append_r( r, aStart.Row(), (nFlags & ScRefFlags::ROW_ABS) 
!= ScRefFlags::ZERO );
 r.append(":");
 lcl_a1_append_r( r, aEnd.Row(), (nFlags & ScRefFlags::ROW2_ABS) != 
ScRefFlags::ZERO );
 }
-else if( aStart.Row() == 0 && aEnd.Row() >= MAXROW )
+else if( aStart.Row() == 0 && aEnd.Row() >= MAXROW && 
!bFullAddressNotation )
 {
 // Full row refs always require 2 cols (A:A)
 lcl_a1_append_c( r, aStart.Col(), (nFlags & ScRefFlags::COL_ABS) 
!= ScRefFlags::ZERO );
@@ -2263,7 +2263,7 @@ OUString ScRange::Format( ScRefFlags nFlags, const 
ScDocume

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/galaxy

[Gabor Kelemen]

 dev/null|binary
 icon-themes/galaxy/res/helpimg/starmath/un21201.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21202.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21203.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21204.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21205.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21206.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21207.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21208.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21209.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21210.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21211.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21212.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21213.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21214.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21215.png |binary
 icon-themes/galaxy/res/helpimg/starmath/un21221.png |binary
 17 files changed

New commits:
commit 5b5c453ba08fec648207547b3d34f9d49b5924dc
Author: Gabor Kelemen 
Date:   Sat Oct 29 14:33:56 2016 +0200

tdf#100015 Move unary and binary operators icons to Galaxy

These are help-only anyways. Also they were on a path
that was not auto-packaged into images_elementary.zip
this is fixed as well.

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

diff --git a/icon-themes/elementary/starmath/res/un21201.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21201.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21201.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21201.png
diff --git a/icon-themes/elementary/starmath/res/un21202.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21202.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21202.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21202.png
diff --git a/icon-themes/elementary/starmath/res/un21203.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21203.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21203.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21203.png
diff --git a/icon-themes/elementary/starmath/res/un21204.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21204.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21204.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21204.png
diff --git a/icon-themes/elementary/starmath/res/un21205.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21205.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21205.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21205.png
diff --git a/icon-themes/elementary/starmath/res/un21206.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21206.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21206.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21206.png
diff --git a/icon-themes/elementary/starmath/res/un21207.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21207.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21207.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21207.png
diff --git a/icon-themes/elementary/starmath/res/un21208.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21208.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21208.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21208.png
diff --git a/icon-themes/elementary/starmath/res/un21209.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21209.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21209.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21209.png
diff --git a/icon-themes/elementary/starmath/res/un21210.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21210.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21210.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21210.png
diff --git a/icon-themes/elementary/starmath/res/un21211.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21211.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21211.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21211.png
diff --git a/icon-themes/elementary/starmath/res/un21212.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21212.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21212.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21212.png
diff --git a/icon-themes/elementary/starmath/res/un21213.png 
b/icon-themes/galaxy/res/helpimg/starmath/un21213.png
similarity index 100%
rename from icon-themes/elementary/starmath/res/un21213.png
rename to icon-themes/galaxy/res/helpimg/starmath/un21213.png
diff --git a/icon-themes/elementary/starmath/res/un21214

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - 2 commits - configure.ac download.lst external/libmwaw external/poppler

[David Tardon]

 configure.ac  |2 
 download.lst  |8 -
 external/libmwaw/0001-fix-build-with-msvc.patch.1 |  148 ++
 external/libmwaw/Library_mwaw.mk  |2 
 external/poppler/UnpackedTarball_poppler.mk   |2 
 external/poppler/poppler-0.46.0-std-max.patch.1   |   10 -
 external/poppler/poppler-vs2013.patch.1   |   11 -
 7 files changed, 107 insertions(+), 76 deletions(-)

New commits:
commit 62e7c29476dc1f3f8d7c784209d3aa4f362dd116
Author: David Tardon 
Date:   Tue Nov 22 21:37:48 2016 +0100

upload libmwaw 0.3.9

Change-Id: I22d6fe02bfb122f060cfe2f8f0ba5259eb5cd60b
Reviewed-on: https://gerrit.libreoffice.org/31088
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 14fc834aebdf4de9276a93e9f595b150a86ee16f)
Signed-off-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 4696ebf..194cbb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7868,7 +7868,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.8])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.9])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
diff --git a/download.lst b/download.lst
index a881466..08bace6 100644
--- a/download.lst
+++ b/download.lst
@@ -104,8 +104,8 @@ export MDNSRESPONDER_MD5SUM := 
940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := 72ad446d76b157e30c1baf39bb288b99
-export MWAW_VERSION_MICRO := 8
+export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b
+export MWAW_VERSION_MICRO := 9
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-fix-build-with-msvc.patch.1 
b/external/libmwaw/0001-fix-build-with-msvc.patch.1
index 95b5e0c..ab60358 100644
--- a/external/libmwaw/0001-fix-build-with-msvc.patch.1
+++ b/external/libmwaw/0001-fix-build-with-msvc.patch.1
@@ -1,54 +1,106 @@
-From 01495bf788fe32723f222599e34ba1779ca3d594 Mon Sep 17 00:00:00 2001
+From ae8f006018f6cfc79b86f327116f6ceed71692f9 Mon Sep 17 00:00:00 2001
 From: David Tardon 
-Date: Fri, 24 Jun 2016 14:01:14 +0200
-Subject: [PATCH] fix build with msvc
+Date: Wed, 23 Nov 2016 09:06:35 +0100
+Subject: [PATCH] fix build with MSVC
 
 ---
- src/lib/CricketDrawParser.cxx | 4 ++--
- src/lib/FreeHandParser.cxx| 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ src/lib/PowerPoint3Parser.cxx | 30 +++---
+ 1 file changed, 15 insertions(+), 15 deletions(-)
 
-diff --git a/src/lib/CricketDrawParser.cxx b/src/lib/CricketDrawParser.cxx
-index f04be91..9fe5a32 100644
 a/src/lib/CricketDrawParser.cxx
-+++ b/src/lib/CricketDrawParser.cxx
-@@ -930,12 +930,12 @@ bool CricketDrawParser::readShape()
- MWAWBox2f box(shape.m_vertices[0], shape.m_vertices[2]);
- int angle[2] = { shape.m_angles[0], shape.m_angles[1] };
- if (box.min()[1]>box.max()[1]) {
--  std::swap(box.min()[1],box.max()[1]);
-+  std::swap(box.min()[1],box.max()[1]);
-   angle[0]=180-shape.m_angles[1];
-   angle[1]=180-shape.m_angles[0];
- }
- if (angle[1]<=angle[0])
--  std::swap(angle[0],angle[1]);
-+  std::swap(angle[0],angle[1]);
- if (angle[1]>360) {
-   int numLoop=int(angle[1]/360)-1;
-   angle[0]-=numLoop*360;
-diff --git a/src/lib/FreeHandParser.cxx b/src/lib/FreeHandParser.cxx
-index 78d8b08..e97e6e3 100644
 a/src/lib/FreeHandParser.cxx
-+++ b/src/lib/FreeHandParser.cxx
-@@ -999,7 +999,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, bool 
strict)
- getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
- for (int j=0; j<4; ++j) {
-   if (j==1) continue;
--  std::swap(dim[2*j],dim[2*j+1]);
-+  std::swap(dim[2*j],dim[2*j+1]);
- }
- val &= 0xFFDF;
-   }
-@@ -1016,7 +1016,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, 
bool strict)
-   f << "landscape,";
-   getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
-   for (int j=0; j<4; ++j)
--std::swap(dim[2*j],dim[2*j+1]);
-+std::swap(dim[2*j],dim[2*j+1]);
- }
- if (val&2) f << "crop[mark],";
- if (val&4) f << "center[mark],";
+diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx
+index 9ecbe1b..51348d6 100644
+---

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

[Gabor Kelemen]

 source/text/smath/01/03090100.xhp |   32 
 source/text/smath/01/03091501.xhp |   32 
 2 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit edf19a7a141e1be811be43fab68d630653b9f8c2
Author: Gabor Kelemen 
Date:   Sat Oct 29 16:28:43 2016 +0200

tdf#100015 Fix icon paths on the unary and binary operators pages

Change-Id: Ib26d9ac56cd413940ec2c2c71fea281726358c88
Reviewed-on: https://gerrit.libreoffice.org/30374
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/source/text/smath/01/03090100.xhp 
b/source/text/smath/01/03090100.xhp
index 42fcda8..9e101bf 100644
--- a/source/text/smath/01/03090100.xhp
+++ b/source/text/smath/01/03090100.xhp
@@ -70,7 +70,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -85,7 +85,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -100,7 +100,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -115,7 +115,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -130,7 +130,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -145,7 +145,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -160,7 +160,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -175,7 +175,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -190,7 +190,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -205,7 +205,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -220,7 +220,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -235,7 +235,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -250,7 +250,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -265,7 +265,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -280,7 +280,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -295,7 +295,7 @@
 
 
 
-Icon
+Icon

 
 
diff --git a/source/text/smath/01/03091501.xhp 
b/source/text/smath/01/03091501.xhp
index b0e0494..3d2e602 100644
--- a/source/text/smath/01/03091501.xhp
+++ b/source/text/smath/01/03091501.xhp
@@ -54,7 +54,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -69,7 +69,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -84,7 +84,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -99,7 +99,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -114,7 +114,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -129,7 +129,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -144,7 +144,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -159,7 +159,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -174,7 +174,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -217,7 +217,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -232,7 +232,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -247,7 +247,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -262,7 +262,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -329,7 +329,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -357,7 +357,7 @@
 
 
 
-Icon
+Icon

 
 
@@ -372,7 +372,7 @@
 
 
 
-Icon
+Icon

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

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit a3b451122946fbedf6de2aaa65dbccac6f352f87
Author: Gabor Kelemen 
Date:   Sat Oct 29 16:28:43 2016 +0200

Updated core
Project: help  edf19a7a141e1be811be43fab68d630653b9f8c2

tdf#100015 Fix icon paths on the unary and binary operators pages

Change-Id: Ib26d9ac56cd413940ec2c2c71fea281726358c88
Reviewed-on: https://gerrit.libreoffice.org/30374
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index ba5028e..edf19a7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ba5028e397bda2a0d8870c29696d55ef2f060c6b
+Subproject commit edf19a7a141e1be811be43fab68d630653b9f8c2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/inc/unx/glyphcache.hxx|4 +---
 vcl/unx/generic/glyphs/glyphcache.cxx |6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 944f8f8adf6e85b028f03e37f68f067a4eeaafff
Author: Caolán McNamara 
Date:   Wed Nov 23 11:56:10 2016 +

fold GetGlyphMetric and GetGlyphData together

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

diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 1e2d57c..366bd2a 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -168,8 +168,7 @@ public:
 const FontCharMapRefGetFontCharMap() const;
 boolGetFontCapabilities(vcl::FontCapabilities &) const;
 
-const GlyphMetric&  GetGlyphMetric( sal_GlyphId aGlyphId )
-{ return GetGlyphData( aGlyphId ).GetMetric(); }
+const GlyphMetric&  GetGlyphMetric(sal_GlyphId aGlyphId);
 
 #if ENABLE_GRAPHITE
 GraphiteFaceWrapper* GetGraphiteFace() const;
@@ -201,7 +200,6 @@ private:
 
 voidApplyGlyphTransform( int nGlyphFlags, 
FT_GlyphRec_* ) const;
 voidApplyGSUB( const FontSelectPattern& );
-GlyphData&  GetGlyphData( sal_GlyphId );
 
 ServerFontLayoutEngine* GetLayoutEngine();
 
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx 
b/vcl/unx/generic/glyphs/glyphcache.cxx
index c1b4a4e..de4bb96 100644
--- a/vcl/unx/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
@@ -304,14 +304,14 @@ long FreetypeFont::Release() const
 return --mnRefCount;
 }
 
-GlyphData& FreetypeFont::GetGlyphData( sal_GlyphId aGlyphId )
+const GlyphMetric& FreetypeFont::GetGlyphMetric(sal_GlyphId aGlyphId)
 {
 // usually the GlyphData is cached
 GlyphList::iterator it = maGlyphList.find( aGlyphId );
 if( it != maGlyphList.end() ) {
 GlyphData& rGlyphData = it->second;
 GlyphCache::GetInstance().UsingGlyph( *this, rGlyphData );
-return rGlyphData;
+return rGlyphData.GetMetric();
 }
 
 // sometimes not => we need to create and initialize it ourselves
@@ -319,7 +319,7 @@ GlyphData& FreetypeFont::GetGlyphData( sal_GlyphId aGlyphId 
)
 mnBytesUsed += sizeof( GlyphData );
 InitGlyphData( aGlyphId, rGlyphData );
 GlyphCache::GetInstance().AddedGlyph( *this, rGlyphData );
-return rGlyphData;
+return rGlyphData.GetMetric();
 }
 
 void FreetypeFont::GarbageCollect( long nMinLruIndex )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 scp2/source/ooo/common_brand.scp|5 +
 scp2/source/ooo/file_ooo.scp|9 +
 scp2/source/ooo/module_ooo.scp  |   11 +++
 scp2/source/ooo/module_ooo.ulf  |6 ++
 setup_native/source/packinfo/packinfo_office.txt|   15 +++
 setup_native/source/packinfo/spellchecker_selection.txt |1 +
 6 files changed, 47 insertions(+)

New commits:
commit 29dbac6fe556eb27067155c3be0c566b5328995c
Author: Aron Budea 
Date:   Tue Nov 22 23:15:28 2016 +0100

tdf#103922: Add Tibetan (bo) dictionary

Change-Id: Ief1a83bb87d03e46a3d3fa7702ab852401d3ed89
Reviewed-on: https://gerrit.libreoffice.org/31089
Tested-by: Jenkins 
Reviewed-by: Andras Timar 
(cherry picked from commit fc88ed47a66e76d279471c1da1193ce90ad8e9e5)
Reviewed-on: https://gerrit.libreoffice.org/31106
Tested-by: Andras Timar 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7cd7733..6424960 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -183,6 +183,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Bn
 DosName = "dict-bn";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Bo
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-bo";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Br
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-br";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4f6a1ee..f0542fc 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -421,6 +421,15 @@ End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Bo
+   Dir = FILELIST_DIR;
+   Name = "Dictionary/dict-bo.filelist";
+   Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
+   TXT_FILE_BODY;
+End
+#endif
+
+#if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Br
Dir = FILELIST_DIR;
Name = "Dictionary/dict-br.filelist";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 7819b24..0d781e1 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -225,6 +225,17 @@ Module gid_Module_Root_Extension_Dictionary_Bn
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Bo
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BO );
+Files = (gid_File_Extension_Dictionary_Bo);
+InstallOrder = "2000";
+Sortkey = "525";
+Spellcheckerlanguage = "bo";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Br
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
 Files = (gid_File_Extension_Dictionary_Br);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 6c1c894..25c5400 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -76,6 +76,12 @@ en-US = "Bengali"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_BN]
 en-US = "Bengali spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BO]
+en-US = "Classical Tibetan syllable spelling dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
 en-US = "Breton"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt 
b/setup_native/source/packinfo/packinfo_office.txt
index 613c79b..47e5817 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -442,6 +442,21 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Bo"
+solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bo"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core 
%PACKAGEVERSION 
%PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION 
%PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
+linuxpatchrequires = ""
+copyright = "2016 Elie Roux"
+solariscopyright = "solariscopyrightfile"
+vendor = "The Document Foundation"
+description = "Bo dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Br"
 solarispackagename = 
"%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
 solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, 
%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, 
%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSIO

[Libreoffice-commits] core.git: download.lst external/poppler

[David Tardon]

 download.lst|4 ++--
 external/poppler/UnpackedTarball_poppler.mk |2 --
 external/poppler/poppler-0.46.0-std-max.patch.1 |   10 --
 external/poppler/poppler-vs2013.patch.1 |   11 ---
 4 files changed, 2 insertions(+), 25 deletions(-)

New commits:
commit 6f1ae11761ddfa2f928254ff51f1860155f670a4
Author: David Tardon 
Date:   Wed Nov 23 13:47:52 2016 +0100

upload poppler 0.49.0

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

diff --git a/download.lst b/download.lst
index 9392459..08bace6 100644
--- a/download.lst
+++ b/download.lst
@@ -131,8 +131,8 @@ export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9
 export PNG_TARBALL := libpng-1.6.24.tar.gz
-export POPPLER_MD5SUM := 8d61c91cb9e99ad38bba1b0b4432f174
-export POPPLER_TARBALL := poppler-0.48.0.tar.xz
+export POPPLER_MD5SUM := 9e057ed8eee1f9979fa75d8f044783b8
+export POPPLER_TARBALL := poppler-0.49.0.tar.xz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 
 ifeq ($(PYTHON_VERSION_MINOR),3)
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index afad5fb..f72c040 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-notests.patch.1 \
$(if $(filter 
MSC-120,$(COM)-$(VCVER)),external/poppler/poppler-snprintf.patch.1) \
external/poppler/poppler-mac-fake.patch.1 \
-   external/poppler/poppler-vs2013.patch.1 \
-   external/poppler/poppler-0.46.0-std-max.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
 ))
diff --git a/external/poppler/poppler-0.46.0-std-max.patch.1 
b/external/poppler/poppler-0.46.0-std-max.patch.1
deleted file mode 100644
index 96a9abe..000
--- a/external/poppler/poppler-0.46.0-std-max.patch.1
+++ /dev/null
@@ -1,10 +0,0 @@
 a/poppler/PSOutputDev.cc
-+++ b/poppler/PSOutputDev.cc
-@@ -48,6 +48,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include "goo/GooString.h"
- #include "goo/GooList.h"
- #include "goo/GooHash.h"
diff --git a/external/poppler/poppler-vs2013.patch.1 
b/external/poppler/poppler-vs2013.patch.1
deleted file mode 100644
index ca892df..000
--- a/external/poppler/poppler-vs2013.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
 poppler/poppler/poppler-config.h.in
-+++ poppler/poppler/poppler-config.h.in
-@@ -186,7 +186,7 @@ char * strtok_r (char *s, const char *delim, char 
**save_ptr);
- #define GCC_PRINTF_FORMAT(fmt_index, va_index)
- #endif
- 
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && _MSC_VER < 1800
- #define fmax(a, b) std::max(a, b)
- #define fmin(a, b) std::min(a, b)
- #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Extending enums in IDL

[Stephan Bergmann]

On 11/23/2016 02:01 PM, Jan Holesovsky wrote:

Stephan Bergmann píše v St 23. 11. 2016 v 12:51 +0100:

The Java UNO runtime represents UNOIDL enum values as non-null
references to specific Java class instances (where those classes are
derived from com.sun.star.uno.Enum).  The bytecode generated for those
classes contains functions that map from enum integer values (as
obtained through the UNO bridges) to instances of those classes.  For
invalid values, that bytecode happens to return null references (it
could also throw exceptions, say).  So Java code confronted with an
extended UNOIDL enum will likely throw NullPointerExceptions and fail.


From the code I've read now, I see no indication that we would be
throwing NullPointerExceptions for the wrong values:

  ridljar/com/sun/star/uno/Enum.java

just happily returns whatever it was asked for:

/**
 * Get the integer value of an enum value.
 * @return   the integer value.
 */
public final int getValue() {
return m_value;
}


That's not the code I was talking about.  See handleEnumType 
(codemaker/source/javamaker/javatype.cxx) for the generated Java fromInt 
methods.



Also

  com.sun.star.Blah.BlehEnum var = something(...);

where something() was extended in LibreOffice to return an additional
com.sun.star.Blah.BlehEnum's value should be fine, as the 3rd party
extension is supposed to use the jar's from LibreOffice it is running
against (ie. the new ones that contain the addition) - so all is
transparent there, right?


An extension will use the jars from the LO installation it is installed 
in.  A 3rd party app (esp. when run on a different machine) could use 
older jars.



Or where exactly is the code that makes sure it throws, please?


What "code that makes sure it throws"?


For client code that means:  When consuming such an integer value it
must be prepared to be presented with a value it does not know.  And
when producing such an integer value it must be prepared that any
consumer does not know the value.  Code written in such a way that it
does not support those requirements is broken.


Sure, but that's a completely different argument from my point of
view :-) - ie. semantic; not a language / technology limitation.


Not sure what you want to say with that.  What /I/ wanted to say is, 
yes, exactly, there's a semantic difference between the non-extensible 
enum and extensible constant group/underlying integer approaches.  Chose 
the one that is supposed to fit your problem better.



Considering that everybody introduces just constants and not enums in
the new code anyway (because of the 'extending enums is painful'
argument), I am proposing to open up the enums for additions for 5.3 as
a general (semantically) incompatible change, so that we don't have to
do the 'SomethingBlah2' dance every time we need to add stuff to an
enum.


First of all, not every concept is better modelled with a constant group 
than with an enum.  The choice needs thought, of course, and there's 
likely been various mis-choices across the API.


Second, enums just can't technically be extended compatibly in the same 
way that constant groups can be; see the Java fromInt issue above.


But whether we "have to do the 'SomethingBlah2' dance" is somewhat 
detached from those technical issues:  If we consider the pros of doing 
an incompatible change higher than the cons, we do such a change.

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

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

[Yousuf Philips]

 sw/uiconfig/swriter/ui/notebookbar_groups.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e4ec7717ef45d18a2d6a37983b0a3d34c7953919
Author: Yousuf Philips 
Date:   Tue Nov 22 19:39:35 2016 +0400

tdf#103170 make blank button labels not translatable

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

diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui 
b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index dd3b906..531c492 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -1069,7 +1069,7 @@
 
 
   
- 

+ 
 35
 30
 True
@@ -1091,7 +1091,7 @@
 
 
   
- 

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

[Libreoffice-commits] online.git: 2 commits - loolwsd/LOOLWSD.cpp

[Ashod Nakashian]

 loolwsd/LOOLWSD.cpp |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 430e0cf0215b29502039092aa4c420b87a6bb7b4
Author: Ashod Nakashian 
Date:   Wed Nov 23 08:54:09 2016 -0500

loolwsd: alert users of low disk space after loading

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

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 5fdff72..5ca3fce 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -892,7 +892,12 @@ private:
 LOG_TRC("Sending to Client [" << status << "].");
 ws->sendFrame(status.data(), status.size());
 
-FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+const std::string fs = 
FileUtil::checkDiskSpaceOnRegisteredFileSystems();
+if (!fs.empty())
+{
+LOG_WRN("File system of " << fs << " dangerously low on disk 
space");
+Util::alertAllUsers("error: cmd=internal kind=diskfull");
+}
 
 // Request the child to connect to us and add this session.
 auto sessionsCount = docBroker->addSession(session);
commit c26e180c081c43d297ba55443e1ce5e9a3cc06b2
Author: Ashod Nakashian 
Date:   Wed Nov 23 09:38:47 2016 -0500

loolwsd: correct locking of DocBrokers

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

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index c253f51..5fdff72 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -313,6 +313,7 @@ static bool cleanupChildren()
 /// Called on startup only.
 static void preForkChildren()
 {
+std::unique_lock DocBrokersLock(DocBrokersMutex);
 std::unique_lock lock(NewChildrenMutex);
 
 int numPreSpawn = LOOLWSD::NumPreSpawnedChildren;
@@ -851,8 +852,6 @@ private:
 DocBrokers.insert(it, std::make_pair(docKey, docBroker));
 }
 
-docBrokersLock.unlock();
-
 // Validate the broker.
 if (!docBroker || !docBroker->isAlive())
 {
@@ -863,6 +862,8 @@ private:
 throw 
WebSocketErrorMessageException(SERVICE_UNAVAILABLE_INTERNAL_ERROR);
 }
 
+docBrokersLock.unlock();
+
 // Check if readonly session is required
 bool isReadOnly = false;
 for (const auto& param : uriPublic.getQueryParameters())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian]

 loolwsd/DocumentBroker.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55c1e7568f7e87fa9dc2e7309ca74e5f182e7e89
Author: Ashod Nakashian 
Date:   Wed Nov 23 00:21:12 2016 -0500

loolwsd: kill redundant exception logging

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

diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index 6672aaf..f31471a 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -81,7 +81,7 @@ public:
 }
 catch (const std::exception&)
 {
-LOG_ERR("Failed to send 'exit' command to child [" << _pid << 
"].");
+// Already logged in sendTextFrame.
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: offapi/com offapi/type_reference

[Michael Meeks]

On 23/11/16 14:22, Jan Iversen wrote:
> I respect that API incompatibility ... In my mind API changes should ...
> I understand that we need to ... I am all for ...

Lets avoid speculating on our existing or future approach to API/ABI
maintenance, and/or pre-judging the outcome of (hopefully) more mature,
and wide-ranging reflection in the ESC call =)

I look forward to talking on Thursday,

ATB,

Michael.

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

Re: [Libreoffice-commits] core.git: offapi/com offapi/type_reference

[Jan Iversen]

> On 23 Nov 2016, at 14:53, Zolnai Tamás  wrote:
> 
> Hi Eike,
> 
> I had no choice. You've made a decision and it seems I have to live
> with the consequences.
> So please don't insult me with saying 'thank you’.

Hi Tamás

Just to be sure, you are NOT alone in here….I respect that API incompatibility 
needs to be carefully considered, but we also need to have windows for doing 
such things.

In my mind API changes should be forbidden in X.y. versions, but allowed 
in 5.y.0 versions. The reason being if we make new functionality, the API needs 
to be enhanced.

Having said that, I understand that we need to make sure “old” extensions 
continue to work, which translates to (in my understanding), that “only expand, 
do not change in the middle” of structures”.

I am all for enhancements (especially ones I can use :-) )

Please consider joining our call this thursday berlin time 16:00 (UTC 15:00 I 
think), if you need help let me know.

rgds
jan I.


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

Request for beta2 release

[Zolnai Tamás]

Hi,

As I read the release plan I saw that beta2 release is marked as
optional. I don't know how you used to decide to have this beta
release or not, but I'd like to request to have it.
I added a new feature to Calc:
https://wiki.documentfoundation.org/ReleaseNotes/5.3#Pivot_tables
, but this feature is fully broken in beta1, because of a revertion:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=50244309501d738e7314fa79785db139c826f8d7
It's fixed now on an API compatible way. It would be good to have this
feature released as early as possible so users can test it.
I also needed to change hundreds of line in pivot table code:
https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-3&id=f8daf04a1d06f870202a1f1868b59ce90adde0e4
so this also would be good to be tested.

Thanks,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sw/CppunitTest_sw_dialogs_test_2.mk |1 +
 sw/qa/unit/sw-dialogs-test_2.cxx|   26 ++
 2 files changed, 27 insertions(+)

New commits:
commit 07b3ea269929148b3289582c9d1e6ac271e3bcc1
Author: Stephan Bergmann 
Date:   Wed Nov 23 15:02:35 2016 +0100

Carry fix over to CppunitTest_sw_dialogs_test_2

...from 2ec76e5db5c194e133b6fee5c7f81c04357971f8 "Make sure swui's 
pSwResMgr is
initialized in CppunitTest_sw_dialogs_test", across ignorant
f888d17127557a8fd3867896dcfa1abbb9f6a53d "split sw screenshots test"

Change-Id: I096e22433317186e1a78855532f2c67bd842f366

diff --git a/sw/CppunitTest_sw_dialogs_test_2.mk 
b/sw/CppunitTest_sw_dialogs_test_2.mk
index 7e6fb0b..12d34c4 100644
--- a/sw/CppunitTest_sw_dialogs_test_2.mk
+++ b/sw/CppunitTest_sw_dialogs_test_2.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sw_dialogs_test2))
 $(eval $(call gb_CppunitTest_set_include,sw_dialogs_test2,\
 -I$(SRCDIR)/sw/source/ui/inc \
 -I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/sw/qa/unit/sw-dialogs-test_2.cxx b/sw/qa/unit/sw-dialogs-test_2.cxx
index cf77589..5917506a 100644
--- a/sw/qa/unit/sw-dialogs-test_2.cxx
+++ b/sw/qa/unit/sw-dialogs-test_2.cxx
@@ -9,17 +9,25 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 
+extern "C" { using Fn = SwAbstractDialogFactory * (*)(); }
+// sw/source/ui/dialog/swuiexp.cxx
+
 /// Test opening a dialog in sw
 class SwDialogsTest2 : public ScreenshotTest
 {
 private:
+osl::Module libSwui_;
+
 /// helper method to populate KnownDialogs, called in setUp(). Needs to be
 /// written and has to add entries to KnownDialogs
 virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
@@ -32,6 +40,8 @@ public:
 SwDialogsTest2();
 virtual ~SwDialogsTest2() override;
 
+void setUp() override;
+
 // try to open a dialog
 void openAnyDialog();
 
@@ -48,6 +58,22 @@ SwDialogsTest2::~SwDialogsTest2()
 {
 }
 
+void SwDialogsTest2::setUp()
+{
+ScreenshotTest::setUp();
+// Make sure the swui library's global pSwResMgr is initialized
+// (alternatively to dynamically loading the library, SwCreateDialogFactory
+// could be declared in an include file and this CppunitTest link against
+// the swui library):
+OUString url("${LO_LIB_DIR}/" SVLIBRARY("swui"));
+rtl::Bootstrap::expandMacros(url); //TODO: detect failure
+CPPUNIT_ASSERT(libSwui_.load(url, SAL_LOADMODULE_GLOBAL));
+auto fn = reinterpret_cast(
+libSwui_.getFunctionSymbol("SwCreateDialogFactory"));
+CPPUNIT_ASSERT(fn != nullptr);
+(*fn)();
+}
+
 void SwDialogsTest2::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
 {
 // fill map of known dialogs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: offapi/com offapi/type_reference

[Zolnai Tamás]

Hi Eike,

I had no choice. You've made a decision and it seems I have to live
with the consequences.
So please don't insult me with saying 'thank you'.

Tamás

2016-11-23 13:21 GMT+01:00 Eike Rathke :
> Hi Zolnai,
>
> On Tuesday, 2016-11-22 21:43:11 +0100, Eike Rathke wrote:
>
>> What now needs to be done is
>> [...]
>
> Thanks a lot for taking care of that!
>
>   Eike
>
> --
> LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
> GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
> Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
> Care about Free Software, support the FSFE https://fsfe.org/support/?erack
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

RMDR: libreoffice-5-3 branch created, *remember to cherry-pick* stuff that should go into 5.3.x

[Christian Lohmaier]

Hi *,

as a reminder: libreoffice-5-3 has been created yesterday night.

This marks feature-freeze for LibreOffice 5.3.x, exceptions need to be
approved by ESC members.

While in Beta, no additional review is necessary (so you can
self-approve your bugfixes just like you would on master)

further reading:
https://wiki.documentfoundation.org/ReleasePlan/5.3#5.3.0_release (the schedule)

https://wiki.documentfoundation.org/Development/Branches (the review rules)

So *remember to cherry-pick*.
And tinderbox administrators: please also let your bots build
libreoffice-5-3 branch from now on (and remove libreoffice-5-0 in case
you still have that enabled :-))

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

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

[Caolán McNamara]

 vcl/inc/unx/glyphcache.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f412fa751df401a1e0d1da842eefb390b7e5ff7
Author: Caolán McNamara 
Date:   Wed Nov 23 11:50:08 2016 +

GetGlyphData is only used by GetGlyphMetric so can be private

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

diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index e5852a0..1e2d57c 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -168,7 +168,6 @@ public:
 const FontCharMapRefGetFontCharMap() const;
 boolGetFontCapabilities(vcl::FontCapabilities &) const;
 
-GlyphData&  GetGlyphData( sal_GlyphId );
 const GlyphMetric&  GetGlyphMetric( sal_GlyphId aGlyphId )
 { return GetGlyphData( aGlyphId ).GetMetric(); }
 
@@ -202,6 +201,7 @@ private:
 
 voidApplyGlyphTransform( int nGlyphFlags, 
FT_GlyphRec_* ) const;
 voidApplyGSUB( const FontSelectPattern& );
+GlyphData&  GetGlyphData( sal_GlyphId );
 
 ServerFontLayoutEngine* GetLayoutEngine();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 vcl/source/gdi/pdfwriter_impl.cxx|   22 ++
 xmlsecurity/source/pdfio/pdfdocument.cxx |2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit cb851cbb09adc637bb6e8095050292f7a8c6a7b1
Author: Miklos Vajna 
Date:   Wed Nov 23 11:27:32 2016 +0100

vcl mscrypto PDF sign: add initial 'signing-certificate' signed attribute

Equivalent of the earlier NSS commit, payload is just an empty sequence
at the moment.

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

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index e5af4d4..d1df5d5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7338,6 +7338,28 @@ bool PDFWriter::Sign(PDFSignContext& rContext)
 aSignerInfo.HashAlgorithm.pszObjId = const_cast(szOID_NIST_sha256);
 aSignerInfo.HashAlgorithm.Parameters.cbData = 0;
 
+// Add the signing certificate as a signed attribute.
+CRYPT_INTEGER_BLOB aCertificateBlob;
+// Just en empty SEQUENCE stub for now.
+std::vector aEncodedCertificate{0x30, 0x00};
+aCertificateBlob.pbData = aEncodedCertificate.data();
+aCertificateBlob.cbData = aEncodedCertificate.size();
+CRYPT_ATTRIBUTE aCertificateAttribute;
+/*
+ * id-aa-signingCertificateV2 OBJECT IDENTIFIER ::=
+ * { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9)
+ *   smime(16) id-aa(2) 47 }
+ */
+aCertificateAttribute.pszObjId = 
const_cast("1.2.840.113549.1.9.16.2.47");
+aCertificateAttribute.cValue = 1;
+aCertificateAttribute.rgValue = &aCertificateBlob;
+// Don't write the signed attribute by default till the value is ready.
+if (g_bDebugDisableCompression)
+{
+aSignerInfo.cAuthAttr = 1;
+aSignerInfo.rgAuthAttr = &aCertificateAttribute;
+}
+
 CMSG_SIGNED_ENCODE_INFO aSignedInfo;
 memset(&aSignedInfo, 0, sizeof(aSignedInfo));
 aSignedInfo.cbSize = sizeof(aSignedInfo);
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index ef9900c..648cc4b 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -380,7 +380,7 @@ sal_Int32 PDFDocument::WriteSignatureObject(const OUString& 
rDescription, bool b
 aSigBuffer.append("/ETSI.CAdES.detached");
 else
 #else
-(void)bAdES;
+(void)bAdES;
 #endif
 aSigBuffer.append("/adbe.pkcs7.detached");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 extras/source/truetype/symbol/OpenSymbol.sfd |   28 +--
 extras/source/truetype/symbol/opens___.ttf   |binary
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 795a2a73a8fc54016bc918e8536081dc86cd2068
Author: Khaled Hosny 
Date:   Tue Nov 22 17:31:10 2016 +0200

Cleanup OpenSymbol vertical metrics

OS/2 sTypoDescender should be -ve not positive, and the hhea and OS/2
values should agree. Also OS/2 usWinAscent/Descent should be big enough
for any glyph in the font.

Change-Id: Iad201f268f4e030565795e858a5a42937328ec80
Reviewed-on: https://gerrit.libreoffice.org/31060
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 
(cherry picked from commit b8283bc46bab7f8bccabaf0d0b2881a5e6a7722e)
Reviewed-on: https://gerrit.libreoffice.org/31113
Tested-by: Khaled Hosny 

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index f6582b3..35d4b01 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -4,7 +4,7 @@ FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
 Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation
-Version: 102.9
+Version: 102.10
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,26 +20,26 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1479471125
+ModificationTime: 1479754802
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
-LineGap: 0
+LineGap: 307
 VLineGap: 0
 Panose: 5 1 0 0 0 0 0 0 0 0
-OS2TypoAscent: 0
-OS2TypoAOffset: 1
-OS2TypoDescent: 820
-OS2TypoDOffset: 1
-OS2TypoLinegap: 0
-OS2WinAscent: -240
+OS2TypoAscent: 1420
+OS2TypoAOffset: 0
+OS2TypoDescent: -442
+OS2TypoDOffset: 0
+OS2TypoLinegap: 307
+OS2WinAscent: 0
 OS2WinAOffset: 1
-OS2WinDescent: -231
+OS2WinDescent: 0
 OS2WinDOffset: 1
-HheadAscent: 0
-HheadAOffset: 1
-HheadDescent: 0
-HheadDOffset: 1
+HheadAscent: 1420
+HheadAOffset: 0
+HheadDescent: -442
+HheadDOffset: 0
 OS2SubXSize: 409
 OS2SubYSize: 409
 OS2SubXOff: 0
diff --git a/extras/source/truetype/symbol/opens___.ttf 
b/extras/source/truetype/symbol/opens___.ttf
index 3129e22..5a10feb 100644
Binary files a/extras/source/truetype/symbol/opens___.ttf and 
b/extras/source/truetype/symbol/opens___.ttf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Extending enums in IDL

[Jan Holesovsky]

Hi Stephan,

Stephan Bergmann píše v St 23. 11. 2016 v 12:51 +0100:

> > But you caught my interest now - so if I understand that correctly, it
> > is not a terrible breakage what's going on here: The client just gets an
> > unknown value; ie. the same thing as when we add a constant to the IDL,
> > and return this unknown new value - right?
> 
> No, there are differences between (incompatibly) extending an UNOIDL 
> enum and (compatibly) extending a UNOIDL constants group; both technical 
> and contractual differences:
> 
> The Java UNO runtime represents UNOIDL enum values as non-null 
> references to specific Java class instances (where those classes are 
> derived from com.sun.star.uno.Enum).  The bytecode generated for those 
> classes contains functions that map from enum integer values (as 
> obtained through the UNO bridges) to instances of those classes.  For 
> invalid values, that bytecode happens to return null references (it 
> could also throw exceptions, say).  So Java code confronted with an 
> extended UNOIDL enum will likely throw NullPointerExceptions and fail.

From the code I've read now, I see no indication that we would be
throwing NullPointerExceptions for the wrong values:

  ridljar/com/sun/star/uno/Enum.java

just happily returns whatever it was asked for:

/**
 * Get the integer value of an enum value.
 * @return   the integer value.
 */
public final int getValue() {
return m_value;
}

Adding new 'static final' members does not throw or return null or is
incompatible in any way here either - right?

Also

  com.sun.star.Blah.BlehEnum var = something(...);

where something() was extended in LibreOffice to return an additional
com.sun.star.Blah.BlehEnum's value should be fine, as the 3rd party
extension is supposed to use the jar's from LibreOffice it is running
against (ie. the new ones that contain the addition) - so all is
transparent there, right?

Or where exactly is the code that makes sure it throws, please?

> For client code that means:  When consuming such an integer value it 
> must be prepared to be presented with a value it does not know.  And 
> when producing such an integer value it must be prepared that any 
> consumer does not know the value.  Code written in such a way that it 
> does not support those requirements is broken.

Sure, but that's a completely different argument from my point of
view :-) - ie. semantic; not a language / technology limitation.

Considering that everybody introduces just constants and not enums in
the new code anyway (because of the 'extending enums is painful'
argument), I am proposing to open up the enums for additions for 5.3 as
a general (semantically) incompatible change, so that we don't have to
do the 'SomethingBlah2' dance every time we need to add stuff to an
enum.

[Unless there is really a technical limitation to doing that of course -
in that case code pointers / code examples would be much appreciated.]

I'll add this as an item to the ESC :-)

All the best,
Kendy

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

Re: tdf#100826: replacing command-line help dialog with console under Windows

[Kaganski Mike]

11/23/2016 3:45 PM, Eike Rathke пишет:

Back in old times there was a guistdio.com built for Windows that when
copied to soffice.com somehow attached stdout to the console and invoked
soffice.exe

No idea if that is still functional, but the source is in
desktop/win32/source/guistdio/

Thanks for your feedback, Eike!

Unfortunately, the solution in the guistdio.inc is to make the application a 
console application (having SUBSYSTEM=CONSOLE [1]) by providing main instead of 
WinMain. This has the drawback of flashing console that is always created by OS 
when launching such programs, as I explained in the first message...

1. https://msdn.microsoft.com/en-us/library/fcc1zstk
--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/if.fods | 1290 -
 1 file changed, 632 insertions(+), 658 deletions(-)

New commits:
commit d99a6463ab53a5e4de92c1d2fb6b178e3a5bde2a
Author: Zdeněk Crhonek 
Date:   Sun Sep 18 12:43:50 2016 +0200

update IF() test case (add test for tdf#100637)

Change-Id: I279b3a7a05779ad80ee9276608f86fa3fe59d51d
Reviewed-on: https://gerrit.libreoffice.org/28989
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/if.fods 
b/sc/qa/unit/data/functions/fods/if.fods
index a2ee76a..7fcc505 100644
--- a/sc/qa/unit/data/functions/fods/if.fods
+++ b/sc/qa/unit/data/functions/fods/if.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-06-25T07:16:38.437590147P0D1LibreOffice/5.1.3.2$Linux_X86_64
 LibreOffice_project/10m0$Build-2
+ 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/7b660e1423554928350e1de2cd4cb7eb577a27ec
  
   
0
0
41364
-   13095
+   11740

 
  view1
@@ -28,10 +28,11 @@
100
60
true
+   false
   
   
-   4
-   25
+   3
+   23
0
0
0
@@ -40,15 +41,16 @@
0
0
0
-   0
+   6
0
100
60
true
+   false
   
  
  Sheet2
- 1185
+ 1241
  0
  100
  60
@@ -69,6 +71,7 @@
  1
  1
  true
+ false
 

   
@@ -88,8 +91,6 @@
true
true
true
-   true
-   true
false
12632256
false
@@ -103,12 +104,14 @@
  
 

+   true
+   true
3
1
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   rgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
false
0
   
@@ -135,6 +138,8 @@
   
   
   
+  
+  
  
  
   
@@ -157,856 +162,867 @@
Kč

   
-  
+  
 $

 
   
-  
+  
 $(

)
   
-  
+  
 $-

 
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  
£

   
-  
+  
-
£

-   
+   
   
-  
+  
£

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/fods/received.fods |  493 -
 sc/qa/unit/data/functions/fods/vdb.fods  | 1420 ++-
 2 files changed, 1245 insertions(+), 668 deletions(-)

New commits:
commit ca0b7ae19a06cc575c63c64d64fb59dfa91f44be
Author: Zdeněk Crhonek 
Date:   Sun Sep 18 13:30:35 2016 +0200

update RECEIVED test case (add test for bug tdf#101228)

Change-Id: Ic29c19df3c3e5a0624365656a725bb4ce4ed4bd3
Reviewed-on: https://gerrit.libreoffice.org/28990
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/received.fods 
b/sc/qa/unit/data/functions/fods/received.fods
index ae6764d..0073043 100644
--- a/sc/qa/unit/data/functions/fods/received.fods
+++ b/sc/qa/unit/data/functions/fods/received.fods
@@ -1,7 +1,7 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-07-18T18:53:36.155207394P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a2c557d80ac68c06ea59586245a7431e061938f0
+ 
2016-07-18T18:53:36.155207394P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/7b660e1423554928350e1de2cd4cb7eb577a27ec
  
   
0
@@ -31,8 +31,8 @@
false
   
   
-   1
-   20
+   2
+   17
0
0
0
@@ -41,7 +41,7 @@
0
0
0
-   0
+   4
0
75
60
@@ -50,7 +50,7 @@
   
  
  Sheet2
- 1280
+ 1241
  0
  75
  60
@@ -125,7 +125,7 @@
true
1
true
-   kQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgBJbnB1dFNsb3Q6VHJheTEARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
false
0
   
@@ -806,7 +806,7 @@

   
   
--
+   -


   
@@ -827,7 +827,7 @@
 € 
   
   
--
+   -

 € 
   
@@ -1216,7 +1216,7 @@
)
   
   
--
+   -

 
   
@@ -1974,38 +1974,41 @@
   
   

-   
+   
   
   

   
-  
-   
-   
-  
-  
+  

   
-  
+  


   
-  
-  
-  
+  
+  
+  





   
-  
+  





   
+  
+   
+   
+   
+   
+   
+  
   


@@ -2023,16 +2026,16 @@
   


-   
-   
-   
+   
+   
+   
   
   

 

Re: tdf#100826: replacing command-line help dialog with console under Windows

[Eike Rathke]

Hi Kaganski,

On Tuesday, 2016-11-22 20:42:01 +, Kaganski Mike wrote:


> Could you please share your thoughts on this? Did I miss some way to 
> implement it better?

Back in old times there was a guistdio.com built for Windows that when
copied to soffice.com somehow attached stdout to the console and invoked
soffice.exe

No idea if that is still functional, but the source is in
desktop/win32/source/guistdio/

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
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: Branch 'libreoffice-5-2' - sc/source

[Eike Rathke]

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

New commits:
commit a346bfaa4492fa53bf8cd21677d7880a86bbb811
Author: Eike Rathke 
Date:   Mon Nov 21 22:55:11 2016 +0100

Resolves: tdf#104096 reset also rRawRes if trailing characters are present

... in lcl_ScAddress_Parse_OOo() so that ScRange::Parse() doesn't receive a
"partially valid" result and does not attempt to follow the entire 
column/row
path.

Change-Id: Ie37c9d22280e30f770422fb621e3b9d972ec1546
(cherry picked from commit 8846cc2218091aa2af8ee3aadd81fd8a80e3b303)
Reviewed-on: https://gerrit.libreoffice.org/31058
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 265877c..134067c 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1439,7 +1439,7 @@ static ScRefFlags lcl_ScAddress_Parse_OOo( const 
sal_Unicode* p, ScDocument* pDo
 nRes |= ScRefFlags::VALID;
 }
 else
-nRes = nBailOutFlags;
+nRes = rRawRes = nBailOutFlags;
 return nRes;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/inc/address.hxx  |   26 --
 sc/source/core/tool/address.cxx |   10 +-
 sc/source/filter/excel/xestream.cxx |6 --
 sc/source/filter/excel/xetable.cxx  |5 -
 sc/source/filter/inc/xestream.hxx   |2 +-
 5 files changed, 38 insertions(+), 11 deletions(-)

New commits:
commit 71862564df1422f84340e421bbef9060c4e41a71
Author: Bartosz Kosiorek 
Date:   Fri Nov 18 12:36:21 2016 +0100

OOXML: Write dimension range in full address notation

In every sheet.xml there is information about dimensions, like:
. During export by LibreOffice to .xlsx,
when row or column has maximum value, the dimension was
truncated. For example given "A1:AMJ177" it's saves .
It was caused problems with Office 2007 import.
This patch is fixing that by always using full address notation
for dimension range,  and allow open documents exported by LO
properly by MS Office.

Change-Id: Idda1455d1f9db08ade0871110fe40be2667c176c
Reviewed-on: https://gerrit.libreoffice.org/30960
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 63d8371..d801d05 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -542,8 +542,30 @@ public:
 const 
css::uno::Sequence* pExternalLinks = nullptr,
 const OUString* pErrRef = nullptr );
 
-SC_DLLPUBLIC OUString Format(ScRefFlags nFlags = ScRefFlags::ZERO, const 
ScDocument* pDocument = nullptr,
- const ScAddress::Details& rDetails = 
ScAddress::detailsOOOa1) const;
+/** Returns string with formatted cell range from aStart to aEnd,
+according to provided address convention.
+@param nFlags
+Cell reference flags
+@param pDocument
+Pointer to document which is used for example to get tab names.
+@param rDetails
+Provide information about required address convention.
+Supported address conventions are:
+CONV_OOO  'doc'#sheet.A1:sheet2.B2
+CONV_XL_A1,   [doc]sheet:sheet2!A1:B2
+CONV_XL_OOX,  [#]sheet:sheet2!A1:B2
+CONV_XL_R1C1, [doc]sheet:sheet2!R1C1:R2C2
+@param bFullAddressNotation
+If TRUE, the full address notation will be used.
+For example in case all columns are used, "A1:AMJ177" is full 
address notation
+and "1:177" is shortened address notation.
+@returns
+String contains formatted cell range in address convention
+ */
+SC_DLLPUBLIC OUString Format( ScRefFlags nFlags = ScRefFlags::ZERO,
+  const ScDocument* pDocument = nullptr,
+  const ScAddress::Details& rDetails = 
ScAddress::detailsOOOa1,
+  bool bFullAddressNotation = false ) const;
 
 inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
  SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index bb2c9e2..0a7a2a9 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2197,7 +2197,7 @@ static inline bool lcl_RowAbsFlagDiffer(const ScRefFlags 
nFlags)
 }
 
 OUString ScRange::Format( ScRefFlags nFlags, const ScDocument* pDoc,
-  const ScAddress::Details& rDetails ) const
+  const ScAddress::Details& rDetails, bool 
bFullAddressNotation ) const
 {
 if( !( nFlags & ScRefFlags::VALID ) )
 {
@@ -2232,14 +2232,14 @@ OUString ScRange::Format( ScRefFlags nFlags, const 
ScDocument* pDoc,
 case formula::FormulaGrammar::CONV_XL_A1:
 case formula::FormulaGrammar::CONV_XL_OOX:
 lcl_ScRange_Format_XL_Header( r, *this, nFlags, pDoc, rDetails );
-if( aStart.Col() == 0 && aEnd.Col() >= MAXCOL )
+if( aStart.Col() == 0 && aEnd.Col() >= MAXCOL && !bFullAddressNotation 
)
 {
 // Full col refs always require 2 rows (2:2)
 lcl_a1_append_r( r, aStart.Row(), (nFlags & ScRefFlags::ROW_ABS) 
!= ScRefFlags::ZERO );
 r.append(":");
 lcl_a1_append_r( r, aEnd.Row(), (nFlags & ScRefFlags::ROW2_ABS) != 
ScRefFlags::ZERO );
 }
-else if( aStart.Row() == 0 && aEnd.Row() >= MAXROW )
+else if( aStart.Row() == 0 && aEnd.Row() >= MAXROW && 
!bFullAddressNotation )
 {
 // Full row refs always require 2 cols (A:A)
 lcl_a1_append_c( r, aStart.Col(), (nFlags & ScRefFlags::COL_ABS) 
!= ScRefFlags::ZERO );
@@ -2263,7 +2263,7 @@ OUString ScRange::Format( ScRefFlags nFlags, const 
ScDocument* pDoc,
 
 case formula::FormulaGrammar::CONV_XL_R1C1:
 lcl_ScRange_Format_XL_Header( r, *this, nFlags, pDoc, rDetails );
-if( aStart.Col() 

[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/src loolwsd/DocumentBroker.cpp loolwsd/PrisonerSession.cpp loolwsd/protocol.txt loolwsd/Storage.cpp loolwsd/Storage.hpp

[Pranav Kant]

 loleaflet/dist/errormessages.js |5 +
 loleaflet/src/control/Control.Dialog.js |4 +++-
 loleaflet/src/core/Socket.js|   11 +++
 loolwsd/DocumentBroker.cpp  |   17 -
 loolwsd/PrisonerSession.cpp |2 +-
 loolwsd/Storage.cpp |   23 ---
 loolwsd/Storage.hpp |   15 +++
 loolwsd/protocol.txt|   11 ---
 8 files changed, 71 insertions(+), 17 deletions(-)

New commits:
commit a149a0c2e164bd42677aec3a50c9a8a0421d1105
Author: Pranav Kant 
Date:   Wed Nov 23 17:52:10 2016 +0530

tdf#103679: Don't always change document permission on error

Have a new event 'warn' which doesn't change the document
permission but just show the user dialog with some message.

Change-Id: I455168e4f7315acdcccfb31fc8c70b86bbc6caad

diff --git a/loleaflet/src/control/Control.Dialog.js 
b/loleaflet/src/control/Control.Dialog.js
index 41836ae..733c5cd 100644
--- a/loleaflet/src/control/Control.Dialog.js
+++ b/loleaflet/src/control/Control.Dialog.js
@@ -5,11 +5,13 @@
 /* global vex */
 L.Control.Dialog = L.Control.extend({
onAdd: function (map) {
+   // TODO: Better distinction between warnings and errors
map.on('error', this._onError, this);
+   map.on('warn', this._onError, this);
map.on('print', this._onPrint, this);
},
 
-   _onError: function (e) {
+   _onError: function(e) {
if (vex.dialogID > 0 && !this._map._fatal) {
// TODO. queue message errors and pop-up dialogs
// Close other dialogs before presenting a new one.
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 5f72068..5c0d834 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -241,11 +241,11 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('error:') && command.errorCmd === 
'storage') {
if (command.errorKind === 'savediskfull') {
-   // Just warn the user
this._map.fire('error', {msg: 
errorMessages.storage.savediskfull});
}
else if (command.errorKind === 'savefailed') {
-   this._map.fire('error', {msg: 
errorMessages.storage.savefailed});
+   // Just warn the user
+   this._map.fire('warn', {msg: 
errorMessages.storage.savefailed});
}
 
return;
commit f8e0b8c11e94810fdde73f8b4d27b80a989670cb
Author: Pranav Kant 
Date:   Wed Nov 23 17:39:54 2016 +0530

tdf#103679: Handle storage diskfull & other PutFile errors

The new behavior is to warn the user when we try to save to
storage and set all the sessions of
the opened document to readonly, if storage server has no disk
space left. In case of WOPI, this is intimated by HTTP response code 413 -
request entity too large.

If save operation to storage failed due to reasons other than
413, just warn the user and let it continue editing the document.
We can add more reasons of failure and act accordingly in future.

Change-Id: I4b046fc38bbc0d752c89d90acb5991a958b76670

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index 348c6c1..036f965 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -4,3 +4,8 @@ exports.limitreached = _('This development build is limited to 
%0 documents, and
 exports.serviceunavailable = _('Service is unavailable. Please try again later 
and report to your administrator if the issue persists.');
 exports.unauthorized = _('Unauthorized WOPI host. Please try again later and 
report to your administrator if the issue persists.');
 exports.wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or 
file_path, usage: file_path=/path/to/doc/');
+
+exports.storage = {
+   savediskfull: _('Save failed due to no disk space left on storage 
server. Document will now be read-only. Please contact the server administrator 
to continue editing.'),
+   savefailed: _('Document cannot be saved to storage. Check your 
permissions or contact the storage server administrator.')
+};
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index d88961b..5f72068 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -239,6 +239,17 @@ L.Socket = L.Class.extend({
 
return;
}
+   else if (textMsg.startsWith('error:') && command.errorCmd === 
'storage') {
+   if (command.errorKind === 'savediskfull') {
+   // Just warn the user
+   this

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

[Stephan Bergmann]

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

New commits:
commit a722ac370f7fca95e63c235b027420cdd7d648d5
Author: Stephan Bergmann 
Date:   Tue Nov 22 09:19:27 2016 +0100

Make sure there's a single global RTTI for SfxLinkItem

...as otherwise dynamic_cast(...) could fail at least on 
macOS (as
observed with CppunitTest_sc_screenshots)

(cherry picked from commit c5940eab8ecfbd0d878f6fe714db32fd9d3e73c3)
Conflicts:
include/sfx2/app.hxx

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

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 4978bc7..c868033 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -88,7 +88,7 @@ namespace sfx2
 }
 }
 
-class SfxLinkItem : public SfxPoolItem
+class SFX2_DLLPUBLIC SfxLinkItem : public SfxPoolItem
 {
 Link aLink;
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: offapi/com offapi/type_reference

[Eike Rathke]

Hi Zolnai,

On Tuesday, 2016-11-22 21:43:11 +0100, Eike Rathke wrote:

> What now needs to be done is
> [...]

Thanks a lot for taking care of that!

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
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: Extending enums in IDL

[Stephan Bergmann]

On 11/23/2016 12:04 PM, Jan Holesovsky wrote:

But you caught my interest now - so if I understand that correctly, it
is not a terrible breakage what's going on here: The client just gets an
unknown value; ie. the same thing as when we add a constant to the IDL,
and return this unknown new value - right?


No, there are differences between (incompatibly) extending an UNOIDL 
enum and (compatibly) extending a UNOIDL constants group; both technical 
and contractual differences:


The Java UNO runtime represents UNOIDL enum values as non-null 
references to specific Java class instances (where those classes are 
derived from com.sun.star.uno.Enum).  The bytecode generated for those 
classes contains functions that map from enum integer values (as 
obtained through the UNO bridges) to instances of those classes.  For 
invalid values, that bytecode happens to return null references (it 
could also throw exceptions, say).  So Java code confronted with an 
extended UNOIDL enum will likely throw NullPointerExceptions and fail.


And in other languages like C++ too, client code can rely on the 
contract that a published UNOIDL enum will not change and have code like


  switch (e) { // exhaustively cover all cases
  case E1: ...;
  case E2: ...;
  case E3: ...;
  default: std::abort();
  }

that will fail when the enum does change.

(Whether the consequences of such an incompatible change are considered 
dramatic enough to forbid the change is another matter.  Forbidding such 
a change and installing an alternative solution can have negative 
consequences too, so the pros and cons need to be weighed.)


On the other hand, a UNOIDL constant group is just that---a group of 
named constants.  Extending it, by definition, does not have 
compatibility implications.  A constant group is typically not used in 
isolation:  There is some concept that is represented (in method 
parameters and return values, struct members, etc.) by some UNOIDL 
integer type, and, for convenience, the supported values and their 
meanings are bundled in a constant group.  The places in .idl files that 
use that concept (by declaring method parameters and return values, 
struct members, etc. of that underlying integer type) will carry 
documentation pointing at the constant group, and will (implicitly or 
explicitly) state that the set of supported values is not fixed and can 
expand over time.


For client code that means:  When consuming such an integer value it 
must be prepared to be presented with a value it does not know.  And 
when producing such an integer value it must be prepared that any 
consumer does not know the value.  Code written in such a way that it 
does not support those requirements is broken.

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

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - desktop/util desktop/win32

[Samuel Mehrbrodt]

 desktop/util/officeloader.rc |   10 +-
 desktop/win32/source/applauncher/launcher.rc |   10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit cf969dddfbbe082d727707a7979dcdb0c31d8ad5
Author: Samuel Mehrbrodt 
Date:   Wed Nov 23 11:34:53 2016 +0100

Fake process metadata to support Dragnon NS 14

Make DNS believe we are OpenOffice 4, not LibreOffice 5

Change-Id: If1ec43bb31f14883d7f28a23f854b9d7eb71ef78

diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index a7d65d2..bfcd24e 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -24,8 +24,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSIONVERSION, SUBVERSION, MICROVERSION, VERVARIANT
-PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+FILEVERSION4,0,9774,500
+PRODUCTVERSION 4,0,9774,500
 FILEFLAGSMASK 0x3F
 FILEFLAGS
 #if defined(DEBUG)
@@ -44,9 +44,9 @@ VS_VERSION_INFO VERSIONINFO
 {
 // International StringTable
 VALUE "CompanyName",  PPS(RES_APP_VENDOR) "\0"
-VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\0"
-VALUE "FileVersion",  PPS(VER_LEVEL) "\0"
-VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
+VALUE "FileDescription",  "OpenOffice 4.1.1\0"
+VALUE "FileVersion",  "4.00.9774\0"
+VALUE "ProductVersion",   "4.00.9774\0"
 VALUE "ProductName",  "LibreOffice\0"
 VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
 VALUE "InternalName", PPS(RES_APP_NAME) "\0"
diff --git a/desktop/win32/source/applauncher/launcher.rc 
b/desktop/win32/source/applauncher/launcher.rc
index f717bcb..6210ab1 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -24,8 +24,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSIONVERSION, SUBVERSION, MICROVERSION, VERVARIANT
-PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+FILEVERSION4,0,9774,500
+PRODUCTVERSION 4,0,9774,500
 FILEFLAGSMASK 0x3F
 FILEFLAGS
 #if defined(DEBUG)
@@ -44,9 +44,9 @@ VS_VERSION_INFO VERSIONINFO
 {
 // International StringTable
 VALUE "CompanyName",  PPS(RES_APP_VENDOR) "\0"
-VALUE "FileDescription",  PPS(RES_APP_FILEDESC) "\0"
-VALUE "FileVersion",  PPS(VER_LEVEL) "\0"
-VALUE "ProductVersion",   PPS(VER_LEVEL) "\0"
+VALUE "FileDescription",  "OpenOffice 4.1.1\0"
+VALUE "FileVersion",  "4.00.9774\0"
+VALUE "ProductVersion",   "4.00.9774\0"
 VALUE "ProductName",  "LibreOffice\0"
 VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
 VALUE "InternalName", PPS(RES_APP_NAME) "\0"
___
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/libreoffice-5-3-branch-point'

[Miklos Vajna]

Tag 'libreoffice-5-3-branch-point' created by Andras Timar 
 at 2016-11-23 11:45 +

libreoffice-5-3-branch-point

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

[Libreoffice-commits] online.git: Changes to 'libreoffice-5-3'

[Miklos Vajna]

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

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

[Caolán McNamara]

 vcl/source/window/syswin.cxx  |4 
 vcl/unx/gtk3/gtk3gtkframe.cxx |4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 37ded4ac7b1fe91bb08eaada29d3514570432073
Author: Caolán McNamara 
Date:   Tue Nov 15 15:05:44 2016 +

Resolves: tdf#102957 revert SetMinOutputSizePixel workaround

of

commit afeddaf7e0d11ad9b1df0c80bcc3f50caa87e21a
Author: Caolán McNamara 
Date:   Wed Dec 16 10:46:10 2015 +

Related: rhbz#1281906 set a min size on un-resizeable non-layout dialogs

and using a mixture of gtk_window_set_default_size before its visible, and
gtk_window_set_default_size + gtk_window_resize after its shown now works 
for
me under wayland so the original problem can be solved that way

Change-Id: Iaf8fd3019a7e902ad07b6825f919c6f25288e9b7
(cherry picked from commit 7e2ef433d29fca84ed27a9203b5761dc8dbd8bf8)
Reviewed-on: https://gerrit.libreoffice.org/30875
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 660328b..6603de2 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1113,10 +1113,6 @@ void SystemWindow::DoInitialLayout()
 mbIsCalculatingInitialLayoutSize = false;
 mbInitialLayoutDone = true;
 }
-else if (IsDialog() && !(GetStyle() & WB_SIZEABLE))
-{
-SetMinOutputSizePixel(GetSizePixel());
-}
 }
 
 void SystemWindow::doDeferredInit(WinBits /*nBits*/)
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index ecd77ee..d74f7b8 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -884,7 +884,9 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight)
 {
 m_nWidthRequest = nWidth;
 m_nHeightRequest = nHeight;
-gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight);
+gtk_window_set_default_size(GTK_WINDOW(m_pWindow), nWidth, nHeight);
+if (gtk_widget_get_visible(m_pWindow))
+gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight);
 }
 
 void GtkSalFrame::resizeWindow( long nWidth, long nHeight )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |   51 +++---
 1 file changed, 28 insertions(+), 23 deletions(-)

New commits:
commit cefb442114814cc4801cd227633853a9bf103ce2
Author: Caolán McNamara 
Date:   Wed Nov 16 10:16:29 2016 +

gtk3: problems with gdk_drag_status under wayland

under wayland, the value selected by gdk_drag_status is not immediately
available via gdk_drag_context_get_selected_action, so use the value
we set on it, not the value it claims to have

pull common code together as getPreferredDragAction

Change-Id: I4d95c4b8183505f2203ad1a8f6947df983ce8d21
(cherry picked from commit 09972f971e13ff967c9897d50ba5fbf0f862e8a4)
Reviewed-on: https://gerrit.libreoffice.org/30899
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d74f7b8..b728782 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3230,6 +3230,23 @@ namespace
 }
 }
 
+namespace
+{
+static GdkDragAction getPreferredDragAction(sal_Int8 dragOperation)
+{
+GdkDragAction eAct(static_cast(0));
+
+if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_MOVE)
+eAct = GDK_ACTION_MOVE;
+else if (dragOperation & 
css::datatransfer::dnd::DNDConstants::ACTION_COPY)
+eAct = GDK_ACTION_COPY;
+else if (dragOperation & 
css::datatransfer::dnd::DNDConstants::ACTION_LINK)
+eAct = GDK_ACTION_LINK;
+
+return eAct;
+}
+}
+
 class GtkDropTargetDropContext : public 
cppu::WeakImplHelper
 {
 GdkDragContext *m_pContext;
@@ -3244,16 +3261,7 @@ public:
 // XDropTargetDropContext
 virtual void SAL_CALL acceptDrop(sal_Int8 dragOperation) 
throw(std::exception) override
 {
-GdkDragAction eAct(static_cast(0));
-
-if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_MOVE)
-eAct = GDK_ACTION_MOVE;
-else if (dragOperation & 
css::datatransfer::dnd::DNDConstants::ACTION_COPY)
-eAct = GDK_ACTION_COPY;
-else if (dragOperation & 
css::datatransfer::dnd::DNDConstants::ACTION_LINK)
-eAct = GDK_ACTION_LINK;
-
-gdk_drag_status(m_pContext, eAct, m_nTime);
+gdk_drag_status(m_pContext, getPreferredDragAction(dragOperation), 
m_nTime);
 }
 
 virtual void SAL_CALL rejectDrop() throw(std::exception) override
@@ -3406,16 +3414,7 @@ public:
 
 virtual void SAL_CALL acceptDrag(sal_Int8 dragOperation) 
throw(std::exception) override
 {
-GdkDragAction eAct(static_cast(0));
-
-if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_MOVE)
-eAct = GDK_ACTION_MOVE;
-else if (dragOperation & 
css::datatransfer::dnd::DNDConstants::ACTION_COPY)
-eAct = GDK_ACTION_COPY;
-else if (dragOperation & 
css::datatransfer::dnd::DNDConstants::ACTION_LINK)
-eAct = GDK_ACTION_LINK;
-
-gdk_drag_status(m_pContext, eAct, m_nTime);
+gdk_drag_status(m_pContext, getPreferredDragAction(dragOperation), 
m_nTime);
 }
 
 virtual void SAL_CALL rejectDrag() throw(std::exception) override
@@ -3457,12 +3456,18 @@ gboolean GtkSalFrame::signalDragMotion(GtkWidget 
*pWidget, GdkDragContext *conte
 //preliminary accept the Drag and select the preferred action, the fire_* 
will
 //inform the original caller of our choice and the callsite can decide
 //to overrule this choice. i.e. typically here we default to ACTION_MOVE
-pContext->acceptDrag(GdkToVcl(gdk_drag_context_get_actions(context)));
+sal_Int8 nSourceActions = GdkToVcl(gdk_drag_context_get_actions(context));
+GdkDragAction eAction = getPreferredDragAction(nSourceActions);
+gdk_drag_status(context, eAction, time);
 aEvent.Context = pContext;
 aEvent.LocationX = x;
 aEvent.LocationY = y;
-aEvent.DropAction = 
GdkToVcl(gdk_drag_context_get_selected_action(context));
-aEvent.SourceActions = GdkToVcl(gdk_drag_context_get_actions(context));
+//under wayland at least, the action selected by gdk_drag_status on the
+//context is not immediately available via 
gdk_drag_context_get_selected_action
+//so here we set the DropAction from what we selected on the context, not
+//what the context says is selected
+aEvent.DropAction = GdkToVcl(eAction);
+aEvent.SourceActions = nSourceActions;
 
 if (!pThis->m_bInDrag)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/window/floatwin.cxx   |   11 ---
 vcl/source/window/menufloatingwindow.cxx |6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 5210e1ba38bfe996a888f21673640de13b49508b
Author: Caolán McNamara 
Date:   Mon Nov 14 11:33:24 2016 +

Resolves: tdf#103914 if menu no longer has focus, leave focus where it is

In the normal course of events, the menu, or its children, has focus when 
its
popped down, in this case continue to restored the focus to the previous 
focus
window which had it when the menu appeared.

If some other non-child window of the menu has focus as popdown time, leave
the focus where it is.

Change-Id: Ia860f90350653ad4d8056738dacbc434fb364989
(cherry picked from commit 616bc7b854e237aea1962a6750abd7f139e38ac2)
Reviewed-on: https://gerrit.libreoffice.org/30862
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index c24706b..e1fb623 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -793,12 +793,17 @@ void FloatingWindow::ImplEndPopupMode( 
FloatWinPopupEndFlags nFlags, const VclPt
 {
 Show( false, ShowFlags::NoFocusChange );
 
-// maybe pass focus on to a suitable FloatingWindow
-if ( xFocusId != nullptr )
-Window::EndSaveFocus( xFocusId );
+if (HasChildPathFocus() && xFocusId != nullptr)
+{
+// restore focus to previous focus window if we still have the 
focus
+Window::EndSaveFocus(xFocusId);
+}
 else if ( pSVData->maWinData.mpFocusWin && 
pSVData->maWinData.mpFirstFloat &&
   ImplIsWindowOrChild( pSVData->maWinData.mpFocusWin ) )
+{
+// maybe pass focus on to a suitable FloatingWindow
 pSVData->maWinData.mpFirstFloat->GrabFocus();
+}
 mbPopupModeTearOff = false;
 }
 else
diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index 52ccac0..0602461 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -403,11 +403,11 @@ void MenuFloatingWindow::End()
 if (GetParent() && !GetParent()->IsDisposed())
 GetParent()->ImplDecModalCount();
 
-// restore focus
+// restore focus to previous window if we still have the focus
 VclPtr xFocusId(xSaveFocusId);
-if (xFocusId != nullptr)
+xSaveFocusId = nullptr;
+if (HasChildPathFocus() && xFocusId != nullptr)
 {
-xSaveFocusId = nullptr;
 ImplGetSVData()->maWinData.mbNoDeactivate = false;
 Window::EndSaveFocus(xFocusId);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/headless/svpgdi.cxx   |4 +++-
 vcl/inc/headless/svpgdi.hxx   |4 ++--
 vcl/unx/gtk3/gtk3gtkframe.cxx |   16 +++-
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |6 ++
 4 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit e7a4b5e3e621b963644bd83578ee053ba1c8ff7c
Author: Caolán McNamara 
Date:   Mon Nov 14 16:23:00 2016 +

gtk3: scrollbar damage area one pixel too narrow/short

under default Ambience theme Ubuntu 16.04

tools rectangle strikes again, rejig to be left/top +
width/height rather than left/top + right/bottom

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

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 74ce2b9..63c60ca 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1360,7 +1360,9 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, 
bool bXorModeAllowed, cons
 
 if (pDamage)
 {
-pDamage->damaged(pDamage->handle, nExtentsLeft, nExtentsTop, 
nExtentsRight, nExtentsBottom);
+pDamage->damaged(pDamage->handle, nExtentsLeft, nExtentsTop,
+  nExtentsRight - nExtentsLeft,
+  nExtentsBottom - nExtentsTop);
 }
 }
 
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 7ac3809..85bb4b0 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -68,8 +68,8 @@ typedef struct _cairo_user_data_key cairo_user_data_key_t;
 enum PaintMode { OVERPAINT, XOR, INVERT };
 
 typedef void (*damageHandler)(void* handle,
-  sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop,
-  sal_Int32 nExtentsRight, sal_Int32 
nExtentsBottom);
+  sal_Int32 nExtentsX, sal_Int32 nExtentsY,
+  sal_Int32 nExtentsWidth, sal_Int32 
nExtentsHeight);
 
 struct VCL_DLLPUBLIC DamageHandler
 {
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 812e4b8..ecd77ee 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -952,12 +952,11 @@ GtkWidget *GtkSalFrame::getMouseEventWidget() const
 }
 
 static void damaged(void *handle,
-sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop,
-sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom)
+sal_Int32 nExtentsX, sal_Int32 nExtentsY,
+sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight)
 {
 GtkSalFrame* pThis = static_cast(handle);
-pThis->damaged(nExtentsLeft, nExtentsTop,
-   nExtentsRight, nExtentsBottom);
+pThis->damaged(nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight);
 }
 
 void GtkSalFrame::InitCommon()
@@ -2859,8 +2858,8 @@ cairo_t* GtkSalFrame::getCairoContext() const
 return cr;
 }
 
-void GtkSalFrame::damaged(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop,
-  sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom) 
const
+void GtkSalFrame::damaged(sal_Int32 nExtentsX, sal_Int32 nExtentsY,
+  sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) 
const
 {
 if (dumpframes)
 {
@@ -2872,9 +2871,8 @@ void GtkSalFrame::damaged(sal_Int32 nExtentsLeft, 
sal_Int32 nExtentsTop,
 }
 
 gtk_widget_queue_draw_area(GTK_WIDGET(m_pFixedContainer),
-   nExtentsLeft, nExtentsTop,
-   nExtentsRight - nExtentsLeft,
-   nExtentsBottom - nExtentsTop);
+   nExtentsX, nExtentsY,
+   nExtentsWidth, nExtentsHeight);
 }
 
 // blit our backing cairo surface to the target cairo context
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index d3becb6..ca73c1e 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1426,8 +1426,6 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 clipRegion(cr);
 cairo_translate(cr, rControlRegion.Left(), rControlRegion.Top());
 
-Rectangle aDamageRect(rControlRegion);
-
 long nX = 0;
 long nY = 0;
 long nWidth = rControlRegion.GetWidth();
@@ -1567,8 +1565,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 
 cairo_destroy(cr); // unref
 
-if (!aDamageRect.IsEmpty())
-mpFrame->damaged(aDamageRect.Left(), aDamageRect.Top(), 
aDamageRect.Right(), aDamageRect.Bottom());
+if (!rControlRegion.IsEmpty())
+mpFrame->damaged(rControlRegion.Left(), rControlRegion.Top(), 
rControlRegion.GetWidth(), rControlRegion.GetHeight());
 
 return true;
 }
___
Libreo

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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf82824.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   16 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit d36587570890d3366222fc9cca8482275db85b3b
Author: Miklos Vajna 
Date:   Tue Nov 15 09:19:45 2016 +0100

tdf#82824 DOCX import: fix at-char embedded object handling

The anchor type of embedded object was simply not handled, we always
assumed that it's as-char.

When it's at-char set the anchor type accordingly, and also set the
usual 6 properties determining the position of the anchored object.

(cherry picked from commit 10efab2b9a3cf7fc49655c90ba29db4512680c38)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

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

diff --git a/sw/qa/extras/ooxmlimport/data/tdf82824.docx 
b/sw/qa/extras/ooxmlimport/data/tdf82824.docx
new file mode 100644
index 000..65e5d4b
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf82824.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 13c8437..39ffc52 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3270,6 +3270,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf103664, "tdf103664.docx")
 CPPUNIT_ASSERT_EQUAL(awt::CharSet::SYMBOL, getProperty(xRun, 
"CharFontCharSet"));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf82824, "tdf82824.docx")
+{
+// This was text::TextContentAnchorType_AS_CHARACTER,  wasn't 
handled on import for the chart.
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getProperty(getShape(1), "AnchorType"));
+}
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 08de96e..855c131 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4766,7 +4766,21 @@ void  DomainMapper_Impl::ImportGraphic(const 
writerfilter::Reference< Properties
 
 // Update the shape properties if it is embedded object.
 if(m_xEmbedded.is()){
-UpdateEmbeddedShapeProps(m_pGraphicImport->GetXShapeObject());
+uno::Reference xShape = 
m_pGraphicImport->GetXShapeObject();
+UpdateEmbeddedShapeProps(xShape);
+if (eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
+{
+uno::Reference xEmbeddedProps(m_xEmbedded, 
uno::UNO_QUERY);
+text::TextContentAnchorType eAnchorType = 
text::TextContentAnchorType_AT_CHARACTER;
+xEmbeddedProps->setPropertyValue("AnchorType", 
uno::makeAny(eAnchorType));
+uno::Reference xShapeProps(xShape, 
uno::UNO_QUERY);
+xEmbeddedProps->setPropertyValue("HoriOrient", 
xShapeProps->getPropertyValue("HoriOrient"));
+xEmbeddedProps->setPropertyValue("HoriOrientPosition", 
xShapeProps->getPropertyValue("HoriOrientPosition"));
+xEmbeddedProps->setPropertyValue("HoriOrientRelation", 
xShapeProps->getPropertyValue("HoriOrientRelation"));
+xEmbeddedProps->setPropertyValue("VertOrient", 
xShapeProps->getPropertyValue("VertOrient"));
+xEmbeddedProps->setPropertyValue("VertOrientPosition", 
xShapeProps->getPropertyValue("VertOrientPosition"));
+xEmbeddedProps->setPropertyValue("VertOrientRelation", 
xShapeProps->getPropertyValue("VertOrientRelation"));
+}
 }
 //insert it into the document at the current cursor position
 OSL_ENSURE( xTextContent.is(), "DomainMapper_Impl::ImportGraphic");
___
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' - offapi/type_reference

[Stephan Bergmann]

 offapi/type_reference/offapi.idl |4 
 1 file changed, 4 insertions(+)

New commits:
commit eeb923d59cf24876517c5976edad9d803df63857
Author: Stephan Bergmann 
Date:   Mon Nov 21 18:21:04 2016 +0100

Update the reference rdbs to libreoffice-5-2

(This deliberately leaves out the published
css.mozilla.XRemoteServiceManagerProvider originally manually removed from
offapi/type_reference/offapi.idl with 
4c18af27bf95b332ee2006cfc0bbf469fb1a84d4
"tdf#96398 kill remaining NPAPI support for plugins _inside_ LO" and now 
fully
removed with b5589970125ae4b8c0a091cfc12d058ca42ce2ab "[API CHANGE] Remove
tdf#96398 leftover XRemoteServiceManagerProvider".)

Change-Id: I75d4cd82ba306099e2563a44739bfb3867a265e9
(cherry picked from commit 76683829204103446476443b099492c402929004)
Reviewed-on: https://gerrit.libreoffice.org/31045
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 1785f24..c726834 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -1481,6 +1481,7 @@ module com {
  [property] ::com::sun::star::util::Color TextColor;
  [property] ::com::sun::star::util::Color TextLineColor;
  [property, optional] ::com::sun::star::style::VerticalAlignment 
VerticalAlign;
+ [property, optional] boolean NoLabel;
 };
 published service UnoControlFormattedField {
  service ::com::sun::star::awt::UnoControlEdit;
@@ -11896,6 +11897,7 @@ module com {
  [property, optional, readonly] ::com::sun::star::awt::XDevice 
ReferenceDevice;
  [property, optional] boolean RecordChanges;
  [property, optional, readonly] boolean IsRecordChangesProtected;
+ [property, optional] boolean Wildcards;
 };
 published interface XFunctionAccess {
  interface ::com::sun::star::uno::XInterface;
@@ -17194,6 +17196,7 @@ module com {
  [property] short SearchSimilarityRemove;
  [property] short SearchSimilarityAdd;
  [property] short SearchSimilarityExchange;
+ [property, optional] boolean SearchWildcard;
 };
 published interface XReplaceDescriptor {
  interface ::com::sun::star::util::XSearchDescriptor;
@@ -17218,6 +17221,7 @@ module com {
  /** @deprecated */ const long REG_NOSUB = 512;
  const long REG_NOT_BEGINOFLINE = 2048;
  const long REG_NOT_ENDOFLINE = 4096;
+ const long WILD_MATCH_SELECTION = 1048576;
 };
 published struct SearchOptions {
  ::com::sun::star::util::SearchAlgorithms algorithmType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - offapi/com offapi/UnoApi_offapi.mk sc/inc sc/qa sc/source

[Tamás Zolnai]

 offapi/UnoApi_offapi.mk|1 
 offapi/com/sun/star/sheet/DataPilotField.idl   |   32 +++
 offapi/com/sun/star/sheet/DataPilotSourceDimension.idl |6 
 offapi/com/sun/star/sheet/DataPilotSourceLevel.idl |7 
 offapi/com/sun/star/sheet/GeneralFunction2.idl |  111 
 sc/inc/dapiuno.hxx |   13 -
 sc/inc/dpobject.hxx|2 
 sc/inc/dpoutput.hxx|1 
 sc/inc/dpsave.hxx  |4 
 sc/inc/dptabsrc.hxx|7 
 sc/inc/dputil.hxx  |1 
 sc/inc/miscuno.hxx |2 
 sc/inc/unonames.hxx|4 
 sc/qa/extras/check_data_pilot_field.cxx|4 
 sc/qa/unit/subsequent_export-test.cxx  |   18 --
 sc/qa/unit/subsequent_filters-test.cxx |4 
 sc/source/core/data/dpobject.cxx   |   64 +++
 sc/source/core/data/dpoutput.cxx   |   40 ++--
 sc/source/core/data/dpsave.cxx |   15 -
 sc/source/core/data/dptabres.cxx   |   13 -
 sc/source/core/data/dptabsrc.cxx   |   66 ++-
 sc/source/core/data/dputil.cxx |   30 ++-
 sc/source/core/tool/interpr2.cxx   |2 
 sc/source/filter/xml/XMLConverter.cxx  |   70 +--
 sc/source/filter/xml/XMLConverter.hxx  |7 
 sc/source/filter/xml/XMLExportDataPilot.cxx|   10 -
 sc/source/filter/xml/xmldpimp.cxx  |5 
 sc/source/ui/unoobj/dapiuno.cxx|  150 +++--
 sc/source/ui/unoobj/datauno.cxx|6 
 sc/source/ui/unoobj/miscuno.cxx|   18 ++
 30 files changed, 509 insertions(+), 204 deletions(-)

New commits:
commit f8daf04a1d06f870202a1f1868b59ce90adde0e4
Author: Tamás Zolnai 
Date:   Wed Nov 23 04:50:02 2016 +

[API Change]: Create new GeneralFunction2 for adding median

New functionality added to pivot table became fully
broken with Eike's revertion:
50244309501d738e7314fa79785db139c826f8d7
This commit fixes this problem.

Reviewed-on: https://gerrit.libreoffice.org/31096
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit c0d4aadf08c16f2d79508367c631366f7a856346)

GeneralFunction is not an enum anymore

Reviewed-on: https://gerrit.libreoffice.org/31103
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 5b7b2c8649596299c8f00b8b3b5056d272e25ccd)

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

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b5657f7..c53b2d9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3409,6 +3409,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/sheet,\
FunctionArgument \
FunctionCategory \
GeneralFunction \
+   GeneralFunction2 \
GoalResult \
IconSetFormatEntry \
IconSetType \
diff --git a/offapi/com/sun/star/sheet/DataPilotField.idl 
b/offapi/com/sun/star/sheet/DataPilotField.idl
index edc84ae..b9f6b2b 100644
--- a/offapi/com/sun/star/sheet/DataPilotField.idl
+++ b/offapi/com/sun/star/sheet/DataPilotField.idl
@@ -98,7 +98,6 @@ published service DataPilotField
  */
 [property, optional] sequence Subtotals;
 
-
 /** specifies the selected page which is used to filter the data pilot.
  */
 [property, optional] string SelectedPage;
@@ -175,6 +174,37 @@ published service DataPilotField
 /** specifies whether to show this field also if it is empty or not.
  */
 [property, optional] boolean ShowEmpty;
+
+/** specifies the function used to calculate results for this field.
+
+For column and row fields, this is the function for subtotals
+(GeneralFunction2::NONE means no subtotals).
+For data fields, this is the function shown in the data pilot
+table.
+
+@since LibreOffice 5.3
+ */
+
+[property, optional] short Function2;
+
+/** specifies the functions used to calculate subtotals for this field.
+
+This property is supported by column and row fields only.
+
+An empty sequence means no subtotals. The same effect can be
+achieved by setting the property #Function2 to the
+value GeneralFunction::NONE. If the length of the
+sequence is greater then 1, then the sequence MUST NOT contain one of
+the values GeneralFunction2::NONE or
+GeneralFunction2::AUTO.
+
+The ord

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw

[David Tardon]

 configure.ac  |2 
 download.lst  |4 
 external/libmwaw/0001-fix-build-with-MSVC.patch.1 |  106 ++
 external/libmwaw/0001-fix-build-with-msvc.patch.1 |   54 ---
 external/libmwaw/Library_mwaw.mk  |2 
 external/libmwaw/UnpackedTarball_libmwaw.mk   |2 
 6 files changed, 112 insertions(+), 58 deletions(-)

New commits:
commit 14fc834aebdf4de9276a93e9f595b150a86ee16f
Author: David Tardon 
Date:   Tue Nov 22 21:37:48 2016 +0100

upload libmwaw 0.3.9

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

diff --git a/configure.ac b/configure.ac
index 7e152a4..7ed5c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7868,7 +7868,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.8])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.9])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
diff --git a/download.lst b/download.lst
index f114ba2..9392459 100644
--- a/download.lst
+++ b/download.lst
@@ -104,8 +104,8 @@ export MDNSRESPONDER_MD5SUM := 
940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := 72ad446d76b157e30c1baf39bb288b99
-export MWAW_VERSION_MICRO := 8
+export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b
+export MWAW_VERSION_MICRO := 9
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-fix-build-with-MSVC.patch.1 
b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
new file mode 100644
index 000..ab60358
--- /dev/null
+++ b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
@@ -0,0 +1,106 @@
+From ae8f006018f6cfc79b86f327116f6ceed71692f9 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 23 Nov 2016 09:06:35 +0100
+Subject: [PATCH] fix build with MSVC
+
+---
+ src/lib/PowerPoint3Parser.cxx | 30 +++---
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx
+index 9ecbe1b..51348d6 100644
+--- a/src/lib/PowerPoint3Parser.cxx
 b/src/lib/PowerPoint3Parser.cxx
+@@ -1076,15 +1076,15 @@ bool PowerPoint3Parser::readDocInfo(MWAWEntry const 
&entry)
+   f << "],";
+   for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2));
+   if (!m_state->m_isMacFile) {
+-std::swap(dim[0],dim[1]);
+-std::swap(dim[2],dim[3]);
++std::swap(dim[0],dim[1]);
++std::swap(dim[2],dim[3]);
+   }
+   MWAWBox2i pageBox(MWAWVec2i(dim[1],dim[0]),MWAWVec2i(dim[3],dim[2]));
+   f << "dim[page]=" << pageBox << ",";
+   for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2));
+   if (!m_state->m_isMacFile) {
+-std::swap(dim[0],dim[1]);
+-std::swap(dim[2],dim[3]);
++std::swap(dim[0],dim[1]);
++std::swap(dim[2],dim[3]);
+   }
+   MWAWBox2i 
paperBox=MWAWBox2i(MWAWVec2i(dim[0],dim[1]),MWAWVec2i(dim[2],dim[3]));
+   f << "dim[paper]=" << paperBox << ",";
+@@ -1673,16 +1673,16 @@ bool PowerPoint3Parser::readSlideFormats(MWAWEntry 
const &entry, std::vectorreadLong(2));
+-if (!isMacFile) std::swap(dim[0],dim[1]);
++if (!isMacFile) std::swap(dim[0],dim[1]);
+ f << "dim0=" << MWAWVec2i(dim[1], dim[0]) << ",";
+ format.m_gradientOffset=int(input->readLong(2));
+ if (format.m_gradientOffset) f << "grad[col,offset]=" << 
format.m_gradientOffset << ",";
+ for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2));
+-if (!isMacFile) std::swap(dim[0],dim[1]);
++if (!isMacFile) std::swap(dim[0],dim[1]);
+ format.m_margins=MWAWVec2i(dim[1], dim[0]);
+ f << "box[margins]=" << format.m_margins << ",";
+ for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2));
+-if (!isMacFile) std::swap(dim[0],dim[1]);
++if (!isMacFile) std::swap(dim[0],dim[1]);
+ format.m_shadowOffset=MWAWVec2i(dim[1], dim[0]);
+ if (format.m_shadowOffset!=MWAWVec2i(0,0))
+   f << "shadow[offset]=" << format.m_shadowOffset << ",";
+@@ -1727,15 +1727,15 @@ bool PowerPoint3Parser::readSlidePolygons(MWAWEntry 
const &entry, std::vectorreadLong(2));
+ if (!isMacFile) {
+-  std::swap(dim[0],dim[1]);
+-  std::swap(dim[2],dim[3]);
++  std::swap(dim[0],dim[1]);
++  std::swap(dim[2],dim[3]);
+ }
+ poly.m_box=MWAWBox2i(MWAWVec2i(dim[1],dim[0]), MWAWVec2i(dim[3],dim[2]));
+ f << "box=

[Libreoffice-commits] core.git: Changes to 'private/jmux/tdf#102010'

[Jan-Marek Glogowski]

New branch 'private/jmux/tdf#102010' available with the following commits:
commit 621d9ef5821c9202da9398115d5a953575de240c
Author: Jan-Marek Glogowski 
Date:   Tue Oct 4 10:13:24 2016 +

tdf#102010 Never overwrite MM files via UNO

Fixes the regression introduced by
  commit e637b6743a506ef74c93ccbe15ab6642f3baa34f

This commit removed the crazy bSubjectIsFilename handling,
where I didn't understood the case of bSubjectIsFilename
and a user supplied prefix.

Mail merge to files never overwrites an existing document,
but there is the special case, when a user selects a target
filename in the MM dialog for single file MM.

Should be fixed by a successive commmit, reverting this and
removing an existing file before starting the MM job.

Change-Id: Idda487023e6984de9c1e701fc088a6b7f92e9847

commit 351a09dd8d34a433e6f93fef28baf5f19e87e437
Author: Jan-Marek Glogowski 
Date:   Mon Oct 3 21:51:56 2016 +0200

MM allow easier manipulation of MM test arguments

Keep the beans::NamedValue vector around and convert it to a
uno::Sequence just before executing the mail merge job.

Change-Id: Ib2b4863337af20fb4423cc1b4ea4223d66d63ae5

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

Extending enums in IDL

[Jan Holesovsky]

Hi Eike,

Eike Rathke píše v Út 22. 11. 2016 v 21:43 +0100:

> For Java, receiving an unknown UNO API enum value results in a null
> value. That can happen if an external Java process not knowing about the
> new enum value using older LO jar files connects against a LibreOffice
> process.

I heard this argument several times before, but did not actually care
enough to dig deeper into it; I just assumed that Java has some kind of
'enum' type that we use in the java bindings, and Things Break Horribly
(TM).

But you caught my interest now - so if I understand that correctly, it
is not a terrible breakage what's going on here: The client just gets an
unknown value; ie. the same thing as when we add a constant to the IDL,
and return this unknown new value - right?

I had a look what we actually do with the 'enum'; it's the following:

> javap 
> workdir/CustomTarget/unoil/javamaker/com/sun/star/sheet/GeneralFunction.class
public final class com.sun.star.sheet.GeneralFunction extends
com.sun.star.uno.Enum {
  public static final com.sun.star.sheet.GeneralFunction NONE;
  public static final int NONE_value;
  public static final com.sun.star.sheet.GeneralFunction AUTO;
  public static final int AUTO_value;
[...]
  public static com.sun.star.sheet.GeneralFunction getDefault();
  public static com.sun.star.sheet.GeneralFunction fromInt(int);
}

So it is subclassed from

  ridljar/com/sun/star/uno/Enum.java

which does not even indicate we'd get a null, but only the (unknown)
value.

For comparison, the constants look like this:

> javap 
> workdir/CustomTarget/unoil/javamaker/com/sun/star/sheet/ConditionEntryType.class
>  
public interface com.sun.star.sheet.ConditionEntryType {
  public static final int COLORSCALE;
  public static final int CONDITION;
  public static final int DATABAR;
  public static final int DATE;
  public static final int ICONSET;
}

From all this, it seems to me that adding a new value to the enum is no
different than adding a new constant: in both cases the client just gets
a value it does not understand, and has to deal with that.

Of course - adding the value in the middle of the enum is a different
story, as the rest of it gets renumbered (which _is_ a real problem, and
should be avoided), but adding at the end seems to me like something we
shouldn't be afraid of - it's just the same as adding a new constant.

Or am I missing anything?

Thank you,
Kendy

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

[Libreoffice-commits] core.git: Changes to 'private/jmux/new-vcl-scheduler+win+fixes'

[Jan-Marek Glogowski]

New branch 'private/jmux/new-vcl-scheduler+win+fixes' available with the 
following commits:
commit 6a1c1556bfdd1c1c65524006f221782d97f9c67d
Author: Jan-Marek Glogowski 
Date:   Sat Jan 2 02:06:36 2016 +0100

dummy bookmark test

Change-Id: Ief362b4d614d71dfdf1bf4fc9e0dc8ae13ecd8c6

commit b6cf44effd948dfad0a8ea7c98c6ca7536e5b994
Author: Jan-Marek Glogowski 
Date:   Mon Jan 25 14:23:08 2016 +0100

Helper to validate URLs with system path fallback

A lot of places work with URLs but need to handle system path input
gracefully. Refactors and removes some duplicated code.

Change-Id: I164b124a074f7faa2f802bcd5609ebadab769aa4

commit 0fc911ae3738701a3240aa66d8b1712b471acbf1
Author: Jan-Marek Glogowski 
Date:   Fri Jan 8 11:18:00 2016 +0100

MM don't generate documents for invalid emails

If we don't have a valid mail address, there is no point merging a
document.

We also have to account differently for documents with fields of
type RES_DBNEXTSETFLD or RES_DBNUMSETFLD, as these would advance
the document cursor for multiple rows.

Sadly there is currently no way to inform the user of bad email
entries. As before these entries are just skipped.

Change-Id: I2b02174e173b8b721c7394d47febfefd3b3066e9

commit d52f5fe826b9c3bb43e0d6b6b824ed054445f8b2
Author: Jan-Marek Glogowski 
Date:   Sun Oct 30 10:10:49 2016 +0100

Move ImplFrameData initialization into constructor

Change-Id: Id918ae46ed521fca5675845b2eb9cd26a8c7ebbb

commit 2e6a3587478e9cf6c3ea8f1a140bec48ed64d234
Author: Jan-Marek Glogowski 
Date:   Sun Oct 16 21:04:59 2016 +

Fix MouseOver handling for various controls

This fixes the mouse over handling for Edit, ComboBox,
ImplSmallBorderWindowView and ListBox.

Change-Id: I6d3e91f786a4e43ca308f55baa9987db6d78949c

commit dbfe110ec646d6e100983825a211b5e4d3a28bef
Author: Jan-Marek Glogowski 
Date:   Sun Oct 16 19:57:29 2016 +

Change compound OnMouseOver handling

This sends Notify events to the compound window, if the mouse
enters to any of the childrens, or leaves from any of the children
outside of the compound window / control.

Additionally all leave events from the compound window are
dropped, if the mouse moves to a child control.

This allows us to skip a lot of redraws AKA flickers for border
focus indicating themes (mbNoFocusRects).

Change-Id: Ibc03226b1cb86443b62a688d3b98f17811b3db61

commit e4ad22632497738bddfbfaca3c03150c7c30c55f
Author: Jan-Marek Glogowski 
Date:   Wed Oct 12 19:44:08 2016 +0200

Drop ListBox include from ComboBox header

ComboBox just uses ListBox internally

Change-Id: Ieed279160db1c9918bd9f3e37102b59ea62f0581

commit b2c97dc03ad03b7205e1839eddba2a5ca044f77e
Author: Jan-Marek Glogowski 
Date:   Sun Oct 9 17:14:54 2016 +

KDE4 fix wrong fallthrough

Was found and marked in 03f440c379a03500a40cc34097c68a150d7a226d,
but is definitly wrong.

Change-Id: I6d04814fb8f25a92dfaf96d8face855315cc0208

commit c350066ec8128cffaedafcc97185b3385f19a463
Author: Jan-Marek Glogowski 
Date:   Sun Oct 9 16:32:04 2016 +

Assume pWin exists while drawing

Change-Id: Id392b7c42d6470230a4d9f627704286e532dce3e

commit a4cbc57e57f234e2ec020f4ddf92288467e9ad22
Author: Jan-Marek Glogowski 
Date:   Sun Oct 9 16:35:57 2016 +

Fix focus and rollover for vcl::ListBox

Change-Id: I4fffd086a38b54c673a199ea0603d25ca54aacd1

commit 17d49c8fe07ab5cdff3115d30daa1e5689288d47
Author: Jan-Marek Glogowski 
Date:   Sun Oct 9 16:34:54 2016 +

KDE4 use correct ComboBox frame pixel metric

Change-Id: I03fa5489ffc5cd5bb386bb321519c61058db4fda

commit d612f65e37ca41cb8b131decae46c10acf84c9ee
Author: Jan-Marek Glogowski 
Date:   Sun Oct 9 17:54:22 2016 +0200

KDE4 rely on style()->pixelMetric for frame width

Change-Id: I7a1e89c0c058bab0b6665e2b96b22251dcb51f4f

commit 3e85abfd9501b9008b8ac39ecbaff22ab81e7a5c
Author: Jan-Marek Glogowski 
Date:   Sun Oct 9 10:50:44 2016 +

Update duplicated / outdated NWS documentation

Removes the old, copied NWS documentation blocks from all native
implementations and update the parent SalGraphics documentation.

Change-Id: I0eff8ea0987c5c841e1b023340b1c3787c09e2ca

commit bab4789529bb09c05fa351061ccc2137e4a05332
Author: Jan-Marek Glogowski 
Date:   Sat Oct 8 14:51:32 2016 +

Fix metric spinbox tool item size

Instead of guessing, use the CalcMinimumSize(), which also knows
about theming.

Change-Id: I747571b48c81166d11d03f99ab564b1a25165ef3

commit cc3fe5168890da1e9d6414acd093817fd36dea81
Author: Jan-Marek Glogowski 
Date:   Sat Oct 8 07:03:28 2016 +0200

tdf#78924 KDE4 drop special Combobox code

At least not needed with breeze KDE4 theme.

Change-Id: I71a05c395d04a6f19c3bcd681450318831b0c29f

commit b902d6e9f07ae6bc77a47ac627

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

[Miklos Vajna]

 sw/source/filter/ww8/rtfexportfilter.cxx |4 +---
 sw/source/filter/ww8/rtfstringbuffer.cxx |   15 +--
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 6920eb20ae271b4f1cdbf574eb4beb8c796fcc6d
Author: Miklos Vajna 
Date:   Wed Nov 23 09:15:14 2016 +0100

sw: clean up redundant initializers in rtfstringbuffer

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

diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx 
b/sw/source/filter/ww8/rtfexportfilter.cxx
index 34bdd46..8170723 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -36,9 +36,7 @@ RtfExportFilter::RtfExportFilter(const uno::Reference< 
uno::XComponentContext >&
 {
 }
 
-RtfExportFilter::~RtfExportFilter()
-{
-}
+RtfExportFilter::~RtfExportFilter() = default;
 
 sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& 
aDescriptor) throw(uno::RuntimeException, std::exception)
 {
diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx 
b/sw/source/filter/ww8/rtfstringbuffer.cxx
index a8394d0..3d7cffc 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.cxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.cxx
@@ -10,15 +10,13 @@
 #include "rtfattributeoutput.hxx"
 
 RtfStringBufferValue::RtfStringBufferValue()
-: m_aBuffer(),
-  m_pFlyFrameFormat(nullptr),
+: m_pFlyFrameFormat(nullptr),
   m_pGrfNode(nullptr)
 {
 }
 
 RtfStringBufferValue::RtfStringBufferValue(const SwFlyFrameFormat* 
pFlyFrameFormat, const SwGrfNode* pGrfNode)
-: m_aBuffer(),
-  m_pFlyFrameFormat(pFlyFrameFormat),
+: m_pFlyFrameFormat(pFlyFrameFormat),
   m_pGrfNode(pGrfNode)
 {
 }
@@ -41,10 +39,7 @@ bool RtfStringBufferValue::isGraphic() const
 return m_pFlyFrameFormat != nullptr && m_pGrfNode != nullptr;
 }
 
-RtfStringBuffer::RtfStringBuffer()
-: m_aValues()
-{
-}
+RtfStringBuffer::RtfStringBuffer() = default;
 
 sal_Int32 RtfStringBuffer::getLength() const
 {
@@ -73,7 +68,7 @@ OString RtfStringBuffer::makeStringAndClear()
 OStringBuffer& RtfStringBuffer::getLastBuffer()
 {
 if (m_aValues.empty() || m_aValues.back().isGraphic())
-m_aValues.push_back(RtfStringBufferValue());
+m_aValues.emplace_back(RtfStringBufferValue());
 return m_aValues.back().m_aBuffer;
 }
 
@@ -89,7 +84,7 @@ void RtfStringBuffer::clear()
 
 void RtfStringBuffer::append(const SwFlyFrameFormat* pFlyFrameFormat, const 
SwGrfNode* pGrfNode)
 {
-m_aValues.push_back(RtfStringBufferValue(pFlyFrameFormat, pGrfNode));
+m_aValues.emplace_back(RtfStringBufferValue(pFlyFrameFormat, pGrfNode));
 }
 
 void RtfStringBuffer::appendAndClear(RtfStringBuffer& rBuf)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regarding gsoc 2017

[Jan Iversen]

Welcome.

The first thing you need to do is to get libre office build on your computer, 
and then submit some patches.

here is a guide to help you:
https://wiki.documentfoundation.org/Development/GetInvolved 


have fun
rgds
jan I.

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

Regarding gsoc 2017

[Nikhil Kumar vats]

I want to contribute to LibreOffice in gsoc 2017. Can you provide me
direction?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar]

Tag '1.9.9' created by Andras Timar  at 2016-11-23 
10:30 +

1.9.9

Changes since 2.0-rc1-115:
---
 0 files changed
---
___
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/2.0-rc2'

[Andras Timar]

Tag '2.0-rc2' created by Andras Timar  at 
2016-11-23 10:30 +

2.0-rc2

Changes since 2.0-rc1-115:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sdext/source/presenter/PresenterAccessibility.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f6d2ff1cb7f0f4917a0d4df38d5dcff8e37d20cc
Author: Michael Stahl 
Date:   Tue Nov 22 22:49:15 2016 +0100

presenter console: fix STL assert when exiting slide show

AtkListener::handleChildRemoved() calls removeAccessibleEventListener(),
apparently without the listener being registered, so the remove() returns
end(), which isn't valid for erase().

(probably happens since e4e208fa2b0930be5a7cbbe2fab2ff2fe2c4a1ff)

Change-Id: Ia0de1bafe214f5a46f250d6573d8c4b408c9cf26

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx 
b/sdext/source/presenter/PresenterAccessibility.cxx
index 7c474b2..48916ebf0 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -1109,7 +1109,11 @@ void SAL_CALL 
PresenterAccessible::AccessibleObject::removeAccessibleEventListen
 {
 const osl::MutexGuard aGuard(m_aMutex);
 
-maListeners.erase(std::remove(maListeners.begin(), maListeners.end(), 
rxListener));
+auto const it(std::remove(maListeners.begin(), maListeners.end(), 
rxListener));
+if (it != maListeners.end())
+{
+maListeners.erase(it);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 dbaccess/source/ui/app/AppController.cxx   |4 
 dbaccess/source/ui/app/AppControllerDnD.cxx|2 
 dbaccess/source/ui/dlg/detailpages.cxx |   40 +++---
 dbaccess/source/ui/dlg/detailpages.hxx |   20 +--
 dbaccess/source/ui/dlg/dlgsave.cxx |   20 +--
 dbaccess/source/ui/dlg/paramdialog.cxx |   23 +--
 dbaccess/source/ui/inc/commontypes.hxx |1 
 dbaccess/source/ui/inc/dlgsave.hxx |   20 +--
 dbaccess/source/ui/inc/paramdialog.hxx |   13 +-
 dbaccess/source/ui/misc/UITools.cxx|2 
 dbaccess/source/ui/querydesign/querycontroller.cxx |2 
 editeng/source/editeng/editdoc.cxx |2 
 editeng/source/editeng/editdoc.hxx |   23 ++-
 editeng/source/editeng/editeng.cxx |   17 +-
 editeng/source/editeng/impedit.hxx |4 
 editeng/source/editeng/impedit2.cxx|   26 ++--
 editeng/source/editeng/impedit3.cxx|   18 +-
 fpicker/source/office/OfficeControlAccess.cxx  |  132 +
 fpicker/source/office/OfficeControlAccess.hxx  |   28 +++-
 fpicker/source/office/iodlg.cxx|   41 ++
 fpicker/source/office/iodlg.hxx|   17 ++
 21 files changed, 242 insertions(+), 213 deletions(-)

New commits:
commit e77c931f44c91c40fd67863fd6c3c6c4167ad3ff
Author: Noel Grandin 
Date:   Wed Nov 23 11:32:36 2016 +0200

convert FLT constants to o3tl::typed_flags

and remove the unused ALLFILESFILTER value

Change-Id: I4d7484ed2d9a5efacac652c6557f14caadd89d34

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 4630e33..fc6418b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -761,7 +761,7 @@ IMPL_LINK_NOARG( SvtFileDialog, NewFolderHdl_Impl, Button*, 
void)
 }
 }
 
-bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter )
+void SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter )
 {
 // delete the old user filter and create a new one
 DELETEZ( pImpl->_pUserFilter );
@@ -781,26 +781,17 @@ bool SvtFileDialog::createNewUserFilter( const OUString& 
_rNewFilter )
 SetDefaultExt( pImpl->GetCurFilter( )->GetExtension() );
 else
 EraseDefaultExt();
-
-// outta here
-return bIsAllFiles;
 }
 
 
-#define FLT_NONEMPTY0x0001
-#define FLT_CHANGED 0x0002
-#define FLT_USERFILTER  0x0004
-#define FLT_ALLFILESFILTER  0x0008
-
-
-sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter )
+AdjustFilterFlags SvtFileDialog::adjustFilter( const OUString& _rFilter )
 {
-sal_uInt16 nReturn = 0;
+AdjustFilterFlags nReturn = AdjustFilterFlags::NONE;
 
 const bool bNonEmpty = !_rFilter.isEmpty();
 if ( bNonEmpty )
 {
-nReturn |= FLT_NONEMPTY;
+nReturn |= AdjustFilterFlags::NonEmpty;
 
 bool bFilterChanged = true;
 
@@ -812,17 +803,13 @@ sal_uInt16 SvtFileDialog::adjustFilter( const OUString& 
_rFilter )
 pFilter = FindFilter_Impl( _rFilter, true, bFilterChanged );
 
 if ( bFilterChanged )
-nReturn |= FLT_CHANGED;
+nReturn |= AdjustFilterFlags::Changed;
 
 if ( !pFilter )
 {
-nReturn |= FLT_USERFILTER;
+nReturn |= AdjustFilterFlags::UserFilter;
 // no filter found : use it as user defined filter
-if ( createNewUserFilter( _rFilter ) )
-{   // it's the "all files" filter
-nReturn |= FLT_ALLFILESFILTER;
-
-}
+createNewUserFilter( _rFilter );
 }
 }
 
@@ -946,8 +933,8 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid)
 return;
 
 // if a filter was retrieved, there were wildcards !
-sal_uInt16 nNewFilterFlags = adjustFilter( aFilter );
-if ( nNewFilterFlags & FLT_CHANGED )
+AdjustFilterFlags nNewFilterFlags = adjustFilter( aFilter );
+if ( nNewFilterFlags & AdjustFilterFlags::Changed )
 {
 // cut off all text before wildcard in edit and select wildcard
 pImpl->_pEdFileName->SetText( aFilter );
@@ -1048,14 +1035,14 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid)
 }
 else
 {
-if ( nNewFilterFlags & FLT_CHANGED )
+if ( nNewFilterFlags & AdjustFilterFlags::Changed )
 ExecuteFilter();
 }
 
 return;
 }
 }
-else if ( !( nNewFilterFlags & FLT_NONEMPTY ) )
+else if ( !( nNewFilterFlags & AdjustFilterFlags::NonEmpty ) )
 {
 // if applicable save URL
 _aPath = aFileName;
@@ -1063,7 +1050,7 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid)
 else
 {
 // if applicable filter again
-if ( nNewFilterFlags & FLT_CHANGED )
+if ( nNewFilterFlags & AdjustFilterFlags::Changed )
 

[Libreoffice-commits] core.git: oox/README

[Mark Hung]

 oox/README |   92 +
 1 file changed, 44 insertions(+), 48 deletions(-)

New commits:
commit 9e3c0bbe0c6f85e1d14c15cf1e94424bb0c387cc
Author: Mark Hung 
Date:   Sun Nov 20 12:06:14 2016 +0800

oox: update README for recent change.

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

diff --git a/oox/README b/oox/README
index 6d01ca5..4f0329d 100644
--- a/oox/README
+++ b/oox/README
@@ -1,19 +1,21 @@
 Support for Office Open XML, the office XML-format designed by Microsoft.
 
-See also:
-[http://wiki.openoffice.org/wiki/OOX]
 
 == DrawingML Custom shapes and presets ==
 
-custom shapes are part of DrawingML and are different to binary ppt
-and VML in older formats, so we needed to add new code to work with
-these. the import happens in oox/source/drawingml, where they are
+Custom shapes are part of DrawingML and are different to binary ppt
+and VML in older formats.
+The import happens in oox/source/drawingml, where they are
 imported as LO's enhanced custom shape's. see
 offapi/com/sun/star/drawing/CustomShape.idl and
 offapi/com/sun/star/drawing/EnhancedCustomShape*.idl
+Check CustomShapeProperties::pushToPropSet() and see
+how custom shape properties are converted.
 
-the export is quite behind now, as it was done before we started work
-on fully supporting drawingml custom shapes. (see FUTURE WORK below)
+Preset shapes are custom shapes whose guides and handles
+have been defined in OOXML specification. By specifying
+preset type and the adjustment values, the reset can
+be taken from the shape definition.
 
 example of drawingml preset:
 
@@ -125,51 +127,24 @@ which is extension not yet in the standard. Thorsten 
suggested to put
 it in such a namespace and keep original (incomplete) geometry for
 backward compatibility, before we can extend the ODF. that's why you
 will see 2 of them in cases where some of the new commands was
-needed. Radek backported code for the new commands to 3-6
-and 4-0 branches.
+needed.
 
-the drawingml also contains new presets (compared to binary/VML) and
-so we now have code with these presets - they are basically
-predefined custom shapes. we generate them using scripts in
-oox/source/drawingml/customshapes/ and the output are
-oox/source/drawingml/customshapepresets[123456].cxx source files
-containing the definition for the preset shapes. this mean that we
-import presets from OOXML files perfectly. one area to look at might
-be check how handles on the imported custom shapes (and presets)
-work.
-
-the source code generation happens in these steps:
-
-  * generate pptx files by running generatePresetsPPTXs.pl. it
-generates files in pptx/ from cshape.pptx sample - replacing
-slide1.xml in it and placing it in new file in pptx/ named after
-the preset plus one cshape-all.pptx file all the presets
-
-  * build oox module with debug (ie. make -s debug=t dbglevel=2)
-
-  * import cshape-all.pptx into impress and redirect output to
-custom-shapes.log
-
-  * generate oox-drawingml-cs-presets data file by running
-generatePresetsData.pl - it uses debug output from the custom-shapes.log
-file
-
-  * check generated data file oox-drawingml-cs-presets and move them to
-oox/source/drawingml/
-
-  * build oox with new source files and test
+In order to convert preset shapes to LO's enhanced custom shape,
+we need to load shape definition of preset shapes. The procedure
+to convert the defintion from OOXML spec for LO is documented
+( also a script ) in oox/source/drawingml/customshapes/README.
+The scripts in oox/source/drawingml/customshapes/ also generate pptx
+files for signle presets and also for all presets
+cshape-all.pptx. The cshape-all.pptx file is then loaded into Impress
+build with debug enabled in oox and the command line output contains
+information. The generated definition is oox-drawingml-cs-presets.
 
-while importing presets, we also set the name of the custom shape so
+Check CustomShapeProperties::initializePresetDataMap() to see how
+generated presets data are loaded into LO.
+While importing presets, we prefix the name with "ooxml-" so
 that we can detect it on export as save it again as preset.
 
-the scripts in oox/source/drawingml/customshapes/ also generate pptx
-files for signle presets and also for all presets
-cshape-all.pptx. the cshape-all.pptx file is then loaded into impress
-build with debug enabled in oox and the command line output contains
-information, which are used by generatePresetsCXX.pl. redirect the
-output into custom-shapes.log in oox/source/drawingml/customshapes/
-and run the script. it creates the customshapepresets[123456].cxx
-source files with presets definitions. also the generated pptx files
+The generated pptx files
 can be used when debugging bugs in custom shapes import/export. also
 the cshape-all.pptx can be used to

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

[Khaled Hosny]

 extras/source/truetype/symbol/OpenSymbol.sfd |   28 +--
 extras/source/truetype/symbol/opens___.ttf   |binary
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b8283bc46bab7f8bccabaf0d0b2881a5e6a7722e
Author: Khaled Hosny 
Date:   Tue Nov 22 17:31:10 2016 +0200

Cleanup OpenSymbol vertical metrics

OS/2 sTypoDescender should be -ve not positive, and the hhea and OS/2
values should agree. Also OS/2 usWinAscent/Descent should be big enough
for any glyph in the font.

Change-Id: Iad201f268f4e030565795e858a5a42937328ec80
Reviewed-on: https://gerrit.libreoffice.org/31060
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index f6582b3..35d4b01 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -4,7 +4,7 @@ FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
 Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation
-Version: 102.9
+Version: 102.10
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,26 +20,26 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1479471125
+ModificationTime: 1479754802
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
-LineGap: 0
+LineGap: 307
 VLineGap: 0
 Panose: 5 1 0 0 0 0 0 0 0 0
-OS2TypoAscent: 0
-OS2TypoAOffset: 1
-OS2TypoDescent: 820
-OS2TypoDOffset: 1
-OS2TypoLinegap: 0
-OS2WinAscent: -240
+OS2TypoAscent: 1420
+OS2TypoAOffset: 0
+OS2TypoDescent: -442
+OS2TypoDOffset: 0
+OS2TypoLinegap: 307
+OS2WinAscent: 0
 OS2WinAOffset: 1
-OS2WinDescent: -231
+OS2WinDescent: 0
 OS2WinDOffset: 1
-HheadAscent: 0
-HheadAOffset: 1
-HheadDescent: 0
-HheadDOffset: 1
+HheadAscent: 1420
+HheadAOffset: 0
+HheadDescent: -442
+HheadDOffset: 0
 OS2SubXSize: 409
 OS2SubYSize: 409
 OS2SubXOff: 0
diff --git a/extras/source/truetype/symbol/opens___.ttf 
b/extras/source/truetype/symbol/opens___.ttf
index 3129e22..5a10feb 100644
Binary files a/extras/source/truetype/symbol/opens___.ttf and 
b/extras/source/truetype/symbol/opens___.ttf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit b96e038a014dc265761c275b238196e42bfa762b
Author: Stephan Bergmann 
Date:   Wed Nov 23 09:29:12 2016 +0100

Updated core
Project: help  ba5028e397bda2a0d8870c29696d55ef2f060c6b

Fix duplicate par_id that broke the build

...by randomly renaming one of the two identical IDs that got both 
introduced
with 576f344764a89a1533d39d1424d3bd4176af1aae "tdf#36038 Help for Extended 
LCID"

Change-Id: I703e4397c7674c6262683829284c1e2b9a11b5af

diff --git a/helpcontent2 b/helpcontent2
index 576f344..ba5028e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 576f344764a89a1533d39d1424d3bd4176af1aae
+Subproject commit ba5028e397bda2a0d8870c29696d55ef2f060c6b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 source/text/shared/01/05020301.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba5028e397bda2a0d8870c29696d55ef2f060c6b
Author: Stephan Bergmann 
Date:   Wed Nov 23 09:29:12 2016 +0100

Fix duplicate par_id that broke the build

...by randomly renaming one of the two identical IDs that got both 
introduced
with 576f344764a89a1533d39d1424d3bd4176af1aae "tdf#36038 Help for Extended 
LCID"

Change-Id: I703e4397c7674c6262683829284c1e2b9a11b5af

diff --git a/source/text/shared/01/05020301.xhp 
b/source/text/shared/01/05020301.xhp
index 54e2654..0be6eec 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -2110,7 +2110,7 @@
   
   
 
-  13
+  13
 
 
   Mongolian
@@ -2462,4 +2462,4 @@
 
 
 
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 loolwsd/DocumentBroker.cpp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit b7065d603de8e8277d485a5d6d8e323de81a5855
Author: Miklos Vajna 
Date:   Wed Nov 23 09:06:48 2016 +0100

DocumentBroker: clean up redundant member init

Change-Id: I5b8f7afe5329c2d1f8abb404c086dcd08c6f1a1f

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 9fa56ae..14bbd4b 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -161,8 +161,6 @@ DocumentBroker::DocumentBroker(const Poco::URI& uriPublic,
 _cursorPosY(0),
 _cursorWidth(0),
 _cursorHeight(0),
-_mutex(),
-_saveMutex(),
 _tileVersion(0),
 _debugRenderedTileCount(0)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits