date:20160623

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

2016-06-23 Thread Stephan Bergmann

 include/vcl/button.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c0ec592ca65e844132be24b20a0c9daffe5f3a6d
Author: Stephan Bergmann 
Date:   Fri Jun 24 08:54:36 2016 +0200

Define functions as deleted

Change-Id: I8227c439a9d74283d108514cdd349b9e534342f7

diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index a020bd6..1bd740c 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -133,9 +133,9 @@ protected:
 SAL_DLLPRIVATE boolIsSymbol() const { return ( (meSymbol != 
SymbolType::DONTKNOW) && (meSymbol != SymbolType::IMAGE) ); }
 SAL_DLLPRIVATE boolIsImage() const { return 
Button::HasImage(); }
 
-// Copy assignment is forbidden and not implemented.
-SAL_DLLPRIVATE PushButton( const PushButton & );
-SAL_DLLPRIVATE PushButton& operator=( const PushButton & );
+   PushButton( const PushButton & ) = delete;
+   PushButton& operator=( const PushButton & )
+   = delete;
 
 SAL_DLLPRIVATE voidImplInit( vcl::Window* pParent, WinBits 
nStyle );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Stephan Bergmann

 include/svtools/genericunodialog.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 11e72223f2a4ac424309bef34268b6ff5821cda8
Author: Stephan Bergmann 
Date:   Fri Jun 24 08:53:31 2016 +0200

-Werror,-Wunused-private-field

Change-Id: I27a139506a9a88a00031958f6569eccb51375ef1

diff --git a/include/svtools/genericunodialog.hxx 
b/include/svtools/genericunodialog.hxx
index 3111f33..a651471 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -68,9 +68,6 @@ namespace svt
 ,public ::comphelper::OMutexAndBroadcastHelper
 ,public ::comphelper::OPropertyContainer
 {
-private:
-::osl::Mutexm_aExecutionMutex;  /// access safety 
for execute/cancel
-
 protected:
 VclPtr  m_pDialog;  /// the dialog 
to execute
 boolm_bExecuting : 1;   /// we're 
currently executing the dialog
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Stephan Bergmann

 include/svtools/tabbar.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c3cdaa39505d85d530d848128d5370f97b57a411
Author: Stephan Bergmann 
Date:   Fri Jun 24 08:51:54 2016 +0200

-Werror,-Wunused-private-field

Change-Id: I06019eb424850f7e49447a6869950734dfc1f640

diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 57f4950..a83d78d 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -302,8 +302,6 @@ private:
 std::unique_ptr mpImpl;
 
 OUStringmaEditText;
-Color   maSelColor;
-Color   maSelTextColor;
 SizemaWinSize;
 longmnMaxPageWidth;
 longmnCurMaxWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Noel Grandin

 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx  |3 -
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx  |1 
 xmloff/inc/XMLImageMapExport.hxx   |2 
 xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx  |2 
 xmloff/inc/txtvfldi.hxx|3 -
 xmloff/source/chart/ColorPropertySet.cxx   |3 -
 xmloff/source/chart/ColorPropertySet.hxx   |1 
 xmloff/source/draw/XMLImageMapExport.cxx   |   13 ++---
 xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx |   24 +-
 xmloff/source/text/XMLPropertyBackpatcher.cxx  |   31 +
 xmloff/source/text/XMLPropertyBackpatcher.hxx  |8 ---
 xmloff/source/text/txtvfldi.cxx|9 +--
 xmloff/source/transform/FormPropOOoTContext.cxx|   19 ---
 13 files changed, 21 insertions(+), 98 deletions(-)

New commits:
commit 6a5e30d52c345cbeb89eab0722fe866db0d62fc6
Author: Noel Grandin 
Date:   Thu Jun 23 11:06:14 2016 +0200

loplugin:singlevalfields in xmlhelp,xmloff

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

diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx 
b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 8046a77..9858740 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -38,7 +38,6 @@ ResultSetBase::ResultSetBase( const uno::Reference< 
uno::XComponentContext >&  r
   m_xProvider( xProvider ),
   m_nRow( -1 ),
   m_nWasNull( true ),
-  m_bRowCountFinal( true ),
   m_sProperty( seq ),
   m_pDisposeEventListeners( nullptr ),
   m_pRowCountListeners( nullptr ),
@@ -498,7 +497,7 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
 {
 if( PropertyName == "IsRowCountFinal" )
 {
-return uno::Any(m_bRowCountFinal);
+return uno::Any(true);
 }
 else if ( PropertyName == "RowCount" )
 {
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx 
b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 56a591b..4d6d36e 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -487,7 +487,6 @@ namespace chelp {
 css::uno::Reference< css::ucb::XContentProvider >  m_xProvider;
 sal_Int32   m_nRow;
 boolm_nWasNull;
-boolm_bRowCountFinal;
 
 typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier 
> > IdentSet;
 typedef std::vector< css::uno::Reference< css::sdbc::XRow > >  
ItemSet;
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index ada29c3..db7ab92 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -49,8 +49,6 @@ class XMLImageMapExport
 
 SvXMLExport& mrExport;
 
-bool mbWhiteSpace;  /// use whitespace between image map elements?
-
 public:
 XMLImageMapExport(SvXMLExport& rExport);
 
diff --git a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx 
b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
index 152d866..9aeaea3 100644
--- a/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
+++ b/xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx
@@ -27,8 +27,6 @@
 */
 class XMLPercentOrMeasurePropertyHandler : public XMLPropertyHandler
 {
-private:
-bool mbPercent;
 public:
 XMLPercentOrMeasurePropertyHandler();
 virtual ~XMLPercentOrMeasurePropertyHandler ();
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index a92f6bc..168d937 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -61,9 +61,6 @@ class XMLValueImportHelper
 const bool bSetStyle;   /// should PrepareField set NumberFormat?
 const bool bSetFormula; /// should PrepareField set Formula?
 
-const bool bStringDefault;  /// default: string-value = content
-const bool bFormulaDefault; /// default: formula = content
-
 public:
 XMLValueImportHelper(
 SvXMLImport& rImprt,/// XML Import
diff --git a/xmloff/source/chart/ColorPropertySet.cxx 
b/xmloff/source/chart/ColorPropertySet.cxx
index a14eeec..cba1746 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -88,7 +88,6 @@ ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
 // note: length of FillColor and LineColor is 9
 m_aColorPropName( "FillColor", 9, RTL_TEXTENCODING_ASCII_US ),
 m_nColor( nColor ),
-m_bIsFillColor( true ),
 m_nDefaultColor( 0x0099ccff )  // blue 8
 {}
 
@@ -101,7 +100,7 @@ Reference< XPropertySetInfo > SAL_CALL 
ColorPropertySet::getPropertySetInfo()

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

2016-06-23 Thread Noel Grandin

 include/svtools/ServerDetailsControls.hxx|1 
 include/svtools/calendar.hxx |2 
 include/svtools/filectrl.hxx |1 
 include/svtools/genericunodialog.hxx |1 
 include/svtools/ivctrl.hxx   |3 
 include/svtools/javacontext.hxx  |1 
 include/svtools/parrtf.hxx   |3 
 include/svtools/svparser.hxx |   10 -
 include/svtools/tabbar.hxx   |2 
 include/svtools/transfer.hxx |2 
 include/svtools/valueset.hxx |1 
 include/svtools/viewdataentry.hxx|2 
 sd/source/ui/dlg/sdtreelb.cxx|1 
 sd/source/ui/view/sdview2.cxx|1 
 sfx2/source/doc/objembed.cxx |1 
 sfx2/source/doc/sfxbasemodel.cxx |1 
 svtools/source/brwbox/datwin.cxx |   12 -
 svtools/source/brwbox/datwin.hxx |2 
 svtools/source/config/accessibilityoptions.cxx   |3 
 svtools/source/config/colorcfg.cxx   |   11 -
 svtools/source/config/extcolorcfg.cxx|   11 -
 svtools/source/contnr/fileview.cxx   |4 
 svtools/source/contnr/iconview.cxx   |2 
 svtools/source/contnr/imivctl1.cxx   |   16 -
 svtools/source/contnr/ivctrl.cxx |4 
 svtools/source/contnr/treelistbox.cxx|   15 -
 svtools/source/contnr/viewdataentry.cxx  |2 
 svtools/source/control/calendar.cxx  |   14 -
 svtools/source/control/filectrl.cxx  |1 
 svtools/source/control/tabbar.cxx|  204 ++-
 svtools/source/control/valueset.cxx  |   40 +---
 svtools/source/dialogs/ServerDetailsControls.cxx |5 
 svtools/source/filter/exportdialog.cxx   |7 
 svtools/source/filter/exportdialog.hxx   |1 
 svtools/source/graphic/descriptor.cxx|7 
 svtools/source/graphic/descriptor.hxx|1 
 svtools/source/hatchwindow/ipwin.cxx |   29 +--
 svtools/source/hatchwindow/ipwin.hxx |1 
 svtools/source/java/javacontext.cxx  |5 
 svtools/source/misc/embedtransfer.cxx|1 
 svtools/source/svrtf/parrtf.cxx  |2 
 svtools/source/svrtf/svparser.cxx|6 
 svtools/source/uno/genericunodialog.cxx  |8 
 sw/source/uibase/dochdl/swdtflvr.cxx |3 
 44 files changed, 138 insertions(+), 312 deletions(-)

New commits:
commit 24ca187b6370ca56c8acd92bc405028dd9deb5f2
Author: Noel Grandin 
Date:   Thu Jun 23 15:43:34 2016 +0200

loplugin:singlevalfields in svtools

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

diff --git a/include/svtools/ServerDetailsControls.hxx 
b/include/svtools/ServerDetailsControls.hxx
index b6ceaa2..aaef76f 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -37,7 +37,6 @@ class DetailsContainer
 VclPtr  m_pFTPort;
 VclPtr   m_pEDRoot;
 VclPtr  m_pFTRoot;
-bool   m_bIsActive;
 
 public:
 DetailsContainer( VclBuilderContainer* pBuilder );
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index 12e60cf..144f782 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -190,7 +190,6 @@ private:
 WinBits mnWinStyle;
 sal_uInt16  mnFirstYear;
 sal_uInt16  mnLastYear;
-sal_uInt16  mnRequestYear;
 boolmbCalc:1,
 mbFormat:1,
 mbDrag:1,
@@ -203,7 +202,6 @@ private:
 mbPrevIn:1,
 mbNextIn:1,
 mbDirect:1,
-mbInSelChange:1,
 mbTravelSelect:1,
 mbScrollDateRange:1,
 mbSelLeft:1,
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index 1c677e8..1ba522d 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -47,7 +47,6 @@ private:
 VclPtr maButton;
 
 OUStringmaButtonText;
-boolmbOpenDlg;
 
 FileControlMode_InternalmnInternalFlags;
 
diff --git a/include/svtools/genericunodialog.hxx 
b/include/svtools/genericunodialog.hxx
index e14b1de..3111f33 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -74,7 +74,6 @@ namespace svt
 protected:
 VclPtr  m_pDialog;  /// the dialog 
to execute
 boolm_bExecuting : 1;   /// we're 
currently executing the dialog
-bool

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

2016-06-23 Thread Noel Grandin

 editeng/source/editeng/eertfpar.cxx |2 --
 editeng/source/editeng/eertfpar.hxx |2 --
 editeng/source/rtf/svxrtf.cxx   |1 -
 include/editeng/numitem.hxx |4 +---
 include/editeng/svxrtf.hxx  |1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit db12f068f849dc0e03d43ee6688ba342e985fa04
Author: Noel Grandin 
Date:   Thu Jun 23 14:45:22 2016 +0200

loplugin:singlevalfields in editeng

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

diff --git a/editeng/source/editeng/eertfpar.cxx 
b/editeng/source/editeng/eertfpar.cxx
index 3f81d4d..136b903 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -57,11 +57,9 @@ EditRTFParser::EditRTFParser(
 aRTFMapMode(MAP_TWIP)
 {
 aCurSel = aSel;
-eDestCharSet= RTL_TEXTENCODING_DONTKNOW;
 nDefFont= 0;
 nDefTab = 0;
 nLastAction = 0;
-nDefFontHeight  = 0;
 
 SetInsPos(EditPosition(mpEditEngine, &aCurSel));
 
diff --git a/editeng/source/editeng/eertfpar.hxx 
b/editeng/source/editeng/eertfpar.hxx
index 5416dd1..d58ccb6 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -34,13 +34,11 @@ class EditRTFParser : public SvxRTFParser
 private:
 EditSelection   aCurSel;
 EditEngine* mpEditEngine;
-rtl_TextEncodingeDestCharSet;
 MapMode aRTFMapMode;
 MapMode aEditMapMode;
 
 sal_uInt16  nDefFont;
 sal_uInt16  nDefTab;
-sal_uInt16  nDefFontHeight;
 sal_uInt8   nLastAction;
 
 protected:
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index c67fc84..a053a7e 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1345,7 +1345,6 @@ RTFPlainAttrMapIds::RTFPlainAttrMapIds( const 
SfxItemPool& rPool )
 nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, false );
 nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, false );
 nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, false );
-nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False );
 nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, false );
 nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, false );
 nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, false );
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 775e8f1..2d67dd1 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -317,7 +317,6 @@ class SvxNodeNum
 sal_uInt16 nLevelVal[ SVX_MAX_NUM ];// Numbers of all levels
 sal_uInt16 nSetValue;   // predetermined number
 sal_uInt8  nMyLevel; // Current Level
-bool   bStartNum; // Restart numbering
 
 public:
 explicit inline SvxNodeNum( sal_uInt16 nSetVal = USHRT_MAX );
@@ -331,7 +330,7 @@ public:
 };
 
 SvxNodeNum::SvxNodeNum( sal_uInt16 nSetVal )
-: nSetValue( nSetVal ), nMyLevel( 0 ), bStartNum( false )
+: nSetValue( nSetVal ), nMyLevel( 0 )
 {
 memset( nLevelVal, 0, sizeof( nLevelVal ) );
 }
@@ -342,7 +341,6 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& 
rCpy )
 {
 nSetValue = rCpy.nSetValue;
 nMyLevel = rCpy.nMyLevel;
-bStartNum = rCpy.bStartNum;
 
 memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) );
 }
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 66c3c54..45dd362 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -148,7 +148,6 @@ struct RTFPlainAttrMapIds
 nTwoLines,
 nCharScaleX,
 nHorzVert,
-nRuby,
 nRelief,
 nHidden
 ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Takeshi Abe

 starmath/inc/node.hxx |   24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit f02c1ca61c936ad555c33c16adf0ce9674c2
Author: Takeshi Abe 
Date:   Thu Jun 23 10:46:33 2016 +0900

starmath: IndexOfSubNode() is for SmStructureNode only

... not for the base class.

Change-Id: I9f6a6de93a4db964c8b019349049fdef4afaf224
Reviewed-on: https://gerrit.libreoffice.org/26583
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index bde97d5..f6f684d 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -205,17 +205,6 @@ public:
 mpParentNode = parent;
 }
 
-/** Get the index of a child node
- *
- * Returns -1, if pSubNode isn't a subnode of this.
- */
-int IndexOfSubNode(SmNode* pSubNode){
-sal_uInt16 nSize = GetNumSubNodes();
-for(sal_uInt16 i = 0; i < nSize; i++)
-if(pSubNode == GetSubNode(i))
-return i;
-return -1;
-}
 /** Set the token for this node */
 void SetToken(SmToken& token){
 maNodeToken = token;
@@ -313,6 +302,19 @@ public:
 
 virtual void  GetAccessibleText( OUStringBuffer &rText ) const override;
 
+/** Get the index of a child node
+ *
+ * Returns -1, if pSubNode isn't a subnode of this.
+ */
+int IndexOfSubNode(SmNode* pSubNode)
+{
+sal_uInt16 nSize = GetNumSubNodes();
+for(sal_uInt16 i = 0; i < nSize; i++)
+if(pSubNode == GetSubNode(i))
+return i;
+return -1;
+}
+
 void SetSubNode(size_t nIndex, SmNode* pNode)
 {
 size_t size = aSubNodes.size();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/minute.fods |  327 +
 sc/qa/unit/data/functions/fods/month.fods  | 1035 +
 2 files changed, 1235 insertions(+), 127 deletions(-)

New commits:
commit f4b8affe8f4bee197bf5ffb73d52fafee3e904db
Author: ZdenÄk Crhonek 
Date:   Fri Jun 10 22:07:59 2016 +0200

add MONTH  test case  (minute test case layout)

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

diff --git a/sc/qa/unit/data/functions/fods/minute.fods 
b/sc/qa/unit/data/functions/fods/minute.fods
index c4ac6e2..d27ec1e 100644
--- a/sc/qa/unit/data/functions/fods/minute.fods
+++ b/sc/qa/unit/data/functions/fods/minute.fods
@@ -47,7 +47,7 @@
true
   
  
- Sheet2
+ Sheet1
  1185
  0
  100
@@ -108,7 +108,7 @@
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
false
0
   
@@ -365,15 +365,6 @@
   
  
  
-  
-   
-  
-  
-   
-  
-  
-   
-  
   

   
@@ -395,16 +386,25 @@
   

   
-  
-   
+  
+   
+  
+  
+   
+  
+  
+   
   
   

   
   
-   
+   
   
   
+   
+  
+  

   
   
@@ -431,107 +431,180 @@
   

   
-  
-  
+  
+   
+   
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+   
+   
+  
+  
+  



   
-  
+  



   
-  
+  



   
-  
+  


   
-  
+  





   
-  
+  





   
-  
+  





   
-  
+  


   
-  
+  



   
-  
+  

   
-  
+  

   
-  
+  


   
-  
+  





   
-  
+  





   
-  
+  





   
-  
+  





   
-  
+  

   
-  
-  
-  
+  
+  
+  

   
-  
+  


   
-  
+  

   
   
@@ -577,7 +650,7 @@
  ??? 
(???)
 
 
- 00.00., 00:00:00
+ 00.00., 00:00:00
 


@@ -592,23 +665,23 @@


 
-
-
-
-
- 
-  YEAR Function
+
+
+
+
+ 
+  MINUTE Function
  
  
 
 
  
 
-
- 
+
+ 
   Result
  
- 
+ 
   PRAVDA
  
  
@@ -616,14 +689,14 @@
 
  
 
-
- 
+
+ 
   Sheet
  
- 
+ 
   Result
  
- 
+ 
   Description
  
 
@@ -631,26 +704,26 @@
  
   1
  
- 
+ 
   PRAVDA
  
  
-  Simple YEAR formulas with local references and values
+  Simple MINUTE formulas with local references and values
  
 
 
  
- 
+ 
  
 
 
  
- 
- 
+ 
+ 
 
 
  
- 
+ 
  
 
 
@@ -676,58 +749,58 @@
 
 
 
-
+
 
 
 
 
 
 
- 
+ 
   Function
  
- 
+ 
   Expected
  
- 
+ 
   Correct
  
- 
+ 
   FunctionString
  
- 
+ 
   Comment
  
  
- 
+ 
  
 
 
- 
+ 
   0
  
  
   0
  
- 
+ 
   PRAVDA
  
- 
+ 
   =MINUTE(1)
  
  
 
 
- 
+ 
   55
  
  
   55
  
- 
+ 
   PRAVDA
  
- 
+ 
   =MINUTE(J3)
  
  
@@ -743,10 +816,10 @@
  
   0
  
- 
+ 
   PRAVDA
  
- 
+ 
   =MINUTE(one)
  
  
@@ -762,10 +835,10 @@
  
   0
  
- 
+ 
   PRAVDA
  
- 
+

[Libreoffice-commits] core.git: vcl/vcl.windows.component

2016-06-23 Thread Markus Mohrhard

 vcl/vcl.windows.component |4 
 1 file changed, 4 insertions(+)

New commits:
commit 259fd2c0abd5627ac5689c752a57edc045dbfcfa
Author: Markus Mohrhard 
Date:   Fri Jun 24 01:35:24 2016 +0200

uitest: make the testing available on windows as well

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

diff --git a/vcl/vcl.windows.component b/vcl/vcl.windows.component
index 088c4a2..2d5b8bb 100644
--- a/vcl/vcl.windows.component
+++ b/vcl/vcl.windows.component
@@ -25,4 +25,8 @@
   
 
   
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2016-06-23 Thread Markus Mohrhard

 solenv/gbuild/UITest.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3f943a79913db52b2c56a56a137c8601ade976c
Author: Markus Mohrhard 
Date:   Fri Jun 24 01:34:56 2016 +0200

uitest: seems like the python_shell is not a necessary dependency

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

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index dc6ea53..2f839c3c 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -14,7 +14,7 @@ gb_UITest_UNITTESTFAILED ?= 
$(GBUILDDIR)/platform/unittest-failed-default.sh
 ifeq ($(SYSTEM_PYTHON),)
 gb_UITest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
 gb_UITest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
-gb_UITest_DEPS ?= $(call gb_Package_get_target,python3) $(call 
gb_Package_get_target,python_shell)
+gb_UITest_DEPS ?= $(call gb_Package_get_target,python3)
 else
 gb_UITest_EXECUTABLE := $(PYTHON_FOR_BUILD)
 gb_UITest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2016-06-23 Thread Markus Mohrhard

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2d5afcaaf43e359e9a01387293b4cf2b2dc0dab
Author: Markus Mohrhard 
Date:   Fri Jun 24 01:33:49 2016 +0200

uitest: the correct python executable for windows is in instdir

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index c757f9a..f9c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -597,7 +597,7 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
 # Python
 gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program)" 
PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" 
PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
-gb_Python_INSTALLED_EXECUTABLE := 
$(INSTROOT)/$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe
+gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
 
 gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w 
$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/coupdaybs.fods | 1810 ++
 sc/qa/unit/data/functions/fods/ddb.fods   | 1724 
 2 files changed, 3534 insertions(+)

New commits:
commit e36a3a4ef429036b580a6ae53902d8426073d9b6
Author: ZdenÄk Crhonek 
Date:   Wed Jun 22 22:40:54 2016 +0200

add COUPDAYBS test case

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

diff --git a/sc/qa/unit/data/functions/fods/coupdaybs.fods 
b/sc/qa/unit/data/functions/fods/coupdaybs.fods
new file mode 100644
index 000..e1efde7
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/coupdaybs.fods
@@ -0,0 +1,1810 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-06-22T22:40:29.759980062P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/fa9416906e615f5f19ad8524176d2ed693662769
+ 
+  
+   0
+   0
+   34873
+   10810
+   
+
+ view1
+ 
+  
+   2
+   11
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+  
+   3
+   13
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 90
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -

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

2016-06-23 Thread Markus Mohrhard

On Thu, Jun 23, 2016 at 5:08 PM, Michael Meeks 
wrote:

>
>
>
> + Most Pressing Bugs:
> http://tdf.io/mostressingbugs
> + tdf#100295 - LibODev-5.2.0.0.b2 does not run in Windows_XP (32
> or 64 bit)
> + Interest in fixing ?  (or is this a 'feature' ?)
> + Tor - thinks a feature.
> + last time - 10% of Windows market (Michael)
>+ compares vs. Mac install base.
> + can we bibisect for Windows to find what killed it.
> + could be related to breakpad ? (Cloph)
>+ a duplicate with more info in it out there.
>+ perhaps Moggi had a look ?
>

I think I mentioned it before. Currently I assume that it is a problem with
libcurl. Unless you specify that you want to compile against the correct
SDK version libcurl uses a vista function unconditionally. So this has been
an old problem (and would have crashed on XP if the corresponding ucp
component got loaded) but is now causing a crash already during start as
our minidump uploaded has a libcurl dependency.

There is a patch to fix it by telling the libcurl build to compile against
the old version but as I have no XP I can not test if it really helps.

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

[Libreoffice-commits] core.git: uitest/test_main.py

2016-06-23 Thread Markus Mohrhard

 uitest/test_main.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5b1bb8983bb2860d0a5fcdcb3fa25e3b082c7c48
Author: Markus Mohrhard 
Date:   Fri Jun 24 00:30:10 2016 +0200

uitest: also print number of skipped tests

Change-Id: I7fbc6513358be252b091154b5ed44d10c8f51c4f

diff --git a/uitest/test_main.py b/uitest/test_main.py
index 72c18ba..41a1b16 100644
--- a/uitest/test_main.py
+++ b/uitest/test_main.py
@@ -99,6 +99,7 @@ if __name__ == '__main__':
 print("Tests run: %d" % result.testsRun)
 print("Tests failed: %d" % len(result.failures))
 print("Tests errors: %d" % len(result.errors))
+print("Tests skipped: %d" % len(result.skipped))
 if not result.wasSuccessful():
 sys.exit(1)
 sys.exit(0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: uitest/UITestCase.py

2016-06-23 Thread Markus Mohrhard

 uitest/UITestCase.py |4 
 1 file changed, 4 insertions(+)

New commits:
commit 940eeadf9bd303c67edb2e6b6d5a1207c8aa8c3d
Author: Markus Mohrhard 
Date:   Fri Jun 24 00:25:14 2016 +0200

uitest: add execution time for each test

Change-Id: I056f739b97b03ce514ffa692bfe4bfeb62f76de8

diff --git a/uitest/UITestCase.py b/uitest/UITestCase.py
index 5628d9d..5e08804 100644
--- a/uitest/UITestCase.py
+++ b/uitest/UITestCase.py
@@ -6,6 +6,7 @@
 #
 
 import unittest
+import time
 
 from uitest_helper import UITest
 
@@ -25,8 +26,11 @@ class UITestCase(unittest.TestCase):
 "org.libreoffice.uitest.UITest", self.xContext)
 
 self.ui_test = UITest(self.xUITest, self.xContext)
+self.startTime = time.time()
 
 def tearDown(self):
+t = time.time() - self.startTime
+print("Execution time for %s: %.3f" % (self.id(), t))
 self.connection.tearDown()
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - sd/qa

2016-06-23 Thread Katarina Behrens

Rebased ref, commits from common ancestor:
commit a16b3794fc862c98ce536812cb25c57c464fcfc7
Author: Katarina Behrens 
Date:   Thu Jun 23 23:06:35 2016 +0200

Put created screenshots into workdir

use osl file abstractions for that

Change-Id: I876ca61e1d42b29f7c592b2778d8847b15513b98

diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 93d3cf0..59f1cc4 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -32,6 +32,7 @@
 
 #include 
 #include 
+#include 
 
 #include "sdabstdlg.hxx"
 #include 
@@ -59,6 +60,8 @@
 
 using namespace ::com::sun::star;
 
+static const char* SCREENSHOT_DIRECTORY = "/workdir/screenshots";
+
 /// Test opening a dialog in sd
 class SdDialogsTest : public test::BootstrapFixture, public unotest::MacrosTest
 {
@@ -135,6 +138,10 @@ void SdDialogsTest::setUp()
 mpFact = SdAbstractDialogFactory::Create();
 mxComponent = loadFromDesktop("private:factory/simpress", 
"com.sun.star.presentation.PresentationDocument");
 CPPUNIT_ASSERT(mxComponent.is());
+
+osl::FileBase::RC err = osl::Directory::create( 
m_directories.getURLFromSrc( SCREENSHOT_DIRECTORY ) );
+CPPUNIT_ASSERT_MESSAGE( "Failed to create screenshot directory", (err == 
osl::FileBase::E_None || err == osl::FileBase::E_EXIST) );
+
 mpImpressDocument = dynamic_cast(mxComponent.get());
 CPPUNIT_ASSERT(mpImpressDocument);
 }
@@ -601,6 +608,7 @@ VclAbstractDialog* 
SdDialogsTest::createDialogByID(sal_uInt32 nID)
 
 void SdDialogsTest::dumpDialogToPath(VclAbstractDialog& rDlg, const OUString& 
rPath)
 {
+
 // for dumping, a lossless format is needed. It may be seen if the created 
data
 // will be further modified/reduced, but for a input creating step it is
 // unavoidable to use a lossless format initially
@@ -633,7 +641,10 @@ void SdDialogsTest::dumpDialogToPath(VclAbstractDialog& 
rDlg, const OUString& rP
 
 if (!aScreenshot.IsEmpty())
 {
-SvFileStream aNew(rPath + OUString(".png"), StreamMode::WRITE | 
StreamMode::TRUNC);
+const OUString aPath = rPath + ".png";
+SvFileStream aNew(aPath, StreamMode::WRITE | StreamMode::TRUNC);
+CPPUNIT_ASSERT_MESSAGE( OUStringToOString( "Failed to create " + 
aPath, RTL_TEXTENCODING_UTF8).getStr(), aNew.IsOpen() );
+
 vcl::PNGWriter aPNGWriter(aScreenshot);
 aPNGWriter.Write(aNew);
 }
@@ -642,20 +653,7 @@ void SdDialogsTest::dumpDialogToPath(VclAbstractDialog& 
rDlg, const OUString& rP
 
 void SdDialogsTest::openAnyDialog()
 {
-// activate for debug using attach
-//while (true)
-//{
-//Sound::Beep();
-//}
-
-// current target for png's is defined here
-const OUString aTempTargetPath(
-#ifdef _WIN32
-"c:\\test_dlgF_"
-#else
-"~/test_dlgF_"
-#endif
-);
+const OUString aTempTargetPath = m_directories.getPathFromSrc( 
SCREENSHOT_DIRECTORY );
 
 // example for SfxTabDialog: 5
 // example for TabDialog: 23
@@ -670,7 +668,7 @@ void SdDialogsTest::openAnyDialog()
 
 if (pDlg)
 {
-dumpDialogToPath(*pDlg, aTempTargetPath + OUString::number(a));
+dumpDialogToPath(*pDlg, aTempTargetPath + "/" + 
OUString::number(a));
 delete pDlg;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/dialog-screenshots' - 2 commits - include/svx sd/qa svx/source svx/uiconfig

2016-06-23 Thread Katarina Behrens

 include/svx/sidebar/AreaPropertyPanelBase.hxx |3 
 sd/qa/unit/dialogs-test.cxx   |   30 ++--
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |  126 +-
 svx/uiconfig/ui/sidebararea.ui|  153 +++---
 4 files changed, 219 insertions(+), 93 deletions(-)

New commits:
commit a37fc927c116342eab0296cf0603eb19edd16656
Author: Katarina Behrens 
Date:   Thu Jun 23 23:01:38 2016 +0200

Put created screenshots into workdir

use osl file abstractions for that

Change-Id: I77ae9a082270f36c4ca5d945412dcec594d938c7

diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx
index 93d3cf0..59f1cc4 100644
--- a/sd/qa/unit/dialogs-test.cxx
+++ b/sd/qa/unit/dialogs-test.cxx
@@ -32,6 +32,7 @@
 
 #include 
 #include 
+#include 
 
 #include "sdabstdlg.hxx"
 #include 
@@ -59,6 +60,8 @@
 
 using namespace ::com::sun::star;
 
+static const char* SCREENSHOT_DIRECTORY = "/workdir/screenshots";
+
 /// Test opening a dialog in sd
 class SdDialogsTest : public test::BootstrapFixture, public unotest::MacrosTest
 {
@@ -135,6 +138,10 @@ void SdDialogsTest::setUp()
 mpFact = SdAbstractDialogFactory::Create();
 mxComponent = loadFromDesktop("private:factory/simpress", 
"com.sun.star.presentation.PresentationDocument");
 CPPUNIT_ASSERT(mxComponent.is());
+
+osl::FileBase::RC err = osl::Directory::create( 
m_directories.getURLFromSrc( SCREENSHOT_DIRECTORY ) );
+CPPUNIT_ASSERT_MESSAGE( "Failed to create screenshot directory", (err == 
osl::FileBase::E_None || err == osl::FileBase::E_EXIST) );
+
 mpImpressDocument = dynamic_cast(mxComponent.get());
 CPPUNIT_ASSERT(mpImpressDocument);
 }
@@ -601,6 +608,7 @@ VclAbstractDialog* 
SdDialogsTest::createDialogByID(sal_uInt32 nID)
 
 void SdDialogsTest::dumpDialogToPath(VclAbstractDialog& rDlg, const OUString& 
rPath)
 {
+
 // for dumping, a lossless format is needed. It may be seen if the created 
data
 // will be further modified/reduced, but for a input creating step it is
 // unavoidable to use a lossless format initially
@@ -633,7 +641,10 @@ void SdDialogsTest::dumpDialogToPath(VclAbstractDialog& 
rDlg, const OUString& rP
 
 if (!aScreenshot.IsEmpty())
 {
-SvFileStream aNew(rPath + OUString(".png"), StreamMode::WRITE | 
StreamMode::TRUNC);
+const OUString aPath = rPath + ".png";
+SvFileStream aNew(aPath, StreamMode::WRITE | StreamMode::TRUNC);
+CPPUNIT_ASSERT_MESSAGE( OUStringToOString( "Failed to create " + 
aPath, RTL_TEXTENCODING_UTF8).getStr(), aNew.IsOpen() );
+
 vcl::PNGWriter aPNGWriter(aScreenshot);
 aPNGWriter.Write(aNew);
 }
@@ -642,20 +653,7 @@ void SdDialogsTest::dumpDialogToPath(VclAbstractDialog& 
rDlg, const OUString& rP
 
 void SdDialogsTest::openAnyDialog()
 {
-// activate for debug using attach
-//while (true)
-//{
-//Sound::Beep();
-//}
-
-// current target for png's is defined here
-const OUString aTempTargetPath(
-#ifdef _WIN32
-"c:\\test_dlgF_"
-#else
-"~/test_dlgF_"
-#endif
-);
+const OUString aTempTargetPath = m_directories.getPathFromSrc( 
SCREENSHOT_DIRECTORY );
 
 // example for SfxTabDialog: 5
 // example for TabDialog: 23
@@ -670,7 +668,7 @@ void SdDialogsTest::openAnyDialog()
 
 if (pDlg)
 {
-dumpDialogToPath(*pDlg, aTempTargetPath + OUString::number(a));
+dumpDialogToPath(*pDlg, aTempTargetPath + "/" + 
OUString::number(a));
 delete pDlg;
 }
 }
commit f242f9f098dd0c0972743fc8f49cecdef2415006
Author: Susobhan Ghosh 
Date:   Mon Jun 20 23:24:51 2016 +0530

tdf#90078 Add import bitmap button to Area Panel

Change-Id: I49712f807d38a614fd707d06c9453545360db89f

diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx 
b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index fc24c92..525199e 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -136,6 +136,8 @@ protected:
 VclPtrmpBTNGradient;
 VclPtrmpMTRAngle;
 VclPtrmpGradientStyle;
+VclPtr mpLbFillBitmap;
+VclPtr mpBmpImport;
 
 std::unique_ptr< XFillStyleItem >   mpStyleItem;
 std::unique_ptr< XFillColorItem >   mpColorItem;
@@ -165,6 +167,7 @@ protected:
 DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void);
 DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void);
 DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void);
+DECL_LINK_TYPED(ClickImportBitmapHdl, Button*, void);
 
 // for transparency gradient
 VclPtr CreateTransparencyGradientControl (PopupContainer* 
pParent);
diff --git a/svx/source/si

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

2016-06-23 Thread David Tardon

 writerperfect/qa/unit/WpftDrawFilterTest.cxx|1 +
 writerperfect/qa/unit/data/draw/libzmf/pass/ZonerDraw_5.zmf |binary
 2 files changed, 1 insertion(+)

New commits:
commit b3b09e461c84a910acb61060647cc476e8f6bae8
Author: David Tardon 
Date:   Thu Jun 23 10:22:18 2016 +0200

add integration test for libzmf

Change-Id: Ic56be82cfc2b2439a4f0e60797796e4583f93554

diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx 
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 56eebec..9dee300 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -50,6 +50,7 @@ void WpftDrawFilterTest::test()
 doTest("com.sun.star.comp.Draw.VisioImportFilter", 
"/writerperfect/qa/unit/data/draw/libvisio/");
 doTest("com.sun.star.comp.Draw.WPGImportFilter", 
"/writerperfect/qa/unit/data/draw/libwpg/");
 doTest("org.libreoffice.comp.Draw.PageMakerImportFilter", 
"/writerperfect/qa/unit/data/draw/libpagemaker/");
+doTest("org.libreoffice.comp.Draw.ZMFImportFilter", 
"/writerperfect/qa/unit/data/draw/libzmf/");
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(WpftDrawFilterTest);
diff --git a/writerperfect/qa/unit/data/draw/libzmf/fail/.gitignore 
b/writerperfect/qa/unit/data/draw/libzmf/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/writerperfect/qa/unit/data/draw/libzmf/indeterminate/.gitignore 
b/writerperfect/qa/unit/data/draw/libzmf/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/writerperfect/qa/unit/data/draw/libzmf/pass/ZonerDraw_5.zmf 
b/writerperfect/qa/unit/data/draw/libzmf/pass/ZonerDraw_5.zmf
new file mode 100644
index 000..fa2a96a
Binary files /dev/null and 
b/writerperfect/qa/unit/data/draw/libzmf/pass/ZonerDraw_5.zmf differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Susobhan Ghosh

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit dd1528b81f4c90c1db8f8eeb38bacc727490c6b6
Author: Susobhan Ghosh 
Date:   Thu Jun 23 15:51:36 2016 +0530

tdf#83830: Remove experimental status from Page Deck

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index f579ba1..2f2a032 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -59,9 +59,6 @@
 
   100
 
-
-  true
-
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Michael Stahl

 package/source/zipapi/ZipOutputStream.cxx |   10 +-
 sfx2/source/doc/docfile.cxx   |6 +++---
 sw/source/core/layout/pagechg.cxx |4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit e7d8cb3ec22906d5d45ba65e0a0cfccd68d202e8
Author: Michael Stahl 
Date:   Thu Jun 23 22:17:49 2016 +0200

sw: fix STL asserts in lcl_MoveAllLowerObjs *again*

Comment added in cf91483690291272f48ff95c1aebd165da8ae4f0 evidently
insufficient.

(regression from b415494bf0468b74318b61f114e2ff4ae68c00ee)

Change-Id: I9a017aefc3a77b0760fcdc3b8e43ff7c6ac516ac

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index c722da9..7ea39752 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1763,8 +1763,10 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const 
Point& rOffset )
 
 // note: pSortedObj elements may be removed and inserted from
 // MoveObjectIfActive(), invalidating iterators
-for (SwAnchoredObject* pAnchoredObj : *pSortedObj)
+// DO NOT CONVERT THIS TO A C++11 FOR LOOP, IT DID NOT WORK THE LAST 2 
TIMES
+for (size_t i = 0; i < pSortedObj->size(); ++i)
 {
+SwAnchoredObject *const pAnchoredObj = (*pSortedObj)[i];
 const SwFrameFormat& rObjFormat = pAnchoredObj->GetFrameFormat();
 const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor();
 
commit 9084c11fb472f2024e609770ce922c911227e7a8
Author: Michael Stahl 
Date:   Thu Jun 23 22:02:04 2016 +0200

sfx2: exception on storage commit is an error (related: tdf#91807)

For no good or obvious reason, SfxMedium::StorageCommit_Impl() swallows
embed::UseBackupException if there is a pTempFile, which (as the comment
claims) is "always now".  This results in the temp file actually being
copied to the user-visible file and the SaveAs "succeeding", when it
clearly did not.

Also move the exception throwing to the end of ZipOutputStream::finish()
to avoid more memory leaks.

Change-Id: I448cc43291754ef20adfa6b65916282fcc365a11

diff --git a/package/source/zipapi/ZipOutputStream.cxx 
b/package/source/zipapi/ZipOutputStream.cxx
index 2daff01..41f78b4 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -183,11 +183,6 @@ void ZipOutputStream::finish()
 // consume all processed entries
 consumeAllScheduledThreadEntries();
 
-if (m_aDeflateException.hasValue())
-{   // throw once all threads are finished and m_aEntries can be released
-::cppu::throwException(m_aDeflateException);
-}
-
 sal_Int32 nOffset= static_cast < sal_Int32 > (m_aChucker.GetPosition());
 for (ZipEntry* p : m_aZipList)
 {
@@ -197,6 +192,11 @@ void ZipOutputStream::finish()
 writeEND( nOffset, static_cast < sal_Int32 > (m_aChucker.GetPosition()) - 
nOffset);
 m_xStream->flush();
 m_aZipList.clear();
+
+if (m_aDeflateException.hasValue())
+{   // throw once all threads are finished and m_aEntries can be released
+::cppu::throwException(m_aDeflateException);
+}
 }
 
 const css::uno::Reference< css::io::XOutputStream >& 
ZipOutputStream::getStream()
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b64e8d3..c4ce871 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1625,10 +1625,10 @@ bool SfxMedium::StorageCommit_Impl()
 OSL_ENSURE( !pImpl->m_aName.isEmpty(), "The 
exception _must_ contain the temporary URL!\n" );
 }
 }
-
-if ( !GetError() )
-SetError( ERRCODE_IO_GENERAL, OSL_LOG_PREFIX );
 }
+
+if (!GetError())
+SetError( ERRCODE_IO_GENERAL, OSL_LOG_PREFIX );
 }
 catch ( const uno::Exception& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Winfried Donkers

 sc/source/core/tool/interpr2.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 716f4ef1625cece6fe8326213df24c52d56c9432
Author: Winfried Donkers 
Date:   Thu Jun 23 15:57:38 2016 +0200

tdf#100562 Add constraints for function DB

Constraints in 
http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#DB
were not all checked.

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

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 2eae22b..ac20f10 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1528,7 +1528,8 @@ void ScInterpreter::ScDB()
 double nRest = GetDouble();
 double nValue = GetDouble();
 if (nMonths < 1.0 || nMonths > 12.0 || nTimeLength > 1200.0 || nRest < 0.0 
||
-nPeriod > (nTimeLength + 1.0) || nRest > nValue || nValue < 0.0)
+nPeriod > (nTimeLength + 1.0) || nRest > nValue || nValue <= 0.0 ||
+nTimeLength <= 0 || nPeriod <= 0 )
 {
 PushIllegalArgument();
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Caolán McNamara

 sc/qa/unit/ucalc.cxx |6 ++
 sc/source/core/data/column4.cxx  |1 +
 sc/source/ui/unoobj/cellsuno.cxx |   10 ++
 3 files changed, 17 insertions(+)

New commits:
commit 28e3843433c3dfa04aae70c3c0516911ee80bf69
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 10:24:49 2016 +0100

Resolves: tdf#100460 queryContentCells doesn't count annotations...

since

commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094
Author: Markus Mohrhard 
Date:   Thu Feb 23 23:36:49 2012 +0100

remove mpNote from ScBaseCell

(cherry picked from commit 83f977c7f40d1a5fb975b8ce7c9958c992dba3f1)

Related: tdf#100460 GetNotesInRange doesn't count last cell in range

e.g. open document from tdf#100460 and select select A20:A21 and right click
and there is a hide comment entry. Shrink the selection to just A20 (which 
has
the comment in it) and the right click menu has no hide comment entry in it.

std::for_each(it, itEnd

means it < itEnd but here we want the rows indicated by

nStartRow <= nEndRow

so we need to increment itEnd by one to get the right range

(cherry picked from commit 84dc0157df9cb173ec74da2bd27507329efc3816)

Change-Id: I281a207e26aec8886b1f46b9279e1135b61586da
48e8c0748f520671e09f04b16961bf9729960317
Reviewed-on: https://gerrit.libreoffice.org/26614
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 337a4ef..e8f0f0a 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5259,6 +5259,12 @@ void Test::testNoteCopyPaste()
 CPPUNIT_ASSERT(pNote);
 CPPUNIT_ASSERT_EQUAL(OUString("Note2"), pNote->GetText());
 
+// Test that GetNotesInRange includes the end of its range
+// and so can find the note
+std::vector aNotes;
+m_pDoc->GetNotesInRange(ScRange(1,7,0), aNotes);
+CPPUNIT_ASSERT_EQUAL(size_t(1), aNotes.size());
+
 m_pDoc->DeleteTab(0);
 }
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 6134eef..4c42a7d 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -700,6 +700,7 @@ void ScColumn::GetNotesInRange(SCROW nStartRow, SCROW 
nEndRow,
 std::pair aEndPos =
 maCellNotes.position(nEndRow);
 sc::CellNoteStoreType::const_iterator itEnd = aEndPos.first;
+std::advance(itEnd, 1);
 
 std::for_each(it, itEnd, NoteEntryCollector(rNotes, nTab, nCol, nStartRow, 
nEndRow));
 }
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 776a918..3bf6646 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3600,7 +3600,17 @@ uno::Reference SAL_CALL 
ScCellRangesBase::queryContentC
 if (bAdd)
 aMarkData.SetMultiMarkArea(aIter.GetPos());
 }
+}
+
+if (nContentFlags & sheet::CellFlags::ANNOTATION)
+{
+std::vector aNotes;
+rDoc.GetNotesInRange(aRanges, aNotes);
 
+for (const auto& i : aNotes)
+{
+aMarkData.SetMultiMarkArea(i.maPos);
+}
 }
 
 ScRangeList aNewRanges;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Miklos Vajna

 sw/source/uibase/dochdl/swdtflvr.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 91f2f71e7b936c3c9fb984aaa01d432926abb38f
Author: Miklos Vajna 
Date:   Thu Jun 16 16:50:11 2016 +0200

sw: fix crash on pasting from an already closed document

As pointed out by

.
Thanks to Michael Stahl for figuring out the list of steps to reproduce
this bug:

1) Create a new Writer document
2) Type some text
3) Select all
4) Copy it
5) Close the document
6) Create a second Writer document
7) Paste -> crash

(cherry picked from commit 1bc3c88bc9ed085bf7e173cb12f313934d92f309)

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

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index ab8d5f4..e496d29 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3286,7 +3286,8 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
 }
 
 bool bRet = true;
-if (lcl_checkClassification(m_pWrtShell->GetDoc(), rShell.GetDoc()))
+// m_pWrtShell is nullptr when the source document is closed already.
+if (!m_pWrtShell || lcl_checkClassification(m_pWrtShell->GetDoc(), 
rShell.GetDoc()))
 bRet = rShell.Paste(m_pClpDocFac->GetDoc());
 
 if( bKillPaMs )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Caolán McNamara

 sc/qa/unit/ucalc.cxx |6 ++
 sc/source/core/data/column4.cxx  |2 +-
 sc/source/ui/unoobj/cellsuno.cxx |   10 ++
 3 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit b8b51fc4b253b3468396addd3bf72766d6d82710
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 10:24:49 2016 +0100

Resolves: tdf#100460 queryContentCells doesn't count annotations...

since

commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094
Author: Markus Mohrhard 
Date:   Thu Feb 23 23:36:49 2012 +0100

remove mpNote from ScBaseCell

Change-Id: I281a207e26aec8886b1f46b9279e1135b61586da
(cherry picked from commit 83f977c7f40d1a5fb975b8ce7c9958c992dba3f1)

Related: tdf#100460 GetNotesInRange doesn't count last cell in range

e.g. open document from tdf#100460 and select select A20:A21 and right click
and there is a hide comment entry. Shrink the selection to just A20 (which 
has
the comment in it) and the right click menu has no hide comment entry in it.

std::for_each(it, itEnd

means it < itEnd but here we want the rows indicated by

nStartRow <= nEndRow

so we need to increment itEnd by one to get the right range

Change-Id: I48e8c0748f520671e09f04b16961bf9729960317
(cherry picked from commit 84dc0157df9cb173ec74da2bd27507329efc3816)
Reviewed-on: https://gerrit.libreoffice.org/26608
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9cecacc..5a38c92 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4980,6 +4980,12 @@ void Test::testNoteCopyPaste()
 CPPUNIT_ASSERT(pNote);
 CPPUNIT_ASSERT_EQUAL(OUString("Note2"), pNote->GetText());
 
+// Test that GetNotesInRange includes the end of its range
+// and so can find the note
+std::vector aNotes;
+m_pDoc->GetNotesInRange(ScRange(1,7,0), aNotes);
+CPPUNIT_ASSERT_EQUAL(size_t(1), aNotes.size());
+
 m_pDoc->DeleteTab(0);
 }
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index e145e75..6e8e4da 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -701,7 +701,7 @@ void ScColumn::GetNotesInRange(SCROW nStartRow, SCROW 
nEndRow,
 maCellNotes.position(nEndRow);
 sc::CellNoteStoreType::const_iterator itEnd = aEndPos.first;
 
-std::for_each(it, itEnd, NoteEntryCollector(rNotes, nTab, nCol, nStartRow, 
nEndRow));
+std::for_each(it, ++itEnd, NoteEntryCollector(rNotes, nTab, nCol, 
nStartRow, nEndRow));
 }
 
 namespace {
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 944c56d..de019bf 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3601,7 +3601,17 @@ uno::Reference SAL_CALL 
ScCellRangesBase::queryContentC
 if (bAdd)
 aMarkData.SetMultiMarkArea(aIter.GetPos());
 }
+}
+
+if (nContentFlags & sheet::CellFlags::ANNOTATION)
+{
+std::vector aNotes;
+rDoc.GetNotesInRange(aRanges, aNotes);
 
+for (const auto& i : aNotes)
+{
+aMarkData.SetMultiMarkArea(i.maPos);
+}
 }
 
 ScRangeList aNewRanges;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/couppcd.fods | 1810 
 1 file changed, 1810 insertions(+)

New commits:
commit 0806fe8c08629e2b0bea527359b1b4bf41af686b
Author: ZdenÄk Crhonek 
Date:   Wed Jun 22 22:33:30 2016 +0200

add COUPPCD test case

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

diff --git a/sc/qa/unit/data/functions/fods/couppcd.fods 
b/sc/qa/unit/data/functions/fods/couppcd.fods
new file mode 100644
index 000..37f9411
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/couppcd.fods
@@ -0,0 +1,1810 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-06-22T22:32:54.47674P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/fa9416906e615f5f19ad8524176d2ed693662769
+ 
+  
+   0
+   0
+   34873
+   10810
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+  
+   3
+   15
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 90
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   
+

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

2016-06-23 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/coupdaysnc.fods | 1810 
 sc/qa/unit/data/functions/fods/coupncd.fods| 1810 
 sc/qa/unit/data/functions/fods/coupnum.fods| 1822 +
 3 files changed, 5442 insertions(+)

New commits:
commit ef2ae91e2ce62fb6e85b645175b88ccc6add48eb
Author: ZdenÄk Crhonek 
Date:   Wed Jun 22 22:50:43 2016 +0200

add COUPDAYS, COUPNCD, COUPNUM test case

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

diff --git a/sc/qa/unit/data/functions/fods/coupdaysnc.fods 
b/sc/qa/unit/data/functions/fods/coupdaysnc.fods
new file mode 100644
index 000..441f8f2
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/coupdaysnc.fods
@@ -0,0 +1,1810 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-06-22T22:49:06.162916274P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/fa9416906e615f5f19ad8524176d2ed693662769
+ 
+  
+   0
+   0
+   34873
+   10810
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+  
+   1
+   11
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 90
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+

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

2016-06-23 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/coupdays.fods | 1693 +++
 1 file changed, 1693 insertions(+)

New commits:
commit 73b56d684df0ba93fac8f9d32be5b08c0f0b4af4
Author: ZdenÄk Crhonek 
Date:   Wed Jun 22 22:47:52 2016 +0200

add COUPDAYS test case

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

diff --git a/sc/qa/unit/data/functions/fods/coupdays.fods 
b/sc/qa/unit/data/functions/fods/coupdays.fods
new file mode 100644
index 000..3406c15
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/coupdays.fods
@@ -0,0 +1,1693 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-06-22T22:45:32.098106233P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/fa9416906e615f5f19ad8524176d2ed693662769
+ 
+  
+   0
+   0
+   34873
+   10757
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+  
+   3
+   11
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 90
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   jQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+

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

2016-06-23 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/and.fods | 2043 
 1 file changed, 2043 insertions(+)

New commits:
commit 5a626116c75367029302902f02a9c9d1a90e7afe
Author: ZdenÄk Crhonek 
Date:   Wed Jun 22 21:17:00 2016 +0200

add AND test case

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

diff --git a/sc/qa/unit/data/functions/fods/and.fods 
b/sc/qa/unit/data/functions/fods/and.fods
new file mode 100644
index 000..6271a83
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/and.fods
@@ -0,0 +1,2043 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-06-10T20:02:06.652576343P0D1LibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/fa9416906e615f5f19ad8524176d2ed693662769
+ 
+  
+   0
+   0
+   26699
+   4967
+   
+
+ view1
+ 
+  
+   0
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+  
+  
+   3
+   9
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ en
+ US
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+   
+
+  
+  
+   (
+   
+   )
+   
+  
+  
+   
+
+  
+  
+   (
+   
+   )
+   
+  
+  
+   Â£
+
+   
+  
+  
+   -
+   Â£
+
+   
+   
+  
+  
+   Â£
+
+   
+  
+  
+   -
+   Â£
+
+   
+   
+  
+  
+   
+

Re: Menu -> VclPtr ...

2016-06-23 Thread Noel Grandin

looks good to me
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -

2016-06-23 Thread László Németh

 0 files changed

New commits:
commit 99fbb31a727a8b6d9947d33c29a348f33876e2ff
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 23 19:27:02 2016 +0200

empty commit (repeat)

Change-Id: I668f70e448d14eab36c04bd5739840aed77cd922
commit fa054a92b75a0d60b8abeafd7e7dba6464505b9f
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 23 19:26:43 2016 +0200

empty commit (repeat)

Change-Id: I376c96a7042a243a0347f89665243ca9a121a157
commit a071a3f984de0af0767025e5877b17a01e15015f
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 23 19:26:12 2016 +0200

empty commit (repeat)

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

Re: CppCheck Report Update

2016-06-23 Thread Maarten Hoes

On Thu, Jun 23, 2016 at 7:06 PM, Christian Lohmaier  wrote:

> <-snip->
> should  not be necessary - adjusting my $ssl_ver  to  TLSv1 should be
> enough;
>
> I  took the liberty to change that :-)
>
> ciao
> Christian
>

Oh. Thanks. Oh well, at least I now know how to do it with mailx as well.
;)

Thanks again !

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

Re: CppCheck Report Update

2016-06-23 Thread Christian Lohmaier

Hi Maarten, *,

On Thu, Jun 23, 2016 at 6:37 PM, Maarten Hoes  wrote:
> Hi,
>
>
> Ive taken the liberty of changing the crontab entry for the creation of the
> cppcheck report on vm140 from this :
>
> /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s
> /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w
> /home/buildslave/tmp/www >/tmp/cppcheck-report.log 2>&1
>
> to this :
>
> cd /home/buildslave/source/dev-tools && git pull &&
> /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s
> /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w
> /home/buildslave/tmp/www >/tmp/cppcheck-report.log 2>&1
>
> in order to make any future updates to the script automatically be used by
> means of a git pull of the corresponding dev-tools repo before running the
> script. Ive tested this on a local vm with the same Linux distro (Mageia 4),
> and it seems to work.
>
>
> By the way, searching through the mailing list archives it seems that the
> emails to the list reporting the success or failure of the
> cppcheck-report.sh run have stopped.
>
> Trying out the command (sendEmail) used (with the addition of '-vv') from
> the commandline on the vm, I get the following error :
>
>
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => Connecting to
> smtp.gmail.com:587
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => My IP address is:
> 89.238.68.140
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => evalSMTPresponse() - Found
> SMTP success code: 220
> Jun 23 17:49:30 vm140 sendEmail[2910]: SUCCESS => Received: 220
> smtp.gmail.com ESMTP x194sm4488242wmf.13 - gsmtp
> Jun 23 17:49:30 vm140 sendEmail[2910]: INFO => Sending: EHLO
> vm140.documentfoundation.org
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => evalSMTPresponse() - Found
> SMTP success code: 250
> Jun 23 17:49:30 vm140 sendEmail[2910]: SUCCESS => Received:
> 250-smtp.gmail.com at your service, [89.238.68.140], 250-SIZE 35882577,
> 250-8BITMIME, 250-STARTTLS, 250-ENHANCEDSTATUSCODES, 250-PIPELINING,
> 250-CHUNKING, 250 SMTPUTF8
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => The remote SMTP server
> supports TLS :)
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => Starting TLS
> Jun 23 17:49:30 vm140 sendEmail[2910]: INFO => Sending: STARTTLS
> Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => evalSMTPresponse() - Found
> SMTP success code: 220
> Jun 23 17:49:30 vm140 sendEmail[2910]: SUCCESS => Received: 220 2.0.0
> Ready to start TLS
> Jun 23 17:49:30 vm140 sendEmail[2910]: ERROR => TLS setup failed: SSL
> connect attempt failed because of handshake problems error:1409442E:SSL
> routines:SSL3_READ_BYTES:tlsv1 alert protocol version
>
>
> I googled the (last line) error, and this page [1] seems to suggest to
> install different/better/more maintained/updated perl modules,

should  not be necessary - adjusting my $ssl_ver  to  TLSv1 should be enough;

I  took the liberty to change that :-)

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

Re: CppCheck Report Update

2016-06-23 Thread Maarten Hoes

Ah.


On Thu, Jun 23, 2016 at 6:37 PM, Maarten Hoes 
wrote:

>
> B.)
> drop sendEmail, install mail/mailx and install&configure something like
> sendmail/postfix/exim on vm140 and see if the cppcheck-report.sh script can
> be modified to use mail/mailx instead. I do have some shell skills, so I
> could spend some time on that myself to see if I can make that work. But I
> will need some help with the sendmail/postfix/exim configuration part. (and
> I guess if vm140 cannot receive mail, then the account used to send the
> email would need to be approved for sending to the mailing list in some
> other manner than 'the normal way').
>

Looks like sendmail is not required after all, the following (trying from
my own vm) works :

$ mailx -v -s "Test Mail" -S smtp-use-starttls -S ssl-verify=ignore -S
smtp-auth=login -S smtp=smtp://smtp.gmail.com:587 -S from="
fromu...@gmail.com(My From User)" -S smtp-auth-user=fromu...@gmail.com -S
smtp-auth-password="mypass" -S ssl-verify=ignore tou...@gmail.com <
/dir/file


If someone with root access can install mailx on
vm140.documentfoundation.org, I can start working on modifying the script
to use 'mailx' instead of 'sendEmai'. (if still desired, that is: let me
know).



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

Re: CppCheck Report Update

2016-06-23 Thread Maarten Hoes

Hi,

Ive taken the liberty of changing the crontab entry for the creation of the
cppcheck report on vm140 from this :

/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w
/home/buildslave/tmp/www >/tmp/cppcheck-report.log 2>&1

to this :

cd /home/buildslave/source/dev-tools && git pull &&
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w
/home/buildslave/tmp/www >/tmp/cppcheck-report.log 2>&1

in order to make any future updates to the script automatically be used by
means of a git pull of the corresponding dev-tools repo before running the
script. Ive tested this on a local vm with the same Linux distro (Mageia
4), and it seems to work.

By the way, searching through the mailing list archives it seems that the
emails to the list reporting the success or failure of the
cppcheck-report.sh run have stopped.

Trying out the command (sendEmail) used (with the addition of '-vv') from
the commandline on the vm, I get the following error :

Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => Connecting to
smtp.gmail.com:587
Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => My IP address is:
89.238.68.140
Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => evalSMTPresponse() - Found
SMTP success code: 220
Jun 23 17:49:30 vm140 sendEmail[2910]: SUCCESS => Received: 220
smtp.gmail.com ESMTP x194sm4488242wmf.13 - gsmtp
Jun 23 17:49:30 vm140 sendEmail[2910]: INFO => Sending: EHLO
vm140.documentfoundation.org
Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => evalSMTPresponse() - Found
SMTP success code: 250
Jun 23 17:49:30 vm140 sendEmail[2910]: SUCCESS => Received:
250-smtp.gmail.com at your service, [89.238.68.140], 250-SIZE 35882577,
250-8BITMIME, 250-STARTTLS, 250-ENHANCEDSTATUSCODES, 250-PIPELINING,
250-CHUNKING, 250 SMTPUTF8
Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => The remote SMTP server
supports TLS :)
Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => Starting TLS
Jun 23 17:49:30 vm140 sendEmail[2910]: INFO => Sending: STARTTLS
Jun 23 17:49:30 vm140 sendEmail[2910]: DEBUG => evalSMTPresponse() - Found
SMTP success code: 220
Jun 23 17:49:30 vm140 sendEmail[2910]: SUCCESS => Received: 220 2.0.0
Ready to start TLS
Jun 23 17:49:30 vm140 sendEmail[2910]: ERROR => TLS setup failed: SSL
connect attempt failed because of handshake problems error:1409442E:SSL
routines:SSL3_READ_BYTES:tlsv1 alert protocol version

I googled the (last line) error, and this page [1] seems to suggest to
install different/better/more maintained/updated perl modules, and then
update the sendEmail perl script (which was last updated in 2009) to use
those perl modules.

So as far as I can see, *if* receiving failed/succeeded email messages is
still wanted, there are the following options :

A.)
modify the sendEmail perl script and use different more recent perl
modules. I have absolutely zero perl skills, so someone else would have to
spend some time to update the script in this scenario.

B.)
drop sendEmail, install mail/mailx and install&configure something like
sendmail/postfix/exim on vm140 and see if the cppcheck-report.sh script can
be modified to use mail/mailx instead. I do have some shell skills, so I
could spend some time on that myself to see if I can make that work. But I
will need some help with the sendmail/postfix/exim configuration part. (and
I guess if vm140 cannot receive mail, then the account used to send the
email would need to be approved for sending to the mailing list in some
other manner than 'the normal way').

C.)
leave it 'as-is': receiving email fail/succeed notifications isnt really
considered important enough.

- Maarten

[1]
https://stackoverflow.com/questions/37277583/send-mail-through-gmail-using-perl

On Sun, Jun 12, 2016 at 3:04 PM, Maarten Hoes 
wrote:

> Caolán McNamara wrote
> > On Sun, 2016-02-28 at 01:35 +,
>
> > cppcheck.libreoffice@
>
> >
> >>> Note:
> >>> The script generating this report was run at :
> >>> 2016-28-02_02:35:42 with user buildslave at host vm140 as
> >>> /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s
> >>> /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck
> >>> -w /home/buildslave/tmp/www
> >>>
> >>> It can be found and improved here:
> >>> https://gerrit.libreoffice.org/gitweb?p=dev-
> >>> tools.git;a=blob;f=cppcheck/cppcheck-report.sh
> >
> >> cppcheck-report.sh (since Feb 15) has --inline-suppr enabled in it so I
> >> would have expected http://dev-builds.libreoffice.org/cppcheck_reports/
> >> master/382.html#line-240 not to appear.
> >
> >> Is that inline suppression markup wrong. Or does something need to be
> >> done to refresh from git the cppcheck-report.sh used to build these
> >> reports ?
> >>
> >
> > Hi,
> >
> >
> > A little late, and really only by accident that I ran into your post, but
> > ...
> >
> >
> >

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

2016-06-23 Thread Caolán McNamara

 vcl/inc/unx/gtk/gtkframe.hxx  |1 
 vcl/unx/gtk3/gtk3gtkframe.cxx |  103 ++
 2 files changed, 75 insertions(+), 29 deletions(-)

New commits:
commit 7dfd50f947671d79b9119f10259857700d5728d8
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 17:32:11 2016 +0100

Resolves: rhbz#1349501 gtk3: smooth scrolling events can be disabled...

by the user with GDK_CORE_DEVICE_EVENTS=1, and so manage to disable their 
wheel
scrolling

Change-Id: I7df63f738983c90dea75b9f43a36133910446aba

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ff5c454..e455f9e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -213,6 +213,7 @@ class GtkSalFrame : public SalFrame
 #if GTK_CHECK_VERSION(3,0,0)
 OUStringm_aTooltip;
 Rectangle   m_aHelpArea;
+guint32 m_nLastScrollEventTime;
 longm_nWidthRequest;
 longm_nHeightRequest;
 cairo_region_t* m_pRegion;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 1136e47..aef66c0 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1051,6 +1051,7 @@ void GtkSalFrame::InitCommon()
 m_bSpanMonitorsWhenFullscreen = false;
 m_nState= GDK_WINDOW_STATE_WITHDRAWN;
 m_nVisibility   = GDK_VISIBILITY_FULLY_OBSCURED;
+m_nLastScrollEventTime = GDK_CURRENT_TIME;
 m_bSendModChangeOnRelease = false;
 m_pIMHandler= nullptr;
 m_hBackgroundPixmap = None;
@@ -2655,11 +2656,15 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, 
GdkEventScroll* pEvent, gpointer
 {
 UpdateLastInputEventTime(pEvent->time);
 
-if (pEvent->direction != GDK_SCROLL_SMOOTH)
-return false;
-
 GtkSalFrame* pThis = static_cast(frame);
 
+// gnome#726878 check for duplicate legacy scroll event
+if (pEvent->direction != GDK_SCROLL_SMOOTH &&
+pThis->m_nLastScrollEventTime == pEvent->time)
+{
+return false;
+}
+
 SalWheelMouseEvent aEvent;
 
 aEvent.mnTime = pEvent->time;
@@ -2670,36 +2675,76 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, 
GdkEventScroll* pEvent, gpointer
 aEvent.mnY = (sal_uLong)pEvent->y;
 aEvent.mnCode = GetMouseModCode( pEvent->state );
 
-// rhbz#1344042 "Traditionally" in gtk3 we tool a single up/down event as
-// equating to 3 scroll lines and a delta of 120. So scale the delta here
-// by 120 where a single mouse wheel click is an incoming delta_x of 1
-// and divide that by 40 to get the number of scrollines
-if (pEvent->delta_x != 0.0)
+switch (pEvent->direction)
 {
-aEvent.mnDelta = -pEvent->delta_x * 120;
-aEvent.mnNotchDelta = aEvent.mnDelta < 0 ? -1 : +1;
-if (aEvent.mnDelta == 0)
-aEvent.mnDelta = aEvent.mnNotchDelta;
-aEvent.mbHorz = true;
-aEvent.mnScrollLines = std::abs(aEvent.mnDelta) / 40;
-if (aEvent.mnScrollLines == 0)
-aEvent.mnScrollLines = 1;
+case GDK_SCROLL_SMOOTH:
+pThis->m_nLastScrollEventTime = pEvent->time;
 
-pThis->CallCallback(SalEvent::WheelMouse, &aEvent);
-}
+// rhbz#1344042 "Traditionally" in gtk3 we tool a single up/down 
event as
+// equating to 3 scroll lines and a delta of 120. So scale the 
delta here
+// by 120 where a single mouse wheel click is an incoming delta_x 
of 1
+// and divide that by 40 to get the number of scrollines
+if (pEvent->delta_x != 0.0)
+{
+aEvent.mnDelta = -pEvent->delta_x * 120;
+aEvent.mnNotchDelta = aEvent.mnDelta < 0 ? -1 : +1;
+if (aEvent.mnDelta == 0)
+aEvent.mnDelta = aEvent.mnNotchDelta;
+aEvent.mbHorz = true;
+aEvent.mnScrollLines = std::abs(aEvent.mnDelta) / 40;
+if (aEvent.mnScrollLines == 0)
+aEvent.mnScrollLines = 1;
+
+pThis->CallCallback(SalEvent::WheelMouse, &aEvent);
+}
 
-if (pEvent->delta_y != 0.0)
-{
-aEvent.mnDelta = -pEvent->delta_y * 120;
-aEvent.mnNotchDelta = aEvent.mnDelta < 0 ? -1 : +1;
-if (aEvent.mnDelta == 0)
-aEvent.mnDelta = aEvent.mnNotchDelta;
-aEvent.mbHorz = false;
-aEvent.mnScrollLines = std::abs(aEvent.mnDelta) / 40;
-if (aEvent.mnScrollLines == 0)
-aEvent.mnScrollLines = 1;
+if (pEvent->delta_y != 0.0)
+{
+aEvent.mnDelta = -pEvent->delta_y * 120;
+aEvent.mnNotchDelta = aEvent.mnDelta < 0 ? -1 : +1;
+if (aEvent.mnDelta == 0)
+aEvent.mnDelta = aEvent.mnNotchDelta;
+aEvent.mbHorz = false;
+aEvent.mnScrollLines

[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/libzmf external/Module_external.mk filter/Configuration_filter.mk filter/source Makefile.fetch RepositoryExternal.m

2016-06-23 Thread Aleksas Pantechovskis

 Makefile.fetch |1 
 RepositoryExternal.mk  |   33 ++
 config_host.mk.in  |3 
 configure.ac   |5 
 download.lst   |2 
 external/Module_external.mk|1 
 external/libzmf/ExternalProject_libzmf.mk  |   43 
 external/libzmf/Makefile   |7 +
 external/libzmf/Module_libzmf.mk   |   17 +++
 external/libzmf/README |6 +
 external/libzmf/UnpackedTarball_libzmf.mk  |   24 
 external/libzmf/ubsan-visibility.patch |   11 ++
 filter/Configuration_filter.mk |2 
 filter/source/config/fragments/filters/ZMFDocument.xcu |   13 ++
 filter/source/config/fragments/types/draw_ZMF_Document.xcu |   12 ++
 writerperfect/Library_wpftdraw.mk  |2 
 writerperfect/source/draw/ZMFImportFilter.cxx  |   69 +
 writerperfect/source/draw/ZMFImportFilter.hxx  |   41 +++
 writerperfect/source/draw/wpftdraw.component   |5 
 19 files changed, 297 insertions(+)

New commits:
commit aaed6fe55a67ee3e92bedf9eed2e2f7c044be19d
Author: Aleksas Pantechovskis 
Date:   Wed Jun 22 19:02:29 2016 +0300

integrate libzmf

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

diff --git a/Makefile.fetch b/Makefile.fetch
index 3884f7f..e78ad98 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -209,6 +209,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,WPS,WPS_TARBALL) \
$(call fetch_Optional,XSLTML,XSLTML_TARBALL) \
$(call fetch_Optional,ZLIB,ZLIB_TARBALL) \
+   $(call fetch_Optional,ZMF,ZMF_TARBALL) \
,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
$(call fetch_Optional,DBGHELP,DBGHELP_DLL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 62d3bfd..04546e5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2001,6 +2001,39 @@ endef
 endif # SYSTEM_PAGEMAKER
 
 
+ifneq ($(SYSTEM_ZMF),)
+
+define gb_LinkTarget__use_zmf
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(ZMF_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(ZMF_LIBS))
+
+endef
+gb_ExternalProject__use_zmf :=
+
+else # !SYSTEM_ZMF
+
+define gb_LinkTarget__use_zmf
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,libzmf)/inc \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(call 
gb_UnpackedTarball_get_dir,libzmf)/src/lib/.libs/libzmf-0.0$(gb_StaticLibrary_PLAINEXT)
 \
+)
+$(call gb_LinkTarget_use_external_project,$(1),libzmf)
+
+endef
+define gb_ExternalProject__use_zmf
+$(call gb_ExternalProject_use_external_project,$(1),libzmf)
+
+endef
+
+endif # SYSTEM_ZMF
+
+
 ifneq ($(SYSTEM_VISIO),)
 
 define gb_LinkTarget__use_visio
diff --git a/config_host.mk.in b/config_host.mk.in
index 620df66..04613e1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -585,6 +585,7 @@ export SYSTEM_WPD=@SYSTEM_WPD@
 export SYSTEM_WPG=@SYSTEM_WPG@
 export SYSTEM_WPS=@SYSTEM_WPS@
 export SYSTEM_ZLIB=@SYSTEM_ZLIB@
+export SYSTEM_ZMF=@SYSTEM_ZMF@
 export TARFILE_LOCATION=@TARFILE_LOCATION@
 export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@
 export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@
@@ -655,6 +656,8 @@ export XRENDER_LIBS=$(gb_SPACE)@XRENDER_LIBS@
 export XSLTPROC=@XSLTPROC@
 export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
+export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@
+export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@
 
 # lang-related stuff
 include $(BUILDDIR)/config_$(gb_Side)_lang.mk
diff --git a/configure.ac b/configure.ac
index 590e326..c5e484b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7873,6 +7873,11 @@ dnl 
===
 libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
 
 dnl ===
+dnl Check for system libzmf
+dnl ===
+libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
+
+dnl ===
 dnl Check for system libvisio
 dnl ===
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 1993f0f..7741265 100644
--- a/download.lst
+++ b/download.lst
@@ -164,6 +164,8 @@ e

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

2016-06-23 Thread Miklos Vajna

 filter/Configuration_filter.mk   |1 
 filter/source/config/fragments/internalgraphicfilters/pdf_Import.xcu |   17 +
 include/vcl/graphicfilter.hxx|1 
 vcl/Library_vcl.mk   |1 
 vcl/source/filter/FilterConfigCache.cxx  |2 
 vcl/source/filter/graphicfilter.cxx  |   16 +
 vcl/source/filter/ipdf/pdfread.cxx   |  107 
++
 vcl/source/filter/ipdf/pdfread.hxx   |   21 +
 8 files changed, 165 insertions(+), 1 deletion(-)

New commits:
commit 878a860dff10bd91491d6c9f2f4e2308bfe4f0b2
Author: Miklos Vajna 
Date:   Thu Jun 23 12:53:54 2016 +0200

vcl: add initial PDF import-as-graphic filter

This allows Insert -> Image e.g. in Writer to read a PDF file, and
insert the metafile equivalent of the first page into the document.

Currently the original PDF document is lost on import (unlike when
inserting an SVG file).

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

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 5dd20f7..a17a00c 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -837,6 +837,7 @@ $(eval $(call 
filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter
pcd_Import_Base16 \
pct_Import \
pcx_Import \
+   pdf_Import \
pgm_Import \
png_Export \
png_Import \
diff --git 
a/filter/source/config/fragments/internalgraphicfilters/pdf_Import.xcu 
b/filter/source/config/fragments/internalgraphicfilters/pdf_Import.xcu
new file mode 100644
index 000..a1cc9ce
--- /dev/null
+++ b/filter/source/config/fragments/internalgraphicfilters/pdf_Import.xcu
@@ -0,0 +1,17 @@
+
+
+pdf_Portable_Document_Format
+SVIPDF
+PDF - Portable Document 
Format
+
+
+PDF - Portable Document Format
+
+IMPORT
+
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 4dc7ed5..4f32b17 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -75,6 +75,7 @@ namespace o3tl
 #define IMP_XBM "SVIXBM"
 #define IMP_XPM "SVIXPM"
 #define IMP_SVG "SVISVG"
+#define IMP_PDF "SVIPDF"
 #define EXP_BMP "SVBMP"
 #define EXP_SVMETAFILE  "SVMETAFILE"
 #define EXP_WMF "SVWMF"
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 78f38cf..d3c3f80 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -362,6 +362,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/filter/sgvtext \
 vcl/source/filter/igif/decode \
 vcl/source/filter/igif/gifread \
+vcl/source/filter/ipdf/pdfread \
 vcl/source/filter/ixbm/xbmread \
 vcl/source/filter/ixpm/xpmread \
 vcl/source/filter/jpeg/Exif \
diff --git a/vcl/source/filter/FilterConfigCache.cxx 
b/vcl/source/filter/FilterConfigCache.cxx
index dce03d7..d8d8862 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -42,7 +42,7 @@ const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameLi
 
 const char* 
FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameList[] =
 {
-IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV, IMP_SVG,
+IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV, IMP_SVG, IMP_PDF,
 EXP_SVMETAFILE, EXP_WMF, EXP_EMF, EXP_SVG, nullptr
 };
 
diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index da9d790..36c05eb 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include "igif/gifread.hxx"
+#include "ipdf/pdfread.hxx"
 #include "jpeg/jpeg.hxx"
 #include "ixbm/xbmread.hxx"
 #include "ixpm/xpmread.hxx"
@@ -763,6 +764,16 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, 
OUString& rFormatExtension,
 }
 }
 
+if (!bTest || rFormatExtension.startsWith("PDF"))
+{
+if ((sFirstBytes[0] == '%' && sFirstBytes[1] == 'P' && sFirstBytes[2] 
== 'D' &&
+ sFirstBytes[3] == 'F' && sFirstBytes[4] == '-'))
+{
+rFormatExtension = "PDF";
+return true;
+}
+}
+
 return bTest && !bSomethingTested;
 }
 
@@ -1685,6 +1696,11 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& 
rGraphic, const OUString& rPat
 break;
 }
 }
+else if (aFilterName == IMP_PDF)
+{
+if (!ImportPDF(rIStream, rGraphic))
+nStatus = GRFILTER_FILTERERROR;
+

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

2016-06-23 Thread Caolán McNamara

 reportdesign/source/ui/dlg/CondFormat.cxx |5 -
 reportdesign/source/ui/dlg/Condition.cxx  |1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 7bc9b583ab8d80fe3e03c0715f63e0421a802c5c
Author: CaolÃ¡n McNamara 
Date:   Wed Jun 22 12:22:20 2016 +0100

Resolves: tdf#100303 Report crashes on close of conditional formatting 
dialog

Condition multiply inherits so the Builder::disposeBuilder call was missed

and prenotify occurs during ::dispose when there is no 
m_pConditionPlayground
anymore, so m_pConditionPlayground == 0 where pPlaygroundCandidate is 0
passes, so a random widget gets cast to somethings its not, hence the bad
cast exception

Change-Id: I6d081dd55df1a68ab893294858e1ab0054d5e049
(cherry picked from commit 547e4b3a80708600edbc3f5669b4428877b5a951)
Reviewed-on: https://gerrit.libreoffice.org/26568
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx 
b/reportdesign/source/ui/dlg/CondFormat.cxx
index 910f4a0..c48f462 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -500,7 +500,10 @@ namespace rptui
 }
 case MouseNotifyEvent::GETFOCUS:
 {
-if ( m_bDeletingCondition )
+if (m_bDeletingCondition)
+break;
+
+if (!m_pConditionPlayground) //e.g. during dispose
 break;
 
 const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() );
diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 142be8a..36cf305 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -329,6 +329,7 @@ void Condition::dispose()
 m_pAddCondition.clear();
 m_pRemoveCondition.clear();
 m_pColorFloat.disposeAndClear();
+disposeBuilder();
 VclHBox::dispose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2016-06-23 Thread Michael Meeks

* Present:
+ Stephan, Sophie, Jan-Marek, Miklos, Michael M, Andras, Caolán,
  Kendy, Olivier, Norbert, Thorsten, Jan I, Robinson, Christian,
  Norbert, Heiko, Michael S, Bjoern (22 minutes in)
 
 * Completed Action Items:
+ back-port the per-processor thread-pool limit to 5-1 / 5-2 (Ashod)
+ Add & Welcome Giuseppe Castagno (Norbert, Stephan)
 
* Pending Action Items:
+ investigate a cron job that queries & auto-merges (Norbert)
 + if +2 by author and +1 by jenkins -> auto-push (on-going)
 [ some problem; stream events don't contain both +1 and +2 -
   a bit complicated; needs a query (Norbert) ]
+ tweak UI and get LiveConnect API key / build case for board (Christian)
+ attempt to re-build a recent gstreamer 1.0 / core spec file
  on our CentOS6 base (tdf#94508) (Christian)
 
* Release Engineering update (Christian)
+ 5.2 RC1
+ published today, on mirros & website.
+ fix included for lang-pack install on Mac/OS & packaging for Linux
+ looking good.
+ in good shape for bug-hunting & crash-reporting.
+ 5.2 RC2
+ July 5th
+ will create libreoffice 5-2-0 branch
+ 5.1.4.2 - released & announced
+ 5.1.5 rc1 : July 12th (week 28)
+ help strings issues ? (Caolan)
+ fixed the strings, but not the tool.
+ Android & iOS Remote
 
* Documentation (Olivier)
 + Updated chapters under revision and proof-reading,
   now ready for publishing.
 + more chapters to update on the way.
 + some help-content updates, due to translator bug finding.
 + Some improvements in Documentation page of the website - big buttons 
(Mike Saunders)
   http://www.libreoffice.org/get-help/documentation/
 
* GSoC 2016 (Thorsten)
+ Mid-Term evaluations! due June 26th
+ one pending !
+ ask/encourage students to submit & register for LibOCon
+ particularly for foreign students.
=> will be re-imbursed up to Eur 1k each, for more ask mentor.
 
* Heiko intro (Heiko)
+ studied psychology, did lots of stats, using computers
+ then moved into usability, started on LibreOffice some years ago.
 
* UX Update (Kendy/Heiko)
+ currently going through the draw tickets, to build a survey (Heiko)
+ surprising how many ways people have to deal with it
+ several feature-requests that can be solved,
  benefitting the whole project
  + eg. navigator / object selection.
+ last meeting: (Kendy)
+ GSOC review
+ question on extensions - bring it here:
+ how much do we want to encourage people to create extensions ?
+ examples for possible extensions: 
+ https://bugs.documentfoundation.org/show_bug.cgi?id=91874 
(spotlight feature)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=94148 
(color reader)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=67090 
(barcode)
+ what to add to the core vs. extensions.
+ so far - ext'ns done by volunteers / external people.
+ finding things in BZ - that could be done as extensions
+ make little sense in the core.
+ keep core simple & clean - but keep it simple and clean.
+ eg. bar-code extension.
+ like simplicity & extensions.
+ one view: extension API awful (Michael)
+ really horribly hard to write document elements with them.
+ another view: beneficial (Stephan)
+ helps to have people finding problems & improving
  APIs & integration.
+ had problems in the past with "bundled extensions"
+ one more: (Thorsten)
+ used to hate extensions,
+ but there is a hard barrier around C++
+ lots of Java / Python people out there.
+ mostly griping about the API surface not UNO (Michael)
+ bar-code horribly implemented too (Michael)
=> not at the stage of some blog-post for direction here (Kendy)
+ good to encourage people to write extensions of course.
+ case-by-case basis.
+ plus of extensions: portability between versions (JMux)
+ saves compiling their own version.
 
* Crashtest update (Caolan)
+ 1 import failures, 119 export failure, 0 coverity
+ earlier in the week was 0, 0, 0.
+ 119 failure are from new colormap index asserts and now fixed at png/bmp 
load time
+ Tor's 4bit bug-fix uncovered lots of evil.
+ should we be more bold converting dbg asserts to real ones ? 
(Thorsten)
+ if around to fix the fallout (Miklos)
+ eg. base URL of document not-empty etc.
+ prolly more here around binary validation (Thorsten)
+ looking good.
+ would be great to load as 24bit and ignore after that (Caolan)
 
* H

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

2016-06-23 Thread Justin Luth

 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |   12 +---
 sw/source/core/layout/flowfrm.cxx |5 -
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 272437706372eaac9bf1d748723196c573ac
Author: Justin Luth 
Date:   Sat Jun 11 10:30:18 2016 +0300

tdf#76349 writer: treat single-column break as page break

Writerfilter imports docx-defined column breaks that exist without
being in a column.  Word treats these as if they were a page break.
Writer basically just preserved and ignored them.

I limited the fix to only consider SVX_BREAK_COLUMN_BEFORE since
writerfilter is only given âcolumn breakâ and treats it as 
column_before.

Change-Id: I0d974441d53243c4426048dd7cb60b3897b803f6
Reviewed-on: https://gerrit.libreoffice.org/26181
Tested-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index bc2eab2..a6282d6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -362,9 +362,15 @@ 
DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,"fdo74153.docx")
  * The  was missing after roundtrip
  */
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
-assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:r[1]/w:br","type","column");
+if (pXmlDoc)
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:r[1]/w:br","type","column");
+
+//tdf76349 match Word's behavior of treating breaks in single columns as 
page breaks.
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testIndentation, "test_indentation.docx")
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 7946f5b..dad6f97 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1127,8 +1127,11 @@ bool SwFlowFrame::IsPageBreak( bool bAct ) const
 return false;
 }
 
+//for compatibility, also break at column break if no columns exist
 const SvxBreak eBreak = pSet->GetBreak().GetBreak();
-if ( eBreak == SVX_BREAK_PAGE_BEFORE || eBreak == 
SVX_BREAK_PAGE_BOTH )
+if ( eBreak == SVX_BREAK_PAGE_BEFORE ||
+ eBreak == SVX_BREAK_PAGE_BOTH ||
+ (eBreak == SVX_BREAK_COLUMN_BEFORE && 
!m_rThis.FindColFrame()) )
 return true;
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Stephan Bergmann

 include/svl/poolitem.hxx |   15 ---
 svl/source/config/cjkoptions.cxx |3 ++-
 svl/source/items/itemprop.cxx|4 +++-
 svl/source/misc/fstathelper.cxx  |3 ++-
 svl/source/numbers/numfmuno.cxx  |5 +++--
 5 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 4809fedd7cd3443100fba1c776267e2d87eb3f95
Author: Stephan Bergmann 
Date:   Tue Jun 21 15:48:59 2016 +0200

Clean up uses of Any::getValue() in svl

Change-Id: I2005ce59d6211181ed039eaff60ffd31084e1d40

diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index f2f9f29..986c6e0 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -50,18 +50,11 @@ enum SfxItemKind {
 inline bool Any2Bool( const css::uno::Any&rValue )
 {
 bool bValue = false;
-if( rValue.hasValue() )
+if( !(rValue >>= bValue) )
 {
-if( rValue.getValueType() == cppu::UnoType::get() )
-{
-bValue = *static_cast(rValue.getValue());
-}
-else
-{
-sal_Int32 nNum = 0;
-if( rValue >>= nNum )
-bValue = nNum != 0;
-}
+sal_Int32 nNum = 0;
+if( rValue >>= nNum )
+bValue = nNum != 0;
 }
 
 return bValue;
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index e0b1b9e..c16cccf 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -19,6 +19,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -179,7 +180,7 @@ void SvtCJKOptions_Impl::Load()
 {
 if( pValues[nProp].hasValue() )
 {
-bool bValue = *static_cast(pValues[nProp].getValue());
+bool bValue = *o3tl::doAccess(pValues[nProp]);
 switch ( nProp )
 {
 case 0: { bCJKFont = bValue; bROCJKFont = 
pROStates[nProp]; } break;
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 639c1f3..69f78e5 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
+#include 
 #include 
 #include 
 #include 
@@ -198,7 +200,7 @@ void SfxItemPropertySet::getPropertyValue( const 
SfxItemPropertySimpleEntry& rEn
 if( rEntry.aType.getTypeClass() == TypeClass_ENUM &&
  rAny.getValueTypeClass() == TypeClass_LONG )
 {
-sal_Int32 nTmp = *static_cast(rAny.getValue());
+sal_Int32 nTmp = *o3tl::forceAccess(rAny);
 rAny.setValue( &nTmp, rEntry.aType );
 }
 }
diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 6f8a184..6530ff7 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -43,7 +44,7 @@ bool FStatHelper::GetModifiedDateTimeOfFile( const OUString& 
rURL,
 if( aAny.hasValue() )
 {
 bRet = true;
-const util::DateTime* pDT = static_cast(aAny.getValue());
+auto pDT = o3tl::doAccess(aAny);
 if( pDate )
 *pDate = Date( pDT->Day, pDT->Month, pDT->Year );
 if( pTime )
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 0047c34..3e9436f 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -952,8 +953,8 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( 
const OUString& aProp
 if (aPropertyName == PROPERTYNAME_NOZERO)
 {
 //  operator >>= shouldn't be used for bool (?)
-if ( aValue.getValueTypeClass() == uno::TypeClass_BOOLEAN )
-pFormatter->SetNoZero( *static_cast(aValue.getValue()) );
+if ( auto b = o3tl::tryAccess(aValue) )
+pFormatter->SetNoZero( *b );
 }
 else if (aPropertyName == PROPERTYNAME_NULLDATE)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Tor Lillqvist

 cui/source/options/optopencl.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c7c27b9b191291cf36e4940aef3e3e7371855797
Author: Tor Lillqvist 
Date:   Thu Jun 23 17:40:30 2016 +0300

tdf#100222: Inform user that a restart is needed after toggling OpenCL use

Change-Id: Ic33cb02440276bc0601c86f2c9eab7d74a6b9874

diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 025cc39..776bb0f 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -167,6 +167,9 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
 {
 maConfig.set();
 bModified = true;
+
+ScopedVclPtrInstance aWarnBox(this, 
CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VclMessageType::Info);
+aWarnBox->Execute();
 }
 
 if (bModified)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Caolán McNamara

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

New commits:
commit 83f977c7f40d1a5fb975b8ce7c9958c992dba3f1
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 10:24:49 2016 +0100

Resolves: tdf#100460 queryContentCells doesn't count annotations...

since

commit c06dbbe7594c2a0b5a5b19f8e183d9c421e6e094
Author: Markus Mohrhard 
Date:   Thu Feb 23 23:36:49 2012 +0100

remove mpNote from ScBaseCell

Change-Id: I281a207e26aec8886b1f46b9279e1135b61586da

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 46c69d2..3801f5b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3601,7 +3601,17 @@ uno::Reference SAL_CALL 
ScCellRangesBase::queryContentC
 if (bAdd)
 aMarkData.SetMultiMarkArea(aIter.GetPos());
 }
+}
+
+if (nContentFlags & sheet::CellFlags::ANNOTATION)
+{
+std::vector aNotes;
+rDoc.GetNotesInRange(aRanges, aNotes);
 
+for (const auto& i : aNotes)
+{
+aMarkData.SetMultiMarkArea(i.maPos);
+}
 }
 
 ScRangeList aNewRanges;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Tor Lillqvist

 sc/source/core/opencl/formulagroupcl.cxx |   66 +
 sc/source/core/opencl/op_database.cxx|  148 +++
 sc/source/core/opencl/op_logical.cxx |2 
 sc/source/core/opencl/op_math.cxx|   10 +-
 sc/source/core/opencl/op_statistical.cxx |   14 +-
 sc/source/core/opencl/opbase.cxx |2 
 sc/source/core/opencl/opbase.hxx |4 
 7 files changed, 134 insertions(+), 112 deletions(-)

New commits:
commit 7000e1a0640156645252d15d505949bff3d1eb4a
Author: Tor Lillqvist 
Date:   Thu Jun 23 16:57:25 2016 +0300

Improve OpenCL logging and warnings

Explicitly catch and report the 'Unhandled' and 'OpenCLError'
exceptions, too, in DynamicKernel::create, instead of relying on a
catch(...).

(Actually not sure why we need three separate classes of OpenCL
handling exceptions.)

We have the code to show the file and line where something exceptional
(or actually not so exceptional) happens with OpenCL, so make use of
that then.

It is a perfectly normal thing to throw (and catch) at least the
UnhandledToken and Unhandled exceptions (when compiling a formula and
noticing that we don't want to use OpenCL for it after all), so it
does not make sense SAL_WARN about them. Just SAL_INFO is fine.

Change-Id: I56770f47622cb4bc40f2216c5e78d3da3c7c9adf

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index c3167e3..3427d9f 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -203,7 +203,7 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, 
cl_program )
 }
 else
 {
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 }
 // Obtain cl context
 ::opencl::KernelEnv kEnv;
@@ -280,7 +280,7 @@ public:
 {
 std::stringstream ss;
 if (GetFormulaToken()->GetType() != formula::svString)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 FormulaToken* Tok = GetFormulaToken();
 ss << Tok->GetString().getString().toAsciiUpperCase().hashCode() << 
"U";
 return ss.str();
@@ -301,7 +301,7 @@ public:
 }
 else
 {
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 }
 
 // Pass the scalar result back to the rest of the formula kernel
@@ -336,7 +336,7 @@ public:
 virtual std::string GenSlidingWindowDeclRef( bool = false ) const override
 {
 if (GetFormulaToken()->GetType() != formula::svDouble)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 return mSymName;
 }
 virtual size_t GetWindowSize() const override
@@ -347,7 +347,7 @@ public:
 {
 FormulaToken* Tok = GetFormulaToken();
 if (Tok->GetType() != formula::svDouble)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 return Tok->GetDouble();
 }
 /// Create buffer and pass the buffer to a given kernel
@@ -963,7 +963,7 @@ public:
 {
 FormulaToken* t = ft->GetFormulaToken();
 if (t->GetType() != formula::svDoubleVectorRef)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 mpDVR = static_cast(t);
 bIsStartFixed = mpDVR->IsStartFixed();
 bIsEndFixed = mpDVR->IsEndFixed();
@@ -1263,7 +1263,7 @@ public:
 {
 FormulaToken* t = ft->GetFormulaToken();
 if (t->GetType() != formula::svDoubleVectorRef)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 mpDVR = static_cast(t);
 bIsStartFixed = mpDVR->IsStartFixed();
 bIsEndFixed = mpDVR->IsEndFixed();
@@ -1493,7 +1493,7 @@ public:
 size_t nCurWindowSize = mpDVR->GetRefRowSize();
 // create clmem buffer
 if (mpDVR->GetArrays()[Base::mnIndex].mpNumericArray == nullptr)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 double* pHostBuffer = const_cast(
 mpDVR->GetArrays()[Base::mnIndex].mpNumericArray);
 size_t szHostBuffer = nInput * sizeof(double);
@@ -1854,7 +1854,7 @@ public:
 ((!pCurDVR->IsStartFixed() && !pCurDVR->IsEndFixed())
 || (pCurDVR->IsStartFixed() && pCurDVR->IsEndFixed()))
 )
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 }
 }
 ss << ") {\n";
@@ -2498,7 +2498,7 @@ public:
 else
 {
 if (mvSubArguments.size() != 2)
-throw Unhandled();
+throw Unhandled(__FILE__, __LINE__);
 bool bArgument1_NeedNested =
 mvSubArguments[0]->GetFormulaToken()->GetType()
 != formula::svSingleVectorRef;
@@ -2612,10 +2612,10 @@ 
Dynam

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

2016-06-23 Thread Caolán McNamara

 sc/qa/unit/ucalc.cxx|6 ++
 sc/source/core/data/column4.cxx |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 84dc0157df9cb173ec74da2bd27507329efc3816
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 14:40:15 2016 +0100

Related: tdf#100460 GetNotesInRange doesn't count last cell in range

e.g. open document from tdf#100460 and select select A20:A21 and right click
and there is a hide comment entry. Shrink the selection to just A20 (which 
has
the comment in it) and the right click menu has no hide comment entry in it.

std::for_each(it, itEnd

means it < itEnd but here we want the rows indicated by

nStartRow <= nEndRow

so we need to increment itEnd by one to get the right range

Change-Id: I48e8c0748f520671e09f04b16961bf9729960317

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9cecacc..5a38c92 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4980,6 +4980,12 @@ void Test::testNoteCopyPaste()
 CPPUNIT_ASSERT(pNote);
 CPPUNIT_ASSERT_EQUAL(OUString("Note2"), pNote->GetText());
 
+// Test that GetNotesInRange includes the end of its range
+// and so can find the note
+std::vector aNotes;
+m_pDoc->GetNotesInRange(ScRange(1,7,0), aNotes);
+CPPUNIT_ASSERT_EQUAL(size_t(1), aNotes.size());
+
 m_pDoc->DeleteTab(0);
 }
 
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index e145e75..6e8e4da 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -701,7 +701,7 @@ void ScColumn::GetNotesInRange(SCROW nStartRow, SCROW 
nEndRow,
 maCellNotes.position(nEndRow);
 sc::CellNoteStoreType::const_iterator itEnd = aEndPos.first;
 
-std::for_each(it, itEnd, NoteEntryCollector(rNotes, nTab, nCol, nStartRow, 
nEndRow));
+std::for_each(it, ++itEnd, NoteEntryCollector(rNotes, nTab, nCol, 
nStartRow, nEndRow));
 }
 
 namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Muhammet Kara

 basctl/source/basicide/localizationmgr.cxx |   53 +
 1 file changed, 25 insertions(+), 28 deletions(-)

New commits:
commit 456902abb40397e45f30efdfa2433d9d773d5344
Author: Muhammet Kara 
Date:   Thu Jun 23 10:54:49 2016 +0300

Improve readability of OUString concatanation in LocalizationMgr

It is more readable and more efficient as a bonus.
See: https://goo.gl/jsVAwy:

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

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index 19604dc..e9dbf62 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -171,10 +171,10 @@ OUString implCreatePureResourceId
   const Reference< XStringResourceManager >& xStringResourceManager )
 {
 sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
-OUString aPureIdStr = OUString::number( nUniqueId );
-aPureIdStr += aDot;
-aPureIdStr += aDialogName;
-aPureIdStr += aDot;
+OUString aPureIdStr = OUString::number( nUniqueId )
++ aDot
++ aDialogName
++ aDot;
 if( !aCtrlName.isEmpty() )
 {
 aPureIdStr += aCtrlName;
@@ -402,10 +402,10 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 aIdStrings.realloc( nPropStringCount );
 OUString* pIdStrings = aIdStrings.getArray();
 
-OUString aIdStrBase = aDot;
-aIdStrBase += aCtrlName;
-aIdStrBase += aDot;
-aIdStrBase += aPropName;
+OUString aIdStrBase = aDot
++ aCtrlName
++ aDot
++ aPropName;
 
 const Locale* pLocales = aLocaleSeq.getConstArray();
 sal_Int32 i;
@@ -420,8 +420,8 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 }
 
 sal_Int32 nUniqueId = 
xStringResourceManager->getUniqueNumericId();
-OUString aPureIdStr = OUString::number( nUniqueId 
);
-aPureIdStr += aIdStrBase;
+OUString aPureIdStr = OUString::number( nUniqueId )
++ aIdStrBase;
 
 // Set Id for all locales
 for( sal_Int32 iLocale = 0 ; iLocale < 
nLocaleCount ; iLocale++ )
@@ -430,8 +430,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 xStringResourceManager->setStringForLocale( 
aPureIdStr, aPropStr, rLocale );
 }
 
-OUString aPropIdStr = aEsc;
-aPropIdStr += aPureIdStr;
+OUString aPropIdStr = aEsc + aPureIdStr;
 pIdStrings[i] = aPropIdStr;
 }
 xPropertySet->setPropertyValue( aPropName, 
Any(aIdStrings) );
@@ -499,10 +498,10 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 aIdStrings.realloc( nPropStringCount );
 OUString* pIdStrings = aIdStrings.getArray();
 
-OUString aIdStrBase = aDot;
-aIdStrBase += aCtrlName;
-aIdStrBase += aDot;
-aIdStrBase += aPropName;
+OUString aIdStrBase = aDot
++ aCtrlName
++ aDot
++ aPropName;
 
 const Locale* pLocales = aLocaleSeq.getConstArray();
 sal_Int32 i;
@@ -512,8 +511,8 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 OUString aPureSourceIdStr = aSourceIdStr.copy( 1 );
 
 sal_Int32 nUniqueId = 
xStringResourceManager->getUniqueNumericId();
-OUString aPureIdStr = OUString::number( nUniqueId 
);
-aPureIdStr += aIdStrBase;
+OUString aPureIdStr = OUString::number( nUniqueId )
++ aIdStrBase;
 
 // Set Id for all locales
 for( sal_Int32 iLocale = 0 ; iLocale < 
nLocaleCount ; iLocale++ )
@@ -532,8 +531,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
 {}

[ANN] LibreOffice 5.2.0 RC1 available

2016-06-23 Thread Christian Lohmaier

Dear Community,

The Document Foundation is pleased to announce the first release
candidate of LibreOffice 5.2.0. The upcoming 5.2.0 will be the first
release of our fresh 5.2 line. Please be aware that LibreOffice 5.2.0
RC1 has not been flagged as ready for production use yet, however feel
free to give it a try instead of 5.0.6 of 5.1.4.

A work-in-progress list of new features in LibreOffice 5.2 can be
found at https://wiki.documentfoundation.org/ReleaseNotes/5.2

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Windows builds are also provided in 64bit version.

Developers and QA might also be interested in the symbol server for
windows debug information (see
https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg
for
details)

Should you find bugs, please report them to our Bugzilla:

  https://bugs.documentfoundation.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/community/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/LibreOffice_Localization_Guide

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs compared to 5.2.0 beta2 is
available from our wiki:

  http://wiki.documentfoundation.org/Releases/5.2.0/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

On behalf of the Community,

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

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

2016-06-23 Thread Caolán McNamara

 sfx2/uiconfig/ui/startcenter.ui |4 ++--
 vcl/source/window/builder.cxx   |   27 +++
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 1413c5d39a45329b47c85511a3161c6f5a43c4f8
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 14:31:18 2016 +0100

map MenuToggleButton to GtkToggleButton with a custom menu property

we don't have non-menu ToggleButtons yet, so thats not done here.

since we first started with GtkPushButton:menu_attrib to indicate
menubuttons gtk has grown menu buttons, but they don't have the
idea of a gtktogglemenu button, so this attribute still has a role
to play I guess

Change-Id: Iebfe5ccf996e22784cf9aaf2bcf367eed79ae686

diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 68ab548..79b1484 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -171,7 +171,7 @@
   
 
 
-  
+  
 _Recent 
Files
 True
 True
@@ -190,7 +190,7 @@
   
 
 
-  
+  
 T_emplates
 True
 True
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index fc8069e..2f1fd3d 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -942,6 +942,22 @@ namespace
 return xWindow;
 }
 
+VclPtr extractStockAndBuildMenuToggleButton(vcl::Window *pParent, 
VclBuilder::stringmap &rMap)
+{
+WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
+
+nBits |= extractRelief(rMap);
+
+VclPtr xWindow = VclPtr::Create(pParent, 
nBits);
+
+if (extractStock(rMap))
+{
+xWindow->SetText(getStockText(extractLabel(rMap)));
+}
+
+return xWindow;
+}
+
 OString extractUnit(const OString& sPattern)
 {
 OString sUnit(sPattern);
@@ -1370,6 +1386,17 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 setupFromActionName(xButton, rMap, m_xFrame);
 xWindow = xButton;
 }
+else if (name == "GtkToggleButton")
+{
+VclPtr xButton;
+OString sMenu = extractCustomProperty(rMap);
+assert(sMenu.getLength() && "not implemented yet");
+xButton = extractStockAndBuildMenuToggleButton(pParent, rMap);
+m_pParserState->m_aButtonMenuMaps.push_back(ButtonMenuMap(id, sMenu));
+xButton->SetImageAlign(ImageAlign::Left); //default to left
+setupFromActionName(xButton, rMap, m_xFrame);
+xWindow = xButton;
+}
 else if (name == "GtkRadioButton")
 {
 extractGroup(id, rMap);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Collabora Online 1.0 Roadmap and Questions

2016-06-23 Thread Andrew McGlashan

Hi Michael,

On 23/06/2016 3:13 AM, Michael Meeks wrote:
> On Wed, 2016-06-22 at 11:38 -0400, Adam Saunders wrote:
>> I'm in the midst of writing a news article about the Collabora Online
>> 1.0 release. I had a couple questions for you:
> 
>   Let me get to those privately - some of the answers don't really belong
> on this list.

WHY?  Please share to the list too.

Thanks
A.



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

[Libreoffice-commits] core.git: include/svx svx/AllLangResTarget_svx.mk svx/Library_svxcore.mk svx/source sw/sdi sw/source sw/uiconfig

2016-06-23 Thread Susobhan Ghosh

 include/svx/SvxNumOptionsTabPageHelper.hxx   |   52 ++
 include/svx/dialogs.hrc  |3 
 include/svx/pagenumberlistbox.hxx|   36 +
 svx/AllLangResTarget_svx.mk  |1 
 svx/Library_svxcore.mk   |2 
 svx/source/dialog/SvxNumOptionsTabPageHelper.cxx |   91 
 svx/source/dialog/pagenumbering.src  |   31 +
 svx/source/dialog/pagenumberlistbox.cxx  |   69 +++
 sw/sdi/_viewsh.sdi   |   25 +
 sw/source/uibase/sidebar/PageStylesPanel.cxx |  504 ++-
 sw/source/uibase/sidebar/PageStylesPanel.hxx |   57 ++
 sw/source/uibase/sidebar/SwPanelFactory.cxx  |2 
 sw/source/uibase/uiview/viewtab.cxx  |  124 +
 sw/uiconfig/swriter/ui/pagestylespanel.ui|  153 ++
 14 files changed, 1119 insertions(+), 31 deletions(-)

New commits:
commit 3881fffe4233ce3aa02051b205c114c1cb520d67
Author: Susobhan Ghosh 
Date:   Tue Jun 7 19:20:22 2016 +0530

tdf#83830: Page Styles Panel

Added new helper class to svx for numbering

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

diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx 
b/include/svx/SvxNumOptionsTabPageHelper.hxx
new file mode 100644
index 000..89fd68d
--- /dev/null
+++ b/include/svx/SvxNumOptionsTabPageHelper.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVX_SVXNUMOPTIONSTABPAGEHELPER_HXX
+#define INCLUDED_SVX_SVXNUMOPTIONSTABPAGEHELPER_HXX
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace css::uno;
+using namespace css::text;
+
+class SVX_DLLPUBLIC SvxNumOptionsTabPageHelper
+{
+public:
+static Reference GetNumberingProvider();
+
+/** Get the numberings provided by the i18n framework (CTL, Asian, ...) and
+add them to the listbox. Extended numbering schemes present in the
+resource and already in the listbox but not offered by the i18n
+framework per configuration are removed.
+
+@param nDoNotRemove
+A value that shall not be removed, i.e. the ugly 0x88
+(SVX_NUM_BITMAP|0x80)
+Pass ::std::numeric_limits::max() if there is no such
+restriction.
+*/
+static void GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotRemove );
+};
+
+#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 45ac305..c2af3bc 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -1075,9 +1075,10 @@
 #define RID_SVXIMG_WIDTH_CUSTOM_GRAY (RID_SVX_START + 1394)
 #define RID_SVXSTRARY_PAPERSIZE_STD  (RID_SVX_START + 1395)
 #define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 1396)
+#define RID_SVXSTRARY_PAGE_NUMBERING (RID_SVX_START + 1397)
 
 // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new 
RIDs for Strings !!!
-#define RID_SVXSTR_NEXTFREE  (RID_SVX_START + 1397)
+#define RID_SVXSTR_NEXTFREE  (RID_SVX_START + 1398)
 
 // if we have _a_lot_ time, we should group the resource ids by type, instead
 // of grouping them by semantics. The reason is that resource ids have to be
diff --git a/include/svx/pagenumberlistbox.hxx 
b/include/svx/pagenumberlistbox.hxx
new file mode 100644
index 000..872a3f2
--- /dev/null
+++ b/include/svx/pagenumberlistbox.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.

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

2016-06-23 Thread Noel Grandin

 compilerplugins/clang/singlevalfields.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2fe32490f097ac107603ba5b1fa15599d720b8f6
Author: Noel Grandin 
Date:   Thu Jun 23 15:13:58 2016 +0200

loplugin singlevalfields, need to check default constructor code too

Change-Id: Idcc8de6f1d403a57c59e84774bd7a97e2f3fc224

diff --git a/compilerplugins/clang/singlevalfields.cxx 
b/compilerplugins/clang/singlevalfields.cxx
index 1a511ab..6d94ef7 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -90,6 +90,8 @@ public:
 }
 
 bool shouldVisitTemplateInstantiations () const { return true; }
+// to catch compiler-generated constructors
+bool shouldVisitImplicitCode() const { return true; }
 
 bool VisitFieldDecl( const FieldDecl* );
 bool VisitMemberExpr( const MemberExpr* );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Stephan Bergmann

 connectivity/source/drivers/postgresql/pq_tools.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7de0439fe25d3d2b133253db76df6515bb272389
Author: Stephan Bergmann 
Date:   Thu Jun 23 15:08:26 2016 +0200

loplugin:unusedvariablecheck

Change-Id: Ia9c5ea707990d03dd4042c2e0a791976cc1b5f74

diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx 
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 0312dde..2d0bc57e 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -465,7 +465,6 @@ void splitSQL( const OString & sql, OStringVector &vec )
 
 void splitDoubleQuoteEscapedIdentifiers( const OUString & source, OUString 
*first, OUString *second)
 {
-OStringVector vec;
 int a = source.indexOf("\".\"");
 OString tempstring = OUStringToOString(source , RTL_TEXTENCODING_UTF8);
 if(a > 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Stephan Bergmann

 compilerplugins/clang/singlevalfields.cxx |   27 ---
 1 file changed, 27 deletions(-)

New commits:
commit b498cf62624b842b81a26872a14fa62f8fe3a12e
Author: Stephan Bergmann 
Date:   Thu Jun 23 15:03:04 2016 +0200

-Werror=unused-function

Change-Id: Ib579e8896a751383d31c1dbf7e6ebf5c0774a976

diff --git a/compilerplugins/clang/singlevalfields.cxx 
b/compilerplugins/clang/singlevalfields.cxx
index 368b767..1a511ab 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -96,7 +96,6 @@ public:
 bool VisitCXXConstructorDecl( const CXXConstructorDecl* );
 private:
 void niceName(const FieldDecl*, MyFieldInfo&);
-std::string fullyQualifiedName(const FunctionDecl*);
 std::string getExprValue(const Expr*);
 bool isInterestingType(const QualType&);
 const FunctionDecl* get_top_FunctionDecl_from_Stmt(const Stmt&);
@@ -112,32 +111,6 @@ void SingleValFields::niceName(const FieldDecl* fieldDecl, 
MyFieldInfo& aInfo)
 aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + 
std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
 }
 
-std::string SingleValFields::fullyQualifiedName(const FunctionDecl* 
functionDecl)
-{
-std::string ret = 
compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
-ret += " ";
-if (isa(functionDecl)) {
-const CXXRecordDecl* recordDecl = 
dyn_cast(functionDecl)->getParent();
-ret += recordDecl->getQualifiedNameAsString();
-ret += "::";
-}
-ret += functionDecl->getNameAsString() + "(";
-bool bFirst = true;
-for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
-if (bFirst)
-bFirst = false;
-else
-ret += ",";
-ret += pParmVarDecl->getType().getCanonicalType().getAsString();
-}
-ret += ")";
-if (isa(functionDecl) && 
dyn_cast(functionDecl)->isConst()) {
-ret += " const";
-}
-
-return ret;
-}
-
 bool SingleValFields::VisitFieldDecl( const FieldDecl* fieldDecl )
 {
 fieldDecl = fieldDecl->getCanonicalDecl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Stephan Bergmann

 compilerplugins/clang/singlevalfields.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 20f58e790441bf62bd9e3ed575a1d97f7144e85c
Author: Stephan Bergmann 
Date:   Thu Jun 23 15:02:01 2016 +0200

-Werror=unused-but-set-variable

Change-Id: I0b3586bb3acca4075b26790a8dfe3f97d6921feb

diff --git a/compilerplugins/clang/singlevalfields.cxx 
b/compilerplugins/clang/singlevalfields.cxx
index b1c7cc8..368b767 100644
--- a/compilerplugins/clang/singlevalfields.cxx
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -278,7 +278,6 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* 
memberExpr )
 if (!functionDecl) {
 break;
 }
-bool bFound = false;
 for (unsigned i = 0; i < callExpr->getNumArgs(); ++i) {
 if (i >= functionDecl->getNumParams()) // can happen in 
template code
 break;
@@ -289,7 +288,6 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* 
memberExpr )
 assignValue = "?";
 bPotentiallyAssignedTo = true;
 }
-bFound = true;
 break;
 }
 }
@@ -299,7 +297,6 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* 
memberExpr )
 {
 const CXXConstructExpr* consExpr = 
dyn_cast(parent);
 const CXXConstructorDecl* consDecl = consExpr->getConstructor();
-bool bFound = false;
 for (unsigned i = 0; i < consExpr->getNumArgs(); ++i) {
 if (i >= consDecl->getNumParams()) // can happen in template 
code
 break;
@@ -310,7 +307,6 @@ bool SingleValFields::VisitMemberExpr( const MemberExpr* 
memberExpr )
 assignValue = "?";
 bPotentiallyAssignedTo = true;
 }
-bFound = true;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

2016-06-23 Thread Michael Stahl

 Makefile.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 496cba2e8b3fdf72812d67602306d1d4700a8d60
Author: Michael Stahl 
Date:   Thu Jun 23 14:34:15 2016 +0200

Makefile: move check-if-root earlier

Somebody who might invoke make as root might also invoke make with -j,
so don't start building in that case.

Change-Id: I0c87aba948cd78a23ad4c49f880700f65684424c

diff --git a/Makefile.in b/Makefile.in
index 23ccc95..6997756 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
 
 else # MAKE_RESTARTS
 
-all: check-if-root build
+all: build
 
 check-if-root:
@if test `id -u` = 0; then \
@@ -240,9 +240,9 @@ fetch:
 endif
 
 #
-# Bootstap
+# Bootstrap
 #
-bootstrap: compilerplugins
+bootstrap: check-if-root compilerplugins
 
 #
 # Build
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -

2016-06-23 Thread László Németh

 0 files changed

New commits:
commit 9eebe5dcbcea1e7481c988816ff5cbdb05847082
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 23 13:55:30 2016 +0200

empty commit (repeat)

Change-Id: I538d6acc978219fedbd067caa8150a5c0f7a6e65
commit faecb12969873aea9dcf18b075ba3b8858319f68
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 23 13:55:21 2016 +0200

empty commit (repeat)

Change-Id: Ib551a128ba1e8f03280afb96b172057d3a62df36
commit 7f71a7915bb5f22142f6a203875aab0cdb9fb9cb
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 23 13:53:33 2016 +0200

empty commit (setPosSize without proc. idle, text typing more proc. idle)

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svtools/source

2016-06-23 Thread Caolán McNamara

 svtools/source/misc/ehdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 401dfdc7f25cb112face662c3fa8aff7ec9c6ef1
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 09:41:40 2016 +0100

VclPtr: svtools error message dialog doesn't dispose

Change-Id: I83640cc60d5e0239d228c749c32f896df5e2d9f2
(cherry picked from commit d531743ca34232aedc0b437a9ff5807dea8d51ed)
Reviewed-on: https://gerrit.libreoffice.org/26588
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index c724871..876e992 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -137,6 +137,7 @@ static sal_uInt16 aWndFunc(
 SAL_WARN( "svtools.misc", "Unknown MessBox return value" );
 break;
 }
+pBox.disposeAndClear();
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Caolán McNamara

 svtools/source/misc/ehdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0effc85942dcfc1b2f96a5671e0acc8f05d47db3
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 09:41:40 2016 +0100

VclPtr: svtools error message dialog doesn't dispose

Change-Id: I83640cc60d5e0239d228c749c32f896df5e2d9f2
(cherry picked from commit d531743ca34232aedc0b437a9ff5807dea8d51ed)
Reviewed-on: https://gerrit.libreoffice.org/26587
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 4579966..6f0864d 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -137,6 +137,7 @@ static sal_uInt16 aWndFunc(
 SAL_WARN( "svtools.misc", "Unknown MessBox return value" );
 break;
 }
+pBox.disposeAndClear();
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Noel Grandin

 compilerplugins/clang/constantparam.cxx   |3 
 compilerplugins/clang/singlevalfields.cxx |  411 ++
 compilerplugins/clang/singlevalfields.py  |   69 +
 3 files changed, 481 insertions(+), 2 deletions(-)

New commits:
commit 8d861bd7028a6ac3cf21ca9758d1f72eef2ac05c
Author: Noel Grandin 
Date:   Thu Jun 23 13:12:53 2016 +0200

new loplugin: singlevalfields

look for fields that only have a single constant value assigned to them

Change-Id: Iafcd37fdb8a8119bbc00f92981a1a01badf9c5a2

diff --git a/compilerplugins/clang/constantparam.cxx 
b/compilerplugins/clang/constantparam.cxx
index 99db545..54fe00c 100644
--- a/compilerplugins/clang/constantparam.cxx
+++ b/compilerplugins/clang/constantparam.cxx
@@ -16,8 +16,7 @@
 #include "compat.hxx"
 
 /*
- Find methods with default params, where the callers never specify the default 
param i.e.
- might as well remove it.
+  Find params on methods where the param is only ever passed as a single 
constant value.
 
  The process goes something like this:
   $ make check
diff --git a/compilerplugins/clang/singlevalfields.cxx 
b/compilerplugins/clang/singlevalfields.cxx
new file mode 100644
index 000..b1c7cc8
--- /dev/null
+++ b/compilerplugins/clang/singlevalfields.cxx
@@ -0,0 +1,411 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "plugin.hxx"
+#include "compat.hxx"
+
+/**
+Look for fields that are only ever assigned a single constant value.
+
+We dmp a list of values assigned to fields, and a list of field definitions.
+Then we will post-process the 2 lists and find the set of interesting fields.
+
+Be warned that it produces around 5G of log file.
+
+The process goes something like this:
+  $ make check
+  $ make FORCE_COMPILE_ALL=1 COMPILER_PLUGIN_TOOL='singlevalfields' check
+  $ ./compilerplugins/clang/singlevalfields.py
+
+Note that the actual process may involve a fair amount of undoing, hand 
editing, and general messing around
+to get it to work :-)
+
+@TODO we don't spot fields that have been zero-initialised via calloc or 
rtl_allocateZeroMemory
+
+*/
+
+namespace {
+
+struct MyFieldInfo
+{
+std::string parentClass;
+std::string fieldName;
+std::string sourceLocation;
+};
+bool operator < (const MyFieldInfo &lhs, const MyFieldInfo &rhs)
+{
+return std::tie(lhs.parentClass, lhs.fieldName)
+ < std::tie(rhs.parentClass, rhs.fieldName);
+}
+
+struct MyFieldAssignmentInfo : public MyFieldInfo
+{
+std::string value;
+};
+
+bool operator < (const MyFieldAssignmentInfo &lhs, const MyFieldAssignmentInfo 
&rhs)
+{
+return std::tie(lhs.parentClass, lhs.fieldName, lhs.value)
+ < std::tie(rhs.parentClass, rhs.fieldName, rhs.value);
+}
+
+
+// try to limit the voluminous output a little
+static std::set assignedSet;
+static std::set definitionSet;
+
+
+class SingleValFields:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit SingleValFields(InstantiationData const & data): Plugin(data) {}
+
+virtual void run() override
+{
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+
+// dump all our output in one write call - this is to try and limit IO 
"crosstalk" between multiple processes
+// writing to the same logfile
+std::string output;
+for (const MyFieldAssignmentInfo & s : assignedSet)
+output += "asgn:\t" + s.parentClass + "\t" + s.fieldName + "\t" + 
s.value + "\n";
+for (const MyFieldInfo & s : definitionSet)
+output += "defn:\t" + s.parentClass + "\t" + s.fieldName + "\t" + 
s.sourceLocation + "\n";
+ofstream myfile;
+myfile.open( SRCDIR "/singlevalfields.log", ios::app | ios::out);
+myfile << output;
+myfile.close();
+}
+
+bool shouldVisitTemplateInstantiations () const { return true; }
+
+bool VisitFieldDecl( const FieldDecl* );
+bool VisitMemberExpr( const MemberExpr* );
+bool VisitCXXConstructorDecl( const CXXConstructorDecl* );
+private:
+void niceName(const FieldDecl*, MyFieldInfo&);
+std::string fullyQualifiedName(const FunctionDecl*);
+std::string getExprValue(const Expr*);
+bool isInterestingType(const QualType&);
+const FunctionDecl* get_top_FunctionDecl_from_Stmt(const Stmt&);
+};
+
+void SingleValFields::niceName(const FieldDecl* fieldDecl, MyFieldInfo& aInfo)
+{
+aInfo.parentClass = fieldDecl->getParent()->getQualifiedNameAsString();
+aInfo.fieldName = fieldDecl->getNameAsString();
+
+SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( 
fieldDecl->getLocation() );
+

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

2016-06-23 Thread Stephan Bergmann

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

New commits:
commit 1f1f26bf0fcd695fcfb4b034bca001631646674e
Author: Stephan Bergmann 
Date:   Thu Jun 23 13:08:11 2016 +0200

loplugin:implicitboolconversion

Change-Id: I21aeb9504be38e4a6b55892730131a878234ced3

diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index b87574c..e7afd60 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -421,7 +421,7 @@ void make_keyword( char *keyword, const char *token)
 if( (token[0] & 0x80) || rtl::isAsciiLowerCase(token[0]) || strlen(token) 
< 2 )
 return;
 
-int capital = rtl::isAsciiUpperCase(keyword[1]);
+bool capital = rtl::isAsciiUpperCase(keyword[1]);
 for( ptr = keyword + 2; *ptr && result; ptr++ )
 {
 if( (*ptr & 0x80) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Noel Grandin

 ucb/source/ucp/file/bc.cxx|   12 -
 ucb/source/ucp/file/bc.hxx|   27 +---
 ucb/source/ucp/file/filcmd.cxx|   12 -
 ucb/source/ucp/file/filcmd.hxx|   24 +--
 ucb/source/ucp/file/filid.cxx |   18 --
 ucb/source/ucp/file/filid.hxx |   21 +--
 ucb/source/ucp/file/filinpstr.cxx |   27 +---
 ucb/source/ucp/file/filinpstr.hxx |   27 +---
 ucb/source/ucp/file/filprp.cxx|9 -
 ucb/source/ucp/file/filprp.hxx|6 
 ucb/source/ucp/file/filrow.cxx|3 
 ucb/source/ucp/file/filrow.hxx|   54 ++--
 ucb/source/ucp/file/filrset.cxx   |   69 +++---
 ucb/source/ucp/file/filrset.hxx   |  138 ++--
 ucb/source/ucp/file/filstr.cxx|   24 +--
 ucb/source/ucp/file/filstr.hxx|   28 +---
 ucb/source/ucp/file/prov.cxx  |   33 +---
 ucb/source/ucp/file/prov.hxx  |9 -
 ucb/source/ucp/ftp/ftpcontentidentifier.cxx   |3 
 ucb/source/ucp/ftp/ftpresultsetbase.cxx   |   80 +++-
 ucb/source/ucp/ftp/ftpresultsetbase.hxx   |   78 +++
 ucbhelper/source/provider/fd_inputstream.cxx  |   10 -
 xmlhelp/source/cxxhelp/inc/tvfactory.hxx  |9 -
 xmlhelp/source/cxxhelp/provider/inputstream.cxx   |   24 +--
 xmlhelp/source/cxxhelp/provider/inputstream.hxx   |   24 +--
 xmlhelp/source/cxxhelp/provider/resultsetbase.cxx |   75 +++
 xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |  146 +++---
 27 files changed, 330 insertions(+), 660 deletions(-)

New commits:
commit 5bd5baff3f2a55bc2d84e1e352a00dd6969394e3
Author: Noel Grandin 
Date:   Thu Jun 23 11:37:33 2016 +0200

remove some more (void) style function definitions/declarations

found with
git grep -nP '^\s*void\s*\)'

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

diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index f3e37a5..d7b6db8 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -577,8 +577,7 @@ BaseContent::addProperty(
 
 
 void SAL_CALL
-BaseContent::removeProperty(
-const OUString& Name )
+BaseContent::removeProperty( const OUString& Name )
 throw( beans::UnknownPropertyException,
beans::NotRemoveableException,
RuntimeException, std::exception)
@@ -595,8 +594,7 @@ BaseContent::removeProperty(
 
 
 Sequence< ContentInfo > SAL_CALL
-BaseContent::queryCreatableContentsInfo(
-void )
+BaseContent::queryCreatableContentsInfo()
 throw( RuntimeException, std::exception )
 {
 return m_pMyShell->queryCreatableContentsInfo();
@@ -604,8 +602,7 @@ BaseContent::queryCreatableContentsInfo(
 
 
 Reference< XContent > SAL_CALL
-BaseContent::createNewContent(
-const ContentInfo& Info )
+BaseContent::createNewContent( const ContentInfo& Info )
 throw( RuntimeException, std::exception )
 {
 // Check type.
@@ -695,8 +692,7 @@ BaseContent::removePropertySetInfoChangeListener(
 
 
 Reference< XInterface > SAL_CALL
-BaseContent::getParent(
-void )
+BaseContent::getParent()
 throw( RuntimeException, std::exception )
 {
 OUString ParentUnq = getParentName( m_aUncPath );
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index b798cae..c071f61 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -88,25 +88,21 @@ namespace fileaccess {
 
 // XInterface
 virtual css::uno::Any SAL_CALL
-queryInterface(
-const css::uno::Type& aType )
+queryInterface( const css::uno::Type& aType )
 throw( css::uno::RuntimeException, std::exception) override;
 
 virtual void SAL_CALL
-acquire(
-void )
+acquire()
 throw() override;
 
 virtual void SAL_CALL
-release(
-void )
+release()
 throw() override;
 
 
 // XComponent
 virtual void SAL_CALL
-dispose(
-void )
+dispose()
 throw( css::uno::RuntimeException, std::exception ) override;
 
 virtual void SAL_CALL
@@ -156,8 +152,7 @@ namespace fileaccess {
css::uno::RuntimeException, std::exception ) override;
 
 virtual void SAL_CALL
-abort(
-sal_Int32 CommandId )
+abort( sal_Int32 CommandId )
 throw( css::uno::RuntimeException, std::exception ) override;
 
 
@@ -206,8 +201,7 @@ namespace fileaccess {
css::uno::RuntimeException, std::exception) override;
 
 virtual void SAL_CALL
-removeProperty(
-const OUString& Name )
+

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

2016-06-23 Thread Prashant

 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |4 ++
 connectivity/source/drivers/postgresql/pq_tools.cxx |   15 
++
 connectivity/source/drivers/postgresql/pq_tools.hxx |1 
 connectivity/source/drivers/postgresql/pq_xtable.cxx|5 ++-
 connectivity/source/drivers/postgresql/pq_xtables.cxx   |6 ++--
 connectivity/source/drivers/postgresql/pq_xtables.hxx   |2 -
 connectivity/source/drivers/postgresql/pq_xview.cxx |5 ++-
 connectivity/source/drivers/postgresql/pq_xviews.cxx|6 ++--
 8 files changed, 34 insertions(+), 10 deletions(-)

New commits:
commit d43f4390e006716ca538ad92d09bd012179efd66
Author: Prashant 
Date:   Tue May 17 17:04:40 2016 +

tdf#67302 Resolving tablesSupplier name clash for postgresql

Change-Id: Ic9bedc678699e136c09a51575f1d27131c5ffd29
Reviewed-on: https://gerrit.libreoffice.org/25069
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index c2e64df..cec6070 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -212,7 +212,9 @@ void ResultSetMetaData::checkTable()
 {
 const OUString name   (getTableName ( 1 ));
 const OUString schema (getSchemaName( 1 ));
-const OUString composedName( schema.isEmpty() ? name : (schema 
+ "." + name) );
+const OUString EscapedName (name.replaceAll("\"","\"\"" ));
+const OUString EscapedSchema ( schema.replaceAll("\"","\"\""));
+const OUString composedName( schema.isEmpty() ? name : ("\"" + 
EscapedSchema + "\".\"" + EscapedName + "\"") );
 tables->getByName( composedName ) >>= m_table;
 }
 }
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx 
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 4e6df8b..0312dde 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -463,6 +463,21 @@ void splitSQL( const OString & sql, OStringVector &vec )
 
 }
 
+void splitDoubleQuoteEscapedIdentifiers( const OUString & source, OUString 
*first, OUString *second)
+{
+OStringVector vec;
+int a = source.indexOf("\".\"");
+OString tempstring = OUStringToOString(source , RTL_TEXTENCODING_UTF8);
+if(a > 0)
+{
+//remove start and end double quote as well as escaped double quotes
+*first =OStringToOUString(OString(&tempstring.getStr()[1],a-2) , 
RTL_TEXTENCODING_UTF8);
+*first=first->replaceAll("\"\"","\"");
+*second 
=OStringToOUString(OString(&tempstring.getStr()[a+2],source.getLength()-a-2) , 
RTL_TEXTENCODING_UTF8);
+*second=second->replaceAll("\"\"","\"");
+}
+}
+
 void tokenizeSQL( const OString & sql, OStringVector &vec  )
 {
 int length = sql.getLength();
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx 
b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 6ab147c..8c17c28 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -111,6 +111,7 @@ OUString array2String( const css::uno::Sequence< 
css::uno::Any > &seq );
 css::uno::Reference< css::sdbc::XConnection > extractConnectionFromStatement(
 const css::uno::Reference< css::uno::XInterface > & stmt );
 
+void splitDoubleQuoteEscapedIdentifiers( const OUString & source, OUString 
*first, OUString *second);
 void splitConcatenatedIdentifier( const OUString & source, OUString *first, 
OUString *second);
 
 
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx 
b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index 4b8d451..8e0ae92 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -154,12 +154,13 @@ void Table::rename( const OUString& newName )
 
 OUString newTableName;
 OUString newSchemaName;
+//changing schema + dot + table-name to "schema"."table-name"
 // OOo2.0 passes schema + dot + new-table-name while
 // OO1.1.x passes new Name without schema
 // in case name contains a dot, it is interpreted as schema.tablename
-if( newName.indexOf( '.' ) >= 0 )
+if( newName.indexOf( "\".\"" ) >= 0 )
 {
-splitConcatenatedIdentifier( newName, &newSchemaName, &newTableName );
+splitDoubleQuoteEscapedIdentifiers( newName, &newSchemaName, 
&newTableName );
 }
 else
 {
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx 
b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 97a9b7f..9ec5c02 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity

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

2016-06-23 Thread anwilli5

 framework/source/services/autorecovery.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 9e28b2f9ac3f205db223352cb88eb3546a8e1c0e
Author: anwilli5 
Date:   Sun Jun 5 23:06:05 2016 -0400

tdf#96607 'Save as' doesn't update global auto-recovery state

The auto-recovery service maintains a list of structures (one for each open
document) containing information needed to carry out the auto-save
functionality. One such piece of information is the location of the backup
file, stored in a struct member named 'OldTempURL'.  At every auto-save
interval, this list is iterated through and a function (implts_saveOneDoc)
is called during each iteration to save the current state of the associated
document.

The algorithm works as follows:
 1. A new backup file URL is chosen so as not to conflict with any already
existing backup files in the backup directory.  This URL is based on the
file name and incorporates a number (starting at 0) that is incremented
until a name is chosen that doesn't conflict.

 2. The document is saved to this new backup file URL

 3. The previous backup file (indicated by its structure's 'OldTempURL') is
deleted

 4. The new backup file URL is stored (in its structure's 'OldTempURL') for 
the
next time the file needs to be saved.

Assuming you start with a new Writer doc and then make some changes, when 
it is
time to auto-save, the backup file name 'untitled_0.odt' (excluding path) 
will
be selected, the latest state of the open file will be written to that 
backup
file, and the full URL for the backup file will be saved into the struct
'OldTempURL' member.

The next time changes are made and an auto-save occurs, this algorithm will
result in the name 'untitled_1.odt' being selected, the file contents saved
into this new file, 'untitled_0.odt' being deleted, and the full URL for the
new backup file being saved in 'OldTempURL'.

The third time through results in 'untitled_0.odt' being selected (since 
this
file doesn't exist on disk), and subsequent iterations of auto-saving cause
the backup file name to alternate between the two aforementioned.

The problem occurs during a 'Save as' operation. When this happens, the 
backup
file is deleted (which is fine - it was just saved, and the next auto-save 
will
back it up) but 'OldTempURL' is not properly reset (see below for more 
info.)
During the next auto-save, 'untitled_0.odt' will be selected for the new 
backup
file name (since no file exists by this name), and one of two things will
happen (based on how many auto-saves have occurred):

 1. 'OldTempURL' points to 'untitled_1.odt', and the algorithm above 
continues
to work correctly (at least in that it continues to backup file 
contents.)

 2. 'OldTempURL' points to 'untitled_0.odt', the name chosen for the new 
backup
file.  In this case, the document contents will be saved to this file
(step 2) but then the file will be deleted (step 3).  'OldTempURL' will
maintain this URL from then on out, causing this case to be hit for all
future auto-save intervals.

So, 50% of the time (30 minutes out of every hour) auto-save will stop 
backing
up file contents on a 'Save as'.

The function that handles the 'Save as' case (implts_markDocumentAsSaved)
clears 'OldTempURL' and sets other relavent struct members for a local 
variable
copy of the global struct, but doesn't copy them back. :(  These changes are
effectively lost when the function returns.

There are several other cases where this appears to be happening as well, 
but
more work is needed to determine whether this is actually the case:
 - implts_prepareSessionShutdown
 - implts_saveDocs, handling the 'dangerousDocs' and in a few other places
 - implts_openDocs
 - implts_resetHandleStates

Also, there is some JUnitTest code for auto-save, but it is currently 
disabled
(and fails to run successfully.) It'd be great to get these working again, 
or
to just write python equivalents. Implementing this would like take me a 
while,
though, so for now I just tested manually to ensure that this fixes the 
issue.

When I have some more time I'd like to work more on this, but I wanted to 
send
this patch in for now to address bug #96607.

This may also address bug #99890, since some of the struct members that 
don't
make it into the global state relate to the file name.  I haven't explicitly
tested this case, though.

Change-Id: Ic702d6f78e60c7cf828a1564ccca118dd45d152b
Reviewed-on: https://gerrit.libreoffice.org/25948
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/au

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

2016-06-23 Thread Zhengqiang Wang

 oox/source/drawingml/customshapeproperties.cxx   |6 +++---
 oox/source/drawingml/customshapes/oox-drawingml-cs-presets   |2 +-
 oox/source/drawingml/customshapes/presetShapeDefinitions.xml |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 45909a8e7ec2c4ef366836ab6bf975a6c2fdd007
Author: Zhengqiang Wang 
Date:   Thu Jun 2 11:35:24 2016 +0800

tdf#100153 modify noSmoking shape

*modify customshapeproperties.cxx
 fix compile error : make oox dbglevel=2
 The define of dumpCode() has been removed by 
c714b43b0137ad253f51e1c65417c9874b8509e5
*modify presetShapeDefinitions.xml
 fix noSmoking shape
*modfiy oox-drawingml-cs-presets
 this file is generated by presetShapeDefinitions.xml

Change-Id: I383d6b6961b546585035afd8c1a4398385a11914
Reviewed-on: https://gerrit.libreoffice.org/25801
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 0182102..daf178d 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -147,7 +147,7 @@ void CustomShapeProperties::pushToPropSet( const 
::oox::core::FilterBase& /* rFi
 
 aPropertyMap = maPresetDataMap[mnShapePresetType];
 #ifdef DEBUG
-aPropertyMap.dumpCode();
+aPropertyMap.dumpCode( aPropertyMap.makePropertySet() );
 #endif
 }
 
@@ -373,10 +373,10 @@ void CustomShapeProperties::pushToPropSet( const 
::oox::core::FilterBase& /* rFi
 
 #ifdef DEBUG
 SAL_INFO("oox.cscode", "==cscode== begin");
-aPropertyMap.dumpCode();
+aPropertyMap.dumpCode( aPropertyMap.makePropertySet() );
 SAL_INFO("oox.cscode", "==cscode== end");
 SAL_INFO("oox.csdata", "==csdata== begin");
-aPropertyMap.dumpData();
+aPropertyMap.dumpData( aPropertyMap.makePropertySet() );
 SAL_INFO("oox.csdata", "==csdata== end");
 #endif
 // converting the vector to a sequence
diff --git a/oox/source/drawingml/customshapes/oox-drawingml-cs-presets 
b/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
index e03f33d..c4f7a34 100644
--- a/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
+++ b/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
@@ -2195,7 +2195,7 @@ ViewBox
 AdjustmentValues
 ([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) { { Value = (any) 
{ (long) 18750 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE, Name 
= "adj" } }
 Equations
-([]string) { "if(0-$0 ,0,if(5-$0 ,$0 ,5))", "min(logwidth,logheight)", 
"?1 *?0 /10", "logwidth/2", "?3 +0-?2 ", "logheight/2", "?5 +0-?2 ", 
"(1080*atan2(logheight,logwidth))/pi", "?6 *cos(pi*(?7 )/1080)", "?4 
*sin(pi*(?7 )/1080)", "sqrt(?8 *?8 +?9 *?9 +0*0)", "?4 *?6 /?10 ", "?2 
*1/2", "(1080*atan2(?12 ,?11 ))/pi", "?13 *2/1", "-1080+2-0", 
"(1080*atan2(logheight,logwidth))/pi", "?16 +0-?13 ", "?17 +0-1080", 
"?6 *cos(pi*(?17 )/1080)", "?4 *sin(pi*(?17 )/1080)", "sqrt(?19 *?19 
+?20 *?20 +0*0)", "?4 *?6 /?21 ", "?22 *cos(pi*(?17 )/1080)", "?22 
*sin(pi*(?17 )/1080)", "logwidth/2", "?25 +?23 -0", "logheight/2", "?27 
+?24 -0", "?25 +0-?23 ", "?27 +0-?24 ", "?3 *cos(pi*(270)/1080)", "?5 
*sin(pi*(270)/1080)", "?25 +0-?31 ", "?25 +?31 -0", "?27 +0-?32 ", "?27 
+?32 -0", "logheight", "logwidth", "(1080)/6.0", "(540)/6.0", 
"(1620)/6.0", "(540)/6.0", "(0)/6.0", "(540)/6.0", 
"(54000
 00)/6.0", "(540)/6.0", "(?17 )/6.0", "(?15 )/6.0", "(?18 
)/6.0", "(?15 )/6.0" }
+([]string) { "if(0-$0 ,0,if(5-$0 ,$0 ,5))", "min(logwidth,logheight)", 
"?1 *?0 /10", "logwidth/2", "?3 +0-?2 ", "logheight/2", "?5 +0-?2 ", 
"(1080*atan2(logheight,logwidth))/pi", "?6 *cos(pi*(?7 )/1080)", "?4 
*sin(pi*(?7 )/1080)", "sqrt(?8 *?8 +?9 *?9 +0*0)", "?4 *?6 /?10 ", "?2 
*1/2", "(1080*atan2(?12 ,?11 ))/pi", "?13 *2/1", "-1080+?14 -0", 
"(1080*atan2(logheight,logwidth))/pi", "?16 +0-?13 ", "?17 +0-1080", 
"?6 *cos(pi*(?17 )/1080)", "?4 *sin(pi*(?17 )/1080)", "sqrt(?19 *?19 
+?20 *?20 +0*0)", "?4 *?6 /?21 ", "?22 *cos(pi*(?17 )/1080)", "?22 
*sin(pi*(?17 )/1080)", "logwidth/2", "?25 +?23 -0", "logheight/2", "?27 
+?24 -0", "?25 +0-?23 ", "?27 +0-?24 ", "?3 *cos(pi*(270)/1080)", "?5 
*sin(pi*(270)/1080)", "?25 +0-?31 ", "?25 +?31 -0", "?27 +0-?32 ", "?27 
+?32 -0", "logheight", "logwidth", "(1080)/6.0", "(540)/6.0", 
"(1620)/6.0", "(540)/6.0", "(0)/6.0", "(540)/6.0", 
"(54
 0)/6.0", "(540)/6.0", "(?17 )/6.0", "(?15 )/6.0", 
"(?18 )/6.0", "(?15 )/6.0" }
 Handles
 ([][]com.sun.star.beans.PropertyValue) { { { Name = "Position", Handle = 
(long) 0, Value = (any) { 
(com.sun.star.drawing.Enhanc

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

2016-06-23 Thread Gökhan Gurbetoğlu

 editeng/source/misc/svxacorr.cxx|3 ++-
 idl/source/cmptools/hash.cxx|4 +++-
 rsc/source/tools/rscchar.cxx|3 ++-
 writerfilter/source/rtftok/rtftokenizer.cxx |3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ea5a5b1dbb669415586520c2b0c526b133aa07e4
Author: GÃ¶khan GurbetoÄlu 
Date:   Tue Jun 21 11:45:30 2016 +0300

tdf#99589 - tolower / toupper - dangerous to Turks ...

Change-Id: Id3b9abd557f2b8dfc942589362452cbdb0232da9
Reviewed-on: https://gerrit.libreoffice.org/26546
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8658967..d736d94 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -66,6 +66,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
@@ -1374,7 +1375,7 @@ void SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, 
const OUString& rTxt,
 
 if( ( IsAutoCorrFlag( ChgOrdinalNumber ) &&
 (nInsPos >= 2 ) &&   // fdo#69762 avoid autocorrect for 
2e-3
-( '-' != cChar || 'E' != toupper(rTxt[nInsPos-1]) || '0' > 
rTxt[nInsPos-2] || '9' < rTxt[nInsPos-2] ) &&
+( '-' != cChar || 'E' != 
rtl::toAsciiUpperCase(rTxt[nInsPos-1]) || '0' > rTxt[nInsPos-2] || '9' < 
rTxt[nInsPos-2] ) &&
 FnChgOrdinalNumber( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) 
) ||
 ( IsAutoCorrFlag( SetINetAttr ) &&
 ( ' ' == cChar || '\t' == cChar || 0x0a == cChar || !cChar ) &&
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 22faf38..fc63730 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 
+#include 
+
 SvStringHashEntry::~SvStringHashEntry() { };
 
 SvHashTable::SvHashTable( sal_uInt32 nMaxEntries )
@@ -121,7 +123,7 @@ sal_uInt32 SvStringHashTable::HashFunc( const OString& 
rElement ) const
 int nShift = 0;
 while( *pStr )
 {
-if( isupper( *pStr ) )
+if( rtl::isAsciiUpperCase( *pStr ) )
 nHash ^= sal_uInt32(*pStr - 'A' + 26) << nShift;
 else
 nHash ^= sal_uInt32(*pStr - 'a') << nShift;
diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx
index b00d61f..dbe096e 100644
--- a/rsc/source/tools/rscchar.cxx
+++ b/rsc/source/tools/rscchar.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding )
 {
@@ -109,7 +110,7 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 
nTextEncoding )
 {
 if( isdigit( *pStr ) )
 nChar = nChar * 16 + (sal_uInt8)*pStr - 
(sal_uInt8)'0';
-else if( isupper( *pStr ) )
+else if( rtl::isAsciiUpperCase( *pStr ) )
 nChar = nChar * 16 + (sal_uInt8)*pStr - 
(sal_uInt8)'A' +10;
 else
 nChar = nChar * 16 + (sal_uInt8)*pStr - 
(sal_uInt8)'a' +10;
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx 
b/writerfilter/source/rtftok/rtftokenizer.cxx
index 2dab789..83ecf69 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -169,7 +170,7 @@ int RTFTokenizer::asHex(char ch)
 ret = ch - '0';
 else
 {
-if (islower(ch))
+if (rtl::isAsciiLowerCase(ch))
 {
 if (ch < 'a' || ch > 'f')
 return -1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source filter/source helpcompiler/inc hwpfilter/source l10ntools/source sal/osl sdext/source soltools/mkdepend tools/source

2016-06-23 Thread Gökhan Gurbetoğlu

 basic/source/sbx/sbxvar.cxx|3 ++-
 filter/source/t602/t602filter.cxx  |9 +
 helpcompiler/inc/HelpCompiler.hxx  |3 ++-
 hwpfilter/source/hbox.cxx  |6 --
 hwpfilter/source/hwpeq.cxx |   18 ++
 l10ntools/source/gL10nMem.cxx  |4 ++--
 sal/osl/w32/file_dirvol.cxx|3 ++-
 sdext/source/pdfimport/wrapper/wrapper.cxx |6 --
 soltools/mkdepend/collectdircontent.cxx|5 +++--
 tools/source/ref/globname.cxx  |9 +
 10 files changed, 39 insertions(+), 27 deletions(-)

New commits:
commit 9b9e5cfd2fa629b2e1dc4a193e48a4a4e8d34126
Author: GÃ¶khan GurbetoÄlu 
Date:   Mon Jun 20 17:40:13 2016 +0300

tdf#99589 - tolower / toupper - dangerous to Turks ...

Change-Id: I8b0fe9354232a7b60f3605fa6f90f6741f7bf683
Reviewed-on: https://gerrit.libreoffice.org/26537
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 0977c74..8ed87ae 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -30,6 +30,7 @@
 #include "sbunoobj.hxx"
 #include 
 #include 
+#include 
 
 #include 
 using namespace com::sun::star::uno;
@@ -350,7 +351,7 @@ sal_uInt16 SbxVariable::MakeHashCode( const OUString& rName 
)
 {
 return 0;
 }
-n = sal::static_int_cast< sal_uInt16 >( ( n << 3 ) + toupper( c ) );
+n = sal::static_int_cast< sal_uInt16 >( ( n << 3 ) + 
rtl::toAsciiUpperCase( c ) );
 }
 return n;
 }
diff --git a/filter/source/t602/t602filter.cxx 
b/filter/source/t602/t602filter.cxx
index 3a4b3ea..ade1e60 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::cppu;
 using namespace ::osl;
@@ -679,14 +680,14 @@ tnode T602ImportFilter::PointCmd602(unsigned char *ch)
 char pcmd[2];
 
 // warning: uChar -> char
-pcmd[0] = (char) toupper(*ch); inschr(*ch);
+pcmd[0] = (char) rtl::toAsciiUpperCase(*ch); inschr(*ch);
 *ch = Readchar602();
 if (!*ch) return tnode::EEND;
 if (*ch=='\n') return tnode::EOL;
 if (!isalpha(*ch)) return (*ch<32) ? tnode::SETCH : tnode::WRITE;
 
 // warning: uChar -> char
-pcmd[1] = (char) toupper(*ch); inschr(*ch);
+pcmd[1] = (char) rtl::toAsciiUpperCase(*ch); inschr(*ch);
 
  if (pcmd[0]=='P' && pcmd[1]=='A') { if (pst.pars) pst.willbeeop = 
true; }
 else if (pcmd[0]=='C' && pcmd[1]=='P') { if (pst.pars) pst.willbeeop = 
true; }
@@ -761,12 +762,12 @@ void T602ImportFilter::Read602()
 
 case tnode::EXPCMD: ch = Readchar602();
 if(ch == 0) {inschr('@'); node = tnode::EEND; }
-else if(isupper(ch)) {
+else if(rtl::isAsciiUpperCase(ch)) {
 cmd602[0] = ch;
 ch = Readchar602();
 cmd602[1] = ch;
 cmd602[2] = '\0';
-if(isupper(ch))
+if(rtl::isAsciiUpperCase(ch))
 node = tnode::SETCMD;   //nedodelano
 else {
 inschr('@');
diff --git a/helpcompiler/inc/HelpCompiler.hxx 
b/helpcompiler/inc/HelpCompiler.hxx
index 78f98a2..1acce8f 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -39,6 +39,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -249,7 +250,7 @@ private:
 
 inline char tocharlower(char c)
 {
-return static_cast(tolower(c));
+return static_cast(rtl::toAsciiLowerCase(c));
 }
 
 #endif
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index e501949..bd30edc 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -31,6 +31,8 @@
 #include "drawdef.h"
 #include "hcode.h"
 
+#include 
+
 int HBox::boxCount = 0;
 
 HBox::HBox(hchar hch)
@@ -586,7 +588,7 @@ static void getOutlineNumStr(int style, int level, int num, 
hchar * hstr)
 ptr = buf;
 while (*ptr)
 {
-*ptr = sal::static_int_cast(toupper(*ptr));
+*ptr = sal::static_int_cast(rtl::toAsciiUpperCase(*ptr));
 ptr++;
 }
 }
@@ -688,7 +690,7 @@ hchar_string Outline::GetUnicode() const
 char *ptr = dest;
 while( *ptr )
 {
-*ptr = 
sal::static_int_cast(toupper(*ptr));
+*ptr = 
sal::static_int_cast(rtl::toAsciiUpperCase(*ptr));
 ptr++;
 }
 }
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index dd46110..b87574c 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -32,6 +32,8 @@ using names

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

2016-06-23 Thread skswales

 scp2/inc/macros.inc |   28 
 1 file changed, 20 insertions(+), 8 deletions(-)

New commits:
commit 8ab7db320ff158949d2eadaa6e654115201ddf61
Author: skswales 
Date:   Thu Jun 2 23:58:50 2016 +0100

tdf#97872 File association in Windows registry

Fix for double backslashes in paths to programs in shell/open etc.
registry entries for all non-native file types such as .doc that are
mapped by installer to use scalc.exe/swriter.exe etc.

Change-Id: Ice8033d4fee079c0fb6d8f84e00ebd784e85d135
Reviewed-on: https://gerrit.libreoffice.org/25849
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7b895b6..30f6760 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -298,7 +298,7 @@ End
 Value = STRING(default); \
 End
 
-#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+#define REGISTRY_ENTRY_NEW_CMD_PPA(name,modid,progpath_program_app) \
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
@@ -309,33 +309,45 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
-Value = "\"\program\\" STRING(app) "\" -n \"%1\""; \
+Value = "\"" STRING(progpath_program_app) "\" -n \"%1\""; \
 End
 
-#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \
+   REGISTRY_ENTRY_NEW_CMD_PPA(name,modid,\program\app)
+
+#define REGISTRY_ENTRY_OPEN_CMD_PPA(name,modid,progpath_program_app) \
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
-Value = "\"\program\\" STRING(app) "\" -o \"%1\""; \
+Value = "\"" STRING(progpath_program_app) "\" -o \"%1\""; \
 End
 
-#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \
+   REGISTRY_ENTRY_OPEN_CMD_PPA(name,modid,\program\app)
+
+#define REGISTRY_ENTRY_PRINT_CMD_PPA(name,modid,progpath_program_app) \
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
-Value = "\"\program\\" STRING(app) "\" -p \"%1\""; \
+Value = "\"" STRING(progpath_program_app) "\" -p \"%1\""; \
 End
 
-#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \
+   REGISTRY_ENTRY_PRINT_CMD_PPA(name,modid,\program\app)
+
+#define REGISTRY_ENTRY_PRINTTO_CMD_PPA(name,modid,progpath_program_app) \
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
-Value = "\"\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
+Value = "\"" STRING(progpath_program_app) "\" -pt \"%2\" \"%1\""; \
 End
 
+#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \
+   REGISTRY_ENTRY_PRINTTO_CMD_PPA(name,modid,\program\app)
+
 #define REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \
 RegistryItem 
CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name)
 \
 ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Michael Stahl

 package/inc/ZipOutputStream.hxx|1 +
 package/source/zipapi/ZipOutputStream.cxx  |   12 +++-
 package/source/zippackage/ZipPackageStream.cxx |   11 +++
 vcl/headless/svpbmp.cxx|   12 +++-
 4 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 8d8b9b80b114b94b20b0bf1438d80e925b49e3bf
Author: Michael Stahl 
Date:   Thu Jun 23 11:24:55 2016 +0200

package: fix exception handling in DeflateThread (related tdf#91807)

In the bugdoc of tdf#91807 there are at least 49 corrupt zip streams
that raise exceptions in the DeflateThreads.  Because the maximum
allowed number of threads happens to be 48, this results in an infinite
loop in ZipOutputStream::reduceScheduledThreadsToGivenNumberOrLess().

(regression from 7e2ea27e5d56f5cf767a6718a0f5edc28e24af14)

In case an exception is thrown, don't re-throw it immediately, which
might cause trouble such as leaking all of the ZipOutputEntry instances
in m_aEntries.

Change-Id: Ia74ab8e46fa1349c049d05dbec3454bfbe7d61d9

diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index 26d7715..136bc72 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -40,6 +40,7 @@ class ZipOutputStream
 ZipEntry*m_pCurrentEntry;
 comphelper::ThreadPool &m_rSharedThreadPool;
 std::vector< ZipOutputEntry* > m_aEntries;
+::css::uno::Any m_aDeflateException;
 
 public:
 ZipOutputStream(
diff --git a/package/source/zipapi/ZipOutputStream.cxx 
b/package/source/zipapi/ZipOutputStream.cxx
index 9213ed7..2daff01 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -98,7 +98,12 @@ void 
ZipOutputStream::consumeScheduledThreadEntry(ZipOutputEntry* pCandidate)
 //Any exceptions thrown in the threads were caught and stored for now
 ::css::uno::Any 
aCaughtException(pCandidate->getParallelDeflateException());
 if (aCaughtException.hasValue())
-::cppu::throwException(aCaughtException);
+{
+m_aDeflateException = aCaughtException; // store it for later throwing
+// the exception handler in DeflateThread should have cleaned temp file
+delete pCandidate;
+return;
+}
 
 writeLOC(pCandidate->getZipEntry(), pCandidate->isEncrypt());
 
@@ -178,6 +183,11 @@ void ZipOutputStream::finish()
 // consume all processed entries
 consumeAllScheduledThreadEntries();
 
+if (m_aDeflateException.hasValue())
+{   // throw once all threads are finished and m_aEntries can be released
+::cppu::throwException(m_aDeflateException);
+}
+
 sal_Int32 nOffset= static_cast < sal_Int32 > (m_aChucker.GetPosition());
 for (ZipEntry* p : m_aZipList)
 {
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 43a9b85..5efb145 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -486,6 +486,17 @@ private:
 catch (const uno::Exception&)
 {
 mpEntry->setParallelDeflateException(::cppu::getCaughtException());
+try
+{
+if (mpEntry->m_xOutStream.is())
+mpEntry->closeBufferFile();
+if (!mpEntry->m_aTempURL.isEmpty())
+mpEntry->deleteBufferFile();
+}
+catch (uno::Exception const&)
+{
+}
+mpEntry->setFinished();
 }
 }
 };
commit cd292ba17c62a90f3530326f7fc87036da16a353
Author: Michael Stahl 
Date:   Wed Jun 22 15:41:11 2016 +0200

vcl: avoid vcl_filters_test crash with ASAN 32-bit

ASAN usually aborts on operator new[] allocation failure but with
allocator_may_return_null=1 in ASAN_OPTIONS it returns null instead; it
doesn't throw std::bad_alloc though.

Change-Id: I28d67a787e90604c12ad06fd97d265664bd62ef2

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index cb8c771..f5dabae 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -125,7 +125,17 @@ BitmapBuffer* ImplCreateDIB(
 {
 size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
 pDIB->mpBits = new sal_uInt8[size];
-std::memset(pDIB->mpBits, 0, size);
+#ifdef __SANITIZE_ADDRESS__
+if (!pDIB->mpBits)
+{   // can only happen with ASAN allocator_may_return_null=1
+delete pDIB;
+pDIB = nullptr;
+}
+else
+#endif
+{
+std::memset(pDIB->mpBits, 0, size);
+}
 }
 catch (const std::bad_alloc&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesk

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/opengl

2016-06-23 Thread Tomaž Vajngerl

 vcl/opengl/salbmp.cxx |   92 +++---
 1 file changed, 66 insertions(+), 26 deletions(-)

New commits:
commit ebad0ff6da52d3f3bf9ca026ed2699df0673ce76
Author: TomaÅ¾ Vajngerl 
Date:   Tue Jun 21 14:34:45 2016 +0800

tdf#100451 convert texture buffer to 1-bit and 4-bit palette buffer

OpenGL doesn't support palettes so when the texture is created,
the bitmap buffer is converted to 24-bit RGB. This works nice for
showing the bitmaps on screen. The problem arises when we want to
read the bitmap buffer back (like in a PDF export) as we have to
convert that back to 1-bit or 4-bit palette bitmap buffer. For 4-bit
this was not implemented yet, on the other hand for 1-bit it was
implemented but it didn't take palette into account so the bitmap
was not correct (inverted).

This commit introduces a ScanlineWriter which handles writing
RGB colors to 1-bit and 4-bit palette scanlines. The class sets
up the masks and shifts needed to place the color information
at the correct place in a byte. It also automatically converts a
RGB to palette index.

Change-Id: Ie66ca8cecff40c1252072ba95196ef65ba787f4c
Reviewed-on: https://gerrit.libreoffice.org/26532
Reviewed-by: TomaÅ¾ Vajngerl 
Tested-by: TomaÅ¾ Vajngerl 
Reviewed-on: https://gerrit.libreoffice.org/26534
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 87fc542..58909b4 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -412,7 +412,48 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const 
int nWidth, const int
 rTexture = OpenGLTexture (nWidth, nHeight, nFormat, nType, pData);
 }
 
-}
+// Write color information for 1 and 4 bit palette bitmap scanlines.
+class ScanlineWriter
+{
+BitmapPalette& maPalette;
+sal_uInt8 mnColorsPerByte; // number of colors that are stored in one byte
+sal_uInt8 mnColorBitSize;  // number of bits a color takes
+sal_uInt8 mnColorBitMask;  // bit mask used to isolate the color
+sal_uInt8* mpCurrentScanline;
+long mnX;
+
+public:
+ScanlineWriter(BitmapPalette& aPalette, sal_Int8 nColorsPerByte)
+: maPalette(aPalette)
+, mnColorsPerByte(nColorsPerByte)
+, mnColorBitSize(8 / mnColorsPerByte) // bit size is number of bit in 
a byte divided by number of colors per byte (8 / 2 = 4 for 4-bit)
+, mnColorBitMask((1 << mnColorBitSize) - 1) // calculate the bit mask 
from the bit size
+, mpCurrentScanline(nullptr)
+, mnX(0)
+{}
+
+inline void writeRGB(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB)
+{
+// calculate to which index we will write
+long nScanlineIndex = mnX / mnColorsPerByte;
+
+// calculate the number of shifts to get the color information to the 
right place
+long nShift = (8 - mnColorBitSize) - ((mnX % mnColorsPerByte) * 
mnColorBitSize);
+
+sal_uInt16 nColorIndex = maPalette.GetBestIndex(BitmapColor(nR, nG, 
nB));
+mpCurrentScanline[nScanlineIndex] &= ~(mnColorBitMask << nShift); // 
clear
+mpCurrentScanline[nScanlineIndex] |= (nColorIndex & mnColorBitMask) << 
nShift; // set
+mnX++;
+}
+
+inline void nextLine(sal_uInt8* pScanline)
+{
+mnX = 0;
+mpCurrentScanline = pScanline;
+}
+};
+
+} // end anonymous namespace
 
 Size OpenGLSalBitmap::GetSize() const
 {
@@ -559,43 +600,43 @@ bool OpenGLSalBitmap::ReadTexture()
 #endif
 return true;
 }
-else if (mnBits == 1)
-{   // convert buffers from 24-bit RGB to 1-bit Mask
+else if (mnBits == 1 || mnBits == 4)
+{   // convert buffers from 24-bit RGB to 1 or 4-bit buffer
 std::vector aBuffer(mnWidth * mnHeight * 3);
 
 sal_uInt8* pBuffer = aBuffer.data();
 determineTextureFormat(24, nFormat, nType);
 maTexture.Read(nFormat, nType, pBuffer);
+sal_uInt16 nSourceBytesPerRow = lclBytesPerRow(24, mnWidth);
 
-int nShift = 7;
-size_t nIndex = 0;
-
-sal_uInt8* pCurrent = pBuffer;
+std::unique_ptr pWriter;
+switch(mnBits)
+{
+case 1:
+pWriter.reset(new ScanlineWriter(maPalette, 8));
+break;
+case 4:
+default:
+pWriter.reset(new ScanlineWriter(maPalette, 2));
+break;
+}
 
 for (int y = 0; y < mnHeight; ++y)
 {
+sal_uInt8* pSource = &pBuffer[y * nSourceBytesPerRow];
+sal_uInt8* pDestination = &pData[y * mnBytesPerRow];
+
+pWriter->nextLine(pDestination);
+
 for (int x = 0; x < mnWidth; ++x)
 {
-if (nShift < 0)
-{
-nShift = 7;
-nIndex++;
-pData[nIndex] = 0;
-}
-
-sal_uInt8 nR = *pCurre

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source

2016-06-23 Thread Thorsten Behrens

 framework/source/dispatch/interceptionhelper.cxx |   21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit e2cc303ee8bbb0029dd095833ae93d84ec9d73c0
Author: Thorsten Behrens 
Date:   Wed Mar 2 15:28:36 2016 +0100

framework: avoid excessive queryDispatch calls

Make better use of the css::frame::XInterceptorInfo interface, to avoid
calling queryDispatch() pointlessly on interfaces that have explicitely
opted out. Since that already broadcasts which urls we're interested in
- so just don't bother calling entries who are not matching.

Change-Id: Id5e780568fd60c38f4cee4ee800d747d65a31dae
Reviewed-on: https://gerrit.libreoffice.org/25214
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 27b6cdb5ab5af33dbba561923c8db81e144c88b9)
Reviewed-on: https://gerrit.libreoffice.org/26358
Reviewed-by: Katarina Behrens 

diff --git a/framework/source/dispatch/interceptionhelper.cxx 
b/framework/source/dispatch/interceptionhelper.cxx
index ad707f3..fc3db65 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -54,16 +54,23 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL 
InterceptionHelper::queryD
 xInterceptor = pIt->xInterceptor;
 
 // b) No match by registration - but a valid interceptor list.
-//Use first interceptor everytimes.
-//Note: it doesn't matter, which direction this helper implementation 
use to ask interceptor objects.
-//Using of member m_aInterceptorList will starts at the beginning 
everytimes.
-//It depends from the filling operation, in which direction it works 
really!
+//Find first interceptor w/o pattern, so we need to query it
 if (!xInterceptor.is() && m_lInterceptionRegs.size()>0)
 {
-pIt  = m_lInterceptionRegs.begin();
-xInterceptor = pIt->xInterceptor;
+InterceptorList::const_iterator pIt2;
+for (pIt2=m_lInterceptionRegs.begin(); 
pIt2!=m_lInterceptionRegs.end(); ++pIt2)
+{
+if (!pIt2->lURLPattern.getLength())
+{
+// no pattern -> need to ask this guy!
+xInterceptor = pIt2->xInterceptor;
+break;
+}
+}
+// if we didn't find any non-pattern interceptor, there's no-one
+// registered for this command url (we already searched for matching
+// patterns above)
 }
-
 // c) No registered interceptor => use our direct slave.
 //This helper exist by design and must be valid everytimes ...
 //But to be more feature proof - we should check that .-)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Pushing to LibO-5-2

2016-06-23 Thread Stephan Bergmann


On 06/21/2016 10:07 PM, Laurent BP wrote:

sberg wrote

All three of the mentioned ;,
;,
; refer to
;


The history of the resolution of this bug is not complete. A first commit
fix it only for polynomial equation, because I wanted to have the smaller
commit (as I thought it was easier for review). This commit was merged to
master before 5-2 branch.
https://bugs.documentfoundation.org/show_bug.cgi?id=94004#c6
Then it takes some time before the 3 other commits for other equation types
were reviewed, and 5-2 was branched. I thought it would not have been a good
idea to have an incomplete feature (wrapping equations if they are too long,
not for all equation types) in LibO 5.2, and I proposed to backport them in
LibO 5.2 beta.

Was I wrong?


Of course, my remarks were of a generic nature, and there may well be 
good reason to do otherwise for specific cases.  I personally have no 
idea about this specific case, though.


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

[Libreoffice-commits] core.git: include/sal include/sfx2 sc/source sd/source sfx2/source sw/inc sw/source

2016-06-23 Thread Miklos Vajna

 include/sal/log-areas.dox  |1 -
 include/sfx2/objsh.hxx |7 ---
 sc/source/ui/docshell/docsh.cxx|4 
 sc/source/ui/inc/docsh.hxx |2 --
 sd/source/ui/docshell/docshell.cxx |4 
 sd/source/ui/inc/DrawDocShell.hxx  |2 --
 sfx2/source/doc/objcont.cxx|5 -
 sw/inc/docsh.hxx   |2 --
 sw/source/uibase/app/docsh.cxx |4 
 9 files changed, 31 deletions(-)

New commits:
commit ed2d342e97e43ff25f450ab6a5752baded6813e4
Author: Miklos Vajna 
Date:   Thu Jun 23 08:47:05 2016 +0200

Remove unused SfxObjectShell::libreOfficeKitCallback()

All clients have been converted to use
SfxViewShell::libreOfficeKitViewCallback() instead.

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

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index dd32631..8a6fbdd 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -316,7 +316,6 @@ certain functionality.
 @li @c sfx.doc
 @li @c sfx.notify
 @li @c sfx.sidebar
-@li @c sfx.tiledrendering
 @li @c sfx.view
 
 @section slideshow
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index ee86c34..fd8e710 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -722,13 +722,6 @@ public:
 SAL_DLLPRIVATE void CancelCheckOut( );
 SAL_DLLPRIVATE void CheckIn( );
 SAL_DLLPRIVATE css::uno::Sequence< css::document::CmisVersion > 
GetCmisVersions();
-
-/**
- * Interface shared by document shell. Allow LOK calls from sfx.
- * Default behavior doesn't do anything. relevant SfxObjectShells should 
override
- * the default behavior and implements LOK calls.
- */
-virtual void libreOfficeKitCallback(int nType, const char* pPayload) const;
 };
 
 #define SFX_GLOBAL_CLASSID \
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 12f8b5d..79cb8c8 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3220,8 +3220,4 @@ bool ScDocShell::GetProtectionHash( /*out*/ 
css::uno::Sequence< sal_Int8 > &rPas
 return bRes;
 }
 
-void ScDocShell::libreOfficeKitCallback(int /*nType*/, const char* 
/*pPayload*/) const
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 84346fb..107c2dc 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -422,8 +422,6 @@ public:
 virtual boolGetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > 
&rPasswordHash ) override;
 
 void SnapVisArea( Rectangle& rRect ) const;
-
-virtual void libreOfficeKitCallback(int nType, const char* pPayload) const 
override;
 };
 
 void UpdateAcceptChangesDialog();
diff --git a/sd/source/ui/docshell/docshell.cxx 
b/sd/source/ui/docshell/docshell.cxx
index b948bd9..ccf257c 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -478,10 +478,6 @@ void DrawDocShell::ClearUndoBuffer()
 pUndoManager->Clear();
 }
 
-void DrawDocShell::libreOfficeKitCallback(int /*nType*/, const char* 
/*pPayload*/) const
-{
-}
-
 } // end of namespace sd
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/DrawDocShell.hxx 
b/sd/source/ui/inc/DrawDocShell.hxx
index cc5a8c0..d377abf 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -201,8 +201,6 @@ public:
 
 voidClearUndoBuffer();
 
-virtual void libreOfficeKitCallback(int nType, const char* pPayload) const 
override;
-
 protected:
 
 SdDrawDocument* mpDoc;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e5681b8..5192e9e 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -651,9 +651,4 @@ bool SfxObjectShell::IsModifyPasswordEntered()
 return pImpl->m_bModifyPasswordEntered;
 }
 
-void SfxObjectShell::libreOfficeKitCallback(int /*nType*/, const char* 
/*pPayload*/) const
-{
-SAL_INFO("sfx.tiledrendering", "SfxObjectShell::libreOfficeKitCallback 
interface not overridden for SfxObjectShell subclass typeId: " << 
typeid(*this).name());
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index cce1600..50ac3c9 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -307,8 +307,6 @@ public:
 virtual voidSetChangeRecording( bool bActivate ) override;
 virtual voidSetProtectionPassword( const OUString &rPassword ) 
override;
 virtual boolGetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > 
&rPasswordHash ) override;
-
-virtual void libreOfficeKitCallback(int nType, const char* pPayload) const 
override;
 };
 
 /** Find the right DocShell and create a new one:
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/so

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

2016-06-23 Thread Jan Holesovsky

 include/xmloff/SchXMLImportHelper.hxx |3 ++
 xmloff/source/chart/SchXMLAxisContext.cxx |   28 ++--
 xmloff/source/chart/SchXMLChartContext.cxx|   30 +++---
 xmloff/source/chart/SchXMLImport.cxx  |   18 ++-
 xmloff/source/chart/SchXMLLegendContext.cxx   |   10 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |   27 ++-
 6 files changed, 35 insertions(+), 81 deletions(-)

New commits:
commit 4d1118e5cc9f2a4dc20ea73fba4cb09d9e2a3ce5
Author: Jan Holesovsky 
Date:   Thu Jun 23 10:22:34 2016 +0200

Simplify dynamic_cast followed by a static_cast.

Change-Id: Ia8b1145d43828a40611e5f59651d9dc6ff7d5360

diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx 
b/xmloff/source/chart/SchXMLAxisContext.cxx
index 652e223..41fad4d7 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -465,17 +465,13 @@ void SchXMLAxisContext::CreateAxis()
 if( !m_aAutoStyleName.isEmpty())
 {
 const SvXMLStylesContext* pStylesCtxt = 
m_rImportHelper.GetAutoStylesContext();
-if( pStylesCtxt )
+if (pStylesCtxt)
 {
-const SvXMLStyleContext* pStyle = 
pStylesCtxt->FindStyleChildContext(
-SchXMLImportHelper::GetChartFamilyID(), m_aAutoStyleName );
+SvXMLStyleContext* pStyle = 
const_cast(pStylesCtxt->FindStyleChildContext(SchXMLImportHelper::GetChartFamilyID(),
 m_aAutoStyleName));
 
-if( pStyle && dynamic_cast( 
pStyle) !=  nullptr)
+if (XMLPropStyleContext * pPropStyleContext = 
dynamic_cast(pStyle))
 {
-// note: SvXMLStyleContext::FillPropertySet is not const
-XMLPropStyleContext * pPropStyleContext = const_cast< 
XMLPropStyleContext * >( dynamic_cast< const XMLPropStyleContext * >( pStyle ));
-if( pPropStyleContext )
-pPropStyleContext->FillPropertySet( m_xAxisProps );
+pPropStyleContext->FillPropertySet(m_xAxisProps);
 
 if( m_bAdaptWrongPercentScaleValues && 
m_aCurrentAxis.eDimension==SCH_XML_AXIS_Y )
 {
@@ -498,7 +494,7 @@ void SchXMLAxisContext::CreateAxis()
 if( xAxisSuppl.is() )
 {
 Reference< beans::XPropertySet > xXAxisProp( 
xAxisSuppl->getAxis(0), uno::UNO_QUERY );
-const_cast( static_cast< 
const XMLPropStyleContext* >( pStyle ))->FillPropertySet( xXAxisProp );
+pPropStyleContext->FillPropertySet(xXAxisProp);
 }
 
 //set scale data of added x axis back to default
commit a07a69850acddae631d6bd9496ace0c35accdda5
Author: Jan Holesovsky 
Date:   Thu Jun 23 10:18:35 2016 +0200

Introduce FillAutoStyle() method to reduce copy'n'paste.

Change-Id: Ibdb6ae15790cc117d3d8c41c57924f9b22e85cba

diff --git a/include/xmloff/SchXMLImportHelper.hxx 
b/include/xmloff/SchXMLImportHelper.hxx
index 415a9a0..765a960 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -100,6 +100,9 @@ public:
 void SetAutoStylesContext( SvXMLStylesContext* pAutoStyles ) { 
mpAutoStyles = pAutoStyles; }
 SvXMLStylesContext* GetAutoStylesContext() const { return mpAutoStyles; }
 
+/// Fill in the autostyle.
+void FillAutoStyle(const OUString& rAutoStyleName, const 
css::uno::Reference& rProp);
+
 const css::uno::Reference< css::chart::XChartDocument >& GetChartDocument()
 { return mxChartDoc; }
 
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx 
b/xmloff/source/chart/SchXMLAxisContext.cxx
index 9feded2..652e223 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -219,18 +219,8 @@ void SchXMLAxisContext::CreateGrid( const OUString& 
sAutoStyleName, bool bIsMajo
 // the line color is black as default, in the model it is a light gray
 xGridProp->setPropertyValue("LineColor",
  uno::makeAny( COL_BLACK ));
-if( !sAutoStyleName.isEmpty())
-{
-const SvXMLStylesContext* pStylesCtxt = 
m_rImportHelper.GetAutoStylesContext();
-if( pStylesCtxt )
-{
-const SvXMLStyleContext* pStyle = 
pStylesCtxt->FindStyleChildContext(
-SchXMLImportHelper::GetChartFamilyID(), sAutoStyleName );
-
-if( pStyle && dynamic_cast( 
pStyle) !=  nullptr)
-const_cast( static_cast< const 
XMLPropStyleContext* >( pStyle ))->FillPropertySet( xGridProp );
-}
-}
+if (!sAutoStyleName.isEmpty())
+m_rImportHelper.FillAutoStyle(sAutoStyleName, xGridProp);
 }
 }
 
diff --git a/xmloff/source/chart/SchXMLChartC

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

2016-06-23 Thread Vasily Melenchuk

 sd/qa/unit/sdmodeltestbase.hxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 535ac37c5ff9b9dc60f6f56e4cfd518eff764975
Author: Vasily Melenchuk 
Date:   Mon Jun 20 16:30:58 2016 +0300

support for ms binary format validation in sd module export tests

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

diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index edf11f9..0b7e3be 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -204,6 +204,10 @@ protected:
 {
 BootstrapFixture::validate(pTempFile->GetFileName(), test::OOXML);
 }
+else if(nExportType == PPT)
+{
+BootstrapFixture::validate(pTempFile->GetFileName(), 
test::MSBINARY);
+}
 pTempFile->EnableKillingFile();
 return loadURL(pTempFile->GetURL(), nExportType);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Week 4 : Area Fill

2016-06-23 Thread Rishabh Kumar

Hi,

Last week I completed the following tasks -

1. Created a new pattern tab - http://imgur.com/Jjmuc35

2. Moved bitmap controls from Area tab - http://imgur.com/CWaK5pP

3. Multiple color palettes in color dialog - http://imgur.com/ZPsy9zO

Work planned for this week -

1. Make changes and merge the commits https://gerrit.libreoffice.org/26015 and
https://gerrit.libreoffice.org/26402 to master.

2. Move all the fill style tabs inside the area tab

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

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

2016-06-23 Thread Caolán McNamara

 svtools/source/misc/ehdl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d531743ca34232aedc0b437a9ff5807dea8d51ed
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 23 09:41:40 2016 +0100

VclPtr: svtools error message dialog doesn't dispose

Change-Id: I83640cc60d5e0239d228c749c32f896df5e2d9f2

diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 09fa9c4..3534f50 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -137,6 +137,7 @@ static sal_uInt16 aWndFunc(
 SAL_WARN( "svtools.misc", "Unknown MessBox return value" );
 break;
 }
+pBox.disposeAndClear();
 return nRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Week 4: Redesigning the Template Manager

2016-06-23 Thread Akshay Deep

Hello,
I'm working with on the Template Manager as my GSoC project.
(Mentors: Samuel
Mehrbrodt and Yousuf Philips)

Last week, I fixed some bugs and enhancement requests in start center. I
worked on few remaining parts of my project. I am also working on a writer
enhancement (GotoPage Dialog),

Patches :
https://gerrit.libreoffice.org/#/q/owner:akshaydeepiitr%2540gmail.com

This week, I'll provide the documentation team with the list of changes
I've done to template manager and will continue with the other tasks.

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

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

2016-06-23 Thread Miklos Vajna

 compilerplugins/clang/oncevar.cxx   |  146 
 compilerplugins/clang/store/oncevar.cxx |  146 
 desktop/source/lib/init.cxx |2 
 3 files changed, 147 insertions(+), 147 deletions(-)

New commits:
commit 7ab4f31b6e23bc33ca9bb3bd6ca44da029148a8d
Author: Miklos Vajna 
Date:   Thu Jun 23 09:43:21 2016 +0200

compilerplugins: move oncevar into store

As suggested by Stephan and agreed by Noel -- as its warnings are not
useful in all cases.

Change-Id: I3c6034ae9d3c74aeb089a67dc48c1f91a3ea3a21

diff --git a/compilerplugins/clang/oncevar.cxx 
b/compilerplugins/clang/store/oncevar.cxx
similarity index 100%
rename from compilerplugins/clang/oncevar.cxx
rename to compilerplugins/clang/store/oncevar.cxx
commit bb19a820e8ceec28bcb346b32f4288babc442720
Author: Miklos Vajna 
Date:   Thu Jun 23 09:42:42 2016 +0200

Revert "desktop: fix loplugin:oncevar"

This reverts commit 8dc2873081bff3fe7107d472a91a24af8b67a87d. Instead of
working around the warning, the plugin will be disabled, as its warnings
are not useful in all cases.

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0d0cdf2..ab765dc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2007,7 +2007,7 @@ static void lo_setDocumentPassword(LibreOfficeKit* pThis,
 
 static char* lo_getVersionInfo(LibreOfficeKit* /*pThis*/)
 {
-static const OUString sVersionStrTemplate(
+const OUString sVersionStrTemplate(
 "{ "
 "\"ProductName\": \"%PRODUCTNAME\", "
 "\"ProductVersion\": \"%PRODUCTVERSION\", "
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-23 Thread Akshay Deep

 include/vcl/button.hxx   |1 +
 include/vcl/menubtn.hxx  |   10 ++
 sfx2/source/dialog/backingwindow.cxx |   12 +++-
 sfx2/source/dialog/backingwindow.hxx |6 +++---
 vcl/source/control/button.cxx|   20 +++-
 vcl/source/control/menubtn.cxx   |   18 ++
 6 files changed, 58 insertions(+), 9 deletions(-)

New commits:
commit 596065ff05165f5b59cfcfdcee09166931455e19
Author: Akshay Deep 
Date:   Sun Jun 19 14:38:54 2016 +0530

GSoC tdf#87697 START CENTER: Indicate selected thumbnailview

Added new "Active" state to PushButton class
Active state used in MenuToggleButton class.

Active => Pressed + Flyover

When hovered in Active state, Active => Flyover only

Change-Id: Iece1550b6d742a7ab3c9f4c7516ec855e1a1b6ef
Reviewed-on: https://gerrit.libreoffice.org/26470
Reviewed-by: Akshay Deep 
Tested-by: Akshay Deep 

diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 0fb7c98..a020bd6 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -120,6 +120,7 @@ protected:
 PushButtonDropdownStyle mnDDStyle;
 boolmbPressed;
 boolmbInUserDraw;
+boolmbIsActive;
 
 SAL_DLLPRIVATE voidImplInitPushButtonData();
 SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* 
pPrevWindow, WinBits nStyle );
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 8d8438f..0e57668 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -78,6 +78,16 @@ public:
 voidSetSelectHdl( const Link& rLink ) { 
maSelectHdl = rLink; }
 };
 
+
+class VCL_DLLPUBLIC MenuToggleButton : public MenuButton
+{
+public:
+explicitMenuToggleButton( vcl::Window* pParent, WinBits nStyle = 0 
);
+virtual ~MenuToggleButton();
+
+voidSetActive( bool bSel );
+};
+
 #endif // INCLUDED_VCL_MENUBTN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 9c054d5..ef27a2d 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -256,6 +256,7 @@ void BackingWindow::initControls()
 mpAllRecentThumbnails->mnFileTypes |= TYPE_OTHER;
 mpAllRecentThumbnails->Reload();
 mpAllRecentThumbnails->ShowTooltips( true );
+mpRecentButton->SetActive(true);
 
 //initialize Template view
 mpLocalView->SetStyle( mpLocalView->GetStyle() | WB_VSCROLL);
@@ -345,7 +346,7 @@ void BackingWindow::setupButton( PushButton* pButton )
 pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
 }
 
-void BackingWindow::setupButton( MenuButton* pButton )
+void BackingWindow::setupButton( MenuToggleButton* pButton )
 {
 vcl::Font 
aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
 aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
@@ -595,6 +596,9 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, 
void )
 mpLocalView->Hide();
 mpAllRecentThumbnails->Show();
 mpAllRecentThumbnails->GrabFocus();
+mpRecentButton->SetActive(true);
+mpTemplateButton->SetActive(false);
+mpTemplateButton->Invalidate();
 }
 else if( pButton == mpTemplateButton )
 {
@@ -604,6 +608,9 @@ IMPL_LINK_TYPED( BackingWindow, ClickHdl, Button*, pButton, 
void )
 mpLocalView->Show();
 mpLocalView->reload();
 mpLocalView->GrabFocus();
+mpRecentButton->SetActive(false);
+mpRecentButton->Invalidate();
+mpTemplateButton->SetActive(true);
 }
 }
 
@@ -654,6 +661,9 @@ IMPL_LINK_TYPED( BackingWindow, MenuSelectHdl, MenuButton*, 
pButton, void )
 mpLocalView->Show();
 mpLocalView->reload();
 mpLocalView->GrabFocus();
+mpRecentButton->SetActive(false);
+mpTemplateButton->SetActive(true);
+mpRecentButton->Invalidate();
 }
 }
 
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 4c80c9f..499d8b3 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -59,9 +59,9 @@ class BackingWindow : public vcl::Window, public 
VclBuilderContainer
 css::uno::Reference 
mxDropTargetListener;
 
 VclPtr mpOpenButton;
-VclPtr mpRecentButton;
+VclPtr mpRecentButton;
 VclPtr mpRemoteButton;
-VclPtr mpTemplateButton;
+VclPtr mpTemplateButton;
 
 VclPtr  mpCreateLabel;
 
@@ -93,7 +93,7 @@ class BackingWindow : public vcl::Window, public 
VclBuilderContainer
 std::unique_ptr mpAccExec;
 
 void setupButton(PushButton* pButton);
-void setupButton(MenuButton* pButton);
+void setupButton(MenuToggleButton* pButton);
 
 void dispatchURL(const OUString& i_rURL,
  const OUString& i_rTarget = OUString("_default"),

79 matches

Mail list logo