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

2017-04-12 Thread Noel Grandin 
 sw/source/core/unocore/unoportenum.cxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 88917210aae25d634f22fed9c916659f3515135a
Author: Noel Grandin 
Date:   Wed Apr 12 14:38:27 2017 +0200

convert BKM_TYPE to scoped enum

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

diff --git a/sw/source/core/unocore/unoportenum.cxx 
b/sw/source/core/unocore/unoportenum.cxx
index 0f1090fdfef2..2f4520b6e8c3 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -85,18 +85,18 @@ static void lcl_CreatePortions(
 
 namespace
 {
-static const sal_uInt8 BKM_TYPE_START = 0;
-static const sal_uInt8 BKM_TYPE_END = 1;
-static const sal_uInt8 BKM_TYPE_START_END = 2;
+enum class BkmType {
+Start, End, StartEnd
+};
 
 struct SwXBookmarkPortion_Impl
 {
 Reference xBookmark;
-sal_uInt8   nBkmType;
+BkmType nBkmType;
 const SwPositionaPosition;
 
 SwXBookmarkPortion_Impl(uno::Reference const& 
xMark,
-const sal_uInt8 nType, SwPosition const& rPosition)
+const BkmType nType, SwPosition const& rPosition)
 : xBookmark ( xMark )
 , nBkmType  ( nType )
 , aPosition ( rPosition )
@@ -141,8 +141,8 @@ namespace
 {
 // #i109272#: cross reference marks: need special handling!
 ::sw::mark::CrossRefBookmark *const pCrossRefMark(dynamic_cast< 
::sw::mark::CrossRefBookmark*>(pBkmk));
-sal_uInt8 const nType = (hasOther || pCrossRefMark)
-? BKM_TYPE_START : BKM_TYPE_START_END;
+BkmType const nType = (hasOther || pCrossRefMark)
+? BkmType::Start : BkmType::StartEnd;
 rBkmArr.insert(std::make_shared(
 SwXBookmark::CreateXBookmark(rDoc, pBkmk),
 nType, rStartPos));
@@ -169,7 +169,7 @@ namespace
 {
 rBkmArr.insert(std::make_shared(
 SwXBookmark::CreateXBookmark(rDoc, pBkmk),
-BKM_TYPE_END, *pEndPos));
+BkmType::End, *pEndPos));
 }
 }
 }
@@ -615,17 +615,17 @@ static void lcl_ExportBookmark(
 break;
 
 SwXTextPortion* pPortion = nullptr;
-if ((BKM_TYPE_START == pPtr->nBkmType) ||
-(BKM_TYPE_START_END == pPtr->nBkmType))
+if ((BkmType::Start == pPtr->nBkmType) ||
+(BkmType::StartEnd == pPtr->nBkmType))
 {
 pPortion =
 new SwXTextPortion(pUnoCursor, xParent, 
PORTION_BOOKMARK_START);
 rPortions.push_back(pPortion);
 pPortion->SetBookmark(pPtr->xBookmark);
-pPortion->SetCollapsed( BKM_TYPE_START_END == pPtr->nBkmType );
+pPortion->SetCollapsed( BkmType::StartEnd == pPtr->nBkmType );
 
 }
-if (BKM_TYPE_END == pPtr->nBkmType)
+if (BkmType::End == pPtr->nBkmType)
 {
 pPortion =
 new SwXTextPortion(pUnoCursor, xParent, PORTION_BOOKMARK_END);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Noel Grandin 
 sw/inc/doc.hxx|3 +--
 sw/inc/fesh.hxx   |3 +--
 sw/inc/tblenum.hxx|8 
 sw/inc/tblsel.hxx |4 ++--
 sw/source/core/docnode/ndtbl.cxx  |   14 +++---
 sw/source/core/frmedt/fetab.cxx   |4 ++--
 sw/source/core/frmedt/tblsel.cxx  |   12 ++--
 sw/source/core/unocore/unotbl.cxx |2 +-
 sw/source/uibase/shells/tabsh.cxx |6 +++---
 9 files changed, 27 insertions(+), 29 deletions(-)

New commits:
commit 518cf484c7aed6cd09c7db4a19d16fbf72d25e3b
Author: Noel Grandin 
Date:   Wed Apr 12 14:35:52 2017 +0200

convert TableMergeErr to scoped enum

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

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a285846cd63a..f75ed2775890 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1206,8 +1206,7 @@ public:
 bool SplitTable( const SwSelBoxes& rBoxes, bool bVert,
sal_uInt16 nCnt, bool bSameHeight = false );
 
-// @return enum TableMergeErr.
-sal_uInt16 MergeTable( SwPaM& rPam );
+TableMergeErr MergeTable( SwPaM& rPam );
 OUString GetUniqueTableName() const;
 bool IsInsTableFormatNum() const;
 bool IsInsTableChangeNumFormat() const;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 9b8a6d4304e3..3932c5af033b 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -638,8 +638,7 @@ public:
 
 bool DeleteTableSel();///< Current selection, may be whole table.
 
-sal_uInt16 MergeTab();  /**< Merge selected parts of table.
-  @return error via enum. */
+TableMergeErr MergeTab();  /**< Merge selected parts of table */
 
 /// Split cell vertically or horizontally.
 bool SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight = false );
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index b5590a6ebc01..fbef062307c8 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -64,11 +64,11 @@ enum class SplitTable_HeadlineOption
 BoxAttrAllCopy // Copy box attributes and paragraph styles of 1st line.
 };
 
-enum TableMergeErr
+enum class TableMergeErr
 {
-TBLMERGE_OK,
-TBLMERGE_NOSELECTION,
-TBLMERGE_TOOCOMPLEX
+Ok,
+NoSelection,
+TooComplex
 };
 
 #endif
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 295cd2da21c1..72057211e3f5 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -109,8 +109,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
   SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo );
 
 // Check if selected boxes allow for a valid merge.
-sal_uInt16 CheckMergeSel( const SwPaM& rPam );
-sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes );
+TableMergeErr CheckMergeSel( const SwPaM& rPam );
+TableMergeErr CheckMergeSel( const SwSelBoxes& rBoxes );
 
 bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index e3e14cefa74d..44d932947a2a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2247,22 +2247,22 @@ bool SwDoc::SplitTable( const SwSelBoxes& rBoxes, bool 
bVert, sal_uInt16 nCnt,
 return bRet;
 }
 
-sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
+TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
 {
 // Check if the current cursor's Point/Mark are inside a Table
 SwTableNode* pTableNd = rPam.GetNode().FindTableNode();
 if( !pTableNd )
-return TBLMERGE_NOSELECTION;
+return TableMergeErr::NoSelection;
 SwTable& rTable = pTableNd->GetTable();
 if( dynamic_cast( &rTable) !=  nullptr )
-return TBLMERGE_NOSELECTION;
-sal_uInt16 nRet = TBLMERGE_NOSELECTION;
+return TableMergeErr::NoSelection;
+TableMergeErr nRet = TableMergeErr::NoSelection;
 if( !rTable.IsNewModel() )
 {
 nRet =::CheckMergeSel( rPam );
-if( TBLMERGE_OK != nRet )
+if( TableMergeErr::Ok != nRet )
 return nRet;
-nRet = TBLMERGE_NOSELECTION;
+nRet = TableMergeErr::NoSelection;
 }
 
 // #i33394#
@@ -2331,7 +2331,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
 
 if( pTableNd->GetTable().Merge( this, aBoxes, aMerged, pMergeBox, 
pUndo ))
 {
-nRet = TBLMERGE_OK;
+nRet = TableMergeErr::Ok;
 
 getIDocumentState().SetModified();
 getIDocumentFieldsAccess().SetFieldsDirty( true, nullptr, 0 );
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index ca1318aed10f..2aa57473d920 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -444,10 +444,10 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
 return bRet;
 }
 
-sal_uInt16 SwFEShell::MergeTab()
+TableMergeErr SwFEShell::MergeTab()
 {
 // check if Point/Mar

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

2017-04-12 Thread Noel Grandin 
 sw/inc/doc.hxx|2 -
 sw/inc/fesh.hxx   |2 -
 sw/inc/swtable.hxx|4 +-
 sw/inc/tblenum.hxx|   41 +++---
 sw/source/core/doc/tblrwcl.cxx|   58 +++---
 sw/source/core/docnode/ndtbl.cxx  |   25 
 sw/source/core/frmedt/fetab.cxx   |   42 +--
 sw/source/core/inc/UndoTable.hxx  |5 +--
 sw/source/core/undo/untbl.cxx |   29 +--
 sw/source/uibase/docvw/edtwin.cxx |   54 +--
 10 files changed, 136 insertions(+), 126 deletions(-)

New commits:
commit 890d6790715c4c3f3565b476d538643f04dc6936
Author: Noel Grandin 
Date:   Wed Apr 12 13:38:31 2017 +0200

convert TableChgWidthHeightType to o3tl::typed_flags

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

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6fc96f312452..a285846cd63a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1251,7 +1251,7 @@ public:
 
 void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
 
-bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
+bool SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType 
eType,
 SwTwips nAbsDiff, SwTwips nRelDiff );
 SwTableBoxFormat* MakeTableBoxFormat();
 SwTableLineFormat* MakeTableLineFormat();
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 7b3b50a7a30d..9b8a6d4304e3 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -729,7 +729,7 @@ public:
 
 bool GetTableAutoFormat( SwTableAutoFormat& rGet );
 
-bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff );
+bool SetColRowWidthHeight( TableChgWidthHeightType eType, sal_uInt16 nDiff 
);
 
 bool GetAutoSum( OUString& rFormula ) const;
 
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index c1e9a50fe82e..e2508ec117ac 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -344,9 +344,9 @@ public:
 TableChgMode GetTableChgMode() const{ return m_eTableChgMode; }
 void SetTableChgMode( TableChgMode eMode )  { m_eTableChgMode = eMode; }
 
-bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
+bool SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType,
 SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
+bool SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType,
 SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
 void RegisterToFormat( SwFormat& rFormat );
 #ifdef DBG_UTIL
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index 5e61189c69b2..b5590a6ebc01 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -19,26 +19,33 @@
 #ifndef INCLUDED_SW_INC_TBLENUM_HXX
 #define INCLUDED_SW_INC_TBLENUM_HXX
 
-// For changing table columns/rows widths/heights.
-typedef sal_uInt16 TableChgWidthHeightType;
+#include 
 
-namespace nsTableChgWidthHeightType
+// For changing table columns/rows widths/heights.
+enum class TableChgWidthHeightType : sal_uInt16
 {
-const TableChgWidthHeightType WH_COL_LEFT = 0;
-const TableChgWidthHeightType WH_COL_RIGHT = 1;
-const TableChgWidthHeightType WH_ROW_TOP = 2;
-const TableChgWidthHeightType WH_ROW_BOTTOM = 3;
-const TableChgWidthHeightType WH_CELL_LEFT = 4;
-const TableChgWidthHeightType WH_CELL_RIGHT = 5;
-const TableChgWidthHeightType WH_CELL_TOP = 6;
-const TableChgWidthHeightType WH_CELL_BOTTOM = 7;
+ColLeft  = 0,
+ColRight = 1,
+RowTop   = 2,
+RowBottom= 3,
+CellLeft = 4,
+CellRight= 5,
+CellTop  = 6,
+CellBottom   = 7,
+InvalidPos   = 0x0f,
 
-// The following can "or"ed into.
-const TableChgWidthHeightType WH_FLAG_INSDEL  = 0x4000;   // 
Insert/Del-mode: the Bigger-Flag
-// tells 
what happens:
-// bBigger 
-> box gets removed.
-// 
!bBigger-> box gets inserted.
-const TableChgWidthHeightType WH_FLAG_BIGGER  = 0x8000;   // Box 
becomes larger -> else smaller.
+// The following can be "or"ed in.
+InsertDeleteMode = 0x4000, // Insert/Del-mode: the Bigger-Flag
+   // tells what happens:
+   // bBigger -> box gets removed.
+   // !bBigger-> box gets inserted.
+BiggerMode   = 0x8000, // Box becomes larger -> else smaller.
+};
+namespace o3tl {
+template<> struct typed_flags : 
is_typed_flags {};
+}
+constexpr TableChgWidthHeightType extractPosition(Tabl

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

2017-04-12 Thread Stephan Bergmann 
 solenv/bin/modules/installer/control.pm   |   14 --
 solenv/bin/modules/installer/windows/admin.pm |   13 -
 solenv/bin/modules/installer/windows/msiglobal.pm |   30 --
 3 files changed, 57 deletions(-)

New commits:
commit 5b6b0bb47aae0dfafb09f4ccf794a921e3717055
Author: Stephan Bergmann 
Date:   Wed Apr 12 14:12:07 2017 +0200

Remove support for cross-building .msi on Linux

...which is no longer needed after 8646ab97dc37c0606b19057686bf3d610f9c15ee
"Remove MinGW support".  This effectively removes the commits
8251cd1936af5047c817adf88333fef31031c506 "Call uuidgen without -n when 
cross-
compiling", e8ddf693e69ea768e4cb1bd4c0445990149af07d "Cross-compiling-msi-
related changes; not finished", 60865562c89f2d9a5d157f809e401d725dee9a86 "We
have to add the path to solver for the msi* tools when cross-compiling", and
61b1c24615445d7677dbfe4a702d3dd97eaa4939 "More full paths for cross msi* 
tools"
(while 8429bd67715a33751f4cfd50cb4be0346d78ee65 "Make the relativisation of 
the
path working even on Linux" from amidst them is probably "harmless").

Change-Id: I0b9be32babdf6db83e2093eafd556c875910d92b
Reviewed-on: https://gerrit.libreoffice.org/36471
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/bin/modules/installer/control.pm 
b/solenv/bin/modules/installer/control.pm
index decf519eb881..c013b593cb79 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -70,12 +70,6 @@ sub check_system_path
 # All platforms: zip
 # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", 
"msitran.exe", "expand.exe" for msi database and packaging
 
-if ($ENV{'CROSS_COMPILING'} eq 'TRUE')
-{
-# we build our own msi* etc. tools when cross-compiling
-$ENV{'PATH'} .= $installer::globals::pathseparator . 
$ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable';
-}
-
 my $onefile;
 my $error = 0;
 my $pathvariable = $ENV{'PATH'};
@@ -100,10 +94,6 @@ sub check_system_path
 {
 @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", 
"uuidgen", "makecab.exe", "msitran.exe", "expand.exe");
 }
-elsif ($installer::globals::isunix && $installer::globals::packageformat 
eq 'msi')
-{
-@needed_files_in_path = ("zip", "msiinfo.exe", "msidb.exe", "uuidgen", 
"makecab.exe", "msitran.exe", "cabextract");
-}
 elsif ($installer::globals::iswin)
 {
 @needed_files_in_path = ("zip.exe");
@@ -167,10 +157,6 @@ sub get_makecab_version
 my $makecabversion = -1;
 
 my $systemcall = "makecab.exe |";
-if ( $installer::globals::isunix )
-{
-$systemcall = 
"$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe |";
-}
 my @makecaboutput = ();
 
 open (CAB, $systemcall);
diff --git a/solenv/bin/modules/installer/windows/admin.pm 
b/solenv/bin/modules/installer/windows/admin.pm
index 6fb18583110f..27e4ba7c3232 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -39,11 +39,6 @@ sub unpack_cabinet_file
 push( @installer::globals::logfileinfo, $infoline);
 
 my $expandfile = "expand.exe";  # Has to be in the path
-if ( $installer::globals::isunix )
-{
-$infoline = "ERROR: We need to change this to use cabextract instead 
of expand.exe\n";
-push( @installer::globals::logfileinfo, $infoline);
-}
 
 # expand.exe has to be located in the system directory.
 # Cygwin has another tool expand.exe, that converts tabs to spaces. This 
cannot be used of course.
@@ -100,10 +95,6 @@ sub extract_tables_from_pcpfile
 my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
 
 my $msidb = "msidb.exe";# Has to be in the path
-if ( $installer::globals::isunix )
-{
-$msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe";
-}
 my $infoline = "";
 my $systemcall = "";
 my $returnvalue = "";
@@ -405,10 +396,6 @@ sub write_sis_info
 if ( ! -f $msidatabase ) { installer::exiter::exit_program("ERROR: Cannot 
find file $msidatabase", "write_sis_info"); }
 
 my $msiinfo = "msiinfo.exe";# Has to be in the path
-if ( $installer::globals::isunix )
-{
-$msiinfo = 
"$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msiinfo.exe";
-}
 my $infoline = "";
 my $systemcall = "";
 my $returnvalue = "";
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 11340fdb845d..383f7f3599cc 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -249,10 +249,6 @@ sub generate_cab_file_list
 # Writing the makecab system call
 
 my $oneline = "makecab.exe /V3 /F " . $ddffilename . " 2\>\&1 |" . 
"\n";
-if ( $

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

2017-04-12 Thread Zdeněk Crhonek 
 sc/qa/unit/data/functions/statistical/fods/z.test.fods | 5260 +
 sc/qa/unit/data/functions/statistical/fods/ztest.fods  | 5216 
 2 files changed, 10476 insertions(+)

New commits:
commit d2e0f12a573fe3629180ece41c4f132d4914b475
Author: Zdeněk Crhonek 
Date:   Wed Apr 12 21:56:31 2017 +0200

add ZTEST, Z.TEST test  case

Change-Id: Icecc7fb4d61efbc9ccd2f3da8b263384fd5858a3
Reviewed-on: https://gerrit.libreoffice.org/36489
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/unit/data/functions/statistical/fods/z.test.fods 
b/sc/qa/unit/data/functions/statistical/fods/z.test.fods
new file mode 100644
index ..12f4cfc8c8c3
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/z.test.fods
@@ -0,0 +1,5260 @@
+
+
+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">
+ 
2017-04-12T21:55:09.177510596P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/eefe13c77d01be37c911e75af191717a944fedb3
+ 
+  
+   0
+   0
+   104905
+   12819
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   6
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   kgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAswAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARHVwbGV4TW9kZTo6T2Zm
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+

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

2017-04-12 Thread Stephan Bergmann 
 include/jvmfwk/framework.hxx  |6 ++
 jvmfwk/source/framework.cxx   |   14 --
 stoc/source/javavm/javavm.cxx |   30 --
 3 files changed, 14 insertions(+), 36 deletions(-)

New commits:
commit 1a2afa01c98b6edefaaf18590d6e55c3a9731920
Author: Stephan Bergmann 
Date:   Wed Apr 12 23:10:11 2017 +0200

Simplify passing options to jfw_startVM

Change-Id: Idac31e282fe4df69449298a03d491473e460c742
Reviewed-on: https://gerrit.libreoffice.org/36495
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index d6059bb640af..afab60eef427 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -454,9 +454,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
 @param pInfo
 [in] optional pointer to a specific JRE; must be caller-freed if not NULL
 @param arOptions
-[in] the array containing additional start arguments or NULL.
-@param nSize
-[in] the size of the array arOptions.
+[in] the vector containing additional start arguments.
 @param ppVM
 [out] the JavaVM pointer.
 @param ppEnv
@@ -484,7 +482,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
 JAVA_HOMEdoes not meet the version requirements.
  */
 JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM(
-JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize,
+JavaInfo const * pInfo, std::vector const & arOptions,
 JavaVM ** ppVM, JNIEnv ** ppEnv);
 
 /** determines the JRE that is to be used.
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 0165fcf9efd9..42d99557fc0b 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -187,10 +187,9 @@ javaFrameworkError 
jfw_findAllJREs(std::vector> *pparI
 }
 
 javaFrameworkError jfw_startVM(
-JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 cOptions,
+JavaInfo const * pInfo, std::vector const & arOptions,
 JavaVM ** ppVM, JNIEnv ** ppEnv)
 {
-assert(cOptions == 0 || arOptions != nullptr);
 assert(ppVM != nullptr);
 javaFrameworkError errcode = JFW_E_NONE;
 
@@ -289,7 +288,7 @@ javaFrameworkError jfw_startVM(
 // it contains the classpath and all options set in the
 //options dialog
 std::unique_ptr sarJOptions(
-new JavaVMOption[cOptions + 2 + vmParams.size()]);
+new JavaVMOption[arOptions.size() + 2 + vmParams.size()]);
 JavaVMOption * arOpt = sarJOptions.get();
 if (! arOpt)
 return JFW_E_ERROR;
@@ -313,10 +312,13 @@ javaFrameworkError jfw_startVM(
 index ++;
 }
 //add all options of the arOptions argument
-for (int ii = 0; ii < cOptions; ii++)
+std::vector convertedOptions;
+for (auto const & ii: arOptions)
 {
-arOpt[index].optionString = arOptions[ii].optionString;
-arOpt[index].extraInfo = arOptions[ii].extraInfo;
+OString conv = OUStringToOString(ii, osl_getThreadTextEncoding());
+convertedOptions.push_back(conv);
+arOpt[index].optionString = const_cast(conv.getStr());
+arOpt[index].extraInfo = nullptr;
 index++;
 }
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 18ab9084c78e..a4e9efe66e59 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -706,33 +706,11 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< 
sal_Int8 > const & rProcessId)
 stoc_javavm::JVM aJvm;
 initVMConfiguration(&aJvm, m_xContext->getServiceManager(),
 m_xContext);
-//Create the JavaVMOption array
 const std::vector & props = aJvm.getProperties();
-std::unique_ptr sarOptions(
-new JavaVMOption[props.size()]);
-JavaVMOption * arOptions = sarOptions.get();
-//Create an array that contains the strings which are passed
-//into the options
-std::unique_ptr sarPropStrings(
- new OString[props.size()]);
-OString * arPropStrings = sarPropStrings.get();
-
-OString sJavaOption("-");
-typedef std::vector::const_iterator cit;
-int index = 0;
-for (cit i = props.begin(); i != props.end(); ++i)
+std::vector options;
+for (auto const & i: props)
 {
-OString sOption = OUStringToOString(
-*i, osl_getThreadTextEncoding());
-
-if (!sOption.matchIgnoreAsciiCase(sJavaOption))
-arPropStrings[index]= OString("-D") + sOption;
-else
-arPropStrings[index] = sOption;
-
-arOptions[index].optionString = 
const_cast(arPropStrings[index].getStr());
-arOptions[index].extraInfo = nullptr;
-index ++;
+options.push_back(i.startsWith("-") ? i : "-D" +

[Libreoffice-commits] core.git: connectivity/source cui/source desktop/source framework/source hwpfilter/source i18nutil/source include/framework include/tools jvmfwk/source onlineupdate/source oox/so

2017-04-12 Thread Andrea Gelmini 
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |1 -
 cui/source/options/optjava.cxx|3 
+--
 desktop/source/lib/init.cxx   |2 --
 framework/source/uielement/toolbarsmenucontroller.cxx |1 -
 hwpfilter/source/lexer.cxx|1 -
 i18nutil/source/utility/unicode.cxx   |1 -
 include/framework/interaction.hxx |1 -
 include/tools/diagnose_ex.h   |1 -
 jvmfwk/source/framework.cxx   |1 -
 onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx |1 -
 oox/source/helper/propertymap.cxx |4 

 sal/qa/osl/file/osl_File_Const.h  |2 --
 sal/rtl/alloc_global.cxx  |8 

 sc/qa/unit/subsequent_filters-test.cxx|3 
+--
 sc/source/filter/html/htmlpars.cxx|1 -
 sc/source/filter/oox/revisionfragment.cxx |2 --
 sc/source/filter/orcus/orcusfiltersimpl.cxx   |1 -
 sc/source/filter/xml/xmlimprt.cxx |1 -
 sc/source/ui/docshell/docfunc.cxx |1 -
 sc/source/ui/miscdlgs/autofmt.cxx |1 -
 sc/source/ui/miscdlgs/scuiautofmt.cxx |1 -
 sc/source/ui/view/gridwin.cxx |2 --
 sc/source/ui/view/tabview3.cxx|1 -
 sc/source/ui/view/viewfun3.cxx|1 -
 sd/qa/unit/dialogs-test.cxx   |1 -
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |1 -
 sd/source/ui/animations/CustomAnimationDialog.cxx |1 -
 sd/source/ui/animations/CustomAnimationPane.hxx   |1 -
 sd/source/ui/sidebar/MasterPageContainer.cxx  |2 --
 sd/source/ui/sidebar/SlideBackground.cxx  |2 --
 sfx2/source/appl/appinit.cxx  |1 -
 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx |1 -
 svx/source/svdraw/svdetc.cxx  |1 -
 svx/source/svdraw/svdpntv.cxx |5 
+
 sw/inc/docary.hxx |1 -
 sw/source/core/doc/DocumentDrawModelManager.cxx   |1 -
 sw/source/uibase/dbui/mmconfigitem.cxx|1 -
 sw/source/uibase/sidebar/PageColumnControl.hxx|1 -
 sw/source/uibase/sidebar/PageFormatPanel.hxx  |1 -
 sw/source/uibase/sidebar/PageStylesPanel.hxx  |1 -
 sw/source/uibase/uiview/viewtab.cxx   |2 --
 ucb/source/ucp/webdav/SerfInputStream.cxx |2 --
 uui/source/iahndl-locking.cxx |2 --
 uui/source/iahndl.cxx |2 --
 vcl/backendtest/VisualBackendTest.cxx |2 --
 vcl/source/app/scheduler.cxx  |1 -
 vcl/source/app/svdata.cxx |3 
---
 vcl/source/gdi/pdfwriter_impl.cxx |1 -
 vcl/unx/generic/app/salinst.cxx   |1 -
 vcl/unx/generic/fontmanager/fontmanager.cxx   |1 -
 vcl/workben/mtfdemo.cxx   |2 --
 vcl/workben/vcldemo.cxx   |1 -
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |1 -
 53 files changed, 3 insertions(+), 82 deletions(-)

New commits:
commit 3c3f7d784eadd60c053284ec2835675f158d4156
Author: Andrea Gelmini 
Date:   Wed Apr 12 15:31:42 2017 +0200

Removed duplicated includes

No automatic tools. Manual checked and tested.

Change-Id: Ife260fa4e1d786cf81f2917a901664cc54943754
Reviewed-on: https://gerrit.libreoffice.org/36371
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index bb1ac1d449dd..9f44363427a5 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - shell/source

2017-04-12 Thread Mike Kaganski 
 shell/source/win32/spsupp/COMOpenDocuments.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ca58e823cb35d988f46ba2de96a1c5ec8f71b891
Author: Mike Kaganski 
Date:   Thu Apr 13 07:25:21 2017 +0300

tdf#103058: fix build failed because of missing header

Change-Id: I8cb7a94baad753f5cab07a085ae567d2c65ef5e1
Reviewed-on: https://gerrit.libreoffice.org/36502
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/shell/source/win32/spsupp/COMOpenDocuments.cxx 
b/shell/source/win32/spsupp/COMOpenDocuments.cxx
index 5f3af74a8be0..83ceb47296f4 100644
--- a/shell/source/win32/spsupp/COMOpenDocuments.cxx
+++ b/shell/source/win32/spsupp/COMOpenDocuments.cxx
@@ -7,6 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
+#include 
+
 #include "COMOpenDocuments.hpp"
 #include "spsuppServ.hpp"
 #include "stdio.h"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Ashod Nakashian 
 wsd/DocumentBroker.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ed51fafecef9424a71cca73edf8bb428d835f372
Author: Ashod Nakashian 
Date:   Wed Apr 12 21:19:51 2017 -0400

wsd: DocBroker is Alive if not flagged to stop

There is a race between creating and adding
a DocBroker into the DocBrokers container
and cleanupDocBrokers is invoked (on timer)
before it had a chance to start its poll
thread. This is exceedingly rare, but it
has happened.

We check that_stop==false flag when deciding
isAlive such that cleanDocBrokers will
not remove it before its thread had
a chance to run (which would happen
after adding it and creating the
ClientSession).

Also, no point in checking isAlive from
the polling thread itself (of course it is
alive).

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

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 3cac2e70..e0c8b05b 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -242,7 +242,7 @@ void DocumentBroker::pollThread()
 
 // If all sessions have been removed, no reason to linger.
 if ((isLoaded() || _markToDestroy) && notSaving &&
-(_sessions.empty() || !isAlive() || idle))
+(_sessions.empty() || idle))
 {
 LOG_INF("Terminating " << (idle ? "idle" : "dead") <<
 " DocumentBroker for docKey [" << getDocKey() << "].");
@@ -292,8 +292,8 @@ void DocumentBroker::pollThread()
 
 bool DocumentBroker::isAlive() const
 {
-if (_poll->isAlive())
-return true; // Polling thread still running.
+if (!_stop || _poll->isAlive())
+return true; // Polling thread not started or still running.
 
 // Shouldn't have live child process outside of the polling thread.
 return _childProcess && _childProcess->isAlive();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Kohei Yoshida 
 sc/source/core/tool/token.cxx |   10 ++
 sc/source/ui/docshell/docfunc.cxx |6 --
 sc/source/ui/undo/undoblk.cxx |2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 6d588e65021ad3d00a91a2732b2a6cf4c59b3534
Author: Kohei Yoshida 
Date:   Wed Apr 5 21:09:59 2017 -0400

tdf#92650: handle overwritten references correctly in undo.

Change-Id: Idc3fbd78f8163c97a9cd80a3ff474b6da0349353
Reviewed-on: https://gerrit.libreoffice.org/36496
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 26075a4278f5..75ef12c08299 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3167,6 +3167,11 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
 aAbs = aErrorPos;
 aRes.mbReferenceModified = true;
 }
+else if (rCxt.maRange.In(aAbs))
+{
+// Referenced cell has been overwritten.
+aRes.mbValueChanged = true;
+}
 
 rRef.SetAddress(aAbs, rNewPos);
 rRef.SetFlag3D(aAbs.Tab() != rNewPos.Tab() || 
!rRef.IsTabRel());
@@ -3183,6 +3188,11 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
 aAbs = aErrorRange;
 aRes.mbReferenceModified = true;
 }
+else if (rCxt.maRange.In(aAbs))
+{
+// Referenced range has been entirely overwritten.
+aRes.mbValueChanged = true;
+}
 
 rRef.SetRange(aAbs, rNewPos);
 // Absolute sheet reference => set 3D flag.
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 1619865cf7e9..76ac2a1aa902 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2839,8 +2839,10 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const 
ScAddress& rDestPos,
 function ScDocument::UpdateReference() is called which calls
 ScDrawLayer::MoveCells() which may move away inserted objects to wrong
 positions (e.g. if source and destination range overlaps).*/
-rDoc.CopyFromClip( aPasteDest, aDestMark, InsertDeleteFlags::ALL & 
~(InsertDeleteFlags::OBJECTS),
-nullptr, pClipDoc.get(), true, false, bIncludeFiltered 
);
+
+rDoc.CopyFromClip(
+aPasteDest, aDestMark, InsertDeleteFlags::ALL & 
~(InsertDeleteFlags::OBJECTS),
+pUndoDoc, pClipDoc.get(), true, false, bIncludeFiltered);
 
 // skipped rows and merged cells don't mix
 if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index dccc583e1317..1141e75655b7 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1101,7 +1101,7 @@ bool ScUndoPaste::CanRepeat(SfxRepeatTarget& rTarget) 
const
 ScUndoDragDrop::ScUndoDragDrop( ScDocShell* pNewDocShell,
 const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut,
 ScDocument* pUndoDocument, bool bScenario ) :
-ScMoveUndo( pNewDocShell, pUndoDocument, nullptr, SC_UNDO_REFFIRST ),
+ScMoveUndo( pNewDocShell, pUndoDocument, nullptr, SC_UNDO_REFLAST ),
 mnPaintExtFlags( 0 ),
 aSrcRange( rRange ),
 bCut( bNewCut ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Kohei Yoshida 
 sc/qa/unit/helper/qahelper.cxx |   38 
 sc/qa/unit/helper/qahelper.hxx |4 ++
 sc/qa/unit/ucalc.hxx   |2 +
 sc/qa/unit/ucalc_formula.cxx   |   63 +
 4 files changed, 107 insertions(+)

New commits:
commit 3a572975704a0d01e458191e8d66ff20ef60e4a8
Author: Kohei Yoshida 
Date:   Wed Apr 12 21:32:56 2017 -0400

tdf#92650: add a unit test for this.

Also add a modern C++11 version of checkOutput(), which should be
used instead of the older variant that is a template function.

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

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 3c4a42c3f919..f3cb007f0e9d 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -490,6 +490,44 @@ ScTokenArray* compileFormula(
 return aComp.CompileString(rFormula);
 }
 
+bool checkOutput(
+ScDocument* pDoc, const ScRange& aOutRange,
+const std::vector>& aCheck, const char* pCaption )
+{
+bool bResult = true;
+const ScAddress& s = aOutRange.aStart;
+const ScAddress& e = aOutRange.aEnd;
+svl::GridPrinter printer(e.Row() - s.Row() + 1, e.Col() - s.Col() + 1, 
CALC_DEBUG_OUTPUT != 0);
+SCROW nOutRowSize = e.Row() - s.Row() + 1;
+SCCOL nOutColSize = e.Col() - s.Col() + 1;
+for (SCROW nRow = 0; nRow < nOutRowSize; ++nRow)
+{
+for (SCCOL nCol = 0; nCol < nOutColSize; ++nCol)
+{
+OUString aVal = pDoc->GetString(nCol + s.Col(), nRow + s.Row(), 
s.Tab());
+printer.set(nRow, nCol, aVal);
+const char* p = aCheck[nRow][nCol];
+if (p)
+{
+OUString aCheckVal = OUString::createFromAscii(p);
+bool bEqual = aCheckVal.equals(aVal);
+if (!bEqual)
+{
+std::cout << "Expected: " << aCheckVal << "  Actual: " << 
aVal << std::endl;
+bResult = false;
+}
+}
+else if (!aVal.isEmpty())
+{
+std::cout << "Empty cell expected" << std::endl;
+bResult = false;
+}
+}
+}
+printer.print(pCaption);
+return bResult;
+}
+
 void clearFormulaCellChangedFlag( ScDocument& rDoc, const ScRange& rRange )
 {
 const ScAddress& s = rRange.aStart;
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 8ffcb047919c..cc4f5d40adc3 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -140,6 +140,10 @@ SCQAHELPER_DLLPUBLIC ScTokenArray* compileFormula(
 ScDocument* pDoc, const OUString& rFormula, const ScAddress* pPos = 
nullptr,
 formula::FormulaGrammar::Grammar eGram = 
formula::FormulaGrammar::GRAM_NATIVE );
 
+SCQAHELPER_DLLPUBLIC bool checkOutput(
+ScDocument* pDoc, const ScRange& aOutRange,
+const std::vector>& aCheck, const char* pCaption 
);
+
 template
 bool checkOutput(ScDocument* pDoc, const ScRange& aOutRange, const char* 
aOutputCheck[][Size], const char* pCaption)
 {
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 8a05d9653508..486bb1064e89 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -151,6 +151,7 @@ public:
 void testFormulaRefUpdateInsertColumns();
 void testFormulaRefUpdateMove();
 void testFormulaRefUpdateMoveUndo();
+void testFormulaRefUpdateMoveUndo2();
 void testFormulaRefUpdateMoveToSheet();
 void testFormulaRefUpdateDeleteContent();
 void testFormulaRefUpdateDeleteAndShiftLeft();
@@ -554,6 +555,7 @@ public:
 CPPUNIT_TEST(testFormulaRefUpdateInsertColumns);
 CPPUNIT_TEST(testFormulaRefUpdateMove);
 CPPUNIT_TEST(testFormulaRefUpdateMoveUndo);
+CPPUNIT_TEST(testFormulaRefUpdateMoveUndo2);
 CPPUNIT_TEST(testFormulaRefUpdateMoveToSheet);
 CPPUNIT_TEST(testFormulaRefUpdateDeleteContent);
 CPPUNIT_TEST(testFormulaRefUpdateDeleteAndShiftLeft);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 045e6976b9d8..9240320fac2a 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2263,6 +2263,69 @@ void Test::testFormulaRefUpdateMoveUndo()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testFormulaRefUpdateMoveUndo2()
+{
+m_pDoc->InsertTab(0, "Test");
+
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+std::vector> aData = {
+{ "1", "2", "=A2*10",  "=SUM(A1:B1)" },
+{ "3", "4", "=SUM(A2:B2)", "=SUM(A2:B2)" },
+{ "=SUM(A1:B1)" },
+};
+
+ScRange aOutRange = insertRangeData(m_pDoc, ScAddress(0,0,0), aData);
+
+std::vector> aCheckInitial = {
+{ "1", "2","30", "3" },
+{ "3", "4", "7", "7" },
+{ "3", nullptr, nullptr, nullptr },
+};
+
+b

[Libreoffice-commits] cppunit.git: configure.ac include/cppunit include/msvc6

2017-04-12 Thread Markus Mohrhard 
 configure.ac   |1 
 include/cppunit/ui/Makefile.am |2 
 include/cppunit/ui/mfc/Makefile.am |5 --
 include/cppunit/ui/mfc/MfcTestRunner.h |   76 -
 include/cppunit/ui/mfc/TestRunner.h|   21 -
 include/msvc6/testrunner/TestRunner.h  |   17 ---
 6 files changed, 1 insertion(+), 121 deletions(-)

New commits:
commit f8bd289315041e24853b74b601131f4745c3feb3
Author: Markus Mohrhard 
Date:   Thu Apr 13 04:20:19 2017 +0200

remove also all references to mfc

diff --git a/configure.ac b/configure.ac
index e7b4617..b34947a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,7 +130,6 @@ AC_CONFIG_FILES([
include/cppunit/portability/Makefile
include/cppunit/tools/Makefile
include/cppunit/ui/Makefile
-   include/cppunit/ui/mfc/Makefile
include/cppunit/ui/text/Makefile
doc/Makefile
doc/Doxyfile
diff --git a/include/cppunit/ui/Makefile.am b/include/cppunit/ui/Makefile.am
index 24cd2a5..4c4ceea 100644
--- a/include/cppunit/ui/Makefile.am
+++ b/include/cppunit/ui/Makefile.am
@@ -1 +1 @@
-SUBDIRS = text mfc
+SUBDIRS = text
diff --git a/include/cppunit/ui/mfc/Makefile.am 
b/include/cppunit/ui/mfc/Makefile.am
deleted file mode 100644
index 534b8cb..000
--- a/include/cppunit/ui/mfc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-libcppunitincludedir = $(includedir)/cppunit/ui/mfc
-
-libcppunitinclude_HEADERS = \
-   TestRunner.h \
-   MfcTestRunner.h
diff --git a/include/cppunit/ui/mfc/MfcTestRunner.h 
b/include/cppunit/ui/mfc/MfcTestRunner.h
deleted file mode 100644
index b2a7ed7..000
--- a/include/cppunit/ui/mfc/MfcTestRunner.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef CPPUNITUI_MFC_MFCTESTRUNNER_H
-#define CPPUNITUI_MFC_MFCTESTRUNNER_H
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include 
-#include 
-
-/* Refer to MSDN documentation to know how to write and use MFC extension DLL:
-   
mk:@MSITStore:h:\DevStudio\MSDN\98VSa\1036\vcmfc.chm::/html/_mfcnotes_tn033.htm#_mfcnotes_how_to_write_an_mfc_extension_dll
-   
-   This can be found in the index with "mfc extension"
-   The basic:
-   Using:
-   - your application must use MFC DLL
-   - memory allocation is done using the same heap
-   - you must define the symbol _AFX_DLL
-
-   Building:
-   - you must define the symbol _AFX_DLL and _AFX_EXT
-   - export class using AFX_EXT_CLASS
- */
-
-CPPUNIT_NS_BEGIN
-
-  class Test;
-  class TestSuite;
-
-
-/*! \brief MFC test runner.
- * \ingroup ExecutingTest
- *
- * Use this to launch the MFC TestRunner. Usually called from you CWinApp 
subclass:
- *
- * \code
- * #include 
- * #include 
- *
- * void 
- * CHostAppApp::RunUnitTests()
- * {
- *   CppUnit::MfcTestRunner runner;
- *   runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
- *
- *   runner.run();
- * }
- * \endcode
- * \see CppUnit::TextTestRunner, CppUnit::TestFactoryRegistry.
- */
-class AFX_EXT_CLASS MfcTestRunner
-{
-public:
-  MfcTestRunner();
-  virtual ~MfcTestRunner();
-
-  void run();
-
-  void addTest( Test *test );
-
-  void addTests( const std::vector &tests );
-
-protected:
-  Test *getRootTest();
-
-  TestSuite *m_suite;
-
-  typedef std::vector Tests;
-  Tests m_tests;
-};
-
-
-CPPUNIT_NS_END
-
-#endif // CPPUNITUI_MFC_MFCTESTRUNNER_H
diff --git a/include/cppunit/ui/mfc/TestRunner.h 
b/include/cppunit/ui/mfc/TestRunner.h
deleted file mode 100644
index c4d6aff..000
--- a/include/cppunit/ui/mfc/TestRunner.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CPPUNITUI_MFC_TESTRUNNER_H
-#define CPPUNITUI_MFC_TESTRUNNER_H
-
-#include 
-
-CPPUNIT_NS_BEGIN
-
-#if defined(CPPUNIT_HAVE_NAMESPACES)
-namespace MfcUi
-{
-  /*! Mfc TestRunner (DEPRECATED).
-   * \deprecated Use CppUnit::MfcTestRunner instead.
-   */
-  typedef CPPUNIT_NS::MfcTestRunner TestRunner;
-}
-#endif // defined(CPPUNIT_HAVE_NAMESPACES)
-
-CPPUNIT_NS_END
-
-
-#endif  // CPPUNITUI_MFC_TESTRUNNER_H
diff --git a/include/msvc6/testrunner/TestRunner.h 
b/include/msvc6/testrunner/TestRunner.h
deleted file mode 100644
index 0bee97a..000
--- a/include/msvc6/testrunner/TestRunner.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef CPPUNIT_MSVC_TESTRUNNER_H
-#define CPPUNIT_MSVC_TESTRUNNER_H
-
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#include 
-
-/*! \brief MFC test runner (DEPRECATED)
- * \ingroup ExecutingTest
- * \deprecated Use CppUnit::MfcUi::TestRunner instead.
- */
-typedef CPPUNIT_NS::MfcTestRunner TestRunner;
-
-#endif  // CPPUNIT_MSVC_TESTRUNNER_H
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/FileServer.cpp

2017-04-12 Thread Henry Castro 
 wsd/FileServer.cpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1a580cc993bae2203c0c3ae905856debca2aa04b
Author: Henry Castro 
Date:   Wed Apr 12 22:11:23 2017 -0400

wsd: add mime type image/png

IE11 requires explicit content-type image/png

Change-Id: Ie0a886bc9b6af50be788456a93583176788c5315

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 53583c6f..43216996 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -168,6 +168,8 @@ void FileServerRequestHandler::handleRequest(const 
HTTPRequest& request, Poco::M
 mimeType = "text/css";
 else if (fileType == "html")
 mimeType = "text/html";
+else if (fileType == "png")
+mimeType = "image/png";
 else if (fileType == "svg")
 mimeType = "image/svg+xml";
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: include/cppunit NEWS src/cppunit

2017-04-12 Thread Markus Mohrhard 
 NEWS  |2 +
 include/cppunit/config/SelectDllLoader.h  |7 
 src/cppunit/BeOsDynamicLibraryManager.cpp |   49 --
 src/cppunit/Makefile.am   |1 
 src/cppunit/cppunit.vcxproj   |1 
 src/cppunit/cppunit_dll.vcxproj   |1 
 6 files changed, 2 insertions(+), 59 deletions(-)

New commits:
commit de5eab33cb30f15f85ac8f197bd571b7695566a6
Author: Markus Mohrhard 
Date:   Thu Apr 13 04:08:37 2017 +0200

remove BeOS special support

diff --git a/NEWS b/NEWS
index b1e0759..f8ef782 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@
 
   - msvc6 plugin
 
+  - BeOS support
+
   New in CppUnit 1.13.2:
   -
 
diff --git a/include/cppunit/config/SelectDllLoader.h 
b/include/cppunit/config/SelectDllLoader.h
index dc1c011..9f8c0d6 100644
--- a/include/cppunit/config/SelectDllLoader.h
+++ b/include/cppunit/config/SelectDllLoader.h
@@ -15,9 +15,6 @@
  * CPPUNIT_HAVE_WIN32_DLL_LOADER
  * If defined, Win32 implementation of DynamicLibraryManager will be used.
  * 
- * CPPUNIT_HAVE_BEOS_DLL_LOADER
- * If defined, BeOs implementation of DynamicLibraryManager will be used.
- * 
  * CPPUNIT_HAVE_UNIX_DLL_LOADER
  * If defined, Unix implementation (dlfcn.h) of DynamicLibraryManager will be 
used.
  */
@@ -50,10 +47,6 @@
 #undef CPPUNIT_PLUGIN_EXPORT
 #define CPPUNIT_PLUGIN_EXPORT extern "C" __declspec(dllexport)
 
-// Is BeOS platform ?
-#elif defined(__BEOS__)
-#define CPPUNIT_HAVE_BEOS_DLL_LOADER 1
-
 // Is Unix platform and have shl_load() (hp-ux)
 #elif defined(CPPUNIT_HAVE_SHL_LOAD)
 #define CPPUNIT_HAVE_UNIX_SHL_LOADER 1
diff --git a/src/cppunit/BeOsDynamicLibraryManager.cpp 
b/src/cppunit/BeOsDynamicLibraryManager.cpp
deleted file mode 100644
index b8568be..000
--- a/src/cppunit/BeOsDynamicLibraryManager.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include 
-
-#if defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
-#include 
-
-#include 
-
-
-CPPUNIT_NS_BEGIN
-
-
-DynamicLibraryManager::LibraryHandle 
-DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
-{
-  return (LibraryHandle)::load_add_on( libraryName.c_str() );
-}
-
-
-void 
-DynamicLibraryManager::doReleaseLibrary()
-{
-  ::unload_add_on( (image_id)m_libraryHandle );
-}
-
-
-DynamicLibraryManager::Symbol 
-DynamicLibraryManager::doFindSymbol( const std::string &symbol )
-{
-  void *symbolPointer;
-  if ( ::get_image_symbol( (image_id)m_libraryHandle, 
-   symbol.c_str(), 
-   B_SYMBOL_TYPE_TEXT, 
-   &symbolPointer ) == B_OK )
-return symnolPointer;
-  return NULL;
-}
-
-
-std::string 
-DynamicLibraryManager::getLastErrorDetail() const
-{
-  return "";
-}
-
-
-CPPUNIT_NS_END
-
-
-#endif // defined(CPPUNIT_HAVE_BEOS_DLL_LOADER)
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 7134bad..bb67a8a 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -10,7 +10,6 @@ lib_LTLIBRARIES = libcppunit.la
 libcppunit_la_SOURCES = \
   AdditionalMessage.cpp \
   Asserter.cpp \
-  BeOsDynamicLibraryManager.cpp \
   BriefTestProgressListener.cpp \
   CompilerOutputter.cpp \
   DefaultProtector.h \
diff --git a/src/cppunit/cppunit.vcxproj b/src/cppunit/cppunit.vcxproj
index 7b7b270..43c63a0 100644
--- a/src/cppunit/cppunit.vcxproj
+++ b/src/cppunit/cppunit.vcxproj
@@ -299,7 +299,6 @@
 
 
 
-
 
 
 
diff --git a/src/cppunit/cppunit_dll.vcxproj b/src/cppunit/cppunit_dll.vcxproj
index 71ef783..043e977 100644
--- a/src/cppunit/cppunit_dll.vcxproj
+++ b/src/cppunit/cppunit_dll.vcxproj
@@ -309,7 +309,6 @@ copy "$(TargetDir)$(TargetName).lib" 
..\..\lib\$(TargetName).lib
 
 
 
-
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] cppunit.git: contrib/bc5 contrib/msvc contrib/readme.txt doc/CppUnit-win.dox examples/examples2008.sln examples/examples.dsw examples/msvc6 examples/ReadMe.txt include/msvc6 INST

2017-04-12 Thread Markus Mohrhard 
 INSTALL-WIN32.txt |   30 
 Makefile.am   |4 
 NEWS  |4 
 contrib/msvc/AddingUnitTestMethod.dsm |  170 -
 contrib/msvc/CppUnit.WWTpl|  486 
 contrib/msvc/CppUnitDev.WWTpl |  488 
 contrib/msvc/readme.txt   |   10 
 contrib/readme.txt|   18 
 dev/null  |binary
 doc/CppUnit-win.dox   |3 
 examples/ReadMe.txt   |3 
 examples/examples.dsw |   60 
 examples/examples2008.sln |   20 
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.cpp  |   81 
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsp  |  489 
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.dsw  |   80 
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.h|   52 
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.rc   |  219 -
 examples/msvc6/CppUnitTestApp/CppUnitTestApp.vcproj   | 1164 
--
 examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.cpp   |  170 -
 examples/msvc6/CppUnitTestApp/CppUnitTestAppDlg.h |   49 
 examples/msvc6/CppUnitTestApp/ReadMe.txt  |   88 
 examples/msvc6/CppUnitTestApp/Resource.h  |   21 
 examples/msvc6/CppUnitTestApp/StdAfx.cpp  |8 
 examples/msvc6/CppUnitTestApp/StdAfx.h|   28 
 examples/msvc6/CppUnitTestApp/res/CppUnitTestApp.rc2  |   13 
 examples/msvc6/HostApp/ExampleTestCase.cpp|   45 
 examples/msvc6/HostApp/ExampleTestCase.h  |   38 
 examples/msvc6/HostApp/HostApp.cpp|  174 -
 examples/msvc6/HostApp/HostApp.dsp|  448 ---
 examples/msvc6/HostApp/HostApp.dsw|   80 
 examples/msvc6/HostApp/HostApp.h  |   53 
 examples/msvc6/HostApp/HostApp.rc |  389 ---
 examples/msvc6/HostApp/HostApp.vcproj | 1115 
-
 examples/msvc6/HostApp/HostAppDoc.cpp |   80 
 examples/msvc6/HostApp/HostAppDoc.h   |   56 
 examples/msvc6/HostApp/HostAppView.cpp|  105 
 examples/msvc6/HostApp/HostAppView.h  |   66 
 examples/msvc6/HostApp/MainFrm.cpp|  107 
 examples/msvc6/HostApp/MainFrm.h  |   57 
 examples/msvc6/HostApp/Makefile.am|4 
 examples/msvc6/HostApp/Resource.h |   20 
 examples/msvc6/HostApp/StdAfx.cpp |6 
 examples/msvc6/HostApp/StdAfx.h   |   26 
 examples/msvc6/HostApp/res/HostApp.rc2|   13 
 examples/msvc6/HostApp/res/Makefile.am|4 
 examples/msvc6/Makefile.am|2 
 include/msvc6/DSPlugin/TestRunnerDSPluginVC6.h|  190 -
 include/msvc6/DSPlugin/TestRunnerDSPluginVC6_i.c  |   50 
 include/msvc6/testrunner/TestPlugInInterface.h|3 
 src/CppUnitLibraries2010.sln  |   11 
 src/DllPlugInTester/DllPlugInTester.cpp   |2 
 src/Makefile.am   |3 
 src/msvc6/DSPlugIn/COMHelper.h|  111 
 src/msvc6/DSPlugIn/DSAddIn.cpp|  110 
 src/msvc6/DSPlugIn/DSAddIn.h  |   59 
 src/msvc6/DSPlugIn/DSPlugIn.cpp   |  170 -
 src/msvc6/DSPlugIn/DSPlugIn.def   |   11 
 src/msvc6/DSPlugIn/DSPlugIn.h |   23 
 src/msvc6/DSPlugIn/DSPlugIn.rc|  156 -
 src/msvc6/DSPlugIn/DSPlugIn.rgs   |   32 
 src/msvc6/DSPlugIn/ReadMe.txt |   96 
 src/msvc6/DSPlugIn/StdAfx.cpp |7 
 src/msvc6/DSPlugIn/StdAfx.h   |   76 
 src/msvc6/DSPlugIn/TestRunnerDSPlugin.idl |   43 
 src/msvc6/DSPlugIn/res/DSPlugIn.rc2   |   13 
 sr

[Libreoffice-commits] cppunit.git: configure.ac examples/qt examples/ReadMe.txt include/cppunit INSTALL-WIN32.txt Makefile.am NEWS src/qttestrunner

2017-04-12 Thread Markus Mohrhard 
 INSTALL-WIN32.txt   |2 
 Makefile.am |1 
 NEWS|4 
 configure.ac|1 
 examples/ReadMe.txt |1 
 examples/qt/ExampleTestCases.cpp|   42 -
 examples/qt/ExampleTestCases.h  |   38 -
 examples/qt/Main.cpp|   19 
 examples/qt/make_example|   10 
 examples/qt/make_example.bat|7 
 examples/qt/qt_example.pro  |   96 --
 examples/qt/qt_example.sln  |   29 
 examples/qt/qt_example.vcproj   |  164 
 examples/qt/qt_example_dll.vcproj   |  164 
 examples/qt/run.bat |2 
 include/cppunit/ui/Makefile.am  |2 
 include/cppunit/ui/qt/Config.h  |   21 
 include/cppunit/ui/qt/Makefile.am   |6 
 include/cppunit/ui/qt/QtTestRunner.h|   85 --
 include/cppunit/ui/qt/TestRunner.h  |   11 
 src/qttestrunner/MostRecentTests.cpp|   68 -
 src/qttestrunner/MostRecentTests.h  |   62 -
 src/qttestrunner/QtTestRunner.cpp   |   70 --
 src/qttestrunner/TestBrowserDlgImpl.cpp |   83 --
 src/qttestrunner/TestBrowserDlgImpl.h   |   32 
 src/qttestrunner/TestFailureInfo.cpp|   21 
 src/qttestrunner/TestFailureInfo.h  |   43 -
 src/qttestrunner/TestFailureListViewItem.cpp|   29 
 src/qttestrunner/TestFailureListViewItem.h  |   48 -
 src/qttestrunner/TestListViewItem.cpp   |   27 
 src/qttestrunner/TestListViewItem.h |   43 -
 src/qttestrunner/TestRunnerDlgImpl.cpp  |  260 ---
 src/qttestrunner/TestRunnerDlgImpl.h|   58 -
 src/qttestrunner/TestRunnerFailureEvent.cpp |   28 
 src/qttestrunner/TestRunnerFailureEvent.h   |   48 -
 src/qttestrunner/TestRunnerModel.cpp|  221 --
 src/qttestrunner/TestRunnerModel.h  |  154 
 src/qttestrunner/TestRunnerModelThreadInterface.cpp |8 
 src/qttestrunner/TestRunnerModelThreadInterface.h   |   35 -
 src/qttestrunner/TestRunnerTestCaseRunEvent.cpp |   26 
 src/qttestrunner/TestRunnerTestCaseRunEvent.h   |   45 -
 src/qttestrunner/TestRunnerThread.cpp   |   38 -
 src/qttestrunner/TestRunnerThread.h |   55 -
 src/qttestrunner/TestRunnerThreadEvent.cpp  |   19 
 src/qttestrunner/TestRunnerThreadEvent.h|   37 -
 src/qttestrunner/TestRunnerThreadFinishedEvent.cpp  |   25 
 src/qttestrunner/TestRunnerThreadFinishedEvent.h|   42 -
 src/qttestrunner/make_lib   |   10 
 src/qttestrunner/make_lib.bat   |7 
 src/qttestrunner/qttestrunnerlib.pro|  149 
 src/qttestrunner/testbrowserdlg.ui  |  148 
 src/qttestrunner/testrunnerdlg.ui   |  687 
 52 files changed, 5 insertions(+), 3326 deletions(-)

New commits:
commit dad270be0b9b1d10b2aeb8960603a06677b75b2b
Author: Markus Mohrhard 
Date:   Thu Apr 13 02:57:18 2017 +0200

remove the qt test runner that depends on ancient qt

diff --git a/INSTALL-WIN32.txt b/INSTALL-WIN32.txt
index 0f78d29..76c5e46 100644
--- a/INSTALL-WIN32.txt
+++ b/INSTALL-WIN32.txt
@@ -114,8 +114,6 @@ cppunit_dll.dll : CppUnit dynamic 
library (DLL) "Multithreaded DLL"
 cppunit_dll.lib: CppUnit dynamic import library 
"Multithreaded DLL"
 cppunitd_dll.dll   : CppUnit dynamic library (DLL) "Debug 
Multithreaded DLL"
 cppunitd_dll.lib   : CppUnit dynamic import library "Debug 
Multithreaded DLL"
-qttestrunner.dll   : QT TestRunner dynamic library (DLL) 
"Multithreaded DLL"
-qttestrunner.lib   : QT TestRunner import library "Multithreaded 
DLL"
 testrunner.dll : MFC TestRunner dynamic library (DLL) 
"Multithreaded DLL"
 testrunner.lib : MFC TestRunner import library "Multithreaded 
DLL"
 testrunnerd.dll: MFC TestRunner dynamic library (DLL) 
"Debug Multithreaded DLL"
diff --git a/Makefile.am b/Makefile.am
index aa33e15..fc5a645 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,6 @@ m4internal = \
 
 unusedfolders = \
src/msvc6 \
-   src/qttestrunner \
include/msvc6
 
 EXTRA_DIST = \
diff --git a/NEWS b/NEWS
index eee1a75..a59dd83 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,10 @@
 * Test Plug-in Runner: 
   - Fixed crash on Win64 in test runner (fdo#81433)
 
+* Removed features
+
+  - QT test runner
+
   New in CppUnit 1.13.2:
   -
 
diff --git a/configu

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

2017-04-12 Thread Eike Rathke 
 sc/source/core/data/postit.cxx |   32 
 1 file changed, 20 insertions(+), 12 deletions(-)

New commits:
commit b9573789b5f47d67e4cb881aaa0fbdb3cb25fb31
Author: Eike Rathke 
Date:   Thu Apr 13 00:46:33 2017 +0200

finally switch the workaround off

Change-Id: I284292a2749c2b38ef874315d5b526e403d578e8

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 225b46edcf76..c0a47df3c99c 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -697,8 +697,9 @@ void ScCaptionPtr::decRefAndDestroy()
 assert(!mpNext);// this must be one and only one
 assert(mpCaption);
 
-#if 1
-// FIXME: there are still cases where the caption pointer is dangling
+#if 0
+// Quick workaround for when there are still cases where the caption
+// pointer is dangling
 mpCaption = nullptr;
 mbNotOwner = false;
 #else
commit 6c0e633e79e3a8af075ddc17e98ff390e66cd496
Author: Eike Rathke 
Date:   Thu Apr 13 00:34:34 2017 +0200

turn assert into SAL_INFO

The old assert conditions don't hold anymore since 
removeFromDrawPageAndFree()
only deletes the SdrCaptionObj on the last refcount, but info can be useful.

Change-Id: I456149b8799a0509dcd7a2da09d627fb0de1a912

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index ee8f82ee0a2c..225b46edcf76 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -1135,20 +1135,16 @@ void ScPostIt::RemoveCaption()
 if (pDrawLayer == maNoteData.mxCaption->GetModel())
 maNoteData.mxCaption.removeFromDrawPageAndFree();
 
-#if 0
-// Either the caption object is gone or, because of Undo or clipboard is
-// held in at least two instances, or only one instance in Undo because the
-// original sheet in this document is just deleted, or the Undo document is
-// just destroyed which leaves us with one reference.
-// Let's detect other use cases..
-assert(!maNoteData.mxCaption || maNoteData.mxCaption.getRefs() >= 2 ||
-(!mrDoc.IsUndo() && !mrDoc.IsClipboard()) || (mrDoc.IsUndo() && 
mrDoc.IsInDtorClear()));
-#endif
+SAL_INFO("sc.core","ScPostIt::RemoveCaption - refs: " << 
maNoteData.mxCaption.getRefs() <<
+"  IsUndo: " << mrDoc.IsUndo() << "  IsClip: " << 
mrDoc.IsClipboard() <<
+"  Dtor: " << mrDoc.IsInDtorClear());
 
-// Forget the caption object if removeFromDrawPageAndFree() above did not
-// free it.
+// Forget the caption object if removeFromDrawPageAndFree() did not free 
it.
 if (maNoteData.mxCaption)
+{
+SAL_INFO("sc.core","ScPostIt::RemoveCaption - forgetting one ref");
 maNoteData.mxCaption.forget();
+}
 }
 
 ScCaptionPtr ScNoteUtil::CreateTempCaption(
commit 06e427c24d75311c0ab79d2da586b961881db766
Author: Eike Rathke 
Date:   Wed Apr 12 23:24:34 2017 +0200

control deletion of SdrCaptionObj within ScCaptionPtr by refcount

I guess this is about the first time ever that repeated Undo and Redo of
Cut&Paste of a cell comment does not crash..

Change-Id: I493a0a5439efde133a07d73ddcbcdf5bda4bc276

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 20f2f485bfe4..ee8f82ee0a2c 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -761,7 +761,9 @@ void ScCaptionPtr::removeFromDrawPageAndFree( bool 
bIgnoreUndo )
 }
 // remove the object from the drawing page, delete if undo is disabled
 removeFromDrawPage( *pDrawPage );
-if (!bRecording)
+// If called from outside mnRefs must be 1 to delete. If called from
+// decRefAndDestroy() mnRefs is already 0.
+if (!bRecording && getRefs() <= 1)
 {
 SdrObject* pObj = release();
 SdrObject::Free( pObj );
@@ -1133,6 +1135,7 @@ void ScPostIt::RemoveCaption()
 if (pDrawLayer == maNoteData.mxCaption->GetModel())
 maNoteData.mxCaption.removeFromDrawPageAndFree();
 
+#if 0
 // Either the caption object is gone or, because of Undo or clipboard is
 // held in at least two instances, or only one instance in Undo because the
 // original sheet in this document is just deleted, or the Undo document is
@@ -1140,6 +1143,7 @@ void ScPostIt::RemoveCaption()
 // Let's detect other use cases..
 assert(!maNoteData.mxCaption || maNoteData.mxCaption.getRefs() >= 2 ||
 (!mrDoc.IsUndo() && !mrDoc.IsClipboard()) || (mrDoc.IsUndo() && 
mrDoc.IsInDtorClear()));
+#endif
 
 // Forget the caption object if removeFromDrawPageAndFree() above did not
 // free it.
commit 6b4b2752fa876c219ee37a799b64211529f950e2
Author: Eike Rathke 
Date:   Tue Apr 11 21:23:27 2017 +0200

bail out early if there is no caption to remove

Change-Id: Id08d82751560092fd6225131970f607dbb2e4801

diff --git a/sc/source/core/data/pos

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

2017-04-12 Thread Johnny_M 
 source/text/shared/00/0001.xhp |2 +-
 source/text/shared/01/05040200.xhp |2 +-
 source/text/smath/01/0502.xhp  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 958daee8ba1a708cfb5eaa3811078500e653f88e
Author: Johnny_M 
Date:   Sat Apr 1 12:04:20 2017 +0200

Fix measurement unit conversion reference

1. Following pages were incorrectly referring to
https://help.libreoffice.org/Common/Frequently-Used_Buttons#metrik instead 
of
https://help.libreoffice.org/Common/Conversion_of_measurement_units#metrik :

- https://help.libreoffice.org/Common/Page (in "Related Topics" at the 
bottom)
- https://help.libreoffice.org/Math/Font_Sizes (in "Base size")

Note: Following pages already use the correct reference:

- https://help.libreoffice.org/Calc/Optimal_Row_Heights (at the top;

http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05030200.xhp#41 )

- https://help.libreoffice.org/Calc/Optimal_Column_Width (at the top;

http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05040200.xhp#42 )

- And other - see

http://opengrok.libreoffice.org/search?q=%23metrik&project=help&defs=&refs=&path=&hist=

2. While at it, also added the same reference to the place which was
incorrectly meant as reference before:

- https://help.libreoffice.org/Common/Frequently-Used_Buttons#Metrics

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

diff --git a/source/text/shared/00/0001.xhp 
b/source/text/shared/00/0001.xhp
index 98e6def00..526895f03 100644
--- a/source/text/shared/00/0001.xhp
+++ b/source/text/shared/00/0001.xhp
@@ -120,7 +120,7 @@
   
  Metrics
- You can enter values in the input fields in different units 
of measurement. The default unit is inches. However, if you want a space of 
exactly 1cm, then type "1cm". Additional units are available according to the 
context, for example, 12 pt for a 12 point spacing. If the value of the new 
unit is unrealistic, the program uses a predefined maximum or minimum 
value.
+ You can enter values in the input fields in different units of 
measurement. The default unit is inches. However, if you want a space of 
exactly 1cm, then type "1cm". Additional units are available according to the 
context, for example, 12 pt for a 12 point spacing. If the value of the new 
unit is unrealistic, the program uses a predefined maximum or minimum 
value.
   
   
  Close
diff --git a/source/text/shared/01/05040200.xhp 
b/source/text/shared/01/05040200.xhp
index 4bde24027..b91e3a8b7 100644
--- a/source/text/shared/01/05040200.xhp
+++ b/source/text/shared/01/05040200.xhp
@@ -177,7 +177,7 @@ width="8.6457in" height="5.9063in">
 Resizes the drawing objects so that 
they fit on the paper format that you select. The arrangement of the drawing 
objects is preserved.
 
-Changing measurement units
+Changing measurement units
 
 
 Writing Register-true
diff --git a/source/text/smath/01/0502.xhp 
b/source/text/smath/01/0502.xhp
index 6b24578af..0ff20fdb7 100644
--- a/source/text/smath/01/0502.xhp
+++ b/source/text/smath/01/0502.xhp
@@ -40,7 +40,7 @@
   
 
 Base size
-All 
elements of a formula are proportionally scaled to the base size. To change the 
base size, select or type in the desired point (pt) size. You can also use 
other units of measure or other metrics, which are then automatically converted to 
points.
+All 
elements of a formula are proportionally scaled to the base size. To change the 
base size, select or type in the desired point (pt) size. You can also use 
other units of measure or other metrics, which are then automatically converted to 
points.
 To permanently change the default size (12 pt) used in 
$[officename] Math, you must first set the size (for example, 11 pt) and then 
click the Default button.
 Relative Sizes
 In this section, you can determine the relative sizes for each type 
of element with reference to the base size.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-12 Thread Johnny_M 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57bdeafc092ae75b8b4c0fb0e5ec4660d96e3de8
Author: Johnny_M 
Date:   Sat Apr 1 12:04:20 2017 +0200

Updated core
Project: help  958daee8ba1a708cfb5eaa3811078500e653f88e

Fix measurement unit conversion reference

1. Following pages were incorrectly referring to
https://help.libreoffice.org/Common/Frequently-Used_Buttons#metrik instead 
of
https://help.libreoffice.org/Common/Conversion_of_measurement_units#metrik :

- https://help.libreoffice.org/Common/Page (in "Related Topics" at the 
bottom)
- https://help.libreoffice.org/Math/Font_Sizes (in "Base size")

Note: Following pages already use the correct reference:

- https://help.libreoffice.org/Calc/Optimal_Row_Heights (at the top;

http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05030200.xhp#41 )

- https://help.libreoffice.org/Calc/Optimal_Column_Width (at the top;

http://opengrok.libreoffice.org/xref/help/source/text/scalc/01/05040200.xhp#42 )

- And other - see

http://opengrok.libreoffice.org/search?q=%23metrik&project=help&defs=&refs=&path=&hist=

2. While at it, also added the same reference to the place which was
incorrectly meant as reference before:

- https://help.libreoffice.org/Common/Frequently-Used_Buttons#Metrics

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

diff --git a/helpcontent2 b/helpcontent2
index dafaa1c1e89f..958daee8ba1a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dafaa1c1e89f912513e87c613db7ff23961d3030
+Subproject commit 958daee8ba1a708cfb5eaa3811078500e653f88e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/build loleaflet/src

2017-04-12 Thread Henry Castro 
 loleaflet/build/deps.js  |6 +
 loleaflet/src/dom/PosAnimation.Timer.js  |   67 
 loleaflet/src/dom/PosAnimation.js|  103 +++
 loleaflet/src/layer/AnnotationManager.js |7 +-
 4 files changed, 142 insertions(+), 41 deletions(-)

New commits:
commit b0c889f2d22c05bcde392a6f2897be6465e0a3aa
Author: Henry Castro 
Date:   Wed Apr 12 17:19:17 2017 -0400

loleaflet: animate the new position of selected annotation

Change-Id: I47af4ac3ec01b03797a03dfcc91ec84f0fd39bb5

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 5178c921..8f66ee63 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -13,6 +13,7 @@ L.AnnotationManager = L.Class.extend({
this._map = map;
this._items = [];
this._selected = null;
+   this._animation = new L.PosAnimation();
this._arrow = L.polyline([], {color: 'darkblue', weight: 1});
this._map.on('AnnotationCancel', this._onAnnotationCancel, 
this);
this._map.on('AnnotationClick', this._onAnnotationClick, this);
@@ -196,10 +197,12 @@ L.AnnotationManager = L.Class.extend({
layout: function () {
var docRight = 
this._map.project(this._map.options.maxBounds.getNorthEast());
var topRight = docRight.add(L.point(this.options.marginX, 
this.options.marginY));
-   var annotation, selectIndex, layoutBounds, point, index;
+   var latlng, annotation, selectIndex, layoutBounds, point, index;
if (this._selected) {
selectIndex = this.getIndexOf(this._selected._data.id);
-   
this._selected.setLatLng(this._map.unproject(L.point(docRight.x, 
this._selected._data.anchorPix.y)));
+   latlng = this._map.unproject(L.point(docRight.x, 
this._selected._data.anchorPix.y));
+   this._animation.run(this._selected._container, 
this._map.latLngToLayerPoint(latlng));
+   this._selected.setLatLng(latlng);
layoutBounds = this._selected.getBounds();
layoutBounds.min = 
layoutBounds.min.add([this.options.marginX, 0]);
layoutBounds.max = 
layoutBounds.max.add([this.options.marginX, 0]);
commit 44482615ca3d355d8637ad6c04082fd1f144e10d
Author: Henry Castro 
Date:   Wed Apr 12 17:17:50 2017 -0400

loleaflet: update PosAnimation.js file

Change-Id: I38a2643e67d1d341b486c987eb73dc5e5608a7cb

diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index 6cce0922..34575612 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -415,6 +415,12 @@ var deps = {
desc: 'Core panning animation support.'
},
 
+   AnimationTimer: {
+   src: ['dom/PosAnimation.Timer.js'],
+   deps: ['AnimationPan'],
+   desc: 'Timer-based pan animation fallback for browsers that 
don\'t support CSS3 transitions.'
+   },
+
AnimationZoom: {
src: [
'map/anim/Map.ZoomAnimation.js',
diff --git a/loleaflet/src/dom/PosAnimation.Timer.js 
b/loleaflet/src/dom/PosAnimation.Timer.js
new file mode 100644
index ..52faf981
--- /dev/null
+++ b/loleaflet/src/dom/PosAnimation.Timer.js
@@ -0,0 +1,67 @@
+/*
+ * L.PosAnimation fallback implementation that powers Leaflet pan animations
+ * in browsers that don't support CSS3 Transitions.
+ */
+
+L.PosAnimation = L.DomUtil.TRANSITION ? L.PosAnimation : 
L.PosAnimation.extend({
+
+   run: function (el, newPos, duration, easeLinearity) { // (HTMLElement, 
Point[, Number, Number])
+   this.stop();
+
+   this._el = el;
+   this._inProgress = true;
+   this._duration = duration || 0.25;
+   this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2);
+
+   this._startPos = L.DomUtil.getPosition(el);
+   this._offset = newPos.subtract(this._startPos);
+   this._startTime = +new Date();
+
+   this.fire('start');
+
+   this._animate();
+   },
+
+   stop: function () {
+   if (!this._inProgress) { return; }
+
+   this._step();
+   this._complete();
+   },
+
+   _animate: function () {
+   // animation loop
+   this._animId = L.Util.requestAnimFrame(this._animate, this);
+   this._step();
+   },
+
+   _step: function () {
+   var elapsed = (+new Date()) - this._startTime,
+   duration = this._duration * 1000;
+
+   if (elapsed < duration) {
+   this._runFrame(this._easeOut(elapsed / duration));
+   } else {
+   this._runFrame(1);
+

[Libreoffice-commits] core.git: basctl/CppunitTest_basctl_dialogs_test.mk chart2/CppunitTest_chart2_dialogs_test.mk cui/CppunitTest_cui_dialogs_test.mk dbaccess/CppunitTest_dbaccess_dialogs_test.mk de

2017-04-12 Thread Caolán McNamara 
 basctl/CppunitTest_basctl_dialogs_test.mk |3 +--
 chart2/CppunitTest_chart2_dialogs_test.mk |3 +--
 cui/CppunitTest_cui_dialogs_test.mk   |3 +--
 dbaccess/CppunitTest_dbaccess_dialogs_test.mk |3 +--
 desktop/CppunitTest_desktop_dialogs_test.mk   |3 +--
 filter/CppunitTest_filter_dialogs_test.mk |3 +--
 formula/CppunitTest_formula_dialogs_test.mk   |3 +--
 fpicker/CppunitTest_fpicker_dialogs_test.mk   |3 +--
 reportdesign/CppunitTest_reportdesign_dialogs_test.mk |3 +--
 sc/CppunitTest_sc_screenshots.mk  |2 +-
 sd/CppunitTest_sd_dialogs_test.mk |3 +--
 sfx2/CppunitTest_sfx2_classification.mk   |2 +-
 sfx2/CppunitTest_sfx2_dialogs_test.mk |3 +--
 starmath/CppunitTest_starmath_dialogs_test.mk |3 +--
 svtools/CppunitTest_svtools_dialogs_test.mk   |3 +--
 svx/CppunitTest_svx_dialogs_test.mk   |3 +--
 sw/CppunitTest_sw_dialogs_test.mk |3 +--
 sw/CppunitTest_sw_mailmerge.mk|2 +-
 uui/CppunitTest_uui_dialogs_test.mk   |3 +--
 vcl/CppunitTest_vcl_dialogs_test.mk   |3 +--
 xmlsecurity/CppunitTest_xmlsecurity_dialogs_test.mk   |3 +--
 21 files changed, 21 insertions(+), 39 deletions(-)

New commits:
commit 9f565f5cb628dcd32b05be7079dd5482e5cc19b9
Author: Caolán McNamara 
Date:   Wed Apr 12 16:21:23 2017 +0100

can use gb_CppunitTest_use_configuration and still access .ui files

after...

commit 506cab1a01b0481d0831a7a692a26dc5a5b55e91
Author: Caolán McNamara 
Date:   Wed Apr 12 16:14:10 2017 +0100

take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR

Change-Id: I9cffdc092206c038da32a32a2cfe629e68b5c258

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

diff --git a/basctl/CppunitTest_basctl_dialogs_test.mk 
b/basctl/CppunitTest_basctl_dialogs_test.mk
index 5a290bfee725..d45c8ab97d8b 100644
--- a/basctl/CppunitTest_basctl_dialogs_test.mk
+++ b/basctl/CppunitTest_basctl_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,basctl_dialogs_te
 
 $(eval $(call gb_CppunitTest_use_rdb,basctl_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,basctl_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,basctl_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,basctl_dialogs_test,\
modules/BasicIDE \
diff --git a/chart2/CppunitTest_chart2_dialogs_test.mk 
b/chart2/CppunitTest_chart2_dialogs_test.mk
index 10c81d098747..edc36d1188d2 100644
--- a/chart2/CppunitTest_chart2_dialogs_test.mk
+++ b/chart2/CppunitTest_chart2_dialogs_test.mk
@@ -63,8 +63,7 @@ $(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,chart2_dialogs_te
 
 $(eval $(call gb_CppunitTest_use_rdb,chart2_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,chart2_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,chart2_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,chart2_dialogs_test,\
modules/schart \
diff --git a/cui/CppunitTest_cui_dialogs_test.mk 
b/cui/CppunitTest_cui_dialogs_test.mk
index e1c07faeb8e2..cb6ae8dbf2c6 100644
--- a/cui/CppunitTest_cui_dialogs_test.mk
+++ b/cui/CppunitTest_cui_dialogs_test.mk
@@ -62,8 +62,7 @@ $(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,cui_dialogs_test)
 
 $(eval $(call gb_CppunitTest_use_rdb,cui_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,cui_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,cui_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,cui_dialogs_test,\
cui \
diff --git a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk 
b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
index 704764bac605..a4c653dc0c3e 100644
--- a/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialogs_test.mk
@@ -61,8 +61,7 @@ $(eval $(call 
gb_CppunitTest_use_vcl_non_headless_with_windows,dbaccess_dialogs_
 
 $(eval $(call gb_CppunitTest_use_rdb,dbaccess_dialogs_test,services))
 
-# $(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test))
-$(eval $(call gb_CppunitTest_use_instdir_configuration,dbaccess_dialogs_test))
+$(eval $(call gb_CppunitTest_use_configuration,dbaccess_dialogs_test))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,dbaccess_dialogs_test,\
dbaccess \
diff --git a/desktop/CppunitTest_desktop_di

Re: Clang 5.0 32-bit builds Failing on CppunitTest_vcl_pdfexport

2017-04-12 Thread Michael Stahl 
On 12.04.2017 21:43, Michael Stahl wrote:
> On 12.04.2017 19:35, slacka wrote:
>> Here is the backtrace:
>>
>> https://pastebin.com/vhYRQDSG
>>
>> This was with  clang version 4.0.0 (trunk 287326)
>>
>> On Ubuntu 16.04.2 LTS 3 4.4.0-64-generic #85-Ubuntu SMP Mon Feb 20 11:49:39
>> UTC 2017 i686 i686 i686 
>>
>> I'm not sure if it was timing, ccache. or what but whatever is causing this
>> crash started about 1 month ago. I have been building Libreoffice with Clang
>> for years and I'm seeing this on 2 different machines(Ubuntu/Fedora).
> 
> oh, that is interesting!
> 
>> #11 0x403058ad in std::terminate() () from 
>> /usr/lib/i386-linux-gnu/libstdc++.so.6
>> No symbol table info available.
>> #12 0x40305b70 in __cxa_throw () from /usr/lib/i386-linux-gnu/libstdc++.so.6
>> No symbol table info available.
>> #13 0x458d4ea4 in errorExit (cinfo=0xbfa9beb0) at 
>> /core/vcl/source/filter/jpeg/jpegc.cxx:45
>> buffer = "Quantization table 0x00 was not 
>> defined\000\016\225\261E\260\276\251\277S\v\000\000\230\273\251\277\273\221\261E\b\000\000\000\b\000\000\000\000\260\367E\b\000\000\000\b\000\000\000\000\260\367E\300\245\362\t\260\245\362\t\370\320\362\t@\v\000\000\001\000\000\000\260\276\251\277\001\000\000\000\000\260\367E軩\277\060\227\261E\260\276\251\277\001\000\000\000@\v\000\000\n\000\000\000
>>  
>> \001\000\000\020\000\000\000`\000\000\000\000\260\367E^\373\064\000\000\000\000\000\n\000\000\000\n\000\000\000\000\261\362\t0\205\362\t\370\320\362\t\n\000\000\000
>>  \001\000\000\001\000\000\000\260\276\251\277"
>> #14 0x45b052e2 in latch_quant_tables (cinfo=0xbfa9beb0) at jdinput.c:259
>> ci = 0
>> qtblno = 0
>> compptr = 0x9f26620
>> qtbl = 0x1
>> #15 0x45b04ab7 in start_input_pass (cinfo=0xbfa9beb0) at jdinput.c:281
>> No locals.
>> #16 0x45b0aa98 in master_selection (cinfo=0xbfa9beb0) at jdmaster.c:575
>> master = 0x9e64870
>> use_c_buffer = 0
>> samplesperrow = 2220
>> jd_samplesperrow = 2220
>> #17 0x45b0a3ce in jinit_master_decompress (cinfo=0xbfa9beb0) at 
>> jdmaster.c:735
>> master = 0x9e64870
>> #18 0x45b033ca in jpeg_start_decompress (cinfo=0xbfa9beb0) at jdapistd.c:47
>> No locals.
>> #19 0x458d5738 in ReadJPEG (pJPEGReader=0x9e5e03c, pInputStream=0xbfa9ca30, 
>> pLines=0xbfa9c124, previewSize=...) at 
>> /core/vcl/source/filter/jpeg/jpegc.cxx:206
> 
> an unhandled exception during JPEG import

this is probably happening since:

commit 6889fa826eef6bd1074d77507818e71dfe8ba152
Author: Caolán McNamara 
AuthorDate: Sat Mar 18 20:19:51 2017 +

rework jpeg error handling to throw rather than setjmp to avoid leaks


the function errorExit() is declared extern "C" and throws an exception,
so std::terminate() is invoked and the catch
(css::uno::RuntimeException) in ReadJPEG() is not reached.

now why does that happen only in your build?  my clang builds don't seem
to mind throwing from extern "C"?  tinderboxes seem happy too.



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

[Libreoffice-commits] online.git: loleaflet/po

2017-04-12 Thread Andras Timar 
 loleaflet/po/templates/loleaflet-help.pot |2 
 loleaflet/po/templates/loleaflet-ui.pot   |  185 --
 2 files changed, 104 insertions(+), 83 deletions(-)

New commits:
commit 1aeaf419991dca57021c6aae3306a4c4a8142530
Author: Andras Timar 
Date:   Wed Apr 12 22:28:15 2017 +0200

loleaflet: updated pot files

Change-Id: I0a589a07bb5658c7b9b749c7184fa09c2e1a49de

diff --git a/loleaflet/po/templates/loleaflet-help.pot 
b/loleaflet/po/templates/loleaflet-help.pot
index 2913307c..8d8c5d9e 100644
--- a/loleaflet/po/templates/loleaflet-help.pot
+++ b/loleaflet/po/templates/loleaflet-help.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 15:39+0200\n"
+"POT-Creation-Date: 2017-04-12 22:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index df4123ea..f3ffb744 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-13 13:01+0100\n"
+"POT-Creation-Date: 2017-04-12 22:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -199,7 +199,8 @@ msgstr ""
 msgid "Delete Index or Table of Contents"
 msgstr ""
 
-#: unocommands.js:18
+#: unocommands.js:18 src/layer/marker/Annotation.js:187
+#: src/layer/tile/TileLayer.js:188
 msgid "Reply"
 msgstr ""
 
@@ -460,220 +461,216 @@ msgid "Special Character"
 msgstr ""
 
 #: dist/toolbar/toolbar.js:525
-msgid "Record Changes"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:526
-msgid "Show Changes"
-msgstr ""
-
-#: dist/toolbar/toolbar.js:528
 msgid "More"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:530 src/control/Control.Menubar.js:170
+#: dist/toolbar/toolbar.js:527 src/control/Control.Menubar.js:170
 #: src/control/Control.Menubar.js:230 src/control/Control.Menubar.js:277
 msgid "Close document"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:609
+#: dist/toolbar/toolbar.js:606
 msgid "Layout"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:634 dist/toolbar/toolbar.js:981
+#: dist/toolbar/toolbar.js:631 dist/toolbar/toolbar.js:976
 msgid "Sum"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:635
+#: dist/toolbar/toolbar.js:632
 msgid "Function"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:636 src/control/Control.CharacterMap.js:428
-#: src/layer/marker/Annotation.js:118
+#: dist/toolbar/toolbar.js:633 src/control/Control.CharacterMap.js:428
+#: src/layer/marker/Annotation.js:130
 msgid "Cancel"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:637 src/layer/tile/TileLayer.js:215
+#: dist/toolbar/toolbar.js:634
 msgid "Accept"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:648
+#: dist/toolbar/toolbar.js:649
 msgid "First sheet"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:649
+#: dist/toolbar/toolbar.js:650
 msgid "Previous sheet"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:650
+#: dist/toolbar/toolbar.js:651
 msgid "Next sheet"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:651
+#: dist/toolbar/toolbar.js:652
 msgid "Last sheet"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:661 src/control/Control.Menubar.js:224
+#: dist/toolbar/toolbar.js:662 src/control/Control.Menubar.js:224
 msgid "Fullscreen presentation"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:663
+#: dist/toolbar/toolbar.js:664
 msgid "Insert slide"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:664 src/control/Control.Menubar.js:221
+#: dist/toolbar/toolbar.js:665 src/control/Control.Menubar.js:221
 msgid "Duplicate slide"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:665 src/control/Control.Menubar.js:222
+#: dist/toolbar/toolbar.js:666 src/control/Control.Menubar.js:222
 msgid "Delete slide"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:678
+#: dist/toolbar/toolbar.js:679
 msgid "Search:"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:683
+#: dist/toolbar/toolbar.js:684
 msgid "Search backwards"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:684
+#: dist/toolbar/toolbar.js:685
 msgid "Search forward"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:685
+#: dist/toolbar/toolbar.js:686
 msgid "Cancel the search"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:690
+#: dist/toolbar/toolbar.js:691
 msgid "No users"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:692
+#: dist/toolbar/toolbar.js:693
 msgid "Previous page"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:693
+#: dist/toolbar/toolbar.js:694
 msgid "Next page"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:695 src/control/Control.Menubar.js:44
+#: dist/toolbar/toolbar.js:696 src/control/Control.Menubar.js:44
 #: src/control/Control.Menubar.js:199
 msgid "Reset zoom"
 msgstr ""
 
-#: dist/toolbar/toolbar.js:696 src/control/Control.Menubar.js:43
+#: dist/toolbar/toolbar.js:697 src/control/Control.Menubar.js:43
 #: src/control/Control.Menubar.js:198
 msgid "Zoom

[Libreoffice-commits] online.git: loleaflet/Makefile.am

2017-04-12 Thread Andras Timar 
 loleaflet/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit baa07c0997b86ff88e3fa53ac3c265ec9fe54acf
Author: Andras Timar 
Date:   Wed Apr 12 22:22:49 2017 +0200

loleaflet: src/control/Control.ContextMenu.js contains translatable strings

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

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index cd5ac55f..0a1880ae 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -56,6 +56,7 @@ pot:
src/admin/Util.js \
src/control/Control.CharacterMap.js \
src/control/Control.ColumnHeader.js \
+   src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
src/control/Control.Menubar.js \
src/control/Control.MetricInput.js \
___
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

2017-04-12 Thread Szymon Kłos 
 include/vcl/IPrioritable.hxx |7 +++
 include/vcl/layout.hxx   |2 --
 sfx2/source/notebookbar/DropdownBox.cxx  |1 +
 sfx2/source/notebookbar/DropdownBox.hxx  |8 +---
 sfx2/source/notebookbar/PriorityHBox.cxx |   17 -
 vcl/source/window/layout.cxx |2 --
 6 files changed, 21 insertions(+), 16 deletions(-)

New commits:
commit 76fbd18a515e531f1d238ab0b405212a032c53f2
Author: Szymon Kłos 
Date:   Mon Apr 10 19:29:59 2017 +0200

Notebookbar: remove dependency between all containers and IPrioritable

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

diff --git a/include/vcl/IPrioritable.hxx b/include/vcl/IPrioritable.hxx
index 11146681ee65..dda8bbd31fa8 100644
--- a/include/vcl/IPrioritable.hxx
+++ b/include/vcl/IPrioritable.hxx
@@ -23,6 +23,10 @@ protected:
 }
 
 public:
+virtual ~IPrioritable()
+{
+}
+
 int GetPriority() const
 {
 return m_nPriority;
@@ -33,6 +37,9 @@ public:
 m_nPriority = nPriority;
 }
 
+virtual void HideContent() = 0;
+virtual void ShowContent() = 0;
+
 private:
 int m_nPriority;
 };
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index f401fcda888c..28c6464c0257 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -14,7 +14,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -24,7 +23,6 @@
 #include 
 
 class VCL_DLLPUBLIC VclContainer : public vcl::Window,
-   public vcl::IPrioritable,
public vcl::IContext
 {
 public:
diff --git a/sfx2/source/notebookbar/DropdownBox.cxx 
b/sfx2/source/notebookbar/DropdownBox.cxx
index 63aba3f33f70..981a220b0959 100644
--- a/sfx2/source/notebookbar/DropdownBox.cxx
+++ b/sfx2/source/notebookbar/DropdownBox.cxx
@@ -113,6 +113,7 @@ public:
 
 DropdownBox::DropdownBox(vcl::Window *pParent)
 : VclHBox(pParent)
+, IPrioritable()
 , m_bInFullView(true)
 {
 m_pButton = VclPtr::Create(this, WB_FLATBUTTON);
diff --git a/sfx2/source/notebookbar/DropdownBox.hxx 
b/sfx2/source/notebookbar/DropdownBox.hxx
index cabd38f5183b..6a34ae6d7705 100644
--- a/sfx2/source/notebookbar/DropdownBox.hxx
+++ b/sfx2/source/notebookbar/DropdownBox.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SFX2_NOTEBOOKBAR_DROPDOWNBOX_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -30,7 +31,8 @@
 
 class Popup;
 
-class SFX2_DLLPUBLIC DropdownBox : public VclHBox
+class SFX2_DLLPUBLIC DropdownBox : public VclHBox,
+   public vcl::IPrioritable
 {
 private:
 bool m_bInFullView;
@@ -42,8 +44,8 @@ public:
 virtual ~DropdownBox() override;
 virtual void dispose() override;
 
-void HideContent();
-void ShowContent();
+void HideContent() override;
+void ShowContent() override;
 
 private:
 DECL_LINK(PBClickHdl, Button*, void);
diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx 
b/sfx2/source/notebookbar/PriorityHBox.cxx
index de2e7b9bb201..fde027bb3364 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -41,7 +41,7 @@ class SFX2_DLLPUBLIC PriorityHBox : public VclHBox
 private:
 bool m_bInitialized;
 
-std::vector m_aSortedChilds;
+std::vector m_aSortedChilds;
 
 public:
 explicit PriorityHBox(vcl::Window *pParent)
@@ -69,8 +69,7 @@ public:
 
 bool bAllwaysExpanded = true;
 
-IPrioritable* pPrioritable = pChild->GetType() == 
WindowType::CONTAINER ?
-dynamic_cast(pChild) : nullptr;
+vcl::IPrioritable* pPrioritable = 
dynamic_cast(pChild);
 if (pPrioritable && pPrioritable->GetPriority() != 
VCL_PRIORITY_DEFAULT)
 bAllwaysExpanded = false;
 
@@ -98,11 +97,12 @@ public:
 auto pChild = m_aSortedChilds.begin();
 while (nCurrentWidth > nWidth && pChild != m_aSortedChilds.end())
 {
-DropdownBox* pBox = static_cast(*pChild);
+// ATM DropdownBox is the only one derived class from IPrioritable
+DropdownBox* pDropdownBox = static_cast(*pChild);
 
-nCurrentWidth -= pBox->GetOutputWidthPixel() + get_spacing();
-pBox->HideContent();
-nCurrentWidth += pBox->GetOutputWidthPixel() + get_spacing();
+nCurrentWidth -= pDropdownBox->GetOutputWidthPixel() + 
get_spacing();
+pDropdownBox->HideContent();
+nCurrentWidth += pDropdownBox->GetOutputWidthPixel() + 
get_spacing();
 
 pChild++;
 }
@@ -154,8 +154,7 @@ public:
 vcl::Window* pChild = GetChild(i);
 
 // Add only containers which have explicitly assigned priority.
-IPrioritable* pPrioritable = pChild->GetType() == 
WindowType::CONTAINER ?
-dynamic_c

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

2017-04-12 Thread Caolán McNamara 
 sw/source/filter/ww8/ww8par.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c5603ba6d9d97d62d68cdbda4e2f06527db7092e
Author: Caolán McNamara 
Date:   Wed Apr 12 21:07:52 2017 +0100

ofz: avoid oom

Change-Id: I64dd130f618ea18b802117b7a2cf0eeb8f271046

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 797518cc2ae5..2a52276d6359 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6002,7 +6002,7 @@ const OUString* 
SwWW8ImplReader::GetAnnotationAuthor(sal_uInt16 nIdx)
 rStrm.Seek( m_pWwFib->m_fcGrpStAtnOwners );
 
 long nRead = 0, nCount = m_pWwFib->m_lcbGrpStAtnOwners;
-while (nRead < nCount)
+while (nRead < nCount && rStrm.good())
 {
 if( m_bVer67 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2017-04-12 Thread David Tardon 
 configure.ac |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 77546ec3587c831846829f6635d91f0d1dd47e27
Author: David Tardon 
Date:   Wed Apr 12 21:58:56 2017 +0200

drop obsolete check for boost/function.hpp

Change-Id: I95b968b7ba13481d246fde7471b02f821372e1fd

diff --git a/configure.ac b/configure.ac
index 505c15d6dd05..21691d71097c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8851,17 +8851,6 @@ if test "$with_system_boost" = "yes"; then
[AC_MSG_ERROR(boost/shared_ptr.hpp not found. install boost)], [])
 AC_CHECK_HEADER(boost/spirit/include/classic_core.hpp, [],
[AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install 
boost >= 1.36)], [])
-AC_CHECK_HEADER(boost/function.hpp, [],
-   [AC_MSG_ERROR(boost/function.hpp not found. install boost)], [])
-CXXFLAGS="$CXXFLAGS -fno-exceptions"
-AC_MSG_CHECKING([whether boost/function.hpp compiles with -fno-exceptions])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include 
-]], 
[[]])],[ac_cv_cxx_boost_no_exceptions_broken=no],[ac_cv_cxx_boost_no_exceptions_broken=yes])
-if test "$ac_cv_cxx_boost_no_exceptions_broken" = "yes"; then
-AC_MSG_ERROR([no, see 
https://bugzilla.redhat.com/show_bug.cgi?id=477131])
-else
-AC_MSG_RESULT([yes])
-fi
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 # this is in m4/ax_boost_base.m4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Clang 5.0 32-bit builds Failing on CppunitTest_vcl_pdfexport

2017-04-12 Thread Michael Stahl 
On 12.04.2017 19:35, slacka wrote:
> Here is the backtrace:
> 
> https://pastebin.com/vhYRQDSG
> 
> This was with  clang version 4.0.0 (trunk 287326)
> 
> On Ubuntu 16.04.2 LTS 3 4.4.0-64-generic #85-Ubuntu SMP Mon Feb 20 11:49:39
> UTC 2017 i686 i686 i686 
> 
> I'm not sure if it was timing, ccache. or what but whatever is causing this
> crash started about 1 month ago. I have been building Libreoffice with Clang

CppunitTest_vcl_pdfexport was added quite recently.

> for years and I'm seeing this on 2 different machines(Ubuntu/Fedora).

oh, that is interesting!

> #11 0x403058ad in std::terminate() () from 
> /usr/lib/i386-linux-gnu/libstdc++.so.6
> No symbol table info available.
> #12 0x40305b70 in __cxa_throw () from /usr/lib/i386-linux-gnu/libstdc++.so.6
> No symbol table info available.
> #13 0x458d4ea4 in errorExit (cinfo=0xbfa9beb0) at 
> /core/vcl/source/filter/jpeg/jpegc.cxx:45
> buffer = "Quantization table 0x00 was not 
> defined\000\016\225\261E\260\276\251\277S\v\000\000\230\273\251\277\273\221\261E\b\000\000\000\b\000\000\000\000\260\367E\b\000\000\000\b\000\000\000\000\260\367E\300\245\362\t\260\245\362\t\370\320\362\t@\v\000\000\001\000\000\000\260\276\251\277\001\000\000\000\000\260\367E軩\277\060\227\261E\260\276\251\277\001\000\000\000@\v\000\000\n\000\000\000
>  
> \001\000\000\020\000\000\000`\000\000\000\000\260\367E^\373\064\000\000\000\000\000\n\000\000\000\n\000\000\000\000\261\362\t0\205\362\t\370\320\362\t\n\000\000\000
>  \001\000\000\001\000\000\000\260\276\251\277"
> #14 0x45b052e2 in latch_quant_tables (cinfo=0xbfa9beb0) at jdinput.c:259
> ci = 0
> qtblno = 0
> compptr = 0x9f26620
> qtbl = 0x1
> #15 0x45b04ab7 in start_input_pass (cinfo=0xbfa9beb0) at jdinput.c:281
> No locals.
> #16 0x45b0aa98 in master_selection (cinfo=0xbfa9beb0) at jdmaster.c:575
> master = 0x9e64870
> use_c_buffer = 0
> samplesperrow = 2220
> jd_samplesperrow = 2220
> #17 0x45b0a3ce in jinit_master_decompress (cinfo=0xbfa9beb0) at jdmaster.c:735
> master = 0x9e64870
> #18 0x45b033ca in jpeg_start_decompress (cinfo=0xbfa9beb0) at jdapistd.c:47
> No locals.
> #19 0x458d5738 in ReadJPEG (pJPEGReader=0x9e5e03c, pInputStream=0xbfa9ca30, 
> pLines=0xbfa9c124, previewSize=...) at 
> /core/vcl/source/filter/jpeg/jpegc.cxx:206

an unhandled exception during JPEG import - then i was wrong to blame
the GStreamer thread?

or is this a different problem - this one dies with SIGABRT while your
previous log died with SIGSEGV?  hmm and previously the test printed "OK
(4)" but here it apparently dies in the middle of the test.  oh, and now
i notice that this log is for CppunitTest_vcl_filters_test not the
pdfexport test.


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

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

2017-04-12 Thread Vitaliy Anderson 
 writerfilter/source/dmapper/NumberingManager.cxx |   11 ---
 writerfilter/source/dmapper/NumberingManager.hxx |4 
 2 files changed, 15 deletions(-)

New commits:
commit 66f71c7e8b68a3e35e258ff1131f5e3d27fd9e85
Author: Vitaliy Anderson 
Date:   Wed Apr 12 16:05:19 2017 +0300

NumberingManager.cxx: remove unused

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

diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 325cef9fd982..3fbc70eb56a1 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -41,9 +41,6 @@
 
 using namespace com::sun::star;
 
-#define NUMBERING_MAX_LEVELS10
-
-
 namespace writerfilter {
 namespace dmapper {
 
@@ -295,14 +292,6 @@ uno::Sequence< beans::PropertyValue > 
ListLevel::GetLevelProperties( )
 //2.3
 //3.4
 
-
-if( m_nFWord6 > 0) //Word 6 compatibility
-{
-if( m_nFPrev == 1)
-
aNumberingProperties.push_back(lcl_makePropVal(PROP_PARENT_NUMBERING,
 NUMBERING_MAX_LEVELS));
-//TODO: prefixing space nFPrevSpace; - has not been used in 
WW8 filter
-}
-
 //TODO: sRGBXchNums; array of inherited numbers
 
 //  nXChFollow; following character 0 - tab, 1 - space, 2 - nothing
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx 
b/writerfilter/source/dmapper/NumberingManager.hxx
index f2cb1d2c637e..723ca47fdab2 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -45,9 +45,7 @@ class ListLevel : public PropertyMap
 sal_Int32 m_nNFC;
//LN_CT_Lvl_numFmt
 sal_Int32 m_nJC; //LN_JC
 sal_Int32 m_nFLegal; 
//LN_FLEGAL
-sal_Int32 m_nFPrev;  //LN_FPREV
 sal_Int32 m_nFPrevSpace; 
//LN_FPREVSPACE
-sal_Int32 m_nFWord6; 
//LN_FWORD6
 sal_Int16 m_nXChFollow;  
//LN_IXCHFOLLOW
 OUString   m_sBulletChar;
 OUString   m_sGraphicURL;
@@ -66,9 +64,7 @@ public:
 ,m_nNFC(-1)
 ,m_nJC(-1)
 ,m_nFLegal(-1)
-,m_nFPrev(-1)
 ,m_nFPrevSpace(-1)
-,m_nFWord6(-1)
 ,m_nXChFollow(SvxNumberFormat::LISTTAB)
 ,m_nTabstop( 0 )
 ,m_outline(false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source comphelper/util offapi/com offapi/UnoApi_offapi.mk solenv/bin

2017-04-12 Thread Caolán McNamara 
 comphelper/Library_comphelper.mk  |1 
 comphelper/source/misc/documentiologring.cxx  |  151 --
 comphelper/source/misc/documentiologring.hxx  |   69 --
 comphelper/util/comphelp.component|5 
 offapi/UnoApi_offapi.mk   |3 
 offapi/com/sun/star/logging/DocumentIOLogRing.idl |   49 ---
 offapi/com/sun/star/logging/SimpleLogRing.idl |   55 
 offapi/com/sun/star/logging/XSimpleLogRing.idl|   62 -
 solenv/bin/native-code.py |1 
 9 files changed, 396 deletions(-)

New commits:
commit 169bd7718264b0e312052757f9bbd2321e1399c2
Author: Caolán McNamara 
Date:   Wed Apr 12 09:05:17 2017 +0100

[API-CHANGE] drop css.comp.logging.SimpleLogRing

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

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 344e186ba0b1..49347b336756 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/docpasswordhelper \
 comphelper/source/misc/docpasswordrequest \
 comphelper/source/misc/documentinfo \
-comphelper/source/misc/documentiologring \
 comphelper/source/misc/evtlistenerhlp \
 comphelper/source/misc/evtmethodhelper \
 comphelper/source/misc/fileurl \
diff --git a/comphelper/source/misc/documentiologring.cxx 
b/comphelper/source/misc/documentiologring.cxx
deleted file mode 100644
index e90cd95f0cf8..
--- a/comphelper/source/misc/documentiologring.cxx
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include 
-#include 
-#include 
-#include 
-
-#include "documentiologring.hxx"
-#include 
-
-using namespace ::com::sun::star;
-
-namespace comphelper
-{
-
-
-OSimpleLogRing::OSimpleLogRing()
-: m_aMessages( SIMPLELOGRING_SIZE )
-, m_bInitialized( false )
-, m_bFull( false )
-, m_nPos( 0 )
-{
-}
-
-
-OSimpleLogRing::~OSimpleLogRing()
-{
-}
-
-// XSimpleLogRing
-
-void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage )
-{
-::osl::MutexGuard aGuard( m_aMutex );
-
-m_aMessages[m_nPos] = aMessage;
-if ( ++m_nPos >= (sal_Int32)m_aMessages.size() )
-{
-m_nPos = 0;
-m_bFull = true;
-}
-
-// if used once then default initialized
-m_bInitialized = true;
-}
-
-
-uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog()
-{
-::osl::MutexGuard aGuard( m_aMutex );
-
-sal_Int32 nResLen = m_bFull ? m_aMessages.size() : m_nPos;
-sal_Int32 nStart = m_bFull ? m_nPos : 0;
-uno::Sequence< OUString > aResult( nResLen );
-
-for ( sal_Int32 nInd = 0; nInd < nResLen; nInd++ )
-aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.size() ];
-
-// if used once then default initialized
-m_bInitialized = true;
-
-return aResult;
-}
-
-// XInitialization
-
-void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& 
aArguments )
-{
-::osl::MutexGuard aGuard( m_aMutex );
-if ( m_bInitialized )
-throw frame::DoubleInitializationException();
-
-if ( !m_refCount )
-throw uno::RuntimeException(); // the object must be refcounted 
already!
-
-if (aArguments.hasElements())
-{
-sal_Int32 nLen = 0;
-if ( aArguments.getLength() == 1 && ( aArguments[0] >>= nLen ) && nLen 
)
-m_aMessages.resize( nLen );
-else
-throw lang::IllegalArgumentException(
-"Nonnull size is expected as the first argument!",
-uno::Reference< uno::XInterface >(),
-0 );
-}
-
-m_bInitialized = true;
-}
-
-// XServiceInfo
-OUString SAL_CALL OSimpleLogRing::getImplementationName()
-{
-return OUString("com.sun.star.comp.logging.SimpleLogRing");
-}
-
-sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString&

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

2017-04-12 Thread Marco Cecchetti 
Tag '2.1-rc1' created by Andras Timar  at 
2017-04-12 18:49 +

2.1-rc1

Changes since 2.1-beta3-81:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'refs/tags/2.1-rc1' - 0 commits -

2017-04-12 Thread Unknown 
Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Gabor Kelemen 
 source/text/shared/01/06140400.xhp |   85 ++---
 1 file changed, 61 insertions(+), 24 deletions(-)

New commits:
commit dafaa1c1e89f912513e87c613db7ff23961d3030
Author: Gabor Kelemen 
Date:   Tue Apr 11 00:19:43 2017 +0200

Update Customize - Toolbars page help

Sync with UI and reorder paragraphs to better follow
its structure.
Add bookmarks as needed.

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

diff --git a/source/text/shared/01/06140400.xhp 
b/source/text/shared/01/06140400.xhp
index 757198a99..141e950e9 100644
--- a/source/text/shared/01/06140400.xhp
+++ b/source/text/shared/01/06140400.xhp
@@ -21,7 +21,7 @@
  -->
 
 
-   
+
 
 
 Toolbars
@@ -30,70 +30,107 @@
 
 
 
+
 Toolbars
-Lets you customize $[officename] toolbars.
+Lets you customize $[officename] 
toolbars.
 
 
 
 
-Toolbar
-Select the toolbar you want to edit.
+
+
+Toolbar
+Select the toolbar you want to 
edit.
+
+Style
+Select the 
toolbar style you want to use. 
+
+Icons
+Shows icons only.
+
+
+Icons 
& Text
+Shows icons and text.
+
+
+Text
+Shows text only.
+
 
 New
-Opens the Name dialog, where you 
enter the name of a new toolbar and select the location of the new 
toolbar. Opens the Name dialog, where you enter the name of a new 
toolbar and select the location of the new toolbar.
+Opens the Name dialog, where you can enter the name 
of a new toolbar and select the location of the new toolbar.
 
+
 Enter the name of a new 
toolbar.
+
+
 Select the location of the new 
toolbar.
 
 
 Toolbar
 The Toolbar button opens a submenu with the 
following commands:
 Rename
-Opens the Name dialog, where you enter a new name for 
the selected toolbar.
+Opens the Rename Toolbar dialog, where you enter a new 
name for the selected toolbar.
 New name
 Enter the new name for the selected toolbar.
+
 Delete
-Deletes the selected toolbar after you agree to the question. You 
can only delete custom toolbars, not the built-in toolbars.
+Deletes the selected toolbar without any further question. You can 
only delete custom toolbars, not the built-in toolbars.
+
 Restore Default Settings
 Restores the default settings.
-Icons only
-Shows icons only.
-Text only
-Shows text only.
-Icons & Text
-Shows icons and text.
 
 
 Moves the selected item up in the 
list.
 
 Moves the selected item down in 
the list.
 
-
+
 Commands
-Displays a list of commands for the selected toolbar of the current 
application or document.
+Displays a list of commands for the selected toolbar 
of the current application or document.
+
 
-Add
-Opens the Add Commands dialog. Select any command, 
then click Add or drag-and-drop the command into the 
Customize dialog.
-Modify
+Add Command
+Opens the Add Commands dialog. Select any command, 
then click Add to insert the command into the 
Customize dialog.
+
+
+Add 
Separator
+Inserts a separator line under the current toolbar 
entry.
+
+
+Modify
 The Modify button opens a submenu with the 
following commands:
 Rename
 Opens the Rename dialog, where you enter a new name for 
the selected command.
 New name
 Enter the new name for the selected command.
-Delete
-Deletes the selected command after you agree to the 
question.
+
 Restore Default Settings
 Restores the default settings.
-Begin a Group
-Inserts a separator line under the current toolbar entry.
 Change Icon
-Opens the Change Icon dialog, where you can assign a different icon 
to the current command.
+Opens the Change Icon dialog, where you can assign a different icon to the 
current command.
 Reset Icon
 Resets the icon to the default icon.
-Save In
+
+
+Remove
+Deletes the selected command without any further 
question.
+
+
+Reset
+Restores the selected toolbar to its original state after you agree to 
the question.
+
+
+Save In
 Select the location where to load the configuration 
and where to save it.
 For 
every entry in the list box, an own configuration is maintained. Select one of 
the open documents or select the application to load and edit the associated 
configuration. Edit the configuration and save it back to the location from 
where you loaded it. Editing the configuration in one location does not change 
the configuration in any other location.
 It 
is not possible to load a configuration from one location and save it to 
another location.
+
+
+Description
+Displays a short description of the given command. 
+For this feature 
to work the help content package for the currently used language must be 
installed.
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2017-04-12 Thread Gabor Kelemen 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bd5b6b9855ad11314ec5d00585fc568bb1689fe
Author: Gabor Kelemen 
Date:   Tue Apr 11 00:19:43 2017 +0200

Updated core
Project: help  dafaa1c1e89f912513e87c613db7ff23961d3030

Update Customize - Toolbars page help

Sync with UI and reorder paragraphs to better follow
its structure.
Add bookmarks as needed.

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

diff --git a/helpcontent2 b/helpcontent2
index 15646c9c9d2c..dafaa1c1e89f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 15646c9c9d2ceab21b8688cbd993a8ee881f7c7f
+Subproject commit dafaa1c1e89f912513e87c613db7ff23961d3030
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 21 commits - cui/source hwpfilter/qa hwpfilter/source include/svl sc/qa sc/source svl/source svx/source sw/qa sw/source vcl/source vc

2017-04-12 Thread Andras Timar 
 cui/source/dialogs/postdlg.cxx|7 
 cui/source/options/optjava.cxx|6 
 hwpfilter/qa/cppunit/data/fail/cslist-1.hwp   |binary
 hwpfilter/source/hpara.cxx|  120 +--
 hwpfilter/source/hpara.h  |9 
 hwpfilter/source/hwpfile.cxx  |  103 ---
 hwpfilter/source/hwpfile.h|   17 
 hwpfilter/source/hwpreader.cxx|  684 ++
 hwpfilter/source/hwpreader.hxx|4 
 hwpfilter/source/solver.cxx   |   53 -
 include/svl/zforlist.hxx  |6 
 include/svl/zformat.hxx   |   34 +
 sc/qa/unit/ucalc.cxx  |  156 +
 sc/qa/unit/ucalc.hxx  |4 
 sc/source/core/data/documen4.cxx  |   36 -
 sc/source/ui/condformat/condformatdlg.cxx |5 
 sc/source/ui/view/tabvwshf.cxx|4 
 svl/source/numbers/zforlist.cxx   |   21 
 svl/source/numbers/zformat.cxx|  147 ++--
 svx/source/dialog/crashreportdlg.cxx  |2 
 sw/qa/extras/ooxmlexport/data/tdf106690.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |9 
 sw/qa/extras/rtfimport/data/hexcrlf.rtf   |6 
 sw/source/core/crsr/crstrvl.cxx   |4 
 sw/source/core/frmedt/fews.cxx|7 
 sw/source/filter/ww8/ww8par6.cxx  |  128 ++--
 sw/source/uibase/uiview/view2.cxx |   25 
 vcl/source/window/dialog.cxx  |3 
 vcl/unx/gtk3/gtk3gtkframe.cxx |8 
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   12 
 writerfilter/source/dmapper/DomainMapper.cxx  |7 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   45 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|6 
 34 files changed, 972 insertions(+), 711 deletions(-)

New commits:
commit 4553bc1bfa72dce55566971e27b94f3a5bfcdc79
Author: Andras Timar 
Date:   Wed Apr 12 20:29:09 2017 +0200

fix previous commit

Change-Id: I204f83aede085bbe4f5bd6937238b2117e51c86a

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 7d94dc40f551..3a9ff75e33fb 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -95,7 +95,7 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 mpEditPostUpload->SetText("Error!");
 
 mpBtnClose->Show();
-
mpBugReportMailto->SetURL(mpFtBugReport->GetURL().replaceAll("%CRASHID", 
aCrashID.replaceAll("Crash-ID=","")));
+
mpBugReportMailto->SetURL(mpBugReportMailto->GetURL().replaceAll("%CRASHID", 
aCrashID.replaceAll("Crash-ID=","")));
 mpBugReportMailto->Show();
 mpEditPreUpload->Hide();
 mpEditPostUpload->Show();
commit ca45d2f299634c65406de9920da1dd044b9a3666
Author: Caolán McNamara 
Date:   Sat Apr 8 21:04:45 2017 +0100

ofz#1062 ensure cshape lifecycle matches expectations

Change-Id: I586e9b3546516a0f05d86b2f7dd93e7c292a6795
Reviewed-on: https://gerrit.libreoffice.org/36300
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 4e175b7aee7c00c6d0d8449a19b26ebf25446b9d)

diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index 84294c59ed3c..3149d65acf0a 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -75,17 +75,16 @@ HWPPara::HWPPara()
 , etcflag(0)
 , ctrlflag(0)
 , pstyno(0)
+, cshape(new CharShape)
 , linfo(nullptr)
-, cshapep(nullptr)
 {
-memset(&cshape, 0, sizeof(cshape));
+memset(cshape.get(), 0, sizeof(cshape));
 memset(&pshape, 0, sizeof(pshape));
 }
 
 HWPPara::~HWPPara()
 {
 delete[] linfo;
-delete[] cshapep;
 }
 
 bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
@@ -102,18 +101,17 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 hwpf.Read4b(&ctrlflag, 1);
 hwpf.Read1b(&pstyno, 1);
 
-
 /* Paragraph representative character */
-cshape.Read(hwpf);
+cshape->Read(hwpf);
 if (nch > 0)
-hwpf.AddCharShape(&cshape);
+hwpf.AddCharShape(cshape);
 
 /* Paragraph paragraphs shape  */
 if (nch && !reuse_shape)
 {
 pshape.Read(hwpf);
-pshape.cshape = &cshape;
-  pshape.pagebreak = etcflag;
+pshape.cshape = cshape.get();
+pshape.pagebreak = etcflag;
 }
 
 linfo = ::comphelper::newArray_null(nline);
@@ -144,23 +142,19 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 
 if (contain_cshape)
 {
-cshapep = ::comphelper::newArray_null(nch);
-if (!cshapep)
-{
-perror("Memory Allocation: cshape\n");
-return false;
-}
-

Re: tdf106013 Add-In functions that are also Excel2013 OOXML functions

2017-04-12 Thread Eike Rathke 
Hi Winfried,

I'm also mixing in some quotes from your previous mail of this topic

On Sunday, 2017-02-26 14:10:57 +0100, Winfried Donkers wrote:
On Wednesday, 2017-04-12 16:37:54 +0200, Winfried Donkers wrote:

> I'm sort of stuck with tdf106013.
> 
> There is a group of Add-In functions that were newly defined in Excel 2013
> (IMCOSH, IMCOT, IMCSC, IMCSCH, IMSEC, IMSECH, IMSINH and IMTAN, I'll call
> them IMxx).
> 
> In Calc these functions are defined in scaddins and also mentioned in
> sc/source/filter/oox/formulabase.cxx in saFuncTable2013[].
> 
> 
> The problem is that the IMxx functions saved as xlsx by Calc won't open
> correctly by Excel and vice versa.
> 
> Calc writes the IMxx functions in xlsx as =IMxx(...), just as on ods.
> 
> Excel writes the IMxx functions in xlsx as =_xlfn.IMxx(...), and in ods as
> =IMxx(...).
> 
> The other Add-In functions are written by both Calc and Excel as
> =FUNCTIONNAME(...).

This is due to that the functions defined in the Add-In were defined by
Excel long ago and are part of OOXML, and those Add-In functions are
treated accordingly during export. Unfortunately the exceptional IM*
cases don't seem to fit into the XclFunctionInfo tables of
sc/source/filter/excel/xlformula.cxx, only the case of writing an
internal function as Add-In is handled there (those with
EXC_FUNCFLAG_ADDINEQUIV set). But the lookup is done by OpCode in those
tables, so that doesn't work for ocExternal.

> When I define the IMxx functions as regular functions, there are written as
> =_xlfn.IMxx(...) in xlsx, but when written to xls, they give problems when
> opening in Excel.

Where and how did you define them as regular functions? Were they also
written as _xlfn.IMxx to .xls? Or without _xlfn.? As macro calls? Or...?

> Any suggestions for a solution?

I could imagine to define some extra range of OpCode for XclFunctionInfo
starting at 0xFF00 or any other unused high value and for
ocExternal/svExternal do an extra lookup depending on the value of the
XclExpScToken's aTokData.mpScToken->GetExternal() programmatical name,
that for example is "com.sun.star.sheet.addin.Analysis.getImcsch", using
a simple std:map like
opcodevalue["com.sun.star.sheet.addin.Analysis.getImcsch"] = 0xFF00;

The corresponding XclFunctionInfo entry then could be

{ 0xFF00,   255,2,  2, V, { RO_E, RO }, 
EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( "IMCSCH" ) },

Note that these 255-export-only definitions due to the BIFF .xls macro
call storage use minparam+1 and maxparam+1, so for IMCSCH that expects
one parameter the definition is 2,2

In XclExpFmlaCompImpl::ProcessFunction() there's

maFuncProv.GetFuncInfoFromOpCode( eOpCode )

which for (eOpCode == ocExternal && rTokData.GetType() == svExternal)
would needed to be called with the new eOpCode according to the mapping.

I hope that helps.


> I just noticed that tdf100450 regarding the Add-in function ACCRINT has a 
> similar problem.
> It currently reflects pre-Excel2013 behaviour, but does not comply with 
> ODFF1.2 or with the current Excel.

Probably keep the 7 parameters ACCRINT as Add-In function but name it
ACCRINT_EXCEL or such, and for 8 parameters introduce a new ACCRINT
function that is stored as _xlfn.ACCRINT (or whatever Excel does? OOXML
only defines 7 parameters).

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd.xml.in wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/TileCache.cpp wsd/TileCache.hpp

2017-04-12 Thread Marco Cecchetti 
 loolwsd.xml.in |2 ++
 wsd/DocumentBroker.cpp |4 
 wsd/LOOLWSD.cpp|4 
 wsd/LOOLWSD.hpp|1 +
 wsd/TileCache.cpp  |9 +++--
 wsd/TileCache.hpp  |3 +++
 6 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit acfbdfa3d59d3d52feae0f711f9d4af3fd71cd66
Author: Marco Cecchetti 
Date:   Wed Apr 12 12:32:59 2017 +0200

wsd - implemented an option to clean cache on doc close

Includes also the following commit:

Clean the cache even when the document was not modified.

And rename the option, to match better the existing tile cache setting.

Change-Id: I0bdb373efb93546527a168df2ed1c75539e95fe4

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 511b5479..5640d08f 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -77,6 +77,8 @@
 
 
 
+true
+
 
 
 
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index e041db70..3cac2e70 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1198,6 +1198,10 @@ void DocumentBroker::destroyIfLastEditor(const 
std::string& id)
 _markToDestroy = (_sessions.size() <= 1);
 LOG_DBG("startDestroy on session [" << id << "] on docKey [" << _docKey <<
 "], markToDestroy: " << _markToDestroy << ", lastEditableSession: 
" << _lastEditableSession);
+
+// Remove all tiles related to this document from the cache.
+if (_markToDestroy && !LOOLWSD::TileCachePersistent)
+_tileCache->completeCleanup();
 }
 
 void DocumentBroker::setModified(const bool value)
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 57c63523..9d3c62fe 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -553,6 +553,7 @@ static std::string UnitTestLibrary;
 
 unsigned int LOOLWSD::NumPreSpawnedChildren = 0;
 std::atomic LOOLWSD::NumConnections;
+bool LOOLWSD::TileCachePersistent = true;
 std::unique_ptr LOOLWSD::TraceDumper;
 
 /// This thread polls basic web serving, and handling of
@@ -610,6 +611,7 @@ void LOOLWSD::initialize(Application& self)
 // Add default values of new entries here.
 static const std::map DefAppConfig
 = { { "tile_cache_path", LOOLWSD_CACHEDIR },
+{ "tile_cache_persistent", "true" },
 { "sys_template_path", "systemplate" },
 { "lo_template_path", LO_PATH },
 { "child_root_path", "jails" },
@@ -762,6 +764,8 @@ void LOOLWSD::initialize(Application& self)
 
 LOOLWSD::NumConnections = 0;
 
+TileCachePersistent = getConfigValue(conf, "tile_cache_persistent", 
true);
+
 // Command Tracing.
 if (getConfigValue(conf, "trace[@enable]", false))
 {
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 072a4a88..72c3a9a1 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -53,6 +53,7 @@ public:
 static std::string FileServerRoot;
 static std::string LOKitVersion;
 static std::atomic NumConnections;
+static bool TileCachePersistent;
 static std::unique_ptr TraceDumper;
 
 /// Flag to shutdown the server.
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index b744eded..ff30710f 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -63,8 +63,7 @@ TileCache::TileCache(const std::string& docURL,
  getTextFile("unsaved.txt", unsaved)))
 {
 // Document changed externally or modifications were not saved after 
all. Cache not useful.
-FileUtil::removeFile(_cacheDir, true);
-LOG_INF("Completely cleared tile cache: " << _cacheDir);
+completeCleanup();
 }
 
 File(_cacheDir).createDirectories();
@@ -77,6 +76,12 @@ TileCache::~TileCache()
 LOG_INF("~TileCache dtor for uri [" << _docURL << "].");
 }
 
+void TileCache::completeCleanup() const
+{
+FileUtil::removeFile(_cacheDir, true);
+LOG_INF("Completely cleared tile cache: " << _cacheDir);
+}
+
 /// Tracks the rendering of a given tile
 /// to avoid duplication and help clock
 /// rendering latency.
diff --git a/wsd/TileCache.hpp b/wsd/TileCache.hpp
index 96b5a5b3..9f86cc72 100644
--- a/wsd/TileCache.hpp
+++ b/wsd/TileCache.hpp
@@ -36,6 +36,9 @@ public:
 TileCache(const std::string& docURL, const Poco::Timestamp& modifiedTime, 
const std::string& cacheDir);
 ~TileCache();
 
+/// Remove the entire cache directory.
+void completeCleanup() const;
+
 TileCache(const TileCache&) = delete;
 
 /// Subscribes if no subscription exists and returns the version number.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd.xml.in wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/TileCache.cpp wsd/TileCache.hpp

2017-04-12 Thread Jan Holesovsky 
 loolwsd.xml.in |2 ++
 wsd/DocumentBroker.cpp |4 
 wsd/LOOLWSD.cpp|4 
 wsd/LOOLWSD.hpp|1 +
 wsd/TileCache.cpp  |9 +++--
 wsd/TileCache.hpp  |3 +++
 6 files changed, 21 insertions(+), 2 deletions(-)

New commits:
commit ba3b32aad1f7fa262990a195241067ac7c7745a0
Author: Jan Holesovsky 
Date:   Wed Apr 12 20:04:30 2017 +0200

Clean the cache even when the document was not modified.

And rename the option, to match better the existing tile cache setting.

Change-Id: Iea5c2c5628a403dd2dc3e2943cd858f40e2a2ebc

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index db871747..5640d08f 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -16,8 +16,6 @@
 4
 
 
-false
-
 loleaflet.html
 
 
@@ -79,6 +77,8 @@
 
 
 
+true
+
 
 
 
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 50fc4fbe..3cac2e70 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -539,12 +539,6 @@ bool DocumentBroker::saveToStorage(const std::string& 
sessionId,
 // We've saved and can safely destroy.
 removeSessionInternal(sessionId);
 
-// Remove all tiles related to this document from the cache.
-if (LOOLWSD::CleanCacheOnDocClose)
-{
-invalidateTiles("invalidatetiles: EMPTY");
-}
-
 // Stop so we get cleaned up and removed.
 _stop = true;
 }
@@ -1204,6 +1198,10 @@ void DocumentBroker::destroyIfLastEditor(const 
std::string& id)
 _markToDestroy = (_sessions.size() <= 1);
 LOG_DBG("startDestroy on session [" << id << "] on docKey [" << _docKey <<
 "], markToDestroy: " << _markToDestroy << ", lastEditableSession: 
" << _lastEditableSession);
+
+// Remove all tiles related to this document from the cache.
+if (_markToDestroy && !LOOLWSD::TileCachePersistent)
+_tileCache->completeCleanup();
 }
 
 void DocumentBroker::setModified(const bool value)
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index cd9a725c..9d3c62fe 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -553,7 +553,7 @@ static std::string UnitTestLibrary;
 
 unsigned int LOOLWSD::NumPreSpawnedChildren = 0;
 std::atomic LOOLWSD::NumConnections;
-bool LOOLWSD::CleanCacheOnDocClose = false;
+bool LOOLWSD::TileCachePersistent = true;
 std::unique_ptr LOOLWSD::TraceDumper;
 
 /// This thread polls basic web serving, and handling of
@@ -611,6 +611,7 @@ void LOOLWSD::initialize(Application& self)
 // Add default values of new entries here.
 static const std::map DefAppConfig
 = { { "tile_cache_path", LOOLWSD_CACHEDIR },
+{ "tile_cache_persistent", "true" },
 { "sys_template_path", "systemplate" },
 { "lo_template_path", LO_PATH },
 { "child_root_path", "jails" },
@@ -619,7 +620,6 @@ void LOOLWSD::initialize(Application& self)
 { "file_server_root_path", "loleaflet/.." },
 { "num_prespawn_children", "1" },
 { "per_document.max_concurrency", "4" },
-{ "clean_cache_on_doc_close", "false" },
 { "loleaflet_html", "loleaflet.html" },
 { "logging.color", "true" },
 { "logging.level", "trace" },
@@ -764,7 +764,7 @@ void LOOLWSD::initialize(Application& self)
 
 LOOLWSD::NumConnections = 0;
 
-CleanCacheOnDocClose = getConfigValue(conf, 
"clean_cache_on_doc_close", false);
+TileCachePersistent = getConfigValue(conf, "tile_cache_persistent", 
true);
 
 // Command Tracing.
 if (getConfigValue(conf, "trace[@enable]", false))
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 6fb0ff8f..72c3a9a1 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -53,7 +53,7 @@ public:
 static std::string FileServerRoot;
 static std::string LOKitVersion;
 static std::atomic NumConnections;
-static bool CleanCacheOnDocClose;
+static bool TileCachePersistent;
 static std::unique_ptr TraceDumper;
 
 /// Flag to shutdown the server.
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index b744eded..ff30710f 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -63,8 +63,7 @@ TileCache::TileCache(const std::string& docURL,
  getTextFile("unsaved.txt", unsaved)))
 {
 // Document changed externally or modifications were not saved after 
all. Cache not useful.
-FileUtil::removeFile(_cacheDir, true);
-LOG_INF("Completely cleared tile cache: " << _cacheDir);
+completeCleanup();
 }
 
 File(_cacheDir).createDirectories();
@@ -77,6 +76,12 @@ TileCache::~TileCache()
 LOG_INF("~TileCache dtor for uri [" << _docURL << "].");
 }
 
+void TileCache::completeCleanup() const
+{
+FileUtil::removeFile(_cacheDir, true);
+LOG_INF("Completely cleared tile cache: " << _cacheDir);
+}
+
 /// Tracks the rendering of a given tile
 /// to avoid duplication and help clock
 /// rendering latency.
diff --git a

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

2017-04-12 Thread Caolán McNamara 
 test/source/setupvcl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e0fab219230cc5a35022beb203a014685d8c354
Author: Caolán McNamara 
Date:   Wed Apr 12 18:04:59 2017 +0100

EnableHeadlessMode bool arg doesn't toggle headless

but refers if a dialog is fatal or autocancelled

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

diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx
index 49bdf7364865..ed090eab62bb 100644
--- a/test/source/setupvcl.cxx
+++ b/test/source/setupvcl.cxx
@@ -74,7 +74,7 @@ void test::setUpVcl() {
 LanguageTag::setConfiguredSystemLanguage(tag.getLanguageType(false));
 InitVCL();
 if (isHeadless()) {
-Application::EnableHeadlessMode(true);
+Application::EnableHeadlessMode(false);
 }
 Application::setDeInitHook(LINK(nullptr, Hook, deinitHook));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Clang 5.0 32-bit builds Failing on CppunitTest_vcl_pdfexport

2017-04-12 Thread slacka 
Here is the backtrace:

https://pastebin.com/vhYRQDSG

This was with  clang version 4.0.0 (trunk 287326)

On Ubuntu 16.04.2 LTS 3 4.4.0-64-generic #85-Ubuntu SMP Mon Feb 20 11:49:39
UTC 2017 i686 i686 i686 

I'm not sure if it was timing, ccache. or what but whatever is causing this
crash started about 1 month ago. I have been building Libreoffice with Clang
for years and I'm seeing this on 2 different machines(Ubuntu/Fedora).



--
View this message in context: 
http://nabble.documentfoundation.org/MSVC-2015-s-broken-static-initializer-list-causing-build-failure-tp4202928p4212319.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] libmspub.git: 8 commits - build/win32 configure.ac .gitignore m4/ax_cxx_compile_stdcxx_11.m4 m4/ax_cxx_compile_stdcxx.m4 m4/.gitignore src/lib

2017-04-12 Thread David Tardon 
 .gitignore |2 
 build/win32/libmspub.dsp   |8 
 build/win32/libmspub.vcproj|8 
 build/win32/libmspub.vcxproj   |2 
 configure.ac   |7 
 m4/.gitignore  |2 
 m4/ax_cxx_compile_stdcxx.m4|  982 +
 m4/ax_cxx_compile_stdcxx_11.m4 |   39 +
 src/lib/MSPUBCollector.cpp |   24 -
 src/lib/MSPUBCollector.h   |7 
 src/lib/MSPUBDocument.cpp  |   13 
 src/lib/MSPUBParser.cpp|   36 -
 src/lib/MSPUBParser.h  |4 
 src/lib/MSPUBParser2k.cpp  |5 
 src/lib/MSPUBParser97.cpp  |5 
 src/lib/MSPUBStringVector.cpp  |   76 ---
 src/lib/PolygonUtils.cpp   |   50 +-
 src/lib/PolygonUtils.h |   12 
 src/lib/ShapeGroupElement.cpp  |   12 
 src/lib/ShapeGroupElement.h|   12 
 src/lib/ShapeInfo.h|   16 
 21 files changed, 1125 insertions(+), 197 deletions(-)

New commits:
commit 9af2873bc114dd81179c580fa4c5993ddbcc45c5
Author: David Tardon 
Date:   Wed Apr 12 19:22:46 2017 +0200

drop forgotten source file

Change-Id: I723886aeb318454c40cf6fde77d1bc95fb6ef8a3

diff --git a/build/win32/libmspub.dsp b/build/win32/libmspub.dsp
index 795af8f..e50e13e 100644
--- a/build/win32/libmspub.dsp
+++ b/build/win32/libmspub.dsp
@@ -123,10 +123,6 @@ SOURCE=..\..\src\lib\MSPUBParser97.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\lib\MSPUBStringVector.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\lib\MSPUBSVGGenerator.cpp
 # End Source File
 # Begin Source File
@@ -159,10 +155,6 @@ SOURCE=..\..\inc\libmspub\MSPUBDocument.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\inc\libmspub\MSPUBStringVector.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\lib\Arrow.h
 # End Source File
 # Begin Source File
diff --git a/build/win32/libmspub.vcproj b/build/win32/libmspub.vcproj
index 5b8a581..aa8f955 100644
--- a/build/win32/libmspub.vcproj
+++ b/build/win32/libmspub.vcproj
@@ -209,10 +209,6 @@
>


-   
-   

@@ -246,10 +242,6 @@
>


-   
-   

diff --git a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj
index fd24291..3849b77 100644
--- a/build/win32/libmspub.vcxproj
+++ b/build/win32/libmspub.vcxproj
@@ -13,7 +13,6 @@
   
 
 
-
 
 
 
@@ -61,7 +60,6 @@
 
 
 
-
 
 
 
diff --git a/src/lib/MSPUBStringVector.cpp b/src/lib/MSPUBStringVector.cpp
deleted file mode 100644
index 3f1bb75..000
--- a/src/lib/MSPUBStringVector.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * This file is part of the libmspub 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 
-
-namespace libmspub
-{
-class MSPUBStringVectorImpl
-{
-public:
-  MSPUBStringVectorImpl() : m_strings() {}
-  ~MSPUBStringVectorImpl() {}
-  std::vector m_strings;
-};
-
-MSPUBStringVector::MSPUBStringVector()
-  : m_pImpl(new MSPUBStringVectorImpl())
-{
-}
-
-MSPUBStringVector::MSPUBStringVector(const MSPUBStringVector &vec)
-  : m_pImpl(new MSPUBStringVectorImpl(*(vec.m_pImpl)))
-{
-}
-
-MSPUBStringVector::~MSPUBStringVector()
-{
-  delete m_pImpl;
-}
-
-MSPUBStringVector &MSPUBStringVector::operator=(const MSPUBStringVector &vec)
-{
-  // Check for self-assignment
-  if (this == &vec)
-return *this;
-  if (m_pImpl)
-delete m_pImpl;
-  m_pImpl = new MSPUBStringVectorImpl(*(vec.m_pImpl));
-  return *this;
-}
-
-unsigned MSPUBStringVector::size() const
-{
-  return (unsigned)(m_pImpl->m_strings.size());
-}
-
-bool MSPUBStringVector::empty() const
-{
-  return m_pImpl->m_strings.empty();
-}
-
-const librevenge::RVNGString &MSPUBStringVector::operator[](unsigned idx) const
-{
-  return m_pImpl->m_strings[idx];
-}
-
-void MSPUBStringVector::append(const librevenge::RVNGString &str)
-{
-  m_pImpl->m_strings.push_back(str);
-}
-
-void MSPUBStringVector::clear()
-{
-  m_pImpl->m_strings.clear();
-}
-
-}
-
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
commit 1182df1076b8f892a18e3c5bb3a3f3dd6ebce24f
Author: David Tardon 
Date:   Wed Apr 12 19:17:44 2017 +0200

boost::bind -> std::bind

Change-Id: Id2fe9b3760add82fa7f13cb00ab0bc1ba5ab4afb

diff --git a/configure.ac b/configure.ac
index c963f8e..a83aedd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,6 @@ AC_SUBST(ZLIB_LIBS)
 # Find required boost headers
 # ===
 AC_CHECK_HEADERS(
-   boost/bind.hpp \
boost/numeric/con

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.2.7.1'

2017-04-12 Thread Christian Lohmaier 
Tag 'libreoffice-5.2.7.1' created by Christian Lohmaier 
 at 2017-04-12 16:55 +

Tag libreoffice-5.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJY7lv1AAoJEPQ0oe+v7q6jNLUP/1glpUSejENrJa4/dVLuiKXz
PSW9IDH5o59G3NWPLthIprAR1/E44uqfFBnKJ9+ulunfMnZGFg5fuzXVSGjTLOjg
r3ptaPgntt6tUKQrg3a2WZYcAsa5EK9+uosnbP+Jk0caez/3tSy0X0cdQ6reRVFM
V3yk87oIxbdT7NPSCzWKEHpFZTUyAym6eYQxSHfURuCQ2eLVZ2U1K0kGZ/mBM1ac
NJjrvpZiUHVzUC/+7+C8vbt0fZw4277/AitNOAjuyoS6H8j58h/JAQtiVrnvkHoC
ixqlN0EKK6yabh+AoeoKgQ9z3hCHQJnTw2Kn8cNUbI+qJMjlGOxSljLNNOMTMkdL
Mk4lACMHY2szzOn1G09mx44wBODAch47KQo/9uGZFR7/ytijCvdo4xsfk5p1kHjM
FhLIyG1qMKv35KuLgGGbe4llm5S1gGuOWfXRch5Vo8TrXho8/GINXLqBnwOD1XFf
EueBhIemhWLhZFQhcqD0pq86pF6GPe+IyjdVFEQVgHyKadUHM4cvH+Bbood9q9sZ
aTXEp3oOhEM0zhfSr0oh8hIQRxO66Nys0Tgv1yDncK7YkG1Ikya6R/PIa813Taeo
+D3VYtZ7QYtUis1n10wZ7U2hbo8iILFXRMwpDgGs8q0Xucw8WUba3vUmiGxjF9ou
jaBONTENDRt8A160Zz1/
=Y4CF
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-8:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.2.7.1'

2017-04-12 Thread Christian Lohmaier 
Tag 'libreoffice-5.2.7.1' created by Christian Lohmaier 
 at 2017-04-12 16:55 +

Tag libreoffice-5.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJY7lv5AAoJEPQ0oe+v7q6jFN4P+wdGOkwDcgxLX7Vp7wXb1Zc4
jx7Xt9BKqsMATbIZRIAqKZ8PXk4ZJQJP9e8cMRzg3vjcKzvXdSp1Wke5gkQrZaqf
vWAd5A/7yYqOhe/JaunLd0/Z/nD1qs7/7RRbpr9ldc78eXaDN7G/QQoIUtRsUfBt
Bob3lzW37n0OWCwIM8ylKjaAupP4+kv5nMKuyuIPX6th6GAJK994gxmos6dFWvF+
RXD/Y+haWDb6CLq5+66Lls76cjZ8AyC+19vWKuG/ioPQkV+Hs5/HV2pnjFYTDXGI
vk4AXEQhLtcvbTeYwI3pD9WzdpVRHkEh37DOknOxQQh6R/3vk3oBMuwbdWWEen5O
ODBikyKJfEq65hYMcyVbmbd07PEU7/YKhITCgYiMwYrbi86YByjPE5JbO5CZaq9q
wA4SYHpTjvsnx9NFbGlqKeG3VVlk/EvdclWNu7JTPGfnEMUNYg0eE0DKmo2HvozY
gV8W5smxVsSd+TALe+mYCryyLzhkHUg2rIKc3U/jCeYOskDOuPS3Rl1BQY2RF8lW
4pFb7NdSg8tT5c3Bsdi46WzX5My4jlE3nZBWwgLAGIwj1tdFsTlXclNhJT8ePemg
HqDLwUu2YsvpKBoVbAj3DGf560P3QaEKCj39DCUtF1JIlmg5h8U8M9iF50rz+lwa
Qp2od86Kwkt3+pQ1L9d3
=v6K8
-END PGP SIGNATURE-

Changes since libreoffice-5-2-branch-point-20:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.2.7.1'

2017-04-12 Thread Christian Lohmaier 
Tag 'libreoffice-5.2.7.1' created by Christian Lohmaier 
 at 2017-04-12 16:55 +

Tag libreoffice-5.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJY7lv8AAoJEPQ0oe+v7q6jo9UQALyKPwHqM09IfbwweLwtNYCd
qdVS0UnH/JqSwVB+y46jbUbhH5P6logV0DMu7seFoSrZqvRLrec6/kNXDL0AAfjH
WO854n6wc3bM6XFN0W2VZFPcVq18NcojLD+fKkJQQCIL+jKfC1rgFwx56lBZSxzs
QtA5CNVib8yg0bleTiwA5zhJtBjlrS6N33Ev6IVlfUoZypCRrw2wyLsJRGTrBxNE
PNugnsXZx0U0R5TtdWMpe1q1ML5nV6TOJEnkRK74XHljhCaUGHUHjUzlmZl/x1Lw
pFlBBUmJXeOQ0ByVEtMF8kS04+sWMiouVT18lbqP2mVWKsxPJPzMF4xXzq6XJQ1p
GwHri6RxDy1QIU5M6rq6LdV1ruj467mjfP7BFfkMGjRkdCDc9l9Ik1YHdGrhz+f7
SMkW54H8f0tngogSBcs/jgtInb98vgGk9hVoBWfCDWIko3hjUdg28yJlJLPv0lZ4
Ba0FKRB/w9ZDLF/QU5TRSkEsN5dDdyqhWX78sQ+2sswoB9U+dsKplNksfG750u4z
Y1NW/F1ca7ZbzkpnSbAu7E6CbibkU3KCS9kHbu1c50NBasEA1xvrPx8MDdOThSNz
Hmh7+H8xQvm1xh849zc4bmtfSYMj060Od20+nresV9MUWQ3KIM3rl09g5C6+k4xS
DbYOEltc9NA2KB1SW9ks
=Z0Cd
-END PGP SIGNATURE-

Changes since cp-5.1-branch-point-27:
---
 0 files changed
---
___
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-7' - configure.ac

2017-04-12 Thread Christian Lohmaier 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5b3f870743eaee7aa7b85706cf182849bfcd073
Author: Christian Lohmaier 
Date:   Wed Apr 12 18:56:05 2017 +0200

bump product version to 5.2.7.1.0+

Change-Id: I4efeae17551dbb798c18e4c90fecb4a5fb488de7

diff --git a/configure.ac b/configure.ac
index 2f68ebef5993..41b998c6d96f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.2.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.7.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.2.7.1'

2017-04-12 Thread Christian Lohmaier 
Tag 'libreoffice-5.2.7.1' created by Christian Lohmaier 
 at 2017-04-12 16:55 +

Tag libreoffice-5.2.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJY7lv/AAoJEPQ0oe+v7q6ju9MP/2rxaro/t7+uveKPTXxaJZAP
nzHddVD7d72Dvm7Zx0fPGt+XItXcqIavX1l9lG91Ww9h0E4Ya2zOaim+N8ObkCtO
AamqwSYCePSpFniI90nHhubQUFp0w9ZEPt897cFXIBBQ7T+s/5PK32xwZdrC3+nQ
FWPzj9ksZnn+AT6fjbwYy6fM+FaoUYsU6BCmnulD4cgOWBi1FeXqBdk/6dnzf1OI
1L0qtwKFDhF7HwBCP5ggaLQt+pkWgmbekuIZEHENGemkXAEdQ0DSsGO2XExYqm7S
gDwQoE+jA8UH5NCcbNlX2qWfE9khHOXcGv4q2Z2Nm0utwIR+6jnliAzbIyUOn49d
VYOllgAvkr6vyCgeyl7yUNMbviITAiwtljUCwSSMI4cnqWHnsCNP8aLToxk/EV47
SO6r18qPNiwLoZV4N7Z8LWLH1gDIFK5byZqGU9SmEsbGIiPkEfLc+Kydc316nYdw
Nwe5X7aWJKSsznYprLw/+oB1pkN/4L44wSE/hq5pgEiii9oIK2+VfezU7tJlpqle
/WmuHcCFJOdzOGbuX+tIEPsWcOWnjZ2CELw944EY7E7L2Hd49l4lrIadSGfbu7FJ
hD0JlOlnToL8LZj9YU9gQ55/m/VxDdRC865u4Ggvon/0hVdShVbMdK+r0DSX4RYr
YllcFEPmyj58MoFNBSM5
=Otoe
-END PGP SIGNATURE-

Changes since libreoffice-5-2-branch-point-1118:
---
 0 files changed
---
___
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' - configure.ac

2017-04-12 Thread Christian Lohmaier 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0b1245d4e715509fa84d50a66b926bbb76fed6f
Author: Christian Lohmaier 
Date:   Wed Apr 12 18:53:44 2017 +0200

bump product version to 5.2.8.0.0+

Change-Id: Ic981e67e4ba8ad1f3f9344c91d6a8338ceb68e3e

diff --git a/configure.ac b/configure.ac
index 2f68ebef5993..9bc526c6ed1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.2.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.2.8.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist wsd/FileServer.cpp

2017-04-12 Thread Pranav Kant 
 loleaflet/dist/loleaflet.html |7 ---
 wsd/FileServer.cpp|   15 ++-
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 00af954041c72f00e2813f4102fe22b6f52fa946
Author: Pranav Kant 
Date:   Wed Apr 12 19:23:35 2017 +0530

Make CSP work in older browsers

This cherry-pick consists of following commits:

Move CSP to response headers from meta tag in html
(cherry picked from commit b7eafb1e4a8da6fced02af395581475f0332c2a7)

Use CSP without WOPI host too
(cherry picked from commit 699e8df9a7f99f59a5366e4f2506a69d71e8de9d)

Change-Id: I7f0d7c294e492b3c69ebea6fbd820d6558b9c3b3
Reviewed-on: https://gerrit.libreoffice.org/36480
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 8b3f794c..bfa9ad3e 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -3,13 +3,6 @@
 
 Online Editor
 
-

[Libreoffice-commits] core.git: Changes to 'libreoffice-5-2-7'

2017-04-12 Thread Christian Lohmaier 
New branch 'libreoffice-5-2-7' available with the following commits:
commit 5534da0fd961787eb60f2fb5abf0bf7c8f12392e
Author: Christian Lohmaier 
Date:   Wed Apr 12 18:52:07 2017 +0200

Branch libreoffice-5-2-7

This is 'libreoffice-5-2-7' - the stable branch for the 5.2.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ica8e8c06a9b3e35d3ae8e2548d8de2f9031ea3e8

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-5-2-7'

2017-04-12 Thread Christian Lohmaier 
New branch 'libreoffice-5-2-7' available with the following commits:
commit ea7b04dcbe45a03a10836467d21ef65bc24bbf91
Author: Christian Lohmaier 
Date:   Wed Apr 12 18:51:46 2017 +0200

Branch libreoffice-5-2-7

This is 'libreoffice-5-2-7' - the stable branch for the 5.2.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ib5370cfeb6fc25bc4b1efdfa79a2d97c05478401

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-2-7'

2017-04-12 Thread Christian Lohmaier 
New branch 'libreoffice-5-2-7' available with the following commits:
commit ed1344b15c78d636b292db69353ab3041d905073
Author: Christian Lohmaier 
Date:   Wed Apr 12 18:51:46 2017 +0200

Branch libreoffice-5-2-7

This is 'libreoffice-5-2-7' - the stable branch for the 5.2.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ie5b528a5b07c2618917d142db74688f829a4c5cc

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-2-7'

2017-04-12 Thread Christian Lohmaier 
New branch 'libreoffice-5-2-7' available with the following commits:
commit 4c99923d1fbea375d424f2d6d004a0bebe280183
Author: Christian Lohmaier 
Date:   Wed Apr 12 18:51:46 2017 +0200

Branch libreoffice-5-2-7

This is 'libreoffice-5-2-7' - the stable branch for the 5.2.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.2.x release,
please use the 'libreoffice-5-2' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ifc1d6b1102d1f23ae9c100bfb5f4442998d2ca99

___
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

2017-04-12 Thread Michael Stahl 
 sw/source/core/crsr/crstrvl.cxx   |4 
 sw/source/uibase/uiview/view2.cxx |   25 -
 2 files changed, 4 insertions(+), 25 deletions(-)

New commits:
commit 224073a5002df33da673a63db24c19f5a43143c1
Author: Michael Stahl 
Date:   Wed Apr 5 16:54:57 2017 +0200

rhbz#1438179 sw: fix toolbar "Next Track Change" / "Previous..."

There's some confusing workarounds in SwView::Execute() that aren't
needed if the SwCursorShell just calls NormalizePam() so it always
makes progress.

(cherry picked from commit 25eb0899227830cca7f28006376962d84f8e9c7a)

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

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 1fb7c8331e90..e83e68923ef0 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1982,6 +1982,8 @@ const SwRangeRedline* SwCursorShell::SelNextRedline()
 SwCallLink aLk( *this ); // watch Cursor-Moves
 SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
+// ensure point is at the end so alternating SelNext/SelPrev works
+NormalizePam(false);
 pFnd = GetDoc()->getIDocumentRedlineAccess().SelNextRedline( 
*m_pCurrentCursor );
 if( pFnd && !m_pCurrentCursor->IsInProtectTable() && 
!m_pCurrentCursor->IsSelOvr() )
 UpdateCursor( 
SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
@@ -2000,6 +2002,8 @@ const SwRangeRedline* SwCursorShell::SelPrevRedline()
 SwCallLink aLk( *this ); // watch Cursor-Moves
 SwCursorSaveState aSaveState( *m_pCurrentCursor );
 
+// ensure point is at the start so alternating SelNext/SelPrev works
+NormalizePam(true);
 pFnd = GetDoc()->getIDocumentRedlineAccess().SelPrevRedline( 
*m_pCurrentCursor );
 if( pFnd && !m_pCurrentCursor->IsInProtectTable() && 
!m_pCurrentCursor->IsSelOvr() )
 UpdateCursor( 
SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE|SwCursorShell::READONLY);
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index edd8bccbc5b4..bdb977ec7b8f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -702,18 +702,8 @@ void SwView::Execute(SfxRequest &rReq)
 
 case FN_REDLINE_NEXT_CHANGE:
 {
-const SwRangeRedline *pCurrent = m_pWrtShell->GetCurrRedline();
 const SwRangeRedline *pNext = m_pWrtShell->SelNextRedline();
 
-// FN_REDLINE_PREV_CHANGE leaves the selection point at the start 
of the redline.
-// In such cases, SelNextRedline (which starts searching from the 
selection point)
-// immediately finds the current redline and advances the 
selection point to its end.
-
-// This behavior means that PREV_CHANGE followed by NEXT_CHANGE 
would not change
-// the current redline, so we detect it and select the next 
redline again.
-if (pCurrent && pCurrent == pNext)
-pNext = m_pWrtShell->SelNextRedline();
-
 if (pNext)
 m_pWrtShell->SetInSelect();
 }
@@ -721,24 +711,9 @@ void SwView::Execute(SfxRequest &rReq)
 
 case FN_REDLINE_PREV_CHANGE:
 {
-const SwPaM *pCursor = m_pWrtShell->GetCursor();
-const SwPosition initialCursorStart = *pCursor->Start();
 const SwRangeRedline *pPrev = m_pWrtShell->SelPrevRedline();
 
 if (pPrev)
-{
-// FN_REDLINE_NEXT_CHANGE leaves the selection point at the 
end of the redline.
-// In such cases, SelPrevRedline (which starts searching from 
the selection point)
-// immediately finds the current redline and advances the 
selection point to its
-// start.
-
-// This behavior means that NEXT_CHANGE followed by 
PREV_CHANGE would not change
-// the current redline, so we detect it and move to the 
previous redline again.
-if (initialCursorStart == *pPrev->Start())
-pPrev = m_pWrtShell->SelPrevRedline();
-}
-
-if (pPrev)
 m_pWrtShell->SetInSelect();
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2017-04-12 Thread Stephan Bergmann 
 configure.ac |  262 +--
 1 file changed, 131 insertions(+), 131 deletions(-)

New commits:
commit e8ffe54dec568332c301f8510f3186c04421b911
Author: Stephan Bergmann 
Date:   Wed Apr 12 16:33:34 2017 +0200

Lets see if basing WINDOWS_SDK_BINDIR_NO_ARCH on WINDOWS_SDK_HOME works 
better

...than basing it on naked winsdktest, even though both should be 
effectively
equivalent modulo Windows pathname normalization voodoo.  But at least the
Win-x86@62-TDF bot complained after a4d1ed6ba2a81b4284cd360f44b6723bc9bfaf85
"Adapt to Windows SDK 10.0.15063" with

> configure: setting up the build environment variables...
> cygpath: cannot create short name of C:\Program Files (x86)\Microsoft 
SDKs\Windows\v7.1A\Bin\x86
> configure: error: path conversion failed for "C:\Program Files 
(x86)\Microsoft SDKs\Windows\v7.1A\/Bin/x86".

presumably because that path does not exist, so pathmunge() -> PathFormat() 
->
cygpath can't generate a short 8.1 DOS form for it (and maybe with the 
already
voodoo'ed WINDOWS_SDK_HOME that happened to work nevertheless, because 
voodoo?).

Unfortunately, this requires to move the whole "Check for the Windows SDK" 
block
further up---but the block itself left unchanged except for splitting the 
part
out that uses WINDOWS_SDK_BINDIR_NO_ARCH.

Change-Id: I13a369ba34b63392ec42333dbc1e538b49a24ca1
Reviewed-on: https://gerrit.libreoffice.org/36481
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 16b3517d1bf5..505c15d6dd05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5316,6 +5316,119 @@ find_msvc_x64_dlls()
 done
 }
 
+dnl =
+dnl Check for the Windows  SDK.
+dnl =
+if test "$_os" = "WINNT"; then
+AC_MSG_CHECKING([for Windows SDK])
+if test "$build_os" = "cygwin"; then
+find_winsdk
+WINDOWS_SDK_HOME=$winsdktest
+
+# normalize if found
+if test -n "$WINDOWS_SDK_HOME"; then
+WINDOWS_SDK_HOME=`cygpath -d "$WINDOWS_SDK_HOME"`
+WINDOWS_SDK_HOME=`cygpath -u "$WINDOWS_SDK_HOME"`
+fi
+
+WINDOWS_SDK_LIB_SUBDIR=$winsdklibsubdir
+fi
+
+if test -n "$WINDOWS_SDK_HOME"; then
+# Remove a possible trailing backslash
+WINDOWS_SDK_HOME=`echo $WINDOWS_SDK_HOME | $SED 's/\/$//'`
+
+if test -f "$WINDOWS_SDK_HOME/Include/adoint.h" \
+ -a -f "$WINDOWS_SDK_HOME/Include/SqlUcode.h" \
+ -a -f "$WINDOWS_SDK_HOME/Include/usp10.h"; then
+have_windows_sdk_headers=yes
+elif test -f "$WINDOWS_SDK_HOME/Include/um/adoint.h" \
+ -a -f "$WINDOWS_SDK_HOME/Include/um/SqlUcode.h" \
+ -a -f "$WINDOWS_SDK_HOME/Include/um/usp10.h"; then
+have_windows_sdk_headers=yes
+elif test -f "$WINDOWS_SDK_HOME/Include/$winsdklibsubdir/um/adoint.h" \
+ -a -f "$WINDOWS_SDK_HOME/Include/$winsdklibsubdir/um/SqlUcode.h" \
+ -a -f "$WINDOWS_SDK_HOME/Include/$winsdklibsubdir/um/usp10.h"; 
then
+have_windows_sdk_headers=yes
+else
+have_windows_sdk_headers=no
+fi
+
+if test -f "$WINDOWS_SDK_HOME/lib/user32.lib"; then
+have_windows_sdk_libs=yes
+elif test -f 
"$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/$WINDOWS_SDK_ARCH/user32.lib"; then
+have_windows_sdk_libs=yes
+else
+have_windows_sdk_libs=no
+fi
+
+if test $have_windows_sdk_headers = no -o $have_windows_sdk_libs = no; 
then
+AC_MSG_ERROR([Some (all?) Windows SDK files not found, please 
check if all needed parts of
+the  Windows SDK are installed.])
+fi
+fi
+
+if test -z "$WINDOWS_SDK_HOME"; then
+AC_MSG_RESULT([no, hoping the necessary headers and libraries will be 
found anyway!?])
+elif echo $WINDOWS_SDK_HOME | grep "v7.1" >/dev/null 2>/dev/null; then
+WINDOWS_SDK_VERSION=70
+AC_MSG_RESULT([found Windows SDK 7 ($WINDOWS_SDK_HOME)])
+elif echo $WINDOWS_SDK_HOME | grep "8.0" >/dev/null 2>/dev/null; then
+WINDOWS_SDK_VERSION=80
+AC_MSG_RESULT([found Windows SDK 8.0 ($WINDOWS_SDK_HOME)])
+dnl compatibility warning if not explicitly choosing the 80 SDK:
+if test -z "$with_windows_sdk"; then
+AC_MSG_WARN([If a build should run on Windows XP,])
+AC_MSG_WARN([use --with-windows-sdk=7.1A])
+add_warning "If a build should run on Windows XP,"
+add_warning "use --with-windows-sdk=7.1A"
+fi
+elif echo $WINDOWS_SDK_HOME | grep "8.1" >/dev/null 2>/dev/null; then
+WINDOWS_SDK_VERSION=81
+AC_MSG_RESULT([found Windows SDK 8.1 ($WINDOWS_SDK_HOME)])
+elif echo $WINDOWS_SDK_HOME | grep "/10" >/dev/null 2>/dev/null; then
+WINDOWS_SDK_V

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

2017-04-12 Thread Nikki Casali 
Statement:
All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

Nikki Casali

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

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

2017-04-12 Thread Werner Tietz 
 scripting/source/pyprov/pythonscript.py |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9a6d78b722f3a49f71a680e49cf64e7cfb637c43
Author: Werner Tietz 
Date:   Tue Apr 11 01:51:11 2017 +0200

tdf#92007 python scripts with tuple-assignments fails on access from GUI

Change-Id: Ice1d7d92cec56751cb26cbb31a5995ab30895125
Reviewed-on: https://gerrit.libreoffice.org/36399
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 7ef47336411389ac492729bef52fe62aebe90f5a)
Reviewed-on: https://gerrit.libreoffice.org/36483

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 6089d14edefe..e312c6a52fbf 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -405,7 +405,12 @@ class ProviderContext:
 allFuncs.append(node.name)
 elif isinstance(node, ast.Assign):
 for target in node.targets:
-if target.id == "g_exportedScripts":
+try:
+identifier = target.id
+except AttributeError:
+identifier = ""
+pass
+if identifier == "g_exportedScripts":
 for value in node.value.elts:
 g_exportedScripts.append(value.id)
 return g_exportedScripts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Jens Carl 
 sw/source/core/text/frminf.cxx |2 
 sw/source/core/text/itrcrsr.cxx|6 -
 sw/source/core/text/itrtxt.cxx |2 
 sw/source/core/text/porlay.cxx |2 
 sw/source/core/text/porlin.cxx |   12 +--
 sw/source/core/text/redlnitr.cxx   |2 
 sw/source/core/text/txtdrop.cxx|4 -
 sw/source/core/text/widorp.cxx |2 
 sw/source/filter/html/htmlgrin.cxx |  137 +
 9 files changed, 79 insertions(+), 90 deletions(-)

New commits:
commit bef7ba7ced13908340ff03aacb64dc22217040b4
Author: Jens Carl 
Date:   Tue Apr 11 07:00:58 2017 +

tdf#39468 Translate German comments in sw

Translate German comments and terms in sw/

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

diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index b1ac9c9bb760..a4f6c1a4ec86 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -206,7 +206,7 @@ void SwTextFrameInfo::GetSpaces( SwPaM &rPam, bool 
bWithLineBreak ) const
 }
 
 // Is there a bullet/symbol etc. at the text position?
-// Fonts: CharSet, SYMBOL und DONTKNOW
+// Fonts: CharSet, SYMBOL and DONTKNOW
 bool SwTextFrameInfo::IsBullet( sal_Int32 nTextStart ) const
 {
 SwTextSizeInfo aInf( const_cast(pFrame) );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 63bd04455597..65a55aa91d74 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -877,7 +877,7 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, const 
sal_Int32 nOfst,
 {
 SeekAndChg( aInf );
 const bool bOldOnWin = aInf.OnWin();
-aInf.SetOnWin( false ); // keine BULLETs!
+aInf.SetOnWin( false ); // no BULLETs!
 SwTwips nTmp = nX;
 aInf.SetKanaComp( pKanaComp );
 aInf.SetKanaIdx( nKanaIdx );
@@ -889,7 +889,7 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, const 
sal_Int32 nOfst,
 {
 pPor->SetLen( pPor->GetLen() + 1 );
 aInf.SetLen( pPor->GetLen() );
-aInf.SetOnWin( false ); // keine BULLETs!
+aInf.SetOnWin( false ); // no BULLETs!
 nTmp += pPor->GetTextSize( aInf ).Width();
 aInf.SetOnWin( bOldOnWin );
 if ( pPor->InSpaceGrp() && nSpaceAdd )
@@ -1068,7 +1068,7 @@ void SwTextCursor::GetCharRect_( SwRect* pOrig, const 
sal_Int32 nOfst,
 pPor->SetLen( 1 );
 aInf.SetLen( pPor->GetLen() );
 SeekAndChg( aInf );
-aInf.SetOnWin( false ); // keine BULLETs!
+aInf.SetOnWin( false ); // no BULLETs!
 aInf.SetKanaComp( pKanaComp );
 aInf.SetKanaIdx( nKanaIdx );
 nTmp = pPor->GetTextSize( aInf ).Width();
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 0f0951a46252..c62265e093d8 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -163,7 +163,7 @@ const SwLineLayout *SwTextIter::GetPrevLine()
 }
 }
 
-// Wenn sich nichts getan hat, dann gibt es nur noch Dummys
+// If nothing has changed, then there are only dummy's
 return pLay;
 }
 
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index fd2ffaf66b7e..a3f8506f7fd7 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1205,7 +1205,7 @@ void SwScriptInfo::InitScriptInfo( const SwTextNode& 
rNode, bool bRTL )
 for ( size_t nDirIdx = 0; nDirIdx < aDirectionChanges.size(); 
++nDirIdx )
 {
 const sal_uInt8 nCurrDirType = GetDirType( nDirIdx );
-// nStart ist start of RTL run:
+// nStart is start of RTL run:
 const sal_Int32 nStart = nDirIdx > 0 ? GetDirChg( nDirIdx - 1 
) : 0;
 // nEnd is end of RTL run:
 const sal_Int32 nEnd = GetDirChg( nDirIdx );
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 1fb0b0ddf2ea..6060ea64b264 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -39,7 +39,7 @@ bool ChkChain( SwLinePortion *pStart )
 "ChkChain(): lost in chains" );
 if( nCount >= 200 || pPor == pStart )
 {
-// der Lebensretter
+// the lifesaver
 pPor = pStart->GetPortion();
 pStart->SetPortion(nullptr);

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-2' - source/af source/am source/ar source/as source/ast source/be source/bg source/bn source/bn-IN source/bo source/br source/brx source/b

2017-04-12 Thread Christian Lohmaier 
 source/af/cui/uiconfig/ui.po   |6 
 source/af/sfx2/uiconfig/ui.po  |6 
 source/af/svx/source/stbctrls.po   |   18 
 source/am/cui/uiconfig/ui.po   |6 
 source/am/helpcontent2/source/text/sbasic/shared.po|   16 
 source/am/sfx2/uiconfig/ui.po  |6 
 source/am/svx/source/stbctrls.po   |   12 
 source/ar/cui/uiconfig/ui.po   |6 
 source/ar/sfx2/uiconfig/ui.po  |   15 
 source/ar/svx/source/stbctrls.po   |   18 
 source/as/cui/uiconfig/ui.po   |9 
 source/as/sfx2/uiconfig/ui.po  |4 
 source/as/svx/source/stbctrls.po   |   18 
 source/ast/cui/uiconfig/ui.po  |   13 
 source/ast/sfx2/uiconfig/ui.po |   16 
 source/ast/svx/source/stbctrls.po  |   18 
 source/be/accessibility/source/helper.po   |   15 
 source/be/connectivity/source/resource.po  |   20 
 source/be/cui/uiconfig/ui.po   |6 
 source/be/dbaccess/source/ext/macromigration.po|   12 
 source/be/dbaccess/source/ui/browser.po|   12 
 source/be/dbaccess/source/ui/misc.po   |   11 
 source/be/desktop/source/deployment/gui.po |   82 
 source/be/desktop/source/deployment/misc.po|   11 
 source/be/editeng/source/misc.po   |   13 
 source/be/instsetoo_native/inc_openoffice/windows/msi_languages.po |   10 
 source/be/librelogo/source/pythonpath.po   |   17 
 source/be/nlpsolver/src/locale.po  |   15 
 source/be/officecfg/registry/data/org/openoffice/Office.po |   17 
 source/be/readlicense_oo/docs.po   |   78 
 source/be/reportdesign/source/core/resource.po |   16 
 source/be/sc/source/ui/src.po  |   38 
 source/be/sc/uiconfig/scalc/ui.po  |   20 
 source/be/scaddins/source/analysis.po  |   12 
 source/be/scp2/source/accessories.po   |   12 
 source/be/sfx2/source/appl.po  |   14 
 source/be/sfx2/uiconfig/ui.po  |   16 
 source/be/svtools/source/misc.po   |   14 
 source/be/svtools/uiconfig/ui.po   |   14 
 source/be/svx/source/dialog.po |   14 
 source/be/svx/source/form.po   |   12 
 source/be/svx/source/sidebar/area.po   |   18 
 source/be/svx/source/src.po|   29 
 source/be/svx/source/stbctrls.po   |   18 
 source/be/sw/source/ui/app.po  |   11 
 source/be/sw/source/ui/envelp.po   |   14 
 source/be/sw/source/ui/utlui.po|   11 
 source/be/sw/uiconfig/swriter/ui.po|   22 
 source/be/swext/mediawiki/help.po  |   32 
 source/be/uui/source.po|   24 
 source/be/wizards/source/formwizard.po |   10 
 source/bg/cui/uiconfig/ui.po   |8 
 source/bg/sfx2/uiconfig/ui.po  |   13 
 source/bg/svx/source/stbctrls.po   |   18 
 source/bn-IN/cui/uiconfig/ui.po|7 
 source/bn-IN/sfx2/uiconfig/ui.po   |   14 
 source/bn-IN/svx/source/stbctrls.po|   18 
 source/bn/cui/uiconfig/ui.po   |6 
 source/bn/sfx2/uiconfig/ui.po  |8 
 source/bn/svx/source/stbctrls.po   |   18 
 source/bo/cui/uiconfig/ui.po   |6 
 source/bo/sfx2/uiconfig/ui.po  |8 
 source/bo/svx/source/stbctrls.po   |   18 
 source/br/cui/uiconfig/ui.po   |8 
 source/br/sfx2/uiconfig/ui.po  |   17 
 source/br/svx/source/stbctrls.po

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - translations

2017-04-12 Thread Christian Lohmaier 
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00fc7dcce35431ff301838c2da51658450fd0015
Author: Christian Lohmaier 
Date:   Wed Apr 12 17:29:58 2017 +0200

Updated core
Project: translations  7ca7a156211552ca17c6f37c48d3b140062df03d

update templates for 5.2.7 rc1

Change-Id: Ia2100bf7a747b1e5f19a786fcd76be94ae77a898

diff --git a/translations b/translations
index fe3157b664e5..7ca7a1562115 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit fe3157b664e542f274f3db40b8d7ce9bd7787f0b
+Subproject commit 7ca7a156211552ca17c6f37c48d3b140062df03d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Caolán McNamara 
 framework/qa/cppunit/dispatchtest.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2af27abaf0531cdd72a5d3b298b7eff5d8bffc5
Author: Caolán McNamara 
Date:   Wed Apr 12 16:59:49 2017 +0100

update test to pass now that .ui files are found

with 506cab1a01b0481d0831a7a692a26dc5a5b55e91

"take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR"

in place .ui files are found and the count here changes,

reverting the above makes it pass, but also reverting
08cf2fd01064306eef7fdbb5b62320947c4d1089 (framework: last 
dispatchInterceptor
gets asked first, 2016-05-20) that this test wants to test also passes

Change-Id: I01f5b77065e9562619412824bf69494b7b672b68

diff --git a/framework/qa/cppunit/dispatchtest.cxx 
b/framework/qa/cppunit/dispatchtest.cxx
index 3dd995510d50..554581debe55 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -191,7 +191,7 @@ void DispatchTest::testInterception()
 CPPUNIT_ASSERT_EQUAL(1, pInterceptor->getExpected());
 CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
 dispatchCommand(mxComponent, ".uno:Italic", {});
-CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getExpected());
+CPPUNIT_ASSERT_EQUAL(1, pInterceptor->getExpected());
 // This was 1: MyInterceptor::queryDispatch() was called for .uno:Italic.
 CPPUNIT_ASSERT_EQUAL(0, pInterceptor->getUnexpected());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Caolán McNamara 
 sw/source/core/crsr/crstrvl.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 244d2abb6c1bcd89cedf773d8721f62451708c3f
Author: Caolán McNamara 
Date:   Mon Apr 10 15:14:37 2017 +0100

Resolves: tdf#106078 get bounding box of commented region for gtk3 tooltips

Change-Id: I4fdc1f471c6c191be9c7c611926bd2b5b2b41308
(cherry picked from commit eb433f83a5f66dd1ca8ed0c62ef9cc0761b7f0ac)
Reviewed-on: https://gerrit.libreoffice.org/36383
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index c024e0eb7d69..9bdc9b932768 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1440,12 +1440,18 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 
 if( pFieldRect && nullptr != ( pFrame = 
pTextNd->getLayoutFrame( GetLayout(), &aPt ) ) )
 {
+//get bounding box of range
 SwRect aStart;
 SwPosition aStartPos(*pTextNd, nSt);
 pFrame->GetCharRect(aStart, aStartPos, 
&aTmpState);
 SwRect aEnd;
 SwPosition aEndPos(*pTextNd, nEnd);
 pFrame->GetCharRect(aEnd, aEndPos, &aTmpState);
+if (aStart.Top() != aEnd.Top() || 
aStart.Bottom() != aEnd.Bottom())
+{
+aStart.Left(pFrame->Frame().Left());
+aEnd.Right(pFrame->Frame().Right());
+}
 *pFieldRect = aStart.Union(aEnd);
 }
 }
@@ -1463,7 +1469,19 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 bRet = true;
 
 if( pFieldRect && nullptr != ( pFrame = 
pTextNd->getLayoutFrame( GetLayout(), &aPt ) ) )
-pFrame->GetCharRect( *pFieldRect, aPos, &aTmpState 
);
+{
+//get bounding box of range
+SwRect aStart;
+pFrame->GetCharRect(aStart, *pRedl->Start(), 
&aTmpState);
+SwRect aEnd;
+pFrame->GetCharRect(aEnd, *pRedl->End(), 
&aTmpState);
+if (aStart.Top() != aEnd.Top() || aStart.Bottom() 
!= aEnd.Bottom())
+{
+aStart.Left(pFrame->Frame().Left());
+aEnd.Right(pFrame->Frame().Right());
+}
+*pFieldRect = aStart.Union(aEnd);
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src

2017-04-12 Thread Jan Holesovsky 
 dev/null |binary
 loleaflet/dist/images/submenu.svg|   76 +++
 loleaflet/dist/loleaflet.css |   52 +++--
 loleaflet/src/layer/marker/Annotation.js |   27 ++-
 4 files changed, 111 insertions(+), 44 deletions(-)

New commits:
commit 7b7c73f8beb4c6f6cee0b35c9a31341e0ad7e801
Author: Jan Holesovsky 
Date:   Wed Apr 12 16:57:37 2017 +0200

Align the Accept / Reject buttons with the kebab menu.

And few other improvemnts inluding:

* use svg instead of png for the menu
* add title (caption) for the Accept / Reject change.

Change-Id: Ic7e781d7e93d319f766b387a8eddfa70c1920760

diff --git a/loleaflet/dist/images/submenu.png 
b/loleaflet/dist/images/submenu.png
deleted file mode 100644
index 5159693f..
Binary files a/loleaflet/dist/images/submenu.png and /dev/null differ
diff --git a/loleaflet/dist/images/submenu.svg 
b/loleaflet/dist/images/submenu.svg
new file mode 100644
index ..59401d65
--- /dev/null
+++ b/loleaflet/dist/images/submenu.svg
@@ -0,0 +1,76 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   height="24"
+   viewBox="0 0 24 24"
+   width="24"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="submenu.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+  
+
+  
+  
+  
+  
+
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 20563cac..d7522f87 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -204,27 +204,35 @@ body {
 
 .loleaflet-annotation-author {
padding-left: 10px;
+   padding-right: 10px;
vertical-align: top;
display: table-cell;
 }
 
-.loleaflet-redline-accept-button, .loleaflet-redline-reject-button {
+.loleaflet-annotation-menu, .loleaflet-annotation-menu-redline, 
.loleaflet-redline-accept-button, .loleaflet-redline-reject-button {
+   margin: 0;
 padding: 0;
-border: 0;
-height: 25px;
-width: 21px;
+width: 24px;
+height: 24px;
+   vertical-align: top;
+   border: 1px solid transparent;
+   display: inline-block;
 }
 
 .loleaflet-redline-accept-button {
-background: url('../images/lc_accepttrackedchanges.svg');
+background: url('../images/lc_accepttrackedchanges.svg') no-repeat 
center !important;
 }
 
 .loleaflet-redline-reject-button {
-background: url('../images/lc_rejecttrackedchange.svg');
+background: url('../images/lc_rejecttrackedchange.svg') no-repeat 
center !important;
 }
 
-.loleaflet-redline-accept-button:hover, .loleaflet-redline-reject-button:hover 
{
-background-color: #dcdcdc;
+.loleaflet-annotation-menu, .loleaflet-annotation-menu-redline {
+   background: url(../images/submenu.svg) no-repeat center !important;
+}
+
+.loleaflet-annotation-menu:hover, .loleaflet-annotation-menu-redline:hover, 
.loleaflet-redline-accept-button:hover, .loleaflet-redline-reject-button:hover {
+   border: 1px solid darkgrey;
 }
 
 .loleaflet-annotation-date {
@@ -237,34 +245,10 @@ body {
height: 6px;
 }
 
-.loleaflet-annotation-menu {
-   background: url(../images/submenu.png) no-repeat;
-   margin: 0;
-   padding: 0;
-   min-width: 15px;
-   height: 21px;
-   text-align: right;
-   border: 1px solid transparent;
-   display: inline-block;
-}
-
-.loleaflet-annotation-menu:hover {
-   border: 1px solid darkgrey;
-}
-
-.loleaflet-annotation-menu-redline {
-   background: url(../images/submenu.png) no-repeat;
+.loleaflet-annotation-menubar {
margin: 0;
padding: 0;
-   min-width: 15px;
-   height: 21px;
-   text-align: right;
-   border: 1px solid transparent;
-   display: inline-block;
-}
-
-.loleaflet-annotation-menu-redline:hover {
-   border: 1px solid darkgrey;
+   vertical-align: top;
 }
 
 .loleaflet-annotation-caption {
diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index a1f22f60..11cd7046 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -139,27 +139,34 @@ L.Annotation = L.Layer.extend({
var tr = L.DomUtil.create('tr', empty, tbody);
var tdImg = L.DomUtil.create(tagTd, 'loleaflet-annotation-img', 
tr);
var tdAuthor = L.DomUtil.create(tagTd, 
'loleaflet-annotation-author', tr);
+   var imgAuthor = L.DomUtil.create('img', empty, tdImg);
+

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

2017-04-12 Thread Werner Tietz 
 scripting/source/pyprov/pythonscript.py |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7ef47336411389ac492729bef52fe62aebe90f5a
Author: Werner Tietz 
Date:   Tue Apr 11 01:51:11 2017 +0200

tdf#92007 python scripts with tuple-assignments fails on access from GUI

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

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index 406693266f45..4803d0bebc23 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -405,7 +405,12 @@ class ProviderContext:
 allFuncs.append(node.name)
 elif isinstance(node, ast.Assign):
 for target in node.targets:
-if target.id == "g_exportedScripts":
+try:
+identifier = target.id
+except AttributeError:
+identifier = ""
+pass
+if identifier == "g_exportedScripts":
 for value in node.value.elts:
 g_exportedScripts.append(value.id)
 return g_exportedScripts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: librelogo/source offapi/com offapi/type_reference oox/source qadevOOo/runner sw/qa sw/source vbahelper/source wizards/com writerfilter/source xmloff/source

2017-04-12 Thread Justin Luth 
 librelogo/source/LibreLogo/LibreLogo.py |8 +--
 offapi/com/sun/star/text/WrapTextMode.idl   |6 ++
 offapi/type_reference/offapi.idl|3 -
 oox/source/vml/vmlshape.cxx |2 
 qadevOOo/runner/util/ValueChanger.java  |2 
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx   |2 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|6 +-
 sw/qa/extras/rtfimport/rtfimport.cxx|8 +--
 sw/source/core/doc/DocumentStylePoolManager.cxx |2 
 sw/source/core/doc/textboxhelper.cxx|4 -
 sw/source/core/draw/dcontact.cxx|4 -
 sw/source/core/edit/edfcol.cxx  |2 
 sw/source/core/frmedt/fefly1.cxx|2 
 sw/source/core/frmedt/feshview.cxx  |6 +-
 sw/source/core/frmedt/fews.cxx  |2 
 sw/source/core/inc/sortedobjs.hxx   |4 -
 sw/source/core/layout/anchoredobject.cxx|2 
 sw/source/core/layout/flowfrm.cxx   |2 
 sw/source/core/layout/fly.cxx   |4 -
 sw/source/core/layout/flycnt.cxx|4 -
 sw/source/core/layout/frmtool.cxx   |2 
 sw/source/core/layout/sortedobjs.cxx|4 -
 sw/source/core/layout/tabfrm.cxx|2 
 sw/source/core/layout/trvlfrm.cxx   |4 -
 sw/source/core/layout/wsfrm.cxx |4 -
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx  |2 
 sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx |2 
 sw/source/core/text/itratr.cxx  |2 
 sw/source/core/text/txtfly.cxx  |   12 
++---
 sw/source/core/unocore/unoframe.cxx |2 
 sw/source/filter/html/htmlcss1.cxx  |2 
 sw/source/filter/html/htmldrawreader.cxx|2 
 sw/source/filter/html/htmlform.cxx  |2 
 sw/source/filter/html/htmlgrin.cxx  |2 
 sw/source/filter/html/htmlplug.cxx  |4 -
 sw/source/filter/html/swhtml.cxx|2 
 sw/source/filter/ww8/docxattributeoutput.cxx|8 +--
 sw/source/filter/ww8/docxsdrexport.cxx  |2 
 sw/source/filter/ww8/rtfattributeoutput.cxx |2 
 sw/source/filter/ww8/wrtw8esh.cxx   |6 +-
 sw/source/filter/ww8/ww8graf.cxx|6 +-
 sw/source/filter/ww8/ww8par.cxx |2 
 sw/source/ui/frmdlg/frmpage.cxx |2 
 sw/source/ui/frmdlg/wrap.cxx|6 +-
 sw/source/ui/vba/vbawrapformat.cxx  |4 -
 sw/source/uibase/shells/basesh.cxx  |   22 
+-
 sw/source/uibase/utlui/attrdesc.cxx |4 -
 sw/source/uibase/utlui/attrdesc.hrc |2 
 sw/source/uibase/utlui/attrdesc.src |2 
 vbahelper/source/vbahelper/vbashapes.cxx|2 
 wizards/com/sun/star/wizards/letter/LetterDocument.py   |4 -
 writerfilter/source/dmapper/GraphicHelpers.cxx  |4 -
 writerfilter/source/dmapper/GraphicImport.cxx   |4 -
 writerfilter/source/dmapper/OLEHandler.cxx  |2 
 writerfilter/source/rtftok/rtfdispatchvalue.cxx |4 -
 xmloff/source/text/txtexppr.cxx |2 
 xmloff/source/text/txtprhdl.cxx |2 
 58 files changed, 113 insertions(+), 106 deletions(-)

New commits:
commit 8913353a8fd2a1d281c2d8a33ca795d97201b7bc
Author: Justin Luth 
Date:   Sat Apr 1 15:31:18 2017 +0300

enum spelling: throught -> through

git grep -l  "[ _\.]THROUGHT" | xargs sed -i 's/THROUGHT/THROUGH/g'
git grep -l -i "[ _\.]THROUGHT" | xargs sed -i 's/throught/through/g'

In ENUMs: THROUGHT = THROUGH (preserved as valid alternate spelling)
In ooxmlexport8 - unit test co

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport8.mk sw/ooxmlexport_setup.mk vcl/source

2017-04-12 Thread Caolán McNamara 
 sw/CppunitTest_sw_ooxmlexport8.mk |2 +-
 sw/ooxmlexport_setup.mk   |2 +-
 vcl/source/window/dialog.cxx  |   20 +++-
 3 files changed, 5 insertions(+), 19 deletions(-)

New commits:
commit 506cab1a01b0481d0831a7a692a26dc5a5b55e91
Author: Caolán McNamara 
Date:   Wed Apr 12 16:14:10 2017 +0100

take the .ui files from $BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR

Change-Id: I9cffdc092206c038da32a32a2cfe629e68b5c258

diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk 
b/sw/CppunitTest_sw_ooxmlexport8.mk
index f3995b2e2e19..7c88db6ed6bc 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -100,7 +100,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_ooxmlexport8,\
 xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_ooxmlexport8))
+$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport8))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sw_ooxmlexport8,\
 modules/swriter \
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 7bd941f4c2b3..d9f981897c3a 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -114,7 +114,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_ooxmlexport$(1),\
filter/source/storagefilterdetect/storagefd \
 ))
 
-$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_ooxmlexport$(1)))
+$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport$(1)))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sw_ooxmlexport$(1),\
 modules/swriter \
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 95d0e1326b08..45713fd85333 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -489,23 +490,8 @@ void VclBuilderContainer::disposeBuilder()
 
 OUString VclBuilderContainer::getUIRootDir()
 {
-/*to-do, check if user config has an override before using shared one, 
etc*/
-css::uno::Reference< css::util::XPathSettings > xPathSettings = 
css::util::thePathSettings::get(
-::comphelper::getProcessComponentContext() );
-
-OUString sShareLayer = xPathSettings->getBasePathShareLayer();
-
-// "UIConfig" is a "multi path" ... use first part only here!
-sal_Int32 nPos = sShareLayer.indexOf(';');
-if (nPos > 0)
-sShareLayer = sShareLayer.copy(0, nPos);
-
-// Note: May be an user uses URLs without a final slash! Check it ...
-if (!sShareLayer.endsWith("/"))
-sShareLayer += "/";
-
-sShareLayer += "soffice.cfg/";
-/*to-do, can we merge all this foo with existing soffice.cfg finding code, 
etc*/
+OUString 
sShareLayer("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/");
+rtl::Bootstrap::expandMacros(sShareLayer);
 return sShareLayer;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - sfx2/uiconfig svx/source svx/uiconfig

2017-04-12 Thread Andras Timar 
 sfx2/uiconfig/ui/safemodequerydialog.ui |3 +--
 svx/source/dialog/crashreportdlg.cxx|7 ---
 svx/source/dialog/crashreportdlg.hxx|3 ++-
 svx/uiconfig/ui/crashreportdlg.ui   |   18 +++---
 4 files changed, 18 insertions(+), 13 deletions(-)

New commits:
commit c51dc04cc3cd48e7d5ab51a1f88e36bda8707c73
Author: Andras Timar 
Date:   Wed Apr 12 17:06:37 2017 +0200

Collabora Crashreport Dialog

Change-Id: Id44e446684993984cf5778c82eb0a990bdd2f465

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index ed56b67678af..7d94dc40f551 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -31,7 +31,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent):
 get(mpBtnClose, "btn_close");
 get(mpEditPreUpload, "ed_pre");
 get(mpEditPostUpload, "ed_post");
-get(mpFtBugReport, "ed_bugreport");
+get(mpBugReportMailto, "bugreport_mailto");
 get(mpCBSafeMode, "check_safemode");
 
 maSuccessMsg = mpEditPostUpload->GetText();
@@ -54,7 +54,7 @@ void CrashReportDialog::dispose()
 mpBtnClose.clear();
 mpEditPreUpload.clear();
 mpEditPostUpload.clear();
-mpFtBugReport.clear();
+mpBugReportMailto.clear();
 mpCBSafeMode.clear();
 
 Dialog::dispose();
@@ -95,7 +95,8 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void)
 mpEditPostUpload->SetText("Error!");
 
 mpBtnClose->Show();
-mpFtBugReport->Show();
+
mpBugReportMailto->SetURL(mpFtBugReport->GetURL().replaceAll("%CRASHID", 
aCrashID.replaceAll("Crash-ID=","")));
+mpBugReportMailto->Show();
 mpEditPreUpload->Hide();
 mpEditPostUpload->Show();
 mpBtnSend->Hide();
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index b0014364bd06..a564670bad55 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -35,7 +36,7 @@ private:
 VclPtr mpBtnClose;
 VclPtr mpEditPreUpload;
 VclPtr mpEditPostUpload;
-VclPtr mpFtBugReport;
+VclPtr mpBugReportMailto;
 VclPtr mpCBSafeMode;
 
 OUString maSuccessMsg;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/svx/uiconfig/ui/crashreportdlg.ui
index 6236cd7babc6..df16e78e8bf1 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -87,7 +87,7 @@ You can help us to fix this issue by sending an anonymous 
crash report to the %P
 0
 The crash report was 
successfully uploaded.
 You can soon find the report at:
-crashreport.collaboraoffice.com/stats/crash_details/%CRASHID
+http://crashreport.collaboraoffice.com/stats/crash_details/%CRASHID
 True
 True
   
@@ -98,12 +98,16 @@ 
crashreport.collaboraoffice.com/stats/crash_details/%CRASHID
   
 
 
-  
-False
-Please check the report 
and if no bug report is connected to the crash report yet, open a new bug 
report at bugs.documentfoundation.org.
-Add detailed instructions on how to reproduce the crash and the shown crash ID 
into the crash report field.
+  
+Click here to send an 
email to supp...@collaboraoffice.com.
+In the message body please add detailed instructions on how to reproduce the 
crash.
 Thank you for your help in improving %PRODUCTNAME.
-True
+True
+True
+True
+none
+0
+mailto:supp...@collaboraoffice.com?subject=Crash report: 
%CRASHID
   
   
 False
commit ff707db0a86bd78ac32efb0d7d5b039c85d636b3
Author: Katarina Behrens 
Date:   Tue Dec 13 16:12:06 2016 +0100

SafeMode: s/LibreOffice/%PRODUCTNAME/, small UI changes

nouns are written Upper Case only in German
also Cancel button looks odd as secondary

Change-Id: Id1b051cbb86ab69ea88c7b1da2cda3eb19f063de
Reviewed-on: https://gerrit.libreoffice.org/31971
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 
(cherry picked from commit 8020215f1f502d30a5045689b865afc0092f126f)

diff --git a/sfx2/uiconfig/ui/safemodequerydialog.ui 
b/sfx2/uiconfig/ui/safemodequerydialog.ui
index 60d6b3a426ed..6d9ba3a618be 100644
--- a/sfx2/uiconfig/ui/safemodequerydialog.ui
+++ b/sfx2/uiconfig/ui/safemodequerydialog.ui
@@ -32,7 +32,6 @@
 False
 True
 0
-True
   
 
 
@@ -61,7 +60,7 @@
   
 True
 False
-Are you sure you want to 
restart %PRODUCTNAME and enter the Safe Mode?
+Are you sure you want to 
restart %PRODUCTNAME and enter safe mode?
 True
 80
 2
diff --git a/svx/uiconfig/ui/crashreportdlg.ui 
b/sv

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

2017-04-12 Thread Caolán McNamara 
 sw/ooxmlexport_setup.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fe7eac1e0776ae3fd9f24b40590021eab8ac4ac9
Author: Caolán McNamara 
Date:   Wed Apr 12 15:56:00 2017 +0100

ooxmlexport4 triggers .ui loading too

Change-Id: I9ed7b3a90f87d9235f80b7d5201ea35ac1ec01e1

diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index d793575f13af..7bd941f4c2b3 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -114,7 +114,11 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_ooxmlexport$(1),\
filter/source/storagefilterdetect/storagefd \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport$(1)))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_ooxmlexport$(1)))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_ooxmlexport$(1),\
+modules/swriter \
+))
 
 $(eval $(call gb_CppunitTest_use_packages,sw_ooxmlexport$(1),\
oox_customshapes \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Gabor Kelemen 
 external/misc_extensions/ExtensionPackageSet_misc_extensions.mk |   48 
--
 1 file changed, 48 deletions(-)

New commits:
commit dab3923a690f742d0a32532b15f47e2557706c8a
Author: Gabor Kelemen 
Date:   Mon Apr 10 00:12:36 2017 +0200

Remove more remains of bundled extensions

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

diff --git a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk 
b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
index 77b981479457..b03254845ee7 100644
--- a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
+++ b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk
@@ -9,56 +9,8 @@
 
 $(eval $(call gb_ExtensionPackageSet_ExtensionPackageSet,misc_extensions))
 
-ifneq ($(BARCODE_EXTENSION_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Barcode,$(BARCODE_EXTENSION_PACK)))
-endif
-
-ifneq ($(DIAGRAM_EXTENSION_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,SmART,$(DIAGRAM_EXTENSION_PACK)))
-endif
-
-ifneq ($(HUNART_EXTENSION_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,hunart,$(HUNART_EXTENSION_PACK)))
-endif
-
 ifneq ($(NUMBERTEXT_EXTENSION_PACK),)
 $(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,numbertext,$(NUMBERTEXT_EXTENSION_PACK)))
 endif
 
-ifneq ($(SUNTEMPLATES_DE_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_de,$(SUNTEMPLATES_DE_PACK)))
-endif
-
-ifneq ($(SUNTEMPLATES_EN_US_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_en-US,$(SUNTEMPLATES_EN_US_PACK)))
-endif
-
-ifneq ($(SUNTEMPLATES_ES_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_es,$(SUNTEMPLATES_ES_PACK)))
-endif
-
-ifneq ($(SUNTEMPLATES_FR_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_fr,$(SUNTEMPLATES_FR_PACK)))
-endif
-
-ifneq ($(SUNTEMPLATES_HU_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_hu,$(SUNTEMPLATES_HU_PACK)))
-endif
-
-ifneq ($(SUNTEMPLATES_IT_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_it,$(SUNTEMPLATES_IT_PACK)))
-endif
-
-ifneq ($(TYPO_EXTENSION_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,typo,$(TYPO_EXTENSION_PACK)))
-endif
-
-ifneq ($(VALIDATOR_EXTENSION_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,Validator,$(VALIDATOR_EXTENSION_PACK)))
-endif
-
-ifneq ($(WATCH_WINDOW_EXTENSION_PACK),)
-$(eval $(call 
gb_ExtensionPackageSet_add_extension,misc_extensions,WatchWindow,$(WATCH_WINDOW_EXTENSION_PACK)))
-endif
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Caolán McNamara 
 sw/CppunitTest_sw_ooxmlexport8.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1b431f454ecc04e44187b29c73f2cf0166c19f39
Author: Caolán McNamara 
Date:   Wed Apr 12 15:39:02 2017 +0100

tell cppunit test about .ui requirement

Change-Id: I2346732db5c4b120025594b89c003f544588048e

diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk 
b/sw/CppunitTest_sw_ooxmlexport8.mk
index 81f758b83b12..f3995b2e2e19 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -100,6 +100,10 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_ooxmlexport8,\
 xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport8))
+$(eval $(call gb_CppunitTest_use_instdir_configuration,sw_ooxmlexport8))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_ooxmlexport8,\
+modules/swriter \
+))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: tdf106013 Add-In functions that are also Excel2013 OOXML functions

2017-04-12 Thread Winfried Donkers 
Hi Eike,

I'm sort of stuck with tdf106013.

There is a group of Add-In functions that were newly defined in Excel
2013 (IMCOSH, IMCOT, IMCSC, IMCSCH, IMSEC, IMSECH, IMSINH and IMTAN,
I'll call them IMxx).

In Calc these functions are defined in scaddins and also mentioned in
sc/source/filter/oox/formulabase.cxx in saFuncTable2013[].


The problem is that the IMxx functions saved as xlsx by Calc won't open
correctly by Excel and vice versa.

[...]

I just noticed that tdf100450 regarding the Add-in function ACCRINT has a 
similar problem.
It currently reflects pre-Excel2013 behaviour, but does not comply with ODFF1.2 
or with the current Excel.

How to cope with old Add-In functions that now also exist as new Excel 
functions?

Winfried

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

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

2017-04-12 Thread dilekuzulmez 
 svx/source/form/fmview.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ef5757ab06743fc56d5bf74d7244edf01acfa842
Author: dilekuzulmez 
Date:   Sun Apr 9 20:06:53 2017 +0300

tdf#96505 Get rid of cargo cult long integer literals

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

diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index c94ba7c8e7d1..3adf31d8a34c 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -368,7 +368,7 @@ void FmFormView::ActivateControls(SdrPageView* pPageView)
 if (!pPageView)
 return;
 
-for (sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); ++i)
+for (sal_uInt32 i = 0; i < pPageView->PageWindowCount(); ++i)
 {
 const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i);
 pImpl->addWindow(rPageWindow);
@@ -381,7 +381,7 @@ void FmFormView::DeactivateControls(SdrPageView* pPageView)
 if( !pPageView )
 return;
 
-for (sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); ++i)
+for (sal_uInt32 i = 0; i < pPageView->PageWindowCount(); ++i)
 {
 const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i);
 pImpl->removeWindow(rPageWindow.GetControlContainer() );
@@ -428,7 +428,7 @@ void FmFormView::InsertControlContainer(const Reference< 
css::awt::XControlConta
 SdrPageView* pPageView = GetSdrPageView();
 if( pPageView )
 {
-for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ )
+for( sal_uInt32 i = 0; i < pPageView->PageWindowCount(); i++ )
 {
 const SdrPageWindow& rPageWindow = 
*pPageView->GetPageWindow(i);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/FileServer.cpp

2017-04-12 Thread Pranav Kant 
 wsd/FileServer.cpp |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 699e8df9a7f99f59a5366e4f2506a69d71e8de9d
Author: Pranav Kant 
Date:   Wed Apr 12 19:58:08 2017 +0530

Use CSP without WOPI host too

Fallback from b7eafb1e4a8da6fced02af395581475f0332c2a7

Change-Id: I741a3f2320cfeec2250c10913871cf350861a39d

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index cf9607d0..53583c6f 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -350,24 +350,29 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 << "X-XSS-Protection: 1; mode=block\r\n"
 << "Referrer-Policy: no-referrer\r\n";
 
+std::ostringstream cspOss;
+cspOss << "Content-Security-Policy: default-src 'none'; "
+   << "frame-src 'self' blob:; "
+   << "connect-src 'self' " << host << "; "
+   << "script-src 'unsafe-inline' 'self'; "
+   << "style-src 'self' 'unsafe-inline'; "
+   << "font-src 'self' data:; "
+   << "img-src 'self' data:; ";
 if (!wopiDomain.empty())
 {
 // Replaced by frame-ancestors in CSP but some oldies don't know about 
that
 oss << "X-Frame-Options: allow-from " << wopiDomain << "\r\n";
-oss << "Content-Security-Policy: default-src 'none'; "
-<< "frame-src 'self' blob:; "
-<< "connect-src 'self' " << host << "; "
-<< "script-src 'unsafe-inline' 'self'; "
-<< "style-src 'self' 'unsafe-inline'; "
-<< "font-src 'self' data:; "
-<< "img-src 'self' data:; "
-<< "frame-ancestors " << wopiDomain << "\r\n";
+cspOss << "frame-ancestors " << wopiDomain;
 }
 else
 {
 oss << "X-Frame-Options: deny\r\n";
 }
 
+cspOss << "\r\n";
+// Append CSP to response headers too
+oss << cspOss.str();
+
 // Setup HTTP Public key pinning
 if (LOOLWSD::isSSLEnabled() && config.getBool("ssl.hpkp[@enable]", false))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - hwpfilter/source sw/source vcl/unx

2017-04-12 Thread Michael Stahl 
 hwpfilter/source/hwpreader.cxx|3 ---
 sw/source/core/inc/unoport.hxx|4 ++--
 sw/source/filter/html/parcss1.cxx |8 
 sw/source/filter/html/swhtml.hxx  |2 +-
 vcl/unx/gtk/a11y/atkutil.cxx  |   14 +++---
 5 files changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 6a9f06e7ca9ba1ea9ebf8ecb013c6f63c4d7419c
Author: Michael Stahl 
Date:   Wed Apr 12 15:53:06 2017 +0200

sw: fix typos in URLs

Change-Id: I51adbc08515352242b3e5b5f9eee071aee5a3951

diff --git a/sw/source/filter/html/parcss1.cxx 
b/sw/source/filter/html/parcss1.cxx
index 3285d0828bd9..c22f8412e140 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -93,8 +93,8 @@ sal_Unicode CSS1Parser::GetNextChar()
 
 // This function implements the scanner described in
 
-//   http://www.w3.orh/pub/WWW/TR/WD-css1.html
-// resp. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
+//   http://www.w3.org/pub/WWW/TR/WD-css1.html
+// resp. http://www.w3.org/pub/WWW/TR/WD-css1-960220.html
 
 // for CSS1. It's a direct implementation of the
 // described Lex grammar.
@@ -651,8 +651,8 @@ CSS1Token CSS1Parser::GetNextToken()
 
 // These functions implement the parser described in
 
-//   http://www.w3.orh/pub/WWW/TR/WD-css1.html
-// resp. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
+//   http://www.w3.org/pub/WWW/TR/WD-css1.html
+// resp. http://www.w3.org/pub/WWW/TR/WD-css1-960220.html
 
 // for CSS1. It's a direct implementation of the
 // described Lex grammar.
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 6250184f683b..6276bb9dd7ab 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -466,7 +466,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 bool m_bChkJumpMark : 1;  // maybe jump to predetermined mark
 bool m_bUpdateDocStat : 1;
 bool m_bFixSelectWidth : 1;   // Set new width of select?
-bool m_bFixSelectHeight : 1;  // Set new width of select?
+bool m_bFixSelectHeight : 1;  // Set new height of select?
 bool m_bTextArea : 1;
 // 24
 bool m_bSelect : 1;
commit fa73f774019e1c5a8e062d6fc1cf35a43e1a847c
Author: Michael Stahl 
Date:   Wed Apr 12 14:15:21 2017 +0200

hwpfilter: remove write-only variable

Change-Id: I03e29b1a3761fcafc70168b04d788dbf3e1584eb

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index b4bf35ec96e4..9d5a331be14b 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3676,7 +3676,6 @@ void HwpReader::makeFormula(TxtBox * hbox)
 {
 char mybuf[3000];
 HWPPara* pPar;
-CharShape *cshape = nullptr;
 
 int n, c, res;
  hchar dest[3];
@@ -3688,8 +3687,6 @@ void HwpReader::makeFormula(TxtBox * hbox)
 for( n = 0; n < pPar->nch && pPar->hhstr[n]->hh;
 n += pPar->hhstr[n]->WSize() )
 {
-if (!cshape)
-cshape = pPar->GetCharShape(n);
 if (l >= sizeof(mybuf)-7)
 break;
 res = hcharconv(pPar->hhstr[n]->hh, dest, UNICODE);
commit b6a4b9264c098218a3f59a0e37504b33a7281e60
Author: Michael Stahl 
Date:   Tue Apr 11 22:22:31 2017 +0200

fix typo @trhows

Change-Id: Ia57df88476b3dad0ed140d4f33a2cb813274376e

diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 539d6b9a5e7e..ad16fbd3f5af 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -126,13 +126,13 @@ protected:
 /// @throws css::beans::PropertyVetoException
 /// @throws css::lang::IllegalArgumentException
 /// @throws css::lang::WrappedTargetException
-/// @trhows css::uno::RuntimeException
+/// @throws css::uno::RuntimeException
 void SAL_CALL SetPropertyValues_Impl(
 const css::uno::Sequence< OUString >& aPropertyNames,
 const css::uno::Sequence< css::uno::Any >& aValues );
 /// @throws css::beans::UnknownPropertyException
 /// @throws css::lang::WrappedTargetException
-/// @trhows css::uno::RuntimeException
+/// @throws css::uno::RuntimeException
 css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl(
 const css::uno::Sequence< OUString >& aPropertyNames );
 
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 0523311d4228..984f0531f702 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -133,20 +133,20 @@ class DocumentFocusListener :
 std::set< uno::Reference< uno::XInterface > > m_aRefList;
 
 public:
-/// @trhows lang::IndexOutOfBoundsException
+/// @throws lang::IndexOutOfBoundsException
 /// @throws uno::RuntimeException
 void attachRecursive(
 const uno::Reference< accessibility::XAccessible >& xAccessible
 );
 
-/// @trhows lang::IndexOutOfBoundsException
+/// @throws lang::IndexOutOfBoundsException
 /// @throws uno::R

[Libreoffice-commits] online.git: loleaflet/dist wsd/FileServer.cpp

2017-04-12 Thread Pranav Kant 
 loleaflet/dist/loleaflet.html |7 ---
 wsd/FileServer.cpp|   10 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit b7eafb1e4a8da6fced02af395581475f0332c2a7
Author: Pranav Kant 
Date:   Wed Apr 12 19:23:35 2017 +0530

Move CSP to response headers from meta tag in html

Some older browsers don't have meta tag support for CSP. Lets put all of
the CSP in response headers to be compatible with oldies.

Change-Id: I7f0d7c294e492b3c69ebea6fbd820d6558b9c3b3

diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 8b3f794c..bfa9ad3e 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -3,13 +3,6 @@
 
 Online Editor
 
-

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

2017-04-12 Thread Caolán McNamara 
 hwpfilter/source/hpara.cxx |   34 +-
 hwpfilter/source/hpara.h   |4 ++--
 hwpfilter/source/hwpfile.cxx   |   13 ++---
 hwpfilter/source/hwpfile.h |4 ++--
 hwpfilter/source/hwpreader.cxx |6 +++---
 5 files changed, 26 insertions(+), 35 deletions(-)

New commits:
commit 4e175b7aee7c00c6d0d8449a19b26ebf25446b9d
Author: Caolán McNamara 
Date:   Sat Apr 8 21:04:45 2017 +0100

ofz#1062 ensure cshape lifecycle matches expectations

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

diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index 84294c59ed3c..3149d65acf0a 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -75,17 +75,16 @@ HWPPara::HWPPara()
 , etcflag(0)
 , ctrlflag(0)
 , pstyno(0)
+, cshape(new CharShape)
 , linfo(nullptr)
-, cshapep(nullptr)
 {
-memset(&cshape, 0, sizeof(cshape));
+memset(cshape.get(), 0, sizeof(cshape));
 memset(&pshape, 0, sizeof(pshape));
 }
 
 HWPPara::~HWPPara()
 {
 delete[] linfo;
-delete[] cshapep;
 }
 
 bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
@@ -102,18 +101,17 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 hwpf.Read4b(&ctrlflag, 1);
 hwpf.Read1b(&pstyno, 1);
 
-
 /* Paragraph representative character */
-cshape.Read(hwpf);
+cshape->Read(hwpf);
 if (nch > 0)
-hwpf.AddCharShape(&cshape);
+hwpf.AddCharShape(cshape);
 
 /* Paragraph paragraphs shape  */
 if (nch && !reuse_shape)
 {
 pshape.Read(hwpf);
-pshape.cshape = &cshape;
-  pshape.pagebreak = etcflag;
+pshape.cshape = cshape.get();
+pshape.pagebreak = etcflag;
 }
 
 linfo = ::comphelper::newArray_null(nline);
@@ -144,23 +142,19 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 
 if (contain_cshape)
 {
-cshapep = ::comphelper::newArray_null(nch);
-if (!cshapep)
-{
-perror("Memory Allocation: cshape\n");
-return false;
-}
-memset(cshapep, 0, nch * sizeof(CharShape));
+cshapep.resize(nch);
 
 for (ii = 0; ii < nch; ii++)
 {
+cshapep[ii].reset(new CharShape);
+memset(cshapep[ii].get(), 0, sizeof(CharShape));
 
 hwpf.Read1b(&same_cshape, 1);
 if (!same_cshape)
 {
-cshapep[ii].Read(hwpf);
+cshapep[ii]->Read(hwpf);
 if (nch > 1)
-hwpf.AddCharShape(&cshapep[ii]);
+hwpf.AddCharShape(cshapep[ii]);
 }
 else if (ii == 0)
 cshapep[ii] = cshape;
@@ -185,15 +179,13 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 return nch && !hwpf.State();
 }
 
-
 CharShape *HWPPara::GetCharShape(int pos)
 {
 if (contain_cshape == 0)
-return &cshape;
-return cshapep + pos;
+return cshape.get();
+return cshapep[pos].get();
 }
 
-
 std::unique_ptr HWPPara::readHBox(HWPFile & hwpf)
 {
 std::unique_ptr hbox;
diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h
index 6496eae80f70..b598c201b569 100644
--- a/hwpfilter/source/hpara.h
+++ b/hwpfilter/source/hpara.h
@@ -103,11 +103,11 @@ class DLLEXPORT HWPPara
  */
 unsigned long ctrlflag;
 unsigned char pstyno;
-CharShape cshape; /* When characters are all 
the same shape */
+std::shared_ptr cshape; /* When 
characters are all the same shape */
 ParaShape pshape; /* if reuse flag is 0, */
 
 LineInfo  *linfo;
-CharShape *cshapep;
+std::vector>   cshapep;
 /**
  * Box object list
  */
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index f0a9f4279c4f..929a783d0761 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -242,8 +242,8 @@ void HWPFile::ParaListRead()
 bool HWPFile::ReadParaList(std::list < HWPPara* > &aplist, unsigned char flag)
 {
 std::unique_ptr spNode( new HWPPara );
- unsigned char tmp_etcflag;
- unsigned char prev_etcflag = 0;
+unsigned char tmp_etcflag;
+unsigned char prev_etcflag = 0;
 while (spNode->Read(*this, flag))
 {
  if( !(spNode->etcflag & 0x04) ){
@@ -467,7 +467,7 @@ CharShape *HWPFile::getCharShape(int index)
 {
 if (index < 0 || static_cast(index) >= cslist.size())
 return nullptr;
-return cslist[index];
+return cslist[index].get();
 }
 
 FBoxStyle *HWPFile::getFBoxStyle(int index)
@@ -537,11 +537,10 @@ void HWPFile::AddParaShape(ParaShape * pshape)
 pshape->index = value;
 }
 
-
-void HWPFile::AddCharShape(CharShape * cshape)
+void HWPFile::AddCharShape(std::shared_ptr& cshape)
 {
-int

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

2017-04-12 Thread Caolán McNamara 
 hwpfilter/source/hpara.cxx |   34 +-
 hwpfilter/source/hpara.h   |4 ++--
 hwpfilter/source/hwpfile.cxx   |   13 ++---
 hwpfilter/source/hwpfile.h |4 ++--
 hwpfilter/source/hwpreader.cxx |6 +++---
 5 files changed, 26 insertions(+), 35 deletions(-)

New commits:
commit 2b71aab34ab8a422948448b4573e2a896fd887ac
Author: Caolán McNamara 
Date:   Sat Apr 8 21:04:45 2017 +0100

ofz#1062 ensure cshape lifecycle matches expectations

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

diff --git a/hwpfilter/source/hpara.cxx b/hwpfilter/source/hpara.cxx
index 84294c59ed3c..3149d65acf0a 100644
--- a/hwpfilter/source/hpara.cxx
+++ b/hwpfilter/source/hpara.cxx
@@ -75,17 +75,16 @@ HWPPara::HWPPara()
 , etcflag(0)
 , ctrlflag(0)
 , pstyno(0)
+, cshape(new CharShape)
 , linfo(nullptr)
-, cshapep(nullptr)
 {
-memset(&cshape, 0, sizeof(cshape));
+memset(cshape.get(), 0, sizeof(cshape));
 memset(&pshape, 0, sizeof(pshape));
 }
 
 HWPPara::~HWPPara()
 {
 delete[] linfo;
-delete[] cshapep;
 }
 
 bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
@@ -102,18 +101,17 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 hwpf.Read4b(&ctrlflag, 1);
 hwpf.Read1b(&pstyno, 1);
 
-
 /* Paragraph representative character */
-cshape.Read(hwpf);
+cshape->Read(hwpf);
 if (nch > 0)
-hwpf.AddCharShape(&cshape);
+hwpf.AddCharShape(cshape);
 
 /* Paragraph paragraphs shape  */
 if (nch && !reuse_shape)
 {
 pshape.Read(hwpf);
-pshape.cshape = &cshape;
-  pshape.pagebreak = etcflag;
+pshape.cshape = cshape.get();
+pshape.pagebreak = etcflag;
 }
 
 linfo = ::comphelper::newArray_null(nline);
@@ -144,23 +142,19 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 
 if (contain_cshape)
 {
-cshapep = ::comphelper::newArray_null(nch);
-if (!cshapep)
-{
-perror("Memory Allocation: cshape\n");
-return false;
-}
-memset(cshapep, 0, nch * sizeof(CharShape));
+cshapep.resize(nch);
 
 for (ii = 0; ii < nch; ii++)
 {
+cshapep[ii].reset(new CharShape);
+memset(cshapep[ii].get(), 0, sizeof(CharShape));
 
 hwpf.Read1b(&same_cshape, 1);
 if (!same_cshape)
 {
-cshapep[ii].Read(hwpf);
+cshapep[ii]->Read(hwpf);
 if (nch > 1)
-hwpf.AddCharShape(&cshapep[ii]);
+hwpf.AddCharShape(cshapep[ii]);
 }
 else if (ii == 0)
 cshapep[ii] = cshape;
@@ -185,15 +179,13 @@ bool HWPPara::Read(HWPFile & hwpf, unsigned char flag)
 return nch && !hwpf.State();
 }
 
-
 CharShape *HWPPara::GetCharShape(int pos)
 {
 if (contain_cshape == 0)
-return &cshape;
-return cshapep + pos;
+return cshape.get();
+return cshapep[pos].get();
 }
 
-
 std::unique_ptr HWPPara::readHBox(HWPFile & hwpf)
 {
 std::unique_ptr hbox;
diff --git a/hwpfilter/source/hpara.h b/hwpfilter/source/hpara.h
index 7f9f26efd18d..126a9ece1482 100644
--- a/hwpfilter/source/hpara.h
+++ b/hwpfilter/source/hpara.h
@@ -103,11 +103,11 @@ class DLLEXPORT HWPPara
  */
 unsigned long ctrlflag;
 unsigned char pstyno;
-CharShape cshape; /* When characters are all 
the same shape */
+std::shared_ptr cshape; /* When 
characters are all the same shape */
 ParaShape pshape; /* if reuse flag is 0, */
 
 LineInfo  *linfo;
-CharShape *cshapep;
+std::vector>   cshapep;
 /**
  * Box object list
  */
diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 9b3b54f1af76..5e4edc951145 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -247,8 +247,8 @@ void HWPFile::ParaListRead()
 bool HWPFile::ReadParaList(std::list < HWPPara* > &aplist, unsigned char flag)
 {
 std::unique_ptr spNode( new HWPPara );
- unsigned char tmp_etcflag;
- unsigned char prev_etcflag = 0;
+unsigned char tmp_etcflag;
+unsigned char prev_etcflag = 0;
 while (spNode->Read(*this, flag))
 {
  if( !(spNode->etcflag & 0x04) ){
@@ -472,7 +472,7 @@ CharShape *HWPFile::getCharShape(int index)
 {
 if (index < 0 || static_cast(index) >= cslist.size())
 return nullptr;
-return cslist[index];
+return cslist[index].get();
 }
 
 FBoxStyle *HWPFile::getFBoxStyle(int index)
@@ -542,11 +542,10 @@ void HWPFile::AddParaShape(ParaShape * pshape)
 pshape->index = value;
 }
 
-
-void HWPFile::AddCharShape(CharShape * cshape)
+void HWPFile::AddCharShape(std::shared_ptr& cshape)
 {
-

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

2017-04-12 Thread Jens Carl 
 sw/source/filter/html/parcss1.cxx |  172 ++
 1 file changed, 85 insertions(+), 87 deletions(-)

New commits:
commit 8b431b80d19794c08570bf8c0a1d9190807e1972
Author: Jens Carl 
Date:   Wed Apr 12 06:56:03 2017 +

tdf#39468 Translate German comments in sw

Translate German comments and terms in sw/source/filter/html/parcss1.cxx

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

diff --git a/sw/source/filter/html/parcss1.cxx 
b/sw/source/filter/html/parcss1.cxx
index 5554efdb943a..3285d0828bd9 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -26,9 +26,8 @@
 #include "css1kywd.hxx"
 #include "parcss1.hxx"
 
-// Loop-Check: Um Endlos-Schleifen zu vermeiden, wird in jeder
-// Schalife geprueft, ob ein Fortschritt in der Eingabe-Position
-// stattgefunden hat
+// Loop-Check: Used to avoid infinite loops, is checked after every
+// loop, if there is progress of the input position
 #define LOOP_CHECK
 
 #ifdef LOOP_CHECK
@@ -59,7 +58,7 @@ void CSS1Parser::InitRead( const OUString& rIn )
 nlLineNr = 0;
 nlLinePos = 0;
 
-bWhiteSpace = true; // Wenn noch nichts gelesen wurde ist das wie WS
+bWhiteSpace = true; // if nothing was read it's like there was WS
 bEOF = false;
 eState = CSS1_PAR_WORKING;
 nValue = 0.;
@@ -92,13 +91,13 @@ sal_Unicode CSS1Parser::GetNextChar()
 return c;
 }
 
-// Diese Funktion realisiert den in
+// This function implements the scanner described in
 
-//  http://www.w3.orh/pub/WWW/TR/WD-css1.html
-// bzw. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
+//   http://www.w3.orh/pub/WWW/TR/WD-css1.html
+// resp. http://www.w3.orh/pub/WWW/TR/WD-css1-960220.html
 
-// beschriebenen Scanner fuer CSS1. Es handelt sich um eine direkte
-// Umsetzung der dort beschriebenen Lex-Grammatik
+// for CSS1. It's a direct implementation of the
+// described Lex grammar.
 
 CSS1Token CSS1Parser::GetNextToken()
 {
@@ -106,7 +105,7 @@ CSS1Token CSS1Parser::GetNextToken()
 aToken.clear();
 
 do {
-// Merken, ob davor White-Space gelesen wurde
+// remember if white space was read
 bool bPrevWhiteSpace = bWhiteSpace;
 bWhiteSpace = false;
 
@@ -142,7 +141,7 @@ CSS1Token CSS1Parser::GetNextToken()
 cNextCh = GetNextChar();
 if (rtl::isAsciiAlpha(cNextCh))
 {
-// den naechsten Identifer scannen
+// scan the next identifier
 OUStringBuffer sTmpBuffer(32);
 do {
 sTmpBuffer.append( cNextCh );
@@ -152,7 +151,7 @@ CSS1Token CSS1Parser::GetNextToken()
 
 aToken += sTmpBuffer.makeStringAndClear();
 
-// und schauen, ob wir ihn kennen
+// check if we know it
 switch( aToken[0] )
 {
 case 'i':
@@ -167,9 +166,8 @@ CSS1Token CSS1Parser::GetNextToken()
 break;
 }
 
-// Fehlerbehandlung: '@ident' und alles bis
-// zu einem Semikolon der dem Ende des folgenden
-// Blocks ignorieren
+// error handling: ignore '@indent' and the rest until
+// semicolon at end of the next block
 if( CSS1_NULL==nRet )
 {
 aToken.clear();
@@ -225,7 +223,7 @@ CSS1Token CSS1Parser::GetNextToken()
 
 case '!': // '!' 'legal' | '!' 'important' | syntax error
 {
-// White Space ueberlesen
+// ignore white space
 cNextCh = GetNextChar();
 while( ( ' ' == cNextCh ||
(cNextCh >= 0x09 && cNextCh <= 0x0d) ) && !IsEOF() )
@@ -236,7 +234,7 @@ CSS1Token CSS1Parser::GetNextToken()
 
 if( 'i'==cNextCh || 'I'==cNextCh)
 {
-// den naechsten Identifer scannen
+// scan next identifier
 OUStringBuffer sTmpBuffer(32);
 do {
 sTmpBuffer.append( cNextCh );
@@ -254,7 +252,7 @@ CSS1Token CSS1Parser::GetNextToken()
 }
 else
 {
-// Fehlerbehandlung: '!' ignorieren, IDENT nicht
+// error handling: ignore '!', not IDENT
 nRet = CSS1_IDENT;
 }
 
@@ -263,7 +261,7 @@ CSS1Token CSS1Parser::GetNextToken()
 }
 else
 {
-// Fehlerbehandlung: '!' ignorieren
+// error handling: ignore '!'
 bNextCh = false;
 }

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

2017-04-12 Thread Caolán McNamara 
 sw/UIConfig_swriter.mk |1 
 sw/inc/cmdid.h |4 
 sw/inc/swcommands.h|3 
 sw/source/ui/app/mn.src|   23 
 sw/source/uibase/docvw/HeaderFooterWin.cxx |  138 +
 sw/source/uibase/inc/HeaderFooterWin.hxx   |5 -
 sw/source/uibase/inc/popup.hrc |3 
 sw/uiconfig/swriter/ui/headerfootermenu.ui |   31 ++
 8 files changed, 101 insertions(+), 107 deletions(-)

New commits:
commit d74689c15170b5bad3e2230b4ea99bb1d9dd1e60
Author: Caolán McNamara 
Date:   Wed Apr 12 14:30:36 2017 +0100

convert header/footer menu to .ui

Change-Id: Ia1aed81bfd806fbca78acc3b23886056a23ade4d

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 81d073621edd..66e19966b996 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -149,6 +149,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/frmtypepage \
sw/uiconfig/swriter/ui/frmurlpage \
sw/uiconfig/swriter/ui/gotopagedialog \
+   sw/uiconfig/swriter/ui/headerfootermenu \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/inputwinmenu \
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 9e718b820487..0b2662a3089d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -711,10 +711,6 @@
 #define FN_REPLY(FN_NOTES+7)
 #define FN_FORMAT_ALL_NOTES (FN_NOTES+8)
 
-#define FN_HEADERFOOTER_EDIT(FN_HEADERFOOTER+1)
-#define FN_HEADERFOOTER_DELETE  (FN_HEADERFOOTER+2)
-#define FN_HEADERFOOTER_BORDERBACK  (FN_HEADERFOOTER+3)
-
 // Region: Parameter
 #define FN_PARAM_MOVE_COUNT (FN_PARAM+2)
 #define FN_PARAM_MOVE_SELECTION (FN_PARAM+3)
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index d1ad3e7a5ba4..e726c818344e 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -32,9 +32,6 @@
 #define CMD_FN_REDLINE_REJECT_DIRECT".uno:RejectTrackedChange"
 #define CMD_FN_REDLINE_NEXT_CHANGE  ".uno:NextTrackedChange"
 #define CMD_FN_REDLINE_PREV_CHANGE  
".uno:PreviousTrackedChange"
-#define CMD_FN_HEADERFOOTER_EDIT".uno:HeaderFooterEdit"
-#define CMD_FN_HEADERFOOTER_DELETE  ".uno:HeaderFooterDelete"
-#define CMD_FN_HEADERFOOTER_BORDERBACK  
".uno:HeaderFooterBorderBackground"
 
 #endif
 
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index fe71b4d08838..984e7ebf55b7 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -89,27 +89,4 @@ Menu MN_ANNOTATION_BUTTON
 };
 };
 
-Menu MN_HEADERFOOTER_BUTTON
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = FN_HEADERFOOTER_EDIT ;
-HelpID = CMD_FN_HEADERFOOTER_EDIT ;
-};
-MenuItem
-{
-Identifier = FN_HEADERFOOTER_BORDERBACK ;
-HelpID = CMD_FN_HEADERFOOTER_BORDERBACK ;
-Text [ en-US ] = "Border and Background..." ;
-};
-MenuItem
-{
-Identifier = FN_HEADERFOOTER_DELETE ;
-HelpID = CMD_FN_HEADERFOOTER_DELETE ;
-};
-};
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx 
b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index f686d8c4fc04..85e2836ab08e 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -126,8 +126,9 @@ namespace
 
 SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin, const SwFrame 
*pFrame, bool bHeader ) :
 SwFrameMenuButtonBase( pEditWin, pFrame ),
+m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), 
"modules/swriter/ui/headerfootermenu.ui", ""),
 m_bIsHeader( bHeader ),
-m_pPopupMenu( nullptr ),
+m_pPopupMenu(m_aBuilder.get_menu("menu")),
 m_pLine( nullptr ),
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
@@ -143,19 +144,17 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* 
pEditWin, const SwFrame *pFrame
 m_pLine = VclPtr::Create(GetEditWin(), 
&SwViewOption::GetHeaderFooterMarkColor);
 m_pLine->SetZOrder(this, ZOrderFlags::Before);
 
-// Create and set the PopupMenu
-m_pPopupMenu = VclPtr::Create(SW_RES(MN_HEADERFOOTER_BUTTON));
-
+// set the PopupMenu
 // Rewrite the menu entries' text
 if (m_bIsHeader)
 {
-m_pPopupMenu->SetItemText(FN_HEADERFOOTER_EDIT, 
SW_RESSTR(STR_FORMAT_HEADER));
-m_pPopupMenu->SetItemText(FN_HEADERFOOTER_DELETE, 
SW_RESSTR(STR_DELETE_HEADER));
+m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("edit"), 
SW_RESSTR(STR_FORMAT_HEADER));
+m_pPopupMenu->SetItemText(m_pPopupMenu->GetItemId("delete"), 
SW_RESSTR(STR_DELETE_HEADER));
 }
 else
 {
-m_pPopupMenu->SetItemText(FN_HEADERFOOTER_EDIT, 
SW_RESSTR(STR_FORMAT_FOOT

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

2017-04-12 Thread Noel Grandin 
 include/oox/ole/axbinarywriter.hxx   |2 +-
 include/oox/ole/axfontdata.hxx   |8 
 oox/source/ole/axcontrol.cxx |   14 +++---
 oox/source/ole/axfontdata.cxx|   10 ++
 sc/source/filter/oox/drawingfragment.cxx |8 
 5 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 4f55dfb564e56515b6ebb4d10b089f67ad628fb6
Author: Noel Grandin 
Date:   Wed Apr 12 13:24:09 2017 +0200

convert AX_FONTDATA constants to scoped enum

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

diff --git a/include/oox/ole/axbinarywriter.hxx 
b/include/oox/ole/axbinarywriter.hxx
index d1fe1a23fcea..c8b1bdb29158 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -85,7 +85,7 @@ public:
 /** Write an integer property value to the stream, the
 respective flag in the property mask is set. */
 template< typename StreamType, typename DataType >
-voidwriteIntProperty( DataType& ornValue )
+voidwriteIntProperty( DataType ornValue )
 { if( startNextProperty() ) 
maOutStrm.writeAligned< StreamType >( ornValue ); }
 /** Write a boolean property value to the stream, the
 respective flag in the property mask is set. */
diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx
index 3e01af488da4..c255747357fa 100644
--- a/include/oox/ole/axfontdata.hxx
+++ b/include/oox/ole/axfontdata.hxx
@@ -39,9 +39,9 @@ const sal_uInt32 AX_FONTDATA_STRIKEOUT  = 0x0008;
 const sal_uInt32 AX_FONTDATA_DISABLED   = 0x2000;
 const sal_uInt32 AX_FONTDATA_AUTOCOLOR  = 0x4000;
 
-const sal_Int32 AX_FONTDATA_LEFT= 1;
-const sal_Int32 AX_FONTDATA_RIGHT   = 2;
-const sal_Int32 AX_FONTDATA_CENTER  = 3;
+enum class AxHorizontalAlign {
+Left = 1, Right = 2, Center = 3
+};
 
 /** All entries of a font property. */
 struct OOX_DLLPUBLIC AxFontData
@@ -50,7 +50,7 @@ struct OOX_DLLPUBLIC AxFontData
 sal_uInt32  mnFontEffects;  ///< Font effect flags.
 sal_Int32   mnFontHeight;   ///< Height of the font (not 
really twips, see code).
 sal_Int32   mnFontCharSet;  ///< Windows character set of the 
font.
-sal_Int32   mnHorAlign; ///< Horizontal text alignment.
+AxHorizontalAlign   mnHorAlign; ///< Horizontal text alignment.
 boolmbDblUnderline; ///< True = double underline style 
(legacy VML drawing controls only).
 
 explicitAxFontData();
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 889c7ad7ae05..283c0e48dc61 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -854,7 +854,7 @@ void AxFontDataModel::importProperty( sal_Int32 nPropId, 
const OUString& rValue
 case XML_FontEffects:   maFontData.mnFontEffects = 
AttributeConversion::decodeUnsigned( rValue );   break;
 case XML_FontHeight:maFontData.mnFontHeight = 
AttributeConversion::decodeInteger( rValue ); break;
 case XML_FontCharSet:   maFontData.mnFontCharSet = 
AttributeConversion::decodeInteger( rValue );break;
-case XML_ParagraphAlign:maFontData.mnHorAlign = 
AttributeConversion::decodeInteger( rValue );   break;
+case XML_ParagraphAlign:maFontData.mnHorAlign = 
static_cast(AttributeConversion::decodeInteger( rValue )); 
break;
 default:AxControlModelBase::importProperty( 
nPropId, rValue );
 }
 }
@@ -894,9 +894,9 @@ void AxFontDataModel::convertProperties( PropertyMap& 
rPropMap, const ControlCon
 sal_Int32 nAlign = awt::TextAlign::LEFT;
 switch( maFontData.mnHorAlign )
 {
-case AX_FONTDATA_LEFT:  nAlign = awt::TextAlign::LEFT;   break;
-case AX_FONTDATA_RIGHT: nAlign = awt::TextAlign::RIGHT;  break;
-case AX_FONTDATA_CENTER:nAlign = awt::TextAlign::CENTER; break;
+case AxHorizontalAlign::Left:  nAlign = awt::TextAlign::LEFT;  
 break;
+case AxHorizontalAlign::Right: nAlign = awt::TextAlign::RIGHT; 
 break;
+case AxHorizontalAlign::Center:nAlign = 
awt::TextAlign::CENTER; break;
 default:OSL_FAIL( "AxFontDataModel::convertProperties - 
unknown text alignment" );
 }
 // form controls expect short value
@@ -934,9 +934,9 @@ void AxFontDataModel::convertFromProperties( PropertySet& 
rPropSet, const Contro
 {
 switch ( nAlign )
 {
-case awt::TextAlign::LEFT: maFontData.mnHorAlign = 
AX_FONTDATA_LEFT;   break;
-case awt::TextAlign::RIGHT: maFontData.mnHorAlign = 
AX_FONTDATA_RIGHT;  break;
-case awt::TextAlign::CENTER: maF

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

2017-04-12 Thread Caolán McNamara 
 vcl/source/window/dialog.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3e4e13300db6a0c2c60dbe733d96ff5a7b0d32e5
Author: Caolán McNamara 
Date:   Wed Apr 12 10:45:35 2017 +0100

infinite SetDefaultSize->SetPosSize->SetDefaultSize

https://retrace.fedoraproject.org/faf/reports/1278627/

presumably the 'optimal' starting size hits the invalid size path
causing another attempt usin the optimal size, so force a valid
initial fallback size

Change-Id: I6c38ee5e1b90ce41a4550c8a8370e791f5c351b0
(cherry picked from commit 4930acb18bbd145fd995084cd95e3e9d631424ed)
Reviewed-on: https://gerrit.libreoffice.org/36453
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index eef4c5ab5018..bff1f27a9613 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -662,7 +662,8 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
 else
 h -= 100;
 
-return Size(w, h);
+return Size(std::max(w, 640 - 15),
+std::max(h, 480 - 50));
 }
 
 void Dialog::StateChanged( StateChangedType nType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Jens Carl 
 sw/source/filter/html/htmlftn.cxx |   16 +-
 sw/source/filter/html/swhtml.hxx  |  275 ++
 2 files changed, 143 insertions(+), 148 deletions(-)

New commits:
commit ec366658fcad31165ec6771b397f50cd9a2ffc2c
Author: Jens Carl 
Date:   Wed Apr 12 04:50:01 2017 +

tdf#39468 Translate German comments in sw

Translate German comments and terms in sw

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

diff --git a/sw/source/filter/html/htmlftn.cxx 
b/sw/source/filter/html/htmlftn.cxx
index a3b66b8518d8..9f2fea2a1743 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -208,7 +208,7 @@ void SwHTMLParser::FinishFootEndNote()
 SwTextFootnote * const pTextFootnote = static_cast(
 m_pPam->GetNode().GetTextNode()->GetTextAttrForCharAt(
 m_pPam->GetPoint()->nContent.GetIndex() - 1, RES_TXTATR_FTN ) );
-// In Kopf- und Fusszeilen duerfen keine Fussnoten eingefuegt werden.
+// In header and footer no footnotes can be inserted.
 if( pTextFootnote )
 {
 m_pFootEndNoteImpl->aTextFootnotes.push_back( pTextFootnote );
@@ -359,12 +359,12 @@ void SwHTMLWriter::OutFootEndNotes()
 Strm().WriteCharPtr( "\">" );
 
 m_bLFPossible = true;
-IncIndentLevel();   // Inhalt von  einruecken
+IncIndentLevel();   // indent content of 
 
-OSL_ENSURE( pTextFootnote, "SwHTMLWriter::OutFootEndNotes: 
SwTextFootnote fehlt" );
+OSL_ENSURE( pTextFootnote, "SwHTMLWriter::OutFootEndNotes: 
SwTextFootnote is missing" );
 SwNodeIndex *pSttNdIdx = pTextFootnote->GetStartNode();
 OSL_ENSURE( pSttNdIdx,
-"SwHTMLWriter::OutFootEndNotes: StartNode-Index fehlt" );
+"SwHTMLWriter::OutFootEndNotes: StartNode-Index is missing" );
 if( pSttNdIdx )
 {
 HTMLSaveData aSaveData( *this, pSttNdIdx->GetIndex()+1,
@@ -372,14 +372,14 @@ void SwHTMLWriter::OutFootEndNotes()
 Out_SwDoc( pCurPam );
 }
 
-DecIndentLevel();   // Inhalt von  einruecken
+DecIndentLevel();   // indent content of 
 if( m_bLFPossible )
 OutNewLine();
 HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, 
false );
 m_bLFPossible = true;
 
 OSL_ENSURE( !m_pFormatFootnote,
-"SwHTMLWriter::OutFootEndNotes: Footnote wurde nicht 
ausgegeben" );
+"SwHTMLWriter::OutFootEndNotes: Footnote was not output" );
 if( m_pFormatFootnote )
 {
 if( m_pFormatFootnote->IsEndNote() )
@@ -393,9 +393,9 @@ void SwHTMLWriter::OutFootEndNotes()
 
 #if OSL_DEBUG_LEVEL > 0
 OSL_ENSURE( nFootnote == m_nFootNote,
-"SwHTMLWriter::OutFootEndNotes: Anzahl Fussnoten stimmt nicht" );
+"SwHTMLWriter::OutFootEndNotes: Number of footnotes does not 
match" );
 OSL_ENSURE( nEn == m_nEndNote,
-"SwHTMLWriter::OutFootEndNotes: Anzahl Endnoten stimmt nicht" );
+"SwHTMLWriter::OutFootEndNotes: Number of endnotes does not match" 
);
 #endif
 
 delete m_pFootEndNotes;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 4dfbd786622c..6250184f683b 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -60,12 +60,12 @@ struct ImplSVEvent;
 #define HTML_DFLT_IMG_WIDTH (MM50*4)
 #define HTML_DFLT_IMG_HEIGHT (MM50*2)
 
-// ein par Sachen, die man oefter mal braucht
+// some things you often need
 extern HTMLOptionEnum aHTMLPAlignTable[];
 extern HTMLOptionEnum aHTMLImgHAlignTable[];
 extern HTMLOptionEnum aHTMLImgVAlignTable[];
 
-// der Attribut Stack:
+// attribute stack:
 
 class HTMLAttr;
 typedef std::deque HTMLAttrs;
@@ -78,13 +78,13 @@ class HTMLAttr
 SwNodeIndex nSttPara, nEndPara;
 sal_Int32 nSttContent, nEndContent;
 bool bInsAtStart : 1;
-bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen
-bool bValid : 1;// ist das Attribut gueltig?
+bool bLikePara : 1; // set attribute above the whole paragraph
+bool bValid : 1;// is the attribute valid?
 
 std::unique_ptr pItem;
-HTMLAttr *pNext;   // noch zu schliessene Attrs mit unterschiedl. Werten
-HTMLAttr *pPrev;   // bereits geschlossene aber noch nicht gesetze Attrs
-HTMLAttr **ppHead; // der Listenkopf
+HTMLAttr *pNext;   // still to close attributes with different values
+HTMLAttr *pPrev;   // already closed but not set attributes
+HTMLAttr **ppHead; // list head
 
 HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem,
HTMLAttr **pHd=nullptr );
@@ -125,26 +125,25 @@ public:
 
 void SetHead( HTMLAttr **ppHd ) { ppHead = ppHd; }
 
-// Beim Setzen von Attributen aus Vorlagen kann es passieren,
-// dass Attribute doch nicht

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

2017-04-12 Thread Caolán McNamara 
 sw/UIConfig_swriter.mk  |1 
 sw/inc/cmdid.h  |3 
 sw/inc/swcommands.h |2 
 sw/source/ui/app/mn.src |   19 
 sw/source/uibase/docvw/PageBreakWin.cxx |  148 +++-
 sw/source/uibase/inc/PageBreakWin.hxx   |3 
 sw/source/uibase/inc/popup.hrc  |3 
 sw/uiconfig/swriter/ui/pagebreakmenu.ui |   25 +
 8 files changed, 102 insertions(+), 102 deletions(-)

New commits:
commit 2fccbd4dea4d3570f1a9c5987bc1904f9211c27c
Author: Caolán McNamara 
Date:   Wed Apr 12 14:01:10 2017 +0100

convert annotation page break menu to .ui

Change-Id: I822029c8fe2dc8ae0a0f52091375d79c0784b7ce

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 41fed854c5d4..81d073621edd 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -211,6 +211,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/notebookbar \
sw/uiconfig/swriter/ui/notebookbar_groups \
sw/uiconfig/swriter/ui/notebookbar_single \
+   sw/uiconfig/swriter/ui/pagebreakmenu \
sw/uiconfig/swriter/ui/pagecolumncontrol \
sw/uiconfig/swriter/ui/pagemargincontrol \
sw/uiconfig/swriter/ui/pageorientationcontrol \
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 74ac12b2c4a6..9e718b820487 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -715,9 +715,6 @@
 #define FN_HEADERFOOTER_DELETE  (FN_HEADERFOOTER+2)
 #define FN_HEADERFOOTER_BORDERBACK  (FN_HEADERFOOTER+3)
 
-#define FN_PAGEBREAK_EDIT   (FN_PAGEBREAK+1)
-#define FN_PAGEBREAK_DELETE (FN_PAGEBREAK+2)
-
 // Region: Parameter
 #define FN_PARAM_MOVE_COUNT (FN_PARAM+2)
 #define FN_PARAM_MOVE_SELECTION (FN_PARAM+3)
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index fdcff077d38f..d1ad3e7a5ba4 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -35,8 +35,6 @@
 #define CMD_FN_HEADERFOOTER_EDIT".uno:HeaderFooterEdit"
 #define CMD_FN_HEADERFOOTER_DELETE  ".uno:HeaderFooterDelete"
 #define CMD_FN_HEADERFOOTER_BORDERBACK  
".uno:HeaderFooterBorderBackground"
-#define CMD_FN_PAGEBREAK_EDIT   ".uno:PageBreakEdit"
-#define CMD_FN_PAGEBREAK_DELETE ".uno:PageBreakDelete"
 
 #endif
 
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index d6dac73f716d..fe71b4d08838 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -112,23 +112,4 @@ Menu MN_HEADERFOOTER_BUTTON
 };
 };
 
-Menu MN_PAGEBREAK_BUTTON
-{
-ItemList =
-{
-MenuItem
-{
-Identifier = FN_PAGEBREAK_EDIT ;
-HelpID = CMD_FN_PAGEBREAK_EDIT ;
-Text [ en-US ] = "Edit Page Break..." ;
-};
-MenuItem
-{
-Identifier = FN_PAGEBREAK_DELETE ;
-HelpID = CMD_FN_PAGEBREAK_DELETE ;
-Text [ en-US ] = "Delete Page Break" ;
-};
-};
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx 
b/sw/source/uibase/docvw/PageBreakWin.cxx
index dcf4b0801088..10b91718b756 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -93,7 +93,8 @@ namespace
 
 SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwFrame *pFrame ) :
 SwFrameMenuButtonBase( pEditWin, pFrame ),
-m_pPopupMenu( nullptr ),
+m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), 
"modules/swriter/ui/pagebreakmenu.ui", ""),
+m_pPopupMenu(m_aBuilder.get_menu("menu")),
 m_pLine( nullptr ),
 m_bIsAppearing( false ),
 m_nFadeRate( 100 ),
@@ -107,10 +108,9 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const 
SwFrame *pFrame ) :
 // Create the line control
 m_pLine = VclPtr::Create( GetEditWin(), 
&SwViewOption::GetPageBreakColor, this );
 
-// Create the popup menu
-m_pPopupMenu = VclPtr::Create( SW_RES( MN_PAGEBREAK_BUTTON ) );
+// Set the popup menu
 m_pPopupMenu->SetDeactivateHdl( LINK( this, SwPageBreakWin, HideHandler ) 
);
-SetPopupMenu( m_pPopupMenu );
+SetPopupMenu(m_pPopupMenu);
 
 m_aFadeTimer.SetTimeout( 50 );
 m_aFadeTimer.SetInvokeHandler( LINK( this, SwPageBreakWin, FadeHandler ) );
@@ -127,7 +127,9 @@ void SwPageBreakWin::dispose()
 m_aFadeTimer.Stop();
 
 m_pLine.disposeAndClear();
-m_pPopupMenu.disposeAndClear();
+m_pPopupMenu.clear();
+m_aBuilder.disposeBuilder();
+
 delete m_pMousePt;
 m_pMousePt = nullptr;
 
@@ -214,88 +216,84 @@ void SwPageBreakWin::Paint(vcl::RenderContext& 
rRenderContext, const ::tools::Re
 pProcessor->process(aGhostedSeq);
 }
 
-void SwPageBreakWin::Select( )
+void SwPageBreakWin::Select()
 {
 SwFrameControlPtr pThis = GetEditWin()->GetFrameControlsManager( 
).GetControl( PageBreak, GetFrame() );
 
-switch( GetCurItemId( ) )
+OS

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

2017-04-12 Thread Noel Grandin 
 sw/inc/tblsel.hxx |   32 +---
 sw/source/core/crsr/trvltbl.cxx   |4 ++--
 sw/source/core/docnode/ndtbl.cxx  |   12 ++--
 sw/source/core/docnode/ndtbl1.cxx |2 +-
 sw/source/core/frmedt/fetab.cxx   |   10 +-
 sw/source/core/frmedt/tblsel.cxx  |   34 +-
 sw/source/uibase/shells/tabsh.cxx |4 ++--
 7 files changed, 50 insertions(+), 48 deletions(-)

New commits:
commit b79d297f4be32aa15c599ad6c1cd77580856
Author: Noel Grandin 
Date:   Wed Apr 12 12:35:05 2017 +0200

convert SwTableSearchType to o3tl::typed_flags

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

diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index c06770e0be9d..295cd2da21c1 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -58,28 +58,30 @@ class SwSelBoxes : public o3tl::sorted_vector {}
 // Selection gets extended in given direction according to enum-parameter.
 // Boxes are collected via the Layout; works correctly if tables are split.
 // (Cf. MakeSelUnions().)
-typedef sal_uInt16 SwTableSearchType;
-namespace nsSwTableSearchType
+enum class SwTableSearchType : sal_uInt16
 {
-const SwTableSearchType TBLSEARCH_NONE = 0x1;   // No extension.
-const SwTableSearchType TBLSEARCH_ROW  = 0x2;   // Extend to rows.
-const SwTableSearchType TBLSEARCH_COL  = 0x3;   // Extend to columns.
+NONE   = 0x01, // No extension.
+Row= 0x02, // Extend to rows.
+Col= 0x03, // Extend to columns.
 
-// As flag to the other values!
-const SwTableSearchType TBLSEARCH_PROTECT = 0x8;  // Collect protected 
boxes too.
-const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not 
correct collected Union.
+// As flags to the other values!
+Protect= 0x08, // Collect protected boxes too.
+NoUnionCorrect = 0x10, // Do not correct collected Union.
+};
+namespace o3tl {
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 SW_DLLPUBLIC void GetTableSel( const SwCursorShell& rShell, SwSelBoxes& rBoxes,
-const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE 
);
+const SwTableSearchType = SwTableSearchType::NONE );
 
 void GetTableSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
-const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE 
);
+const SwTableSearchType = SwTableSearchType::NONE );
 
 // As before, but don't start from selection but from Start- EndFrames.
 void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd,
 SwSelBoxes& rBoxes, SwCellFrames* pCells,
-const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE 
);
+const SwTableSearchType = SwTableSearchType::NONE );
 
 // As before but directly via PaMs.
 void GetTableSelCrs( const SwCursorShell& rShell, SwSelBoxes& rBoxes );
@@ -114,9 +116,9 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
 
 // Check if Split or InsertCol lead to a box becoming smaller than MINLAY.
 bool CheckSplitCells( const SwCursorShell& rShell, sal_uInt16 nDiv,
-const SwTableSearchType = 
nsSwTableSearchType::TBLSEARCH_NONE );
+const SwTableSearchType = SwTableSearchType::NONE );
 bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv,
-const SwTableSearchType = 
nsSwTableSearchType::TBLSEARCH_NONE );
+const SwTableSearchType = SwTableSearchType::NONE );
 
 // For working on tab selection also for split tables.
 class SwSelUnion
@@ -140,11 +142,11 @@ typedef std::vector SwSelUnions;
 
 // Gets the tables involved in a table selection and the union-rectangles of 
the selections
 // - also for split tables.
-// If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE
+// If a parameter is passed that != SwTableSearchType::NONE
 // the selection is extended in the given direction.
 void MakeSelUnions( SwSelUnions&, const SwLayoutFrame *pStart,
 const SwLayoutFrame *pEnd,
-const SwTableSearchType = 
nsSwTableSearchType::TBLSEARCH_NONE );
+const SwTableSearchType = SwTableSearchType::NONE );
 
 // These classes copy the current table selections (rBoxes) into a
 // separate structure while keeping the table structure.
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 472c2766a782..70b4000c46e8 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -146,11 +146,11 @@ bool SwCursorShell::SelTableRowOrCol( bool bRow, bool 
bRowSimple )
 
 // search box based on layout
 SwSelBoxes aBoxes;
-SwTableSearchType eType = bRow ? nsSwTableSearchType::TBLSEARCH_ROW : 
nsSwTableSearchType::TBLSEARCH

[Libreoffice-commits] online.git: loleaflet/src

2017-04-12 Thread Jan Holesovsky 
 loleaflet/src/map/Map.js |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f5a69785de65d8cf48f2b93e64e7c41a4a374a72
Author: Jan Holesovsky 
Date:   Wed Apr 12 14:39:15 2017 +0200

_initialCenter is now unused.

Change-Id: Ie9442168bc6075574b6d83bf0558b0c4983b2361

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index fcb75e27..8d153a67 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -313,7 +313,6 @@ L.Map = L.Evented.extend({
 
var oldSize = this.getSize();
this._sizeChanged = true;
-   this._initialCenter = null;
 
var newSize = this.getSize(),
oldCenter = oldSize.divideBy(2).round(),
@@ -698,7 +697,6 @@ L.Map = L.Evented.extend({
}
 
this._zoom = zoom;
-   this._initialCenter = center;
 
if (!preserveMapOffset) {
L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/src

2017-04-12 Thread Pranav Kant 
 loleaflet/src/map/Map.js |6 --
 1 file changed, 6 deletions(-)

New commits:
commit cc4de7c1375e7b55b03154dcfb79b70a9b721d03
Author: Pranav Kant 
Date:   Wed Apr 12 16:33:51 2017 +0530

loleaflet: Grid/selection/caret is sometimes displaced

This is actually not a displaced cursor, but displaced tiles map pane.
It happens when the user refreshes the the document page and
before the document finishes loading, switches to some other tab and
then get back to the document when the document load finishes. In such
circumstances, due to browsers not emitting the 'resize' event (probably
because it didn't have the focus when the map loaded) we return
incorrect/unexpected map center. Because 'resize' event sets 
this._initialCenter to
null, so map.getCenter() never returns this._initialCenter and instead
return this.layerPointToLatLng(this._getCenterLayerPoint()) which seems
to be the correct thing to return here.

The reason that the displaced cursor is not
observed when user doesn't switch to other tabs is because of the
browsers emitting the 'resize' event before we set the map transforms.
Nevertheless, in some circumstances it is quite possible that this
event, 'resize', is processed after we set the transforms even though
user hasn't switched the tabs but probability of this is very less which
justifies this bug's hard-to-reproduce nature when user doesn't change
the tabs.

Instead of making sure that 'resize' event is triggered before we set
the transforms, removing this block of code that returns unexpected
return value (which we never seem to use anywhere anyhow) seems more
sensible thing to do.

Change-Id: Iff532a902e6100be7f39c204cbf2f28f1a7f6a49
Reviewed-on: https://gerrit.libreoffice.org/36458
Reviewed-by: pranavk 
Tested-by: pranavk 
(cherry picked from commit 336ac4d6d1f41232fb315e76db9e831f421ea5f0)

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 4b7e2c39..8d153a67 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -313,7 +313,6 @@ L.Map = L.Evented.extend({
 
var oldSize = this.getSize();
this._sizeChanged = true;
-   this._initialCenter = null;
 
var newSize = this.getSize(),
oldCenter = oldSize.divideBy(2).round(),
@@ -427,10 +426,6 @@ L.Map = L.Evented.extend({
 
getCenter: function () { // (Boolean) -> LatLng
this._checkIfLoaded();
-
-   if (this._initialCenter && !this._moved()) {
-   return this._initialCenter;
-   }
return this.layerPointToLatLng(this._getCenterLayerPoint());
},
 
@@ -702,7 +697,6 @@ L.Map = L.Evented.extend({
}
 
this._zoom = zoom;
-   this._initialCenter = center;
 
if (!preserveMapOffset) {
L.DomUtil.setPosition(this._mapPane, new L.Point(0, 0));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Miklos Vajna 
 sw/qa/extras/ooxmlexport/data/tdf106690.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |9 
 writerfilter/source/dmapper/DomainMapper.cxx  |7 ---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   45 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 ++
 5 files changed, 59 insertions(+), 7 deletions(-)

New commits:
commit 776839b8bfc6eed905ce97c6fe32af8deb8d1451
Author: Miklos Vajna 
Date:   Tue Apr 4 09:12:34 2017 +0200

tdf#106690 DOCX import: fix automatic spacing before/after numbered para 
block

The context is text nodes with automatic before/after spacing and
numbering rules set, like:

A
* B
* C
* D
E

The correct behavior seems to be (though I haven't found this explicitly
written in the OOXML spec) to drop spacing between B and C and C and D,
but not before B and not after D. Originally no spacing was dropped,
then commit c486e875de7c8e845594f5043a37ee8800865782 (tdf#95031 DOCX
import: auto spacing inside numbering means no spacing, 2016-10-18)
removed spacing around all B/C/D.

Fix the problem by checking the numbering rules and automatic after
spacing of the previous paragraph, so spacing before B and after D is
not removed.

Change-Id: Icbdb36e31057ab0e8ac033888cf5cc7c52dad5d0
Reviewed-on: https://gerrit.libreoffice.org/36062
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 1bf7f6a1a50ee9f24a3687240fe6ae390b905a6b)
Reviewed-on: https://gerrit.libreoffice.org/36142
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf106690.docx 
b/sw/qa/extras/ooxmlexport/data/tdf106690.docx
new file mode 100644
index ..b233ef81c6cf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf106690.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 786074a40849..e48f51824749 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -49,6 +49,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95031, "tdf95031.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(getParagraph(3), "ParaTopMargin"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf106690, "tdf106690.docx")
+{
+// This was 0, numbering rules with automatic spacing meant 0
+// before/autospacing for all text nodes, even for ones at the start/end of
+// a numbered text node block.
+CPPUNIT_ASSERT_EQUAL(static_cast(494), 
getProperty(getParagraph(2), "ParaBottomMargin"));
+CPPUNIT_ASSERT_EQUAL(static_cast(494), 
getProperty(getParagraph(2), "ParaTopMargin"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf89377, 
"tdf89377_tableWithBreakBeforeParaStyle.docx")
 {
 // the paragraph style should set table's text-flow break-before-page
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 79a12523f999..f2dfd37e727c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -620,9 +620,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 }
 if  (nIntValue) // If auto spacing is set, then only store set 
value in InteropGrabBag
 {
-if (m_pImpl->GetTopContext()->isSet(PROP_NUMBERING_RULES))
-// Numbering is set -> auto space is 0.
-default_spacing = 0;
+m_pImpl->SetParaAutoBefore(true);
 m_pImpl->GetTopContext()->Insert( PROP_PARA_TOP_MARGIN, 
uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
 }
 else
@@ -645,9 +643,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 }
 if  (nIntValue) // If auto spacing is set, then only store set 
value in InteropGrabBag
 {
-if (m_pImpl->GetTopContext()->isSet(PROP_NUMBERING_RULES))
-// Numbering is set -> auto space is 0.
-default_spacing = 0;
 m_pImpl->GetTopContext()->Insert( PROP_PARA_BOTTOM_MARGIN, 
uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) );
 }
 else
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bebfaa7f8e02..236436cbd362 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -242,7 +242,8 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bFrameBtLr(false),
 m_bIsSplitPara(false),
 m_vTextFramesForChaining(),
-m_bParaHadField(false)
+m_bParaHadField(false),
+m_bParaAutoBefore(false)
 
 {
 m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault(
@@ -1169,7 +1170,48 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMap

[Libreoffice-commits] libcdr.git: src/lib

2017-04-12 Thread David Tardon 
 src/lib/CDRStylesCollector.cpp |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d3115eaf664eb01d03af1fe65c0c2680960b6ab7
Author: David Tardon 
Date:   Wed Apr 12 14:37:11 2017 +0200

ofz#998 fix division by 0

Change-Id: I85c2888adf6289d6cfd23728d36e130a15f54368

diff --git a/src/lib/CDRStylesCollector.cpp b/src/lib/CDRStylesCollector.cpp
index 093dad8..99f6caf 100644
--- a/src/lib/CDRStylesCollector.cpp
+++ b/src/lib/CDRStylesCollector.cpp
@@ -36,6 +36,9 @@ void libcdr::CDRStylesCollector::collectBmp(unsigned imageId, 
unsigned colorMode
   libcdr::CDRInternalStream stream(bitmap);
   librevenge::RVNGBinaryData image;
 
+  if (height == 0)
+height = 1;
+
   unsigned tmpPixelSize = (unsigned)(height * width);
   if (tmpPixelSize < (unsigned)height) // overflow
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Stephan Bergmann 
 include/o3tl/safeint.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2685678cd0221f4522e8502183baeaecb5ddd0a4
Author: Stephan Bergmann 
Date:   Wed Apr 12 14:34:10 2017 +0200

Revert "Work around clang-cl issue with MSVC's safeint.h for now"

This reverts commit acbb7e3243afec515bf98b2b34454afc5320bf66.  No longer 
needed
with safeint.h from recent "Windows Software Development Kit - Windows
10.0.15063.137".

diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index e4eee64ff2fd..ce144d22d9ea 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_O3TL_SAFEINT_HXX
 
 #include 
-#if defined(_MSC_VER) && !defined __clang__
+#if defined(_MSC_VER)
 #include 
 #else
 #ifndef __has_builtin
@@ -22,7 +22,7 @@
 namespace o3tl
 {
 
-#if defined(_MSC_VER) && !defined __clang__
+#if defined(_MSC_VER)
 
 template inline bool checked_multiply(T a, T b, T& result)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Andras Timar 
Tag '2.1-rc1' created by Andras Timar  at 
2017-04-12 12:15 +

2.1-rc1

Changes since 2.1-beta3-78:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - debian/changelog debian/control loolwsd.spec.in

2017-04-12 Thread Andras Timar 
 debian/changelog |6 ++
 debian/control   |2 +-
 loolwsd.spec.in  |4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 12f0182b7744cab5328457b13211a5283c5391dd
Author: Andras Timar 
Date:   Wed Apr 12 14:12:00 2017 +0200

Bump package version for 2.1-rc1

diff --git a/debian/changelog b/debian/changelog
index 7d814912..3dd16eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.1.0-4) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool21
+
+ -- Andras Timar   Tue, 12 Apr 2017 11:20:00 +0100
+
 loolwsd (2.1.0-3) unstable; urgency=medium
 
   * see the git log: http://col.la/cool21
diff --git a/debian/control b/debian/control
index c4c841ec..5e6f5504 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.3-calc (>= 5.3.10.3), collaboraofficebasis5.3-core 
(>= 5.3.10.3), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.3), 
collaboraofficebasis5.3-images (>= 5.3.10.3), collaboraofficebasis5.3-impress 
(>= 5.3.10.3), collaboraofficebasis5.3-ooofonts (>= 5.3.10.3), 
collaboraofficebasis5.3-writer (>= 5.3.10.3), collaboraoffice5.3 (>= 5.3.10.3), 
collaboraoffice5.3-ure (>= 5.3.10.3), collaboraofficebasis5.3-en-us (>= 
5.3.10.3), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.3), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.3), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.3), collaboraofficebasis5.3-draw 
(>= 5.3.10.3), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.3-calc (>= 5.3.10.5), collaboraofficebasis5.3-core 
(>= 5.3.10.5), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.5), 
collaboraofficebasis5.3-images (>= 5.3.10.5), collaboraofficebasis5.3-impress 
(>= 5.3.10.5), collaboraofficebasis5.3-ooofonts (>= 5.3.10.5), 
collaboraofficebasis5.3-writer (>= 5.3.10.5), collaboraoffice5.3 (>= 5.3.10.5), 
collaboraoffice5.3-ure (>= 5.3.10.5), collaboraofficebasis5.3-en-us (>= 
5.3.10.5), collaboraofficebasis5.3-en-us-calc (>= 5.3.10.5), 
collaboraofficebasis5.3-en-us-res (>= 5.3.10.5), 
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.5), collaboraofficebasis5.3-draw 
(>= 5.3.10.5), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.5)
 Description: LibreOffice Online WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 4ee560e4..52428414 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:3%{?dist}
+Release:4%{?dist}
 Vendor: Collabora
 Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
@@ -26,7 +26,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
 %endif
 
-Requires:   collaboraoffice5.3 >= 5.3.10.3 collaboraoffice5.3-ure >= 
5.3.10.3 collaboraofficebasis5.3-core >= 5.3.10.3 
collaboraofficebasis5.3-writer >= 5.3.10.3 collaboraofficebasis5.3-impress >= 
5.3.10.3 collaboraofficebasis5.3-graphicfilter >= 5.3.10.3 
collaboraofficebasis5.3-en-US >= 5.3.10.3 collaboraofficebasis5.3-calc >= 
5.3.10.3 collaboraofficebasis5.3-en-US-res >= 5.3.10.3 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.3 collaboraofficebasis5.3-ooofonts 
>= 5.3.10.3 collaboraofficebasis5.3-images >= 5.3.10.3 
collaboraofficebasis5.3-noto-fonts >= 5.3.10.3 collaboraofficebasis5.3-draw >= 
5.3.10.3 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.3
+Requires:   collaboraoffice5.3 >= 5.3.10.5 collaboraoffice5.3-ure >= 
5.3.10.5 collaboraofficebasis5.3-core >= 5.3.10.5 
collaboraofficebasis5.3-writer >= 5.3.10.5 collaboraofficebasis5.3-impress >= 
5.3.10.5 collaboraofficebasis5.3-graphicfilter >= 5.3.10.5 
collaboraofficebasis5.3-en-US >= 5.3.10.5 collaboraofficebasis5.3-calc >= 
5.3.10.5 collaboraofficebasis5.3-en-US-res >= 5.3.10.5 
collaboraofficebasis5.3-en-US-calc >= 5.3.10.5 collaboraofficebasis5.3-ooofonts 
>= 5.3.10.5 collaboraofficebasis5.3-images >= 5.3.10.5 
collaboraofficebasis5.3-noto-fonts >= 5.3.10.5 collaboraofficebasis5.3-draw >= 
5.3.10.5 collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.5
 Requires:   systemd
 Requires(post): coreutils grep sed
 %if 0%{?fedora} || 0%{?rhel} >= 7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-12 Thread Noel Grandin 
 xmloff/source/draw/shapeexport.cxx |   93 +++--
 1 file changed, 48 insertions(+), 45 deletions(-)

New commits:
commit 86eb71c4789dc5ab0200f49f7e5bca512ef4adaf
Author: Noel Grandin 
Date:   Wed Apr 12 12:09:20 2017 +0200

convert FOUND_ constants to o3tl::typed_flags

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

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 882e0890f9a6..1807d766a8d4 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -86,6 +86,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -1518,20 +1519,22 @@ void XMLShapeExport::ImpExportText( const 
uno::Reference< drawing::XShape >& xSh
 }
 
 
-namespace {
-
-const sal_Int32 FOUND_CLICKACTION   = 0x0001;
-const sal_Int32 FOUND_BOOKMARK  = 0x0002;
-const sal_Int32 FOUND_EFFECT= 0x0004;
-const sal_Int32 FOUND_PLAYFULL  = 0x0008;
-const sal_Int32 FOUND_VERB  = 0x0010;
-const sal_Int32 FOUND_SOUNDURL  = 0x0020;
-const sal_Int32 FOUND_SPEED = 0x0040;
-const sal_Int32 FOUND_CLICKEVENTTYPE= 0x0080;
-const sal_Int32 FOUND_MACRO = 0x0100;
-const sal_Int32 FOUND_LIBRARY   = 0x0200;
-
-} // namespace
+enum class Found {
+NONE  = 0x,
+CLICKACTION   = 0x0001,
+BOOKMARK  = 0x0002,
+EFFECT= 0x0004,
+PLAYFULL  = 0x0008,
+VERB  = 0x0010,
+SOUNDURL  = 0x0020,
+SPEED = 0x0040,
+CLICKEVENTTYPE= 0x0080,
+MACRO = 0x0100,
+LIBRARY   = 0x0200,
+};
+namespace o3tl {
+template<> struct typed_flags : is_typed_flags {};
+}
 
 void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& 
xShape )
 {
@@ -1544,7 +1547,7 @@ void XMLShapeExport::ImpExportEvents( const 
uno::Reference< drawing::XShape >& x
 if( !xEvents.is() )
 return;
 
-sal_Int32 nFound = 0;
+Found nFound = Found::NONE;
 
 OUString aClickEventType;
 presentation::ClickAction eClickAction = presentation::ClickAction_NONE;
@@ -1564,55 +1567,55 @@ void XMLShapeExport::ImpExportEvents( const 
uno::Reference< drawing::XShape >& x
 const beans::PropertyValue* pPropertyEnd = pProperty + 
aClickProperties.getLength();
 for( ; pProperty != pPropertyEnd; ++pProperty )
 {
-if( ( ( nFound & FOUND_CLICKEVENTTYPE ) == 0 ) && pProperty->Name 
== msEventType )
+if( !( nFound & Found::CLICKEVENTTYPE ) && pProperty->Name == 
msEventType )
 {
 if( pProperty->Value >>= aClickEventType )
-nFound |= FOUND_CLICKEVENTTYPE;
+nFound |= Found::CLICKEVENTTYPE;
 }
-else if( ( ( nFound & FOUND_CLICKACTION ) == 0 ) && 
pProperty->Name == msClickAction )
+else if( !( nFound & Found::CLICKACTION ) && pProperty->Name == 
msClickAction )
 {
 if( pProperty->Value >>= eClickAction )
-nFound |= FOUND_CLICKACTION;
+nFound |= Found::CLICKACTION;
 }
-else if( ( ( nFound & FOUND_MACRO ) == 0 ) && ( pProperty->Name == 
msMacroName || pProperty->Name == msScript ) )
+else if( !( nFound & Found::MACRO ) && ( pProperty->Name == 
msMacroName || pProperty->Name == msScript ) )
 {
 if( pProperty->Value >>= aStrMacro )
-nFound |= FOUND_MACRO;
+nFound |= Found::MACRO;
 }
-else if( ( ( nFound & FOUND_LIBRARY ) == 0 ) && pProperty->Name == 
msLibrary )
+else if( !( nFound & Found::LIBRARY ) && pProperty->Name == 
msLibrary )
 {
 if( pProperty->Value >>= aStrLibrary )
-nFound |= FOUND_LIBRARY;
+nFound |= Found::LIBRARY;
 }
-else if( ( ( nFound & FOUND_EFFECT ) == 0 ) && pProperty->Name == 
msEffect )
+else if( !( nFound & Found::EFFECT ) && pProperty->Name == 
msEffect )
 {
 if( pProperty->Value >>= eEffect )
-nFound |= FOUND_EFFECT;
+nFound |= Found::EFFECT;
 }
-else if( ( ( nFound & FOUND_BOOKMARK ) == 0 ) && pProperty->Name 
== msBookmark )
+else if( !( nFound & Found::BOOKMARK ) && pProperty->Name == 
msBookmark )
 {
 if( pProperty->Value >>= aStrBookmark )
-nFound |= FOUND_BOOKMARK;
+nFound |= Found::BOOKMARK;
 }
-else if( ( ( nFound & FOUND_SPEED ) == 0 ) && pProperty->Name == 
msSpeed )
+else if( !( nFound & Found::SPE

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

2017-04-12 Thread Caolán McNamara 
 sw/source/filter/ww8/ww8par2.cxx |   16 
 sw/source/filter/ww8/ww8scan.cxx |   23 ++-
 sw/source/filter/ww8/ww8scan.hxx |4 ++--
 3 files changed, 24 insertions(+), 19 deletions(-)

New commits:
commit 9c946e83cb773a0d0f05d27dab43cf6f934c7a56
Author: Caolán McNamara 
Date:   Wed Apr 12 12:56:27 2017 +0100

use std::unique_ptr

Change-Id: I74ab04b58c848961b1c4d30b68e8dd5ff5dd1f0d

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 19b75d2662c1..3aada795060c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4079,17 +4079,17 @@ void WW8RStyle::ScanStyles()// investigate 
style dependencies
 
 rSI.m_nFilePos = pStStrm->Tell();// remember FilePos
 sal_uInt16 nSkip;
-WW8_STD* pStd = Read1Style(nSkip, nullptr);  // read STD
-rSI.m_bValid = (nullptr != pStd);
+std::unique_ptr xStd(Read1Style(nSkip, nullptr));  // read STD
+rSI.m_bValid = xStd.get() != nullptr;
 if (rSI.m_bValid)
 {
-rSI.m_nBase = pStd->istdBase;// remember Basis
-rSI.m_bColl = ( pStd->sgc == 1 );// Para-Style
+rSI.m_nBase = xStd->istdBase; // remember Basis
+rSI.m_bColl = xStd->sgc == 1; // Para-Style
 }
 else
 rSI = SwWW8StyInf();
 
-delete pStd;
+xStd.reset();
 pStStrm->SeekRel( nSkip );  // skip Names and Sprms
 }
 }
commit ce577c94e7c4c53930a43ab0fd78fcacbf2eb01c
Author: Caolán McNamara 
Date:   Wed Apr 12 12:54:08 2017 +0100

drop unused argument

Change-Id: Ibbf3d6cbf694b1ca693d53c9ac92076a85df125f

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 9787ad27cfaa..19b75d2662c1 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3983,10 +3983,10 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
 
 pStStrm->Seek( rSI.m_nFilePos );
 
-sal_uInt16 nSkip, cbStd;
+sal_uInt16 nSkip;
 OUString sName;
 
-std::unique_ptr xStd(Read1Style(nSkip, &sName, &cbStd));// read 
Style
+std::unique_ptr xStd(Read1Style(nSkip, &sName));// read Style
 
 if (xStd)
 rSI.SetOrgWWIdent( sName, xStd->sti );
@@ -4079,7 +4079,7 @@ void WW8RStyle::ScanStyles()// investigate style 
dependencies
 
 rSI.m_nFilePos = pStStrm->Tell();// remember FilePos
 sal_uInt16 nSkip;
-WW8_STD* pStd = Read1Style( nSkip, nullptr, nullptr );  // read STD
+WW8_STD* pStd = Read1Style(nSkip, nullptr);  // read STD
 rSI.m_bValid = (nullptr != pStd);
 if (rSI.m_bValid)
 {
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 322f16c89876..4ce475c18952 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6563,7 +6563,7 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
 // so it has no empty slot, we should allocate memory and a pointer should
 // reference to STD (perhaps filled with 0). If the slot is empty,
 // it will return a null pointer.
-WW8_STD* WW8Style::Read1STDFixed(sal_uInt16& rSkip, sal_uInt16* pcbStd)
+WW8_STD* WW8Style::Read1STDFixed(sal_uInt16& rSkip)
 {
 WW8_STD* pStd = nullptr;
 
@@ -6630,17 +6630,15 @@ WW8_STD* WW8Style::Read1STDFixed(sal_uInt16& rSkip, 
sal_uInt16* pcbStd)
 rSt.SeekRel( cbStd );   // skip leftovers
 rSkip = 0;
 }
-if( pcbStd )
-*pcbStd = cbStd;
 return pStd;
 }
 
-WW8_STD* WW8Style::Read1Style(sal_uInt16& rSkip, OUString* pString, 
sal_uInt16* pcbStd)
+WW8_STD* WW8Style::Read1Style(sal_uInt16& rSkip, OUString* pString)
 {
 // Attention: MacWord-Documents have their Stylenames
 // always in ANSI, even if eStructCharSet == CHARSET_MAC !!
 
-WW8_STD* pStd = Read1STDFixed(rSkip, pcbStd); // read STD
+WW8_STD* pStd = Read1STDFixed(rSkip); // read STD
 
 // string desired?
 if( pString )
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index c0ead8a7936e..c3b9cd284e0b 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1563,8 +1563,8 @@ protected:
 
 public:
 WW8Style( SvStream& rSt, WW8Fib& rFibPara );
-WW8_STD* Read1STDFixed(sal_uInt16& rSkip, sal_uInt16* pcbStd);
-WW8_STD* Read1Style(sal_uInt16& rSkip, OUString* pString, sal_uInt16* 
pcbStd);
+WW8_STD* Read1STDFixed(sal_uInt16& rSkip);
+WW8_STD* Read1Style(sal_uInt16& rSkip, OUString* pString);
 sal_uInt16 GetCount() const { return cstd; }
 };
 
commit 13ca751a69f1aed666eade43d464b357dbe3c1af
Author: Caolán McNamara 
Date:   Wed Apr 12 12:52:40 2017 +0100

ofz: timeout, guard against going backwards

Change-Id: Ib91ae165147582bdb44690215a1df6f01ede796b

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8pa

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

2017-04-12 Thread Caolán McNamara 
 include/svx/dialogs.hrc  |1 
 svx/UIConfig_svx.mk  |1 
 svx/source/stbctrls/selctrl.cxx  |   62 +--
 svx/source/stbctrls/stbctrls.h   |5 ---
 svx/source/stbctrls/stbctrls.src |   32 
 svx/uiconfig/ui/selectionmenu.ui |   41 +
 6 files changed, 76 insertions(+), 66 deletions(-)

New commits:
commit aa708712ff438fab961b59196c777ca42eece3da
Author: Caolán McNamara 
Date:   Wed Apr 12 10:29:50 2017 +0100

convert selection menu to .ui

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

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index d384997129c8..2a23a2164ccb 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -251,7 +251,6 @@
 #define RID_SVXSTR_OVERWRITE_TEXT   (RID_SVX_START + 212)
 
 // Strings for the selection mode
-#define RID_SVXMENU_SELECTION   (RID_SVX_START + 213)
 #define RID_SVXBMP_SELECTION(RID_SVX_START + 215)
 
 #define RID_SVXSTR_XMLSEC_SIG_OK(RID_SVX_START + 222)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 20c0eaae0919..633b8d6e986a 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/rulermenu \
svx/uiconfig/ui/safemodedialog \
svx/uiconfig/ui/savemodifieddialog \
+   svx/uiconfig/ui/selectionmenu \
svx/uiconfig/ui/sidebararea \
svx/uiconfig/ui/sidebarshadow \
svx/uiconfig/ui/sidebargraphic \
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index af230c55dac9..a98ed9e29f1e 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -32,42 +33,48 @@
 SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
 
 /// Popup menu to select the selection type
-class SelectionTypePopup : public PopupMenu
+class SelectionTypePopup
 {
+VclBuilderm_aBuilder;
+VclPtr m_xMenu;
+static sal_uInt16 id_to_state(const OString& rIdent);
+sal_uInt16 state_to_id(sal_uInt16 nState) const;
 public:
-explicit SelectionTypePopup( sal_uInt16 nCurrent );
+explicit SelectionTypePopup(sal_uInt16 nCurrent);
+OUString GetItemTextForState(sal_uInt16 nState) { return 
m_xMenu->GetItemText(state_to_id(nState)); }
+sal_uInt16 GetState() const { return 
id_to_state(m_xMenu->GetCurItemIdent()); }
+sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return 
m_xMenu->Execute(pWindow, rPopupPos); }
 };
 
-/// Item id's cannot start from 0, so we need to convert
-static sal_uInt16 id_to_state( sal_uInt16 nId )
+sal_uInt16 SelectionTypePopup::id_to_state(const OString& rIdent)
 {
-switch ( nId )
-{
-default: // fall through
-case SELECTION_STANDARD: return 0;
-case SELECTION_EXTENDED: return 1;
-case SELECTION_ADDED:return 2;
-case SELECTION_BLOCK:return 3;
-}
+if (rIdent == "block")
+return 3;
+else if (rIdent == "adding")
+return 2;
+else if (rIdent == "extending")
+return 1;
+else // fall through
+return 0;
 }
 
-/// Item id's cannot start from 0, so we need to convert
-static sal_uInt16 state_to_id( sal_uInt16 nState )
+sal_uInt16 SelectionTypePopup::state_to_id(sal_uInt16 nState) const
 {
-switch ( nState )
+switch (nState)
 {
 default: // fall through
-case 0: return SELECTION_STANDARD;
-case 1: return SELECTION_EXTENDED;
-case 2: return SELECTION_ADDED;
-case 3: return SELECTION_BLOCK;
+case 0: return m_xMenu->GetItemId("standard");
+case 1: return m_xMenu->GetItemId("extending");
+case 2: return m_xMenu->GetItemId("adding");
+case 3: return m_xMenu->GetItemId("block");
 }
 }
 
-SelectionTypePopup::SelectionTypePopup( sal_uInt16 nCurrent )
-: PopupMenu( ResId( RID_SVXMENU_SELECTION, DIALOG_MGR() ) )
+SelectionTypePopup::SelectionTypePopup(sal_uInt16 nCurrent)
+: m_aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), 
"svx/ui/selectionmenu.ui", "")
+, m_xMenu(m_aBuilder.get_menu("menu"))
 {
-CheckItem( state_to_id( nCurrent ) );
+m_xMenu->CheckItem(state_to_id(nCurrent));
 }
 
 SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
@@ -89,20 +96,19 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, 
SfxItemState eState,
 const SfxUInt16Item* pItem = static_cast(pState);
 mnState = pItem->GetValue();
 
-ScopedVclPtrInstance aPop( mnState );
-GetStatusBar().SetQuickHelpText( GetId(), aPop->GetItemText( 
state_to_id( mnState

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

2017-04-12 Thread Tamás Zolnai 
 chart2/qa/extras/chart2import.cxx   |   25 
 chart2/qa/extras/data/pptx/tdf106217.pptx   |binary
 oox/source/drawingml/chart/chartdrawingfragment.cxx |5 
 3 files changed, 30 insertions(+)

New commits:
commit 676dcf204ac7e1326a48be30a2a5f825a2a8eb26
Author: Tamás Zolnai 
Date:   Sat Mar 11 16:42:22 2017 +0100

tdf#106217: Wrong size and position of a shape inside chart

Same code which was added to the method
DrawingFragment::onEndElement() in
d178d7bef193565a7d6aacbc37a58dfc4bd7b316

A shape's size and position inside a chart object
are primarily defined by  and  tags in
drawing.xml, but in the same file we also have
an  tag which is used for the same thing
(defining size and postion) in general. Testing with
MSO it seems it ignores what values are set to  and
uses only the  and  values.
The test document showing this problem must be created
an earlier version of MSO, becuase  is set to some
random values. Editing the chart and saving it with MSO
2013 the  values are set consistently with
 and  pair.

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

Change-Id: Icbaff78e5a6fcea36678c3b3755c97f57976b626
Reviewed-on: https://gerrit.libreoffice.org/35076
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
Reviewed-by: Christian Lohmaier 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 75b0f9c474c4..e43fa1fedde8 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -60,6 +61,7 @@ public:
 void testFdo54361();
 void testFdo54361_1();
 void testTdf86624(); // manually placed legends
+void testTdf106217();
 void testAutoBackgroundXLSX();
 void testChartAreaStyleBackgroundXLSX();
 void testAxisTextRotationXLSX();
@@ -117,6 +119,7 @@ public:
 CPPUNIT_TEST(testFdo54361);
 CPPUNIT_TEST(testFdo54361_1);
 CPPUNIT_TEST(testTdf86624);
+CPPUNIT_TEST(testTdf106217);
 CPPUNIT_TEST(testAutoBackgroundXLSX);
 CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX);
 CPPUNIT_TEST(testAxisTextRotationXLSX);
@@ -685,6 +688,28 @@ void Chart2ImportTest::testTdf86624()
 CPPUNIT_ASSERT(aPos.Y > 4000); // real value for ms is above 7000
 }
 
+void Chart2ImportTest::testTdf106217()
+{
+load("/chart2/qa/extras/data/pptx/", "tdf106217.pptx");
+uno::Reference< chart::XChartDocument > xChartDoc = 
getChartDocFromDrawImpress(0, 0);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+uno::Reference xDrawPageSupplier(xChartDoc, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xCircle(xDrawPage->getByIndex(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCircle.is());
+
+uno::Reference xNamedShape(xCircle, uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(xNamedShape->getName(), OUString("Oval 1"));
+
+awt::Point aPosition = xCircle->getPosition();
+CPPUNIT_ASSERT_EQUAL(aPosition.X, sal_Int32(6870));
+CPPUNIT_ASSERT_EQUAL(aPosition.Y, sal_Int32(7261));
+awt::Size aSize = xCircle->getSize();
+CPPUNIT_ASSERT_EQUAL(aSize.Width, sal_Int32(2701));
+CPPUNIT_ASSERT_EQUAL(aSize.Height, sal_Int32(2700));
+}
+
 void Chart2ImportTest::testTransparentBackground(OUString const & filename)
 {
 load("/chart2/qa/extras/data/xlsx/", filename);
diff --git a/chart2/qa/extras/data/pptx/tdf106217.pptx 
b/chart2/qa/extras/data/pptx/tdf106217.pptx
new file mode 100755
index ..64fb968b8a15
Binary files /dev/null and b/chart2/qa/extras/data/pptx/tdf106217.pptx differ
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx 
b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index de8d3f2303bf..00bc99f7bd8e 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -216,6 +216,11 @@ void ChartDrawingFragment::onEndElement()
 getLimitedValue< sal_Int32, sal_Int64 >( aShapeRectEmu.Y, 
0, SAL_MAX_INT32 ),
 getLimitedValue< sal_Int32, sal_Int64 >( 
aShapeRectEmu.Width, 0, SAL_MAX_INT32 ),
 getLimitedValue< sal_Int32, sal_Int64 >( 
aShapeRectEmu.Height, 0, SAL_MAX_INT32 ) );
+
+// Set the position and size before calling addShape().
+mxShape->setPosition(awt::Point(aShapeRectEmu32.X, 
aShapeRectEmu32.Y));
+mxShape->setSize(awt::Size(aShapeRectEmu32.Width, 
aShapeRectEmu32.Height));
+
 basegfx::B2DHomMatrix aMatrix;
 mxShape->addShape( getFilter(), getFilter().getCurrentTheme(), 
mxDrawPage, aMatrix, mxShape->getFillProperties(), &aShapeRectEmu32 );
 }

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

2017-04-12 Thread Tor Lillqvist 
 include/oox/export/drawingml.hxx  |9 +++-
 oox/source/export/chartexport.cxx |   11 -
 oox/source/export/drawingml.cxx   |   75 --
 sd/qa/unit/export-tests.cxx   |6 +--
 4 files changed, 66 insertions(+), 35 deletions(-)

New commits:
commit 9e43f32b19df707a68307a693014df10f4645d98
Author: Tor Lillqvist 
Date:   Wed Feb 15 19:21:06 2017 +0200

tdf#106304: Fix newline and empty paragraph font size issues in .pptx export

Output  instead of 
 for hard newlines. This fixes the
problem that the line before the hard newline in the .pptx export is
not centred.

The fix for the sd_export_tests is a bit hacky, but then so is the
code in question.

Don't unnecessarily use bogus default char size for a:endParaRPr.
Instead use the size last used for an a:rPr below the same WriteText()
call. I am not exactly sure about how this hangs together, but this
has the desired effect on the exported .pptx.

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

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index dc1c06d88879..51a4604fa5a6 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -194,12 +194,15 @@ public:
   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, sal_Int32 nRotation = 0 );
 
 void WriteText( const css::uno::Reference< css::uno::XInterface >& 
rXIface, const OUString& presetWarp, bool bBodyPr = true, bool bText = true, 
sal_Int32 nXmlNamespace = 0);
-void WriteParagraph( const css::uno::Reference< css::text::XTextContent >& 
rParagraph );
+void WriteParagraph( const css::uno::Reference< css::text::XTextContent >& 
rParagraph,
+ bool& rbOverridingCharHeight, sal_Int32& rnCharHeight 
);
 void WriteParagraphProperties( const css::uno::Reference< 
css::text::XTextContent >& rParagraph );
 void WriteParagraphNumbering( const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet,
   sal_Int16 nLevel );
-void WriteRun( const css::uno::Reference< css::text::XTextRange >& rRun );
-void WriteRunProperties( const css::uno::Reference< 
css::beans::XPropertySet >& rRun, bool bIsField, sal_Int32 nElement = XML_rPr 
,bool bCheckDirect = true);
+void WriteRun( const css::uno::Reference< css::text::XTextRange >& rRun,
+   bool& rbOverridingCharHeight, sal_Int32& rnCharHeight );
+void WriteRunProperties( const css::uno::Reference< 
css::beans::XPropertySet >& rRun, bool bIsField, sal_Int32 nElement, bool 
bCheckDirect,
+ bool& rbOverridingCharHeight, sal_Int32& 
rnCharHeight );
 
 void WritePresetShape( const char* pShape );
 void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool 
bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const 
css::beans::PropertyValue& rProp );
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index b8172f99ec62..c3be54951ed3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1102,13 +1102,16 @@ void ChartExport::exportTitle( const Reference< XShape 
>& xShape )
 pFS->startElement( FSNS( XML_a, XML_pPr ),
 FSEND );
 
-WriteRunProperties(xPropSet, false, XML_defRPr);
+bool bDummy = false;
+sal_Int32 nDummy;
+WriteRunProperties(xPropSet, false, XML_defRPr, true, bDummy, nDummy );
 
 pFS->endElement( FSNS( XML_a, XML_pPr ) );
 
 pFS->startElement( FSNS( XML_a, XML_r ),
 FSEND );
-WriteRunProperties( xPropSet, false );
+bDummy = false;
+WriteRunProperties( xPropSet, false, XML_rPr, true, bDummy, nDummy );
 pFS->startElement( FSNS( XML_a, XML_t ),
 FSEND );
 pFS->writeEscaped( sText );
@@ -2390,7 +2393,9 @@ void ChartExport::exportTextProps(const 
Reference& xPropSet)
 pFS->startElement(FSNS(XML_a, XML_p), FSEND);
 pFS->startElement(FSNS(XML_a, XML_pPr), FSEND);
 
-WriteRunProperties(xPropSet, false, XML_defRPr);
+bool bDummy = false;
+sal_Int32 nDummy;
+WriteRunProperties(xPropSet, false, XML_defRPr, true, bDummy, nDummy);
 
 pFS->endElement(FSNS(XML_a, XML_pPr));
 pFS->endElement(FSNS(XML_a, XML_p));
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index d6751a23392f..d114b23a33c8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1203,7 +1203,8 @@ void DrawingML::WriteShapeTransformation( const 
Reference< XShape >& rXShape, sa
 WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size( 
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV, 
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
 }
 
-void DrawingML::WriteRunP

[Libreoffice-commits] online.git: loleaflet/src

2017-04-12 Thread Pranav Kant 
 loleaflet/src/map/Map.js |4 
 1 file changed, 4 deletions(-)

New commits:
commit 336ac4d6d1f41232fb315e76db9e831f421ea5f0
Author: Pranav Kant 
Date:   Wed Apr 12 16:33:51 2017 +0530

loleaflet: Grid/selection/caret is sometimes displaced

This is actually not a displaced cursor, but displaced tiles map pane.
It happens when the user refreshes the the document page and
before the document finishes loading, switches to some other tab and
then get back to the document when the document load finishes. In such
circumstances, due to browsers not emitting the 'resize' event (probably
because it didn't have the focus when the map loaded) we return
incorrect/unexpected map center. Because 'resize' event sets 
this._initialCenter to
null, so map.getCenter() never returns this._initialCenter and instead
return this.layerPointToLatLng(this._getCenterLayerPoint()) which seems
to be the correct thing to return here.

The reason that the displaced cursor is not
observed when user doesn't switch to other tabs is because of the
browsers emitting the 'resize' event before we set the map transforms.
Nevertheless, in some circumstances it is quite possible that this
event, 'resize', is processed after we set the transforms even though
user hasn't switched the tabs but probability of this is very less which
justifies this bug's hard-to-reproduce nature when user doesn't change
the tabs.

Instead of making sure that 'resize' event is triggered before we set
the transforms, removing this block of code that returns unexpected
return value (which we never seem to use anywhere anyhow) seems more
sensible thing to do.

Change-Id: Iff532a902e6100be7f39c204cbf2f28f1a7f6a49
Reviewed-on: https://gerrit.libreoffice.org/36458
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 4b7e2c39..fcb75e27 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -427,10 +427,6 @@ L.Map = L.Evented.extend({
 
getCenter: function () { // (Boolean) -> LatLng
this._checkIfLoaded();
-
-   if (this._initialCenter && !this._moved()) {
-   return this._initialCenter;
-   }
return this.layerPointToLatLng(this._getCenterLayerPoint());
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2017-04-12 Thread Stephan Bergmann 
 configure.ac |   68 ---
 1 file changed, 47 insertions(+), 21 deletions(-)

New commits:
commit a4d1ed6ba2a81b4284cd360f44b6723bc9bfaf85
Author: Stephan Bergmann 
Date:   Wed Apr 12 12:11:57 2017 +0200

Adapt to Windows SDK 10.0.15063

On a machine with MSVC 2013 and 2015 (but no 2017) installed, I installed
"Windows Software Development Kit - Windows 10.0.15063.137" as available 
through
 
(in the
hopes that it will provide a better fix for
acbb7e3243afec515bf98b2b34454afc5320bf66 "Work around clang-cl issue with 
MSVC's
safeint.h for now").  That apparently removed various files from the
C:\Program Files (x86)\Windows Kits\10\bin\ hierarchy, while it added files 
to a
new C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\ hierarchy (and

mentions that in an "SDK Layout Changes: Side by Side install of tools and
metadata" section).  So return a new winsdkbinsubdir var from find_winsdk() 
to
cover installations that use this new layout scheme.

In b076e8f673d1714ee8b6f991eb2ca299b6fa8949 "Fix include and library paths 
for
at least me", tml had hardcoded some 10.0.15063 -> 10.0.14393 mappings that 
are
unhelpful at least in my scenario.  I tried to keep those hacks in in a way 
that
would still work for tml's scenario.

The check for msiinfo.exe etc. had been broken since
ecfabb66f421ef07f52a655117f047aa75d54a01 "add support for Windows 8 SDK", 
but
apparently in a way so that nobody noticed.  The first

  # needed for msi packaging
  pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/x86" "before"

is indeed needed, as (at least some of) those tools are only available in 
the
arm and x86 sub-dirs, not in the arm64 and x64 ones.  (I'm not sure whether 
the
two later pathmunges adding $WINDOWS_SDK_BINDIR_NO_ARCH/{x64,x86} are still
relevant, though.)

Change-Id: Ia403e4bde7b1abf7e2c9d9f084a05af2d1311617
Reviewed-on: https://gerrit.libreoffice.org/36455
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 335dc0385eb7..16b3517d1bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3325,7 +3325,11 @@ find_ucrt()
 PathFormat "$(win_get_env_from_vsvars32bat UniversalCRTSdkDir)"
 UCRTSDKDIR=$formatted_path
 UCRTVERSION=$(win_get_env_from_vsvars32bat UCRTVersion)
-if test "$UCRTVERSION" = 10.0.15063.0; then
+dnl Hack needed at least by tml:
+if test "$UCRTVERSION" = 10.0.15063.0 \
+-a ! -f "${UCRTSDKDIR}Include/10.0.15063.0/um/sqlext.h" \
+-a -f "${UCRTSDKDIR}Include/10.0.14393.0/um/sqlext.h"
+then
 UCRTVERSION=10.0.14393.0
 fi
 else
@@ -5157,9 +5161,9 @@ find_dotnetsdk46()
 find_winsdk_version()
 {
 # Args: $1 : SDK version as in "6.0A", "7.0" etc
-# Return values: $winsdktest, $winsdklibsubdir
+# Return values: $winsdktest, $winsdkbinsubdir, $winsdklibsubdir
 
-unset winsdktest winsdklibsubdir
+unset winsdktest winsdkbinsubdir winsdklibsubdir
 
 case "$1" in
 7.*)
@@ -5191,11 +5195,20 @@ find_winsdk_version()
 if test -n "$regvalue"; then
 winsdktest=$regvalue
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v${1}/ProductVersion"
+if test -n "$regvalue"; then
+winsdkbinsubdir="$regvalue".0
+fi
 winsdklibsubdir=$regvalue
 if test "$regvalue" = "10.0.14393"; then
 winsdklibsubdir="10.0.14393.0"
 elif test "$regvalue" = "10.0.15063"; then
-winsdklibsubdir="10.0.14393.0"
+winsdklibsubdir="10.0.15063.0"
+dnl Hack needed at least by tml:
+if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
+-a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
+then
+winsdklibsubdir="10.0.14393.0"
+fi
 fi
 return
 fi
@@ -5304,14 +5317,23 @@ find_msvc_x64_dlls()
 }
 
 if test "$build_os" = "cygwin"; then
-dnl Check midl.exe
+dnl Check midl.exe; this being the first check for a tool in the SDK bin
+dnl dir, it also determines that dir's path w/o an arch segment if any,
+dnl WINDOWS_SDK_BINDIR_NO_ARCH:
 AC_MSG_CHECKING([for midl.exe])
 
 find_winsdk
-if test -f "$winsdktest/Bin/midl.exe"; then
-MIDL_PATH="$winsdktest/Bin"
+if test -n "$winsdkbinsubdir" \
+-a -f "$winsdktest/Bin/$winsdkbinsubdir/$WINDOWS_SDK_ARCH/midl.exe"
+then
+WINDOWS_SDK_BINDIR_NO_ARCH=$winsdktest/Bin/$winsdkbinsubdir
+

[Libreoffice-commits] online.git: wsd/FileServer.cpp

2017-04-12 Thread Miklos Vajna 
 wsd/FileServer.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4dbdd72bc281646d995c6f427ff1cee67f739802
Author: Miklos Vajna 
Date:   Wed Apr 12 13:46:09 2017 +0200

wsd: avoid std::string::compare() in FileServer

When we are just interested in equality. compare() is more meant for
sorting functions where negative/zero/positive return value is useful.

Change-Id: I11138a14dc08e23d33f3848aeb734d9f56f3e9f7

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 8968133b..96552d40 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -177,7 +177,7 @@ void FileServerRequestHandler::handleRequest(const 
HTTPRequest& request, Poco::M
 if (it != request.end())
 {
 // if ETags match avoid re-sending the file.
-if (!noCache && !it->second.compare("\"" LOOLWSD_VERSION_HASH 
"\""))
+if (!noCache && it->second == "\"" LOOLWSD_VERSION_HASH "\"")
 {
 // TESTME: harder ... - do we even want ETag support ?
 std::ostringstream oss;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - download.lst external/pdfium libreofficekit/qa

2017-04-12 Thread Miklos Vajna 
 download.lst  |4 ++--
 external/pdfium/Library_pdfium.mk |   25 -
 external/pdfium/README|2 --
 external/pdfium/UnpackedTarball_pdfium.mk |1 +
 external/pdfium/system-zlib.patch.1   |   13 +
 libreofficekit/qa/unit/tiledrendering.cxx |5 -
 6 files changed, 24 insertions(+), 26 deletions(-)

New commits:
commit d30de8376f1ceb16cc7348dc271f9f1704ff728b
Author: Miklos Vajna 
Date:   Wed Apr 12 10:13:19 2017 +0200

CppunitTest_libreofficekit_tiledrendering: disable occasionally failing test

When it failed, it always failed like this:


libreofficekit/qa/unit/tiledrendering.cxx:311:TiledRenderingTest::runAllTests
equality assertion failed
- Expected: 3

- Actual  :

It's not clear yet what triggers the failure, sounds like some kind of 
timing.

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

diff --git a/libreofficekit/qa/unit/tiledrendering.cxx 
b/libreofficekit/qa/unit/tiledrendering.cxx
index 77d149d6b346..885bfda09bc4 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -245,8 +245,8 @@ void insertString(Document& rDocument, const std::string& s)
 {
 rDocument.postKeyEvent(LOK_KEYEVENT_KEYINPUT, c, 0);
 rDocument.postKeyEvent(LOK_KEYEVENT_KEYUP, c, 0);
+processEventsToIdle();
 }
-processEventsToIdle();
 }
 
 }
@@ -278,6 +278,8 @@ void TiledRenderingTest::testDocumentLoadLanguage(Office* 
pOffice)
 pDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, css::awt::Key::UP);
 processEventsToIdle();
 
+#if 0
+// FIXME disabled, as occasionally fails
 // we've got a meaningful result
 OString aResult = pDocument->getTextSelection("text/plain;charset=utf-8");
 CPPUNIT_ASSERT_EQUAL(OString("3\n"), aResult);
@@ -309,6 +311,7 @@ void TiledRenderingTest::testDocumentLoadLanguage(Office* 
pOffice)
 // we've got a meaningful result
 aResult = pDocument->getTextSelection("text/plain;charset=utf-8");
 CPPUNIT_ASSERT_EQUAL(OString("3\n"), aResult);
+#endif
 }
 
 #if 0
commit 4e943da402ea5a7b450a9251ff75a6a3969dba74
Author: Miklos Vajna 
Date:   Wed Apr 12 09:15:13 2017 +0200

external: upgrade to pdfium-3050 and stop using bundled zlib

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

diff --git a/download.lst b/download.lst
index 56c372210c56..f372257ef879 100644
--- a/download.lst
+++ b/download.lst
@@ -183,8 +183,8 @@ export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b633
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33
 export PAGEMAKER_TARBALL := libpagemaker-0.0.3.tar.bz2
-export PDFIUM_SHA256SUM := 
6cba5355eed239fd2186e5c4876899d1e0fa6c0aab55a377a39941e327834b01
-export PDFIUM_TARBALL := cfcb6b4f3b5b6097edc5df7903ef00ea-pdfium-3021.tar.bz2
+export PDFIUM_SHA256SUM := 
27cbf262470eac93613079a0f2fcbbd26be50a8487c7be6607a5e15f4e7c9497
+export PDFIUM_TARBALL := pdfium-3050.tar.bz2
 export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_SHA256SUM := 
b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2
diff --git a/external/pdfium/Library_pdfium.mk 
b/external/pdfium/Library_pdfium.mk
index 79f8917c61c8..e8f2a9e9b481 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -250,7 +250,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 # fpdfdoc
 $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/core/fpdfdoc/cline \
-UnpackedTarball/pdfium/core/fpdfdoc/clines \
 UnpackedTarball/pdfium/core/fpdfdoc/cpdf_aaction \
 UnpackedTarball/pdfium/core/fpdfdoc/cpdf_action \
 UnpackedTarball/pdfium/core/fpdfdoc/cpdf_actionfields \
@@ -417,7 +416,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,pdfium,\
 UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_SpecialButton \
 UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_Utils \
 UnpackedTarball/pdfium/fpdfsdk/pdfwindow/PWL_Wnd \
-UnpackedTarball/pdfium/fpdfsdk/pdfwindow/cpwl_pathdata \
+UnpackedTarball/pdfium/fpdfsdk/pdfwindow/cpwl_color \
 ))
 
 # third_party/bigint
@@ -489,27 +488,11 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\
 UnpackedTarball/pdfium/third_party/libopenjpeg20/tgt \
 ))
 
-# third_party/fx_zlib
-$(eval $(call gb_Library_add_generated_cobjects,pdfium,\
-UnpackedTarball/pdfium/third_par

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

2017-04-12 Thread Stephan Bergmann 
 tools/qa/cppunit/test_inetmime.cxx |   26 ++
 tools/source/inet/inetmime.cxx |   10 ++
 2 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit c4d02f488d6ca85e25f231db27eaba4ca3085db0
Author: Stephan Bergmann 
Date:   Wed Apr 12 13:39:52 2017 +0200

Add minimal INetMIME::scanContentType test and fix bugs thus found

Change-Id: I8fcbeb2b0804bc4f9ee8f97f7d02737ba79a7f20

diff --git a/tools/qa/cppunit/test_inetmime.cxx 
b/tools/qa/cppunit/test_inetmime.cxx
index 50973dff8649..1a5d16b5aba6 100644
--- a/tools/qa/cppunit/test_inetmime.cxx
+++ b/tools/qa/cppunit/test_inetmime.cxx
@@ -35,8 +35,11 @@ namespace
 public:
 void test_decodeHeaderFieldBody();
 
+void test_scanContentType();
+
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(test_decodeHeaderFieldBody);
+CPPUNIT_TEST(test_scanContentType);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -53,6 +56,29 @@ namespace
 CPPUNIT_ASSERT(testDecode("=?iso-8859-1?B?QUJD?=", "ABC"));
 }
 
+void Test::test_scanContentType()
+{
+{
+OUString input
+= "TEST/subTST; parm1*0*=US-ASCII'En'5%25%20; 
Parm1*1*=of%2010";
+OUString type;
+OUString subType;
+INetContentTypeParameterList parameters;
+auto end = INetMIME::scanContentType(
+input.getStr(), input.getStr() + input.getLength(), &type,
+&subType, ¶meters);
+CPPUNIT_ASSERT(end != nullptr);
+CPPUNIT_ASSERT_EQUAL(OUString(), OUString(end));
+CPPUNIT_ASSERT_EQUAL(OUString("test"), type);
+CPPUNIT_ASSERT_EQUAL(OUString("subtst"), subType);
+CPPUNIT_ASSERT_EQUAL(
+INetContentTypeParameterList::size_type(1), parameters.size());
+auto i = parameters.find("parm1");
+CPPUNIT_ASSERT(i != parameters.end());
+CPPUNIT_ASSERT_EQUAL(OUString("5% of 10"), i->second.m_sValue);
+}
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 27cb1857b5d4..da5dab7216cf 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -434,16 +434,17 @@ void appendISO88591(OUString & rText, sal_Char const * 
pBegin,
 Parameter ** ParameterList::find(const OString& rAttribute,
  sal_uInt32 nSection, bool & rPresent)
 {
+rPresent = false;
 Parameter ** p = &m_pList;
 for (; *p; p = &(*p)->m_pNext)
 {
 sal_Int32 nCompare = rAttribute.compareTo((*p)->m_aAttribute);
 if (nCompare > 0)
-break;
+return &(*p)->m_pNext;
 else if (nCompare == 0)
 {
 if (nSection > (*p)->m_nSection)
-break;
+return &(*p)->m_pNext;
 else if (nSection == (*p)->m_nSection)
 {
 rPresent = true;
@@ -451,7 +452,6 @@ Parameter ** ParameterList::find(const OString& rAttribute,
 }
 }
 }
-rPresent = false;
 return p;
 }
 
@@ -793,9 +793,11 @@ sal_Unicode const * scanParameters(sal_Unicode const * 
pBegin,
 INetMIMEOutputSink aSink;
 while (p != pEnd)
 {
-sal_uInt32 nChar = INetMIME::getUTF32Character(p, pEnd);
+auto q = p;
+sal_uInt32 nChar = INetMIME::getUTF32Character(q, pEnd);
 if (rtl::isAscii(nChar) && !isTokenChar(nChar))
 break;
+p = q;
 if (nChar == '%' && p + 1 < pEnd)
 {
 int nWeight1 = INetMIME::getHexWeight(p[0]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

  1   2   >