date:20141117

 svx/source/svdraw/svdograf.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit e47b43f4c2fd2a634469b3f2797352d0e3d09ca3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 09:17:17 2014 +0100

-Werror,-Wunused-variable

...since 286e2f5c6ec829bc0987b1be7016699f7ef03e5e Related fdo#82953: Forget
package URL of image after it is loaded

Change-Id: If4cc941353b72f555dee26d158aee7b15b359a9c

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 42c33ce..585abe43 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1347,8 +1347,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
 aGraphic, aUserData, *pStream,
 GRFILTER_FORMAT_DONTKNOW, NULL, 0, pFilterData.get()))
 {
-const OUString aNewUserData( pGraphic-GetUserData() );
-
 pGraphic-SetGraphic( aGraphic );
 pGraphic-SetUserData();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Miklos Vajna

 include/rtl/ustring.hxx  |   23 +++
 oox/source/export/drawingml.cxx  |6 +++---
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/docxexport.cxx  |4 ++--
 4 files changed, 29 insertions(+), 6 deletions(-)

New commits:
commit acd78552de4179d869cf7061dffab22063466f1c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Nov 17 08:59:01 2014 +0100

Add rtl::OUString::toUtf8()

There is rtl::OUStringToOString() already to do OUString to OString 
conversion
using UTF-8 encoding on a best effort basis.  However multiple modules have
code where we assume that such a conversion is perfect. Add a new method 
that
asserts such an expected success instead of duplicating it at multiple 
places.

Change-Id: I0e55b53f558df82b67af6a463c8144655cf0ca74

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index b9a868b..66b320f 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -2106,6 +2106,29 @@ public:
 }
 
 /**
+ * Convert this string to an OString, assuming that the string can be
+ * UTF-8-encoded successfully.
+ *
+ * In other words, you must not use this method on a random sequence of
+ * UTF-16 code units, but only at places where it is assumed that the
+ * content is a proper string.
+ *
+ * @since LibreOffice 4.4
+ */
+inline OString toUtf8() const
+{
+OString aTarget;
+bool bSuccess = rtl_convertUStringToString(aTarget.pData,
+   getStr(),
+   getLength(),
+   RTL_TEXTENCODING_UTF8,
+   
RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR);
+(void) bSuccess;
+assert(bSuccess);
+return aTarget;
+}
+
+/**
   Returns the string representation of the integer argument.
 
   This function can't be used for language specific conversion.
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6b0e4dc..79a2c2d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -931,7 +931,7 @@ OUString DrawingML::WriteBlip( Reference XPropertySet  
rXPropSet, const OUStri
 GET( nContrast, AdjustContrast );
 
 mpFS-startElementNS( XML_a, XML_blip,
-FSNS( XML_r, XML_embed), OUStringToOString( sRelId, 
RTL_TEXTENCODING_UTF8 ).getStr(),
+FSNS( XML_r, XML_embed), sRelId.toUtf8().getStr(),
 FSEND );
 if( nBright || nContrast )
 {
@@ -1693,7 +1693,7 @@ void DrawingML::WriteParagraphNumbering( Reference 
XPropertySet  rXPropSet, sa
XML_val, IS( std::max( (sal_Int32)25000, 
std::min( (sal_Int32)40, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND );
 if( bHasFontDesc )
 mpFS-singleElementNS( XML_a, XML_buFont,
-   XML_typeface, OUStringToOString( 
aFontDesc.Name, RTL_TEXTENCODING_UTF8 ).getStr(),
+   XML_typeface, 
aFontDesc.Name.toUtf8().getStr(),
XML_charset, (aFontDesc.CharSet == 
awt::CharSet::SYMBOL) ? 2 : NULL,
FSEND );
 
@@ -1934,7 +1934,7 @@ void DrawingML::WriteText( Reference XInterface  
rXIface, const OUString pres
FSEND );
 if( presetWarp != NULL   !presetWarp.isEmpty())
 {
-mpFS-singleElementNS(XML_a, XML_prstTxWarp, 
XML_prst,OUStringToOString(presetWarp, RTL_TEXTENCODING_UTF8 ).getStr(),
+mpFS-singleElementNS(XML_a, XML_prstTxWarp, XML_prst, 
presetWarp.toUtf8().getStr(),
 FSEND );
 }
 if (GetDocumentType() == DOCUMENT_DOCX)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 479d2ca..7444240 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2296,7 +2296,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* 
pRedlineData)
 
 OString aId( OString::number( pRedlineData-GetSeqNo() ) );
 const OUString rAuthor( SW_MOD()-GetRedlineAuthor( 
pRedlineData-GetAuthor() ) );
-OString aAuthor( OUStringToOString( rAuthor, RTL_TEXTENCODING_UTF8 ) );
+OString aAuthor( rAuthor.toUtf8() );
 OString aDate( DateTimeToOString( pRedlineData-GetTimeStamp() ) );
 
 switch( pRedlineData-GetType() )
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 1150463..5b4c381 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -207,7 +207,7 @@ OString DocxExport::AddRelation( const OUString rType, 
const OUString rTarget
 OUString sId =

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

2014-11-17 Thread Maxim Monastirsky

 sd/sdi/_drvwsh.sdi |4 ++--
 sd/source/ui/view/drviews2.cxx |   11 ---
 sd/source/ui/view/drviews7.cxx |2 +-
 sd/source/ui/view/drviewse.cxx |   10 ++
 4 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit a4450fe6d06a138c1f3b1c43546a7246be8a26c5
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Mon Nov 17 10:24:30 2014 +0200

Related: fdo#83572 Try to fix zoom mode button state

Change-Id: I4e146788c3ab83f714bfb0aef1da018b038be64d

diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 2166470..38953ca 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -629,12 +629,12 @@ interface DrawView
 ]
 SID_ZOOM_MODE // ole : no, status : play rec
 [
-ExecMethod = FuTemporary ;
+ExecMethod = FuPermanent ;
 StateMethod = GetMenuState ;
 ]
 SID_ZOOM_PANNING // ole : no, status : play rec
 [
-ExecMethod = FuTemporary ;
+ExecMethod = FuPermanent ;
 StateMethod = GetMenuState ;
 ]
 SID_ZOOM_IN // ole : no, status : play rec
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c85eb2c..c8b6c07 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -156,7 +156,6 @@
 #include futxtatt.hxx
 #include fuvect.hxx
 #include futext.hxx
-#include fuzoom.hxx
 #include helpids.h
 #include optsitem.hxx
 #include sdabstdlg.hxx
@@ -1222,16 +1221,6 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
 }
 break;
 
-case SID_ZOOM_MODE:
-case SID_ZOOM_PANNING:
-{
-mbZoomOnPage = false;
-SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), 
mpDrawView, GetDoc(), rReq) );
-Invalidate( SID_ZOOM_TOOLBOX );
-rReq.Ignore ();
-}
-break;
-
 case SID_BEFORE_OBJ:
 case SID_BEHIND_OBJ:
 {
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 4bb781f..37e8a31 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -289,7 +289,7 @@ void DrawViewShell::GetMenuState( SfxItemSet rSet )
 // map images of the toolboxes
 UpdateToolboxImages( rSet );
 
-if( nId != SID_ZOOM_TOOLBOX 
+if( nSId != SID_ZOOM_TOOLBOX 
 nSId != SID_DRAWTBX_INSERT 
 nSId != SID_POSITION 
 nSId != SID_OBJECT_ALIGN )
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 100d1f8..9536739 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -94,6 +94,7 @@
 #include optsitem.hxx
 #include Window.hxx
 #include fuformatpaintbrush.hxx
+#include fuzoom.hxx
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -533,6 +534,15 @@ void DrawViewShell::FuPermanent(SfxRequest rReq)
 break;
 }
 
+case SID_ZOOM_MODE:
+case SID_ZOOM_PANNING:
+{
+mbZoomOnPage = false;
+SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), 
mpDrawView, GetDoc(), rReq ) );
+rReq.Done();
+}
+break;
+
 default:
break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 394ba4a68b618fb8bd3e76886648c559d90b8ba4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 09:51:21 2014 +0100

loplugin:implicitboolconversion

Change-Id: I389fa692e4a8f99d8de21cf0af3f2a7f0ac1a6f5

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a7045db..a48553c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3008,7 +3008,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 break;
 case RTF_LTRROW:
 case RTF_RTLROW:
-
m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblPrBase_bidiVisual, 
RTFValue::Pointer_t(new RTFValue(nKeyword == RTF_RTLROW)));
+
m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TblPrBase_bidiVisual, 
RTFValue::Pointer_t(new RTFValue(int(nKeyword == RTF_RTLROW;
 break;
 case RTF_LTRCH:
 // dmapper does not support this.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Takeshi Abe

 starmath/source/parse.cxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit e186db5257956a88ed5ed7a9db1867b44324252d
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Mon Nov 17 10:09:46 2014 +0900

assert that no other types than TGOPER can happen in SmParser::Oper()

TOVERBRACE/TUNDERBRACE belongs to TGPRODUCT.

Change-Id: I34b23858fb70f38ffd82e373e16ab68632d6e303
Reviewed-on: https://gerrit.libreoffice.org/12508
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 4b724b6..4683c37 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1655,11 +1655,6 @@ void SmParser::Oper()
 }
 break;
 
-case TOVERBRACE :
-case TUNDERBRACE :
-pNode = new SmMathSymbolNode(m_aCurToken);
-break;
-
 case TOPER :
 NextToken();
 
@@ -1668,7 +1663,7 @@ void SmParser::Oper()
 break;
 
 default :
-SAL_WARN(starmath, unknown case);
+assert(false  unknown case);
 }
 m_aNodeStack.push(pNode);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Olivier Hallot

 source/text/scalc/01/stat_data.xhp  |  284 +++
 source/text/scalc/01/statistics.xhp |  321 ++--
 2 files changed, 303 insertions(+), 302 deletions(-)

New commits:
commit c7a50f7e051ca7ed0c6f63bcbc55a3ce25029b7d
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Sun Nov 16 14:08:38 2014 -0200

Do not make numbers translatable in Help contents

Spare time and energy of translators by marking numbers non-translatable.

Change-Id: I99846db2271e27761ecf5498ce1456b3adcd84dc
Reviewed-on: https://gerrit.libreoffice.org/12493
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/scalc/01/stat_data.xhp 
b/source/text/scalc/01/stat_data.xhp
index 5263a70..7bd2bf3 100644
--- a/source/text/scalc/01/stat_data.xhp
+++ b/source/text/scalc/01/stat_data.xhp
@@ -32,193 +32,193 @@
   paragraph id=par_id2008201415533343874 role=paragraph 
xml-lang=en-USThe following data will be used as example /paragraph
   table id=Tabela3
 tablerow
-  tablecell colspan= rowspan=
+  tablecell
 /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533312589 role=tablehead 
xml-lang=en-USA/paragraph
+  tablecell
+paragraph id=par_id2008201415533312589 role=tablehead 
xml-lang=en-US localize=falseA/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id200820141558155 role=tablehead 
xml-lang=en-USB/paragraph
+  tablecell
+paragraph id=par_id200820141558155 role=tablehead 
xml-lang=en-US localize=falseB/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533321020 role=tablehead 
xml-lang=en-USC/paragraph
+  tablecell
+paragraph id=par_id2008201415533321020 role=tablehead 
xml-lang=en-US localize=falseC/paragraph
   /tablecell
 /tablerow
 tablerow
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533376551 role=tablehead 
xml-lang=en-US1/paragraph
+  tablecell
+paragraph id=par_id2008201415533376551 role=tablehead 
xml-lang=en-US  localize=false1/paragraph
   /tablecell
-  tablecell colspan= rowspan=
+  tablecell
 paragraph id=par_id200820141553335121 role=tablehead 
xml-lang=en-USMaths/paragraph
   /tablecell
-  tablecell colspan= rowspan=
+  tablecell
 paragraph id=par_id2008201415533379519 role=tablehead 
xml-lang=en-USPhysics/paragraph
   /tablecell
-  tablecell colspan= rowspan=
+  tablecell
 paragraph id=par_id20082014155644 role=tablehead 
xml-lang=en-USBiology/paragraph
   /tablecell
 /tablerow
 tablerow
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533318687 role=tablehead 
xml-lang=en-US2/paragraph
+  tablecell
+paragraph id=par_id2008201415533318687 role=tablehead 
xml-lang=en-US  localize=false2/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533340873 role=tablecontent 
xml-lang=en-US47/paragraph
+  tablecell
+paragraph id=par_id2008201415533340873 role=tablecontent 
xml-lang=en-US  localize=false47/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533348976 role=tablecontent 
xml-lang=en-US67/paragraph
+  tablecell
+paragraph id=par_id2008201415533348976 role=tablecontent 
xml-lang=en-US  localize=false67/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533345798 role=tablecontent 
xml-lang=en-US33/paragraph
+  tablecell
+paragraph id=par_id2008201415533345798 role=tablecontent 
xml-lang=en-US  localize=false33/paragraph
   /tablecell
 /tablerow
 tablerow
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533344558 role=tablehead 
xml-lang=en-US3/paragraph
+  tablecell
+paragraph id=par_id2008201415533344558 role=tablehead 
xml-lang=en-US  localize=false3/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533348756 role=tablecontent 
xml-lang=en-US36/paragraph
+  tablecell
+paragraph id=par_id2008201415533348756 role=tablecontent 
xml-lang=en-US  localize=false36/paragraph
   /tablecell
-  tablecell colspan= rowspan=
-paragraph id=par_id2008201415533364631 role=tablecontent 
xml-lang=en-US68/paragraph
+  tablecell
+paragraph id=par_id2008201415533364631 role=tablecontent 
xml-lang=en-US  localize=false68/paragraph

[Libreoffice-commits] core.git: helpcontent2

2014-11-17 Thread Olivier Hallot

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

New commits:
commit 21e8586eaed0ad646ed10978e1285ffb14cec0a4
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Sun Nov 16 14:08:38 2014 -0200

Updated core
Project: help  c7a50f7e051ca7ed0c6f63bcbc55a3ce25029b7d

Do not make numbers translatable in Help contents

Spare time and energy of translators by marking numbers non-translatable.

Change-Id: I99846db2271e27761ecf5498ce1456b3adcd84dc
Reviewed-on: https://gerrit.libreoffice.org/12493
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index b9e9fb3..c7a50f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b9e9fb3ea9a4d493038643b831ca9b9149d4c2b8
+Subproject commit c7a50f7e051ca7ed0c6f63bcbc55a3ce25029b7d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Adolfo Jayme Barrientos

 vcl/uiconfig/ui/cupspassworddialog.ui   |   24 +--
 vcl/uiconfig/ui/errornocontentdialog.ui |5 
 vcl/uiconfig/ui/errornoprinterdialog.ui |5 
 vcl/uiconfig/ui/printerdevicepage.ui|  216 ++--
 vcl/uiconfig/ui/printerpaperpage.ui |   43 +-
 vcl/uiconfig/ui/querydialog.ui  |7 -
 6 files changed, 126 insertions(+), 174 deletions(-)

New commits:
commit 70d2919e2d9543ccad8ccf25c827c4f4873af750
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Sun Nov 16 11:32:58 2014 -0600

HIG fixes for vcl

Change-Id: I7ab2aa906073f0ea09ca4e3e4ae1d5346f6e7616
Reviewed-on: https://gerrit.libreoffice.org/12499
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/uiconfig/ui/cupspassworddialog.ui 
b/vcl/uiconfig/ui/cupspassworddialog.ui
index 81f80e8..f7c9802 100644
--- a/vcl/uiconfig/ui/cupspassworddialog.ui
+++ b/vcl/uiconfig/ui/cupspassworddialog.ui
@@ -1,11 +1,12 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.1 --
+!-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.0/
   object class=GtkDialog id=CUPSPasswordDialog
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=title translatable=yesAuthentication request/property
+property name=title translatable=yesAuthentication Request/property
+property name=resizableFalse/property
 property name=type_hintnormal/property
 child internal-child=vbox
   object class=GtkBox id=dialog-vbox1
@@ -66,32 +67,28 @@
   object class=GtkLabel id=label1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
-property name=label translatable=yes_User/property
+property name=xalign1/property
+property name=label translatable=yes_User:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetuser/property
   /object
   packing
 property name=left_attach0/property
 property name=top_attach1/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
   object class=GtkLabel id=label2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
-property name=label translatable=yes_Password/property
+property name=xalign1/property
+property name=label translatable=yes_Password:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetpass/property
   /object
   packing
 property name=left_attach0/property
 property name=top_attach2/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -99,7 +96,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=xalign0/property
-property name=label translatable=yesPlease enter your 
authentication data for server %s/property
+property name=label translatable=yesPlease enter your 
authentication data for server â%sâ/property
 property name=use_underlineTrue/property
 property name=wrapTrue/property
 property name=max_width_chars56/property
@@ -108,7 +105,6 @@
 property name=left_attach0/property
 property name=top_attach0/property
 property name=width2/property
-property name=height1/property
   /packing
 /child
 child
@@ -120,8 +116,6 @@
   packing
 property name=left_attach1/property
 property name=top_attach1/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -134,8 +128,6 @@
   packing
 property name=left_attach1/property
 property name=top_attach2/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
   /object
diff --git a/vcl/uiconfig/ui/errornocontentdialog.ui 
b/vcl/uiconfig/ui/errornocontentdialog.ui
index bf0b4e3..abe2be5 100644
--- a/vcl/uiconfig/ui/errornocontentdialog.ui
+++ b/vcl/uiconfig/ui/errornocontentdialog.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?

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

2014-11-17 Thread Adolfo Jayme Barrientos

 filter/uiconfig/ui/impswfdialog.ui   |4 -
 filter/uiconfig/ui/pdfsignpage.ui|8 +-
 filter/uiconfig/ui/warnpdfdialog.ui  |   10 --
 filter/uiconfig/ui/xmlfiltertabpagegeneral.ui|9 +-
 filter/uiconfig/ui/xmlfiltertabpagetransformation.ui |8 +-
 svx/uiconfig/ui/colorwindow.ui   |3 
 svx/uiconfig/ui/docrecoverybrokendialog.ui   |   12 ++-
 svx/uiconfig/ui/docrecoveryprogressdialog.ui |   70 +--
 svx/uiconfig/ui/fontworkgallerydialog.ui |   42 ---
 svx/uiconfig/ui/fontworkspacingdialog.ui |1 
 svx/uiconfig/ui/passwd.ui|6 -
 svx/uiconfig/ui/redlinefilterpage.ui |   10 +-
 12 files changed, 75 insertions(+), 108 deletions(-)

New commits:
commit f7393810a7b716be3a2c99c86dc9d78bd834dbfa
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Sun Nov 16 09:45:17 2014 -0600

More HIG fixes in filter, svx

Change-Id: I74df6b8221b4bb18791ec81af266dd58571c4c8c
Reviewed-on: https://gerrit.libreoffice.org/12489
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/filter/uiconfig/ui/impswfdialog.ui 
b/filter/uiconfig/ui/impswfdialog.ui
index e5981fc..c132db7f 100644
--- a/filter/uiconfig/ui/impswfdialog.ui
+++ b/filter/uiconfig/ui/impswfdialog.ui
@@ -11,7 +11,7 @@
   object class=GtkDialog id=ImpSWFDialog
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=title translatable=yesMacromedia Flash (SWF) 
Options/property
+property name=title translatable=yesFlash (SWF) Options/property
 property name=resizableFalse/property
 property name=type_hintdialog/property
 child internal-child=vbox
@@ -129,7 +129,7 @@
 /child
 child
   object class=GtkCheckButton id=exportall
-property name=label translatable=yesExport _all slides 
(unchecking exports current slide)/property
+property name=label translatable=yesExport _all slides 
(uncheck to export current slide)/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
diff --git a/filter/uiconfig/ui/pdfsignpage.ui 
b/filter/uiconfig/ui/pdfsignpage.ui
index e479480..4090c85 100644
--- a/filter/uiconfig/ui/pdfsignpage.ui
+++ b/filter/uiconfig/ui/pdfsignpage.ui
@@ -154,7 +154,7 @@
   object class=GtkLabel id=label7
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
+property name=xalign1/property
 property name=label translatable=yesCertificate 
password:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetpassword/property
@@ -168,7 +168,7 @@
   object class=GtkLabel id=label12
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
+property name=xalign1/property
 property name=label 
translatable=yesLocation:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetlocation/property
@@ -182,7 +182,7 @@
   object class=GtkLabel id=label13
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
+property name=xalign1/property
 property name=label translatable=yesContact 
information:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetcontact/property
@@ -196,7 +196,7 @@
   object class=GtkLabel id=label14
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=xalign0/property
+property name=xalign1/property
 property name=label 
translatable=yesReason:/property
 property name=use_underlineTrue/property
 property name=mnemonic_widgetreason/property
diff --git a/filter/uiconfig/ui/warnpdfdialog.ui 
b/filter/uiconfig/ui/warnpdfdialog.ui
index f996864..1860e84 100644
--- a/filter/uiconfig/ui/warnpdfdialog.ui
+++ b/filter/uiconfig/ui/warnpdfdialog.ui
@@ -1,12 +1,12 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.1 --
+!-- Generated with glade 3.18.3 --
 interface
   requires lib=gtk+ version=3.6/
   object class=GtkMessageDialog

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svx/source sw/CppunitTest_sw_odfexport.mk sw/qa sw/source

2014-11-17 Thread Zolnai Tamás

 svx/source/svdraw/svdograf.cxx|
2 
 sw/CppunitTest_sw_odfexport.mk|
4 
 sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt 
|binary
 sw/qa/extras/odfexport/odfexport.cxx  |   
50 ++
 sw/source/core/graphic/ndgrf.cxx  |
4 
 5 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 33ab79d7e324489194b086812c920af06870e032
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Sun Nov 16 21:38:11 2014 +0100

Related fdo#82953: Forget package URL of image after it is loaded

It causes problems if we handle those imported images differently which
are identified by a package URL, so after the first load remove
this URL and handle images on the same way as inserted images.

Some related bugs:
* #i44367#
* #i124946#
* #i114361#
* fdo#73270

The image in the test document has a special ID which is different
from that one which is generated by LO internally so after ODF export
the new generated image URL is different from the imported one.

(cherry picked from commit 286e2f5c6ec829bc0987b1be7016699f7ef03e5e)

Change-Id: Ic80adf76c72123af8e89ca3daa4dfa57d7c362a6
Reviewed-on: https://gerrit.libreoffice.org/12503
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 5a9496f..fcc9d14 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1374,7 +1374,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
 const OUString aNewUserData( pGraphic-GetUserData() );
 
 pGraphic-SetGraphic( aGraphic );
-pGraphic-SetUserData( aNewUserData );
+pGraphic-SetUserData();
 
 // Graphic successfully swapped in.
 pRet = GRFMGR_AUTOSWAPSTREAM_LOADED;
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 2c0e19a..5cfc8f0 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -79,6 +79,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
 xmloff/util/xo \
 ))
 
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\
+officecfg/registry \
+))
+
 $(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
 
 $(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport))
diff --git 
a/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt 
b/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt
new file mode 100644
index 000..867c075
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/document_with_two_images_with_special_IDs.odt 
differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index c0b42c0..1a4c9d5 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -17,6 +17,9 @@
 #include com/sun/star/text/RelOrientation.hpp
 #include com/sun/star/text/XDocumentIndex.hpp
 #include com/sun/star/drawing/TextVerticalAdjust.hpp
+#include com/sun/star/awt/XBitmap.hpp
+#include com/sun/star/graphic/XGraphic.hpp
+#include officecfg/Office/Common.hxx
 
 class Test : public SwModelTestBase
 {
@@ -386,6 +389,53 @@ DECLARE_ODFEXPORT_TEST(testShapeRelsize, 
shape-relsize.odt)
 CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, 
getPropertysal_Int16(xShape, RelativeHeightRelation));
 }
 
+DECLARE_ODFEXPORT_TEST(testImageWithSpecialID, 
document_with_two_images_with_special_IDs.odt)
+{
+// Here the problem was that LO did not handle well those image URLs in 
the ODT file which are
+// not match with that one which is generated by LO internaly (based on 
the image's size, type and so on)
+
+// Trigger swap out mechanism to test swapped state factor too.
+boost::shared_ptr comphelper::ConfigurationChanges  
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
 batch);
+batch-commit();
+
+uno::Referencedrawing::XShape xImage = getShape(1);
+uno::Reference beans::XPropertySet  XPropSet( xImage, 
uno::UNO_QUERY_THROW );
+// Check URL
+{
+OUString sURL;
+XPropSet-getPropertyValue(GraphicURL) = sURL;
+CPPUNIT_ASSERT(sURL != 
OUString(vnd.sun.star.GraphicObject:));
+}
+// Check size
+{
+uno::Referencegraphic::XGraphic xGraphic;
+XPropSet-getPropertyValue(Graphic) = xGraphic;
+uno::Referenceawt::XBitmap xBitmap(xGraphic, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xBitmap.is());
+

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

2014-11-17 Thread Julien Nabet

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

New commits:
commit 952b968042e51ff3245a81cb6b970863a92fab5f
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Nov 15 17:48:20 2014 +0100

cppcheck: Same expression on both sides of '||'

Change-Id: I89c758366c2140f0033c1006f6a03bbc17ea8096
Reviewed-on: https://gerrit.libreoffice.org/12459
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index ce05325..d9739ad 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -693,7 +693,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle rArea, bool 
bFitWidth, bool bFitHe
 // Optimization: SdrTableObj::SetChanged() can call this very often, 
repeatedly
 // with the same settings, noticeably increasing load time. Skip if 
already done.
 bool bInteractiveMightGrowBecauseTextChanged =
-mpTableObj-IsReallyEdited()  (mpTableObj-IsAutoGrowHeight() || 
mpTableObj-IsAutoGrowHeight());
+mpTableObj-IsReallyEdited()  (mpTableObj-IsAutoGrowHeight() || 
mpTableObj-IsAutoGrowWidth());
 WritingMode writingMode = mpTableObj-GetWritingMode();
 if( bInteractiveMightGrowBecauseTextChanged
 || lastLayoutTable != this || lastLayoutInputRectangle != rArea
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Vort

 filter/source/svg/svgreader.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e353ecd3dbbe773f114908a3fd77d4ed460f00ed
Author: Vort vv...@yandex.ru
Date:   Sun Nov 16 08:02:13 2014 +0200

fdo#77268 SVG Import: fix null pointer dereference

Change-Id: I47c591f3d8b61d60f1258db3515c6805bf42304c
Reviewed-on: https://gerrit.libreoffice.org/12472
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index e0696f5..db506e1 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1033,6 +1033,9 @@ struct AnnotatingVisitor
   maGradientStopVector[
   
maGradientVector.back().maStops.back()].maStopColor );
 break;
+case XML_TOKEN_INVALID:
+SAL_INFO(svg, unhandled token);
+break;
 default:
 SAL_INFO(svg, unhandled token   getTokenName(nTokenId));
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - cui/source include/svtools sd/source sfx2/source svtools/source sw/source

2014-11-17 Thread Jennifer Liebel

 cui/source/options/optjava.cxx  |6 ++---
 cui/source/options/optjava.hxx  |2 -
 cui/source/tabpages/macroass.cxx|   10 -
 include/svtools/treelistbox.hxx |2 -
 sd/source/ui/dlg/brkdlg.cxx |6 ++---
 sd/source/ui/framework/module/ShellStackGuard.cxx   |   12 +--
 sd/source/ui/framework/module/ShellStackGuard.hxx   |2 -
 sd/source/ui/inc/BreakDlg.hxx   |2 -
 sd/source/ui/slidesorter/controller/SlsAnimator.cxx |   12 +--
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx |2 -
 sfx2/source/appl/appcfg.cxx |   17 +++-
 sfx2/source/appl/newhelp.cxx|   13 +---
 sfx2/source/appl/newhelp.hxx|2 -
 svtools/source/contnr/imivctl1.cxx  |   10 -
 svtools/source/contnr/treelistbox.cxx   |8 +++
 svtools/source/control/tabbar.cxx   |   12 +--
 sw/source/uibase/docvw/srcedtw.cxx  |8 +++
 sw/source/uibase/inc/edtwin.hxx |2 -
 sw/source/uibase/inc/srcedtw.hxx|2 -
 sw/source/uibase/inc/unotools.hxx   |2 -
 sw/source/uibase/utlui/unotools.cxx |   10 -
 21 files changed, 70 insertions(+), 72 deletions(-)

New commits:
commit aa1d615453846d38c242a40da9661164316073d1
Author: Jennifer Liebel jliebe...@gmail.com
Date:   Mon Nov 17 09:18:52 2014 +

changed timers to idle

Change-Id: I92f40d3dad133347f1b8db0b025b624d3305f885

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 10ee781..51da12c 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -182,8 +182,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* 
pParent, const SfxItemSet
 m_pAddBtn-SetClickHdl( LINK( this, SvxJavaOptionsPage, AddHdl_Impl ) );
 m_pParameterBtn-SetClickHdl( LINK( this, SvxJavaOptionsPage, 
ParameterHdl_Impl ) );
 m_pClassPathBtn-SetClickHdl( LINK( this, SvxJavaOptionsPage, 
ClassPathHdl_Impl ) );
-m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl 
) );
-m_aResetTimer.SetTimeout( RESET_TIMEOUT );
+m_aResetIdle.SetIdleHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
+m_aResetIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER);
 
 m_pExpertConfigBtn-SetClickHdl( LINK( this, SvxJavaOptionsPage, 
ExpertConfigHdl_Impl) );
 if (!officecfg::Office::Common::Security::EnableExpertConfiguration::get())
@@ -771,7 +771,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
 m_pMacroCB-Check( aMiscOpt.IsMacroRecorderMode() );
 m_pMacroCB-SaveValue();
 
-m_aResetTimer.Start();
+m_aResetIdle.Start();
 }
 
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 353b749..247d9cd 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -72,7 +72,7 @@ private:
 OUStringm_sInstallText;
 OUStringm_sAccessibilityText;
 OUStringm_sAddDialogText;
-Timer   m_aResetTimer;
+Idlem_aResetIdle;
 
 CheckBox*   m_pExperimentalCB;
 CheckBox*   m_pMacroCB;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 0288663..233b9b9 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -55,7 +55,7 @@ public:
 SfxConfigFunctionListBox*   pMacroLB;
 
 boolbReadOnly;
-Timer   maFillGroupTimer;
+IdlemaFillGroupIdle;
 boolbGotEvents;
 bool m_bDummyActivated; /// has this tab page already been activated
 };
@@ -188,11 +188,11 @@ bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet )
 
 void _SfxMacroTabPage::LaunchFillGroup()
 {
-if (!mpImpl-maFillGroupTimer.GetTimeoutHdl().IsSet())
+if (!mpImpl-maFillGroupIdle.GetTimeoutHdl().IsSet())
 {
-mpImpl-maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this, 
_SfxMacroTabPage, TimeOut_Impl ) );
-mpImpl-maFillGroupTimer.SetTimeout( 0 );
-mpImpl-maFillGroupTimer.Start();
+mpImpl-maFillGroupIdle.SetIdleHdl( STATIC_LINK( this, 
_SfxMacroTabPage, TimeOut_Impl ) );
+mpImpl-maFillGroupIdle.SetPriority( VCL_IDLE_PRIORITY_HIGHEST );
+mpImpl-maFillGroupIdle.Start();
 }
 }
 
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 733d4a2..94ad1d7 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -800,7 +800,7 @@ class SvInplaceEdit2
 LinkaCallBackHdl;

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

2014-11-17 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d266fe13f60aab4975326eef5dc095c0f42ead48
Author: Yousuf Philips philip...@hotmail.com
Date:   Fri Nov 14 03:02:33 2014 +0400

fdo#86183 set ctrl+shift+e to track changes and reassign edit mode

Change-Id: If1bfbc6686dd164eba9a705fbdb72fa0a08cdefe
Reviewed-on: https://gerrit.libreoffice.org/12415
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index f59a259..58ee4bc 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -48,6 +48,12 @@
   node oor:name=E_SHIFT_MOD1 oor:op=replace
 prop oor:name=Command
   value xml:lang=x-no-translateI10N SHORTCUTS - NO 
TRANSLATE/value
+  value xml:lang=en-US.uno:TrackChanges/value
+/prop
+  /node
+  node oor:name=M_SHIFT_MOD1 oor:op=replace
+prop oor:name=Command
+  value xml:lang=x-no-translateI10N SHORTCUTS - NO 
TRANSLATE/value
   value xml:lang=en-US.uno:EditDoc/value
 /prop
   /node
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - include/sfx2 include/svx sfx2/source svx/source

2014-11-17 Thread Tobias Madl

 include/sfx2/dinfdlg.hxx|4 ++--
 include/svx/numvset.hxx |4 ++--
 sfx2/source/dialog/dinfdlg.cxx  |   16 
 svx/source/dialog/svxbmpnumvalueset.cxx |6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 55cf9f3194f5bc5a6b98b6424d806d53a617c3bc
Author: Tobias Madl tobias.madl@gmail.com
Date:   Mon Nov 17 09:25:25 2014 +

changed timers to idles

Change-Id: Icb6e3e72939ab0d04d9f099f1e476131a223de48

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 340681a..0f867a4 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -424,8 +424,8 @@ private:
 std::vector CustomPropertyLine*   m_aCustomPropertiesLines;
 CustomPropertyLine* m_pCurrentLine;
 SvNumberFormatter   m_aNumberFormatter;
-Timer   m_aEditLoseFocusTimer;
-Timer   m_aBoxLoseFocusTimer;
+Idlem_aEditLoseFocusIdle;
+Idlem_aBoxLoseFocusIdle;
 Linkm_aRemovedHdl;
 
 DECL_LINK(  TypeHdl, CustomPropertiesTypeBox* );
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index ae5a402..4bc16cf 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
 
 class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
 {
-Timer   aFormatTimer;
+IdleaFormatIdle;
 boolbGrfNotFound;
 
 void init();
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public 
SvxNumValueSet
 voidSetGrfNotFound(bool bSet) {bGrfNotFound = bSet;}
 boolIsGrfNotFound()const {return bGrfNotFound;}
 
-Timer  GetFormatTimer() {return aFormatTimer;}
+Idle  GetFormatIdle() {return aFormatIdle;}
 
 public:
 SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP);
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 850cb9c..4ac4070 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1426,10 +1426,10 @@ 
CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
 
Application::GetSettings().GetLanguageTag().getLanguageType() )
 
 {
-m_aEditLoseFocusTimer.SetTimeout( 300 );
-m_aEditLoseFocusTimer.SetTimeoutHdl( LINK( this, CustomPropertiesWindow, 
EditTimeoutHdl ) );
-m_aBoxLoseFocusTimer.SetTimeout( 300 );
-m_aBoxLoseFocusTimer.SetTimeoutHdl( LINK( this, CustomPropertiesWindow, 
BoxTimeoutHdl ) );
+m_aEditLoseFocusIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
+m_aEditLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, 
EditTimeoutHdl ) );
+m_aBoxLoseFocusIdle.SetPriority( VCL_IDLE_PRIORITY_LOWEST );
+m_aBoxLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, 
BoxTimeoutHdl ) );
 
 m_aNameBox.add_mnemonic_label(m_pHeaderAccName);
 m_aNameBox.SetAccessibleName(m_pHeaderAccName-GetText());
@@ -1454,8 +1454,8 @@ 
CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent,
 
 CustomPropertiesWindow::~CustomPropertiesWindow()
 {
-m_aEditLoseFocusTimer.Stop();
-m_aBoxLoseFocusTimer.Stop();
+m_aEditLoseFocusIdle.Stop();
+m_aBoxLoseFocusIdle.Stop();
 ClearAllLines();
 }
 
@@ -1531,7 +1531,7 @@ IMPL_LINK( CustomPropertiesWindow, EditLoseFocusHdl, 
CustomPropertiesEdit*, pEdi
 if ( !pLine-m_bTypeLostFocus )
 {
 m_pCurrentLine = pLine;
-m_aEditLoseFocusTimer.Start();
+m_aEditLoseFocusIdle.Start();
 }
 else
 pLine-m_bTypeLostFocus = false;
@@ -1544,7 +1544,7 @@ IMPL_LINK( CustomPropertiesWindow, BoxLoseFocusHdl, 
CustomPropertiesTypeBox*, pB
 if ( pBox )
 {
 m_pCurrentLine = pBox-GetLine();
-m_aBoxLoseFocusTimer.Start();
+m_aBoxLoseFocusIdle.Start();
 }
 
 return 0;
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx 
b/svx/source/dialog/svxbmpnumvalueset.cxx
index 0963e6d..55aebe3 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -480,15 +480,15 @@ void SvxBmpNumValueSet::init()
 GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
 SetStyle( GetStyle() | WB_VSCROLL );
 SetLineCount( 3 );
-aFormatTimer.SetTimeout(300);
-aFormatTimer.SetTimeoutHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
+aFormatIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
+aFormatIdle.SetIdleHdl(LINK(this, SvxBmpNumValueSet, FormatHdl_Impl));
 }
 
 
 SvxBmpNumValueSet::~SvxBmpNumValueSet()
 {
 GalleryExplorer::EndLocking(GALLERY_THEME_BULLETS);
-aFormatTimer.Stop();
+aFormatIdle.Stop();
 }
 
 void SvxBmpNumValueSet::UserDraw( const UserDrawEvent rUDEvt )

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

2014-11-17 Thread Julien Nabet

 vcl/source/opengl/OpenGLContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 277a59c0e8f3fefc78a2bde659443dd81c368299
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Nov 15 18:39:08 2014 +0100

cppcheck: Return value of std::remove() ignored. Elements remain in 
container.

Change-Id: I1e3bcb013d27c6f9a1484c9f1e23b63f42615b9b
Reviewed-on: https://gerrit.libreoffice.org/12460
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 0659ce5..98eb068 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -65,7 +65,7 @@ OpenGLContext::~OpenGLContext()
 #elif defined( UNX )
 if(m_aGLWin.ctx)
 {
-std::remove( vShareList.begin(), vShareList.end(), m_aGLWin.ctx );
+vShareList.erase(std::remove( vShareList.begin(), vShareList.end(), 
m_aGLWin.ctx ));
 
 glXMakeCurrent(m_aGLWin.dpy, None, NULL);
 if( glGetError() != GL_NO_ERROR )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 8fcc9b63db3bed413a6d7b84390175ced005ea02
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 16:51:10 2014 +0100

Updated core
Project: help  47428b6382955d4f9962fca14e65d19bb5b99983

fdo#85817 rename Document as E-mail to E-mail Document

Change-Id: I4897c43ae12fcb317f04c1d982e213f061786e58
Reviewed-on: https://gerrit.libreoffice.org/12490
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index c7a50f7..47428b6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c7a50f7e051ca7ed0c6f63bcbc55a3ce25029b7d
+Subproject commit 47428b6382955d4f9962fca14e65d19bb5b99983
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/00/0401.xhp|4 ++--
 source/text/shared/01/0116.xhp|2 +-
 source/text/shared/01/01160200.xhp|4 ++--
 source/text/shared/explorer/database/menufile.xhp |2 +-
 source/text/shared/guide/email.xhp|2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 47428b6382955d4f9962fca14e65d19bb5b99983
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 16:51:10 2014 +0100

fdo#85817 rename Document as E-mail to E-mail Document

Change-Id: I4897c43ae12fcb317f04c1d982e213f061786e58
Reviewed-on: https://gerrit.libreoffice.org/12490
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index 1237794..54ccd62 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -310,7 +310,7 @@
 paragraph role=paragraph id=par_id3155529 xml-lang=en-US l10n=U 
oldref=17variable id=sendenMenuemph File - Send/emph
 /variable/paragraph
 section id=dokument
-paragraph role=paragraph id=par_id3145386 xml-lang=en-US l10n=U 
oldref=18Choose emphFile - Send - Document as E-mail/emph
+paragraph role=paragraph id=par_id3145386 xml-lang=en-US l10n=U 
oldref=18Choose emphFile - Send - E-mail Document/emph
 /paragraph
 section id=sysendmail
 table id=
@@ -321,7 +321,7 @@
/image/paragraph
 /tablecell
 tablecell
-paragraph role=paragraph id=par_idN113C8 xml-lang=en-US 
l10n=NEWDocument as E-mail/paragraph
+paragraph role=paragraph id=par_idN113C8 xml-lang=en-US 
l10n=NEWE-mail Document/paragraph
 /tablecell
 /tablerow
 /table
diff --git a/source/text/shared/01/0116.xhp 
b/source/text/shared/01/0116.xhp
index 189fe49..b45b15a 100644
--- a/source/text/shared/01/0116.xhp
+++ b/source/text/shared/01/0116.xhp
@@ -39,7 +39,7 @@
 section id=howtoget
   embed href=text/shared/00/0401.xhp#senden/
 /section
-paragraph role=heading id=hd_id3154398 xml-lang=en-US level=2 
l10n=U oldref=3link href=text/shared/01/01160200.xhp name=Document as 
E-mailDocument as E-mail/link/paragraph
+paragraph role=heading id=hd_id3154398 xml-lang=en-US level=2 
l10n=U oldref=3link href=text/shared/01/01160200.xhp name=Document as 
E-mailE-mail Document/link/paragraph
 embed href=text/shared/01/01160200.xhp#versendentext/commentNew menu 
commands, see #i46895 and #i63793/commentcommentUFI: New commands all have 
the same Help IDs, but different names/comment
 bookmark xml-lang=en-US branch=hid/.uno:SendMailDocAsOOo id=bm_id827967 
localize=false/
 paragraph role=paragraph id=par_id4546342 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenOpens a new window in your 
default e-mail program with the current document as an attachment. The 
OpenDocument file format is used./ahelp/paragraph
diff --git a/source/text/shared/01/01160200.xhp 
b/source/text/shared/01/01160200.xhp
index b9f1636..364d4aa 100644
--- a/source/text/shared/01/01160200.xhp
+++ b/source/text/shared/01/01160200.xhp
@@ -22,7 +22,7 @@

 meta
 topic id=textshared0101160200xml indexer=include
-title id=tit xml-lang=en-USDocument as E-mail/title
+title id=tit xml-lang=en-USE-mail Document/title
 filename/text/shared/01/01160200.xhp/filename
 /topic
 /meta
@@ -30,7 +30,7 @@
 section id=sendemail
 bookmark xml-lang=en-US branch=hid/.uno:SendMail id=bm_id1274021 
localize=false/
 bookmark xml-lang=en-US branch=hid/.uno:SendMail id=bm_id3155619 
localize=false/
-paragraph role=heading id=hd_id3150702 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/shared/01/01160200.xhpDocument as 
E-mail/link/paragraph
+paragraph role=heading id=hd_id3150702 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/shared/01/01160200.xhpE-mail 
Document/link/paragraph
 paragraph role=paragraph id=par_id3152823 xml-lang=en-US l10n=CHG 
oldref=2variable id=versendentextahelp hid=.uno:SendMailOpens a new 
window in your default e-mail program with the current document as an 
attachment. The current file format is used./ahelp/variable If the document 
is new and unsaved, the format specified in switchinline 
select=syscaseinline select=MAC%PRODUCTNAME - 
Preferences/caseinlinedefaultinlineTools - 
Options/defaultinline/switchinline - Load/Save - General is 
used./paragraph
 /section
 section id=howtoget
diff --git a/source/text/shared/explorer/database/menufile.xhp 
b/source/text/shared/explorer/database/menufile.xhp
index b2d996c..127cd4e 100644
--- a/source/text/shared/explorer/database/menufile.xhp
+++ b/source/text/shared/explorer/database/menufile.xhp
@@ -43,7 +43,7 @@
 paragraph role=paragraph id=par_idN105EE xml-lang=en-US 
l10n=NEWahelp hid=.Exports the selected report or form to a text 
document. A dynamic report is exported as a copy of the database contents at 
the time of export./ahelp/paragraph
 paragraph role=heading id=par_idN105F1 xml-lang=en-US level=2

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

 source/text/shared/02/0201.xhp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5a6a67a35d9ff72d6723cc2e13d43bb6c25e81c7
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 19:31:43 2014 +0100

apply styles dropdown: rename More label and add info about pop-up menu

Change-Id: Icbecb2063225676b6bf47a492a873ed5f6479670
Reviewed-on: https://gerrit.libreoffice.org/12501
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/02/0201.xhp 
b/source/text/shared/02/0201.xhp
index d4490b0..ea1291a 100644
--- a/source/text/shared/02/0201.xhp
+++ b/source/text/shared/02/0201.xhp
@@ -36,7 +36,8 @@
 paragraph xml-lang=en-US id=par_id3155351 role=paragraph 
l10n=CHG oldref=2ahelp hid=.uno:StyleApplyAssigns a style to the 
current paragraph, selected paragraphs, or to a selected 
object./ahelp/paragraph
  /section
   /section
-  paragraph xml-lang=en-US id=par_idN10621 role=paragraph 
l10n=NEWTo reset the selected objects to the default paragraph style, select 
Clear formatting. Select More to open the Styles and Formatting 
window./paragraph
+  paragraph xml-lang=en-US id=par_idN10621 role=paragraph 
l10n=NEWTo reset the selected objects to the default paragraph style, select 
emphClear formatting/emph. Select emphMore Styles/emph to open the 
Styles and Formatting window./paragraph
+  paragraph xml-lang=en-US id=par_idN10631 role=paragraph 
l10n=NEWBy pressing the Down arrow button on the right of a style name, you 
show pop-up menu that allows to update style from selection or to edit 
style./paragraph
   section id=sylistenfeld
  table id=tbl_id3156042
 tablerow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 37fd78cc9dfeeec07c5f5f7e4df3dcf142895d21
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 19:31:43 2014 +0100

Updated core
Project: help  5a6a67a35d9ff72d6723cc2e13d43bb6c25e81c7

apply styles dropdown: rename More label and add info about pop-up menu

Change-Id: Icbecb2063225676b6bf47a492a873ed5f6479670
Reviewed-on: https://gerrit.libreoffice.org/12501
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index 47428b6..5a6a67a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 47428b6382955d4f9962fca14e65d19bb5b99983
+Subproject commit 5a6a67a35d9ff72d6723cc2e13d43bb6c25e81c7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 1e3463ece66f6658678005830fc3ee87c598e73e
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 17:25:57 2014 +0100

Updated core
Project: help  d08fb7ff77e5a054dc6005652159299891fc15ff

fdo#85046 rename items related to recording changes

Change-Id: Ia1068ed4590585cc9cc4a8ece29a761f61c290e9
Reviewed-on: https://gerrit.libreoffice.org/12496
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index 5a6a67a..d08fb7f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5a6a67a35d9ff72d6723cc2e13d43bb6c25e81c7
+Subproject commit d08fb7ff77e5a054dc6005652159299891fc15ff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/scalc/01/0217.xhp |2 +-
 source/text/shared/00/0402.xhp|   20 ++--
 source/text/shared/01/01100600.xhp|2 +-
 source/text/shared/01/0119.xhp|2 +-
 source/text/shared/01/0223.xhp|4 ++--
 source/text/shared/01/02230150.xhp|4 ++--
 source/text/shared/01/02230300.xhp|4 ++--
 source/text/shared/01/02230400.xhp|4 ++--
 source/text/shared/guide/microsoft_terms.xhp  |2 +-
 source/text/shared/guide/protection.xhp   |4 ++--
 source/text/shared/guide/redlining_accept.xhp |2 +-
 source/text/shared/guide/redlining_doccompare.xhp |2 +-
 source/text/shared/guide/redlining_docmerge.xhp   |2 +-
 source/text/shared/guide/redlining_enter.xhp  |6 +++---
 source/text/shared/guide/redlining_navigation.xhp |6 +++---
 source/text/shared/guide/redlining_protect.xhp|6 +++---
 source/text/shared/optionen/01040700.xhp  |2 +-
 source/text/shared/optionen/01060600.xhp  |2 +-
 source/text/swriter/01/05150300.xhp   |2 +-
 19 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit d08fb7ff77e5a054dc6005652159299891fc15ff
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 17:25:57 2014 +0100

fdo#85046 rename items related to recording changes

Change-Id: Ia1068ed4590585cc9cc4a8ece29a761f61c290e9
Reviewed-on: https://gerrit.libreoffice.org/12496
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/scalc/01/0217.xhp 
b/source/text/scalc/01/0217.xhp
index 8bb8895..2a65596 100644
--- a/source/text/scalc/01/0217.xhp
+++ b/source/text/scalc/01/0217.xhp
@@ -44,7 +44,7 @@ YJ: checked/lastedited
 section id=howtoget
   embed href=text/scalc/00/0402.xhp#btaloes/
 /section
-paragraph role=note id=par_id3145801 xml-lang=en-US l10n=CHG 
oldref=7You cannot delete a sheet while emphEdit - Changes - Record/emph 
is activated./paragraph
+paragraph role=note id=par_id3145801 xml-lang=en-US l10n=CHG 
oldref=7You cannot delete a sheet while emphEdit - Track Changes - Record 
Changes/emph is activated./paragraph
 paragraph role=heading id=hd_id3147124 xml-lang=en-US level=2 
l10n=U oldref=3Yes/paragraph
 paragraph role=paragraph id=par_id3154943 xml-lang=en-US l10n=U 
oldref=4Deletes the current sheet./paragraph
 paragraph role=heading id=hd_id3149412 xml-lang=en-US level=2 
l10n=U oldref=5No/paragraph
diff --git a/source/text/shared/00/0402.xhp 
b/source/text/shared/00/0402.xhp
index f0e6556..6b8d2c6 100644
--- a/source/text/shared/00/0402.xhp
+++ b/source/text/shared/00/0402.xhp
@@ -156,30 +156,30 @@
 
 /section
 /section
-paragraph role=paragraph id=par_id3145251 xml-lang=en-US l10n=U 
oldref=555variable id=aenderungenChoose emphEdit - Changes/emph
+paragraph role=paragraph id=par_id3145251 xml-lang=en-US l10n=U 
oldref=555variable id=aenderungenChoose emphEdit - Track Changes/emph
 /variable/paragraph
-paragraph role=paragraph id=par_id3153336 xml-lang=en-US l10n=U 
oldref=556variable id=aufzeichnenChoose emphEdit - Changes - 
Record/emph
+paragraph role=paragraph id=par_id3153336 xml-lang=en-US l10n=U 
oldref=556variable id=aufzeichnenChoose emphEdit - Track Changes - 
Record Changes/emph
 /variable/paragraph
-paragraph role=paragraph id=par_id3150594 xml-lang=en-US l10n=U 
oldref=557variable id=anzeigenswitchinline select=applcaseinline 
select=WRITERChoose emphEdit - Changes - Show/emph
-/caseinlinecaseinline select=CALCChoose emphEdit - Changes - 
Show/emph
+paragraph role=paragraph id=par_id3150594 xml-lang=en-US l10n=U 
oldref=557variable id=anzeigenswitchinline select=applcaseinline 
select=WRITERChoose emphEdit - Track Changes - Show Changes/emph
+/caseinlinecaseinline select=CALCChoose emphEdit - Track Changes - 
Show Changes/emph
 /caseinline/switchinline
 /variable/paragraph
-paragraph role=paragraph id=par_id3153845 xml-lang=en-US l10n=U 
oldref=558variable id=rotlinieChoose emphEdit - Changes - Accept or 
Reject/emph
+paragraph role=paragraph id=par_id3153845 xml-lang=en-US l10n=U 
oldref=558variable id=rotlinieChoose emphEdit - Track Changes - Manage 
Changes/emph
 /variable/paragraph
 section id=rotlinieliste
-paragraph role=paragraph id=par_id3148587 xml-lang=en-US l10n=U 
oldref=559Choose emphEdit - Changes - Accept or Reject - List/emph 
tab/paragraph
+paragraph role=paragraph id=par_id3148587 xml-lang=en-US l10n=U 
oldref=559Choose emphEdit - Track Changes - Manage Changes - List/emph 
tab/paragraph
 paragraph role=paragraph id=par_id3150396 xml-lang=en-US l10n=U 
oldref=574Choose emphFormat - AutoCorrect - Apply and Edit Changes./emph 
AutoCorrect dialog appears, click emphEdit Changes/emph button, see 
emphList/emph tab page/paragraph
 /section
-paragraph role=paragraph

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

 source/text/shared/01/06040500.xhp|2 +-
 source/text/shared/02/1803.xhp|6 +++---
 source/text/swriter/guide/auto_spellcheck.xhp |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 23808726b1af61e0f7f8ada72899c23c0d442ad7
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 18:00:55 2014 +0100

fdo#80490 rename AutoSpellcheck and reflect its removal from toolbar

Change-Id: If77bb61af25998e193e3e8f1ea2382fe2be4423a
Reviewed-on: https://gerrit.libreoffice.org/12498
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/01/06040500.xhp 
b/source/text/shared/01/06040500.xhp
index 296937c..e0a9b82 100644
--- a/source/text/shared/01/06040500.xhp
+++ b/source/text/shared/01/06040500.xhp
@@ -31,7 +31,7 @@
 bookmark_valuespellcheck; context menus/bookmark_value
 /bookmark
 paragraph role=heading id=hd_id3152823 xml-lang=en-US level=1 
l10n=U oldref=1AutoCorrect context menu/paragraph
-paragraph role=paragraph id=par_id3146936 xml-lang=en-US l10n=CHG 
oldref=2To access this menu, right-click a misspelled word in your document. 
To view the misspelled words in your document, enable 
emphAutoSpellcheck/emph icon on the Standard toolbar./paragraph
+paragraph role=paragraph id=par_id3146936 xml-lang=en-US l10n=CHG 
oldref=2To access this menu, right-click a misspelled word in your document. 
To view the misspelled words in your document, choose emphTools - Automatic 
Spell Checking/emph./paragraph
 bookmark xml-lang=en-US branch=hid/SW_HID_LINGU_REPLACE id=bm_id3151097 
localize=false/
 paragraph role=heading id=hd_id3153899 xml-lang=en-US level=2 
l10n=U oldref=4lt;Replacement Suggestionsgt;/paragraph
 paragraph role=paragraph id=par_id3147000 xml-lang=en-US l10n=CHG 
oldref=5ahelp hid=HID_LINGU_REPLACEClick the word to replace the 
highlighted word. Use the AutoCorrect submenu for permanent 
replacement./ahelpcommentUFI: see i60431/comment/paragraph
diff --git a/source/text/shared/02/1803.xhp 
b/source/text/shared/02/1803.xhp
index ad5c326..9d5f97b 100644
--- a/source/text/shared/02/1803.xhp
+++ b/source/text/shared/02/1803.xhp
@@ -22,7 +22,7 @@
 helpdocument version=1.0
 meta
 topic id=textshared021803xml indexer=include status=PUBLISH
-title xml-lang=en-US id=titAutoSpellcheck On/Off/title
+title xml-lang=en-US id=titAutomatic Spell Checking On/Off/title
 filename/text/shared/02/1803.xhp/filename
 /topic
 history
@@ -34,7 +34,7 @@
   
   
   section id=pruefung
-  paragraph id=hd_id3155599 role=heading level=1 oldref=1 l10n=U 
xml-lang=en-USlink href=text/shared/02/1803.xhp name=AutoSpellcheck 
On/OffAutoSpellcheck On/Off/link/paragraph
+  paragraph id=hd_id3155599 role=heading level=1 oldref=1 l10n=U 
xml-lang=en-USlink href=text/shared/02/1803.xhp name=Automatic Spell 
Checking On/OffAutomatic Spell Checking On/Off/link/paragraph
   embed href=text/shared/optionen/01010400.xhp#automatisch/
   /section
   section id=sypruefung
@@ -47,7 +47,7 @@
   paragraph l10n=E role=paragraph id=par_id3150040 xml-lang=en-US 
oldref=image src=cmd/sc_spellonline.png id=img_id3150808alt 
xml-lang=en-US id=alt_id3150808Icon/alt/image/paragraph
  /tablecell
  tablecell
-  paragraph role=paragraph id=par_id3147571 l10n=U xml-lang=en-US 
oldref=2AutoSpellcheck On/Off/paragraph
+  paragraph role=paragraph id=par_id3147571 l10n=U xml-lang=en-US 
oldref=2Automatic Spell Checking On/Off/paragraph
  /tablecell
 /tablerow

diff --git a/source/text/swriter/guide/auto_spellcheck.xhp 
b/source/text/swriter/guide/auto_spellcheck.xhp
index 2819a3e..a6ccc0e 100644
--- a/source/text/swriter/guide/auto_spellcheck.xhp
+++ b/source/text/swriter/guide/auto_spellcheck.xhp
@@ -27,7 +27,7 @@
   /topic
/meta
body
-bookmark xml-lang=en-US branch=index 
id=bm_id3154265bookmark_valuespellcheck;AutoSpellcheck 
on/off/bookmark_value
+bookmark xml-lang=en-US branch=index 
id=bm_id3154265bookmark_valuespellcheck;Automatic Spell Checking 
on/off/bookmark_value
   bookmark_valueautomatic spellcheck/bookmark_value
   bookmark_valuechecking spelling;while typing/bookmark_value
   bookmark_valuewords;disabling spellcheck/bookmark_value
@@ -40,7 +40,7 @@
  oldref=41To Check Spelling Automatically While You 
Type/paragraph
   list type=ordered
  listitem
-paragraph xml-lang=en-US id=par_id3155531 role=listitem 
l10n=CHG oldref=42Activate the emphAutoSpellcheck /emphicon on the 
Standard bar./paragraph
+paragraph xml-lang=en-US id=par_id3155531 role=listitem 
l10n=CHG oldref=42Choose emphTools - Automatic Spell 
Checking/emph./paragraph
  /listitem
  listitem
 paragraph xml-lang=en-US id=par_id3155569 role=listitem 
l10n=U oldref=33Right-click a word with a red wavy underline, and then 
choose a suggested replacement word

[Libreoffice-commits] core.git: 2 commits - helpcontent2

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

New commits:
commit ed2dd9ea6a462eb1ee866d38371d9b84d7246efa
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 18:00:55 2014 +0100

Updated core
Project: help  23808726b1af61e0f7f8ada72899c23c0d442ad7

fdo#80490 rename AutoSpellcheck and reflect its removal from toolbar

Change-Id: If77bb61af25998e193e3e8f1ea2382fe2be4423a
Reviewed-on: https://gerrit.libreoffice.org/12498
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index d080ad6..2380872 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d080ad69dcff1dc67ed10930b029df08229fdb2a
+Subproject commit 23808726b1af61e0f7f8ada72899c23c0d442ad7
commit a64f00484d81911206bf383c98b6de7981213b1e
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 17:34:40 2014 +0100

Updated core
Project: help  d080ad69dcff1dc67ed10930b029df08229fdb2a

fdo#79149 insert image dialog: rename Style to Frame Style

Change-Id: Ibb16ba76d2d7e98f5dc19dbcc82e80d8c08b334b
Reviewed-on: https://gerrit.libreoffice.org/12497
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index d08fb7f..d080ad6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d08fb7ff77e5a054dc6005652159299891fc15ff
+Subproject commit d080ad69dcff1dc67ed10930b029df08229fdb2a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/shared/01/0414.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d080ad69dcff1dc67ed10930b029df08229fdb2a
Author: Stanislav Horacek stanislav.hora...@gmail.com
Date:   Sun Nov 16 17:34:40 2014 +0100

fdo#79149 insert image dialog: rename Style to Frame Style

Change-Id: Ibb16ba76d2d7e98f5dc19dbcc82e80d8c08b334b
Reviewed-on: https://gerrit.libreoffice.org/12497
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/source/text/shared/01/0414.xhp 
b/source/text/shared/01/0414.xhp
index 59b62da..d3193bb 100644
--- a/source/text/shared/01/0414.xhp
+++ b/source/text/shared/01/0414.xhp
@@ -41,7 +41,7 @@
 /section
 embed href=text/shared/guide/insert_bitmap.xhp#insert_bitmap/
 bookmark xml-lang=en-US branch=hid/SVT_HID_FILEOPEN_IMAGE_TEMPLATE 
id=bm_id3150902 localize=false/
-paragraph role=heading id=hd_id3149760 xml-lang=en-US level=2 
l10n=U oldref=17Style/paragraph
+paragraph role=heading id=hd_id3149760 xml-lang=en-US level=2 
l10n=U oldref=17Frame Style/paragraph
 paragraph role=paragraph id=par_id3154398 xml-lang=en-US l10n=U 
oldref=18ahelp hid=HID_FILEOPEN_IMAGE_TEMPLATESelect the frame style for 
the graphic./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/SVX_HID_OFA_HYPERLINK_URL_TXT 
id=bm_id3157991 localize=false/
 bookmark xml-lang=en-US branch=hid/SVT_HID_FILEDLG_LINK_CB 
id=bm_id3152542 localize=false/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Aurimas Fišeras

 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   11 +++
 sc/source/core/tool/interpr2.cxx   |3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit a1a76a362ab8ad23e54791da2711b76907f1edad
Author: Aurimas FiÅ¡eras auri...@members.fsf.org
Date:   Sat Aug 23 11:50:56 2014 +0300

added Lithuanian LTL to EUROCONVERT(), CONVERT()

Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4)
Reviewed-on: https://gerrit.libreoffice.org/12463
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
 value0.702804/value
   /prop
 /node
+node oor:name=CR19 oor:op=replace
+  prop oor:name=FromUnit
+valueEUR/value
+  /prop
+  prop oor:name=ToUnit
+valueLTL/value
+  /prop
+  prop oor:name=Factor
+value3.45280/value
+  /prop
+/node
   /node
   node oor:name=Calculate
 node oor:name=Other
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 51453dd..64d321c 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2797,7 +2797,8 @@ static bool lclConvertMoney( const OUString aSearchUnit, 
double rfRate, int r
 { CYP, 0.585274, 2 },
 { SKK, 30.1260,  2 },
 { EEK, 15.6466,  2 },
-{ LVL, 0.702804, 2 }
+{ LVL, 0.702804, 2 },
+{ LTL, 3.45280,  2 }
 };
 
 static const size_t nConversionCount = sizeof( aConvertTable ) / sizeof( 
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Adolfo Jayme Barrientos

 icon-themes/galaxy/sfx2/res/minus.png |binary
 icon-themes/galaxy/sfx2/res/plus.png  |binary
 2 files changed

New commits:
commit 82425621ed5a215d6ee1b010d5431692b051e19b
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Sun Nov 16 12:15:46 2014 -0600

Change disclosure +/- icons to pointers

Change-Id: Ia42e2bc5120be294bc791dd2e2f06dd1fc2a2c8a
Reviewed-on: https://gerrit.libreoffice.org/12500
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/icon-themes/galaxy/sfx2/res/minus.png 
b/icon-themes/galaxy/sfx2/res/minus.png
index ac5b2cd..d044240 100644
Binary files a/icon-themes/galaxy/sfx2/res/minus.png and 
b/icon-themes/galaxy/sfx2/res/minus.png differ
diff --git a/icon-themes/galaxy/sfx2/res/plus.png 
b/icon-themes/galaxy/sfx2/res/plus.png
index 66497e6..63490c8 100644
Binary files a/icon-themes/galaxy/sfx2/res/plus.png and 
b/icon-themes/galaxy/sfx2/res/plus.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |8 
 sw/qa/extras/rtfimport/data/unbalanced-columns.rtf|5 +
 sw/qa/extras/rtfimport/rtfimport.cxx  |8 
 writerfilter/inc/dmapper/DomainMapper.hxx |1 +
 writerfilter/inc/resourcemodel/WW8ResourceModel.hxx   |3 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |5 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +++
 writerfilter/source/dmapper/PropertyMap.cxx   |9 ++---
 writerfilter/source/dmapper/PropertyMap.hxx   |2 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |5 +
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1 +
 writerfilter/source/ooxml/model.xml   |1 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|6 ++
 15 files changed, 59 insertions(+), 4 deletions(-)

New commits:
commit 084d5986823e7bd7baaa68450c0a6b4772c84246
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Jul 17 14:59:19 2014 +0200

fdo#84645 RTF import: set DontBalanceTextColumns=true for the last section 
...

... if it has multiple columns. See commit
d185204737031955c56a24356ed003d342548434 (DOCX import: set
DontBalanceTextColumns=true for the last section, 2014-07-17) for the
DOCX equivalent of this problem; this just adapts the RTF tokenizer to
dmapper.

(cherry picked from commit d185204737031955c56a24356ed003d342548434)
(cherry picked from commit f4bb73164a51ec83fe1d5975b1232d35f8a9e88a)

Change-Id: Ib30f9b386e204b8b2987832ab17ee0cc53b3f0bc
Reviewed-on: https://gerrit.libreoffice.org/12462
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx 
b/sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx
new file mode 100755
index 000..da6f93f
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 900a25e..0082009 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2395,6 +2395,14 @@ DECLARE_OOXMLIMPORT_TEST(testBnc821804, bnc821804.docx)
 CPPUNIT_ASSERT_EQUAL(false,getPropertybool(getRun(getParagraph(10), 3), 
IsStart));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testUnbalancedColumns, unbalanced-columns.docx)
+{
+uno::Referencetext::XTextSectionsSupplier 
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTextSections(xTextSectionsSupplier-getTextSections(), uno::UNO_QUERY);
+// This was false, last section was balanced, but it's unbalanced in Word.
+CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xTextSections-getByIndex(2), 
DontBalanceTextColumns));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/rtfimport/data/unbalanced-columns.rtf 
b/sw/qa/extras/rtfimport/data/unbalanced-columns.rtf
new file mode 100644
index 000..aa57e38
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/unbalanced-columns.rtf
@@ -0,0 +1,5 @@
+{\rtf1
+\cols2
+\pard\plain First paragraph.\par
+Second paragraph.\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 1214051..8a6c6da 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2009,6 +2009,14 @@ DECLARE_RTFIMPORT_TEST(testFdo82512, fdo82512.rtf)
 CPPUNIT_ASSERT_EQUAL(style::BreakType_COLUMN_BEFORE, 
getPropertystyle::BreakType(getParagraph(2), BreakType));
 }
 
+DECLARE_RTFIMPORT_TEST(testUnbalancedColumns, unbalanced-columns.rtf)
+{
+uno::Referencetext::XTextSectionsSupplier 
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTextSections(xTextSectionsSupplier-getTextSections(), uno::UNO_QUERY);
+// This was false, last section was balanced, but it's unbalanced in Word.
+CPPUNIT_ASSERT_EQUAL(true, getPropertybool(xTextSections-getByIndex(0), 
DontBalanceTextColumns));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx 
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 9266f08..7143219 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -87,6 +87,7 @@ public:
 
 // Stream
 virtual void markLastParagraphInSection() SAL_OVERRIDE;
+virtual void markLastSectionGroup() SAL_OVERRIDE;
 
 // BinaryObj
 virtual void data(const sal_uInt8* buf, size_t len,
diff --git a/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx 
b/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
index

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

 vcl/source/opengl/OpenGLContext.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a5a307a6147c1dee5cf1ceda3ae823abc48f6366
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 10:39:17 2014 +0100

warning C4702: unreachable code

Change-Id: Ia0c8a1dff329bedc4084c104659fe15183ae

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 98eb068..4cde114 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -200,8 +200,6 @@ bool WGLisExtensionSupported(const char *extension)
 if ((p==supported || p[-1]==' ')  (p[extlen]=='\0' || p[extlen]==' 
'))
 return 1; // Match
 }
-
-CHECK_GL_ERROR();
 }
 
 bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int rPixelFormat,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/parse-perfcheck.py

2014-11-17 Thread Laurent Godard

 bin/parse-perfcheck.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ad91cfdcf256f5af159f2f18d3b83f17b91849dc
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Fri Nov 14 18:11:08 2014 +0100

parse-perfcheck : add filename to csv results

one can find callgrind output file more easilly

Change-Id: Ic5019d5259a63ab23ed44d39baaeb7432690382e
Reviewed-on: https://gerrit.libreoffice.org/12450
Reviewed-by: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Tested-by: Riccardo Magliocchetti riccardo.magliocche...@gmail.com

diff --git a/bin/parse-perfcheck.py b/bin/parse-perfcheck.py
index 71f248c..ea10adf 100755
--- a/bin/parse-perfcheck.py
+++ b/bin/parse-perfcheck.py
@@ -47,14 +47,14 @@ def parseFile(dirname, filename, lastCommit):
 
   colsResult[lastCommitId]['values'][curTestComment] = total
 
-  return [lastCommitId, lastCommitDate, testName, curTestComment, total]
+  return [lastCommitId, lastCommitDate, testName, curTestComment, total, 
filename]
 
 def processDirectory(rootDir, needsCsvHeader, lastCommit):
 
 results = []
 
 if needsCsvHeader:
-results.append([lastCommit, lastCommitDate, test filename, dump 
comment, count])
+results.append([lastCommit, lastCommitDate, test filename, dump 
comment, count, filename])
 
 for dirName, subdirList, fileList in os.walk(rootDir):
 files = [f for f in fileList if f.startswith(callgrind.out.)]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 14 commits - filter/source include/package package/inc package/source

 filter/source/xsltfilter/OleHandler.cxx  |2 
 include/package/Deflater.hxx |1 
 package/inc/CRC32.hxx|2 
 package/inc/ZipOutputEntry.hxx   |   29 --
 package/inc/ZipOutputStream.hxx  |   23 +
 package/inc/ZipPackageFolder.hxx |1 
 package/inc/ZipPackageStream.hxx |   11 
 package/source/zipapi/CRC32.cxx  |7 
 package/source/zipapi/Deflater.cxx   |8 
 package/source/zipapi/ZipFile.cxx|4 
 package/source/zipapi/ZipOutputEntry.cxx |  307 ---
 package/source/zipapi/ZipOutputStream.cxx|  204 +--
 package/source/zippackage/ContentInfo.hxx|2 
 package/source/zippackage/ZipPackage.cxx |   34 +-
 package/source/zippackage/ZipPackageFolder.cxx   |   36 --
 package/source/zippackage/ZipPackageStream.cxx   |  194 ++
 package/source/zippackage/wrapstreamforshare.cxx |4 
 17 files changed, 441 insertions(+), 428 deletions(-)

New commits:
commit 0843ade74e5848c0babad509b10c334b01847be2
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Nov 12 21:25:55 2014 +0100

package: Do not bother with deflating jpeg images

It takes a lot of time and we can save ~1% of size if at all. Rather
store them uncompressed in the zip file.
With png, we can save a bit more, although it's still only about 4% - 8%?

Change-Id: I43a3e3812882e4ce85e7af9d0aaab454d98c4860

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 5eaa6e951..64b48d3 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -773,6 +773,14 @@ bool ZipPackageStream::saveChild(
 pTempEntry-nCompressedSize = pTempEntry-nSize = -1;
 }
 
+uno::Reference io::XSeekable  xSeek(xStream, uno::UNO_QUERY);
+// It's not worth to deflate jpegs to save ~1% in a slow process
+if (xSeek.is()  msMediaType.endsWith(/jpeg))
+{
+ImplSetStoredData(*pTempEntry, xStream);
+xSeek-seek(0);
+}
+
 try
 {
 ZipOutputStream::setEntry(pTempEntry);
@@ -799,7 +807,6 @@ bool ZipPackageStream::saveChild(
 {
 bParallelDeflate = true;
 // Do not deflate small streams in a thread
-uno::Reference io::XSeekable  xSeek( xStream, uno::UNO_QUERY 
);
 if (xSeek.is()  xSeek-getLength()  10)
 bParallelDeflate = false;
 
commit d09b6209f1f374b6069089d8583c9ee373e3c1e5
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Nov 4 09:18:57 2014 +0100

package: Do not deflate small streams in a thread

Change-Id: Iae804a34f344aa793a6d5c13315f7bc1eb64c0a2

diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 90f0df8..5eaa6e951 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -798,6 +798,11 @@ bool ZipPackageStream::saveChild(
 else
 {
 bParallelDeflate = true;
+// Do not deflate small streams in a thread
+uno::Reference io::XSeekable  xSeek( xStream, uno::UNO_QUERY 
);
+if (xSeek.is()  xSeek-getLength()  10)
+bParallelDeflate = false;
+
 if (bParallelDeflate)
 {
 // Start a new thread deflating this zip entry
commit 062cf187026f55001ab4661b89242d13c6ed71d7
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Oct 28 20:58:29 2014 +0100

ZipPackageStream::getRawData can be private

Change-Id: I66cbbfb2aa6abc6c8ebe34d9ea69855436c23edd

diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index ff6d3db..af2c721 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -71,7 +71,10 @@ private:
 bool m_bUseWinEncoding;
 bool m_bRawStream;
 
+/// Check that m_xStream implements io::XSeekable and return it
 ::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream  
GetOwnSeekStream();
+::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream  
SAL_CALL getRawData()
+throw(::com::sun::star::uno::RuntimeException);
 
 public:
 bool IsEncrypted () const{ return m_bIsEncrypted;}
@@ -135,8 +138,6 @@ public:
 const rtlRandomPool rRandomPool ) SAL_OVERRIDE;
 
 void setZipEntryOnLoading( const ZipEntry rInEntry);
-::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream  
SAL_CALL getRawData()
-throw(::com::sun::star::uno::RuntimeException);
 void successfullyWritten( ZipEntry *pEntry );
 
 static

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 6 commits - android/Bootstrap android/experimental desktop/source sal/android solenv/bin

2014-11-17 Thread Tomaž Vajngerl

 android/Bootstrap/src/org/libreoffice/kit/DirectBufferAllocator.java   
   |   14 -
 android/Bootstrap/src/org/libreoffice/kit/Document.java
   |4 
 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java  
   |   33 +--
 android/Bootstrap/src/org/libreoffice/kit/Office.java  
   |   12 -
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
  |   53 +++---
 
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProviderFactory.java
 |2 
 desktop/source/lib/init.cxx
   |   87 +++---
 desktop/source/lib/lokandroid.cxx  
   |   24 --
 sal/android/libreofficekit-jni.c   
   |8 
 solenv/bin/native-code.py  
   |4 
 10 files changed, 143 insertions(+), 98 deletions(-)

New commits:
commit 9bb1d121a822ca18aff83966f13e393d6fa639ba
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 10:47:02 2014 +0100

android: use ByteBuffer to send or store pointers in JNI bindings

Using direct ByteBuffer is much nicer option to store or send
pointers between C(++) code and Java via JNI as it handles endiness
and pointer size for us. Using long type can have unexpected
results in 32-bit architectures (mostly Android). This was causing
grief especially when Android introduced support for 64-bit
architectures starting with SDK 19.

Change-Id: Ie92d0f913b668e1724e846d70d1820445d9cb086

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 52b9bfd..aad4d5a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -24,9 +24,9 @@ public class Document {
 public static final int DOCTYPE_DRAWING = 3;
 public static final int DOCTYPE_OTHER = 4;
 
-private final long handle;
+private final ByteBuffer handle;
 
-public Document(long handle) {
+public Document(ByteBuffer handle) {
 this.handle = handle;
 }
 
diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java 
b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index 4fe2061..2a60f84 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -14,6 +14,7 @@ import android.content.pm.ApplicationInfo;
 import android.util.Log;
 
 import java.io.InputStream;
+import java.nio.ByteBuffer;
 
 // Native methods in this class are all implemented in
 // sal/android/lo-bootstrap.c as the lo-bootstrap library is loaded with
@@ -34,7 +35,7 @@ public final class LibreOfficeKit
 // Trigger initialization on the JNI - LOKit side.
 private static native boolean initializeNative(String dataDir, String 
cacheDir, String apkFile);
 
-public static native long getLibreOfficeKitHandle();
+public static native ByteBuffer getLibreOfficeKitHandle();
 
 // Wrapper for putenv()
 public static native void putenv(String string);
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Office.java 
b/android/Bootstrap/src/org/libreoffice/kit/Office.java
index bd6144f..e7d26c5 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Office.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Office.java
@@ -9,22 +9,24 @@
 
 package org.libreoffice.kit;
 
+import java.nio.ByteBuffer;
+
 public class Office {
 
-private long handle;
+private ByteBuffer handle;
 
-public Office(long handle) {
+public Office(ByteBuffer handle) {
 this.handle = handle;
 }
 
 public native String getError();
 
-private native long documentLoadNative(String url);
+private native ByteBuffer documentLoadNative(String url);
 
 public Document documentLoad(String url) {
-long documentHandle = documentLoadNative(url);
+ByteBuffer documentHandle = documentLoadNative(url);
 Document document = null;
-if (documentHandle  0) {
+if (documentHandle != null) {
 document = new Document(documentHandle);
 }
 return document;
diff --git a/desktop/source/lib/lokandroid.cxx 
b/desktop/source/lib/lokandroid.cxx
index 707996e..0f408ea 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -25,21 +25,14 @@
 jfieldID getHandleField(JNIEnv* pEnv, jobject aObject)
 {
 jclass clazz = pEnv-GetObjectClass(aObject);
-return pEnv-GetFieldID(clazz, handle, J);
+return pEnv-GetFieldID(clazz, handle, Ljava/nio/ByteBuffer;);
 }
 
 template typename T
 T* getHandle(JNIEnv* pEnv, jobject aObject)
 {
-jlong aHandle = pEnv-GetLongField(aObject, getHandleField(pEnv, aObject));
-return

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

2014-11-17 Thread Matthew J . Francis

 include/sfx2/recentdocsviewitem.hxx|4 
 sfx2/source/control/recentdocsviewitem.cxx |   28 +---
 2 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit e43f692ef908fd2bc180a5e16fb363ec6bb7eb09
Author: Matthew J. Francis mjay.fran...@gmail.com
Date:   Sun Nov 16 10:26:18 2014 +0800

fdo#85478 Avoid destroying bitmaps after VCL is shut down

Change-Id: I1ece738e7f60b6bbbdc802339f8b9deec9396e1b
Reviewed-on: https://gerrit.libreoffice.org/12469
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/include/sfx2/recentdocsviewitem.hxx 
b/include/sfx2/recentdocsviewitem.hxx
index b1a51fe..7ee05ee 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -49,6 +49,10 @@ private:
 
 /// Is the icon that the user can click to remove the document from the 
recent documents highlighted?
 bool m_bRemoveIconHighlighted;
+
+BitmapEx m_aRemoveRecentBitmap;
+
+BitmapEx m_aRemoveRecentBitmapHighlighted;
 };
 
 #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index aa2a7e0..c8f19f4 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -30,31 +30,13 @@ using namespace com::sun::star::uno;
 using namespace drawinglayer::primitive2d;
 using namespace drawinglayer::processor2d;
 
-/// Icon that the user can click to remove the document from the recent 
documents.
-struct theRemoveRecentBitmap : public rtl::StaticWithInitBitmapEx, 
theRemoveRecentBitmap
-{
-BitmapEx operator()()
-{
-return SfxResId(IMG_RECENTDOC_REMOVE);
-}
-
-};
-
-/// Highlighted version of icon that the user can click to remove the document 
from the recent documents.
-struct theRemoveRecentBitmapHighlighted : public rtl::StaticWithInitBitmapEx, 
theRemoveRecentBitmapHighlighted
-{
-BitmapEx operator()()
-{
-return SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED);
-}
-
-};
-
 RecentDocsViewItem::RecentDocsViewItem(ThumbnailView rView, const OUString 
rURL,
 const OUString rTitle, const BitmapEx rThumbnail, sal_uInt16 nId)
 : ThumbnailViewItem(rView, nId),
   maURL(rURL),
-  m_bRemoveIconHighlighted(false)
+  m_bRemoveIconHighlighted(false),
+  m_aRemoveRecentBitmap(SfxResId(IMG_RECENTDOC_REMOVE)),
+  
m_aRemoveRecentBitmapHighlighted(SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED))
 {
 OUString aTitle(rTitle);
 INetURLObject aURLObj(rURL);
@@ -151,7 +133,7 @@ Rectangle RecentDocsViewItem::updateHighlight(bool 
bVisible, const Point rPoint
 Rectangle RecentDocsViewItem::getRemoveIconArea() const
 {
 Rectangle aArea(getDrawArea());
-Size aSize(theRemoveRecentBitmap::get().GetSizePixel());
+Size aSize(m_aRemoveRecentBitmap.GetSizePixel());
 
 return Rectangle(
 Point(aArea.Right() - aSize.Width() - THUMBNAILVIEW_ITEM_CORNER, 
aArea.Top() + THUMBNAILVIEW_ITEM_CORNER),
@@ -175,7 +157,7 @@ void 
RecentDocsViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProc
 Point aIconPos(getRemoveIconArea().TopLeft());
 
 aSeq[0] = drawinglayer::primitive2d::Primitive2DReference(new 
DiscreteBitmapPrimitive2D(
-m_bRemoveIconHighlighted? 
theRemoveRecentBitmapHighlighted::get(): theRemoveRecentBitmap::get(),
+m_bRemoveIconHighlighted ? 
m_aRemoveRecentBitmapHighlighted : m_aRemoveRecentBitmap,
 B2DPoint(aIconPos.X(), aIconPos.Y(;
 
 pProcessor-process(aSeq);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/win/source/gdi/winlayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d8a8149e1550ca435b35a421b97070266914f49f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 11:02:01 2014 +0100

warning C4189: local variable is initialized but not referenced

Change-Id: Id87af31e9b60d548959ba735b635ff3d154fc587

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7f6fdc9..3321d0d 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -244,9 +244,9 @@ void WinLayout::DrawText(SalGraphics rGraphics) const
 aRects.mnDestHeight = height;
 
 pImpl-PreDraw();
-COLORREF color = GetTextColor(hDC);
-SalColor salColor = MAKE_SALCOLOR(GetRValue(color), 
GetGValue(color), GetBValue(color));
 // TODO when we have it:
+// COLORREF color = GetTextColor(hDC);
+// SalColor salColor = MAKE_SALCOLOR(GetRValue(color), 
GetGValue(color), GetBValue(color));
 // pImpl-DrawSolidColorWithMask(salColor, aTexture, aRects);
 // and kill the following interim thing:
 pImpl-DrawTexture(aTexture, aRects);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/core/unocore/unoobj2.cxx  |6 +++---
 sw/source/core/unocore/unoparagraph.cxx |2 +-
 sw/source/core/unocore/unoportenum.cxx  |2 +-
 sw/source/core/unocore/unorefmk.cxx |2 +-
 sw/source/uibase/uno/unotxvw.cxx|2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 1b3f795c8e993fa9a8b76f84292041d3d22523dc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 11:04:56 2014 +0100

suspicious cast from 'bool' to 'sal_Bool' [loplugin:salbool]

Change-Id: I28b52faa71bb198ee34ae4893e4610aa83773645

diff --git a/sw/source/core/unocore/unoobj2.cxx 
b/sw/source/core/unocore/unoobj2.cxx
index ed2db72..adc6bd0 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -538,7 +538,7 @@ SwXParagraphEnumeration::hasMoreElements() throw 
(uno::RuntimeException, std::ex
 {
 SolarMutexGuard aGuard;
 
-return static_castsal_Bool(m_pImpl-m_bFirstParagraph || 
m_pImpl-m_xNextPara.is());
+return m_pImpl-m_bFirstParagraph || m_pImpl-m_xNextPara.is();
 }
 
 //!! compare to SwShellTableCrsr::FillRects() in viscrs.cxx
@@ -1861,8 +1861,8 @@ SwXParaFrameEnumeration::hasMoreElements() throw 
(uno::RuntimeException, std::ex
 if (!m_pImpl-GetCursor())
 throw uno::RuntimeException();
 
-return static_castsal_Bool(m_pImpl-m_xNextObject.is() ||
-lcl_CreateNextObject(*m_pImpl-GetCursor(),m_pImpl-m_xNextObject, 
m_pImpl-m_Frames));
+return m_pImpl-m_xNextObject.is() ||
+lcl_CreateNextObject(*m_pImpl-GetCursor(),m_pImpl-m_xNextObject, 
m_pImpl-m_Frames);
 }
 
 uno::Any SAL_CALL SwXParaFrameEnumeration::nextElement()
diff --git a/sw/source/core/unocore/unoparagraph.cxx 
b/sw/source/core/unocore/unoparagraph.cxx
index a7a7395..3acacd7 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -1328,7 +1328,7 @@ uno::Type SAL_CALL SwXParagraph::getElementType() throw 
(uno::RuntimeException,
 sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException, 
std::exception)
 {
 SolarMutexGuard aGuard;
-return static_castsal_Bool(GetTxtNode() != nullptr);
+return GetTxtNode() != nullptr;
 }
 
 uno::Reference text::XText  SAL_CALL
diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index 90e9700..039e60f 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -399,7 +399,7 @@ throw( uno::RuntimeException, std::exception )
 {
 SolarMutexGuard aGuard;
 
-return static_castsal_Bool(m_Portions.size()  0);
+return m_Portions.size()  0;
 }
 
 uno::Any SwXTextPortionEnumeration::nextElement()
diff --git a/sw/source/core/unocore/unorefmk.cxx 
b/sw/source/core/unocore/unorefmk.cxx
index ec1c4c4..9cc6a33 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1234,7 +1234,7 @@ SwXMeta::hasElements() throw (uno::RuntimeException, 
std::exception)
 {
 SolarMutexGuard g;
 
-return static_castsal_Bool(m_pImpl-GetRegisteredIn() != nullptr);
+return m_pImpl-GetRegisteredIn() != nullptr;
 }
 
 // XEnumerationAccess
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 7f6682e..8d31246 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -483,7 +483,7 @@ sal_Bool SAL_CALL SwXTextView::isFormDesignMode(  ) throw 
(uno::RuntimeException
 SolarMutexGuard aGuard;
 SwView* pView2 = GetView();
 FmFormShell* pFormShell = pView2 ? pView2-GetFormShell() : NULL;
-return static_castsal_Bool(!pFormShell || pFormShell-IsDesignMode());
+return !pFormShell || pFormShell-IsDesignMode();
 }
 
 void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool _DesignMode ) throw 
(RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/filter/oox/drawingmanager.cxx |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit fbe3a3cf6070caba35e0c7b8e6f15ed6136f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 11:16:28 2014 +0100

-Werror,-Wunused-const-variable

Change-Id: Ic6a8f6435e00c7b679c58bdfe57da4555107787d

diff --git a/sc/source/filter/oox/drawingmanager.cxx 
b/sc/source/filter/oox/drawingmanager.cxx
index 62e2448..2b9dc40 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -43,28 +43,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 using namespace ::oox::drawingml;
 
-namespace {
-
-// OBJ record -
-
-// line formatting 
-
-const sal_uInt8 BIFF_OBJ_LINE_AUTOCOLOR = 64;
-
-const sal_uInt8 BIFF_OBJ_LINE_SOLID = 0;
-
-const sal_uInt8 BIFF_OBJ_LINE_HAIR  = 0;
-
-
-
-// fill formatting 
-
-const sal_uInt8 BIFF_OBJ_FILL_AUTOCOLOR = 65;
-
-const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1;
-
-} // namespace
-
 // BIFF drawing page
 BiffDrawingBase::BiffDrawingBase( const WorksheetHelper rHelper, const 
Reference XDrawPage  rxDrawPage ) :
 WorksheetHelper( rHelper ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +-
 sc/source/core/tool/calcconfig.cxx   |9 +
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit e6a441ccc19aacdde335c2282047631e0baf40cd
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Nov 17 10:38:14 2014 +0200

Insert some fairly generic fallback whitelist entries for now

Change-Id: I1887a32aeef8097e3e8297d6bddc51179dd65127

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 6f2dc7c..d4e65eb 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1401,7 +1401,7 @@
   info
 descLike OpenCLWhiteList, but for combinations known to be 
good./desc
   /info
-  value oor:separator=;Linux/*/Advanced Micro Devices, 
Inc./*/1445.5 (sse2,avx)//value
+  value oor:separator=;Linux/*/Advanced Micro Devices, 
Inc./*/1445.5 (sse2,avx)/;*/*/Advanced Micro Devices, Inc./*/*/;*/*/Intel(R) 
Corporation/*/*/;*/*/NVIDIA Corporation/*/*//value
 /prop
   /group
   group oor:name=Syntax
diff --git a/sc/source/core/tool/calcconfig.cxx 
b/sc/source/core/tool/calcconfig.cxx
index 0ff048b..c93d482 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -45,9 +45,18 @@ void ScCalcConfig::setOpenCLConfigToDefault()
 maOpenCLSubsetOpCodes.insert(ocAverage);
 maOpenCLSubsetOpCodes.insert(ocSumIfs);
 
+// This entry we have had for some time (when blacklisting was
+// done elsewhere in the code), so presumably there is a known
+// good reason for it.
 maOpenCLBlackList.insert(OpenCLImplMatcher(Windows, *, Intel(R) 
Corporation, *, 9.17.10.2884, ));
 
+// This is what I have tested on Linux and it works for our unit tests.
 maOpenCLWhiteList.insert(OpenCLImplMatcher(Linux, *, Advanced Micro 
Devices, Inc., *, 1445.5 (sse2,avx), ));
+
+// For now, assume that AMD, Intel and NVIDIA drivers are good
+maOpenCLWhiteList.insert(OpenCLImplMatcher(*, *, Advanced Micro 
Devices, Inc., *, *, ));
+maOpenCLWhiteList.insert(OpenCLImplMatcher(*, *, Intel(R) 
Corporation, *, *, ));
+maOpenCLWhiteList.insert(OpenCLImplMatcher(*, *, NVIDIA Corporation, 
*, *, ));
 }
 
 void ScCalcConfig::reset()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SfxFilterMatcher::GuessFilter called with sal_False instead of SfxFilterGlags

On Sun, 2014-11-16 at 19:59 +0100, Matteo Casalin wrote:
 Hi all,
  I found some call sites [1] for SfxFilterMatcher::GuessFilter which 
 pass a sal_False value instead of a SfxFilterFlags, and among the 
 defined flags I just see SFX_FILTER_VERSION_NONE (which is never used in 
 the code, anyway) with a 0 value. These calls seems to be like this from 
 the beginning and I really haven't got a clue if sal_False should be 
 changed to 0 (or SFX_FILTER_VERSION_NONE), to something else, just 
 deleted, or whatever.

The safest and easiest thing IMO is to just change from from sal_False
to SFX_FILTER_VERSION_NONE so I've done that change now.

C.

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

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

 connectivity/source/drivers/kab/kfields.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c34322b5253db84f80fb936419769565e4c6d207
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 11:44:05 2014 +0100

Missing include

Change-Id: I1dbf7a73ec60115f11d3a5455de2871041cd1605

diff --git a/connectivity/source/drivers/kab/kfields.cxx 
b/connectivity/source/drivers/kab/kfields.cxx
index ec7d400..79582dd 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include sal/config.h
+
+#include osl/diagnose.h
 
 #include kfields.hxx
 #include resource/common_res.hrc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 cppu/source/threadpool/thread.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1fc7a1d532015c8dc3eb07ee9b600bb153e04073
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 11:57:43 2014 +0100

cid#1254675 Uncaught exception

just throw up hands in despair via std::abort instead of std::runtime_error

Change-Id: I356932ed2d76558bb4febbd2ac0a7bb6ea27bd0f

diff --git a/cppu/source/threadpool/thread.cxx 
b/cppu/source/threadpool/thread.cxx
index 724da75..e1be210 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include sal/config.h
+
+#include cstdlib
 #include stdio.h
 #include osl/diagnose.h
 #include uno/threadpool.h
@@ -125,7 +128,7 @@ namespace cppu_threadpool {
 }
 try {
 if (!create()) {
-throw std::runtime_error(osl::Thread::create failed);
+std::abort();
 }
 } catch (...) {
 rThreadAdmin.remove_locked( this );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SfxFilterMatcher::GuessFilter called with sal_False instead of SfxFilterGlags

2014-11-17 Thread Matteo Casalin

Great! Thanks Caolán.
Matteo

On Mon, 17 Nov 2014 10:42:03 +
Caolán McNamara caol...@redhat.com wrote:

 On Sun, 2014-11-16 at 19:59 +0100, Matteo Casalin wrote:
  Hi all,
   I found some call sites [1] for SfxFilterMatcher::GuessFilter which 
  pass a sal_False value instead of a SfxFilterFlags, and among the 
  defined flags I just see SFX_FILTER_VERSION_NONE (which is never used in 
  the code, anyway) with a 0 value. These calls seems to be like this from 
  the beginning and I really haven't got a clue if sal_False should be 
  changed to 0 (or SFX_FILTER_VERSION_NONE), to something else, just 
  deleted, or whatever.
 
 The safest and easiest thing IMO is to just change from from sal_False
 to SFX_FILTER_VERSION_NONE so I've done that change now.
 
 C.
 
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2014-11-17 Thread Michael Stahl

 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx |1 +
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 8b50d6b176e53c11762bbcdd767060550acd1bc1
Author: Michael Stahl mst...@redhat.com
Date:   Mon Nov 17 12:49:21 2014 +0100

bridges: get at least the x86 bridge to build

Change-Id: Idd2f223e0c83e0a6a19e70bd677058b6899bf766

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index bdb3093..70452c7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -20,6 +20,7 @@
 
 #include com/sun/star/uno/genfunc.hxx
 #include com/sun/star/uno/RuntimeException.hpp
+#include osl/diagnose.h
 #include uno/data.h
 #include typelib/typedescription.hxx
 
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
index 3a31d08..fabcbc8 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx
@@ -19,6 +19,7 @@
 
 
 #include sal/alloca.h
+#include osl/diagnose.h
 
 #include com/sun/star/uno/genfunc.hxx
 #include com/sun/star/uno/RuntimeException.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svtools/qa/unit/GraphicObjectTest.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 46eb0952f1e2d75b427bdcd553c33027f1e44e8f
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Nov 17 14:09:06 2014 +0200

WaE: Unreferenced function definition [loplugin:unreffun]

Change-Id: I55d6d1d403622e5ec04c29dd407274cf9db20c40

diff --git a/svtools/qa/unit/GraphicObjectTest.cxx 
b/svtools/qa/unit/GraphicObjectTest.cxx
index 34e26fd..80cfada 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -38,7 +38,9 @@ class GraphicObjectTest: public test::BootstrapFixture, 
public unotest::MacrosTe
 {
 
 public:
+#if 0
 void testSwap();
+#endif
 void testSizeBasedAutoSwap();
 
 
@@ -61,17 +63,23 @@ private:
 static const char aGraphicFile[] = /svtools/qa/unit/data/graphic.png;
 static const sal_uLong nGraphicSizeBytes = 4800;
 
+#if 0
+
 const Graphic lcl_loadGraphic(const rtl::OUString rUrl)
 {
 const Image aImage(rUrl);
 return Graphic(aImage.GetBitmapEx());
 }
 
+#endif
+
 IMPL_LINK(GraphicObjectTest, getLinkStream, GraphicObject*, /*pGraphObj*/)
 {
 return reinterpret_castsal_IntPtr(GRFMGR_AUTOSWAPSTREAM_LINK);
 }
 
+#if 0
+
 void GraphicObjectTest::testSwap()
 {
 // simple non-linked case
@@ -141,6 +149,8 @@ void GraphicObjectTest::testSwap()
 }
 }
 
+#endif
+
 void GraphicObjectTest::testSizeBasedAutoSwap()
 {
 // Set cache size to a very small value to check what happens
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svtools/qa/unit/GraphicObjectTest.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f71aa1adc822d7886a060bf66d513478a029fa4b
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Nov 17 14:24:16 2014 +0200

WaE: unused variables

Change-Id: I82570a716a0dba6c466bc754ce66ac53e7c17efa

diff --git a/svtools/qa/unit/GraphicObjectTest.cxx 
b/svtools/qa/unit/GraphicObjectTest.cxx
index 80cfada..4f99b52 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -60,11 +60,11 @@ private:
 CPPUNIT_TEST_SUITE_END();
 };
 
+#if 0
+
 static const char aGraphicFile[] = /svtools/qa/unit/data/graphic.png;
 static const sal_uLong nGraphicSizeBytes = 4800;
 
-#if 0
-
 const Graphic lcl_loadGraphic(const rtl::OUString rUrl)
 {
 const Image aImage(rUrl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - 2 commits - include/svtools svtools/source svx/source

2014-11-17 Thread Tobias Madl

 include/svtools/asynclink.hxx |8 
 svtools/source/control/asynclink.cxx  |   18 +-
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx |2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 280649a558b085de0bfdd9ff6a70a4d6c5be527b
Author: Tobias Madl tobias.madl@gmail.com
Date:   Mon Nov 17 12:36:23 2014 +

changed Timer tp idle

Change-Id: Ia3e76239ba98530547e057bebfda767ad684730b

diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index e303bbe..fea886d 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -25,7 +25,7 @@
 #include tools/link.hxx
 #include osl/mutex.hxx
 
-class Timer;
+class Idle;
 struct ImplSVEvent;
 
 namespace svtools {
@@ -34,7 +34,7 @@ class SVT_DLLPUBLIC AsynchronLink
 {
 Link   _aLink;
 ImplSVEvent * _nEventId;
-Timer* _pTimer;
+Idle*  _pIdle;
 bool   _bInCall;
 bool*  _pDeleted;
 void*  _pArg;
@@ -47,7 +47,7 @@ public:
 AsynchronLink( const Link rLink )
 : _aLink( rLink )
 , _nEventId( 0 )
-, _pTimer( 0 )
+, _pIdle( 0 )
 , _bInCall( false )
 , _pDeleted( 0 )
 , _pArg( 0 )
@@ -55,7 +55,7 @@ public:
 {}
 AsynchronLink()
 : _nEventId( 0 )
-, _pTimer( 0 )
+, _pIdle( 0 )
 , _bInCall( false )
 , _pDeleted( 0 )
 , _pArg( 0 )
diff --git a/svtools/source/control/asynclink.cxx 
b/svtools/source/control/asynclink.cxx
index 57550e8..1efd934 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -46,7 +46,7 @@ bAllowDoubles
 {
 _pArg = pObj;
 DBG_ASSERT( bAllowDoubles ||
-( !_nEventId  ( !_pTimer || !_pTimer-IsActive() ) ),
+( !_nEventId  ( !_pIdle || !_pIdle-IsActive() ) ),
 Schon ein Call unterwegs );
 if( _nEventId )
 {
@@ -54,17 +54,17 @@ bAllowDoubles
 Application::RemoveUserEvent( _nEventId );
 if( _pMutex ) _pMutex-release();
 }
-if( _pTimer )_pTimer-Stop();
+if( _pIdle )_pIdle-Stop();
 if( bUseTimer )
 {
-if( !_pTimer )
+if( !_pIdle )
 {
-_pTimer = new Timer;
-_pTimer-SetTimeout( 0 );
-_pTimer-SetTimeoutHdl( STATIC_LINK(
+_pIdle = new Idle;
+_pIdle-SetPriority( VCL_IDLE_PRIORITY_HIGHEST );
+_pIdle-SetIdleHdl( STATIC_LINK(
 this, AsynchronLink, HandleCall) );
 }
-_pTimer-Start();
+_pIdle-Start();
 }
 else
 {
@@ -81,7 +81,7 @@ AsynchronLink::~AsynchronLink()
 {
 Application::RemoveUserEvent( _nEventId );
 }
-delete _pTimer;
+delete _pIdle;
 if( _pDeleted ) *_pDeleted = true;
 delete _pMutex;
 }
@@ -104,7 +104,7 @@ void AsynchronLink::ClearPendingCall()
 _nEventId = 0;
 }
 if( _pMutex ) _pMutex-release();
-if( _pTimer ) _pTimer-Stop();
+if( _pIdle ) _pIdle-Stop();
 }
 
 void AsynchronLink::Call_Impl( void* pArg )
commit 1688ee26cf83fcb954af20fff0a66ab381759ca3
Author: Tobias Madl tobias.madl@gmail.com
Date:   Mon Nov 17 12:14:50 2014 +

fixed timer, idle bug

Change-Id: Ic7ce17e39d2bcaf608576dd785b4f6abf62407c0

diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx 
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index dde69b3..006c310 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -429,7 +429,7 @@ namespace sdr
 {
 // Init timer
 maBufferIdle.SetPriority( VCL_IDLE_PRIORITY_HIGH );
-maBufferIdle.SetTimeoutHdl(LINK(this, OverlayManagerBuffered, 
ImpBufferTimerHandler));
+maBufferIdle.SetIdleHdl(LINK(this, OverlayManagerBuffered, 
ImpBufferTimerHandler));
 }
 
 rtl::ReferenceOverlayManager OverlayManagerBuffered::create(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental

2014-11-17 Thread Tomaž Vajngerl

 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09f97af0c82cdcd0622abe651ad09232ae7cfa5c
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Mon Nov 17 13:42:41 2014 +0100

android: Change the handle type (long too ByteBuffer)

Change-Id: Ia2ed94dbbb43d2e768da5af5ca7a51f5cda5bae0

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index d4531d1..3455b7c 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -49,7 +49,7 @@ public class LOKitTileProvider implements TileProvider {
 Log.i(LOGTAG,  mOffice.documentLoad() returned null, trying 
to restart 'Office' and loading again);
 mOffice.destroy();
 Log.i(LOGTAG,  mOffice.destroy() done);
-long handle = LibreOfficeKit.getLibreOfficeKitHandle();
+ByteBuffer handle = LibreOfficeKit.getLibreOfficeKitHandle();
 Log.i(LOGTAG,  getLibreOfficeKitHandle() =  + handle);
 mOffice = new Office(handle);
 Log.i(LOGTAG,  new Office created);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svtools/qa/unit/GraphicObjectTest.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c9518656afab37cf4c0389946c7a97478132bd81
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 13:43:56 2014 +0100

loplugin:unreffun

Change-Id: Ifc7377fe1bb68b21e462818248706f53347b39b1

diff --git a/svtools/qa/unit/GraphicObjectTest.cxx 
b/svtools/qa/unit/GraphicObjectTest.cxx
index 4f99b52..5216e70 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -52,7 +52,9 @@ public:
 }
 
 private:
+#if 0
 DECL_LINK(getLinkStream, GraphicObject*);
+#endif
 
 private:
 CPPUNIT_TEST_SUITE(GraphicObjectTest);
@@ -71,15 +73,11 @@ const Graphic lcl_loadGraphic(const rtl::OUString rUrl)
 return Graphic(aImage.GetBitmapEx());
 }
 
-#endif
-
 IMPL_LINK(GraphicObjectTest, getLinkStream, GraphicObject*, /*pGraphObj*/)
 {
 return reinterpret_castsal_IntPtr(GRFMGR_AUTOSWAPSTREAM_LINK);
 }
 
-#if 0
-
 void GraphicObjectTest::testSwap()
 {
 // simple non-linked case
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/priorities' - dbaccess/source

2014-11-17 Thread Jennifer Liebel

 dbaccess/source/ui/inc/JoinTableView.hxx |2 +-
 dbaccess/source/ui/querydesign/JoinTableView.cxx |   18 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 3eb679960b66c5094fbd68372418fd9ba3ba9033
Author: Jennifer Liebel jliebe...@gmail.com
Date:   Mon Nov 17 12:41:33 2014 +

idle to timer

Change-Id: I4862cbdb224a90c156a0c59b131ed94bf6f0d7f1

diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx 
b/dbaccess/source/ui/inc/JoinTableView.hxx
index a14be0d..c9c5002 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -85,7 +85,7 @@ namespace dbaui
 OTableWindowMap m_aTableMap;
 ::std::vectorOTableConnection*m_vTableConnection;
 
-Idlem_aDragScrollIdle;
+Timer   m_aDragScrollTimer;
 Rectangle   m_aDragRect;
 Rectangle   m_aSizingRect;
 Point   m_aDragOffset;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx 
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 29b64ef..2944efc 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -169,7 +169,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, 
OJoinDesignView* pView )
 
 InitColors();
 
-m_aDragScrollIdle.SetIdleHdl(LINK(this, OJoinTableView, 
OnDragScrollTimer));
+m_aDragScrollTimer.SetTimeoutHdl(LINK(this, OJoinTableView, 
OnDragScrollTimer));
 }
 
 OJoinTableView::~OJoinTableView()
@@ -717,8 +717,8 @@ void OJoinTableView::Tracking( const TrackingEvent rTEvt )
 {
 if( m_pDragWin )
 {
-if (m_aDragScrollIdle.IsActive())
-m_aDragScrollIdle.Stop();
+if (m_aDragScrollTimer.IsActive())
+m_aDragScrollTimer.Stop();
 
 // adjust position of child after moving
 // windows are not allowed to leave display range
@@ -777,8 +777,8 @@ void OJoinTableView::Tracking( const TrackingEvent rTEvt )
 }
 else if (rTEvt.IsTrackingCanceled())
 {
-if (m_aDragScrollIdle.IsActive())
-m_aDragScrollIdle.Stop();
+if (m_aDragScrollTimer.IsActive())
+m_aDragScrollTimer.Stop();
 EndTracking();
 }
 else
@@ -990,8 +990,8 @@ bool OJoinTableView::ScrollWhileDragging()
 OSL_ENSURE(m_pDragWin != NULL, OJoinTableView::ScrollWhileDragging must 
not be called when a window is being dragged !);
 
 // kill the timer
-if (m_aDragScrollIdle.IsActive())
-m_aDragScrollIdle.Stop();
+if (m_aDragScrollTimer.IsActive())
+m_aDragScrollTimer.Stop();
 
 Point aDragWinPos = m_ptPrevDraggingPos - m_aDragOffset;
 Size aDragWinSize = m_pDragWin-GetSizePixel();
@@ -1049,8 +1049,8 @@ bool OJoinTableView::ScrollWhileDragging()
 // resetting timer, if still necessary
 if (bNeedScrollTimer)
 {
-m_aDragScrollIdle.SetPriority(VCL_IDLE_PRIORITY_LOW);
-m_aDragScrollIdle.Start();
+m_aDragScrollTimer.SetTimeout(100);
+m_aDragScrollTimer.Start();
 }
 
 // redraw DraggingRect
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-11-17 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=75025
Bug 75025 depends on bug 80755, which changed state.

Bug 80755 Summary: StartCenter displays thumbnails of password-protected files
https://bugs.freedesktop.org/show_bug.cgi?id=80755

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] core.git: 2 commits - include/vcl

2014-11-17 Thread Chris Sherlock

 include/vcl/animate.hxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 65f41639e219470c80f896129731f9ed6f072b6b
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Mon Nov 17 21:59:28 2014 +1100

vcl: remove AnimViewList_impl typedef also

Another typedef that destroys code readibility. I've removed 
AnimViewList_impl
because it's just a vector of ImplAnimView pointers.

Change-Id: I97e5867e1a7aeae575e45989ba7436867da9c808

diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index dae31a9..e966e3f 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -122,7 +122,6 @@ struct AInfo
 };
 
 class ImplAnimView;
-typedef ::std::vector ImplAnimView*  AnimViewList_impl;
 
 class VCL_DLLPUBLIC Animation
 {
@@ -217,8 +216,8 @@ public:
 private:
 SAL_DLLPRIVATE static sal_uLong mnAnimCount;
 
-std::vector AnimationBitmap* maList;
-AnimViewList_impl maViewList;
+std::vector AnimationBitmap*  maList;
+std::vector ImplAnimView* maViewList;
 
 LinkmaNotifyLink;
 BitmapExmaBitmapEx;
commit 725150f4ad8bcbe4c9706eea264238c1e3159915
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Mon Nov 17 21:55:47 2014 +1100

vcl: remove AnimationBitmapList_impl typedef

Severe overuse of typedefs makes baby Torvalds sad. :-)

AnimationBitmapList_impl is just a typedef to a vector of AnimationBitmap
pointers. It's used precisely once in the code - in animate.hxx. This just
makes reading the code more difficult - too many layers of abstraction.

Change-Id: If84892dc90220c7dfe8c071d629268efa226f069

diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 25f10f0..dae31a9 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -122,7 +122,6 @@ struct AInfo
 };
 
 class ImplAnimView;
-typedef ::std::vector AnimationBitmap*  AnimationBitmapList_impl;
 typedef ::std::vector ImplAnimView*  AnimViewList_impl;
 
 class VCL_DLLPUBLIC Animation
@@ -218,7 +217,7 @@ public:
 private:
 SAL_DLLPRIVATE static sal_uLong mnAnimCount;
 
-AnimationBitmapList_impl maList;
+std::vector AnimationBitmap* maList;
 AnimViewList_impl maViewList;
 
 LinkmaNotifyLink;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/jpeg-turbo external/Module_external.mk Makefile.fetch RepositoryExternal.mk vcl/source

 Makefile.fetch|1 
 RepositoryExternal.mk |   14 
 config_host.mk.in |2 
 configure.ac  |   67 +-
 download.lst  |2 
 external/Module_external.mk   |1 
 external/jpeg-turbo/ExternalProject_jpeg-turbo.mk |   37 
 external/jpeg-turbo/Makefile  |7 ++
 external/jpeg-turbo/Module_jpeg-turbo.mk  |   21 ++
 external/jpeg-turbo/README|6 +
 external/jpeg-turbo/UnpackedTarball_jpeg-turbo.mk |   19 ++
 external/jpeg-turbo/jpeg-turbo.build.patch.1  |   58 +++
 external/jpeg-turbo/jpeg-turbo.win_build.patch.1  |   15 
 vcl/source/filter/jpeg/transupp.c |4 -
 14 files changed, 250 insertions(+), 4 deletions(-)

New commits:
commit 71fae5db27255fb51a25a307205a8fe76cc56b6a
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Nov 17 09:16:34 2014 +0100

Add internal libjpeg-turbo library to be used instead of libjpeg

Unfortunately requires nasm - the netwide assembler -
http://www.nasm.us/

Upstream libjpeg-turbo is meant to be built with CMake on Windows but
thanks to our gcc-wrappers we are able to avoid that.

jpeg is kept mostly for platforms we are cross-compiling to. For now,
it's used also for Mac OS X because jpeg-turbo does not build there,
which should be fixed later.

Change-Id: Id87b7072a8acc2578c3abf7e82cb1499e5094dbf

diff --git a/Makefile.fetch b/Makefile.fetch
index 18b12be..7aee66a 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -151,6 +151,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_LIBXML_TARBALL) \
$(call fetch_Optional,JFREEREPORT,JFREEREPORT_SAC_TARBALL) \
$(call fetch_Optional,JPEG,JPEG_TARBALL) \
+   $(call fetch_Optional,JPEG_TURBO,JPEG_TURBO_TARBALL) \
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 911dab1..47f6e90 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -444,6 +444,20 @@ $(call gb_LinkTarget_set_ldflags,$(1),\
 
 endef
 
+else ifeq ($(WITH_JPEG_TURBO),TRUE)
+
+define gb_LinkTarget__use_jpeg
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,jpeg-turbo) \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,jpeg-turbo)/.libs/libjpeg$(gb_StaticLibrary_PLAINEXT)
 \
+)
+$(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo)
+
+endef
+
 else # !SYSTEM_JPEG
 
 define gb_LinkTarget__use_jpeg
diff --git a/config_host.mk.in b/config_host.mk.in
index b507562..a23629f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -411,6 +411,7 @@ export MWAW_CFLAGS=$(gb_SPACE)@MWAW_CFLAGS@
 export MWAW_LIBS=$(gb_SPACE)@MWAW_LIBS@
 export MYTHES_CFLAGS=$(gb_SPACE)@MYTHES_CFLAGS@
 export MYTHES_LIBS=$(gb_SPACE)@MYTHES_LIBS@
+export NASM=@NASM@
 export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@
 export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@
 export NEON_VERSION=@NEON_VERSION@
@@ -619,6 +620,7 @@ export WITH_FONTS=@WITH_FONTS@
 export WITH_GALLERY_BUILD=@WITH_GALLERY_BUILD@
 export WITH_GSSAPI=@WITH_GSSAPI@
 export WITH_HELPPACK_INTEGRATION=@WITH_HELPPACK_INTEGRATION@
+export WITH_JPEG_TURBO=@WITH_JPEG_TURBO@
 export WITH_KRB5=@WITH_KRB5@
 export WITH_LANG=@WITH_LANG@
 export WITH_LANG_LIST=@WITH_LANG_LIST@
diff --git a/configure.ac b/configure.ac
index e401569..8ee0ab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1890,6 +1890,11 @@ AC_ARG_WITH(system-npapi-headers,
 [with_system_npapi_headers=$with_system_headers]
 )
 
+AC_ARG_WITH(jpeg-turbo,
+AS_HELP_STRING([--with-jpeg-turbo],
+[Use internal libjpeg-turbo library.]),,
+[with_jpeg_turbo=auto])
+
 AC_ARG_WITH(webdav,
 AS_HELP_STRING([--with-webdav],
 [Specify which library to use for webdav implementation.
@@ -7342,6 +7347,18 @@ if test $with_system_jpeg = auto; then
 esac
 fi
 
+if test $with_jpeg_turbo = auto; then
+# TODO use jpeg-turbo on Darwin too
+case $_os in
+WINNT)
+with_jpeg_turbo=yes
+;;
+*)
+with_jpeg_turbo=no
+;;
+esac
+fi
+
 if test $with_system_jpeg = yes; then
 AC_MSG_RESULT([external])
 SYSTEM_JPEG=TRUE
@@ -7351,12 +7368,56 @@ if test $with_system_jpeg = yes; then
 [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
 libo_MINGW_CHECK_DLL([libjpeg])
 else
-AC_MSG_RESULT([internal])
 SYSTEM_JPEG=
-BUILD_TYPE=$BUILD_TYPE JPEG
+if test

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

2014-11-17 Thread David Tardon

 vcl/source/fontsubset/sft.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 06efeee90c6347c4f136fe057188ac04f40a0bb9
Author: David Tardon dtar...@redhat.com
Date:   Fri Nov 14 13:17:07 2014 +0100

use already existing variable

Change-Id: I3f2781e2a041845e732046ea591a15c9bb21f1a5

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 13da74b..b694520f5 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1096,7 +1096,7 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, const 
sal_uInt32 nMaxCmapSize
 sal_uInt16* const pGlyph = ((subHeader2s[0].idRangeOffset))
  + (Int16FromMOTA(subHeader2s[0].idRangeOffset)/2) 
/* + offset*/
  + theLowByte  
/* + to_look   */
- - Int16FromMOTA(subHeader2s[0].firstCode)
+ - firstCode
  ;
 if (reinterpret_castsal_uInt8*(pGlyph) - cmap  
int(nMaxCmapSize) - 4)
 return *pGlyph;
commit e164eb5c85547a49c0bcbdbdf1b1cdc9726f3133
Author: David Tardon dtar...@redhat.com
Date:   Fri Nov 14 13:16:40 2014 +0100

coverity#1251174 untrusted pointer read

Change-Id: I894fc64d6ae6881347bd1379d2934654536a01cf

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index b512b12..13da74b 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1093,11 +1093,15 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, 
const sal_uInt32 nMaxCmapSize
 if(k == 0) {
 firstCode = Int16FromMOTA(subHeader2s[k].firstCode);
 if(theLowByte = firstCode  theLowByte  (firstCode + 
Int16FromMOTA(subHeader2s[k].entryCount))) {
-return *(((subHeader2s[0].idRangeOffset))
+sal_uInt16* const pGlyph = ((subHeader2s[0].idRangeOffset))
  + (Int16FromMOTA(subHeader2s[0].idRangeOffset)/2) 
/* + offset*/
  + theLowByte  
/* + to_look   */
  - Int16FromMOTA(subHeader2s[0].firstCode)
- );
+ ;
+if (reinterpret_castsal_uInt8*(pGlyph) - cmap  
int(nMaxCmapSize) - 4)
+return *pGlyph;
+else
+return MISSING_GLYPH_INDEX;
 } else {
 return MISSING_GLYPH_INDEX;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANN] new internal jpeg needs nasm

On Fri, 2014-11-14 at 15:47 +0100, Matúš Kukan wrote:
 Hi,
 
 I am working on replacing internal jpeg with jpeg-turbo.
 https://gerrit.libreoffice.org/#/c/12402/
 
 Once it hits master, you will need to get nasm tool to build it.
 http://www.nasm.us/
 Info about how to install it, is in our configure.
 
 I've avoided cmake by using our great gcc-wrappers. Thanks for that!
 
 It should be ready now, I've just not tested it on OS X.

I've pushed it. By default it's enabled only on Windows.
Please, Windows tinderbox owners, update according to
https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies#Install_NASM
'lode' should install it too now.

Old jpeg library is used otherwise.
Probably it's worth someone to have a look on OS X and fix the build and
enable by default too.

Thanks,

Matus

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

LibreOffice-4.3.4.1 compile error with GCC-4.9.2

2014-11-17 Thread Qurban Ullah

I tried many time with system libs and without system libs, each time I faced
the same problem.

/build/libreoffice/libreoffice-4.3.4.1/workdir/CxxObject/helpcompiler/source/HelpIndexer_main.o:
In function `main':
HelpIndexer_main.cxx:(.text.startup+0x3b6): undefined reference to
`HelpIndexer::HelpIndexer(rtl::OUString const, rtl::OUString const,
rtl::OUString const, rtl::OUString const)'
HelpIndexer_main.cxx:(.text.startup+0x3d8): undefined reference to
`HelpIndexer::indexDocuments()'
HelpIndexer_main.cxx:(.text.startup+0x3f1): undefined reference to
`HelpIndexer::getErrorMessage()'
collect2: error: ld returned 1 exit status
/build/libreoffice/libreoffice-4.3.4.1/solenv/gbuild/LinkTarget.mk:444:
recipe for target
'/build/libreoffice/libreoffice-4.3.4.1/workdir/LinkTarget/Executable/HelpIndexer'
failed
make[1]: ***
[/build/libreoffice/libreoffice-4.3.4.1/workdir/LinkTarget/Executable/HelpIndexer]
Error 1
make[1]: *** Waiting for unfinished jobs
Makefile:224: recipe for target 'build' failed
make: *** [build] Error 2



--
View this message in context: 
http://nabble.documentfoundation.org/LibreOffice-4-3-4-1-compile-error-with-GCC-4-9-2-tp4129286.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] configure.ac: turn valgrind automagic into --enable-valgrind option

Hi,

On 2 November 2014 13:48, Andreas Sturmlechner
andreas.sturmlech...@gmail.com wrote:
 Hi!

 Please consider a patch to configure.ac.

 - valgrind headers might be present, but not wished for libreoffice
 - if valgrind support is desired but for some reason not found, configure 
 should not keep quiet and continue

Although I don't see a reason for this, it does not mean there is none.
Thanks.

 Attaching a patch that hopes to achieve this in as few lines as possible.

Hmm, could you please attach it as a real patch - not just diff - or
even better,
push to gerrit and send licence statement too, as all explained in:
https://wiki.documentfoundation.org/Development/gerrit
In gerrit, there is bigger chance someone will notice your nice patch.

Thanks,

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

[Libreoffice-commits] buildbot.git: lcov-report/lcov-report.sh

2014-11-17 Thread Maarten Hoes

 lcov-report/lcov-report.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 410781e98f876d5d1c892c5e967a6d54c2d33e64
Author: Maarten Hoes hoes.maar...@gmail.com
Date:   Mon Nov 17 12:26:06 2014 +0100

Add missing '/' in directory/file pathname.

Change-Id: I178239e8a504a612fa6b87cf37710d31a2d9bd13
Reviewed-on: https://gerrit.libreoffice.org/12512
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/lcov-report/lcov-report.sh b/lcov-report/lcov-report.sh
index a490b3b..bcd5116 100755
--- a/lcov-report/lcov-report.sh
+++ b/lcov-report/lcov-report.sh
@@ -139,7 +139,7 @@ lcov_tracefile_cleanup()
 lcov --rc geninfo_auto_base=1 --remove ${TRACEFILE_DIR?}/lcov_total.info 
\
 /usr/include/* /usr/lib/* ${SRC_DIR?}/*/UnpackedTarball/* 
${SRC_DIR?}/workdir/* \
 ${BUILD_DIR?}/workdir/* ${SRC_DIR?}/instdir/* ${SRC_DIR?}/external/* 
\
--o ${TRACEFILE_DIR?}lcov_filtered.info \
+-o ${TRACEFILE_DIR?}/lcov_filtered.info \
 || die tracefile generation ${TRACEFILE_DIR?}/lcov_filtered.info failed.
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 4 commits - solenv/gbuild vcl/inc vcl/source vcl/win

 solenv/gbuild/ExternalProject.mk|1 
 vcl/inc/win/saldata.hxx |2 
 vcl/source/opengl/OpenGLContext.cxx |   59 +++--
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/win/source/window/salframe.cxx  |   73 
 5 files changed, 52 insertions(+), 85 deletions(-)

New commits:
commit d6b765015b26362d7d8db9a4a0f7659c177acd38
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Nov 17 14:51:56 2014 +0100

windows opengl: Setup the VirtualDevice so that SetPixelFormat succeeds.

Without this, I'm getting a strange 0xc0070006 error from SetPixelFormat.

Change-Id: I6df6168a7d29d59272849e177a8e463fa5cef807

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 0914449..3ec1415 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -754,39 +754,31 @@ bool OpenGLContext::init(HDC hDC, HWND hWnd)
 bool OpenGLContext::ImplInit()
 {
 SAL_INFO(vcl.opengl, OpenGLContext::ImplInitstart);
+
 // PixelFormat tells Windows how we want things to be
-PIXELFORMATDESCRIPTOR PixelFormatFront =
-{
-sizeof(PIXELFORMATDESCRIPTOR),
-1,  // Version Number
-PFD_SUPPORT_OPENGL,
-PFD_TYPE_RGBA,  // Request An RGBA Format
-(BYTE)32,   // Select Our Color Depth
-0, 0, 0, 0, 0, 0,   // Color Bits Ignored
-0,  // No Alpha Buffer
-0,  // Shift Bit Ignored
-0,  // No Accumulation Buffer
-0, 0, 0, 0, // Accumulation Bits Ignored
-64, // 32 bit Z-BUFFER
-0,  // 0 bit stencil buffer
-0,  // No Auxiliary Buffer
-0,  // now ignored
-0,  // Reserved
-0, 0, 0 // Layer Masks Ignored
-};
+PIXELFORMATDESCRIPTOR pfd;
+ZeroMemory(pfd, sizeof(pfd));
+
+pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
+pfd.nVersion = 1;
+pfd.dwFlags = PFD_SUPPORT_OPENGL;
+pfd.iPixelType = PFD_TYPE_RGBA;
+pfd.cColorBits = 24;
+pfd.cDepthBits = 32;
+pfd.iLayerType = PFD_MAIN_PLANE;
 
 // interestingly we need this flag being set even if we use single buffer
 // rendering - otherwise we get errors with virtual devices
-PixelFormatFront.dwFlags |= PFD_DOUBLEBUFFER;
+pfd.dwFlags |= PFD_DOUBLEBUFFER;
 
 if (mbRequestVirtualDevice)
-PixelFormatFront.dwFlags |= PFD_DRAW_TO_BITMAP;
+pfd.dwFlags |= PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI;
 else
-PixelFormatFront.dwFlags |= PFD_DRAW_TO_WINDOW;
+pfd.dwFlags |= PFD_DRAW_TO_WINDOW;
 
 //  we must check whether can set the MSAA
 int WindowPix = 0;
-bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix,
+bool bMultiSampleSupport = InitMultisample(pfd, WindowPix,
 mbUseDoubleBufferedRendering, mbRequestVirtualDevice);
 if (bMultiSampleSupport  WindowPix != 0)
 {
@@ -794,7 +786,7 @@ bool OpenGLContext::ImplInit()
 }
 else
 {
-WindowPix = ChoosePixelFormat(m_aGLWin.hDC, PixelFormatFront);
+WindowPix = ChoosePixelFormat(m_aGLWin.hDC, pfd);
 }
 
 if (WindowPix == 0)
@@ -803,7 +795,7 @@ bool OpenGLContext::ImplInit()
 return false;
 }
 
-if (!SetPixelFormat(m_aGLWin.hDC, WindowPix, PixelFormatFront))
+if (!SetPixelFormat(m_aGLWin.hDC, WindowPix, pfd))
 {
 ImplWriteLastError(GetLastError(), SetPixelFormat in 
OpenGLContext::ImplInit);
 SAL_WARN(vcl.opengl, SetPixelFormat failed);
commit 60d80d6248e14ecd5bda607fc708ffd2b90fe49f
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Nov 17 12:29:56 2014 +0100

windows: Improve logging.

Change-Id: I15e6d240b3c94af07e9b39cc16efb581869729f2

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index e1ae8cc..2c0731e 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -183,7 +183,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM l
 void EmitTimerCallback();
 
 void SalTestMouseLeave();
-bool ImplWriteLastError( DWORD lastError, const char *szApiCall );
+void ImplWriteLastError(DWORD lastError, const char *szApiCall);
 
 long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM 
lParam );
 long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam );
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index fbadeac..0914449 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -23,6 +23,10 @@
 #include postmac.h
 #endif
 
+#if defined( WNT )
+#include

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

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d743004ac41c36cdbdcc31bf87b0736f0b468341
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Nov 17 15:40:38 2014 +0100

missing include

Change-Id: Iac01fc756a74cbaeebd1d9a01ddea74bbaf18f4b

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 3a16543..8789e97 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -22,6 +22,7 @@
 
 #include com/sun/star/uno/genfunc.hxx
 #include com/sun/star/uno/RuntimeException.hpp
+#include osl/diagnose.h
 #include uno/data.h
 
 #include bridges/cpp_uno/shared/bridge.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 14 commits - basic/source bin/distro-install-file-lists framework/source lotuswordpro/source odk/source Repository.mk sc/source shell/Executable_gnome_open_url.mk shell

 Repository.mk |1 
 basic/source/comp/exprtree.cxx|4 
 bin/distro-install-file-lists |1 
 framework/source/uielement/toolbarmanager.cxx |1 
 lotuswordpro/source/filter/lwpfrib.cxx|8 -
 odk/source/unoapploader/unx/unoapploader.c|1 
 sc/source/filter/excel/colrowst.cxx   |3 
 shell/Executable_gnome_open_url.mk|   22 
 shell/Module_shell.mk |1 
 shell/source/unix/misc/gnome-open-url.c   |  117 --
 shell/source/unix/misc/gnome-open-url.sh  |4 
 svl/source/items/itemset.cxx  |   10 ++
 sw/source/core/unocore/unocrsrhelper.cxx  |2 
 sw/source/filter/xml/xmltbli.cxx  |   10 --
 sw/source/uibase/dochdl/gloshdl.cxx   |2 
 sw/source/uibase/docvw/PostItMgr.cxx  |5 -
 sw/source/uibase/uiview/view2.cxx |2 
 vcl/source/fontsubset/sft.cxx |2 
 vcl/source/gdi/regionband.cxx |   18 +++-
 19 files changed, 44 insertions(+), 170 deletions(-)

New commits:
commit 6ca5cc5b1aea3c7dc9f8c5f96eb9b9237430278f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 13:34:39 2014 +

help coverity out with empty()

Change-Id: Icc28a0f0f4afcbda9e595fa753494a8161f82d4c

diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index c5e18c9..a2221fe 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -988,14 +988,15 @@ bool SwPostItMgr::LayoutByPage(std::listSwSidebarWin* 
aVisiblePostItList,cons
 longlTopBorder  = rBorder.Top() + 5;
 longlBottomBorder   = rBorder.Bottom() - 5;
 const long  lVisibleHeight  = lBottomBorder - lTopBorder; 
//rBorder.GetHeight() ;
+const size_tnPostItListSize = aVisiblePostItList.size();
 longlTranslatePos   = 0;
 boolbScrollbars = false;
 
 // do all necessary resizings
-if (!aVisiblePostItList.empty()  lVisibleHeight  lNeededHeight)
+if (nPostItListSize  0  lVisibleHeight  lNeededHeight)
 {
 // ok, now we have to really resize and adding scrollbars
-const long lAverageHeight = (lVisibleHeight - 
aVisiblePostItList.size()*GetSpaceBetween()) / aVisiblePostItList.size();
+const long lAverageHeight = (lVisibleHeight - 
nPostItListSize*GetSpaceBetween()) / nPostItListSize;
 if (lAverageHeightGetMinimumSizeWithMeta())
 {
 bScrollbars = true;
commit a7d26c9f252f35eb18d8ab2900e4a6f67ca2e875
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 12:57:44 2014 +

coverity#1242859 rework to silence Untrusted loop bound

Change-Id: Ic30dd457b0f2fdbd13aa1508f97cdda6364390e4

diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 4e37854..05f3f7f 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -199,10 +199,21 @@ void RegionBand::load(SvStream rIStrm)
 ImplRegionBand* pCurrBand = 0;
 
 // get header from first element
-sal_uInt16 nTmp16(0);
-rIStrm.ReadUInt16( nTmp16 );
+sal_uInt16 nTmp16(STREAMENTRY_END);
+rIStrm.ReadUInt16(nTmp16);
 
-while(STREAMENTRY_END != (StreamEntryType)nTmp16)
+if (STREAMENTRY_END == (StreamEntryType)nTmp16)
+return;
+
+size_t nRecordsPossible = rIStrm.remainingSize() / (2*sizeof(sal_Int32));
+if (!nRecordsPossible)
+{
+OSL_ENSURE(false, premature end of region stream );
+implReset();
+return;
+}
+
+do
 {
 // insert new band or new separation?
 if(STREAMENTRY_BANDHEADER == (StreamEntryType)nTmp16)
@@ -254,6 +265,7 @@ void RegionBand::load(SvStream rIStrm)
 // get next header
 rIStrm.ReadUInt16( nTmp16 );
 }
+while(STREAMENTRY_END != (StreamEntryType)nTmp16);
 
 }
 
commit 6b709b27b3552ced17b612b78f1c8cadc81f620c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 12:40:45 2014 +

coverity#735399 Logically dead code

we can only enter the bAssumeExprLParenMode controlled block once
because the block sets bAssumeExprLParenMode to false

bAssumeExprLParenMode is only true if the first token read in the
method is LPAREN

so we can only enter this block if the current token is LPAREN and
its the first token processed, so the token can't be BYVAL

Change-Id: I6e668fca4d127d7dbfe447e2d9f2231e05278a7d

diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index d004b09..c01a729 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -1071,10 +1071,6 @@ SbiParameters::SbiParameters( SbiParser* p, bool 
bStandaloneExpression, bool bPa
 {
 bBracket = true;
 delete pExpr;
-

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 2 commits - vcl/inc vcl/opengl vcl/Package_opengl.mk

2014-11-17 Thread Louis-Francis Ratté-Boulianne

 vcl/Package_opengl.mk  |1 
 vcl/inc/openglgdiimpl.hxx  |   14 ++
 vcl/opengl/gdiimpl.cxx |  170 ++---
 vcl/opengl/maskFragmentShader.glsl |   10 -
 vcl/opengl/transformedTextureVertexShader.glsl |   24 +++
 5 files changed, 200 insertions(+), 19 deletions(-)

New commits:
commit 435e8d6aa8a185540fe0f788f28bba188cc840e6
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 10:00:33 2014 -0500

vcl: Fix DrawMask implementation in OpenGL backend

Change-Id: Idc0bedaba5a4cea351f131d402c2b1093ac1c53c

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index c317d4c..187458b 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -406,7 +406,7 @@ bool OpenGLSalGraphicsImpl::CreateMaskProgram( void )
 glBindAttribLocation( mnMaskProgram, GL_ATTRIB_POS, position );
 glBindAttribLocation( mnMaskProgram, GL_ATTRIB_TEX, tex_coord_in );
 mnMaskUniform = glGetUniformLocation( mnMaskProgram, sampler );
-mnMaskColorUniform = glGetUniformLocation( mnMaskProgram, mask );
+mnMaskColorUniform = glGetUniformLocation( mnMaskProgram, color );
 
 CHECK_GL_ERROR();
 return true;
@@ -844,7 +844,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( 
OpenGLTexture rTexture, OpenGL
 CHECK_GL_ERROR();
 }
 
-void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture rMask, SalColor 
nMaskColor, const SalTwoRect /*pPosAry*/ )
+void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture rMask, SalColor 
nMaskColor, const SalTwoRect pPosAry )
 {
 if( mnMaskProgram == 0 )
 {
@@ -858,7 +858,10 @@ void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture 
rMask, SalColor nMaskColor,
 glActiveTexture( GL_TEXTURE0 );
 rMask.Bind();
 
-//DrawTextureRect( rMask, pPosAry );
+glEnable( GL_BLEND );
+glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+DrawTextureRect( rMask, pPosAry );
+glDisable( GL_BLEND );
 
 rMask.Unbind();
 glUseProgram( 0 );
diff --git a/vcl/opengl/maskFragmentShader.glsl 
b/vcl/opengl/maskFragmentShader.glsl
index 4a8204e..2cc7377 100644
--- a/vcl/opengl/maskFragmentShader.glsl
+++ b/vcl/opengl/maskFragmentShader.glsl
@@ -7,15 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-precision mediump float;
 varying vec2 tex_coord;
 uniform sampler2D sampler;
-uniform vec4 color;
+uniform vec4 color;
 
 void main() {
-   vec4 texel0;
-   texel0 = texture2D(sampler, tex_coord);
-   gl_FragColor = color * texel0.a;
+vec4 texel0;
+texel0 = texture2D(sampler, tex_coord);
+gl_FragColor = color;
+gl_FragColor.a = 1.0 - texel0.r;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c62ef361cff6a1cd9016341119f3a6b1470e3848
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 09:15:15 2014 -0500

vcl: Implement drawing of transformed bitmaps in OpenGL backend

Change-Id: I79717a608f33050b84244e378a6e51bd3be29232

diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index 18c56fc..9151d94 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -21,6 +21,7 @@ $(eval $(call 
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
solidVertexShader.glsl \
textureFragmentShader.glsl \
textureVertexShader.glsl \
+   transformedTextureVertexShader.glsl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 80d760a..29bc7a2 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -56,6 +56,17 @@ protected:
 GLuint mnTextureProgram;
 GLuint mnSamplerUniform;
 
+GLuint mnTransformedTextureProgram;
+GLuint mnTransformedViewportUniform;
+GLuint mnTransformedTransformUniform;
+GLuint mnTransformedSamplerUniform;
+
+GLuint mnTransformedMaskedTextureProgram;
+GLuint mnTransformedMaskedViewportUniform;
+GLuint mnTransformedMaskedTransformUniform;
+GLuint mnTransformedMaskedSamplerUniform;
+GLuint mnTransformedMaskedMaskUniform;
+
 GLuint mnMaskedTextureProgram;
 GLuint mnMaskedSamplerUniform;
 GLuint mnMaskSamplerUniform;
@@ -79,7 +90,9 @@ protected:
 
 bool CreateSolidProgram( void );
 bool CreateTextureProgram( void );
+bool CreateTransformedTextureProgram( void );
 bool CreateMaskedTextureProgram( void );
+bool CreateTransformedMaskedTextureProgram( void );
 bool CreateMaskProgram( void );
 bool CreateLinearGradientProgram( void );
 bool CreateRadialGradientProgram( void );
@@ -103,6 +116,7 @@ public:
 void DrawPolyPolygon( const basegfx::B2DPolyPolygon rPolyPolygon );
 void DrawTextureRect( OpenGLTexture rTexture, const SalTwoRect rPosAry, 
bool bInverted = false );
 void DrawTexture( OpenGLTexture rTexture, const SalTwoRect rPosAry, bool 
bInverted = false );
+void DrawTransformedTexture( OpenGLTexture rTexture,

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

 filter/qa/cppunit/data/met/fail/afl-divide-zero-1.met |binary
 filter/source/graphicfilter/ios2met/ios2met.cxx   |9 -
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit eb6d27321d2d5f9d069c4a3cbcc9bc6e5b4c98ab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 15:22:08 2014 +

afl: divide-by-zero

Change-Id: Ided311873f654c0f40dae57c8876a6412ee97d3e

diff --git a/filter/qa/cppunit/data/met/fail/afl-divide-zero-1.met 
b/filter/qa/cppunit/data/met/fail/afl-divide-zero-1.met
new file mode 100644
index 000..62ccf48
Binary files /dev/null and 
b/filter/qa/cppunit/data/met/fail/afl-divide-zero-1.met differ
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 5f1d17f..aa29380 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2357,7 +2357,14 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, 
sal_uInt16 nFieldSize)
 pOS2MET-SeekRel(4);
 nStartIndex=ReadBigEndianWord();
 pOS2MET-SeekRel(3);
-pOS2MET-ReadUChar( nbyte ); 
nBytesPerCol=((sal_uInt16)nbyte)  0x00ff;
+pOS2MET-ReadUChar( nbyte );
+nBytesPerCol=((sal_uInt16)nbyte)  0x00ff;
+if (nBytesPerCol == 0)
+{
+pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR);
+ErrorCode=4;
+break;
+}
 nEndIndex=nStartIndex+(nElemLen-11)/nBytesPerCol;
 for (i=nStartIndex; inEndIndex; i++) {
 if (nBytesPerCol  3) pOS2MET-SeekRel(nBytesPerCol-3);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |3 +--
 sc/source/core/tool/calcconfig.cxx   |   15 +++
 2 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit ab2e6c659ed79c911f1d995567d5162b3b807874
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Nov 17 17:11:43 2014 +0200

Add a bunch of allegedly common opcodes to the default subset for OpenCL

RAND, SIN, COS, TAN, ATAN, EXP, LN, SQRT, NORMSINV, ROUND, POWER, 
SUMPRODUCT,
PRODUCT and NORMDIST.

Change-Id: I9619a9a3b022fe00e53bf82735e160a2d449f105

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index d4e65eb..31395a9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1372,8 +1372,7 @@
formula contains only these operators and functions, it
might be calculated using OpenCL./desc
   /info
- !-- numeric values correspond to MIN;MAX;SUM;AVERAGE;SUMIFS --
-  value222;223;224;226;403/value
+  
value66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value
 /prop
 prop oor:name=OpenCLAutoSelect oor:type=xs:boolean 
oor:nillable=false
   !-- UIHints: Tools - Options  Spreadsheet  Formula --
diff --git a/sc/source/core/tool/calcconfig.cxx 
b/sc/source/core/tool/calcconfig.cxx
index c93d482..a8527ad 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -39,10 +39,25 @@ void ScCalcConfig::setOpenCLConfigToDefault()
 mbOpenCLSubsetOnly = true;
 mbOpenCLAutoSelect = true;
 mnOpenCLMinimumFormulaGroupSize = 20;
+
+maOpenCLSubsetOpCodes.insert(ocRandom);
+maOpenCLSubsetOpCodes.insert(ocSin);
+maOpenCLSubsetOpCodes.insert(ocCos);
+maOpenCLSubsetOpCodes.insert(ocTan);
+maOpenCLSubsetOpCodes.insert(ocArcTan);
+maOpenCLSubsetOpCodes.insert(ocExp);
+maOpenCLSubsetOpCodes.insert(ocLn);
+maOpenCLSubsetOpCodes.insert(ocSqrt);
+maOpenCLSubsetOpCodes.insert(ocSNormInv);
+maOpenCLSubsetOpCodes.insert(ocRound);
+maOpenCLSubsetOpCodes.insert(ocPower);
+maOpenCLSubsetOpCodes.insert(ocSumProduct);
 maOpenCLSubsetOpCodes.insert(ocMin);
 maOpenCLSubsetOpCodes.insert(ocMax);
 maOpenCLSubsetOpCodes.insert(ocSum);
+maOpenCLSubsetOpCodes.insert(ocProduct);
 maOpenCLSubsetOpCodes.insert(ocAverage);
+maOpenCLSubsetOpCodes.insert(ocNormDist);
 maOpenCLSubsetOpCodes.insert(ocSumIfs);
 
 // This entry we have had for some time (when blacklisting was
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Michael Stahl

 officecfg/registry/data/org/openoffice/VCL.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d93c89ddf564d0445f28e0ba552ba94975d40f2a
Author: Michael Stahl mst...@redhat.com
Date:   Mon Nov 17 15:46:23 2014 +0100

officecfg: set VCL.WM.ShouldSwitchWorkspace to false

It's quite obnoxious of applications to switch virtual desktops, and
i#45160 / i#96684 indicate the main reason for this was to avoid crashes
9 years ago; let's see if we get any crash reports with it disabled.

Change-Id: Ib020380c9ad3b386c7cf00fb2144cb766d1f6c83

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 457ac10..28e24e7 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -51,7 +51,7 @@
 /node
 node oor:name=WM oor:op=replace
   prop oor:name=ShouldSwitchWorkspace oor:op=replace 
oor:type=xs:string
-value/
+valuefalse/value
   /prop
 /node
   /node
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 filter/source/graphicfilter/ios2met/ios2met.cxx |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 9f072ee847164ae628d6378d30e27cb5022ce437
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 15:36:54 2014 +

don't reuse old var remnants

Change-Id: I1074d0431695ec21e22cdef334dbe419763e7ba2

diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index aa29380..6b38be4 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -773,20 +773,18 @@ Color OS2METReader::GetPaletteColor(sal_uInt32 nIndex)
  sal::static_int_cast sal_uInt8 (nIndex0xff));
 }
 
-
 sal_uInt16 OS2METReader::ReadBigEndianWord()
 {
-sal_uInt8 nLo,nHi;
+sal_uInt8 nLo(0), nHi(0);
 pOS2MET-ReadUChar( nHi ).ReadUChar( nLo );
 return (((sal_uInt16)nHi)8)|(((sal_uInt16)nLo)0x00ff);
 }
 
 sal_uLong OS2METReader::ReadBigEndian3BytesLong()
 {
-sal_uInt16 nLo;
-sal_uInt8 nHi;
+sal_uInt8 nHi(0);
 pOS2MET-ReadUChar( nHi );
-nLo=ReadBigEndianWord();
+sal_uInt16 nLo = ReadBigEndianWord();
 return sal_uLong)nHi)16)0x00ff)|((sal_uLong)nLo);
 }
 
@@ -2563,10 +2561,7 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, 
sal_uInt16 nFieldSize)
 
 void OS2METReader::ReadOS2MET( SvStream  rStreamOS2MET, GDIMetaFile  
rGDIMetaFile )
 {
-sal_uInt16 nFieldSize;
-sal_uInt16 nFieldType;
 sal_uLong nPercent, nLastPercent;
-sal_uInt8 nMagicByte;
 
 ErrorCode=0;
 
@@ -2632,6 +2627,7 @@ void OS2METReader::ReadOS2MET( SvStream  rStreamOS2MET, 
GDIMetaFile  rGDIMetaF
 
 sal_uInt64 const nStartPos = pOS2MET-Tell();
 sal_uInt64 const nRemaining = pOS2MET-remainingSize();
+
 Callback(0); nLastPercent=0;
 
 sal_uInt64 nPos = pOS2MET-Tell();
@@ -2644,15 +2640,17 @@ void OS2METReader::ReadOS2MET( SvStream  
rStreamOS2MET, GDIMetaFile  rGDIMetaF
 nLastPercent=nPercent;
 }
 
-nFieldSize=ReadBigEndianWord();
-
+sal_uInt16 nFieldSize = ReadBigEndianWord();
+sal_uInt8 nMagicByte(0);
 pOS2MET-ReadUChar( nMagicByte );
 if (nMagicByte!=0xd3) {
 pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR);
 ErrorCode=7;
 break;
 }
-pOS2MET-ReadUInt16( nFieldType );
+
+sal_uInt16 nFieldType(0);
+pOS2MET-ReadUInt16(nFieldType);
 
 pOS2MET-SeekRel(3);
 nPos+=8; nFieldSize-=8;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 3 commits - vcl/inc vcl/opengl vcl/Package_opengl.mk vcl/win

 vcl/Package_opengl.mk  |1 
 vcl/inc/openglgdiimpl.hxx  |   14 ++
 vcl/opengl/gdiimpl.cxx |  170 ++---
 vcl/opengl/maskFragmentShader.glsl |   10 -
 vcl/opengl/transformedTextureVertexShader.glsl |   24 +++
 vcl/win/source/gdi/winlayout.cxx   |8 -
 6 files changed, 203 insertions(+), 24 deletions(-)

New commits:
commit fb9f6b70956306faa2d9621f0b3f68281394ed18
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Nov 17 16:37:50 2014 +0100

windows opengl: Use the updated DrawMask to get nice text with OpenGL.

Change-Id: Ie4f08575848e76159af86d44e10f24fa383930fb

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 04672ce..f6cbf79 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -243,13 +243,11 @@ void WinLayout::DrawText(SalGraphics rGraphics) const
 aRects.mnDestWidth = width;
 aRects.mnDestHeight = height;
 
-pImpl-PreDraw();
 COLORREF color = GetTextColor(hDC);
 SalColor salColor = MAKE_SALCOLOR(GetRValue(color), 
GetGValue(color), GetBValue(color));
-// TODO when we have it:
-// pImpl-DrawSolidColorWithMask(salColor, aTexture, aRects);
-// and kill the following interim thing:
-pImpl-DrawTexture(aTexture, aRects);
+
+pImpl-PreDraw();
+pImpl-DrawMask(aTexture, salColor, aRects);
 pImpl-PostDraw();
 }
 
commit 3bc4469e90ca80f07aba21346e8c9865d23e0e6e
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 10:00:33 2014 -0500

vcl: Fix DrawMask implementation in OpenGL backend

Change-Id: Idc0bedaba5a4cea351f131d402c2b1093ac1c53c

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 3953fbe..7c2d831 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -406,7 +406,7 @@ bool OpenGLSalGraphicsImpl::CreateMaskProgram( void )
 glBindAttribLocation( mnMaskProgram, GL_ATTRIB_POS, position );
 glBindAttribLocation( mnMaskProgram, GL_ATTRIB_TEX, tex_coord_in );
 mnMaskUniform = glGetUniformLocation( mnMaskProgram, sampler );
-mnMaskColorUniform = glGetUniformLocation( mnMaskProgram, mask );
+mnMaskColorUniform = glGetUniformLocation( mnMaskProgram, color );
 
 CHECK_GL_ERROR();
 return true;
@@ -844,7 +844,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( 
OpenGLTexture rTexture, OpenGL
 CHECK_GL_ERROR();
 }
 
-void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture rMask, SalColor 
nMaskColor, const SalTwoRect /*pPosAry*/ )
+void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture rMask, SalColor 
nMaskColor, const SalTwoRect pPosAry )
 {
 if( mnMaskProgram == 0 )
 {
@@ -858,7 +858,10 @@ void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture 
rMask, SalColor nMaskColor,
 glActiveTexture( GL_TEXTURE0 );
 rMask.Bind();
 
-//DrawTextureRect( rMask, pPosAry );
+glEnable( GL_BLEND );
+glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+DrawTextureRect( rMask, pPosAry );
+glDisable( GL_BLEND );
 
 rMask.Unbind();
 glUseProgram( 0 );
diff --git a/vcl/opengl/maskFragmentShader.glsl 
b/vcl/opengl/maskFragmentShader.glsl
index 4a8204e..2cc7377 100644
--- a/vcl/opengl/maskFragmentShader.glsl
+++ b/vcl/opengl/maskFragmentShader.glsl
@@ -7,15 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-precision mediump float;
 varying vec2 tex_coord;
 uniform sampler2D sampler;
-uniform vec4 color;
+uniform vec4 color;
 
 void main() {
-   vec4 texel0;
-   texel0 = texture2D(sampler, tex_coord);
-   gl_FragColor = color * texel0.a;
+vec4 texel0;
+texel0 = texture2D(sampler, tex_coord);
+gl_FragColor = color;
+gl_FragColor.a = 1.0 - texel0.r;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 80867ebdb95a261dc0e06989bb37054c3ed45c54
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 09:15:15 2014 -0500

vcl: Implement drawing of transformed bitmaps in OpenGL backend

Change-Id: I79717a608f33050b84244e378a6e51bd3be29232

diff --git a/vcl/Package_opengl.mk b/vcl/Package_opengl.mk
index 18c56fc..9151d94 100644
--- a/vcl/Package_opengl.mk
+++ b/vcl/Package_opengl.mk
@@ -21,6 +21,7 @@ $(eval $(call 
gb_Package_add_files,vcl_opengl_shader,$(LIBO_ETC_FOLDER)/opengl,\
solidVertexShader.glsl \
textureFragmentShader.glsl \
textureVertexShader.glsl \
+   transformedTextureVertexShader.glsl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index fa88a2a..c7def13 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -57,6 +57,17 @@ protected:
 GLuint mnTextureProgram;
 GLuint mnSamplerUniform;
 
+GLuint mnTransformedTextureProgram;
+GLuint

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

 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d388ef0b3b4eeca17580e19014cc148cd98de61f
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Nov 17 17:50:07 2014 +0200

Blind fix attempt: include osl/diagnose.h

Change-Id: Ic734b56852212d4cee352fc3669dbb16838be8ae

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 1b54647..0d6a754 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -22,6 +22,7 @@
 
 #include rtl/alloc.h
 #include osl/mutex.hxx
+#include osl/diagnose.h
 
 #include com/sun/star/uno/genfunc.hxx
 #include com/sun/star/uno/RuntimeException.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/num-parent-style.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|6 
 sw/qa/extras/rtfimport/rtfimport.cxx|6 ++--
 writerfilter/source/dmapper/DomainMapper.cxx|   29 ++--
 4 files changed, 36 insertions(+), 5 deletions(-)

New commits:
commit c03b691a7cd8eba128204c851b99e0b75c580c0c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Nov 17 16:54:12 2014 +0100

DOCX import: handle w:numId from parent styles as well

Without this, we may miss the w:numId of a paragraph and set no
numbering style name; and that leads to not restarting numberings when
needed.

Change-Id: I9a4896266c5b7f1d7cc2adc43b84e227c004da7c

diff --git a/sw/qa/extras/ooxmlexport/data/num-parent-style.docx 
b/sw/qa/extras/ooxmlexport/data/num-parent-style.docx
new file mode 100644
index 000..4b8c657
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/num-parent-style.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 851d72e..39c559a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -565,6 +565,12 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlCjklist35, 
cjklist35.docx)
 CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_LOWER_ZH, numFormat);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testNumParentStyle, num-parent-style.docx)
+{
+// This was Outline, i.e. w:numId was not imported from the Heading 2 
paragraph style.
+CPPUNIT_ASSERT(getPropertyOUString(getParagraph(4), 
NumberingStyleName).startsWith(WWNum));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index c393ad9..5b00fd6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1099,6 +1099,30 @@ static bool ExchangeLeftRight( const PropertyMapPtr 
rContext, DomainMapper_Impl*
 return bExchangeLeftRight;
 }
 
+/// Check if the style or its parent has a list id, recursively.
+static sal_Int32 lcl_getListId(const StyleSheetEntryPtr pEntry, const 
StyleSheetTablePtr pStyleTable)
+{
+const StyleSheetPropertyMap* pEntryProperties = dynamic_castconst 
StyleSheetPropertyMap*(pEntry-pProperties.get());
+if (!pEntryProperties)
+return -1;
+
+sal_Int32 nListId = pEntryProperties-GetListId();
+// The style itself has a list id.
+if (nListId = 0)
+return nListId;
+
+// The style has no parent.
+if (pEntry-sBaseStyleIdentifier.isEmpty())
+return -1;
+
+const StyleSheetEntryPtr pParent = 
pStyleTable-FindStyleSheetByISTD(pEntry-sBaseStyleIdentifier);
+// No such parent style or loop in the style hierarchy.
+if (!pParent || pParent == pEntry)
+return -1;
+
+return lcl_getListId(pParent, pStyleTable);
+}
+
 void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext )
 {
 // These SPRM's are not specific to any section, so it's expected that 
there is no context yet.
@@ -1976,10 +2000,11 @@ void DomainMapper::sprmWithProps( Sprm rSprm, 
PropertyMapPtr rContext )
 OSL_ENSURE( pEntry.get(), no style sheet found );
 const StyleSheetPropertyMap* pStyleSheetProperties = 
dynamic_castconst StyleSheetPropertyMap*(pEntry ? pEntry-pProperties.get() : 
nullptr);
 
-if( pStyleSheetProperties  pStyleSheetProperties-GetListId() = 
0 )
+sal_Int32 nListId = pEntry ? lcl_getListId(pEntry, pStyleTable) : 
-1;
+if( pStyleSheetProperties  nListId = 0 )
 {
 rContext-Insert( PROP_NUMBERING_STYLE_NAME, uno::makeAny(
-ListDef::GetStyleName( 
pStyleSheetProperties-GetListId( ) ) ), false);
+ListDef::GetStyleName( nListId ) ), false);
 
 // We're inheriting properties from a numbering style. Make 
sure a possible right margin is inherited from the base style.
 sal_Int32 nParaRightMargin = 0;
commit 521185705d062e9526a8a3e0bc485c943e83eb0e
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Nov 17 08:54:10 2014 +0100

CppunitTest_sw_rtfimport: indentation fixes

Change-Id: I696489a60729426b9b14df6c9e79a2d8247d21fb

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 645cf7c..6a1a23b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2083,7 +2083,7 @@ DECLARE_RTFIMPORT_TEST(testFdo83204, fdo83204.rtf)
 }
 
 // This testcase illustrate leveltext with multibyte strings coded in cp950 ( 
BIG5 ).
-DECLARE_RTFIMPORT_TEST(testCp950listleveltext1, cp950listleveltext1.rtf )
+DECLARE_RTFIMPORT_TEST(testCp950listleveltext1, cp950listleveltext1.rtf)
 {
 // suffix with Chinese only ( most common case generated

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

 registry/source/reflread.cxx  |  557 ++
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |2 
 2 files changed, 349 insertions(+), 210 deletions(-)

New commits:
commit f7bd3531cca1fc6cde8a3b2be65d29bf71c44feb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 16:34:54 2014 +0100

cid#1213388 etc.: Make reflread.cxx more robust

incl. revert of and proper fix for 8f69c7a11bf31f7134caf4e03fbcd4c6ef86382d
coverity#1213373 Use of untrusted scalar value, the data is tainted after 
all

Change-Id: I19e4d544ccf6d02afe8d6e441cae6bbdadb8a6be

diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 76cd4cf..e226fbf 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include sal/config.h
 
+#include cstring
 #include memory
 #include new
 
@@ -52,6 +54,8 @@ const sal_uInt16 majorVersion = 0x0001;
 class BlopObject
 {
 public:
+struct BoundsError {};
+
 const sal_uInt8* m_pBuffer;
 sal_uInt32  m_bufferLen;
 boolm_isCopied;
@@ -63,27 +67,33 @@ public:
 
 inline sal_uInt8 readBYTE(sal_uInt32 index) const
 {
+if (index = m_bufferLen) {
+throw BoundsError();
+}
 return m_pBuffer[index];
 }
 
 inline sal_Int16 readINT16(sal_uInt32 index) const
 {
+if (m_bufferLen  2 || index = m_bufferLen - 1) {
+throw BoundsError();
+}
 return ((m_pBuffer[index]  8) | (m_pBuffer[index+1]  0));
 }
 
 inline sal_uInt16 readUINT16(sal_uInt32 index) const
 {
-//This is untainted data which comes from a controlled source
-//so, using a byte-swapping pattern which coverity doesn't
-//detect as such
-
//http://security.coverity.com/blog/2014/Apr/on-detecting-heartbleed-with-static-analysis.html
-sal_uInt32 v = m_pBuffer[index]; v = 8;
-v |= m_pBuffer[index+1];
-return v;
+if (m_bufferLen  2 || index = m_bufferLen - 1) {
+throw BoundsError();
+}
+return ((m_pBuffer[index]  8) | (m_pBuffer[index+1]  0));
 }
 
 inline sal_Int32 readINT32(sal_uInt32 index) const
 {
+if (m_bufferLen  4 || index = m_bufferLen - 3) {
+throw BoundsError();
+}
 return (
 (m_pBuffer[index]24) |
 (m_pBuffer[index+1]  16) |
@@ -94,19 +104,22 @@ public:
 
 inline sal_uInt32 readUINT32(sal_uInt32 index) const
 {
-//This is untainted data which comes from a controlled source
-//so, using a byte-swapping pattern which coverity doesn't
-//detect as such
-
//http://security.coverity.com/blog/2014/Apr/on-detecting-heartbleed-with-static-analysis.html
-sal_uInt32 v = m_pBuffer[index]; v = 8;
-v |= m_pBuffer[index+1]; v = 8;
-v |= m_pBuffer[index+2]; v = 8;
-v |= m_pBuffer[index+3];
-return v;
+if (m_bufferLen  4 || index = m_bufferLen - 3) {
+throw BoundsError();
+}
+return (
+(m_pBuffer[index]24) |
+(m_pBuffer[index+1]  16) |
+(m_pBuffer[index+2]  8)  |
+(m_pBuffer[index+3]  0)
+);
 }
 
 inline sal_Int64 readINT64(sal_uInt32 index) const
 {
+if (m_bufferLen  8 || index = m_bufferLen - 7) {
+throw BoundsError();
+}
 return (
 ((sal_Int64)m_pBuffer[index]56) |
 ((sal_Int64)m_pBuffer[index+1]  48) |
@@ -121,6 +134,9 @@ public:
 
 inline sal_uInt64 readUINT64(sal_uInt32 index) const
 {
+if (m_bufferLen  8 || index = m_bufferLen - 7) {
+throw BoundsError();
+}
 return (
 ((sal_uInt64)m_pBuffer[index]56) |
 ((sal_uInt64)m_pBuffer[index+1]  48) |
@@ -244,8 +260,8 @@ public:
 
 StringCache* m_pStringCache;
 
-ConstantPool(const sal_uInt8* buffer, sal_uInt16 numEntries)
-: BlopObject(buffer, 0, false)
+ConstantPool(const sal_uInt8* buffer, sal_uInt32 len, sal_uInt16 
numEntries)
+: BlopObject(buffer, len, false)
 , m_numOfEntries(numEntries)
 , m_pIndex(NULL)
 , m_pStringCache(NULL)
@@ -346,7 +362,11 @@ const sal_Char* 
ConstantPool::readUTF8NameConstant(sal_uInt16 index)
 {
 if (readUINT16(m_pIndex[index - 1] + CP_OFFSET_ENTRY_TAG) == 
CP_TAG_UTF8_NAME)
 {
-aName = (const sal_Char*) (m_pBuffer + m_pIndex[index - 1] + 
CP_OFFSET_ENTRY_DATA);
+sal_uInt32 n = m_pIndex[index - 1] + CP_OFFSET_ENTRY_DATA;
+if (n  m_bufferLen  std::memchr(m_pBuffer, 0, n) != nullptr)
+{
+aName = (const sal_Char*) (m_pBuffer + n);
+}
 }
 }
 
@@ -543,7 +563,12 @@ const sal_Unicode* 
ConstantPool::readStringConstant(sal_uInt16

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

 registry/source/reflcnst.hxx |   46 ---
 1 file changed, 46 deletions(-)

New commits:
commit 87c51f9b75198503633bc30f40b73f40a40fc72d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 17:20:35 2014 +0100

Remove dead code

Change-Id: I1edce9e336650cc3317de8883e08fb6536c58c70

diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index e9e3944..e08da94 100644
--- a/registry/source/reflcnst.hxx
+++ b/registry/source/reflcnst.hxx
@@ -106,13 +106,6 @@ inline sal_uInt32 writeBYTE(sal_uInt8* buffer, sal_uInt8 v)
 return sizeof(sal_uInt8);
 }
 
-inline sal_uInt16 readBYTE(const sal_uInt8* buffer, sal_uInt8 v)
-{
-v = buffer[0];
-
-return sizeof(sal_uInt8);
-}
-
 inline sal_uInt32 writeINT16(sal_uInt8* buffer, sal_Int16 v)
 {
 buffer[0] = (sal_uInt8)((v  8)  0xFF);
@@ -121,13 +114,6 @@ inline sal_uInt32 writeINT16(sal_uInt8* buffer, sal_Int16 
v)
 return sizeof(sal_Int16);
 }
 
-inline sal_uInt32 readINT16(const sal_uInt8* buffer, sal_Int16 v)
-{
-v = ((buffer[0]  8) | (buffer[1]  0));
-
-return sizeof(sal_Int16);
-}
-
 inline sal_uInt32 writeUINT16(sal_uInt8* buffer, sal_uInt16 v)
 {
 buffer[0] = (sal_uInt8)((v  8)  0xFF);
@@ -206,22 +192,6 @@ inline sal_uInt32 writeINT64(sal_uInt8* buffer, sal_Int64 
v)
 return sizeof(sal_Int64);
 }
 
-inline sal_uInt32 readINT64(const sal_uInt8* buffer, sal_Int64 v)
-{
-v = (
-((sal_Int64)buffer[0]  56) |
-((sal_Int64)buffer[1]  48) |
-((sal_Int64)buffer[2]  40) |
-((sal_Int64)buffer[3]  32) |
-((sal_Int64)buffer[4]  24) |
-((sal_Int64)buffer[5]  16) |
-((sal_Int64)buffer[6]  8)  |
-((sal_Int64)buffer[7]  0)
-);
-
-return sizeof(sal_Int64);
-}
-
 inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v)
 {
 buffer[0] = (sal_uInt8)((v  56)  0xFF);
@@ -236,22 +206,6 @@ inline sal_uInt32 writeUINT64(sal_uInt8* buffer, 
sal_uInt64 v)
 return sizeof(sal_uInt64);
 }
 
-inline sal_uInt32 readUINT64(const sal_uInt8* buffer, sal_uInt64 v)
-{
-v = (
-((sal_uInt64)buffer[0]  56) |
-((sal_uInt64)buffer[1]  48) |
-((sal_uInt64)buffer[2]  40) |
-((sal_uInt64)buffer[3]  32) |
-((sal_uInt64)buffer[4]  24) |
-((sal_uInt64)buffer[5]  16) |
-((sal_uInt64)buffer[6]  8)  |
-((sal_uInt64)buffer[7]  0)
-);
-
-return sizeof(sal_uInt64);
-}
-
 inline sal_uInt32 writeUtf8(sal_uInt8* buffer, const sal_Char* v)
 {
 sal_uInt32 size = strlen(v) + 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sal/osl/w32/path_helper.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cc00f501b8686ae5a4f7db2a1546af9e04e0eab2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 17 17:29:52 2014 +0100

Missing include

Change-Id: I767b9300568971c09c058347a9bbb66108dd792a

diff --git a/sal/osl/w32/path_helper.hxx b/sal/osl/w32/path_helper.hxx
index 3881e44..6f75fca 100644
--- a/sal/osl/w32/path_helper.hxx
+++ b/sal/osl/w32/path_helper.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SAL_OSL_W32_PATH_HELPER_HXX
 
 #include path_helper.h
+#include osl/diagnose.h
 #include rtl/alloc.h
 #include rtl/ustring.hxx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 editeng/source/editeng/impedit3.cxx |   65 +---
 1 file changed, 38 insertions(+), 27 deletions(-)

New commits:
commit ed2c3a53853fbc4df843c10aecbfa463b6a67475
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Mon Nov 10 16:49:58 2014 +0100

editeng: Avoid calling expensive getLineBreak() if possible

ImpEditEngine::ImpBreakLine: if nMinBreakPos == nMaxBreakPos just set
nBreakPos to the same value directly.

Change-Id: I4544cb6c56f68071cba739260161bb24ef5a3f7f

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index f68bc5c..bcbe8dc 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1769,45 +1769,56 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* 
pParaPortion, EditLine* pLine, Te
 break;
 }
 }
+assert(nMinBreakPos = nMaxBreakPos);
 
 lang::Locale aLocale = GetLocale( EditPaM( pNode, nMaxBreakPos ) );
 
 Reference  i18n::XBreakIterator  _xBI( ImplGetBreakIterator() );
-Reference XHyphenator  xHyph;
-if ( bCanHyphenate )
-xHyph = GetHyphenator();
-i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence 
PropertyValue (), 1 );
-i18n::LineBreakUserOptions aUserOptions;
-
-const i18n::ForbiddenCharacters* pForbidden = 
GetForbiddenCharsTable()-GetForbiddenCharacters( 
LanguageTag::convertToLanguageType( aLocale ), true );
-aUserOptions.forbiddenBeginCharacters = pForbidden-beginLine;
-aUserOptions.forbiddenEndCharacters = pForbidden-endLine;
-aUserOptions.applyForbiddenRules = static_castconst 
SfxBoolItem(pNode-GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES 
)).GetValue();
-aUserOptions.allowPunctuationOutsideMargin = static_castconst 
SfxBoolItem(pNode-GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION 
)).GetValue();
-aUserOptions.allowHyphenateEnglish = sal_False;
-
-i18n::LineBreakResults aLBR = _xBI-getLineBreak(
-pNode-GetString(), nMaxBreakPos, aLocale, nMinBreakPos, 
aHyphOptions, aUserOptions );
-nBreakPos = aLBR.breakIndex;
-
-// BUG in I18N - under special condition (break behind field, #87327#) 
breakIndex is  nMinBreakPos
-if ( nBreakPos  nMinBreakPos )
+const bool bAllowPunctuationOutsideMargin = static_castconst 
SfxBoolItem(
+pNode-GetContentAttribs().GetItem( EE_PARA_HANGINGPUNCTUATION 
)).GetValue();
+
+if (nMinBreakPos == nMaxBreakPos)
 {
 nBreakPos = nMinBreakPos;
 }
-else if ( ( nBreakPos  nMaxBreakPos )  
!aUserOptions.allowPunctuationOutsideMargin )
+else
 {
-OSL_FAIL( I18N: XBreakIterator::getLineBreak returns position  
Max );
-nBreakPos = nMaxBreakPos;
-}
+Reference XHyphenator  xHyph;
+if ( bCanHyphenate )
+xHyph = GetHyphenator();
+i18n::LineBreakHyphenationOptions aHyphOptions( xHyph, Sequence 
PropertyValue (), 1 );
+i18n::LineBreakUserOptions aUserOptions;
+
+const i18n::ForbiddenCharacters* pForbidden = 
GetForbiddenCharsTable()-GetForbiddenCharacters( 
LanguageTag::convertToLanguageType( aLocale ), true );
+aUserOptions.forbiddenBeginCharacters = pForbidden-beginLine;
+aUserOptions.forbiddenEndCharacters = pForbidden-endLine;
+aUserOptions.applyForbiddenRules = static_castconst 
SfxBoolItem(pNode-GetContentAttribs().GetItem( EE_PARA_FORBIDDENRULES 
)).GetValue();
+aUserOptions.allowPunctuationOutsideMargin = 
bAllowPunctuationOutsideMargin;
+aUserOptions.allowHyphenateEnglish = sal_False;
+
+i18n::LineBreakResults aLBR = _xBI-getLineBreak(
+pNode-GetString(), nMaxBreakPos, aLocale, nMinBreakPos, 
aHyphOptions, aUserOptions );
+nBreakPos = aLBR.breakIndex;
+
+// BUG in I18N - under special condition (break behind field, 
#87327#) breakIndex is  nMinBreakPos
+if ( nBreakPos  nMinBreakPos )
+{
+nBreakPos = nMinBreakPos;
+}
+else if ( ( nBreakPos  nMaxBreakPos )  
!aUserOptions.allowPunctuationOutsideMargin )
+{
+OSL_FAIL( I18N: XBreakIterator::getLineBreak returns position 
 Max );
+nBreakPos = nMaxBreakPos;
+}
 
-// nBreakPos can never be outside the portion, even not with hangig 
punctuation
-if ( nBreakPos  nMaxBreakPos )
-nBreakPos = nMaxBreakPos;
+// nBreakPos can never be outside the portion, even not with 
hangig punctuation
+if ( nBreakPos  nMaxBreakPos )
+nBreakPos = nMaxBreakPos;
+}
 
 // BUG in I18N - the japanese dot is in the next line!
 // !!!

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

2014-11-17 Thread Bjoern Michaelsen

 sw/qa/extras/ooxmlimport/data/fdo85542.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   31 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |   14 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   24 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 ++-
 5 files changed, 60 insertions(+), 14 deletions(-)

New commits:
commit b1bd96e70230e498ea1c76388a684e5a5c3cbff4
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Nov 16 16:47:08 2014 +0100

fdo#85542: fix DOCX import of overlapping bookmarks

This was broken by 345a3a394e082595924bf219796627f6c00ae2dd.
Kill the static variable and instead have some more state in the
implementation. Still not ideal, but at least fixes the regression.

Change-Id: I562f7d88a1983bd0ec2e01d6bb1e4a53551d0953
Reviewed-on: https://gerrit.libreoffice.org/12491
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlimport/data/fdo85542.docx 
b/sw/qa/extras/ooxmlimport/data/fdo85542.docx
new file mode 100644
index 000..db49408
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo85542.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 57ae735..3f2dd6b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -32,6 +32,7 @@
 #include com/sun/star/text/VertOrientation.hpp
 #include com/sun/star/text/WrapTextMode.hpp
 #include com/sun/star/text/WritingMode2.hpp
+#include com/sun/star/text/XBookmarksSupplier.hpp
 #include com/sun/star/text/XDependentTextField.hpp
 #include com/sun/star/text/XFormField.hpp
 #include com/sun/star/text/XPageCursor.hpp
@@ -2501,6 +2502,36 @@ DECLARE_OOXMLIMPORT_TEST(testBnc821804, bnc821804.docx)
 CPPUNIT_ASSERT_EQUAL(false,getPropertybool(getRun(getParagraph(10), 3), 
IsStart));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testFdo85542, fdo85542.docx)
+{
+//CPPUNIT_ASSERT_EQUAL(false,true);
+uno::Referencetext::XBookmarksSupplier xBookmarksSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xBookmarksByIdx(xBookmarksSupplier-getBookmarks(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xBookmarksByIdx-getCount(), 3);
+uno::Referencecontainer::XNameAccess 
xBookmarksByName(xBookmarksSupplier-getBookmarks(), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xBookmarksByName-hasByName(B1));
+CPPUNIT_ASSERT(xBookmarksByName-hasByName(B2));
+CPPUNIT_ASSERT(xBookmarksByName-hasByName(B3));
+// B1
+uno::Referencetext::XTextContent 
xContent1(xBookmarksByName-getByName(B1), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xRange1(xContent1-getAnchor(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xRange1-getString(), OUString(ABB));
+// B2
+uno::Referencetext::XTextContent 
xContent2(xBookmarksByName-getByName(B2), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xRange2(xContent2-getAnchor(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xRange2-getString(), OUString(BBC));
+// B3 -- testing a collapsed bookmark
+uno::Referencetext::XTextContent 
xContent3(xBookmarksByName-getByName(B3), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xRange3(xContent3-getAnchor(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xRange3-getString(), OUString());
+uno::Referencetext::XText xText(xRange3-getText( ), uno::UNO_QUERY);
+uno::Referencetext::XTextCursor 
xNeighborhoodCursor(xText-createTextCursor( ), uno::UNO_QUERY);
+xNeighborhoodCursor-gotoRange(xRange3, false);
+xNeighborhoodCursor-goLeft(1, false);
+xNeighborhoodCursor-goRight(2, true);
+uno::Referencetext::XTextRange xTextNeighborhood(xNeighborhoodCursor, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xTextNeighborhood-getString(), OUString(AB));
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5b00fd6..8d4f548 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -183,7 +183,6 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 if (m_pImpl-getTableManager().attribute(nName, val))
 return;
 
-static OUString sLocalBookmarkName;
 static const int nSingleLineSpacing = 240;
 sal_Int32 nIntValue = val.getInt();
 OUString sStringValue = val.getString();
@@ -220,14 +219,15 @@ void DomainMapper::lcl_attribute(Id nName, Value  val)
 case NS_ooxml::LN_endnote:
 break;
 case NS_ooxml::LN_CT_Bookmark_name:
-// sStringValue contains the bookmark name
-sLocalBookmarkName = sStringValue;
+// SAL_DEBUG(LN_CT_Bookmark_name   sStringValue);
+m_pImpl-SetBookmarkName( sStringValue );
 break;
 case

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

 sdext/source/presenter/PresenterController.cxx |   28 +
 1 file changed, 20 insertions(+), 8 deletions(-)

New commits:
commit 81a4a4b6b75d31eba079c57e47afd23e2e9cbecb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Nov 6 09:56:49 2014 +

Resolves: fdo#76581 copy-and-paste - slideshow crash in presenter console

crash started after...

commit 0218b0e2fa510d7acd7413dbedefd9ad50257f76
Date:   Mon Jul 15 19:45:44 2013 +0300
fdo#65457 -  Provide visual clues in presenter view.

Change-Id: I19d84800bd5924f2dcc9e5debcf18ef95577105c
(cherry picked from commit 9b3410961e52b4666a118158512e050462711fd0)
Reviewed-on: https://gerrit.libreoffice.org/12283
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sdext/source/presenter/PresenterController.cxx 
b/sdext/source/presenter/PresenterController.cxx
index fa77685..dc26247 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -358,7 +358,7 @@ void PresenterController::UpdatePaneTitles (void)
 sCurrentSlideName = sName;
 }
 }
-catch (beans::UnknownPropertyException)
+catch (const beans::UnknownPropertyException)
 {
 }
 }
@@ -585,10 +585,16 @@ bool PresenterController::HasTransition 
(Referencedrawing::XDrawPage rxPage)
 if( rxPage.is() )
 {
 Referencebeans::XPropertySet xSlidePropertySet (rxPage, UNO_QUERY);
-xSlidePropertySet-getPropertyValue(TransitionType) = 
aTransitionType;
-if( aTransitionType  0 )
+try
+{
+xSlidePropertySet-getPropertyValue(TransitionType) = 
aTransitionType;
+if (aTransitionType  0)
+{
+bTransition = true;
+}
+}
+catch (const beans::UnknownPropertyException)
 {
-bTransition = true;
 }
 }
 return bTransition;
@@ -597,8 +603,6 @@ bool PresenterController::HasTransition 
(Referencedrawing::XDrawPage rxPage)
 bool PresenterController::HasCustomAnimation (Referencedrawing::XDrawPage 
rxPage)
 {
 bool bCustomAnimation = false;
-presentation::AnimationEffect aEffect = presentation::AnimationEffect_NONE;
-presentation::AnimationEffect aTextEffect = 
presentation::AnimationEffect_NONE;
 if( rxPage.is() )
 {
 sal_uInt32 i, nCount = rxPage-getCount();
@@ -606,8 +610,16 @@ bool PresenterController::HasCustomAnimation 
(Referencedrawing::XDrawPage rxP
 {
 Referencedrawing::XShape xShape(rxPage-getByIndex(i), 
UNO_QUERY);
 Referencebeans::XPropertySet xShapePropertySet(xShape, 
UNO_QUERY);
-xShapePropertySet-getPropertyValue(Effect) = aEffect;
-xShapePropertySet-getPropertyValue(TextEffect) = aTextEffect;
+presentation::AnimationEffect aEffect = 
presentation::AnimationEffect_NONE;
+presentation::AnimationEffect aTextEffect = 
presentation::AnimationEffect_NONE;
+try
+{
+xShapePropertySet-getPropertyValue(Effect) = aEffect;
+xShapePropertySet-getPropertyValue(TextEffect) = 
aTextEffect;
+}
+catch (const beans::UnknownPropertyException)
+{
+}
 if( aEffect != presentation::AnimationEffect_NONE ||
 aTextEffect != presentation::AnimationEffect_NONE )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/source

 vcl/source/opengl/OpenGLContext.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit e912e156a39de46c0100e66e1efdf294f9ccc015
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Nov 17 18:20:44 2014 +0100

windows opengl: WIP don't wait on vsync.

Change-Id: I7fe4b17d24e809c0427552151ddcf227d5e61563

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 3ec1415..2a2a94d 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -874,6 +874,15 @@ bool OpenGLContext::InitGLEW()
 
 #endif
 
+#if 0 // TODO make this to compile
+#ifdef WNT
+if (!WGLEW_EXT_swap_control || !wglSwapIntervalEXT(0))
+{
+SAL_WARN(vcl.opengl, Failed to set swap interval to 0, rendering 
will be extremely slow.);
+}
+#endif
+#endif
+
 SAL_INFO(vcl.opengl, OpenGLContext::ImplInitend);
 mbInitialized = true;
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source

 sc/inc/column.hxx   |3 ++-
 sc/source/core/data/column4.cxx |   20 +---
 sc/source/core/data/table4.cxx  |4 +++-
 3 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 1f69b4cbedf8b8ac290fe0814bd000550e49fb69
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 13:06:51 2014 -0500

Avoid area listeners and such during formula cell paste replication.

All formula cells get marked dirty and start area-listening at the very
end of CopyFromClip.  No need to do it in CloneFormulaCells.

Change-Id: I9faf48fd722c2ebcf4b74d5e523317b5d9c71a22

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 4e8bb00..654e08b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -316,7 +316,8 @@ public:
 
 bool HasFormulaCell( SCROW nRow1, SCROW nRow2 ) const;
 
-void CloneFormulaCell( const ScFormulaCell rSrc, const 
std::vectorsc::RowSpan rRanges );
+void CloneFormulaCell(
+const ScFormulaCell rSrc, const std::vectorsc::RowSpan rRanges, 
sc::StartListeningContext* pCxt );
 
 svl::SharedString GetSharedString( SCROW nRow ) const;
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 94634dd..2d6609d 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -213,7 +213,7 @@ void ScColumn::CopyOneCellFromClip( 
sc::CopyFromClipContext rCxt, SCROW nRow1,
 std::vectorsc::RowSpan aRanges;
 aRanges.reserve(1);
 aRanges.push_back(sc::RowSpan(nRow1, nRow2));
-CloneFormulaCell(*rSrcCell.mpFormula, aRanges);
+CloneFormulaCell(*rSrcCell.mpFormula, aRanges, NULL);
 }
 break;
 default:
@@ -473,11 +473,11 @@ void ScColumn::DeleteRanges( const 
std::vectorsc::RowSpan rRanges, InsertDele
 DeleteArea(itSpan-mnRow1, itSpan-mnRow2, nDelFlag, bBroadcast);
 }
 
-void ScColumn::CloneFormulaCell( const ScFormulaCell rSrc, const 
std::vectorsc::RowSpan rRanges )
+void ScColumn::CloneFormulaCell(
+const ScFormulaCell rSrc, const std::vectorsc::RowSpan rRanges, 
sc::StartListeningContext* pCxt )
 {
 sc::CellStoreType::iterator itPos = maCells.begin();
 sc::CellTextAttrStoreType::iterator itAttrPos = maCellTextAttrs.begin();
-sc::StartListeningContext aCxt(*pDocument);
 
 std::vectorScFormulaCell* aFormulas;
 std::vectorsc::RowSpan::const_iterator itSpan = rRanges.begin(), 
itSpanEnd = rRanges.end();
@@ -495,8 +495,11 @@ void ScColumn::CloneFormulaCell( const ScFormulaCell 
rSrc, const std::vectorsc
 {
 // Single, ungrouped formula cell.
 ScFormulaCell* pCell = new ScFormulaCell(rSrc, *pDocument, aPos);
-pCell-StartListeningTo(aCxt);
-pCell-SetDirty();
+if (pCxt)
+{
+pCell-StartListeningTo(*pCxt);
+pCell-SetDirty();
+}
 aFormulas.push_back(pCell);
 }
 else
@@ -513,8 +516,11 @@ void ScColumn::CloneFormulaCell( const ScFormulaCell 
rSrc, const std::vectorsc
 xGroup-mpTopCell = pCell;
 xGroup-mnLength = nLen;
 }
-pCell-StartListeningTo(aCxt);
-pCell-SetDirty();
+if (pCxt)
+{
+pCell-StartListeningTo(*pCxt);
+pCell-SetDirty();
+}
 aFormulas.push_back(pCell);
 }
 }
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 701e6d5..bfc29bd 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -61,6 +61,7 @@
 #include conditio.hxx
 #include editutil.hxx
 #include columnspanset.hxx
+#include listenercontext.hxx
 
 #include math.h
 #include boost/scoped_ptr.hpp
@@ -1163,7 +1164,8 @@ void ScTable::FillFormulaVertical(
 }
 
 aCol[nCol].DeleteRanges(aSpans, IDF_CONTENTS, false);
-aCol[nCol].CloneFormulaCell(rSrcCell, aSpans);
+sc::StartListeningContext aCxt(*pDocument);
+aCol[nCol].CloneFormulaCell(rSrcCell, aSpans, aCxt);
 
 rProgress += nRow2 - nRow1 + 1;
 if (pProgress)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice extensions to ODF: Improving documentation

2014-11-17 Thread Robinson Tryon

To make it easier to keep track of what we've extended in ODF (and
what has been proposed to OASIS vs. added to the next version of ODF
vs. been implemented in LO, etc..) I thought up a few new columns to
add to our table that lists all LibreOffice extensions to ODF:
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#List_of_LibreOffice_ODF_extensions

This update should make it easier for both devs and users to keep
track of our ODF extensions, and to help them understand what features
will be lost if documents are saved as ODF 1.2 vs. ODF 1.2 Extended.

Here's the extended list of columns:

! Commit
! Added to master!-- rough date pulled into master --
! ODF Version(s) Extended !-- e.g. 1.2+ --
! Affects LO Versions !-- e.g. (3.5.6 - current). Once a feature is
implemented officially in ODF and LO, we can close the range, at least
when saving in the latest version of ODF --
! Validation Errors !-- Any errors/warnings this feature will
trigger in an ODF validator, or none --
! Added elements/attributes
! Functional Area
! OASIS cross-reference
! Standardized in ODF !-- ODF version # in which this feature was
added (or explanation for not becoming a standard) --
! Standardized as... !-- Name of the feature in ODF (+ URL link to
section of spec) --

Suggestions on how to improve the column names (and provide more
clarity about how we extend ODF) greatly appreciated!

Thanks,
--R

--
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] Release Notes Whiteboard Keyword

2014-11-17 Thread V Stuart Foote

Top posting reply to Joel's note...

Actually, it makes a lot of sense in that release notes really need a more 
descriptive narrative for substantive enhancements and bug fixes.  As is we 
often simply list the fixes against prior releases.

Envision this whiteboard tagging would support two aspects
1) the editorial tracking that substantive ehnancment/bug fixes  have been 
described in the release notes
2) encourage QA/Dev or OP to describe the user impact of fixing an issue 
directly in the BZ so it could be picked up in a release note snippet.

Stuart

From: Libreoffice-qa libreoffice-qa-boun...@lists.freedesktop.org on behalf 
of Joel Madero jmadero@gmail.com
Sent: Friday, November 14, 2014 4:56 PM
To: Jay Philips
Cc: LibreOffice-QA; libreoffice-dev
Subject: Re: [Libreoffice-qa] Release Notes Whiteboard Keyword

Hi Jay,
 Hi All,

 I had recently been listening to a podcast and they mentioned that a
 linux or bsd distro would have a keyword in its bug tracking system for
 bugs that are worth mentioning in the release notes. So i was thinking
 that a whiteboard keyword of the same could be done so that it is easy
 to query bugzilla for these when libreoffice releases a major release.
I have really mixed feelings about this - sounds like a good way to
encourage pet bugs which we don't like. How is this different from just
the MAB list?

Best,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Questions about bool or sal_Bool in Any::setValue, makeAny

2014-11-17 Thread Matteo Casalin


Hi all,
I was converting all sw call-places to Any::setValue that pass 
sal_Bool to use bool instead. I wonder if this is a good choice or not, 
is there any guideline?

Also some of these call places look like:

sal_Bool bTrue = sal_True;
uno::Any aVal(bTrue, ::getBooleanCppuType());
some_function_call( aVal );

or

uno::Any aAny;
sal_Bool bFalse = sal_False;
aTmp.setValue(bFalse, ::getBooleanCppuType()  );
some_function_call( aTmp );

could these be changed to use makeAny(bool)? Does this hold also if the 
same Any object is used multiple times (each time calling setValue on it)?


Thanks
Matteo
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 1085 commits - accessibility/source android/experimental apple_remote/source autogen.sh avmedia/Library_avmediagst.mk avmedia/Library

2014-11-17 Thread Douglas Mencken

Rebased ref, commits from common ancestor:
commit 5567f56fbae892f521cf284c7e505a22a1027b25
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Sat Oct 25 11:03:56 2014 -0400

vcl: workarounds for `objc_msgSend setDelegate' on OS X 10.5

(vcl/osx/salframe.cxx, vcl/osx/salmenu.cxx)

plus, move conditional includes in salframe.cxx down a bit

Change-Id: I39886b4590f227ec69042fed0f5240ba0b0fd7f2

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6a67101..077e40c 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -37,11 +37,6 @@
 #include osx/a11yfactory.h
 #include quartz/utils.h
 
-#if MACOSX_SDK_VERSION  1060
-#include vcl/timer.hxx
-#include osx/saltimer.h
-#endif
-
 #include salwtype.hxx
 
 #include premac.h
@@ -54,6 +49,11 @@
 #include Carbon/Carbon.h
 #include postmac.h
 
+#if MACOSX_SDK_VERSION  1060
+#include vcl/timer.hxx
+#include osx/saltimer.h
+#endif
+
 using namespace std;
 
 AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL;
@@ -201,16 +201,16 @@ void AquaSalFrame::initWindowAndView()
 [mpNSWindow setAcceptsMouseMovedEvents: YES];
 [mpNSWindow setHasShadow: YES];
 
-#if MACOSX_SDK_VERSION  1060
-objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow); */
 [mpNSWindow setDelegate: static_castidNSWindowDelegate (mpNSWindow)];
-#endif
 
 if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
 {
 objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
 }
+#endif
+
 const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, 
maGeometry.nHeight )};
 mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView 
userData: nil assumeInside: NO];
 
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 315c025..d670933 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -246,9 +246,8 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
 if( ! mbMenuBar )
 {
 mpMenu = [[SalNSMenu alloc] initWithMenu: this];
-#if MACOSX_SDK_VERSION  1060
-objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
-#else
+#if MACOSX_SDK_VERSION = 1060
+/* objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu); */
 [mpMenu setDelegate: (idNSMenuDelegate)mpMenu];
 #endif
 }
commit b95e673086d1756ee888df49e72cc6409f204894
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Sun Oct 26 06:38:10 2014 -0400

vcl: fix some cannot convert 'objc_object*' to... issues

Change-Id: I4b0e32c412937da4b2ea4bf350be32ea31362b3c

diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 4e19e1d..f821da7 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -160,7 +160,7 @@ static std::ostream operator(std::ostream s, NSPoint 
point) {
 // (getter with parameter)attributeNameHereAttributeForParameter:
 // (setter)   setAttributeNameHereAttributeForElement:to:
 -(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter 
withGetterParameter:(BOOL)withGetterParameter {
-SEL selector = nil;
+SEL selector = (SEL)nil;
 NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
 @try {
 // step 1: create method name from attribute name
@@ -186,7 +186,7 @@ static std::ostream operator(std::ostream s, NSPoint 
point) {
 // step 2: create selector
 selector = NSSelectorFromString ( methodName );
 } @catch ( id exception ) {
-selector = nil;
+selector = (SEL)nil;
 }
 [ pool release ];
 return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8e0d58b..ecbda95 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -482,7 +482,7 @@ static AquaSalFrame* getMouseContainerFrame()
 mpFrame = pFrame;
 mMarkedRange = NSMakeRange(NSNotFound, 0);
 mSelectedRange = NSMakeRange(NSNotFound, 0);
-mpReferenceWrapper = nil;
+mpReferenceWrapper = (ReferenceWrapper*)nil;
 mpMouseEventListener = nil;
 mpLastSuperEvent = nil;
 }
@@ -1788,7 +1788,7 @@ private:
 // some frames never become visible ..
 ::vcl::Window *pWindow = mpFrame - GetWindow();
 if ( ! pWindow )
-return nil;
+return (::com::sun::star::accessibility::XAccessibleContext*)nil;
 
 mpReferenceWrapper = new ReferenceWrapper;
 mpReferenceWrapper - rAccessibleContext =  pWindow - 
/*GetAccessibleChildWindow( 0 ) -*/ GetAccessible() - getAccessibleContext();
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index ce3ab41..69f7753 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -558,7 +558,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType,
 [NSNumber numberWithBool:NO], 
@kCUIWindowFrameDrawTitleSeparatorKey,

[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source

 sc/inc/column.hxx|2 +-
 sc/inc/document.hxx  |2 +-
 sc/inc/table.hxx |2 +-
 sc/source/core/data/column.cxx   |2 +-
 sc/source/core/data/document.cxx |   13 +++--
 sc/source/core/data/table2.cxx   |4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 601e4fe908cb10948b0a86a37877e606af5f5dbf
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 13:45:35 2014 -0500

Rename methods whose name no longer represent what they do.

We now do all broadcasting at the end of CopyFromClip, and nowhere else
during pasting from clip.

Change-Id: I1cb2c529f127d6e4080e49e4827f048ce5a19f95

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 654e08b..57ff8aa 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -351,7 +351,7 @@ public:
 bool IsFormulaDirty( SCROW nRow ) const;
 
 void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
-void BroadcastInArea( SCROW nRow1, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans );
+void SetDirtyFromClip( SCROW nRow1, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans );
 void SetDirty( SCROW nRow1, SCROW nRow2 );
 voidSetDirtyVar();
 voidSetDirtyAfterLoad();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 72b49a8..a09581b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1257,7 +1257,7 @@ public:
 SCCOL nCol2, SCROW nRow2,
 const ScMarkData rMark, 
InsertDeleteFlags nInsFlag );
 
-void BroadcastFromClip(
+void SetDirtyFromClip(
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData 
rMark,
 InsertDeleteFlags nInsFlag, sc::ColumnSpanSet rBroadcastSpans );
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 5a6f015..daacd60 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -438,7 +438,7 @@ public:
 void StartListeningInArea(
 sc::StartListeningContext rCxt, SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2 );
 
-void BroadcastInArea(
+void SetDirtyFromClip(
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans );
 
 void CopyToTable(
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9eb2358..381307d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -3044,7 +3044,7 @@ void ScColumn::SetAllFormulasDirty( const 
sc::SetFormulaDirtyContext rCxt )
 sc::ProcessFormula(maCells, aFunc);
 }
 
-void ScColumn::BroadcastInArea( SCROW nRow1, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans )
+void ScColumn::SetDirtyFromClip( SCROW nRow1, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans )
 {
 // Set all formula cells in the range dirty, and pick up all non-formula
 // cells for later broadcasting.  We don't broadcast here.
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8e55be7..9487826 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2429,18 +2429,17 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, 
SCROW nRow1,
 }
 }
 
-void ScDocument::BroadcastFromClip(
+void ScDocument::SetDirtyFromClip(
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData 
rMark,
 InsertDeleteFlags nInsFlag, sc::ColumnSpanSet rBroadcastSpans )
 {
 if (nInsFlag  IDF_CONTENTS)
 {
-ScBulkBroadcast aBulkBroadcast( GetBASM());
 SCTAB nMax = static_castSCTAB(maTabs.size());
 ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
 for (; itr != itrEnd  *itr  nMax; ++itr)
 if (maTabs[*itr])
-maTabs[*itr]-BroadcastInArea(nCol1, nRow1, nCol2, nRow2, 
rBroadcastSpans);
+maTabs[*itr]-SetDirtyFromClip(nCol1, nRow1, nCol2, nRow2, 
rBroadcastSpans);
 }
 }
 
@@ -2815,8 +2814,10 @@ void ScDocument::CopyFromClip( const ScRange 
rDestRange, const ScMarkData rMar
 
 // Listener aufbauen nachdem alles inserted wurde
 StartListeningFromClip( nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, 
nInsFlag );
-// nachdem alle Listener aufgebaut wurden, kann gebroadcastet werden
-BroadcastFromClip(nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag, 
aBroadcastSpans);
+
+// Set all formula cells dirty, and collect non-empty non-formula cell
+// positions so that we can broadcast on them below.
+SetDirtyFromClip(nAllCol1, nAllRow1, nAllCol2, nAllRow2, rMark, nInsFlag, 
aBroadcastSpans);
 
 {
 ScBulkBroadcast aBulkBroadcast( GetBASM());
@@ -2901,7 +2902,7 @@ void ScDocument::CopyMultiRangeFromClip(
 StartListeningFromClip(aDestRange.aStart.Col(), aDestRange.aStart.Row(),
aDestRange.aEnd.Col(), aDestRange.aEnd.Row(), 
rMark, nInsFlag );
 // nachdem alle Listener aufgebaut

[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source

 sc/inc/column.hxx  |4 +++-
 sc/inc/document.hxx|3 ++-
 sc/inc/table.hxx   |3 ++-
 sc/source/core/data/column4.cxx|7 +++
 sc/source/core/data/document.cxx   |2 +-
 sc/source/core/data/document10.cxx |5 +++--
 sc/source/core/data/table7.cxx |7 +++
 7 files changed, 17 insertions(+), 14 deletions(-)

New commits:
commit 8efe63bf1c5f6f2a889b991fca4b3922a48f6e87
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 14:16:28 2014 -0500

Avoid unnecessary broadcasting when deleting cells prior to pasting.

Change-Id: Id224fd6fdb804350e7e00634db802e80090ae6d7

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 57ff8aa..86dbd39 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -247,7 +247,9 @@ public:
 bool InitBlockPosition( sc::ColumnBlockPosition rBlockPos );
 bool InitBlockPosition( sc::ColumnBlockConstPosition rBlockPos ) const;
 
-void DeleteBeforeCopyFromClip( sc::CopyFromClipContext rCxt, const 
ScColumn rClipCol );
+void DeleteBeforeCopyFromClip(
+sc::CopyFromClipContext rCxt, const ScColumn rClipCol, 
sc::ColumnSpanSet rBroadcastSpans );
+
 void CopyOneCellFromClip( sc::CopyFromClipContext rCxt, SCROW nRow1, 
SCROW nRow2, size_t nColOffset );
 
 void CopyFromClip(
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index a09581b..a3bfa07 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1242,7 +1242,8 @@ public:
 
 bool InitColumnBlockPosition( sc::ColumnBlockPosition rBlokPos, SCTAB 
nTab, SCCOL nCol );
 
-void DeleteBeforeCopyFromClip( sc::CopyFromClipContext rCxt, const 
ScMarkData rMark );
+void DeleteBeforeCopyFromClip(
+sc::CopyFromClipContext rCxt, const ScMarkData rMark, 
sc::ColumnSpanSet rBroadcastSpans );
 
 bool CopyOneCellFromClip(
 sc::CopyFromClipContext rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2 );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index daacd60..ea1e2a3 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -426,7 +426,8 @@ public:
 
 bool InitColumnBlockPosition( sc::ColumnBlockPosition rBlockPos, SCCOL 
nCol );
 
-void DeleteBeforeCopyFromClip( sc::CopyFromClipContext rCxt, const 
ScTable rClipTab );
+void DeleteBeforeCopyFromClip(
+sc::CopyFromClipContext rCxt, const ScTable rClipTab, 
sc::ColumnSpanSet rBroadcastSpans );
 
 void CopyOneCellFromClip(
 sc::CopyFromClipContext rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2 );
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 2d6609d..f0d28eb 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -41,7 +41,8 @@ bool ScColumn::IsMerged( SCROW nRow ) const
 return pAttrArray-IsMerged(nRow);
 }
 
-void ScColumn::DeleteBeforeCopyFromClip( sc::CopyFromClipContext rCxt, const 
ScColumn rClipCol )
+void ScColumn::DeleteBeforeCopyFromClip(
+sc::CopyFromClipContext rCxt, const ScColumn rClipCol, 
sc::ColumnSpanSet rBroadcastSpans )
 {
 sc::CopyFromClipContext::Range aRange = rCxt.getDestRange();
 if (!ValidRow(aRange.mnRow1) || !ValidRow(aRange.mnRow2))
@@ -107,7 +108,7 @@ void ScColumn::DeleteBeforeCopyFromClip( 
sc::CopyFromClipContext rCxt, const Sc
 SCROW nRow2 = it-mnRow2;
 
 if (nDelFlag  IDF_CONTENTS)
-DeleteCells(aBlockPos, nRow1, nRow2, nDelFlag, aDeletedRows);
+DeleteCells(aBlockPos, nRow1, nRow2, nDelFlag, aDeletedRows, 
rBroadcastSpans);
 
 if (nDelFlag  IDF_NOTE)
 DeleteCellNotes(aBlockPos, nRow1, nRow2);
@@ -134,8 +135,6 @@ void ScColumn::DeleteBeforeCopyFromClip( 
sc::CopyFromClipContext rCxt, const Sc
 else if ((nDelFlag  IDF_HARDATTR) == IDF_HARDATTR)
 pAttrArray-DeleteHardAttr(nRow1, nRow2);
 }
-
-BroadcastCells(aDeletedRows, SC_HINT_DATACHANGED);
 }
 
 void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext rCxt, SCROW 
nRow1, SCROW nRow2, size_t nColOffset )
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 9487826..abfe1b0 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2712,7 +2712,7 @@ void ScDocument::CopyFromClip( const ScRange rDestRange, 
const ScMarkData rMar
 {
 // Delete cells in the destination only if their corresponding 
clip cells are not empty.
 aCxt.setDestRange(nCol1, nRow1, nCol2, nRow2);
-DeleteBeforeCopyFromClip(aCxt, rMark);
+DeleteBeforeCopyFromClip(aCxt, rMark, aBroadcastSpans);
 }
 else
 DeleteArea(nCol1, nRow1, nCol2, nRow2, rMark, nDelFlag, false, 
aBroadcastSpans);
diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index 49c0a9f..1f14d5d 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -37,7 +37,8 @@ bool

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/inc vcl/opengl

2014-11-17 Thread Louis-Francis Ratté-Boulianne

 vcl/inc/opengl/salbmp.hxx |3 ++-
 vcl/opengl/gdiimpl.cxx|   18 +-
 vcl/opengl/salbmp.cxx |   32 
 vcl/opengl/scale.cxx  |1 +
 4 files changed, 32 insertions(+), 22 deletions(-)

New commits:
commit 67ff07df7d5bcf11da407b775b3fc541622fe297
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 14:24:31 2014 -0500

vcl: Execute pending operations on source when copying bitmap

Change-Id: I8a6a5ffe71c9e5f16533fd1f0944d4fd2a051c73

diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 9995645..98fc2fe 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -84,10 +84,11 @@ public:
 public:
 
 boolCreate( OpenGLContext rContext, const OpenGLTexture 
rTex, long nX, long nY, long nWidth, long nHeight );
-OpenGLTexture  GetTexture( OpenGLContext rContext ) const;
+OpenGLTexture  GetTexture() const;
 
 private:
 
+voidExecuteOperations();
 GLuint  CreateTexture();
 voidDeleteTexture();
 voidDrawTexture( GLuint nTexture, const SalTwoRect rPosAry );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 187458b..c9f8d4e 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1339,7 +1339,7 @@ void OpenGLSalGraphicsImpl::drawBitmap( const SalTwoRect 
rPosAry, const SalBitm
 assert(dynamic_castconst OpenGLSalBitmap*(rSalBitmap));
 
 const OpenGLSalBitmap rBitmap = static_castconst 
OpenGLSalBitmap(rSalBitmap);
-OpenGLTexture rTexture = rBitmap.GetTexture( maContext );
+OpenGLTexture rTexture = rBitmap.GetTexture();
 
 SAL_INFO( vcl.opengl, ::drawBitmap );
 PreDraw();
@@ -1362,8 +1362,8 @@ void OpenGLSalGraphicsImpl::drawBitmap(
 {
 const OpenGLSalBitmap rBitmap = static_castconst 
OpenGLSalBitmap(rSalBitmap);
 const OpenGLSalBitmap rMask = static_castconst 
OpenGLSalBitmap(rMaskBitmap);
-OpenGLTexture rTexture( rBitmap.GetTexture( maContext ) );
-OpenGLTexture rMaskTex( rMask.GetTexture( maContext ) );
+OpenGLTexture rTexture( rBitmap.GetTexture() );
+OpenGLTexture rMaskTex( rMask.GetTexture() );
 
 SAL_INFO( vcl.opengl, ::drawBitmap with MASK );
 PreDraw();
@@ -1377,7 +1377,7 @@ void OpenGLSalGraphicsImpl::drawMask(
 SalColor nMaskColor )
 {
 const OpenGLSalBitmap rBitmap = static_castconst 
OpenGLSalBitmap(rSalBitmap);
-OpenGLTexture rTexture( rBitmap.GetTexture( maContext ) );
+OpenGLTexture rTexture( rBitmap.GetTexture() );
 
 SAL_INFO( vcl.opengl, ::drawMask );
 PreDraw();
@@ -1492,8 +1492,8 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
 {
 const OpenGLSalBitmap rBitmap = static_castconst 
OpenGLSalBitmap(rSalBitmap);
 const OpenGLSalBitmap rAlpha = static_castconst 
OpenGLSalBitmap(rAlphaBitmap);
-OpenGLTexture rTexture( rBitmap.GetTexture( maContext ) );
-OpenGLTexture rAlphaTex( rAlpha.GetTexture( maContext ) );
+OpenGLTexture rTexture( rBitmap.GetTexture() );
+OpenGLTexture rAlphaTex( rAlpha.GetTexture() );
 
 SAL_INFO( vcl.opengl, ::drawAlphaBitmap );
 PreDraw();
@@ -1507,7 +1507,7 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
 const SalBitmap rSalBitmap )
 {
 const OpenGLSalBitmap rBitmap = static_castconst 
OpenGLSalBitmap(rSalBitmap);
-OpenGLTexture rTexture( rBitmap.GetTexture( maContext ) );
+OpenGLTexture rTexture( rBitmap.GetTexture() );
 
 SAL_INFO( vcl.opengl, ::drawAlphaBitmap );
 PreDraw();
@@ -1528,11 +1528,11 @@ bool OpenGLSalGraphicsImpl::drawTransformedBitmap(
 {
 const OpenGLSalBitmap rBitmap = static_castconst 
OpenGLSalBitmap(rSrcBitmap);
 const OpenGLSalBitmap* pMaskBitmap = static_castconst 
OpenGLSalBitmap*(pAlphaBitmap);
-OpenGLTexture rTexture( rBitmap.GetTexture( maContext ) );
+OpenGLTexture rTexture( rBitmap.GetTexture() );
 OpenGLTexture aMask; // no texture
 
 if( pMaskBitmap != NULL )
-aMask = pMaskBitmap-GetTexture( maContext );
+aMask = pMaskBitmap-GetTexture();
 
 SAL_INFO( vcl.opengl, ::drawTransformedBitmap );
 PreDraw();
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 780c268..6dfb4bd 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -130,8 +130,9 @@ bool OpenGLSalBitmap::Create( const SalBitmap rSalBmp, 
sal_uInt16 nNewBitCount
 mnBufWidth = rSourceBitmap.mnBufWidth;
 mnBufHeight = rSourceBitmap.mnBufHeight;
 maPalette = rSourceBitmap.maPalette;
+// execute any pending operations on the source bitmap
+maTexture = rSourceBitmap.GetTexture();
 mpContext = rSourceBitmap.mpContext;
-maTexture = rSourceBitmap.maTexture;
 mbDirtyTexture = false;
 maUserBuffer = rSourceBitmap.maUserBuffer;
 
@@ -147,13 +148,13 @@ bool OpenGLSalBitmap::Create( const 
::com::sun::star::uno::Reference ::com::sun
 return false;
 }
 
-OpenGLTexture

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

 chart2/source/controller/main/SelectionHelper.cxx |9 ++---
 sc/source/filter/excel/xistyle.cxx|   12 +---
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 96b524cdd639b57c875eada551e267654f2a83fc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 17:03:15 2014 +

coverity#1242891 Untrusted loop bound

Change-Id: I5859cef0fa6b9c49225c5d7b073bcbc521734854

diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 7349a8e..446b283 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -150,8 +150,15 @@ void XclImpPalette::ReadPalette( XclImpStream rStrm )
 {
 sal_uInt16 nCount;
 rStrm  nCount;
-OSL_ENSURE( rStrm.GetRecLeft() == static_cast sal_Size ( 4 * nCount ),
-XclImpPalette::ReadPalette - size mismatch );
+
+const size_t nMinRecordSize = 4;
+const size_t nMaxRecords = rStrm.GetRecLeft() / nMinRecordSize;
+if (nCount  nMaxRecords)
+{
+SAL_WARN(sc, Parsing error:   nMaxRecords 
+  max possible entries, but   nCount   claimed, 
truncating);
+nCount = nMaxRecords;
+}
 
 maColorTable.resize( nCount );
 Color aColor;
@@ -164,7 +171,6 @@ void XclImpPalette::ReadPalette( XclImpStream rStrm )
 }
 
 // FONT record - font information =
-
 XclImpFont::XclImpFont( const XclImpRoot rRoot ) :
 XclImpRoot( rRoot ),
 mbHasCharSet( false ),
commit 5d0da4db5a8c7a76f83c4db60e4577bf2202ed9f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Nov 17 16:39:03 2014 +

coverity#1242824 Unused value

Change-Id: I5f53e538f8f76c337cda8b90fcf4ed717ed2476e

diff --git a/chart2/source/controller/main/SelectionHelper.cxx 
b/chart2/source/controller/main/SelectionHelper.cxx
index 8389fe4e..ee54fc8 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -172,13 +172,12 @@ void Selection::adaptSelectionToNewPos( const Point 
rMousePos, DrawViewWrapper*
 //bAllowMultiClickSelectionChange==true - a second click on the same 
object can lead to a changed selection (e.g. series - single data point)
 
 //get object to select:
-SdrObject* pNewObj = 0;
 {
 m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing = 
ObjectIdentifier();
 
 //the search for the object to select starts with the hit object 
deepest in the grouping hierarchy (a leaf in the tree)
 //further we travel along the grouping hierarchy from child to 
parent
-pNewObj = pDrawViewWrapper-getHitObject(rMousePos);
+SdrObject* pNewObj = pDrawViewWrapper-getHitObject(rMousePos);
 m_aSelectedOID = ObjectIdentifier( lcl_getObjectName( pNewObj ) 
);//name of pNewObj
 
 //ignore handle only objects for hit test
@@ -207,7 +206,6 @@ void Selection::adaptSelectionToNewPos( const Point 
rMousePos, DrawViewWrapper*
 //if a sibling of the last selected object is clicked 
don't go up further
 break;
 }
-SdrObject*pLastChild = pNewObj;
 ObjectIdentifier aLastChild = m_aSelectedOID;
 if ( !SelectionHelper::findNamedParent( pNewObj, 
m_aSelectedOID, false ) )
 {
@@ -220,17 +218,15 @@ void Selection::adaptSelectionToNewPos( const Point 
rMousePos, DrawViewWrapper*
 {
 if( bAllowMultiClickSelectionChange )
 {
-pNewObj  = pLastChild;
 m_aSelectedOID = aLastChild;
 }
 else
 
m_aSelectedOID_selectOnlyIfNoDoubleClickIsFollowing = aLastChild;
-
 break;
 }
 }
 
-OSL_ENSURE( pNewObj  m_aSelectedOID.isValid(), somehow lost 
selected object );
+OSL_ENSURE(m_aSelectedOID.isValid(), somehow lost selected 
object);
 }
 else
 {
@@ -281,7 +277,6 @@ void Selection::adaptSelectionToNewPos( const Point 
rMousePos, DrawViewWrapper*
 if( pDrawViewWrapper-IsObjectHit( pLegend, rMousePos 
) )
 {
 m_aSelectedOID = ObjectIdentifier( aLegendCID );
-pNewObj = pLegend;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/opengl

 vcl/opengl/salbmp.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 6631d9819cb1635a6b8d273b99e8c17f33286dfc
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Nov 17 20:33:41 2014 +

vcl: only use default windows' GL Context for bitmaps if NULL / 
uninitialized.

Change-Id: I6465c548ba5d50da2cca7cce24e9bd2a20b28f47

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 6dfb4bd..78bcf07 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -472,14 +472,17 @@ sal_uInt16 OpenGLSalBitmap::GetBitCount() const
 
 bool OpenGLSalBitmap::makeCurrent()
 {
-OpenGLContextProvider *pProvider;
-pProvider = dynamic_cast OpenGLContextProvider* ( 
ImplGetDefaultWindow()-GetGraphics() );
-if( pProvider == NULL )
+if (!mpContext || !mpContext-isInitialized())
 {
-SAL_WARN( vcl.opengl, Couldn't get default OpenGL context provider 
);
-return false;
+OpenGLContextProvider *pProvider;
+pProvider = dynamic_cast OpenGLContextProvider* ( 
ImplGetDefaultWindow()-GetGraphics() );
+if( pProvider == NULL )
+{
+SAL_WARN( vcl.opengl, Couldn't get default OpenGL context 
provider );
+return false;
+}
+mpContext = pProvider-GetOpenGLContext();
 }
-mpContext = pProvider-GetOpenGLContext();
 mpContext-makeCurrent();
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/source

 vcl/source/opengl/OpenGLContext.cxx |   27 ++-
 1 file changed, 22 insertions(+), 5 deletions(-)

New commits:
commit ea95f561a10ea48d63cf94e6ad35b647b083cfb9
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Nov 17 21:07:27 2014 +

vcl: initialize data when XGetWindowAttributes fails.

Change-Id: If6fc99483c06efec9a600226a09ead9a3f6dab59

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 0659ce5..cf19258 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -465,7 +465,12 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int 
nBestFBC, bool bUseDoubl
 SAL_INFO(vcl.opengl, window:   win);
 
 XWindowAttributes xattr;
-XGetWindowAttributes( dpy, win, xattr );
+if( !XGetWindowAttributes( dpy, win, xattr ) )
+{
+SAL_WARN(vcl.opengl, Failed to get window attributes for fbconfig  
 win);
+xattr.screen = 0;
+xattr.visual = NULL;
+}
 
 int screen = XScreenNumberOfScreen( xattr.screen );
 
@@ -537,7 +542,11 @@ Visual* getVisual(Display* dpy, Window win)
 initOpenGLFunctionPointers();
 
 XWindowAttributes xattr;
-XGetWindowAttributes( dpy, win, xattr );
+if( !XGetWindowAttributes( dpy, win, xattr ) )
+{
+SAL_WARN(vcl.opengl, Failed to get window attributes for getVisual 
  win);
+xattr.visual = NULL;
+}
 SAL_INFO(vcl.opengl, using VisualID   xattr.visual);
 return xattr.visual;
 }
@@ -696,9 +705,17 @@ bool OpenGLContext::ImplInit()
 SAL_INFO(vcl.opengl, available GL  extensions:   
m_aGLWin.GLExtensions);
 
 XWindowAttributes xWinAttr;
-XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, xWinAttr );
-m_aGLWin.Width = xWinAttr.width;
-m_aGLWin.Height = xWinAttr.height;
+if( !XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, xWinAttr ) )
+{
+SAL_WARN(vcl.opengl, Failed to get window attributes on   
m_aGLWin.win);
+m_aGLWin.Width = 0;
+m_aGLWin.Height = 0;
+}
+else
+{
+m_aGLWin.Width = xWinAttr.width;
+m_aGLWin.Height = xWinAttr.height;
+}
 
 if( m_aGLWin.HasGLXExtension(GLX_SGI_swap_control ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: translations

2014-11-17 Thread Andras Timar

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

New commits:
commit 07a086feaf6d045849cc6474ffe95f61b9021fa1
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Nov 17 22:10:37 2014 +0100

Updated core
Project: translations  154fe50e9789ad67a6eadaa5d4290372720afe2f

diff --git a/translations b/translations
index 7a93a55..154fe50 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7a93a556c365806ff1306e70f970feaf1bd7581f
+Subproject commit 154fe50e9789ad67a6eadaa5d4290372720afe2f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/sl

2014-11-17 Thread Andras Timar

 source/sl/avmedia/source/viewer.po |5 
 source/sl/connectivity/source/resource.po  |4 
 source/sl/cui/source/options.po|8 
 source/sl/cui/uiconfig/ui.po   | 1230 
--
 source/sl/dbaccess/uiconfig/ui.po  |   19 
 source/sl/desktop/uiconfig/ui.po   |7 
 source/sl/extensions/source/bibliography.po|7 
 source/sl/extensions/uiconfig/sbibliography/ui.po  |4 
 source/sl/filter/source/config/fragments/filters.po|4 
 source/sl/filter/uiconfig/ui.po|  136 -
 source/sl/framework/source/classes.po  |   14 
 source/sl/helpcontent2/source/text/scalc.po|   14 
 source/sl/helpcontent2/source/text/scalc/01.po |  409 +--
 source/sl/helpcontent2/source/text/sdraw/guide.po  |   18 
 source/sl/helpcontent2/source/text/shared/00.po|   36 
 source/sl/helpcontent2/source/text/shared/01.po|   69 
 source/sl/helpcontent2/source/text/shared/02.po|   20 
 source/sl/helpcontent2/source/text/shared/autopi.po|6 
 source/sl/helpcontent2/source/text/shared/explorer/database.po |   16 
 source/sl/helpcontent2/source/text/shared/guide.po |   76 
 source/sl/helpcontent2/source/text/shared/optionen.po  |  110 
 source/sl/helpcontent2/source/text/simpress.po |   14 
 source/sl/helpcontent2/source/text/simpress/01.po  |   30 
 source/sl/helpcontent2/source/text/simpress/02.po  |8 
 source/sl/helpcontent2/source/text/swriter.po  |   14 
 source/sl/helpcontent2/source/text/swriter/00.po   |   42 
 source/sl/helpcontent2/source/text/swriter/01.po   |   72 
 source/sl/helpcontent2/source/text/swriter/02.po   |   30 
 source/sl/helpcontent2/source/text/swriter/guide.po|   54 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |  134 -
 source/sl/readlicense_oo/docs.po   |6 
 source/sl/reportdesign/uiconfig/dbreport/ui.po |5 
 source/sl/sc/source/ui/sidebar.po  |   13 
 source/sl/sc/source/ui/src.po  |   25 
 source/sl/sc/uiconfig/scalc/ui.po  |  228 +
 source/sl/scp2/source/ooo.po   |8 
 source/sl/sd/source/ui/app.po  |   15 
 source/sl/sd/uiconfig/simpress/ui.po   |   10 
 source/sl/sfx2/source/dialog.po|   14 
 source/sl/sfx2/uiconfig/ui.po  |  112 
 source/sl/starmath/source.po   |  176 +
 source/sl/starmath/uiconfig/smath/ui.po|  203 -
 source/sl/svtools/source/misc.po   |7 
 source/sl/svtools/uiconfig/ui.po   |8 
 source/sl/svx/inc.po   |5 
 source/sl/svx/source/dialog.po |   31 
 source/sl/svx/source/stbctrls.po   |   38 
 source/sl/svx/source/tbxctrls.po   |   23 
 source/sl/svx/uiconfig/ui.po   |  283 +-
 source/sl/sw/source/ui/app.po  |4 
 source/sl/sw/source/ui/dbui.po |2 
 source/sl/sw/source/uibase/ribbar.po   |9 
 source/sl/sw/source/uibase/uiview.po   |7 
 source/sl/sw/source/uibase/utlui.po|   69 
 source/sl/sw/uiconfig/swriter/ui.po|  544 ++--
 source/sl/vcl/source/src.po|   10 
 56 files changed, 2460 insertions(+), 2005 deletions(-)

New commits:
commit 154fe50e9789ad67a6eadaa5d4290372720afe2f
Author: Andras Timar andras.ti...@collabora.com
Date:   Mon Nov 17 22:10:37 2014 +0100

Updated Slovenian translation

Change-Id: Ieb93ab3aa0b59b089367b2feba9be2f199553822

diff --git a/source/sl/avmedia/source/viewer.po 
b/source/sl/avmedia/source/viewer.po
index 4c17a1a..7cf20c7 100644
--- a/source/sl/avmedia/source/viewer.po
+++ b/source/sl/avmedia/source/viewer.po
@@ -3,8 +3,8 @@ msgid 
 msgstr 
 Project-Id-Version: LibreOffice 4.4\n
 Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOfficebug_status=UNCONFIRMEDcomponent=UI\n;
-POT-Creation-Date: 2014-10-29 10:46+0100\n
-PO-Revision-Date: 2014-10-09 21:57+0200\n
+POT-Creation-Date: 2014-11-12 11:41+0100\n
+PO-Revision-Date: 2014-11-05 19:55+0200\n
 Last-Translator: Martin Srebotnjak mi...@filmsi.net\n
 Language-Team:

[Libreoffice-commits] core.git: 5 commits - connectivity/source include/tools sal/osl tools/source

 connectivity/source/drivers/ado/Aolevariant.cxx |1 
 include/tools/fract.hxx |  129 ++-
 sal/osl/w32/path_helper.h   |1 
 tools/source/generic/fract.cxx  |  270 ++--
 4 files changed, 230 insertions(+), 171 deletions(-)

New commits:
commit 5fffe5e5ece8ab130c9024bd1f04f1d08a8e01c2
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 16:19:28 2014 -0500

Build fix on Windows

Change-Id: I5c24856bfe48646bc0e9cd00f0849a5db12dfef2

diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx 
b/connectivity/source/drivers/ado/Aolevariant.cxx
index bcb0c62..5a1962b 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -19,6 +19,7 @@
 
 #include ado/Aolevariant.hxx
 #include connectivity/dbconversion.hxx
+#include osl/diagnose.h
 #include com/sun/star/sdbc/SQLException.hpp
 #include com/sun/star/util/Time.hpp
 #include com/sun/star/util/Date.hpp
commit 2cd24526e7e806b279b5d85f89a932393b65bd0a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 10:01:31 2014 -0500

Build fix.

Change-Id: Ifa6775384993900980c93df88162143aa7ac0a08

diff --git a/sal/osl/w32/path_helper.h b/sal/osl/w32/path_helper.h
index 056a1ca..7da985b 100644
--- a/sal/osl/w32/path_helper.h
+++ b/sal/osl/w32/path_helper.h
@@ -23,6 +23,7 @@
 #include sal/types.h
 #include rtl/ustring.h
 #include osl/file.h
+#include osl/diagnose.h
 
 #ifdef __cplusplus
 extern C
commit 2dff8ff29583526920e017fc86b5e2a51b4d6c30
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 09:37:03 2014 -0500

Build fix on Linux.

Change-Id: Iea96991a3bef08c17a8a0cbc347408dadc0061af

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 7f7ab6f..2c48502 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -22,6 +22,7 @@
 #include tools/lineend.hxx
 #include tools/stream.hxx
 #include rtl/ustring.hxx
+#include osl/diagnose.h
 
 #include limits.h
 #include algorithm
commit 6d7282fa8a2c6075ae838aaababe47a1e6513d74
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 08:35:01 2014 -0500

Apply pimpl to Fraction.

Change-Id: I60eb597a6374b807b2264af6d5841a42e9b1c0f3

diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index 597876f..93663ac 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -19,8 +19,7 @@
 #ifndef INCLUDED_TOOLS_FRACT_HXX
 #define INCLUDED_TOOLS_FRACT_HXX
 
-#include boost/rational.hpp
-#include sal/log.hxx
+#include sal/types.h
 #include tools/toolsdllapi.h
 
 class SvStream;
@@ -29,17 +28,18 @@ class SvStream;
 // calculations using sal_Int64 with checks for 'long' overflows.
 class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Fraction
 {
-private:
-boolvalid;
-boost::rationalsal_Int64  value;
+struct Impl;
+
+Impl* mpImpl;
 
 boolHasOverflowValue();
 
 public:
-Fraction() { valid = true; }
+Fraction();
 Fraction( const Fraction  rFrac );
 Fraction( long nNum, long nDen=1 );
 Fraction( double dVal );
+~Fraction();
 
 boolIsValid() const;
 
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index e9e2f5f..7f7ab6f 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -17,16 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include algorithm
-#include cmath
-
-#include limits.h
-#include rtl/ustring.hxx
-#include osl/diagnose.h
-#include tools/debug.hxx
 #include tools/fract.hxx
+#include tools/debug.hxx
 #include tools/lineend.hxx
 #include tools/stream.hxx
+#include rtl/ustring.hxx
+
+#include limits.h
+#include algorithm
+#include cmath
+
+#include boost/rational.hpp
+#include boost/noncopyable.hpp
 
 templatetypename T
 static boost::rationalT rational_FromDouble(double dVal);
@@ -34,51 +36,79 @@ static boost::rationalT rational_FromDouble(double dVal);
 templatetypename T
 static void rational_ReduceInaccurate(boost::rationalT rRational, unsigned 
nSignificantBits);
 
+struct Fraction::Impl : boost::noncopyable
+{
+boolvalid;
+boost::rationalsal_Int64  value;
+};
+
+Fraction::Fraction() : mpImpl(new Impl)
+{
+mpImpl-valid = true;
+}
+
+Fraction::Fraction( const Fraction rFrac ) : mpImpl(new Impl)
+{
+mpImpl-valid = rFrac.mpImpl-valid;
+if (mpImpl-valid)
+mpImpl-value.assign( rFrac.mpImpl-value.numerator(), 
rFrac.mpImpl-value.denominator() );
+}
+
 // Initialized by setting nNum as nominator and nDen as denominator
 // Negative values in the denominator are invalid and cause the
 // inversion of both nominator and denominator signs
 // in order to return the correct value.

Re: Questions about bool or sal_Bool in Any::setValue, makeAny

2014-11-17 Thread Michael Stahl

On 16.11.2014 19:57, Matteo Casalin wrote:
 Hi all,
  I was converting all sw call-places to Any::setValue that pass 
 sal_Bool to use bool instead. I wonder if this is a good choice or not, 
 is there any guideline?

it looks like the Any has specific support for C++ bool so it should
work fine.

 Also some of these call places look like:
 
  sal_Bool bTrue = sal_True;
  uno::Any aVal(bTrue, ::getBooleanCppuType());
  some_function_call( aVal );
 
 or
 
  uno::Any aAny;
  sal_Bool bFalse = sal_False;
  aTmp.setValue(bFalse, ::getBooleanCppuType()  );
  some_function_call( aTmp );
 
 could these be changed to use makeAny(bool)? Does this hold also if the 
 same Any object is used multiple times (each time calling setValue on it)?

it's much better to use a type-safe method like makeAny() or operator=
and not the Any::setValue()/getValue() methods that operate on unsafe void*.


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

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/source

 vcl/source/opengl/OpenGLContext.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit a3945b695457cc697ce8264aea24d10e97663ab2
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Nov 17 21:51:50 2014 +

vcl: make OpenGLContext::makeCurrent unfeasibly faster.

Don't set the same context if it is already set. Apparently this is
something that is unbelievably costly on Windows, and very costly on
Linux. Instead check if the context is already set, and don't re-set it.

Change-Id: If4fed3e555e1388031446be76d6fdfde5b9f13e5

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index cf19258..b803fd6 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1092,7 +1092,11 @@ SystemWindowData 
OpenGLContext::generateWinData(vcl::Window* pParent, bool)
 void OpenGLContext::makeCurrent()
 {
 #if defined( WNT )
-if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+if (wglGetCurrentContext() == m_aGLWin.hRC)
+{
+SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting 
the same context);
+}
+else if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
 {
 SAL_WARN(vcl.opengl, OpenGLContext::makeCurrent(): wglMakeCurrent 
failed:   GetLastError());
 }
@@ -1102,7 +1106,11 @@ void OpenGLContext::makeCurrent()
 #elif defined( IOS ) || defined( ANDROID )
 // nothing
 #elif defined( UNX )
-if (!glXMakeCurrent( m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix : 
m_aGLWin.win, m_aGLWin.ctx ))
+if (glXGetCurrentContext() == m_aGLWin.ctx)
+{
+SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting 
the same context);
+}
+else if (!glXMakeCurrent( m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix : 
m_aGLWin.win, m_aGLWin.ctx ))
 SAL_WARN(vcl.opengl, OpenGLContext::makeCurrent failed);
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/opengl/OpenGLContext.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 5b14cd7d8d293365ebc03ee1442610180c07ab8d
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Nov 17 21:51:50 2014 +

vcl: make OpenGLContext::makeCurrent unfeasibly faster.

Don't set the same context if it is already set. Apparently this is
something that is unbelievably costly on Windows, and very costly on
Linux. Instead check if the context is already set, and don't re-set it.

Change-Id: If4fed3e555e1388031446be76d6fdfde5b9f13e5

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 4cde114..e7f7f71 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1073,7 +1073,11 @@ SystemWindowData 
OpenGLContext::generateWinData(vcl::Window* pParent, bool)
 void OpenGLContext::makeCurrent()
 {
 #if defined( WNT )
-if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+if (wglGetCurrentContext() == m_aGLWin.hRC)
+{
+SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting 
the same context);
+}
+else if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
 {
 SAL_WARN(vcl.opengl, OpenGLContext::makeCurrent(): wglMakeCurrent 
failed:   GetLastError());
 }
@@ -1083,7 +1087,11 @@ void OpenGLContext::makeCurrent()
 #elif defined( IOS ) || defined( ANDROID )
 // nothing
 #elif defined( UNX )
-if (!glXMakeCurrent( m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix : 
m_aGLWin.win, m_aGLWin.ctx ))
+if (glXGetCurrentContext() == m_aGLWin.ctx)
+{
+SAL_INFO(vcl.opengl, OpenGLContext::makeCurrent(): Avoid setting 
the same context);
+}
+else if (!glXMakeCurrent( m_aGLWin.dpy, mbPixmap ? m_aGLWin.glPix : 
m_aGLWin.win, m_aGLWin.ctx ))
 SAL_WARN(vcl.opengl, OpenGLContext::makeCurrent failed);
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 4 commits - solenv/gbuild vcl/inc vcl/source vcl/win

 solenv/gbuild/ExternalProject.mk|1 
 vcl/inc/win/saldata.hxx |2 
 vcl/source/opengl/OpenGLContext.cxx |   21 +++---
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/win/source/gdi/winlayout.cxx|8 +--
 vcl/win/source/window/salframe.cxx  |   73 
 6 files changed, 40 insertions(+), 67 deletions(-)

New commits:
commit 9368d7474263460e33d2047ffa9f6cc97f3b997d
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Nov 17 16:37:50 2014 +0100

windows opengl: Use the updated DrawMask to get nice text with OpenGL.

Change-Id: Ie4f08575848e76159af86d44e10f24fa383930fb

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7f6fdc9..1d461e6 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -243,13 +243,11 @@ void WinLayout::DrawText(SalGraphics rGraphics) const
 aRects.mnDestWidth = width;
 aRects.mnDestHeight = height;
 
-pImpl-PreDraw();
 COLORREF color = GetTextColor(hDC);
 SalColor salColor = MAKE_SALCOLOR(GetRValue(color), 
GetGValue(color), GetBValue(color));
-// TODO when we have it:
-// pImpl-DrawSolidColorWithMask(salColor, aTexture, aRects);
-// and kill the following interim thing:
-pImpl-DrawTexture(aTexture, aRects);
+
+pImpl-PreDraw();
+pImpl-DrawMask(aTexture, salColor, aRects);
 pImpl-PostDraw();
 }
 
commit bb92f43374d09206151c9640811bc28dfb2d94e4
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Nov 17 12:29:56 2014 +0100

windows: Improve logging.

Change-Id: I15e6d240b3c94af07e9b39cc16efb581869729f2

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index e1ae8cc..2c0731e 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -183,7 +183,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM l
 void EmitTimerCallback();
 
 void SalTestMouseLeave();
-bool ImplWriteLastError( DWORD lastError, const char *szApiCall );
+void ImplWriteLastError(DWORD lastError, const char *szApiCall);
 
 long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM 
lParam );
 long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam );
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index b803fd6..cc1264b 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -23,6 +23,10 @@
 #include postmac.h
 #endif
 
+#if defined( WNT )
+#include win/saldata.hxx
+#endif
+
 using namespace com::sun::star;
 
 #if defined( UNX )  !defined MACOSX  !defined IOS  !defined ANDROID
@@ -200,8 +204,6 @@ bool WGLisExtensionSupported(const char *extension)
 if ((p==supported || p[-1]==' ')  (p[extlen]=='\0' || p[extlen]==' 
'))
 return 1; // Match
 }
-
-CHECK_GL_ERROR();
 }
 
 bool InitMultisample(PIXELFORMATDESCRIPTOR pfd, int rPixelFormat,
@@ -767,7 +769,8 @@ bool OpenGLContext::init(HDC hDC, HWND hWnd)
 bool OpenGLContext::ImplInit()
 {
 SAL_INFO(vcl.opengl, OpenGLContext::ImplInitstart);
-PIXELFORMATDESCRIPTOR PixelFormatFront = // PixelFormat Tells Windows How 
We Want Things To Be
+// PixelFormat tells Windows how we want things to be
+PIXELFORMATDESCRIPTOR PixelFormatFront =
 {
 sizeof(PIXELFORMATDESCRIPTOR),
 1,  // Version Number
@@ -815,17 +818,25 @@ bool OpenGLContext::ImplInit()
 return false;
 }
 
-SetPixelFormat(m_aGLWin.hDC, WindowPix, PixelFormatFront);
+if (!SetPixelFormat(m_aGLWin.hDC, WindowPix, PixelFormatFront))
+{
+ImplWriteLastError(GetLastError(), SetPixelFormat in 
OpenGLContext::ImplInit);
+SAL_WARN(vcl.opengl, SetPixelFormat failed);
+return false;
+}
+
 m_aGLWin.hRC = wglCreateContext(m_aGLWin.hDC);
 if (m_aGLWin.hRC == NULL)
 {
+ImplWriteLastError(GetLastError(), wglCreateContext in 
OpenGLContext::ImplInit);
 SAL_WARN(vcl.opengl, wglCreateContext failed);
 return false;
 }
 
 if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
 {
-SAL_WARN(vcl.opengl, wglMakeCurrent failed:   GetLastError());
+ImplWriteLastError(GetLastError(), wglMakeCurrent in 
OpenGLContext::ImplInit);
+SAL_WARN(vcl.opengl, wglMakeCurrent failed);
 return false;
 }
 
diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index d42b0f5..d2fef8f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5974,64 +5974,27 @@ bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM 
wParam, LPARAM lParam, LR
 return bResult;
 }
 
-bool ImplWriteLastError( DWORD lastError, const char *szApiCall )
+void ImplWriteLastError(DWORD lastError, const char *szApiCall)
 {
-static

[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - vcl/opengl

2014-11-17 Thread Louis-Francis Ratté-Boulianne

 vcl/opengl/gdiimpl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 053b01fa6533ccd62b1bd184f0c7f9e42422cb8c
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 17:36:42 2014 -0500

vcl: Unbind framebuffer after setting offscreen mode

Change-Id: I057b148f51c8f011cb013e1f06288aec4d9bdb2a

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index c9f8d4e..bfa4b1f 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -292,6 +292,7 @@ void OpenGLSalGraphicsImpl::SetOffscreen( bool bOffscreen )
 glBindFramebuffer( GL_FRAMEBUFFER, mnFramebufferId );
 maOffscreenTex = OpenGLTexture( GetWidth(), GetHeight() );
 glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, 
GL_TEXTURE_2D, maOffscreenTex.Id(), 0 );
+glBindFramebuffer( GL_FRAMEBUFFER, 0 );
 }
 
 CHECK_GL_ERROR();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source

 sc/inc/column.hxx   |3 -
 sc/inc/table.hxx|3 -
 sc/source/core/data/column3.cxx |   22 
 sc/source/core/data/column4.cxx |   93 
 sc/source/core/data/document.cxx|9 ++-
 sc/source/core/data/formulacell.cxx |6 ++
 sc/source/core/data/table2.cxx  |5 +
 7 files changed, 113 insertions(+), 28 deletions(-)

New commits:
commit dc3a21333fc9c0f98385ccc54035512c5a73dac9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 17:37:07 2014 -0500

Use group-area listeners during copy  paste if we can.

This should reduce the number of area listeners generated esp. when
replicating tons of formula cells down the column.

Change-Id: I1ea8f51f667e6b0e1a646f84d79f5e8430b478d5

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 86dbd39..6d8b091 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -255,7 +255,8 @@ public:
 void CopyFromClip(
 sc::CopyFromClipContext rCxt, SCROW nRow1, SCROW nRow2, long nDy, 
ScColumn rColumn );
 
-void StartListeningInArea( sc::StartListeningContext rCxt, SCROW nRow1, 
SCROW nRow2 );
+void StartListeningInArea(
+sc::StartListeningContext rStartCxt, sc::EndListeningContext 
rEndCxt, SCROW nRow1, SCROW nRow2 );
 
 voidRemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
 
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index ea1e2a3..b1e06e1 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -437,7 +437,8 @@ public:
 SCsCOL nDx, SCsROW nDy, ScTable* pTable );
 
 void StartListeningInArea(
-sc::StartListeningContext rCxt, SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2 );
+sc::StartListeningContext rStartCxt, sc::EndListeningContext rEndCxt,
+SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
 
 void SetDirtyFromClip(
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sc::ColumnSpanSet 
rBroadcastSpans );
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 73c0311..b2a115f 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1535,28 +1535,6 @@ void ScColumn::StartNeededListeners()
 
 namespace {
 
-class StartListeningInAreaHandler
-{
-sc::StartListeningContext mrCxt;
-public:
-StartListeningInAreaHandler(sc::StartListeningContext rCxt) : mrCxt(rCxt) 
{}
-
-void operator() (size_t /*nRow*/, ScFormulaCell* p)
-{
-p-StartListeningTo(mrCxt);
-}
-};
-
-}
-
-void ScColumn::StartListeningInArea( sc::StartListeningContext rCxt, SCROW 
nRow1, SCROW nRow2 )
-{
-StartListeningInAreaHandler aFunc(rCxt);
-sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
-}
-
-namespace {
-
 void applyTextNumFormat( ScColumn rCol, SCROW nRow, SvNumberFormatter* 
pFormatter )
 {
 sal_uInt32 nFormat = pFormatter-GetStandardFormat(NUMBERFORMAT_TEXT);
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index f0d28eb..925bb4c 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1135,4 +1135,97 @@ bool ScColumn::HasFormulaCell( SCROW nRow1, SCROW nRow2 
) const
 return aRet.first != maCells.end();
 }
 
+namespace {
+
+class StartListeningInAreaHandler
+{
+sc::StartListeningContext mrStartCxt;
+sc::EndListeningContext mrEndCxt;
+
+public:
+StartListeningInAreaHandler( sc::StartListeningContext rStartCxt, 
sc::EndListeningContext rEndCxt ) :
+mrStartCxt(rStartCxt), mrEndCxt(rEndCxt) {}
+
+void operator() ( const sc::CellStoreType::value_type node, size_t 
nOffset, size_t nDataSize )
+{
+if (node.type != sc::element_type_formula)
+// We are only interested in formulas.
+return;
+
+ScFormulaCell** ppBeg = sc::formula_block::at(*node.data, nOffset);
+ScFormulaCell** ppEnd = ppBeg + nDataSize;
+
+ScFormulaCell** pp = ppBeg;
+
+// If the first formula cell belongs to a group and it's not the top
+// cell, move up to the top cell of the group, and have all the extra
+// formula cells stop listening.
+
+ScFormulaCell* pFC = *pp;
+if (pFC-IsShared()  !pFC-IsSharedTop())
+{
+SCROW nBackTrackSize = pFC-aPos.Row() - pFC-GetSharedTopRow();
+if (nBackTrackSize  0)
+{
+assert(static_castsize_t(nBackTrackSize) = nOffset);
+for (SCROW i = 0; i  nBackTrackSize; ++i)
+--pp;
+endListening(pp, ppBeg);
+}
+}
+
+for (; pp != ppEnd; ++pp)
+{
+pFC = *pp;
+
+if (!pFC-IsSharedTop())
+{
+pFC-StartListeningTo(mrStartCxt);
+continue;
+}
+
+// If This is the last group in the range, see if the group
+// extends beyond the range, in which

[Libreoffice-commits] core.git: 6 commits - vcl/inc vcl/opengl vcl/Package_opengl.mk vcl/source

 vcl/Package_opengl.mk  |1 
 vcl/inc/opengl/salbmp.hxx  |2 
 vcl/inc/opengl/win/gdiimpl.hxx |1 
 vcl/inc/opengl/x11/gdiimpl.hxx |1 
 vcl/inc/openglgdiimpl.hxx  |   16 ++
 vcl/opengl/gdiimpl.cxx |  174 ++---
 vcl/opengl/maskFragmentShader.glsl |   10 -
 vcl/opengl/salbmp.cxx  |   31 +++-
 vcl/opengl/transformedTextureVertexShader.glsl |   24 +++
 vcl/opengl/win/gdiimpl.cxx |6 
 vcl/opengl/x11/gdiimpl.cxx |6 
 vcl/source/opengl/OpenGLContext.cxx|   27 +++
 12 files changed, 262 insertions(+), 37 deletions(-)

New commits:
commit 414c2e2d5ae4c47865adf0338ef7e117fbb8775e
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Nov 17 21:07:27 2014 +

vcl: initialize data when XGetWindowAttributes fails.

Change-Id: If6fc99483c06efec9a600226a09ead9a3f6dab59

diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index e7f7f71..33a019d 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -463,7 +463,12 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int 
nBestFBC, bool bUseDoubl
 SAL_INFO(vcl.opengl, window:   win);
 
 XWindowAttributes xattr;
-XGetWindowAttributes( dpy, win, xattr );
+if( !XGetWindowAttributes( dpy, win, xattr ) )
+{
+SAL_WARN(vcl.opengl, Failed to get window attributes for fbconfig  
 win);
+xattr.screen = 0;
+xattr.visual = NULL;
+}
 
 int screen = XScreenNumberOfScreen( xattr.screen );
 
@@ -535,7 +540,11 @@ Visual* getVisual(Display* dpy, Window win)
 initOpenGLFunctionPointers();
 
 XWindowAttributes xattr;
-XGetWindowAttributes( dpy, win, xattr );
+if( !XGetWindowAttributes( dpy, win, xattr ) )
+{
+SAL_WARN(vcl.opengl, Failed to get window attributes for getVisual 
  win);
+xattr.visual = NULL;
+}
 SAL_INFO(vcl.opengl, using VisualID   xattr.visual);
 return xattr.visual;
 }
@@ -694,9 +703,17 @@ bool OpenGLContext::ImplInit()
 SAL_INFO(vcl.opengl, available GL  extensions:   
m_aGLWin.GLExtensions);
 
 XWindowAttributes xWinAttr;
-XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, xWinAttr );
-m_aGLWin.Width = xWinAttr.width;
-m_aGLWin.Height = xWinAttr.height;
+if( !XGetWindowAttributes( m_aGLWin.dpy, m_aGLWin.win, xWinAttr ) )
+{
+SAL_WARN(vcl.opengl, Failed to get window attributes on   
m_aGLWin.win);
+m_aGLWin.Width = 0;
+m_aGLWin.Height = 0;
+}
+else
+{
+m_aGLWin.Width = xWinAttr.width;
+m_aGLWin.Height = xWinAttr.height;
+}
 
 if( m_aGLWin.HasGLXExtension(GLX_SGI_swap_control ) )
 {
commit 1c20a126d43ca34332f050f6eb847621de99e1b0
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Nov 17 20:33:41 2014 +

vcl: only use default windows' GL Context for bitmaps if NULL / 
uninitialized.

Change-Id: I6465c548ba5d50da2cca7cce24e9bd2a20b28f47

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 780c268..15ef1b3 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -464,14 +464,17 @@ sal_uInt16 OpenGLSalBitmap::GetBitCount() const
 
 bool OpenGLSalBitmap::makeCurrent()
 {
-OpenGLContextProvider *pProvider;
-pProvider = dynamic_cast OpenGLContextProvider* ( 
ImplGetDefaultWindow()-GetGraphics() );
-if( pProvider == NULL )
+if (!mpContext || !mpContext-isInitialized())
 {
-SAL_WARN( vcl.opengl, Couldn't get default OpenGL context provider 
);
-return false;
+OpenGLContextProvider *pProvider;
+pProvider = dynamic_cast OpenGLContextProvider* ( 
ImplGetDefaultWindow()-GetGraphics() );
+if( pProvider == NULL )
+{
+SAL_WARN( vcl.opengl, Couldn't get default OpenGL context 
provider );
+return false;
+}
+mpContext = pProvider-GetOpenGLContext();
 }
-mpContext = pProvider-GetOpenGLContext();
 mpContext-makeCurrent();
 return true;
 }
commit 95017eaf851c6b97db38cd226b6bea661e73dc60
Author: Louis-Francis RattÃ©-Boulianne l...@collabora.com
Date:   Mon Nov 17 10:00:33 2014 -0500

vcl: Fix DrawMask implementation in OpenGL backend

Change-Id: Idc0bedaba5a4cea351f131d402c2b1093ac1c53c

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 339f3c6..ab6b95f 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -406,7 +406,7 @@ bool OpenGLSalGraphicsImpl::CreateMaskProgram( void )
 glBindAttribLocation( mnMaskProgram, GL_ATTRIB_POS, position );
 glBindAttribLocation( mnMaskProgram, GL_ATTRIB_TEX, tex_coord_in );
 mnMaskUniform = glGetUniformLocation( mnMaskProgram, sampler );
-mnMaskColorUniform = glGetUniformLocation( mnMaskProgram, mask );
+

Re: Questions about bool or sal_Bool in Any::setValue, makeAny

2014-11-17 Thread Matteo Casalin


On 11/17/2014 10:39 PM, Michael Stahl wrote:

On 16.11.2014 19:57, Matteo Casalin wrote:

Hi all,
  I was converting all sw call-places to Any::setValue that pass
sal_Bool to use bool instead. I wonder if this is a good choice or not,
is there any guideline?


it looks like the Any has specific support for C++ bool so it should
work fine.


I confirm that the code compiles fine (on Linux x86_64), so I'll proceed 
with these changes.





Also some of these call places look like:

  sal_Bool bTrue = sal_True;
  uno::Any aVal(bTrue, ::getBooleanCppuType());
  some_function_call( aVal );

or

  uno::Any aAny;
  sal_Bool bFalse = sal_False;
  aTmp.setValue(bFalse, ::getBooleanCppuType()  );
  some_function_call( aTmp );

could these be changed to use makeAny(bool)? Does this hold also if the
same Any object is used multiple times (each time calling setValue on it)?


it's much better to use a type-safe method like makeAny() or operator=
and not the Any::setValue()/getValue() methods that operate on unsafe void*.



Thank you Michael for the hints.
I will work on a patch that does both bool and makeAny (or =) and 
submit it to gerrit for a final review.


Matteo


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



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

[Libreoffice-commits] core.git: Branch 'feature/perfwork5' - sc/inc sc/source

 sc/inc/column.hxx|2 +-
 sc/inc/table.hxx |2 +-
 sc/source/core/data/column4.cxx  |8 
 sc/source/core/data/document.cxx |2 +-
 sc/source/core/data/table2.cxx   |4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 218ab60cf1dc9a01a8f8bb49c7be1762595d5ffe
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Nov 17 18:35:53 2014 -0500

Rename these to make it clear that they are only to be called from ...

ScDocument::CopyFromClip.

Change-Id: Ia95b65ca7982735b9c217a7b60d194117d64e774

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 6d8b091..5a0f70c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -255,7 +255,7 @@ public:
 void CopyFromClip(
 sc::CopyFromClipContext rCxt, SCROW nRow1, SCROW nRow2, long nDy, 
ScColumn rColumn );
 
-void StartListeningInArea(
+void StartListeningFromClip(
 sc::StartListeningContext rStartCxt, sc::EndListeningContext 
rEndCxt, SCROW nRow1, SCROW nRow2 );
 
 voidRemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b1e06e1..7d802e3 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -436,7 +436,7 @@ public:
 sc::CopyFromClipContext rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
 SCsCOL nDx, SCsROW nDy, ScTable* pTable );
 
-void StartListeningInArea(
+void StartListeningFromClip(
 sc::StartListeningContext rStartCxt, sc::EndListeningContext rEndCxt,
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 );
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 925bb4c..40f18bf 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1137,13 +1137,13 @@ bool ScColumn::HasFormulaCell( SCROW nRow1, SCROW nRow2 
) const
 
 namespace {
 
-class StartListeningInAreaHandler
+class StartListeningFromClipHandler
 {
 sc::StartListeningContext mrStartCxt;
 sc::EndListeningContext mrEndCxt;
 
 public:
-StartListeningInAreaHandler( sc::StartListeningContext rStartCxt, 
sc::EndListeningContext rEndCxt ) :
+StartListeningFromClipHandler( sc::StartListeningContext rStartCxt, 
sc::EndListeningContext rEndCxt ) :
 mrStartCxt(rStartCxt), mrEndCxt(rEndCxt) {}
 
 void operator() ( const sc::CellStoreType::value_type node, size_t 
nOffset, size_t nDataSize )
@@ -1221,10 +1221,10 @@ private:
 
 }
 
-void ScColumn::StartListeningInArea(
+void ScColumn::StartListeningFromClip(
 sc::StartListeningContext rStartCxt, sc::EndListeningContext rEndCxt, 
SCROW nRow1, SCROW nRow2 )
 {
-StartListeningInAreaHandler aFunc(rStartCxt, rEndCxt);
+StartListeningFromClipHandler aFunc(rStartCxt, rEndCxt);
 sc::ProcessBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
 }
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 77e57aa..d6bb230 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2430,7 +2430,7 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, 
SCROW nRow1,
 ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
 for (; itr != itrEnd  *itr  nMax; ++itr)
 if (maTabs[*itr])
-maTabs[*itr]-StartListeningInArea(aStartCxt, aEndCxt, nCol1, 
nRow1, nCol2, nRow2);
+maTabs[*itr]-StartListeningFromClip(aStartCxt, aEndCxt, 
nCol1, nRow1, nCol2, nRow2);
 }
 }
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index b6f1441..6a4647c 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1059,7 +1059,7 @@ void ScTable::SetDirtyFromClip(
 aCol[i].SetDirtyFromClip(nRow1, nRow2, rBroadcastSpans);
 }
 
-void ScTable::StartListeningInArea(
+void ScTable::StartListeningFromClip(
 sc::StartListeningContext rStartCxt, sc::EndListeningContext rEndCxt,
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
 {
@@ -1067,7 +1067,7 @@ void ScTable::StartListeningInArea(
 if (nRow2  MAXROW) nRow2 = MAXROW;
 if (ValidColRow(nCol1, nRow1)  ValidColRow(nCol2, nRow2))
 for (SCCOL i = nCol1; i = nCol2; i++)
-aCol[i].StartListeningInArea(rStartCxt, rEndCxt, nRow1, nRow2);
+aCol[i].StartListeningFromClip(rStartCxt, rEndCxt, nRow1, nRow2);
 }
 
 void ScTable::CopyToTable(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Chris Sherlock

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b8f49366a4d37343245382ff90c74b4166d2ab3
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Nov 18 10:34:55 2014 +1100

officecfg, opencl, calc: readd comment detailing what the OpenCL values 
mean.

Change-Id: I8acff5eb524de477935d06942ab0c9335fbc50ff

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 31395a9..b31a2e1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1371,6 +1371,7 @@
 descThe list of operator and function opcodes for which to use 
OpenCL. If a
formula contains only these operators and functions, it
might be calculated using OpenCL./desc
+  !-- numeric values correspond to 
RAND;SIN;COS;TAN;ATAN;EXP;LN;SQRT;NORMSINV;ROUND;POWER;SUBPRODUCT;PROUDCT;NORMDIST;MIN;MAX;SUM;AVERAGE;SUMIFS
 --
   /info
   
value66;82;83;84;88;102;103;104;149;204;209;213;222;223;224;225;226;236;403/value
 /prop
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-17 Thread Chris Sherlock

 vcl/source/gdi/impanmvw.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f1be97ffb10f298f3d9805a685d99eb948b4732
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Nov 18 10:40:43 2014 +1100

vcl: fix tab spacing in ImpAnimView class definition

Change-Id: Ic9863ba0d57e4505ce182c5ccc7855f4797784de

diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index 82e61e3..bf3545b 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.hxx
@@ -42,10 +42,10 @@ private:
 SizemaDispSz;
 SizemaRestSz;
 MapMode maMap;
-vcl::Region  maClip;
+vcl::Region maClip;
 VirtualDevice*  mpBackground;
 VirtualDevice*  mpRestore;
-sal_uLong   mnActPos;
+sal_uLong   mnActPos;
 DisposalmeLastDisposal;
 boolmbPause;
 boolmbMarked;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - bin/update_pch.sh solenv/gbuild vcl/inc vcl/source vcl/win