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

[jan Iversen]

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

New commits:
commit dbf06ea94cc4032c9ffaf646fb749c07f2269f45
Author: jan Iversen 
Date:   Tue Oct 25 08:21:08 2016 +0200

Updated core
Project: translations  56c14d6481dd2985e5258a92458837f4063a128e

Update pootle for 5.2.3 RC2

Change-Id: I9c9ffb826d90252c80404c6be4176f628e5cf639

diff --git a/translations b/translations
index 2d989b5..56c14d6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2d989b5da3a90d5a5b76d7d1f7940fdc19963257
+Subproject commit 56c14d6481dd2985e5258a92458837f4063a128e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svl/Library_passwordcontainer.mk

[Ariel Constenla-Haile]

 svl/Library_passwordcontainer.mk |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 1d688395e2dd0cb54b89cd365231e211546a9c82
Author: Ariel Constenla-Haile 
Date:   Tue Oct 25 03:52:56 2016 +

i127139 - Work around broken toolchain

diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 24a8152..2056636 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -41,6 +41,17 @@ $(eval $(call gb_Library_add_api,passwordcontainer,\
 offapi \
 ))
 
+ifeq ($(GUI),UNX)
+ifeq ($(COM),GCC)
+ifeq ($(CPUNAME),INTEL)
+$(eval $(call gb_Library_set_ldflags,passwordcontainer,\
+$(gb_LinkTarget_LDFLAGS) \
+-Wl$(COMMA)--start-group -lc -Wl$(COMMA)--end-group \
+))
+endif
+endif
+endif
+
 $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
 cppu \
 cppuhelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/document.hxx  |2 +-
 sc/qa/unit/ucalc_formula.cxx |2 +-
 sc/source/core/data/documen7.cxx |2 +-
 sc/source/core/data/document.cxx |6 +++---
 sc/source/ui/docshell/docsh.cxx  |2 +-
 sc/source/ui/docshell/docsh3.cxx |2 +-
 sc/source/ui/view/gridwin4.cxx   |2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b5c65b53de6663e12a8192100d6e25494779c5c7
Author: Kohei Yoshida 
Date:   Thu Oct 20 20:36:40 2016 -0400

Rename ClearFormulaContext() to make it more representative.

In the future we might put more prep code in here, in addition
to clearing the context data.

Change-Id: I44256a0dfbe1301e2c1443b291f4635ca0ba80f5

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ed7bdab..4e4e8c4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2276,7 +2276,7 @@ public:
  * Call this before any operations that might trigger one or more formula
  * cells to get calculated.
  */
-void ClearFormulaContext();
+void PrepareFormulaCalc();
 
 SvtBroadcaster* GetBroadcaster( const ScAddress& rPos );
 const SvtBroadcaster* GetBroadcaster( const ScAddress& rPos ) const;
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 74028fb..2780d08 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -702,7 +702,7 @@ void Test::testFetchVectorRefArray()
 
 // Clear everything and start over.
 clearRange(m_pDoc, ScRange(0,0,0,MAXCOL,MAXROW,0));
-m_pDoc->ClearFormulaContext();
+m_pDoc->PrepareFormulaCalc();
 
 // Totally empty range in a totally empty column (Column A).
 aArray = m_pDoc->FetchVectorRefArray(ScAddress(0,0,0), 3); // A1:A3
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index d64b286..27538b6 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -84,7 +84,7 @@ void ScDocument::Broadcast( const ScHint& rHint )
 
 void ScDocument::BroadcastCells( const ScRange& rRange, sal_uInt32 nHint, bool 
bBroadcastSingleBroadcasters )
 {
-ClearFormulaContext();
+PrepareFormulaCalc();
 
 if (!pBASM)
 return;// Clipboard or Undo
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index c22ac0f..5883506 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2415,7 +2415,7 @@ ScDocument::NumFmtMergeHandler::~NumFmtMergeHandler()
 mpDoc->pFormatExchangeList = nullptr;
 }
 
-void ScDocument::ClearFormulaContext()
+void ScDocument::PrepareFormulaCalc()
 {
 mpFormulaGroupCxt.reset();
 }
@@ -3826,7 +3826,7 @@ void ScDocument::InterpretDirtyCells( const ScRangeList& 
rRanges )
 if (!GetAutoCalc())
 return;
 
-mpFormulaGroupCxt.reset();
+PrepareFormulaCalc();
 
 for (size_t nPos=0, nRangeCount = rRanges.size(); nPos < nRangeCount; 
nPos++)
 {
@@ -3867,7 +3867,7 @@ void ScDocument::AddTableOpFormulaCell( ScFormulaCell* 
pCell )
 
 void ScDocument::CalcAll()
 {
-ClearFormulaContext();
+PrepareFormulaCalc();
 ClearLookupCaches();// Ensure we don't deliver zombie data.
 sc::AutoCalcSwitch aSwitch(*this, true);
 TableContainer::iterator it = maTabs.begin();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ca0b2a0..ba3d5de 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3159,7 +3159,7 @@ ScDocShellModificator::~ScDocShellModificator()
 void ScDocShellModificator::SetDocumentModified()
 {
 ScDocument& rDoc = rDocShell.GetDocument();
-rDoc.ClearFormulaContext();
+rDoc.PrepareFormulaCalc();
 if ( !rDoc.IsImportingXML() )
 {
 // AutoCalcShellDisabled temporaer restaurieren
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 85db59d..da426b5 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -86,7 +86,7 @@ void ScDocShell::PostDataChanged()
 {
 Broadcast( SfxHint( FID_DATACHANGED ) );
 SfxGetpApp()->Broadcast(SfxHint( FID_ANYDATACHANGED ));  // Navigator
-aDocument.ClearFormulaContext();
+aDocument.PrepareFormulaCalc();
 //! Navigator direkt benachrichtigen!
 }
 
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 15edd26..f449f77 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -515,7 +515,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, 
SCROW nY2, ScUpdateMod
 
 // Flag drawn formula cells "unchanged".
 rDoc.ResetChanged(ScRange(nX1, nY1, nTab, nX2, nY2, nTab));
-rDoc.ClearFormulaContext();
+rDoc.PrepareFormulaCalc();
 }
 
 void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& 
rTableInfo, ScOutputData& aOutputData,
___
Libreoffice-commits mailing list
libreoffice-comm...@list

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

[Ashod Nakashian]

 loolwsd/TileCache.cpp |   35 ++-
 1 file changed, 26 insertions(+), 9 deletions(-)

New commits:
commit a2ef70c71ce48e81864de6d20382e8ef156bf64d
Author: Ashod Nakashian 
Date:   Mon Oct 24 19:57:37 2016 -0400

loolwsd: mark all tiles but the first to have come from the cache

While this has some overhead, it makes debugging of tile
rendering easier.

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

diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 5decc9e..e8ebdd1 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -167,20 +167,37 @@ void TileCache::saveTileAndNotify(const TileDesc& tile, 
const char *data, const
 {
 std::string response = tile.serialize("tile:");
 Log::debug("Sending tile message to subscribers: " + response);
-response += '\n';
 
-std::vector output;
-output.reserve(static_cast(4) * tile.getWidth() * 
tile.getHeight());
-output.resize(response.size());
+std::vector output(256 + size);
+output.resize(response.size() + 1 + size);
+
 std::memcpy(output.data(), response.data(), response.size());
+output[response.size()] = '\n';
+std::memcpy(output.data() + response.size() + 1, data, size);
 
-const auto pos = output.size();
-output.resize(pos + size);
-std::memcpy(output.data() + pos, data, size);
+// Send to first subscriber as-is (without cache marker).
+auto firstSubscriber = tileBeingRendered->_subscribers[0].lock();
+if (firstSubscriber)
+{
+try
+{
+firstSubscriber->sendBinaryFrame(output.data(), 
output.size());
+}
+catch (const std::exception& ex)
+{
+Log::warn("Failed to send tile to " + 
firstSubscriber->getName() + ": " + ex.what());
+}
+}
+
+// All others must get served from the cache.
+response += " renderid=cached\n";
+output.resize(response.size() + size);
+std::memcpy(output.data(), response.data(), response.size());
+std::memcpy(output.data() + response.size(), data, size);
 
-for (const auto& i: tileBeingRendered->_subscribers)
+for (size_t i = 1; i < tileBeingRendered->_subscribers.size(); ++i)
 {
-auto subscriber = i.lock();
+auto subscriber = tileBeingRendered->_subscribers[i].lock();
 if (subscriber)
 {
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/ClientSession.cpp loolwsd/TileCache.cpp loolwsd/TileCache.hpp

[Ashod Nakashian]

 loolwsd/ClientSession.cpp |2 +-
 loolwsd/TileCache.cpp |2 +-
 loolwsd/TileCache.hpp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cdf6beee864843078b66806200f7e45c2fdd9aa9
Author: Ashod Nakashian 
Date:   Mon Oct 24 08:54:37 2016 -0400

loolwsd: lookupRendering -> lookupCachedFile

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

diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index ee5510b..2faf494 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -300,7 +300,7 @@ bool ClientSession::sendFontRendering(const char *buffer, 
int length, StringToke
 output.resize(response.size());
 std::memcpy(output.data(), response.data(), response.size());
 
-std::unique_ptr cachedRendering = 
docBroker->tileCache().lookupRendering(font, "font");
+std::unique_ptr cachedRendering = 
docBroker->tileCache().lookupCachedFile(font, "font");
 if (cachedRendering && cachedRendering->is_open())
 {
 cachedRendering->seekg(0, std::ios_base::end);
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index f3cb817..5decc9e 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -280,7 +280,7 @@ void TileCache::saveRendering(const std::string& name, 
const std::string& dir, c
 Util::saveDataToFileSafely(fileName, data, size);
 }
 
-std::unique_ptr TileCache::lookupRendering(const std::string& 
name, const std::string& dir)
+std::unique_ptr TileCache::lookupCachedFile(const std::string& 
name, const std::string& dir)
 {
 const std::string dirName = _cacheDir + "/" + dir;
 const std::string fileName = dirName + "/" + name;
diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp
index fc0210b..fd44cd0 100644
--- a/loolwsd/TileCache.hpp
+++ b/loolwsd/TileCache.hpp
@@ -61,7 +61,7 @@ public:
 // The dir parameter should be the type of rendering, like "font", 
"style", etc
 void saveRendering(const std::string& name, const std::string& dir, const 
char *data, size_t size);
 
-std::unique_ptr lookupRendering(const std::string& name, 
const std::string& dir);
+std::unique_ptr lookupCachedFile(const std::string& name, 
const std::string& dir);
 
 // The tiles parameter is an invalidatetiles: message as sent by the child 
process
 void invalidateTiles(const std::string& tiles);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/test

[Ashod Nakashian]

 loolwsd/test/TileCacheTests.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff7f325794bcad0365c27b03075798cfba3515d1
Author: Ashod Nakashian 
Date:   Mon Oct 24 08:47:54 2016 -0400

loolwsd: use a document with comments to test tile rendering

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

diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp
index 33bf2b1..3618f19 100644
--- a/loolwsd/test/TileCacheTests.cpp
+++ b/loolwsd/test/TileCacheTests.cpp
@@ -385,7 +385,7 @@ void TileCacheTests::testTilesRenderedJustOnce()
 {
 const auto testname = "tilesRenderdJustOnce ";
 
-auto socket = *loadDocAndGetSocket("empty.odt", _uri, testname);
+auto socket = *loadDocAndGetSocket("with_comment.odt", _uri, testname);
 
 assertResponseString(socket, "statechanged: .uno:AcceptTrackedChange=", 
testname);
 
@@ -450,7 +450,7 @@ void TileCacheTests::testTilesRenderedJustOnceMultiClient()
 const auto testname4 = testname + "-4 ";
 
 std::string documentPath, documentURL;
-getDocumentPathAndURL("hello.odt", documentPath, documentURL);
+getDocumentPathAndURL("with_comment.odt", documentPath, documentURL);
 
 std::cerr << "Connecting first client." << std::endl;
 auto socket = *loadDocAndGetSocket(_uri, documentURL, testname1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 include/oox/export/drawingml.hxx |2 +-
 oox/source/export/drawingml.cxx  |   15 ---
 oox/source/export/shapes.cxx |4 +++-
 sw/qa/extras/ooxmlexport/data/tdf103389.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   11 +++
 5 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit f7c61b08d526c79ecd1522dff79386059b6125e0
Author: Tamás Zolnai 
Date:   Tue Oct 25 01:51:25 2016 +

tdf#103389: Resaving a DOCX document with two canvases leads to a broken 
file.

Make custom shape export more robust. In case of the test
document, WriteCustomGeometry is called, but this call
does not export anything, and so we get a shape without
any geometry in the DOCX file, which causes problem to MS Word.

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

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index a880cd2..e9dc0a3 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -204,7 +204,7 @@ public:
 void WritePresetShape( const char* pShape , std::vector< 
std::pair> & rAvList );
 void WritePresetShape( const char* pShape );
 void WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool 
bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const 
css::beans::PropertyValue& rProp );
-void WriteCustomGeometry( const css::uno::Reference& 
rXShape );
+bool WriteCustomGeometry( const css::uno::Reference& 
rXShape );
 void WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon );
 void WriteFill( const css::uno::Reference< css::beans::XPropertySet >& 
xPropSet );
 void WriteShapeStyle( const css::uno::Reference< css::beans::XPropertySet 
>& rXPropSet );
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a70b8d6..2925646 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2298,23 +2298,23 @@ void DrawingML::WritePresetShape( const char* pShape, 
MSO_SPT eShapeType, bool b
 mpFS->endElementNS(  XML_a, XML_prstGeom );
 }
 
-void DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
+bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
 {
 uno::Reference< beans::XPropertySet > aXPropSet;
 uno::Any aAny( 
rXShape->queryInterface(cppu::UnoType::get()));
 
 if ( ! (aAny >>= aXPropSet) )
-return;
+return false;
 
 try
 {
 aAny = aXPropSet->getPropertyValue( "CustomShapeGeometry" );
 if ( !aAny.hasValue() )
-return;
+return false;
 }
 catch( const ::uno::Exception& )
 {
-return;
+return false;
 }
 
 
@@ -2345,7 +2345,7 @@ void DrawingML::WriteCustomGeometry( const Reference< 
XShape >& rXShape )
 }
 
 if ( !aPairs.hasElements() )
-return;
+return false;
 
 if ( !aSegments.hasElements() )
 {
@@ -2369,7 +2369,7 @@ void DrawingML::WriteCustomGeometry( const Reference< 
XShape >& rXShape )
 if ( nExpectedPairCount > aPairs.getLength() )
 {
 SAL_WARN("oox", "Segments need " << nExpectedPairCount << 
" coordinates, but Coordinates have only " << aPairs.getLength() << " pairs.");
-return;
+return false;
 }
 
 mpFS->startElementNS( XML_a, XML_custGeom, FSEND );
@@ -2531,10 +2531,11 @@ void DrawingML::WriteCustomGeometry( const Reference< 
XShape >& rXShape )
 mpFS->endElementNS( XML_a, XML_path );
 mpFS->endElementNS( XML_a, XML_pathLst );
 mpFS->endElementNS( XML_a, XML_custGeom );
+return true;
 }
 }
 }
-
+return false;
 }
 
 void DrawingML::WritePolyPolygon( const tools::PolyPolygon& rPolyPolygon )
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 62b8b34..a44f2ee 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -834,7 +834,9 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 else if (bCustGeom)
 {
 WriteShapeTransformation( xShape, XML_a, bFlipH, bFlipV );
-WriteCustomGeometry( xShape );
+bool bSuccess = WriteCustomGeometry( xShape );
+if (!bSuccess)
+WritePresetShape( sPresetShape );
 }
 else if (bOnBlacklist && bHasHandles && nAdjustmentValuesIndex !=-1 && 
!sShapeType.startsWith("mso-spt"))
 {
diff --git a/sw/qa/extras/ooxmlexport/data/tdf103389.docx 
b/sw/qa/extras/ooxmlexport/data/tdf103389.docx
new file mode 100644
index 000..0ef80e6
Binary files /dev/null and b/sw/qa/extras/ooxmlex

tdf#103209 Background color setting isn't reflected to BasicIDE

[Takeshi Abe]

Hi,

I would like to ask someone to review my patch for tdf#103209 [1],
but I could not find who will be the one(s) in [2].

[1] https://gerrit.libreoffice.org/#/c/29815/
[2] https://wiki.documentfoundation.org/FindTheExpert

Cheers,
-- Takeshi Abe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: testing commonsallayout branch

[Khaled Hosny]

Hi,

I think the daily builds would be the better as they should have any new
fixes:
http://dev-builds.libreoffice.org/daily/master/

To enable the new layout you need to set SAL_USE_COMMON_LAYOUT
environment variable, to disable it you need to unset the variable
(setting it to 0 will NOT disable it as the code just check the presence
of the variable not its value).

Regards,
Khaled

On Mon, Oct 24, 2016 at 01:40:19PM +0200, Milos Sramek wrote:
> Hi,
> 
> to be sure that I do everything right:
> 
> The master build should be downloaded from
> http://dev-builds.libreoffice.org/pre-releases/win/x86_64/
> http://dev-builds.libreoffice.org/pre-releases/mac/x86_64/
> http://dev-builds.libreoffice.org/pre-releases/deb/x86_64/
> 
> The builds are from October 21-st - are they already the right ones?
> 
> How to select the layout code? Which environment settings to use?
> 
> best
> Milos
> 
> On 2016-10-24 00:30, Khaled Hosny wrote:
> > Hi,
> >
> > Things I’d like to test at this point:
> > * master with and without the new layout code activated on the three
> >   platforms. To see if we have any regressions or, hopefully, progressions.
> > * master with the new layout code across platforms (to see if we really
> >   getting identical results as we hope).
> >
> > Regards,
> > Khaled
> >
> > On Fri, Oct 21, 2016 at 09:18:01PM +0200, Milos Sramek wrote:
> >> Hi,
> >>
> >>
> >> I've changed subject, since the discussion went in a different direction.
> >>
> >> Meanwhile I've discovered, that one can run OSX in a virtual machine :).
> >> That fits to my environment well.
> >>
> >> I've tested a few random files with a few random version on Linux, Mac
> >> and Windows. The results:
> >> http://bender.dam.fmph.uniba.sk/~milos/roundtrip/odttest-mac-win/rslt-web.ods
> >>
> >> Brief explanantion:
> >> grade 0: pixel level identical
> >> grade 1: some differences, probably not visible
> >> ...
> >> Grade meaning is explained in a comment
> >>
> >>> is a link to pdf:
> >> column LND: side by side
> >> column THE: overlay
> >> column HLPE: vertically aligned lines
> >> column FDE: vertically and horizontally aligned
> >>
> >> first sheet: print test: printed by tested version (name in header) and
> >> in reference version (LO43 on Linux) and compared
> >> second sheet: roundtrip test: saved to odt and printed by the reference
> >> version. No differences here
> >>
> >> Which versions should I test? The engines can be specified by
> >> environment variable - I can test that too.
> >>
> >> Is there a way how to install multiple versions in parallel on MAC? I
> >> can install only production and development one.
> >>
> >> best
> >> Milos
> >>
> >>
> >> On 2016-10-18 18:36, Khaled Hosny wrote:
> >>> On Tue, Oct 18, 2016 at 09:06:42AM +0200, Milos Sramek wrote:
>  Dear Khaled,
> 
>  do you think that extensive comparison of rendering of numerous
>  documents with and without the new layout engine makes sense?
>  If yes, I can run my tests in such a way to see if there are any
>  differences.
> >>> This would be extremely helpful, and more so if it can run on Windows or
> >>> Mac.
> >>>
>  My test documents use latin script except for a few ones in Chinese. So,
>  if you happen to have sume documents in Arabic I can add them to my test
>  set.
> >>> I’ve a random collection of documents somewhere, I’ll clean it up and
> >>> send it to you.
> >>>
> >>> Regards,
> >>> Khaled
> >>>
> >>>
> >>> ___
> >>> LibreOffice mailing list
> >>> LibreOffice@lists.freedesktop.org
> >>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> >>
> >> -- 
> >> email & jabber: sramek.mi...@gmail.com
> >>
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
> 
> -- 
> email & jabber: sramek.mi...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Better organization of bugs with meta bugs

[Jay Philips]

Hi All,

With the ability to only set the component field to classify bugs to a 
very basic level, i believe that meta bugs should be used to further 
classify things and provide a needed means of grouping bugs.

The keywords and whiteboard fields have been useful for developers to 
hunt down bugs they want to work on, but QA users not aware of these 
tags wont set them, which means that some bugs wont appear in such 
searches. The 'see also' field has been used to group similar bugs 
together, but how closely related these bugs are isnt defined with this 
association and having a large list of bugs in the see also area is a 
clutter.

With the usage of meta bugs, the QA team will be able to

1) Easily group related bugs under a clear meta bug heading, like for a 
language group, GSoC project, vcl backend, dialog, etc.

examples
https://bugs.documentfoundation.org/show_bug.cgi?id=83066
https://bugs.documentfoundation.org/show_bug.cgi?id=85184
https://bugs.documentfoundation.org/show_bug.cgi?id=102495
https://bugs.documentfoundation.org/show_bug.cgi?id=103238

2) Easily find duplicate bugs of a particular topic by only searching 
through the bugs in a particular meta bug, which can easily be done with 
bugzilla's search or by clicking on the 'show dependency tree' link 
found on the meta bug page and then clicking on the 'show resolved' 
button on the dependency tree page to show close bugs.

examples
https://bugs.documentfoundation.org/showdependencytree.cgi?id=99671&hide_resolved=0
https://bugs.documentfoundation.org/showdependencytree.cgi?id=88278&hide_resolved=0

3) Organize bugs not only under one main meta bug, but also have 
sub-meta bugs and sub-sub-meta bugs to provide an hierarchically 
organized structure to the bugs.

example
https://bugs.documentfoundation.org/show_bug.cgi?id=102019
|- https://bugs.documentfoundation.org/show_bug.cgi?id=94551
|- https://bugs.documentfoundation.org/show_bug.cgi?id=103223
   |- https://bugs.documentfoundation.org/show_bug.cgi?id=34551

4) Notifying other users CCed on a meta bug of a related bug that they 
can possibly triage and fix.

Meta bugs have also helped developers in providing a central place for 
them to find all the related bugs of a particular topic they want to 
work on, as creating a new keyword or whiteboard tag for this grouping 
isnt efficient.

examples
https://bugs.documentfoundation.org/show_bug.cgi?id=81234
https://bugs.documentfoundation.org/show_bug.cgi?id=91063
https://bugs.documentfoundation.org/show_bug.cgi?id=91310

So i encourage all users to associate meta bugs to bug reports they 
submit and triage and create a new meta bug if a suitable one isnt 
available and they have seen enough similar bugs of a similar topic. 
Adding an alias for the meta bug is also encouraged, as it will appear 
on the page of associated bugs rather than the bug number. For a list of 
all available meta bugs, you can find the "Meta bugs" search query[1] 
listed in the "Saved Searches" tab[2] of Preferences in Bugzilla.

I've created many meta bugs over the last few months and would 
appreciate everyones help in making them as complete as possible. I have 
just finished cleaning up the sidebar meta bug[3] over the last 2 days, 
as it had over 150 bugs associated with it, and plan to continue further 
organizing its sub-meta bugs into sub-sub-meta bugs when necessary.



[1] 
https://bugs.documentfoundation.org/buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=Meta%20bugs&sharer_id=22399

[2] https://bugs.documentfoundation.org/userprefs.cgi?tab=saved-searches

[3] 
https://bugs.documentfoundation.org/showdependencytree.cgi?id=65138&hide_resolved=0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[László Németh]

 0 files changed

New commits:
commit 36de83bdb985e20bcfbd06571fbc2b1ca15feaf5
Author: László Németh 
Date:   Mon Oct 24 23:14:08 2016 +0200

empty commit (repeat)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/get_bookmark.sh help3xsl/help.js help3xsl/index.html

[Fabio Biocchetti]

 help3xsl/default.css |2 +-
 help3xsl/get_bookmark.sh |   13 ++---
 help3xsl/help.js |   35 +++
 help3xsl/index.html  |   34 +-
 4 files changed, 55 insertions(+), 29 deletions(-)

New commits:
commit 2f35a021df0677851b7f05522ca5b97b3992aca9
Author: Fabio Biocchetti 
Date:   Mon Oct 24 19:16:27 2016 +0200

Fix comments in script and JavaScript refactor.

Comments correction in shell script
Introduced js debouncer for search bar
xml-stylesheet tag removed
Introduced parameter passing through pages
Links in XHP pages now work with js
Minor adjustments

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

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 7065f0f..8863bbe 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -137,7 +137,7 @@ position: fixed;
 bottom: 5px;
 left: 5px; 
 overflow:auto; 
-width: 30%;
+width: 29%;
 height: 90%;
 }
 
diff --git a/help3xsl/get_bookmark.sh b/help3xsl/get_bookmark.sh
index b8e7ee6..a64ee24 100755
--- a/help3xsl/get_bookmark.sh
+++ b/help3xsl/get_bookmark.sh
@@ -1,11 +1,10 @@
 #/bin/bash
-#*--
-#* 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 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/.
 
 stub1=''
 stub2=''
diff --git a/help3xsl/help.js b/help3xsl/help.js
index fb77cbc..839c895 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -15,21 +15,33 @@ if (response == 1){return xhttp.responseXML;}
 return xhttp.responseText;
 }
 
+function getParameterByName(name, url) {
+if (!url) {
+  url = window.location.href;
+}
+name = name.replace(/[\[\]]/g, "\\$&");
+var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+results = regex.exec(url);
+if (!results) return null;
+if (!results[2]) return '';
+return decodeURIComponent(results[2].replace(/\+/g, " "));
+}
 
 function displayResult(file, moduleName, language, system)
 {
 var xml = loadXMLDoc(file, 1);
-var xsl = loadXMLDoc('/online_transform.xsl', 1);
+var xsl = loadXMLDoc('online_transform.xsl', 1);
 var xsltProcessor;
 var resultDocument;
 var bookmarkHTML;
 var urlVars = getUrlVars(file);
   var module = urlVars["DbPAR"];
+  moduleName = moduleName || module;
   var language = urlVars["Language"];
   var system = urlVars["System"];
   var usedb = urlVars["UseDB"];
-  document.getElementById("DisplayArea").innerHTML= null; 
-  document.getElementById("BottomLeft").innerHTML= null; 
+  document.getElementById("DisplayArea").innerHTML= null;
+  document.getElementById("BottomLeft").innerHTML= null;
 // code for IE
 if (window.ActiveXObject || xhttp.responseType == "msxml-document")
   {
@@ -45,8 +57,9 @@ else if (document.implementation && 
document.implementation.createDocument)
 if (language){xsltProcessor.setParameter(null, "Language", language);}
 if (system){xsltProcessor.setParameter(null, "System", system);}
 
-$(document).on('click', '#BottomLeft a', function(e) {
+$(document).on('click', '#BottomLeft a, #DisplayArea a', function(e) {
   e.preventDefault();
+  $('#search-bar').val('');
   var xml = loadXMLDoc($(this).attr('href'), 1);
   var resultDocument = xsltProcessor.transformToFragment(xml,  document);
   $("#DisplayArea").html($(resultDocument).find('#DisplayArea').html());
@@ -57,16 +70,22 @@ else if (document.implementation && 
document.implementation.createDocument)
 resultDocument = xsltProcessor.transformToFragment(xml,  document);
 $("#DisplayArea").html($(resultDocument).find('#DisplayArea').html());
 // Handle bookmar panel
-$("#BottomLeft").load('/bookmark_'+moduleName+'.html');
+$("#BottomLeft").load('bookmark_'+moduleName+'.html');
   }
 }
 
+var debouncer = null;
 $(document).ready(function() {
   $('#search-bar').keyup(function() {
-$("#BottomLeft ul li" ).show();
-if($(this).val()) {
-  $("#BottomLeft ul a:not(:contains('" + $(this).val() + "'))" 
).parent().hide();
+if(debouncer) {
+  clearTimeout(debouncer);
 }
+debouncer = setTimeout(function(){
+  $("#BottomLeft ul li" ).show();
+  if($('#search-bar').val()) {
+$("#BottomLeft ul a:not(:contains('" + $('#search-bar').val() + "'))" 
).parent().hide();
+  }
+}, 500);
   });
 });
 
diff --git a/help3xsl/index.html b/help3xsl/index.html
index f326003..ffba610 100644
--- a/help3xsl/index.html
+++ b/help3xsl/

[Libreoffice-commits] core.git: helpcontent2

[Fabio Biocchetti]

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

New commits:
commit 419e4fa1b587c1e4bc3f8d48729e1955ade1c8c3
Author: Fabio Biocchetti 
Date:   Mon Oct 24 19:16:27 2016 +0200

Updated core
Project: help  2f35a021df0677851b7f05522ca5b97b3992aca9

Fix comments in script and JavaScript refactor.

Comments correction in shell script
Introduced js debouncer for search bar
xml-stylesheet tag removed
Introduced parameter passing through pages
Links in XHP pages now work with js
Minor adjustments

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

diff --git a/helpcontent2 b/helpcontent2
index b560ca3..2f35a02 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b560ca36513ef209b23081dc5b971d30dd60e5f1
+Subproject commit 2f35a021df0677851b7f05522ca5b97b3992aca9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 starmath/source/edit.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 168eb0bfd324be5d0023a8a3ea7ee58f1edbcbb8
Author: Julien Nabet 
Date:   Mon Oct 24 21:53:07 2016 +0200

tdf#103452: add missing xPopupMenu.disposeAndClear();

See https://bugs.documentfoundation.org/attachment.cgi?id=128226

Change-Id: If6641531b96f33b2864f69bd4195c92548fce148
Reviewed-on: https://gerrit.libreoffice.org/30234
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f13aaf8..43fc755 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -369,6 +369,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
 xPopupMenu->SetSelectHdl(LINK(this, SmEditWindow, MenuSelectHdl));
 
 xPopupMenu->Execute( this, aPoint );
+xPopupMenu.disposeAndClear();
 bForwardEvt = false;
 }
 else if (rCEvt.GetCommand() == CommandEventId::Wheel)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loleaflet/dist/errormessages.js |2 +-
 loleaflet/po/templates/loleaflet-ui.pot |2 +-
 loleaflet/po/ui-sl.po   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f79546853f7e646f581ecbece123b9f2bf306cdf
Author: Andras Timar 
Date:   Mon Oct 24 22:18:00 2016 +0200

loleaflet: spelling noun vs. verb: checkout -> check out

diff --git a/loleaflet/dist/errormessages.js b/loleaflet/dist/errormessages.js
index 9ccfaf8..348c6c1 100644
--- a/loleaflet/dist/errormessages.js
+++ b/loleaflet/dist/errormessages.js
@@ -1,6 +1,6 @@
 exports.diskfull = _('No disk space left on server, please contact the server 
administrator to continue.');
 exports.emptyhosturl = _('The host URL is empty. The loolwsd server is 
probably misconfigured, please contact the administrator.');
-exports.limitreached = _('This development build is limited to %0 documents, 
and %1 connections - to avoid the impression that it is suitable for deployment 
in large enterprises. To find out more about deploying and scaling %2 checkout: 
%3.');
+exports.limitreached = _('This development build is limited to %0 documents, 
and %1 connections - to avoid the impression that it is suitable for deployment 
in large enterprises. To find out more about deploying and scaling %2 check 
out: %3.');
 exports.serviceunavailable = _('Service is unavailable. Please try again later 
and report to your administrator if the issue persists.');
 exports.unauthorized = _('Unauthorized WOPI host. Please try again later and 
report to your administrator if the issue persists.');
 exports.wrongwopisrc = _('Wrong WOPISrc, usage: WOPISrc=valid encoded URI, or 
file_path, usage: file_path=/path/to/doc/');
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index e12b9c9..08ba209 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -211,7 +211,7 @@ msgstr ""
 msgid ""
 "This development build is limited to %0 documents, and %1 connections - to "
 "avoid the impression that it is suitable for deployment in large "
-"enterprises. To find out more about deploying and scaling %2 checkout: %3."
 msgstr ""
 
diff --git a/loleaflet/po/ui-sl.po b/loleaflet/po/ui-sl.po
index f9c0793..d8a0bf0 100644
--- a/loleaflet/po/ui-sl.po
+++ b/loleaflet/po/ui-sl.po
@@ -216,7 +216,7 @@ msgstr ""
 msgid ""
 "This development build is limited to %0 documents, and %1 connections - to "
 "avoid the impression that it is suitable for deployment in large "
-"enterprises. To find out more about deploying and scaling %2 checkout: %3."
 msgstr ""
 "Ta razvojna gradnja je omejena na %0 dokumentov in %1 povezav - da bi se "
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - 2 commits - cui/source

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit 7e1ddc5b7c07c3b9d2c5528954355362ce3391f1
Author: Katarina Behrens 
Date:   Mon Oct 24 21:58:38 2016 +0200

screenshot annotation: More readable markup

this should placate clang too

Change-Id: Ida2cceebd5870b5896fb125e51e4cb67ad253d92

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index 53a0cc9..cd0591d 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -54,38 +54,45 @@ namespace
 
 OUString lcl_AltDescr()
 {
-OUString aRet = OUString("") +
-OUString(" ") + //FIXME real dialog title or something
-OUString("");
-return aRet;
+OUString aTempl = OUString(""
+   " " //FIXME real dialog title or something
+  "");
+aTempl = aTempl.replaceFirst( "%1", lcl_genRandom("alt_id") );
+
+return aTempl;
 }
 
 OUString lcl_Image( const OUString& rScreenshotId )
 {
-OUString aRet = OUString("") + //FIXME width + height
-lcl_AltDescr() +
-OUString("");
-return aRet;
+OUString aTempl = OUString("" //FIXME width + height
+"%3"
+   "");
+aTempl = aTempl.replaceFirst( "%1", lcl_genRandom("img_id") );
+aTempl = aTempl.replaceFirst( "%2", rScreenshotId );
+aTempl = aTempl.replaceFirst( "%3", lcl_AltDescr() );
+
+return aTempl;
 }
 
 OUString lcl_ParagraphWithImage( const OUString& rScreenshotId )
 {
-OUString aRet = OUString("") +
-lcl_Image( rScreenshotId ) +
-OUString("");
-return aRet;
+OUString aTempl = OUString( "%2"
+""  SAL_NEWLINE_STRING );
+aTempl = aTempl.replaceFirst( "%1", lcl_genRandom("par_id") );
+aTempl = aTempl.replaceFirst( "%2", lcl_Image(rScreenshotId) );
+
+return aTempl;
 }
 
 OUString lcl_Bookmark( const OUString& rWidgetId )
 {
-OUString aRet = ""  + 
SAL_NEWLINE_STRING;
-aRet += OUString("") + SAL_NEWLINE_STRING;
-return aRet;
+OUString aTempl = "" SAL_NEWLINE_STRING
+  "" SAL_NEWLINE_STRING;
+aTempl = aTempl.replaceFirst( "%1", rWidgetId );
+aTempl = aTempl.replaceFirst( "%2", rWidgetId );
+aTempl = aTempl.replaceFirst( "%3", lcl_genRandom("bm_id") );
+
+return aTempl;
 }
 }
 
commit 4044419c29c5df19defcc06ad170c8f6d329b0b3
Author: Katarina Behrens 
Date:   Mon Oct 24 15:16:37 2016 +0200

screenshot annotation: put back removed fields

I hate you loplugin !!!

Change-Id: I01067b04005a59b7ecb10a5a72ab6090b7f040a8

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index ca56d1f..53a0cc9 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -92,8 +92,11 @@ namespace
 class ControlDataEntry
 {
 public:
-ControlDataEntry(const basegfx::B2IRange& rB2IRange)
-: maB2IRange(rB2IRange)
+ControlDataEntry(
+const vcl::Window& rControl,
+const basegfx::B2IRange& rB2IRange)
+: mrControl(rControl),
+maB2IRange(rB2IRange)
 {
 }
 
@@ -105,6 +108,7 @@ public:
 const OString GetHelpId() const { return mrControl.GetHelpId(); }
 
 private:
+const vcl::Window&  mrControl;
 basegfx::B2IRange   maB2IRange;
 };
 
@@ -251,7 +255,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), 
RTL_TEXTENCODING_UTF8 );
 maMainMarkupText = lcl_ParagraphWithImage( aHelpId);
 mpText->SetText( maMainMarkupText );
-mpText->SetReadOnly(true);
+mpText->SetReadOnly();
 }
 
 // set click handler for save button
@@ -275,7 +279,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren(
 
 if (!aCurrentRange.isEmpty())
 {
-rControlDataCollection.push_back(ControlDataEntry(aCurrentRange));
+rControlDataCollection.push_back(ControlDataEntry(rCurrent, 
aCurrentRange));
 }
 
 for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Problem building in Gerrit, Windows only.

[Michael Stahl]

On 24.10.2016 14:20, Michael Stahl wrote:
> On 20.10.2016 10:52, Stephan Bergmann wrote:
>> On 10/20/2016 09:13 AM, Giuseppe Castagno wrote:
>>> a patch of mine:
>>> 
>>> always fails in Gerrit Windows build machine in test
>>> PythonTest_solenv_python:
>>> 
>>>
>>>
>>> Unfortunately I'm not able to reproduce it on my Window 10 build machine
>>> (Win10 64bit, VS2013 64bit, LO 32bit) , where that same test doesn't fail.
>>>
>>> I need help, because I have no idea what's going on.
>>> May be make internal error, as stated in these build log lines:
>>>
>>> "
>>> make[3]: Entering directory
>>> '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest'
>>>
>>> make[3]: *** internal error: invalid --jobserver-fds string
>>> 'gmake_semaphore_5488'.  Stop.
>>> make[3]: Leaving directory
>>> '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest'
>>>
>>> "
>>> can give some hint?
>>
>> Looking at 
>> , 
>> quite a number of the recent master Gerrit/Jenkins Windows builds are 
>> red, and, scanning through their console output, quite a number fail 
>> with the same "ERROR: test_gbuildtoide (gbuildtoide.CheckGbuildToIde)" 
>> as your 
>> .
>>
>> Looks like there is still problems there after 
>> 
>>  
>> "prep WinResTarget for WNT in testdir".  Björn?
> 
> if i insert a "subprocess.check_call(['/bin/sh', '-c', 'set'])" in that
> test i see these variables:
> 
> MAKEFLAGS='rs -j --jobserver-fds=3,4'
> MAKELEVEL=2
> MAKE_TERMERR=/dev/pts/4
> MAKE_TERMOUT=/dev/pts/4
> 
> but not MAKE itself so the test just invokes the first make in the PATH.
> 
> let's try if this helps:
>  https://gerrit.libreoffice.org/30226

this succeeded on the same "tb72" that produced the above failed build
log, so i've pushed it to master now.


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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-10'

[Andras Timar]

Tag 'cp-5.1-10' created by Andras Timar  at 
2016-10-24 19:17 +

cp-5.1-10

Changes since cp-5.1-9-33:
---
 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/cp-5.1-10'

[jan Iversen]

Tag 'cp-5.1-10' created by Andras Timar  at 
2016-10-24 19:17 +

cp-5.1-10

Changes since cp-5.1-9-2:
---
 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/cp-5.1-10'

[Miklos Vajna]

Tag 'cp-5.1-10' created by Andras Timar  at 
2016-10-24 19:17 +

cp-5.1-10

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-10'

[Andras Timar]

Tag 'cp-5.1-10' created by Andras Timar  at 
2016-10-24 19:17 +

cp-5.1-10

Changes since cp-5.1-9:
Andras Timar (1):
  Update pt_PT dictionary to version 16.10.1.2

---
 pt_PT/README_th_pt_PT_v2.txt |  123 
 pt_PT/description.xml|2 
 pt_PT/pt_PT.dic  |   19 
 pt_PT/th_pt_PT_v2.dat|107769 
---
 4 files changed, 91971 insertions(+), 15942 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild solenv/Module_solenv.mk solenv/PythonTest_solenv_python.mk solenv/qa

[Michael Stahl]

 solenv/Module_solenv.mk  |2 --
 solenv/PythonTest_solenv_python.mk   |5 +
 solenv/gbuild/extensions/post_GbuildToIde.mk |3 ++-
 solenv/qa/python/gbuildtoide.py  |7 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 6677759c29620796540a0265c4f6d0671f6a42c6
Author: Michael Stahl 
Date:   Mon Oct 24 14:12:40 2016 +0200

solenv: force gbuildtoide test to use the same "make" as the caller

Possibly mis-matching make binaries could be the reason behind failures
that have been observed on Jenkins:

make[3]: Entering directory 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest'
make[3]: *** internal error: invalid --jobserver-fds string 
'gmake_semaphore_5488'.  Stop.

Also, to enable this: Revert "Revert "prep WinResTarget for WNT in testdir""

This reverts commit 6e261cb19e5751eb0553ad0c5b357b1a5747518c.

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

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index f471374..d179771 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -22,11 +22,9 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
PythonTest_solenv_python \
 ))
 endif
-endif
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/PythonTest_solenv_python.mk 
b/solenv/PythonTest_solenv_python.mk
index 8985ce2..8ed1c20 100644
--- a/solenv/PythonTest_solenv_python.mk
+++ b/solenv/PythonTest_solenv_python.mk
@@ -13,4 +13,9 @@ $(eval $(call 
gb_PythonTest_add_modules,solenv_python,$(SRCDIR)/solenv/qa/python
gbuildtoide \
 ))
 
+# force gbuildtoide.py to use the same make binary as is used here
+$(eval $(call gb_PythonTest_set_defs,solenv_python,\
+MAKE="$(MAKE)" \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_GbuildToIde.mk 
b/solenv/gbuild/extensions/post_GbuildToIde.mk
index c8087ba..74a867c 100644
--- a/solenv/gbuild/extensions/post_GbuildToIde.mk
+++ b/solenv/gbuild/extensions/post_GbuildToIde.mk
@@ -18,7 +18,8 @@ foo:
true
 
 define gb_LinkTarget__command
-mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2))
+mkdir -p $(WORKDIR)/GbuildToIde/$(dir $(2)) $(WORKDIR)/Headers/$(dir $(2))
+$(if $(filter WNT,$(OS)),mkdir -p $(dir $(call 
gb_WinResTarget_get_target,dummy)))
 printf '{"LINKTARGET": "%s"' '$(2)' > $(WORKDIR)/GbuildToIde/$(2)
 printf ', "ILIBTARGET": "%s"' '$(ILIBTARGET)' >> $(WORKDIR)/GbuildToIde/$(2)
 printf ', "COBJECTS": "%s"' '$(COBJECTS)' >> $(WORKDIR)/GbuildToIde/$(2)
diff --git a/solenv/qa/python/gbuildtoide.py b/solenv/qa/python/gbuildtoide.py
index 11e66a8..af2014d 100644
--- a/solenv/qa/python/gbuildtoide.py
+++ b/solenv/qa/python/gbuildtoide.py
@@ -18,13 +18,18 @@ import tempfile
 class CheckGbuildToIde(unittest.TestCase):
 def setUp(self):
 self.tempwork = tempfile.mkdtemp()
+if os.environ['OS'] == 'WNT':
+self.tempworkmixed = self.tempwork.replace('\\','/')
+else:
+self.tempworkmixed = self.tempwork
 
 def tearDown(self):
 subprocess.check_call(['rm', '-rf', self.tempwork])
 
 def test_gbuildtoide(self):
 os.chdir(os.path.join(os.environ['SRCDIR'], 'solenv', 'qa', 'python', 
'selftest'))
-subprocess.check_call(['make', 'gbuildtoide', 'WORKDIR=%s' % 
self.tempwork])
+make = os.environ['MAKE']
+subprocess.check_call([make, 'gbuildtoide', 'WORKDIR=%s' % 
self.tempworkmixed])
 jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToIde', 
'Library'))
 gbuildlibs = []
 for jsonfilename in jsonfiles:
___
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-1-0' - 2 commits - loleaflet/src

[Andras Timar]

 loleaflet/src/control/Control.Tabs.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 418361e21af10b336b7db979a2ade4e712c79ed5
Author: Andras Timar 
Date:   Mon Oct 24 20:54:55 2016 +0200

loleaflet: add loleaflet-font class to Calc tab context menu

(cherry picked from commit ae0b3a6cac374f7cfdfd310b7a2fce6f95971032)

diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 4dd43cb..d1e6bf9 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -32,6 +32,7 @@ L.Control.Tabs = L.Control.extend({
 
$.contextMenu({
selector: '.spreadsheet-context-menu',
+   className: 'loleaflet-font',
callback: function(key, options) {
var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
 
commit 26fded56040c7e710bc324b0b9e1ab98424e0ebd
Author: Andras Timar 
Date:   Mon Oct 24 20:52:52 2016 +0200

loleaflet: typo: initalized -> initialized

(cherry picked from commit 67d21d682d273e134ceae41dc4d7d6a51ee994e5)

diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 7e4bd46..4dd43cb 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -6,7 +6,7 @@
 L.Control.Tabs = L.Control.extend({
onAdd: function(map) {
map.on('updatepermission', this._onUpdatePermission, this);
-   this._initalized = false;
+   this._initialized = false;
},
 
_onUpdatePermission: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 loleaflet/src/control/Control.Tabs.js |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ae0b3a6cac374f7cfdfd310b7a2fce6f95971032
Author: Andras Timar 
Date:   Mon Oct 24 20:54:55 2016 +0200

loleaflet: add loleaflet-font class to Calc tab context menu

diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 4dd43cb..d1e6bf9 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -32,6 +32,7 @@ L.Control.Tabs = L.Control.extend({
 
$.contextMenu({
selector: '.spreadsheet-context-menu',
+   className: 'loleaflet-font',
callback: function(key, options) {
var nPos = 
parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
 
commit 67d21d682d273e134ceae41dc4d7d6a51ee994e5
Author: Andras Timar 
Date:   Mon Oct 24 20:52:52 2016 +0200

loleaflet: typo: initalized -> initialized

diff --git a/loleaflet/src/control/Control.Tabs.js 
b/loleaflet/src/control/Control.Tabs.js
index 7e4bd46..4dd43cb 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -6,7 +6,7 @@
 L.Control.Tabs = L.Control.extend({
onAdd: function(map) {
map.on('updatepermission', this._onUpdatePermission, this);
-   this._initalized = false;
+   this._initialized = false;
},
 
_onUpdatePermission: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas_k]

 icon-themes/breeze/update-icons.py |   24 
 1 file changed, 24 deletions(-)

New commits:
commit e28b8b779b1465d72bc089138fde925e34e11893
Author: andreas_k 
Date:   Mon Oct 24 20:26:59 2016 +0200

remove link to github cause breeze_svg are now in core

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

diff --git a/icon-themes/breeze/update-icons.py 
b/icon-themes/breeze/update-icons.py
deleted file mode 100755
index 81014d2..000
--- a/icon-themes/breeze/update-icons.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/python3
-# Copyright 2014 Jonathan Riddell 
-# May be copied under the MPLv2
-# Map breeze freedesktop named icons to libreoffice icon names
-
-import os
-import subprocess
-
-if os.path.isdir("plasma-next-icons"):
-os.chdir("plasma-next-icons")
-subprocess.check_call(["git", "pull", "-r"])
-os.chdir("..")
-else:
-subprocess.check_call(["git", "clone", 
"https://github.com/NitruxSA/plasma-next-icons.git";])
-
-mapping = {}
-
-mappingFile = open('mapping', 'r')
-for line in mappingFile:
-freeDesktopFile = "plasma-next-icons/" + line.rsplit(" ")[0]
-libreOfficeFile = line.rsplit(" ")[1].rstrip()
-size = line.rsplit(" ")[2].rstrip()
-print(freeDesktopFile + " → " + libreOfficeFile + " @ " + size+"x"+size)
-subprocess.check_call(["ksvgtopng", size, size, freeDesktopFile, 
libreOfficeFile])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 sc/source/core/data/table3.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2ed5057993fa8d0f57531303e6c9fafc37138737
Author: Aron Budea 
Date:   Fri Oct 14 15:37:48 2016 +0200

tdf#79892: Improve performance of transliteration

Pass resolved language to transliterate call, so it doesn't
have to be resolved each time inside.

Change-Id: Ibcad3b8517cb92c3462e14207c0a79ca2c76d73b
Reviewed-on: https://gerrit.libreoffice.org/29829
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1784b1c..2674f3f 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2500,11 +2500,12 @@ public:
 else
 {
 OUString aQueryStr = rItem.maString.getString();
+const LanguageType nLang = 
ScGlobal::pSysLocale->GetLanguageTag().getLanguageType();
 OUString aCell( mpTransliteration->transliterate(
-aCellStr.getString(), ScGlobal::eLnge, 0, 
aCellStr.getLength(),
+aCellStr.getString(), nLang, 0, aCellStr.getLength(),
 nullptr ) );
 OUString aQuer( mpTransliteration->transliterate(
-aQueryStr, ScGlobal::eLnge, 0, aQueryStr.getLength(),
+aQueryStr, nLang, 0, aQueryStr.getLength(),
 nullptr ) );
 sal_Int32 nIndex = (rEntry.eOp == SC_ENDS_WITH || 
rEntry.eOp == SC_DOES_NOT_END_WITH) ?
 (aCell.getLength() - aQuer.getLength()) : 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_scalc.mk help3xsl/get_bookmark.sh source/text

[Chandanathil P . Geevan]

 AllLangHelp_scalc.mk  |3 
 help3xsl/get_bookmark.sh  |   14 -
 source/text/scalc/01/04060102.xhp |  264 ++
 source/text/scalc/01/common_func_workdaysintl.xhp |  163 +
 source/text/scalc/01/func_networkdays.intl.xhp|   65 +
 source/text/scalc/01/func_networkdays.xhp |6 
 source/text/scalc/01/func_workday.xhp |6 
 source/text/scalc/01/func_workdays.intl.xhp   |   66 +
 8 files changed, 445 insertions(+), 142 deletions(-)

New commits:
commit b560ca36513ef209b23081dc5b971d30dd60e5f1
Author: Chandanathil P. Geevan 
Date:   Mon Oct 24 01:05:12 2016 -0200

tdf#80439 Help pages for (NET)WORKDAYS.INTL

removed useless file
replaced commas with semicolons in function expression

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

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 4574dfc..e9cb083 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -220,7 +220,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_isoweeknum \
 helpcontent2/source/text/scalc/01/func_minute \
 helpcontent2/source/text/scalc/01/func_month \
+helpcontent2/source/text/scalc/01/common_func_workdaysintl \
 helpcontent2/source/text/scalc/01/func_networkdays \
+helpcontent2/source/text/scalc/01/func_networkdays.intl \
+helpcontent2/source/text/scalc/01/func_workdays.intl \
 helpcontent2/source/text/scalc/01/func_numbervalue \
 helpcontent2/source/text/scalc/01/func_now \
 helpcontent2/source/text/scalc/01/func_second \
diff --git a/help3xsl/get_bookmark.sh b/help3xsl/get_bookmark.sh
index 2ae124c..b8e7ee6 100755
--- a/help3xsl/get_bookmark.sh
+++ b/help3xsl/get_bookmark.sh
@@ -1,11 +1,11 @@
 #/bin/bash
-
+#*--
+#* 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/.
+#*
 
 stub1=''
 stub2=''
diff --git a/source/text/scalc/01/04060102.xhp 
b/source/text/scalc/01/04060102.xhp
index 09f3bf7..47e8ce1 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
+-->
+
 
-
-Date & Time Functions
-/text/scalc/01/04060102.xhp
-
+  
+Date & Time Functions
+/text/scalc/01/04060102.xhp
+  
 
+
 
-date and time functions
-functions; date & time
-Function Wizard; date & time
+
+
+  date and time functions
+  functions; date & time
+  Function Wizard; date & time
 
-Date & Time Functions
-These spreadsheet functions are used 
for inserting and editing dates and times. 
-
+
+
+Date 
& Time Functions
+These spreadsheet functions are used for inserting and 
editing dates and times. 
+
 
 
 
+
 
-The 
functions whose names end with _ADD or _EXCEL2003 return the same results as 
the corresponding Microsoft Excel 2003 functions without the suffix. Use the 
functions without suffix to get results based on international 
standards.
+The functions whose 
names end with _ADD or _EXCEL2003 return the same results as the corresponding 
Microsoft Excel 2003 functions without the suffix. Use the functions without 
suffix to get results based on international standards.
 
-$[officename] internally handles a date/time value as a numerical 
value. If you assign the numbering format "Number" to a date or time value, it 
is converted to a number. For example, 01/01/2000 12:00 PM, converts to 
36526.5. The value preceding the decimal point corresponds to the date; the 
value following the decimal point corresponds to the time. If you do not want 
to see this type of numerical date or time representation, change the number 
format (date or time) accordingly. To do this, select the cell containing the 
date or time value, call its context menu and select Format Cells. 
The Numbers tab page contains the functions for defining the 
number format.
-Date base for day zero
-Dates are calculated as offsets from a starting day zero. You can 
set the day zero to be one of the following:
+$[officename] 
internally handles a date/time value as a numerical value. If you assign the 
numbering format "Number" to a date or time value, it is converted to a number. 
For example, 01/01/2000 12:00 PM, converts to 36526.5. The value preceding the 
decimal point corresponds to the date; the value following the decimal point 
corresponds to the time. If you do not want to see this type of numerical date 
or time representation, change the number format (date or time) accordingly. To 
do this, select the cell containing the date or time value, call its context 
menu and select Format Cells. The Numbers tab page 
contains the functio

[Libreoffice-commits] core.git: helpcontent2

[Chandanathil P . Geevan]

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

New commits:
commit e3088f21d6227af67c955d91c536dc1ecfdea476
Author: Chandanathil P. Geevan 
Date:   Mon Oct 24 01:05:12 2016 -0200

Updated core
Project: help  b560ca36513ef209b23081dc5b971d30dd60e5f1

tdf#80439 Help pages for (NET)WORKDAYS.INTL

removed useless file
replaced commas with semicolons in function expression

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

diff --git a/helpcontent2 b/helpcontent2
index a4da1a4..b560ca3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a4da1a4e16caf0c413b5a4e4f3e2e7c068fede51
+Subproject commit b560ca36513ef209b23081dc5b971d30dd60e5f1
___
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' - desktop/source include/opencl opencl/source

[Tomaž Vajngerl]

 desktop/source/app/opencl.cxx|3 +--
 include/opencl/openclwrapper.hxx |5 -
 opencl/source/openclwrapper.cxx  |   21 ++---
 3 files changed, 23 insertions(+), 6 deletions(-)

New commits:
commit 5f36c66183049522977a386d9afce462ac5d3ec0
Author: Tomaž Vajngerl 
Date:   Tue Oct 18 23:53:44 2016 +0200

tdf#103395 opencl: don't initialize OpenCL when disabled

If SAL_DISABLE_OPENCL is set we don't want to do any kind of
OpenCL initialization. Put an extra guard in fillOpenCLInfo
(and similar methods in opencl package) to prevent that.

Put the check if OpenCL can be used into one place which checks
SAL_DISABLE_OPENCL and UseOpenCL in configuration.

Reviewed-on: https://gerrit.libreoffice.org/30025
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 21e8ed8b5f032f63012a7ee84bce64fac218154f)

Change-Id: Icc216d4299d3a7942843117ab9b9411de8075b11
Reviewed-on: https://gerrit.libreoffice.org/30220
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 13161f3..791b7a9 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -117,8 +117,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 
 void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop)
 {
-if (getenv("SAL_DISABLE_OPENCL") ||
-!officecfg::Office::Common::Misc::UseOpenCL::get())
+if (!opencl::canUseOpenCL())
 return;
 
 SAL_INFO("opencl", "Initiating test of OpenCL device");
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 233412f..5f71b2a 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -26,7 +26,8 @@
 
 #include 
 
-namespace opencl {
+namespace opencl
+{
 
 struct KernelEnv
 {
@@ -56,6 +57,8 @@ struct OPENCL_DLLPUBLIC GPUEnv
 extern OPENCL_DLLPUBLIC GPUEnv gpuEnv;
 extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures;
 
+OPENCL_DLLPUBLIC bool canUseOpenCL();
+
 OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const 
char * clFileName );
 OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuEnv, const char* filename, int idx);
 OPENCL_DLLPUBLIC void setKernelEnv( KernelEnv *envInfo );
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index 5d40a54..dcc55d0 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -32,6 +32,8 @@
 
 #include 
 
+#include 
+
 #ifdef _WIN32
 #include 
 #include 
@@ -64,7 +66,8 @@ namespace opencl {
 GPUEnv gpuEnv;
 sal_uInt64 kernelFailures = 0;
 
-namespace {
+namespace
+{
 
 bool bIsInited = false;
 
@@ -693,7 +696,9 @@ bool createPlatformInfo(cl_platform_id nPlatformId, 
OpenCLPlatformInfo& rPlatfor
 const std::vector& fillOpenCLInfo()
 {
 static std::vector aPlatforms;
-if(!aPlatforms.empty())
+
+// return early if we already initialized or can't use OpenCL
+if (!aPlatforms.empty() || !canUseOpenCL())
 return aPlatforms;
 
 int status = clewInit(OPENCL_DLL_NAME);
@@ -776,9 +781,16 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, 
size_t& rDeviceId, size_
 
 }
 
+bool canUseOpenCL()
+{
+if (getenv("SAL_DISABLE_OPENCL") || 
!officecfg::Office::Common::Misc::UseOpenCL::get())
+return false;
+return true;
+}
+
 bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool 
bForceEvaluation, OUString& rOutSelectedDeviceVersionIDString)
 {
-if(fillOpenCLInfo().empty() || getenv("SAL_DISABLE_OPENCL"))
+if (!canUseOpenCL() || fillOpenCLInfo().empty())
 return false;
 
 cl_device_id pDeviceId = nullptr;
@@ -854,6 +866,9 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 
 void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId)
 {
+if (!canUseOpenCL())
+return;
+
 int status = clewInit(OPENCL_DLL_NAME);
 if (status < 0)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sd/source/ui/unoidl/unomodel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59ec27f44630fe129a590ba4caf6998bb671ecb5
Author: Stephan Bergmann 
Date:   Mon Oct 24 17:53:01 2016 +0200

Calculate size of embedded Impress document properly

The '- 1's had been like that ever since
cbd8e4d144757f40b75063bb4ab0e13ca2cfaad0 "added VisibleArea and MapUnit
properties" but caused the following problem, suggesting that they may have 
been
an off-by-one error right from the start:

Opening an .odt Writer doc with an embedded (via "Insert - Object - OLE
Object... - Create new - LibreOffice 5.3 Presentation") Impress doc for 
which
the .odt's content.xml records

  

causes XMLTextFrameContext_Impl::Create
(xmloff/source/text/XMLTextFrameContext.cxx) to create a size (in 100th 
mm?) of
14099x, which is converted to 7993x5669 twips, which are then passed to 
an
SwFormatFrameSize ctor (sw/source/core/layout/atrfrm.cxx).

However, double-clicking into the Writer doc's Impress area (to make the 
Impress
doc editable) and then clicking back into the outer Writer doc's area (to 
put
the Impress doc back into non-editing mode) causes the Writer doc to be
considered modified (e.g., the "Save" icon gets a small green "plus" 
overlay)
due to the call to SfxObjectShell::SetModified at

> SfxObjectShell::SetModified(bool) (this=0x21293a0, bModifiedP=true) at 
sfx2/source/doc/objmisc.cxx:314
> SwDocShell::SetModified(bool) (this=0x21293a0, bSet=true) at 
sw/source/uibase/app/docsh2.cxx:1243
> SwDocShell::Ole2ModifiedHdl(bool) (this=0x21293a0, bNewStatus=true) at 
sw/source/uibase/app/docsh.cxx:1093
> SwDocShell::LinkStubOle2ModifiedHdl(void*, bool) (instance=0x21293a0, 
data=true) at sw/source/uibase/app/docsh.cxx:1090
> Link::Call(bool) const (this=0xa32c0c8, data=true) at 
include/tools/link.hxx:84
> sw::DocumentStateManager::SetModified() (this=0x82e77f0) at 
sw/source/core/doc/DocumentStateManager.cxx:48
> SwDoc::SetAttr(SfxItemSet const&, SwFormat&) (this=0xa32c050, 
rSet=SfxItemSet of pool 0x21dbd60 with parent 0x0 and Which ranges: [(88, 88)] 
= {...}, rFormat=...) at sw/source/core/doc/docfmt.cxx:492
> SwDoc::SetAttr(SfxPoolItem const&, SwFormat&) (this=0xa32c050, rAttr=..., 
rFormat=...) at sw/source/core/doc/docfmt.cxx:468
> SwFlyFrame::ChgSize(Size const&) (this=0xa14ae10, aNewSize=Size = {...}) 
at sw/source/core/layout/fly.cxx:1993
> SwFEShell::RequestObjectResize(SwRect const&, 
com::sun::star::uno::Reference const&) 
(this=0x83fc880, rRect=SwRect = {...}, xObj=uno::Reference to 
(OCommonEmbeddedObject *) 0x7fff745f7530) at 
sw/source/core/frmedt/fefly1.cxx:1334
> SwOleClient::ViewChanged() (this=0x4a15a10) at 
sw/source/uibase/uiview/swcli.cxx:151
> SfxInPlaceClient::Invalidate() (this=0x4a15a10) at 
sfx2/source/view/ipclient.cxx:812
> SfxInPlaceClient::SetObjAreaAndScale(Rectangle const&, Fraction const&, 
Fraction const&) (this=0x4a15a10, rArea=Rectangle = {...}, rScaleWidth=Fraction 
containing std::unique_ptr containing 0x1d47a40, 
rScaleHeight=Fraction containing std::unique_ptr containing 
0x8c0d910) at sfx2/source/view/ipclient.cxx:785
> SwWrtShell::CalcAndSetScale(svt::EmbeddedObjectRef&, SwRect const*, 
SwRect const*, bool) (this=0x83fc880, xObj=..., pFlyPrtRect=0x0, 
pFlyFrameRect=0x0, bNoTextFramePrtAreaChanged=false) at 
sw/source/uibase/wrtsh/wrtsh1.cxx:825
> SwWrtShell::LaunchOLEObj(long) (this=0x83fc880, nVerb=0) at 
sw/source/uibase/wrtsh/wrtsh1.cxx:591
> SwEditWin::MouseButtonDown(MouseEvent const&) (this=0x490b2e0, 
_rMEvt=...) at sw/source/uibase/docvw/edtwin.cxx:3366
> ImplHandleMouseEvent(VclPtr const&, MouseNotifyEvent, bool, 
long, long, unsigned long, unsigned short, MouseEventModifiers) (xWindow=..., 
nSVEvent=MouseNotifyEvent::MOUSEBUTTONDOWN, bMouseLeave=false, nX=750, nY=341, 
nMsgTime=32828148, nCode=1, nMode=(MouseEventModifiers::SIMPLECLICK | 
MouseEventModifiers::SELECT)) at vcl/source/window/winproc.cxx:698
> ImplHandleSalMouseButtonDown(vcl::Window*, SalMouseEvent*) 
(pWindow=0x19d19a0, pEvent=0x7fffc928) at vcl/source/window/winproc.cxx:1999
> ImplWindowFrameProc(vcl::Window*, SalEvent, void const*) 
(_pWindow=0x19d19a0, nEvent=SalEvent::MouseButtonDown, pEvent=0x7fffc928) 
at vcl/source/window/winproc.cxx:2329
> SalFrame::CallCallback(SalEvent, void const*) const (this=0x1996820, 
nEvent=SalEvent::MouseButtonDown, pEvent=0x7fffc928) at 
vcl/inc/salframe.hxx:280
> GtkSalFrame::CallCallbackExc(SalEvent, void const*) const 
(this=0x1996820, nEvent=SalEvent::MouseButtonDown, pEvent=0x7fffc928) at 
vcl/unx/gtk3/gtk3gtkframe.cxx:4219
> GtkSalFrame::signalButton(_GtkWidget*, _GdkEventButton*, void*) 
(pEvent=0x16403d0, frame=0x1996820) at vcl/unx/gtk3/gtk3gtkframe.cxx:2615
>  (instance=instance@entry=0x16f0e20, 
signal_id=, detail=detail@entry=0) at 

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

[Hieronymous]

 sfx2/source/doc/doctempl.cxx |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 39851c7f780e548d494a9ef8bdf256b32a631f00
Author: Hieronymous 
Date:   Sat Oct 15 21:06:28 2016 +0530

tdf#75280 Clean up usage of sal_uIntPtr.

doctempl.hxx doesn't contain any sal_uIntPtr instances. GetCount and
GetRegionCount functions return sal_uInt16 hence sal_uIntPtr instances
have been converted to sal_uInt16.

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

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index a1c3134..28a9976 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -341,9 +341,9 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const
 if ( !pImp->Construct() )
 return 0;
 
-sal_uIntPtr nCount = pImp->GetRegionCount();
+sal_uInt16 nCount = pImp->GetRegionCount();
 
-return (sal_uInt16) nCount;
+return nCount;
 }
 
 
@@ -368,12 +368,12 @@ sal_uInt16 SfxDocumentTemplates::GetCount
 return 0;
 
 RegionData_Impl *pData = pImp->GetRegion( nRegion );
-sal_uIntPtrnCount = 0;
+sal_uInt16nCount = 0;
 
 if ( pData )
 nCount = pData->GetCount();
 
-return (sal_uInt16) nCount;
+return nCount;
 }
 
 
@@ -1152,16 +1152,16 @@ bool SfxDocumentTemplates::GetLogicNames
 DocTempl_EntryData_Impl  *pEntry = nullptr;
 bool bFound = false;
 
-sal_uIntPtr nCount = GetRegionCount();
+sal_uInt16 nCount = GetRegionCount();
 
-for ( sal_uIntPtr i=0; !bFound && (iGetRegion( i );
 if ( pData )
 {
-sal_uIntPtr nChildCount = pData->GetCount();
+sal_uInt16 nChildCount = pData->GetCount();
 
-for ( sal_uIntPtr j=0; !bFound && (jGetEntry( j );
 if ( pEntry && pEntry->GetTargetURL() == aPath )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: It seems LO doesn't handle correctly complex HTTP queries

[Stephan Bergmann]

On 10/24/2016 03:19 PM, Giuseppe Castagno wrote:

working on bug


I came across a couple of complex HTTP queries that IMHO LO doesn't
handle correctly.

One query full URI is:



while LO WebDAV percent-encodes into:



That is, LO detects a HTTP query start at the first '?' from the end of
the URI and not at the first '?' after the last segment of the path, as
it should be according to
, and
.

Furthermore, it doesn't seems to encode correctly the query body, but I
still have to dig deeper for that.

I think that the WebDAV UCP provider should not change the HTTP query it
receives, but the query should be correctly set and percent-encoded by
the client application (e.g. framework).

This means that the '?' character should be percent-encoded as %3F into
the path part of the URI before being presented to WebDAV provider, this
to prevent possibly wrong interpretation.

I'd like to change the way the WebDAV provider deals with HTTP query,
that implies the correct percent-encoding of '?' into %3F in UCB
provider clients.
The query re-encoding is done here:



ucb_impl::urihelper::encodeURI (ucb/source/ucp/inc/urihelper.hxx) indeed 
looks very broken; it should not be used.  (If there is real need to 
"fix" URIs, INetURLObject has capabilities that are probably less broken 
than those of this encodeURI.)


Apart from the use of encodeURI in 
ucb/source/ucp/webdav-neon/NeonUri.cxx, the four uses in 
ucb/source/ucp/webdav-neon/DAVTypes.cxx of the form


  ucb_impl::urihelper::encodeURI( NeonUri::unescape( rURL ) )

look especially worrying---NeonUri::unescape is apparently meant to 
unescape individual URL path segments; applying it to a complete URL 
breaks things.

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

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

[Andras Timar]

 loolwsd/FileServer.cpp |9 -
 1 file changed, 9 deletions(-)

New commits:
commit e3029937918f9f65bcfb4db22896e8be78785fbf
Author: Andras Timar 
Date:   Mon Oct 24 16:37:56 2016 +0200

loolwsd: remove unused defines

diff --git a/loolwsd/FileServer.cpp b/loolwsd/FileServer.cpp
index b140cb1..d56824f 100644
--- a/loolwsd/FileServer.cpp
+++ b/loolwsd/FileServer.cpp
@@ -39,15 +39,6 @@
 #include "FileServer.hpp"
 #include "LOOLWSD.hpp"
 
-/* CODE */
-#define LOOLWSD_CODE "This development build is limited to %d documents, and 
%d connections - to avoid the impression that it is suitable for deployment in 
large enterprises. To find out more about deploying and scaling %s checkout - 
%s."
-
-/* PRODUCT */
-#define LOOLWSD_PRODUCT "LibreOffice Online"
-
-/* PRODUCT URL */
-#define LOOLWSD_URL 
"https://wiki.documentfoundation.org/Development/LibreOffice_Online";
-
 using Poco::FileInputStream;
 using Poco::Net::HTMLForm;
 using Poco::Net::HTTPRequest;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 xmlsecurity/source/helper/ooxmlsecexporter.cxx |2 +-
 xmlsecurity/source/helper/xsecctl.cxx  |   20 ++--
 xmlsecurity/source/helper/xsecctl.hxx  |   17 +
 xmlsecurity/source/helper/xsecparser.cxx   |   12 ++--
 xmlsecurity/source/helper/xsecsign.cxx |8 
 xmlsecurity/source/helper/xsecverify.cxx   |4 ++--
 6 files changed, 28 insertions(+), 35 deletions(-)

New commits:
commit 34dc5ea5510df5692addbf4d8559e72085a4835b
Author: Tor Lillqvist 
Date:   Mon Oct 24 12:10:27 2016 +0300

Use an enum class

Change-Id: If75874ee12197edd367f5527a37e467041005794

diff --git a/xmlsecurity/source/helper/xsecctl.cxx 
b/xmlsecurity/source/helper/xsecctl.cxx
index 23df46f..87f65cf 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -61,7 +61,7 @@ XSecController::XSecController( const 
cssu::Reference&
 , m_bIsSAXEventKeeperConnected(false)
 , m_bIsCollectingElement(false)
 , m_bIsBlocking(false)
-, m_nStatusOfSecurityComponents(UNINITIALIZED)
+, m_eStatusOfSecurityComponents(InitializationState::UNINITIALIZED)
 , m_bIsSAXEventKeeperSticky(false)
 , m_pErrorMessage(nullptr)
 , m_nReservedSignatureId(0)
@@ -129,7 +129,7 @@ void XSecController::createXSecComponent( )
 /*
  * marks all security components are not available.
  */
-m_nStatusOfSecurityComponents = FAILTOINITIALIZED;
+m_eStatusOfSecurityComponents = InitializationState::FAILTOINITIALIZED;
 m_xXMLSignature = nullptr;
 m_xXMLDocumentWrapper = nullptr;
 m_xSAXEventKeeper = nullptr;
@@ -183,7 +183,7 @@ void XSecController::createXSecComponent( )
 xSAXEventKeeperStatusChangeBroadcaster
 ->addSAXEventKeeperStatusChangeListener( xStatusChangeListener );
 
-m_nStatusOfSecurityComponents = INITIALIZED;
+m_eStatusOfSecurityComponents = InitializationState::INITIALIZED;
 }
 }
 
@@ -228,12 +228,12 @@ bool XSecController::chainOn( bool bRetrievingLastEvent )
 
 if (!m_bIsSAXEventKeeperSticky && !m_bIsSAXEventKeeperConnected)
 {
-if ( m_nStatusOfSecurityComponents == UNINITIALIZED )
+if ( m_eStatusOfSecurityComponents == 
InitializationState::UNINITIALIZED )
 {
 createXSecComponent();
 }
 
-if ( m_nStatusOfSecurityComponents == INITIALIZED )
+if ( m_eStatusOfSecurityComponents == InitializationState::INITIALIZED 
)
 /*
  * if all security components are ready, chains on the SAXEventKeeper
  */
@@ -455,7 +455,7 @@ void XSecController::startMission(
 {
 m_xUriBinding = xUriBinding;
 
-m_nStatusOfSecurityComponents = UNINITIALIZED;
+m_eStatusOfSecurityComponents = InitializationState::UNINITIALIZED;
 m_xSecurityContext = xSecurityContext;
 m_pErrorMessage = nullptr;
 
@@ -534,7 +534,7 @@ void XSecController::endMission()
 
 for (int i=0; ihttp://www.w3.org/2001/04/xmlenc#sha256";
 #define ALGO_RELATIONSHIP 
"http://schemas.openxmlformats.org/package/2006/RelationshipTransform";
 
-/*
- * status of security related components
- */
-#define UNINITIALIZED 0
-#define INITIALIZED   1
-#define FAILTOINITIALIZED 2
-
 class XSecParser;
 
 class InternalSignatureInformation
@@ -292,7 +285,11 @@ private:
  * a flag representing the current status of security related
  * components.
  */
-sal_Int32 m_nStatusOfSecurityComponents;
+
+/*
+ * status of security related components
+ */
+enum class InitializationState { UNINITIALIZED, INITIALIZED, 
FAILTOINITIALIZED } m_eStatusOfSecurityComponents;
 
 /*
  * a flag representing whether the SAXEventKeeper need to be
diff --git a/xmlsecurity/source/helper/xsecsign.cxx 
b/xmlsecurity/source/helper/xsecsign.cxx
index 6791d40..4a5fb3d 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -313,7 +313,7 @@ bool XSecController::WriteSignature(
  */
 chainOn(true);
 
-if ( m_nStatusOfSecurityComponents == INITIALIZED )
+if ( m_eStatusOfSecurityComponents == InitializationState::INITIALIZED )
 /*
  * if all security components are ready, add the signature
  * stream.
@@ -383,7 +383,7 @@ bool XSecController::WriteOOXMLSignature(const 
uno::Reference&
 // Chain the SAXEventKeeper to the SAX chain.
 chainOn(/*bRetrievingLastEvent=*/true);
 
-if (m_nStatusOfSecurityComponents == INITIALIZED)
+if (m_eStatusOfSecurityComponents == InitializationState::INITIALIZED)
 {
 m_bIsSAXEventKeeperSticky = true;
 m_xSAXEventKeeper->setNextHandler(xDocumentHandler);
diff --git a/xmlsecurity/source/helper/xsecverify.cxx 
b/xmlsecurity/source/helper/xsecverify.cxx
index bded4f8..46946fe 100644
--- a/xmlsecurity/source/helper/xsecverify.cxx
+++ b/xmlsecurity/source/helper/xsecverify.cxx
@@ -46,7 +46,7 @@ namespace cssxs = com::sun::star::xml::sax;
 cssu::Refere

Merging new VCL scheduler feature branch

[Jan-Marek Glogowski]

Hi everybody,

I've updated and fixed the feature branch and I'm confident enough to
merge it :-)

Last build is almost successful
(http://ci.libreoffice.org/job/lo_gerrit/1836/), except that I had three
JUnit failures on Windows for my last three builds, which I couldn't
reproduce locally.

I'll just quote my mail from last month.

Am 16.09.2016 um 23:49 schrieb Jan-Marek Glogowski:
> 
> This fixes my mail merge performance problem since the 5.0 merge of idle
> job handling.
> 
> It completely drops the idea of separated idle and timer handling and
> drops a lot of special handling and workarounds for problems in the
> original code, but keeps the Idle class for convenience. I tried to list
> all the revert commit ids and started to test the original bugs.
> 
> Everything is just scheduled by priority and Idles now get a very low
> one per default, while they previously had the same one then timers.
> Additionally it drops the 1ms lag for tasks, which actually adds up, as
> idle tasks weren't instantly scheduled.
> 
> I already fixed the two most obvious busy loop bugs in Writer with
> workarounds for the general idle job handler and the statistics
> collector. Instead of polling for work I would like to switch these to
> be enabled on demand, but that'll definitely take more work. Currently
> they are converted to timers, which check for work every few seconds,
> then should switch to idle - ok 0ms timeouts, until all work is processed.

The last patch is just a hack. Quite probably setting the document to
the busy state should "simply" disable the DocumentTimerManager, also in
regard to SwLayIdle::DoIdleJob / SwLayIdle::SwLayIdle /
SwViewShell::LayoutIdle. This feels duplicated, but seems quite hard to
untangle.

> I tried to simplify the priority groups to make it easier to select the
> correct one. There are still some suspicions HIGHEST ones. I had to guess
> the new dependencies from the original priority of the idles, but I'm
> quite sure there is some missing stuff. I would like to get some kind of
> annotations to be able to build a priority tree of all of them for a
> better overview.
> 
> It would be great to get feedback from people of all other platforms /
> VCL backends.
> 
> Thanks for your comments and feedback
> 
> Jan-Marek
> 
> P.S. it adds a VCL python GDB script, which can be used to dump the list
> of currently scheduled tasks.
> 
> P.P.S. naming is sill a mess. Sometimes it's task, sometimes event. The
> scheduler class is actually the base class for the timers and idles and
> should be renamed Event or Task.

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

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

[Caolán McNamara]

 sc/uiconfig/scalc/ui/conditionaliconset.ui |   74 +
 1 file changed, 74 insertions(+)

New commits:
commit 0909b2ef68016e21e13cd676a2456e31776e9ec1
Author: Caolán McNamara 
Date:   Mon Oct 24 15:08:00 2016 +0100

add missing conditionaliconset.ui

Change-Id: I48d6b83acbaf702e4be813adfb51ea93c5b65416

diff --git a/sc/uiconfig/scalc/ui/conditionaliconset.ui 
b/sc/uiconfig/scalc/ui/conditionaliconset.ui
new file mode 100644
index 000..fb2048f
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/conditionaliconset.ui
@@ -0,0 +1,74 @@
+
+
+
+  
+  
+True
+False
+6
+
+  
+True
+False
+True
+6
+12
+
+  
+True
+False
+ >= 
+  
+  
+1
+0
+  
+
+
+  
+True
+True
+True
+  
+  
+2
+0
+  
+
+
+  
+True
+False
+
+  Value
+  Percent
+  Percentile
+  Formula
+
+  
+  
+3
+0
+  
+
+
+  
+True
+False
+center
+center
+gtk-missing-image
+  
+  
+0
+0
+  
+
+  
+  
+0
+0
+  
+
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/tools include/vcl rsc/inc rsc/source sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk vcl/source

[Caolán McNamara]

 include/tools/rc.h |3 
 include/tools/rcid.h   |2 
 include/vcl/fixed.hxx  |3 
 rsc/inc/rscdb.hxx  |1 
 rsc/source/parser/rscicpx.cxx  |   18 -
 rsc/source/parser/rscinit.cxx  |4 -
 sc/UIConfig_scalc.mk   |1 
 sc/inc/sc.hrc  |2 
 sc/source/ui/condformat/condformatdlgentry.cxx |   89 +++--
 sc/source/ui/inc/condformatdlg.hrc |4 -
 sc/source/ui/src/condformatdlg.src |   38 --
 sc/uiconfig/scalc/ui/functionpanel.ui  |2 
 vcl/source/control/fixed.cxx   |   25 ---
 13 files changed, 55 insertions(+), 137 deletions(-)

New commits:
commit eac3793d4d92d75bffd9b282f75a9df20ec19299
Author: Caolán McNamara 
Date:   Mon Oct 24 14:35:15 2016 +0100

no FixedImage is loaded from .src anymore

Change-Id: I7c5acd18b14822d6344af3709c6d8cfb343104ef

diff --git a/include/tools/rc.h b/include/tools/rc.h
index 7eab5bf..5355e8f 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -48,9 +48,6 @@ namespace o3tl {
 template<> struct typed_flags : 
is_typed_flags {};
 }
 
-// For "FixedImage" resource:
-#define RSC_FIXEDIMAGE_IMAGE0x0001
-
 // For all menu resources:
 enum class RscMenu {
 Items  = 0x01,
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index c88ee3c..5c2ed2f 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -55,8 +55,6 @@
 
 #define RSC_TEXT(RSC_NOTYPE + 0x57)
 
-#define RSC_FIXEDIMAGE  (RSC_NOTYPE + 0x5a)
-
 #define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
 
 // (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 93dafda..0096a7e 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -161,11 +161,8 @@ private:
 protected:
 SAL_DLLPRIVATE voidImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags,
   const Point& rPos, const Size& rSize );
-SAL_DLLPRIVATE voidImplLoadRes( const ResId& rResId );
-
 public:
 explicitFixedImage( vcl::Window* pParent, WinBits nStyle = 0 );
-explicitFixedImage( vcl::Window* pParent, const ResId& );
 
 virtual voidApplySettings(vcl::RenderContext&) override;
 
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index cbcafe0..4be970f 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -179,7 +179,6 @@ class RscTypCont
 RscTop *InitClassEdit( RscTop * pSuper );
 RscTop *InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
 RscTop *InitClassFixedText( RscTop * pSuper );
-RscTop *InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
 RscTop *InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
 RscTop *InitClassMenuItem( RscTop * pSuper );
 RscTop *InitClassMenu( RscTop * pSuper, RscTop * pMenuItem );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index c502047..01c310d 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -360,24 +360,6 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
 return pClassFixedText;
 }
 
-RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * 
pClassImage )
-{
-AtomnId;
-RscTop *pClassFixedImage;
-
-// initialize class
-nId = pHS->getID( "FixedImage" );
-pClassFixedImage = new RscClass( nId, RSC_FIXEDIMAGE, pSuper );
-pClassFixedImage->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-aNmTb.Put( nId, CLASSNAME, pClassFixedImage );
-
-// initialize variables
-nId = aNmTb.Put( "Fixed", VARNAME );
-pClassFixedImage->SetVariable( nId, pClassImage, nullptr, 0, 
RSC_FIXEDIMAGE_IMAGE );
-
-return pClassFixedImage;
-}
-
 RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
 {
 AtomnId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 68bb4f7..7bd5ea7 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -68,7 +68,6 @@ void RscTypCont::Init()
 RscTop   *  pClassEdit;
 RscTop   *  pClassListBox;
 RscTop   *  pClassFixedText;
-RscTop   *  pClassFixedImage;
 RscTop   *  pClassKeyCode;
 RscTop   *  pLangClassKeyCode;
 
@@ -315,9 +314,6 @@ void RscTypCont::Init()
 pClassFixedText = InitClassFixedText( pClassControl );
 pRoot->Insert( pClassFixedText );
 
-pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage );
-pRoot->Insert( pClassFixedImage );
-
 pClassKeyCode = InitClassKeyCode( pClassMgr, pKey );
 pRoot->Insert( pClassKeyCode );
 {
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 4e42bca..7af35fc 100644
--- a/vcl

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

[Miklos Vajna]

 xmlsecurity/inc/pdfsignaturehelper.hxx |2 
 xmlsecurity/source/helper/documentsignaturemanager.cxx |   15 +++
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |   35 +
 3 files changed, 52 insertions(+)

New commits:
commit 51593c41efd7471777adb520814dede4d3f51044
Author: Miklos Vajna 
Date:   Mon Oct 24 14:41:18 2016 +0200

xmlsecurity: implement PDF signature removal UI

Unlike with ZIP-based storage, it can happen that the removal fails, so
make sure we only remove the signature from the listbox when
PDFDocument::RemoveSignature() succeeds.

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

diff --git a/xmlsecurity/inc/pdfsignaturehelper.hxx 
b/xmlsecurity/inc/pdfsignaturehelper.hxx
index bae8d3c..cd9a3e2 100644
--- a/xmlsecurity/inc/pdfsignaturehelper.hxx
+++ b/xmlsecurity/inc/pdfsignaturehelper.hxx
@@ -46,6 +46,8 @@ public:
 void SetDescription(const OUString& rDescription);
 /// Append a new signature at the end of xInputStream.
 bool Sign(const css::uno::Reference& xInputStream);
+/// Remove the signature at nPosition (and all dependent signatures) from 
xInputStream.
+static bool RemoveSignature(const 
css::uno::Reference& xInputStream, sal_uInt16 nPosition);
 };
 
 #endif // INCLUDED_XMLSECURITY_INC_PDFSIGNATUREHELPER_HXX
diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx 
b/xmlsecurity/source/helper/documentsignaturemanager.cxx
index 1db2319..0a5568f 100644
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@@ -313,6 +313,21 @@ bool DocumentSignatureManager::add(const 
uno::Reference&
 
 void DocumentSignatureManager::remove(sal_uInt16 nPosition)
 {
+if (!mxStore.is())
+{
+// Something not ZIP based, try PDF.
+uno::Reference xInputStream(mxSignatureStream, 
uno::UNO_QUERY);
+if (PDFSignatureHelper::RemoveSignature(xInputStream, nPosition))
+{
+SAL_WARN("xmlsecurity.helper", 
"PDFSignatureHelper::RemoveSignature() failed");
+return;
+}
+
+// Only erase when the removal was successfull, it may fail for PDF.
+
maCurrentSignatureInformations.erase(maCurrentSignatureInformations.begin() + 
nPosition);
+return;
+}
+
 
maCurrentSignatureInformations.erase(maCurrentSignatureInformations.begin() + 
nPosition);
 
 // Export all other signatures...
diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx 
b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
index fdd4ed8..a1b1d20 100644
--- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx
@@ -11,6 +11,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -148,4 +149,38 @@ bool PDFSignatureHelper::Sign(const 
uno::Reference& xInputStre
 return true;
 }
 
+bool PDFSignatureHelper::RemoveSignature(const 
uno::Reference& xInputStream, sal_uInt16 nPosition)
+{
+std::unique_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+xmlsecurity::pdfio::PDFDocument aDocument;
+if (!aDocument.Read(*pStream))
+{
+SAL_WARN("xmlsecurity.helper", "failed to read the document");
+return false;
+}
+
+if (!aDocument.RemoveSignature(nPosition))
+{
+SAL_WARN("xmlsecurity.helper", "failed to remove signature");
+return false;
+}
+
+uno::Reference xStream(xInputStream, uno::UNO_QUERY);
+uno::Reference xTruncate(xStream, uno::UNO_QUERY);
+if (!xTruncate.is())
+{
+SAL_WARN("xmlsecurity.helper", "failed to truncate");
+return false;
+}
+xTruncate->truncate();
+std::unique_ptr 
pOutStream(utl::UcbStreamHelper::CreateStream(xStream, true));
+if (!aDocument.Write(*pOutStream))
+{
+SAL_WARN("xmlsecurity.helper", "failed to write without signature");
+return false;
+}
+
+return true;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit d981691c56759d779d617d749f5b9f6a18ae8a8f
Author: Katarina Behrens 
Date:   Mon Oct 24 15:16:37 2016 +0200

screenshot annotation: put back removed fields

I hate you loplugin !!!

Change-Id: I01067b04005a59b7ecb10a5a72ab6090b7f040a8

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index ca56d1f..5c58660 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -92,8 +92,11 @@ namespace
 class ControlDataEntry
 {
 public:
-ControlDataEntry(const basegfx::B2IRange& rB2IRange)
-: maB2IRange(rB2IRange)
+ControlDataEntry(
+const vcl::Window& rControl,
+const basegfx::B2IRange& rB2IRange)
+: mrControl(rControl),
+maB2IRange(rB2IRange)
 {
 }
 
@@ -102,9 +105,15 @@ public:
 return maB2IRange;
 }
 
+const vcl::Window& getControl() const
+{
+return mrControl;
+}
+
 const OString GetHelpId() const { return mrControl.GetHelpId(); }
 
 private:
+const vcl::Window&  mrControl;
 basegfx::B2IRange   maB2IRange;
 };
 
@@ -275,7 +284,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren(
 
 if (!aCurrentRange.isEmpty())
 {
-rControlDataCollection.push_back(ControlDataEntry(aCurrentRange));
+rControlDataCollection.push_back(ControlDataEntry(rCurrent, 
aCurrentRange));
 }
 
 for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

It seems LO doesn't handle correctly complex HTTP queries

[Giuseppe Castagno]

Hi all,

working on bug


I came across a couple of complex HTTP queries that IMHO LO doesn't 
handle correctly.


One query full URI is:


while LO WebDAV percent-encodes into:


That is, LO detects a HTTP query start at the first '?' from the end of 
the URI and not at the first '?' after the last segment of the path, as 
it should be according to
, and 
.


Furthermore, it doesn't seems to encode correctly the query body, but I 
still have to dig deeper for that.


I think that the WebDAV UCP provider should not change the HTTP query it 
receives, but the query should be correctly set and percent-encoded by 
the client application (e.g. framework).


This means that the '?' character should be percent-encoded as %3F into 
the path part of the URI before being presented to WebDAV provider, this 
to prevent possibly wrong interpretation.


I'd like to change the way the WebDAV provider deals with HTTP query, 
that implies the correct percent-encoding of '?' into %3F in UCB 
provider clients.

The query re-encoding is done here:


Any thoughts?

References:
The HTTP query is defined in 
.

Which in turn links to 


--
Kind Regards,
Giuseppe Castagno
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/source

[Katarina Behrens]

 cui/source/dialogs/screenshotannotationdlg.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 2b34cf0aa20eaa3beba095420aea8e0fffb32749
Author: Katarina Behrens 
Date:   Mon Oct 24 15:16:37 2016 +0200

screenshot annotation: put back removed fields

I hate you loplugin !!!

Change-Id: I01067b04005a59b7ecb10a5a72ab6090b7f040a8

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index ca56d1f..c91e223 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -92,8 +92,11 @@ namespace
 class ControlDataEntry
 {
 public:
-ControlDataEntry(const basegfx::B2IRange& rB2IRange)
-: maB2IRange(rB2IRange)
+ControlDataEntry(
+const vcl::Window& rControl,
+const basegfx::B2IRange& rB2IRange)
+: mrControl(rControl),
+maB2IRange(rB2IRange)
 {
 }
 
@@ -102,6 +105,11 @@ public:
 return maB2IRange;
 }
 
+const vcl::Window& getControl() const
+{
+return mrControl;
+}
+
 const OString GetHelpId() const { return mrControl.GetHelpId(); }
 
 private:
@@ -275,7 +283,7 @@ void ScreenshotAnnotationDlg_Impl::CollectChildren(
 
 if (!aCurrentRange.isEmpty())
 {
-rControlDataCollection.push_back(ControlDataEntry(aCurrentRange));
+rControlDataCollection.push_back(ControlDataEntry(rCurrent, 
aCurrentRange));
 }
 
 for (sal_uInt16 a(0); a < rCurrent.GetChildCount(); a++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/Library_sc.mk   |1 
 sc/inc/sc.hrc  |2 
 sc/source/ui/condformat/condformatdlgentry.cxx |2 
 sc/source/ui/formdlg/privsplt.cxx  |  319 -
 sc/source/ui/inc/condformatdlg.hrc |1 
 sc/source/ui/inc/dwfunctr.hxx  |1 
 sc/source/ui/inc/privsplt.hxx  |   67 -
 sc/source/ui/src/condformatdlg.src |4 
 sc/source/ui/src/scstring.src  |5 
 9 files changed, 7 insertions(+), 395 deletions(-)

New commits:
commit 7a0072474b08f045e5560db7335a4c03d104e40c
Author: Caolán McNamara 
Date:   Mon Oct 24 13:35:10 2016 +0100

move STR_CONDITION resource around

Change-Id: I154ba5fd03974a7c8426fdf71a2253bbbe59ad8c

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0966da0..8cfc7f3 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -902,7 +902,7 @@
 #define SCSTR_FORMULA_AUTOCORRECTION(STR_START + 214)
 
 #define SCSTR_RENAMEOBJECT  (STR_START + 215)
-//free slot
+#define SCSTR_CONDITION (STR_START + 216)
 #define SCSTR_WARN_ME_IN_FUTURE_CHECK   (STR_START + 217)
 
 // header of search result dialog
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 68e25c8..32ba4ed 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -42,7 +42,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, 
ScDocument* pDoc, const S
 maFtCondNr( VclPtr::Create( this, ScResId( FT_COND_NR ) ) ),
 maFtCondition( VclPtr::Create( this, ScResId( FT_CONDITION ) ) 
),
 mnIndex(0),
-maStrCondition(ScResId( STR_CONDITION ).toString()),
+maStrCondition(ScResId(SCSTR_CONDITION).toString()),
 maLbType( VclPtr::Create( this, ScResId( LB_TYPE ) ) ),
 mpDoc(pDoc),
 maPos(rPos)
diff --git a/sc/source/ui/inc/condformatdlg.hrc 
b/sc/source/ui/inc/condformatdlg.hrc
index af801f5..a35e9d6 100644
--- a/sc/source/ui/inc/condformatdlg.hrc
+++ b/sc/source/ui/inc/condformatdlg.hrc
@@ -27,7 +27,6 @@
 
 #define WD_PREVIEW 26
 #define BTN_OPTIONS 30
-#define STR_CONDITION 31
 
 #define FT_RANGE 32
 #define ED_RANGE 33
diff --git a/sc/source/ui/src/condformatdlg.src 
b/sc/source/ui/src/condformatdlg.src
index cf6ae3e..ded2aa6 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -21,10 +21,6 @@ Control RID_COND_ENTRY
 Pos = MAP_APPFONT( 2, 2 );
 Size = MAP_APPFONT( 50, 10 );
 };
-String STR_CONDITION
-{
-Text [ en-US ] = "Condition ";
-};
 
 FixedText FT_CONDITION
 {
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index fab1ebd..70dc432 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -949,4 +949,9 @@ String SCSTR_UNDO_CELL_ANCHOR
 Text [ en-US ] = "Cell Anchor" ;
 };
 
+String SCSTR_CONDITION
+{
+Text [ en-US ] = "Condition ";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 420e215a975a4cb12b03d3487e98345782953b46
Author: Caolán McNamara 
Date:   Mon Oct 24 13:08:37 2016 +0100

drop now unused ScPrivatSplit

Change-Id: I7e7eb4e1d5a4d9f7e419570844f2e06ae4cf999a

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 27326ae..0aa859e 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -466,7 +466,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/ui/formdlg/dwfunctr \
 sc/source/ui/formdlg/formdata \
 sc/source/ui/formdlg/formula \
-sc/source/ui/formdlg/privsplt \
 sc/source/ui/miscdlgs/acredlin \
 sc/source/ui/miscdlgs/anyrefdg \
 sc/source/ui/miscdlgs/autofmt \
diff --git a/sc/source/ui/formdlg/privsplt.cxx 
b/sc/source/ui/formdlg/privsplt.cxx
deleted file mode 100644
index a59a32d..000
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ /dev/null
@@ -1,319 +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 "privsplt.hxx"
-#include 
-
-/***

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

[Noel Grandin]

 writerfilter/source/dmapper/DomainMapper.cxx  |   14 ++
 writerfilter/source/dmapper/DomainMapper.hxx  |3 ---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   16 +---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 -
 writerfilter/source/dmapper/SdtHelper.cxx |8 ++--
 writerfilter/source/dmapper/SdtHelper.hxx |1 -
 writerfilter/source/dmapper/TableManager.cxx  |8 
 writerfilter/source/dmapper/TableManager.hxx  |   21 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|7 +--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx|1 -
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx  |4 ++--
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx  |8 ++--
 12 files changed, 18 insertions(+), 74 deletions(-)

New commits:
commit 3c4c5aa8cce98fb95473d63d05ba9097e9032ccc
Author: Noel Grandin 
Date:   Mon Oct 24 14:29:17 2016 +0200

loplugin:expandablemethods in writerfilter..xmlhelp

Change-Id: I23ce30e2f15b6fe857a727f1ef84c40d8d0b127d

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index f37025f..d69cf50 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -190,9 +190,9 @@ DomainMapper::~DomainMapper()
 // Grab-bag handling
 comphelper::SequenceAsHashMap aProperties;
 // Add the saved w:themeFontLang setting
-aProperties["ThemeFontLangProps"] = 
uno::makeAny(GetThemeFontLangProperties());
+aProperties["ThemeFontLangProps"] = 
uno::makeAny(m_pImpl->GetSettingsTable()->GetThemeFontLangProperties());
 // Add the saved compat settings
-aProperties["CompatSettings"] = uno::makeAny(GetCompatSettings());
+aProperties["CompatSettings"] = 
uno::makeAny(m_pImpl->GetSettingsTable()->GetCompatSettings());
 uno::Reference 
xDocProps(m_pImpl->GetTextDocument(), uno::UNO_QUERY);
 if (xDocProps.is())
 {
@@ -3675,16 +3675,6 @@ beans::PropertyValue DomainMapper::getInteropGrabBag()
 return aRet;
 }
 
-uno::Sequence DomainMapper::GetThemeFontLangProperties() 
const
-{
-return m_pImpl->GetSettingsTable()->GetThemeFontLangProperties();
-}
-
-uno::Sequence DomainMapper::GetCompatSettings() const
-{
-return m_pImpl->GetSettingsTable()->GetCompatSettings();
-}
-
 void DomainMapper::HandleRedline( Sprm& rSprm )
 {
 sal_uInt32 nSprmId = rSprm.getId();
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx 
b/writerfilter/source/dmapper/DomainMapper.hxx
index 764be3c..d1b3622 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -120,9 +120,6 @@ public:
 /// Get the stored tokens and clear the internal storage.
 css::beans::PropertyValue getInteropGrabBag();
 
-css::uno::Sequence GetThemeFontLangProperties() 
const;
-css::uno::Sequence GetCompatSettings() const;
-
 void HandleRedline( Sprm& rSprm );
 
 private:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 980601c..be369fa7 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1682,7 +1682,11 @@ void DomainMapper_Impl::CheckParaMarkerRedline( 
uno::Reference< text::XTextRange
 if ( m_pParaMarkerRedline.get( ) )
 {
 CreateRedline( xRange, m_pParaMarkerRedline );
-ResetParaMarkerRedline( );
+if ( m_pParaMarkerRedline.get( ) )
+{
+m_pParaMarkerRedline.reset();
+m_currentRedline.reset();
+}
 }
 }
 
@@ -5005,16 +5009,6 @@ void DomainMapper_Impl::RemoveTopRedline( )
 m_currentRedline.reset();
 }
 
-void DomainMapper_Impl::ResetParaMarkerRedline( )
-{
-if ( m_pParaMarkerRedline.get( ) )
-{
-m_pParaMarkerRedline.reset();
-m_currentRedline.reset();
-}
-}
-
-
 void DomainMapper_Impl::ApplySettingsTable()
 {
 if (m_pSettingsTable && m_xTextFactory.is())
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index ec40e8e..b643b7f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -773,7 +773,6 @@ public:
 void SetCurrentRedlineRevertProperties( const 
css::uno::Sequence& aProperties );
 void SetCurrentRedlineIsRead();
 void RemoveTopRedline( );
-void ResetParaMarkerRedline( );
 void SetCurrentRedlineInitials( const OUString& sInitials );
 bool IsFirstRun() { return m_bIsFirstRun;}
 void SetIsFirstRun(bool bval) { m_bIsFirstRun = bval;}
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index d2e8ab8..a27c017 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/

Re: Problem building in Gerrit, Windows only.

[Michael Stahl]

On 20.10.2016 10:52, Stephan Bergmann wrote:
> On 10/20/2016 09:13 AM, Giuseppe Castagno wrote:
>> a patch of mine:
>> 
>> always fails in Gerrit Windows build machine in test
>> PythonTest_solenv_python:
>> 
>>
>>
>> Unfortunately I'm not able to reproduce it on my Window 10 build machine
>> (Win10 64bit, VS2013 64bit, LO 32bit) , where that same test doesn't fail.
>>
>> I need help, because I have no idea what's going on.
>> May be make internal error, as stated in these build log lines:
>>
>> "
>> make[3]: Entering directory
>> '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest'
>>
>> make[3]: *** internal error: invalid --jobserver-fds string
>> 'gmake_semaphore_5488'.  Stop.
>> make[3]: Leaving directory
>> '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/windows_msc_dbgutil_32/solenv/qa/python/selftest'
>>
>> "
>> can give some hint?
> 
> Looking at 
> , 
> quite a number of the recent master Gerrit/Jenkins Windows builds are 
> red, and, scanning through their console output, quite a number fail 
> with the same "ERROR: test_gbuildtoide (gbuildtoide.CheckGbuildToIde)" 
> as your 
> .
> 
> Looks like there is still problems there after 
> 
>  
> "prep WinResTarget for WNT in testdir".  Björn?

if i insert a "subprocess.check_call(['/bin/sh', '-c', 'set'])" in that
test i see these variables:

MAKEFLAGS='rs -j --jobserver-fds=3,4'
MAKELEVEL=2
MAKE_TERMERR=/dev/pts/4
MAKE_TERMOUT=/dev/pts/4

but not MAKE itself so the test just invokes the first make in the PATH.

let's try if this helps:
 https://gerrit.libreoffice.org/30226


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

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

[Winfried Donkers]

 formula/source/core/api/token.cxx|4 
 sc/source/core/tool/interpr3.cxx |   13 +++--
 sc/source/filter/excel/xeformula.cxx |1 +
 sc/source/ui/src/scfuncs.src |2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 536258758a9192ce8985d5055edac600568120fc
Author: Winfried Donkers 
Date:   Fri Oct 14 17:34:47 2016 +0200

tdf#103186, make LOGINV ODFF1.2 compliant.

(Also retain Excel-interoperability and backward compatibility with Calc.)

Change-Id: Ibbe7224eabfb776cf6e7ecfeabae6d188178f4ed
Reviewed-on: https://gerrit.libreoffice.org/29885
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index 7c85b15..409c417 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1069,6 +1069,7 @@ inline bool MissingConventionODF::isRewriteNeeded( OpCode 
eOp ) const
 case ocGammaDist:
 case ocPoissonDist:
 case ocAddress:
+case ocLogInv:
 case ocLogNormDist:
 case ocNormDist:
 return true;
@@ -1113,6 +1114,7 @@ inline bool MissingConventionOOXML::isRewriteNeeded( 
OpCode eOp )
 case ocFDist_LT:
 case ocPoissonDist:
 case ocNormDist:
+case ocLogInv:
 case ocLogNormDist:
 case ocHypGeomDist:
 
@@ -1171,6 +1173,7 @@ void FormulaMissingContext::AddMoreArgs( 
FormulaTokenArray *pNewArr, const Missi
 pNewArr->AddDouble( 1.0 );  // 4th, 
Cumulative=true()
 }
 break;
+case ocLogInv:
 case ocLogNormDist:
 if ( mnCurArg == 0 )
 {
@@ -1236,6 +1239,7 @@ void FormulaMissingContext::AddMoreArgs( 
FormulaTokenArray *pNewArr, const Missi
 }
 break;
 
+case ocLogInv:
 case ocLogNormDist:
 if ( mnCurArg == 0 )
 {
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 04b0343..66ca35c 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2147,15 +2147,16 @@ void ScInterpreter::ScSNormInv()
 
 void ScInterpreter::ScLogNormInv()
 {
-if ( MustHaveParamCount( GetByte(), 3 ) )
+sal_uInt8 nParamCount = GetByte();
+if ( MustHaveParamCount( nParamCount, 1, 3 ) )
 {
-double sigma = GetDouble(); // Stdabw
-double mue = GetDouble();   // Mittelwert
-double y = GetDouble(); // y
-if (sigma <= 0.0 || y <= 0.0 || y >= 1.0)
+double fSigma = ( nParamCount == 3 ? GetDouble() : 1.0 );  // Stddev
+double fMue = ( nParamCount >= 2 ? GetDouble() : 0.0 );// Mean
+double fP = GetDouble();   // p
+if ( fSigma <= 0.0 || fP <= 0.0 || fP >= 1.0 )
 PushIllegalArgument();
 else
-PushDouble(exp(mue+sigma*gaussinv(y)));
+PushDouble( exp( fMue + fSigma * gaussinv( fP ) ) );
 }
 }
 
diff --git a/sc/source/filter/excel/xeformula.cxx 
b/sc/source/filter/excel/xeformula.cxx
index b810279..9326121 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1736,6 +1736,7 @@ void XclExpFmlaCompImpl::AppendTrailingParam( 
XclExpFuncData& rFuncData )
 break;
 
 case ocLogNormDist:
+case ocLogInv:
 switch( nParamCount )
  {
 // LOGNORMDIST function needs 3 parameters in Excel
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 84dcc9b..061e7a3 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7600,7 +7600,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 0;
 ID_FUNCTION_GRP_STATISTIC;
 HID_FUNC_LOGINV;
-3;  0;  0;  0;
+3;  0;  1;  1;
 0;
 };
 String 2 // Name of Parameter 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/tools include/vcl rsc/inc rsc/source sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk vcl/source

[Caolán McNamara]

 include/tools/rc.h  |   10 -
 include/tools/rcid.h|2 
 include/vcl/button.hxx  |1 
 include/vcl/layout.hxx  |   18 ++
 include/vcl/split.hxx   |1 
 rsc/inc/rscdb.hxx   |2 
 rsc/source/parser/rscicpx.cxx   |   67 ---
 rsc/source/parser/rscinit.cxx   |5 
 sc/AllLangResTarget_sc.mk   |1 
 sc/UIConfig_scalc.mk|1 
 sc/source/ui/formdlg/dwfunctr.cxx   |  270 +---
 sc/source/ui/formdlg/dwfunctr.hrc   |   26 ---
 sc/source/ui/formdlg/dwfunctr.src   |   97 ---
 sc/source/ui/inc/dwfunctr.hxx   |   30 ---
 sc/source/ui/sidebar/ScPanelFactory.cxx |2 
 sc/uiconfig/scalc/ui/functionpanel.ui   |  141 
 vcl/source/control/button.cxx   |   20 --
 vcl/source/window/builder.cxx   |8 
 vcl/source/window/layout.cxx|  139 +++-
 vcl/source/window/split.cxx |5 
 20 files changed, 326 insertions(+), 520 deletions(-)

New commits:
commit 602274c77fa8134ca097f4d60b9fb75cea0eff78
Author: Caolán McNamara 
Date:   Sun Oct 23 21:11:41 2016 +0100

no ImageButton loaded from .src now

Change-Id: If6f6718e1e6d756b99a499deafa4310c76a75ad3

diff --git a/include/tools/rc.h b/include/tools/rc.h
index 7759037..7eab5bf 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -77,16 +77,6 @@ namespace o3tl {
 template<> struct typed_flags : is_typed_flags {};
 }
 
-// For "ImageButtons":
-enum class RscImageButtonFlags {
-Image   = 0x01,
-Symbol  = 0x02,
-State   = 0x04
-};
-namespace o3tl {
-template<> struct typed_flags : 
is_typed_flags {};
-}
-
 // For "Image":
 enum class RscImageFlags {
 ImageBitmap   = 0x01,
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 4d69c85..c88ee3c 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -49,8 +49,6 @@
 #define RSC_BUTTON  (RSC_NOTYPE + 0x45)
 #define RSC_PUSHBUTTON  (RSC_NOTYPE + 0x46)
 
-#define RSC_IMAGEBUTTON (RSC_NOTYPE + 0x4a)
-
 #define RSC_EDIT(RSC_NOTYPE + 0x52)
 
 #define RSC_LISTBOX (RSC_NOTYPE + 0x55)
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index c7976b4..ff52187 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -500,7 +500,6 @@ private:
 
 public:
  ImageButton( vcl::Window* pParent, WinBits nStyle = 0 );
- ImageButton( vcl::Window* pParent, const ResId& rResId );
 };
 
 class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 715a88f..cbcafe0 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -176,8 +176,6 @@ class RscTypCont
  RscArray * pLangGeo );
 RscTop *InitClassControl( RscTop * pSuper );
 RscTop *InitClassPushButton( RscTop * pSuper );
-RscTop *InitClassImageButton( RscTop * pSuper, RscTop * pClassImage,
-RscEnum * pTriState );
 RscTop *InitClassEdit( RscTop * pSuper );
 RscTop *InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
 RscTop *InitClassFixedText( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e2514b8..c502047 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -281,73 +281,6 @@ RscTop * RscTypCont::InitClassPushButton( RscTop * pSuper )
 return pClassPushButton;
 }
 
-RscTop * RscTypCont::InitClassImageButton( RscTop * pSuper,
-   RscTop * pClassImage,
-   RscEnum * pTriState )
-{
-AtomnId;
-RscTop *pClassImageButton;
-
-// initialize class
-nId = pHS->getID( "ImageButton" );
-pClassImageButton = new RscClass( nId, RSC_IMAGEBUTTON, pSuper );
-pClassImageButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-aNmTb.Put( nId, CLASSNAME, pClassImageButton );
-
-// initialize variables
-{
-nId = aNmTb.Put( "ButtonImage", VARNAME );
-pClassImageButton->SetVariable( nId, pClassImage, nullptr, 0,
- 
(sal_uInt32)RscImageButtonFlags::Image );
-}
-// initialize variables
-{
-AtomnVarId;
-RscEnum   * pSymbol;
-
-aBaseLst.push_back( pSymbol = new RscEnum( pHS->getID( 
"EnumSymbolButton" ), RSC_NOTYPE ) );
-
-SETCONST( pSymbol, "IMAGEBUTTON_DONTKNOW",  SymbolType::DONTKNOW );
-SETCONST( pSymbol, "IMAGEBUTTON_IMAGE", SymbolType::IMAGE );
-SETCONST( pSymbol, "IMAGEBUTTON_ARROW_UP",  SymbolType::ARROW_UP );
-SETCONST( pSymbol, "IMAGEBUTTON_ARROW_DOWN",SymbolType::ARROW_DOWN 
);
-SETCONST( pSymbol,

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit d64a72be9fa480963a69cc5fa869ad651c086e17
Author: Caolán McNamara 
Date:   Mon Oct 24 13:03:53 2016 +0100

Updated core
Project: help  a4da1a4e16caf0c413b5a4e4f3e2e7c068fede51

update help ids for function panel .ui conversion

Change-Id: Ie6623190ca919e7e4cf0d76ba94fd67056a09f3e

diff --git a/helpcontent2 b/helpcontent2
index 30255d8..a4da1a4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 30255d8b05e07fd611338af7b05e22cd2092e6b5
+Subproject commit a4da1a4e16caf0c413b5a4e4f3e2e7c068fede51
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OSX Sierra test fail, with master.

[Michael Stahl]

On 19.10.2016 08:02, Jan Iversen wrote:
>  4.
> cppunittester(39743,0x7fffb04373c0) malloc: *** error for object
> 0x7fd8ab0af400: incorrect checksum for freed object - object was
> probably modified after being freed.
> 
> 
> It seems to me we have a memory fault, in graphic helper, or am I
> completely wrong ?

yes... does "valgrind" exist for macOS?  valgrind.org says "AMD64/Darwin
(Mac OS X 10.10, with initial support for 10.11)" - would be interesting
to know if it works with the usual "make  CppunitTest_... VALGRIND=memcheck"


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

License Statement

[Chandanathil P Geevan]

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

--
Mr. C.P.Geevan, Ph.D.
~~
[M] +91-9824283954; [O] Tel +91-79-40370106; +91-79-65446747
Blog: http://g1talkshop.blogspot.in/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: testing commonsallayout branch

[Milos Sramek]

Hi,

to be sure that I do everything right:

The master build should be downloaded from
http://dev-builds.libreoffice.org/pre-releases/win/x86_64/
http://dev-builds.libreoffice.org/pre-releases/mac/x86_64/
http://dev-builds.libreoffice.org/pre-releases/deb/x86_64/

The builds are from October 21-st - are they already the right ones?

How to select the layout code? Which environment settings to use?

best
Milos

On 2016-10-24 00:30, Khaled Hosny wrote:
> Hi,
>
> Things I’d like to test at this point:
> * master with and without the new layout code activated on the three
>   platforms. To see if we have any regressions or, hopefully, progressions.
> * master with the new layout code across platforms (to see if we really
>   getting identical results as we hope).
>
> Regards,
> Khaled
>
> On Fri, Oct 21, 2016 at 09:18:01PM +0200, Milos Sramek wrote:
>> Hi,
>>
>>
>> I've changed subject, since the discussion went in a different direction.
>>
>> Meanwhile I've discovered, that one can run OSX in a virtual machine :).
>> That fits to my environment well.
>>
>> I've tested a few random files with a few random version on Linux, Mac
>> and Windows. The results:
>> http://bender.dam.fmph.uniba.sk/~milos/roundtrip/odttest-mac-win/rslt-web.ods
>>
>> Brief explanantion:
>> grade 0: pixel level identical
>> grade 1: some differences, probably not visible
>> ...
>> Grade meaning is explained in a comment
>>
>>> is a link to pdf:
>> column LND: side by side
>> column THE: overlay
>> column HLPE: vertically aligned lines
>> column FDE: vertically and horizontally aligned
>>
>> first sheet: print test: printed by tested version (name in header) and
>> in reference version (LO43 on Linux) and compared
>> second sheet: roundtrip test: saved to odt and printed by the reference
>> version. No differences here
>>
>> Which versions should I test? The engines can be specified by
>> environment variable - I can test that too.
>>
>> Is there a way how to install multiple versions in parallel on MAC? I
>> can install only production and development one.
>>
>> best
>> Milos
>>
>>
>> On 2016-10-18 18:36, Khaled Hosny wrote:
>>> On Tue, Oct 18, 2016 at 09:06:42AM +0200, Milos Sramek wrote:
 Dear Khaled,

 do you think that extensive comparison of rendering of numerous
 documents with and without the new layout engine makes sense?
 If yes, I can run my tests in such a way to see if there are any
 differences.
>>> This would be extremely helpful, and more so if it can run on Windows or
>>> Mac.
>>>
 My test documents use latin script except for a few ones in Chinese. So,
 if you happen to have sume documents in Arabic I can add them to my test
 set.
>>> I’ve a random collection of documents somewhere, I’ll clean it up and
>>> send it to you.
>>>
>>> Regards,
>>> Khaled
>>>
>>>
>>> ___
>>> LibreOffice mailing list
>>> LibreOffice@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>>
>> -- 
>> email & jabber: sramek.mi...@gmail.com
>>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice


-- 
email & jabber: sramek.mi...@gmail.com

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

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

[Noel Grandin]

 include/xmloff/txtparae.hxx   |6 --
 include/xmloff/xmlimp.hxx |2 --
 include/xmloff/xmlnumfe.hxx   |1 -
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |   11 ++-
 xmloff/source/chart/SchXMLPlotAreaContext.hxx |3 ---
 xmloff/source/core/xmlimp.cxx |   11 +++
 xmloff/source/draw/sdxmlexp.cxx   |   12 +++-
 xmloff/source/draw/sdxmlexp_impl.hxx  |2 --
 xmloff/source/style/xmlnumfe.cxx  |   13 -
 xmloff/source/text/XMLTextNumRuleInfo.cxx |2 +-
 xmloff/source/text/XMLTextNumRuleInfo.hxx |5 -
 xmloff/source/text/txtparae.cxx   |4 ++--
 xmloff/source/transform/MutableAttrList.cxx   |   10 ++
 xmloff/source/transform/MutableAttrList.hxx   |2 --
 xmloff/source/transform/OOo2Oasis.cxx |9 ++---
 xmloff/source/transform/OOo2Oasis.hxx |2 --
 xmloff/source/transform/Oasis2OOo.cxx |9 ++---
 xmloff/source/transform/Oasis2OOo.hxx |2 --
 18 files changed, 21 insertions(+), 85 deletions(-)

New commits:
commit a41ecf922771904cdebf17b29066389441716b2c
Author: Noel Grandin 
Date:   Mon Oct 24 13:35:09 2016 +0200

loplugin:expandablemethods in xmloff

Change-Id: I995a4167ac4df5ca35d963dcf68ae802a997e1e1

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 1c46342..7855fde 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -546,12 +546,6 @@ public:
 {
 exportPageFrames( bIsProgress );
 }
-void exportFramesBoundToFrame(
-const css::uno::Reference< css::text::XTextFrame >& 
rParentTxtFrame,
-bool bIsProgress )
-{
-exportFrameFrames( false, bIsProgress, &rParentTxtFrame );
-}
 inline const XMLTextListAutoStylePool& GetListAutoStylePool() const;
 
 void SetBlockMode( bool bSet ) { bBlock = bSet; }
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 8ba9695..84e1713 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -256,8 +256,6 @@ public:
 
 virtual ~SvXMLImport() throw() override;
 
-static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
-
 // css::xml::sax::XDocumentHandler
 virtual void SAL_CALL startDocument()
 throw (css::xml::sax::SAXException,
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index c04b8e4..da27110 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -56,7 +56,6 @@ private:
 
 SAL_DLLPRIVATE void AddCalendarAttr_Impl( const OUString& rCalendar );
 SAL_DLLPRIVATE void AddStyleAttr_Impl( bool bLong );
-SAL_DLLPRIVATE void AddTextualAttr_Impl( bool bText );
 SAL_DLLPRIVATE void AddLanguageAttr_Impl( sal_Int32 nLang );
 
 SAL_DLLPRIVATE void AddToTextElement_Impl( const OUString& rString );
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index fe33c1b..48a5a9a 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -666,18 +666,11 @@ 
SchXMLPositionAttributesHelper::~SchXMLPositionAttributesHelper()
 {
 }
 
-bool SchXMLPositionAttributesHelper::hasSize() const
-{
-return m_bHasSizeWidth && m_bHasSizeHeight;
-}
-bool SchXMLPositionAttributesHelper::hasPosition() const
-{
-return m_bHasPositionX && m_bHasPositionY;
-}
 bool SchXMLPositionAttributesHelper::hasPosSize() const
 {
-return hasPosition() && hasSize();
+return (m_bHasPositionX && m_bHasPositionY) && (m_bHasSizeWidth && 
m_bHasSizeHeight);
 }
+
 bool SchXMLPositionAttributesHelper::isAutomatic() const
 {
 return m_bAutoSize || m_bAutoPosition;
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index 17e1a64..612bdbb 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -65,9 +65,6 @@ public:
 css::awt::Rectangle getRectangle() const { return css::awt::Rectangle( 
m_aPosition.X, m_aPosition.Y, m_aSize.Width, m_aSize.Height );}
 
 private:
-bool hasSize() const;
-bool hasPosition() const;
-
 SvXMLImport& m_rImport;
 
 css::awt::Point m_aPosition;
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 638b519..efce026 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -456,18 +456,13 @@ namespace
 class theSvXMLImportUnoTunnelId : public rtl::Static< UnoTunnelIdInit, 
theSvXMLImportUnoTunnelId> {};
 }
 
-// XUnoTunnel & co
-const uno::Sequence< sal_Int8 > & SvXMLImport::getUnoTunnelId() throw()
-{
-return theSvXMLImportUnoTunnelId::get().getSeq();
-}
-
 // XUnoTunnel
 sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& 
rId )
 throw( uno::RuntimeException, 

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

[Dennis Francis]

 sc/inc/document.hxx |5 -
 sc/inc/sc.hrc   |1 +
 sc/inc/sortparam.hxx|1 +
 sc/inc/table.hxx|2 +-
 sc/sdi/scalc.sdi|2 +-
 sc/source/core/data/document.cxx|4 ++--
 sc/source/core/data/sortparam.cxx   |9 ++---
 sc/source/core/data/table1.cxx  |8 +++-
 sc/source/ui/dbgui/tpsort.cxx   |4 
 sc/source/ui/docshell/dbdocfun.cxx  |3 ++-
 sc/source/ui/inc/tpsort.hxx |2 ++
 sc/source/ui/view/cellsh2.cxx   |5 +
 sc/source/ui/view/gridwin.cxx   |1 +
 sc/uiconfig/scalc/ui/sortoptionspage.ui |   32 +++-
 14 files changed, 60 insertions(+), 19 deletions(-)

New commits:
commit 258d039798b9ca4cc95a14d62e30bb725ad2c8ec
Author: Dennis Francis 
Date:   Fri Oct 7 20:50:43 2016 +0530

tdf#100517 : Optionally include comment-only columns when sorting

Change-Id: I6b8d4cceda276bef95b28706fb15cb040e07f4c6
Reviewed-on: https://gerrit.libreoffice.org/29593
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3a53e66..ed7bdab 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1253,13 +1253,16 @@ public:
 If TRUE, do not adjust the top row.
 @param  bStickyLeftCol
 If TRUE, do not adjust the left column.
+@param  bConsiderCellNotes
+If TRUE, consider the presence of cell notes 
besides data.
 
 @returns true if there is any data, false if not.
  */
 boolShrinkToUsedDataArea( bool& o_bShrunk,
   SCTAB nTab, SCCOL& rStartCol, SCROW& 
rStartRow,
   SCCOL& rEndCol, SCROW& rEndRow, bool 
bColumnsOnly,
-  bool bStickyTopRow = false, bool 
bStickyLeftCol = false ) const;
+  bool bStickyTopRow = false, bool 
bStickyLeftCol = false,
+  bool bConsiderCellNotes = false ) 
const;
 
 /**
  * Return the last non-empty row position in given columns that's no
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 31bd7d6..0966da0 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -687,6 +687,7 @@
 #define SID_SORT_ATTRIBS(SC_PARAM_START+3)
 #define SID_SORT_USERDEF(SC_PARAM_START+4)
 #define SID_SORT_NATURALSORT(SC_PARAM_START+5)
+#define SID_SORT_INCCOMMENTS(SC_PARAM_START+6)
 
 // Sidebar -
 
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 268b14c..3351249 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -49,6 +49,7 @@ struct SC_DLLPUBLIC ScSortParam
 boolbByRow;
 boolbCaseSens;
 boolbNaturalSort;
+boolbIncludeComments;
 boolbUserDef;
 boolbIncludePattern;
 boolbInplace;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e163233..350dcbd 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -504,7 +504,7 @@ public:
 
 boolShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, 
SCROW& rStartRow,
   SCCOL& rEndCol, SCROW& rEndRow, bool 
bColumnsOnly,
-  bool bStickyTopRow, bool bStickyLeftCol 
) const;
+  bool bStickyTopRow, bool bStickyLeftCol, 
bool bConsiderCellNotes=false ) const;
 
 SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const;
 
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index fee950c..aff8050 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -1259,7 +1259,7 @@ SfxVoidItem DataSelect SID_DATA_SELECT
 
 
 SfxVoidItem DataSort SID_SORT
-(SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader 
SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem 
NaturalSort SID_SORT_NATURALSORT,SfxBoolItem IncludeAttribs 
SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 
FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 
FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 
FN_PARAM_5,SfxBoolItem Ascending3 FN_PARAM_6)
+(SfxBoolItem ByRows SID_SORT_BYROW,SfxBoolItem HasHeader 
SID_SORT_HASHEADER,SfxBoolItem CaseSensitive SID_SORT_CASESENS,SfxBoolItem 
NaturalSort SID_SORT_NATURALSORT,SfxBoolItem IncludeAttribs 
SID_SORT_ATTRIBS,SfxUInt16Item UserDefIndex SID_SORT_USERDEF,SfxInt32Item Col1 
FN_PARAM_1,SfxBoolItem Ascending1 FN_PARAM_2,SfxInt32Item Col2 
FN_PARAM_3,SfxBoolItem Ascending2 FN_PARAM_4,SfxInt32Item Col3 
FN_PARAM_5,SfxBoolItem Ascending3

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

[Takeshi Abe]

 svl/qa/unit/svl.cxx|   21 +
 svl/source/numbers/zformat.cxx |3 +++
 2 files changed, 24 insertions(+)

New commits:
commit 1bd2f008130c717f8f2acd6edad64e00faa2e98d
Author: Takeshi Abe 
Date:   Fri Oct 21 11:46:47 2016 +0900

tdf#103060 Format "GGG" as the era name of a locale-dependent calendar

by default, as Excel does.

This change applies to "GG" and "G" as well. Note that nothing changes
for Italian locale, in which "GGG" stays as a placeholder for day of week.

Change-Id: Iad68f6a9548b7229930c0e0c518fdb29bfaa026f
Reviewed-on: https://gerrit.libreoffice.org/29724
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 9ae468f..48b5b44 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -60,6 +60,7 @@ public:
 void testSharedStringPoolPurge();
 void testFdo60915();
 void testI116701();
+void testTdf103060();
 void testDateInput();
 void testIsNumberFormat();
 void testUserDefinedNumberFormats();
@@ -71,6 +72,7 @@ public:
 CPPUNIT_TEST(testSharedStringPoolPurge);
 CPPUNIT_TEST(testFdo60915);
 CPPUNIT_TEST(testI116701);
+CPPUNIT_TEST(testTdf103060);
 CPPUNIT_TEST(testDateInput);
 CPPUNIT_TEST(testIsNumberFormat);
 CPPUNIT_TEST(testUserDefinedNumberFormats);
@@ -484,6 +486,25 @@ void Test::testI116701()
 checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
 }
 
+void Test::testTdf103060()
+{
+LanguageType eLang = LANGUAGE_JAPANESE;
+OUString sCode, sExpected;
+double fPreviewNumber = 42655; // equals 2016-10-12
+SvNumberFormatter aFormatter(m_xContext, eLang);
+sCode = "G";
+sExpected = "H"; // Heisei era
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
+sCode = "GG";
+const sal_Unicode EXPECTED_G2[] = {0x5E73};
+sExpected = OUString(EXPECTED_G2, SAL_N_ELEMENTS(EXPECTED_G2));
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
+sCode = "GGG";
+const sal_Unicode EXPECTED_G3[] = {0x5E73, 0x6210};
+sExpected = OUString(EXPECTED_G3, SAL_N_ELEMENTS(EXPECTED_G3));
+checkPreviewString(aFormatter, sCode, fPreviewNumber, eLang, sExpected);
+}
+
 void Test::testDateInput()
 {
 const char* aData[][2] = {
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index a37987e..8178b7e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3264,6 +3264,9 @@ bool SvNumberformat::ImpIsOtherCalendar( const 
ImpSvNumFor& rNumFor ) const
 case NF_KEY_RR :
 case NF_KEY_AAA :
 case NF_KEY_ :
+case NF_KEY_G :
+case NF_KEY_GG :
+case NF_KEY_GGG :
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf89377_tableWithBreakBeforeParaStyle.docx 
|binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |
6 ++
 writerfilter/source/dmapper/DomainMapper.cxx  |   
27 +-
 3 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit d129099624d2b646d975c9567541ed9c18adb7ef
Author: Justin Luth 
Date:   Sat Oct 22 15:20:38 2016 +0300

tdf#89377 writerfilter: table honors ParaStyle break-before-page

.doc format handled in prior patch.

This import .docx patch checks to see if the very first paragraph style
in a table is set with a page-break, and if so, then transfers
that setting to the table itself.

Change-Id: Ibb87eeb0fbdb7fdd84ef43dd1d7e0a6f8e1f8ad5
Reviewed-on: https://gerrit.libreoffice.org/30161
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf89377_tableWithBreakBeforeParaStyle.docx 
b/sw/qa/extras/ooxmlexport/data/tdf89377_tableWithBreakBeforeParaStyle.docx
new file mode 100755
index 000..bf673e8
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf89377_tableWithBreakBeforeParaStyle.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 0a63788..18ab97e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -46,6 +46,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95031, "tdf95031.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(getParagraph(3), "ParaTopMargin"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf89377, 
"tdf89377_tableWithBreakBeforeParaStyle.docx")
+{
+// the paragraph style should set table's text-flow break-before-page
+CPPUNIT_ASSERT_EQUAL( 3, getPages() );
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index b93a965..f37025f 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2533,7 +2533,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 }
 break;
 case NS_ooxml::LN_tblStart:
-
+{
 /*
  * Hack for Importing Section Properties
  * LO is not able to import section properties if first element in the
@@ -2545,8 +2545,31 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 {
 m_pImpl->AddDummyParaForTableInSection();
 }
-m_pImpl->m_nTableDepth++;
 
+// if first paragraph style in table has break-before-page, transfer 
that setting to the table itself.
+if( m_pImpl->m_nTableDepth == 0 )
+{
+const uno::Any aBreakType = 
uno::makeAny(style::BreakType_PAGE_BEFORE);
+const PropertyMapPtr pParagraphProps = 
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
+if( pParagraphProps && 
pParagraphProps->isSet(PROP_PARA_STYLE_NAME) )
+{
+StyleSheetEntryPtr pStyle = nullptr;
+OUString sStyleName;
+pParagraphProps->getProperty(PROP_PARA_STYLE_NAME)->second >>= 
sStyleName;
+if( !sStyleName.isEmpty() && GetStyleSheetTable() )
+pStyle = GetStyleSheetTable()->FindStyleSheetByStyleName( 
sStyleName );
+
+if( pStyle && pStyle->pProperties
+&& pStyle->pProperties->isSet(PROP_BREAK_TYPE)
+&& 
pStyle->pProperties->getProperty(PROP_BREAK_TYPE)->second == aBreakType )
+{
+pParagraphProps->Insert(PROP_BREAK_TYPE, aBreakType);
+}
+}
+}
+
+m_pImpl->m_nTableDepth++;
+}
 break;
 case NS_ooxml::LN_tblEnd:
 m_pImpl->m_nTableDepth--;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 loleaflet/src/layer/tile/TileLayer.js |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d50d3f5b775fe72879aebb623ade2ea7b326e9c9
Author: Pranav Kant 
Date:   Mon Oct 24 16:26:35 2016 +0530

loleaflet: Fix missing comma, semi-colons etc

Change-Id: Ic47e6e44a83c43ff7aea840fb6b04d1ad7c4e4a2

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index cbea6e6..90dcc34 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1920,8 +1920,8 @@ L.TileLayer = L.GridLayer.extend({
var overlayMaps = {
'Tile overlays': this._debugInfo,
'Screen overlays': this._debugInfo2,
-   'Typing': this._debugTyper,
-   }
+   'Typing': this._debugTyper
+   };
L.control.layers({}, overlayMaps, {collapsed: 
false}).addTo(map);
 
this._map.on('layeradd', function(e) {
@@ -2025,7 +2025,7 @@ L.TileLayer = L.GridLayer.extend({
rect.setStyle({fillOpacity: opac - 
0.04});
}
}
-   this._debugTimeoutId = setTimeout(function () { 
map._docLayer._debugTimeout() }, 50);
+   this._debugTimeoutId = setTimeout(function () { 
map._docLayer._debugTimeout(); }, 50);
}
},
 
@@ -2038,7 +2038,7 @@ L.TileLayer = L.GridLayer.extend({
this._postKeyboardEvent('input', 
this._debugLorem.charCodeAt(this._debugLoremPos % this._debugLorem.length), 0);
}
this._debugLoremPos++;
-   this._debugTypeTimeoutId = setTimeout(function () { 
map._docLayer._debugTypeTimeout() }, 50);
+   this._debugTypeTimeoutId = setTimeout(function () { 
map._docLayer._debugTypeTimeout(); }, 50);
}
 
 });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loolwsd/DocumentBroker.cpp loolwsd/LOOLWSD.cpp loolwsd/protocol.txt loolwsd/Storage.cpp loolwsd/Storage.hpp

[Pranav Kant]

 loolwsd/DocumentBroker.cpp |   42 --
 loolwsd/LOOLWSD.cpp|9 -
 loolwsd/Storage.cpp|6 +++---
 loolwsd/Storage.hpp|   13 +
 loolwsd/protocol.txt   |2 +-
 5 files changed, 33 insertions(+), 39 deletions(-)

New commits:
commit 36fece8b07097d8e155f632abdf6c0f907550502
Author: Pranav Kant 
Date:   Sun Oct 23 17:35:46 2016 +0530

loolwsd: Separate WOPI load duration and check fileinfo duration

Add both of them and send them as wopiloadduration to the client,
if storage is WOPI.

Change-Id: I5652d346d70f473624f03536469acf45470db742

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index eeb3fd7..3a5e1be 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -237,19 +237,29 @@ bool DocumentBroker::load(const std::string& sessionId, 
const std::string& jailI
 }
 
 // Lets load the document now
-if (_storage->isLoaded())
+const bool loaded = _storage->isLoaded();
+if (!loaded)
 {
-// Already loaded. Nothing to do.
-return true;
-}
+const auto localPath = _storage->loadStorageFileToLocal();
+_uriJailed = Poco::URI(Poco::URI("file://"), localPath);
+_filename = fileInfo._filename;
 
-const auto localPath = _storage->loadStorageFileToLocal();
-_uriJailed = Poco::URI(Poco::URI("file://"), localPath);
-_filename = fileInfo._filename;
+// Use the local temp file's timestamp.
+_lastFileModifiedTime = 
Poco::File(_storage->getLocalRootPath()).getLastModified();
+_tileCache.reset(new TileCache(_uriPublic.toString(), 
_lastFileModifiedTime, _cacheRoot));
+}
 
-// Use the local temp file's timestamp.
-_lastFileModifiedTime = 
Poco::File(_storage->getLocalRootPath()).getLastModified();
-_tileCache.reset(new TileCache(_uriPublic.toString(), 
_lastFileModifiedTime, _cacheRoot));
+// If its WOPI storage, send the duration that it took for WOPI calls
+if (dynamic_cast(_storage.get()) != nullptr)
+{
+// Get the time taken to load the file from storage
+auto callDuration = 
dynamic_cast(_storage.get())->getWopiLoadDuration();
+// Add the time taken to check file info
+callDuration += fileInfo._callDuration;
+const std::string msg = "stats: wopiloadduration " + 
std::to_string(callDuration.count());
+Log::trace("Sending to Client [" + msg + "].");
+it->second->sendTextFrame(msg);
+}
 
 return true;
 }
@@ -856,16 +866,6 @@ bool DocumentBroker::forwardToClient(const std::string& 
prefix, const std::vecto
 return false;
 }
 
-const std::chrono::duration DocumentBroker::getStorageLoadDuration() 
const
-{
-if (dynamic_cast(_storage.get()) != nullptr)
-{
-return 
dynamic_cast(_storage.get())->getWopiLoadDuration();
-}
-
-return std::chrono::duration::zero();
-}
-
 void DocumentBroker::childSocketTerminated()
 {
 if (!_childProcess->isAlive())
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 10b4e2f..3eefd6d 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -881,15 +881,6 @@ private:
 auto sessionsCount = docBroker->addSession(session);
 Log::trace(docKey + ", ws_sessions++: " + 
std::to_string(sessionsCount));
 
-// If its a WOPI host, return time taken to make calls to it
-const auto storageCallDuration = 
docBroker->getStorageLoadDuration();
-if (storageCallDuration != std::chrono::duration::zero())
-{
-status = "stats: wopiloadduration " + 
std::to_string(storageCallDuration.count());
-Log::trace("Sending to Client [" + status + "].");
-ws->sendFrame(status.data(), (int) status.size());
-}
-
 LOOLWSD::dumpEventTrace(docBroker->getJailId(), id, "NewSession: " 
+ uri);
 
 // Let messages flow.
diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index a20691d..3a00066 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -306,9 +306,8 @@ StorageBase::FileInfo WopiStorage::getFileInfo(const 
Poco::URI& uriPublic)
 Poco::StreamCopier::copyToString(rs, resMsg);
 
 const auto endTime = std::chrono::steady_clock::now();
-const std::chrono::duration diff = (endTime - startTime);
-_wopiLoadDuration += diff;
-Log::debug("WOPI::CheckFileInfo returned: " + resMsg + ". Call duration: " 
+ std::to_string(diff.count()) + "s");
+const std::chrono::duration callDuration = (endTime - startTime);
+Log::debug("WOPI::CheckFileInfo returned: " + resMsg + ". Call duration: " 
+ std::to_string(callDuration.count()) + "s");
 const auto index = resMsg.find_first_of('{');
 if (index != std::string::npos)
 {
@@ -33

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

[Justin Luth]

 sw/CppunitTest_sw_ww8export2.mk|   82 
++
 sw/Module_sw.mk|1 
 sw/qa/extras/ww8export/data/tdf89377_tableWithBreakBeforeParaStyle.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx  |   39 

 sw/source/filter/ww8/ww8par2.cxx   |7 
 5 files changed, 129 insertions(+)

New commits:
commit f5f51cb93d11731c64dfd68044144100f5fc4b28
Author: Justin Luth 
Date:   Fri Oct 21 13:27:42 2016 +0300

tdf#89377 ww8import: table honors ParaStyle break-before-page

MS Word can page-break inside a table at any row
(using paragraph styles from the first column).
Thus a table can be split across many pages.
Writer can't because it ignores all page-breaks while inside a table,
although the entire table itself can specify starting on a new page.

This imported .doc patch checks to see if the very first paragraph style
in a table is set with a page-break, and if so, then transfers
that setting to the table itself. That at least mimics the most
common layout scenario.

Change-Id: Ifcf720e357fdf433c225234aae8e3838f1416422
Reviewed-on: https://gerrit.libreoffice.org/30127
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk
new file mode 100644
index 000..214b500
--- /dev/null
+++ b/sw/CppunitTest_sw_ww8export2.mk
@@ -0,0 +1,82 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8export2))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export2, \
+sw/qa/extras/ww8export/ww8export2 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export2, \
+comphelper \
+cppu \
+cppuhelper \
+$(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
+sal \
+test \
+unotest \
+utl \
+sw \
+tl \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_ww8export2,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_ww8export2,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/qa/extras/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_ww8export2))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_ww8export2))
+$(eval $(call gb_CppunitTest_use_vcl,sw_ww8export2))
+
+$(eval $(call gb_CppunitTest_use_components,sw_ww8export2,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+filter/source/config/cache/filterconfig1 \
+filter/source/storagefilterdetect/storagefd \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/lng \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sw/util/msword \
+sw/util/sw \
+sw/util/swd \
+sfx2/util/sfx \
+svl/source/fsstor/fsstorage \
+svtools/util/svt \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unotools/util/utl \
+unoxml/source/service/unoxml \
+unoxml/source/rdf/unordf \
+uui/util/uui \
+$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
+xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export2))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index d63c5a2..b5950bb 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_ooxmlw14export \
 CppunitTest_sw_ooxmlimport \
 CppunitTest_sw_ww8export \
+CppunitTest_sw_ww8export2 \
 CppunitTest_sw_ww8import \
 CppunitTest_sw_rtfexport \
 CppunitTest_sw_rtfimport \
diff --git 
a/sw/qa/extras/ww8export/data/tdf89377_tableWithBreakBeforeParaStyle.doc 
b/sw/qa/extras/ww8export/data/tdf89377_tableWithBreakBeforeParaStyle.doc
new file mode 100755
index 000..ef6415f
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf89377_tableWithBreakBeforeParaStyle.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
new file mode 100644
index 000..50aad0f
--- /dev/null
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

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

[Miklos Vajna]

 sw/source/filter/html/htmlcss1.cxx   |  104 +-
 sw/source/filter/html/htmlctxt.cxx   |   42 ++--
 sw/source/filter/html/htmldrawreader.cxx |   36 +--
 sw/source/filter/html/htmlform.cxx   |   52 ++---
 sw/source/filter/html/htmlgrin.cxx   |   12 -
 sw/source/filter/html/htmlnumreader.cxx  |   18 -
 sw/source/filter/html/htmlplug.cxx   |   32 +--
 sw/source/filter/html/htmlsect.cxx   |   16 -
 sw/source/filter/html/svxcss1.cxx|  316 +++
 sw/source/filter/html/svxcss1.hxx|   44 ++--
 sw/source/filter/html/swhtml.cxx |4 
 11 files changed, 338 insertions(+), 338 deletions(-)

New commits:
commit 87296258189bea6bebae9ff6c31dc9e76d8b2c56
Author: Miklos Vajna 
Date:   Mon Oct 24 10:08:44 2016 +0200

sw: prefix members of SvxCSS1PropertyInfo

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

diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index c1f0fcd..1b8bc83 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -134,7 +134,7 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
 bool bKeep = false;
 bool bSetKeep = false, bSetBreak = false, bSetPageDesc = false;
 const SwPageDesc *pPageDesc = nullptr;
-switch( rPropInfo.ePageBreakBefore )
+switch( rPropInfo.m_ePageBreakBefore )
 {
 case SVX_CSS1_PBREAK_ALWAYS:
 eBreak = SvxBreak::PageBefore;
@@ -154,7 +154,7 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
 default:
 ;
 }
-switch( rPropInfo.ePageBreakAfter )
+switch( rPropInfo.m_ePageBreakAfter )
 {
 case SVX_CSS1_PBREAK_ALWAYS:
 case SVX_CSS1_PBREAK_LEFT:
@@ -279,29 +279,29 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, 
SfxItemSet& rItemSet,
 const SfxPoolItem *pCollItem, *pItem;
 
 // linker, rechter Rand und Erstzeilen-Einzug
-if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin ||
- rPropInfo.bTextIndent) &&
-(!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin ||
- !rPropInfo.bTextIndent) &&
+if( (rPropInfo.m_bLeftMargin || rPropInfo.m_bRightMargin ||
+ rPropInfo.m_bTextIndent) &&
+(!rPropInfo.m_bLeftMargin || !rPropInfo.m_bRightMargin ||
+ !rPropInfo.m_bTextIndent) &&
 SfxItemState::SET == 
rCollItemSet.GetItemState(RES_LR_SPACE,true,&pCollItem) &&
 SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) )
 {
 const SvxLRSpaceItem *pLRItem = static_cast(pItem);
 
 SvxLRSpaceItem aLRItem( *static_cast(pCollItem) );
-if( rPropInfo.bLeftMargin )
+if( rPropInfo.m_bLeftMargin )
 aLRItem.SetTextLeft( pLRItem->GetTextLeft() );
-if( rPropInfo.bRightMargin )
+if( rPropInfo.m_bRightMargin )
 aLRItem.SetRight( pLRItem->GetRight() );
-if( rPropInfo.bTextIndent )
+if( rPropInfo.m_bTextIndent )
 aLRItem.SetTextFirstLineOfst( pLRItem->GetTextFirstLineOfst() );
 
 rItemSet.Put( aLRItem );
 }
 
 // oberer und unterer Rand
-if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) &&
-(!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) &&
+if( (rPropInfo.m_bTopMargin || rPropInfo.m_bBottomMargin) &&
+(!rPropInfo.m_bTopMargin || !rPropInfo.m_bBottomMargin) &&
 SfxItemState::SET == rCollItemSet.GetItemState(RES_UL_SPACE,true,
   &pCollItem) &&
 SfxItemState::SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) )
@@ -309,9 +309,9 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, 
SfxItemSet& rItemSet,
 const SvxULSpaceItem *pULItem = static_cast(pItem);
 
 SvxULSpaceItem aULItem( *static_cast(pCollItem) );
-if( rPropInfo.bTopMargin )
+if( rPropInfo.m_bTopMargin )
 aULItem.SetUpper( pULItem->GetUpper() );
-if( rPropInfo.bBottomMargin )
+if( rPropInfo.m_bBottomMargin )
 aULItem.SetLower( pULItem->GetLower() );
 
 rItemSet.Put( aULItem );
@@ -458,19 +458,19 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc 
*pPageDesc,
 bool bChanged = false;
 
 // linker, rechter Rand und Erstzeilen-Einzug
-if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin) &&
+if( (rPropInfo.m_bLeftMargin || rPropInfo.m_bRightMargin) &&
 SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) )
 {
-if( (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin) &&
+if( (!rPropInfo.m_bLeftMargin || !rPropInfo.m_bRightMargin) &&
 SfxItemState::SET == rPageItemSet.GetItemState(RES_LR_SPACE,
   true,&pPageItem) )
 {
 const SvxLRSpaceItem *pLRItem = static_cas

[SOLVED] Re: [Libreoffice-commits] core.git: Blind fix to TBs

[julien2412]

Thank you Stephan for your feedback.

I just realized I could revert it directly from gerrit.
So done now (see
https://cgit.freedesktop.org/libreoffice/core/commit/?id=330b1d8b1e1eae9ec0a4504676c3518ca5d9a951)

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-Blind-fix-to-TBs-tp4198073p4198082.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] core.git: xmlsecurity/source

[Julien Nabet]

 xmlsecurity/source/pdfio/pdfdocument.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 330b1d8b1e1eae9ec0a4504676c3518ca5d9a951
Author: Julien Nabet 
Date:   Mon Oct 24 09:47:01 2016 +

Revert "Blind fix to TBs"

This reverts commit f736c71dde8f4a84688b932b1531808d4c7cbd8c.

Change-Id: I83df90a5fc6cefb4e0c4fdbb37fa46a546809b83
Reviewed-on: https://gerrit.libreoffice.org/30223
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 2a5b70e..f63fe2e 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -775,7 +775,7 @@ size_t PDFDocument::FindStartXRef(SvStream& rStream)
 // Find the "startxref" token, somewhere near the end of the document.
 std::vector aBuf(1024);
 rStream.Seek(STREAM_SEEK_TO_END);
-rStream.SeekRel(-1 * aBuf.capacity());
+rStream.SeekRel(-1 * aBuf.size());
 size_t nBeforePeek = rStream.Tell();
 size_t nSize = rStream.ReadBytes(aBuf.data(), aBuf.size());
 rStream.Seek(nBeforePeek);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Preparation of OASIS ODF-TC proposals

[Laurent BP]

Hi,

Following some extensions of ODF in LibO about fraction number format, I
wrote two drafts for OASIS ODF-TC proposals:
- tdf#100755: number:zeros-denominator-digits and
number:zeros-numerator-digits for the number '0' in format string for
denominator and numerator. It allows to distinguish '?' and '0' in format
string  OASIS-proposal-zeros-numerator-denominator-digits.odt

  
- tdf#100834 number:integer-fraction-delimiter to define the string
delimiter between integer and fractional part of the representation: "3 plus
1/7" for instance  OASIS-proposal-integer-fraction-delimiter.odt

  

They surely need some improvements :-)

Best regards,

Laurent BP



-
LibreOffice 5.1.4.1
--
View this message in context: 
http://nabble.documentfoundation.org/Preparation-of-OASIS-ODF-TC-proposals-tp4198031.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

Re: Merging feature/commonsallayout branch

[Wols Lists]

On 20/10/16 05:14, Yousuf Philips wrote:
> On 10/20/2016 02:34 AM, Khaled Hosny wrote:
>> So that is not as bad as I thought it would be. We can have a runtime
>> check for 5.3 that forces disable CommonSalLayout for Windows XP. We can
>> then communicate in advance that we are dropping Windows XP support in
>> 5.4 (since we will remove the old code by then).
>>
>> WDYT?
> 
> As XP still has between 6 and 9% of desktop market share, which is
> around the same amount of Windows 8/8.1 and Mac OS X, it is in the top 5
> desktop OSes and i wouldnt recommend alienating them any time soon.
> 
> https://www.netmarketshare.com/operating-system-market-share.aspx?qprid=10&qpcustomd=0
> 
> 
> http://gs.statcounter.com/#desktop-os-ww-monthly-201607-201607-bar
> 
> It would be useful to use the update ping stats to know what percentage
> of our user base are still on XP and if it isnt as high as the above
> stats perceive it to be, then it is worth dropping it sooner.
> 
Well, I'll bite. I still rely on XP. And upgrading is not really on the
cards - I've tried and everything keeps falling apart around me.

Two problems - I no longer have access to Windows keys, so I can't
upgrade my VMs, and anyway as of Windows 7, you can't point your home
directories at a linux share :-(

My XP setup has "My Documents" and "My Pictures" pointing at ~/Documents
and ~/Pictures. With the introduction of libraries in 7, that cannot be
done any more. (The recommended solution - "cache the remote server
locally", isn't really a solution, especially when the remote server is
storing a couple of terabytes ...)

And unfortunately, my wife now has memory issues, so trying to get her
to learn something new and move off of XP is NOT an easy job :-(

Yes I do understand that we can't keep supporting ancient technology,
and MS do like to keep changing things :-( but that's exactly what makes
life very difficult for my wife - and, indeed, many older people...

Cheers,
Wol

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

[Libreoffice-commits] core.git: desktop/source libreofficekit/source

[Noel Grandin]

 desktop/source/lib/init.cxx  |2 +-
 libreofficekit/source/gtk/lokdocview.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6320a0f2108e5c4b7f397005a5b5bf6ae93812bd
Author: Noel Grandin 
Date:   Mon Oct 24 11:30:14 2016 +0200

revert string::find changes

this reverts

commit 610f59651563205564a0f4818b5c1d347ca02132
fix "cppcheck:stlIfStrFind"

and

commit 5c1bb338ef0d781648d5b33ffc9d64c2be6d9926
cppcheck:stlIfStrFind

which are deficient in one way or another, the original logic, while
inefficient, is still most accurate

Change-Id: I4907d2569c9c2976533f8ac9f4b8b45eb1807b72

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 29a9bfe..f3592c8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -356,7 +356,7 @@ struct RectangleAndPart
 static RectangleAndPart Create(const std::string& rPayload)
 {
 RectangleAndPart aRet;
-if (rPayload.rfind("EMPTY") == 0) // payload starts with "EMPTY"
+if (rPayload.find("EMPTY") == 0) // payload starts with "EMPTY"
 {
 if (comphelper::LibreOfficeKit::isPartInInvalidation())
 aRet.m_nPart = std::stol(rPayload.substr(6));
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 8f23995..a08d93e 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1136,7 +1136,7 @@ callback (gpointer pData)
 {
 case LOK_CALLBACK_INVALIDATE_TILES:
 {
-if (pCallback->m_aPayload.rfind("EMPTY") != 0) // payload doesn't 
start with "EMPTY"
+if (pCallback->m_aPayload.find("EMPTY") != 0) // payload doesn't start 
with "EMPTY"
 {
 GdkRectangle aRectangle = payloadToRectangle(pDocView, 
pCallback->m_aPayload.c_str());
 setTilesInvalid(pDocView, aRectangle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 filter/source/flash/swffilter.cxx  |4 +---
 filter/source/svg/svgfilter.cxx|8 ++--
 xmloff/source/draw/shapeexport.cxx |   34 +++---
 3 files changed, 18 insertions(+), 28 deletions(-)

New commits:
commit 319a07c4be1bf9712a162a970ab3b659dd3777c2
Author: Stephan Bergmann 
Date:   Mon Oct 24 11:19:19 2016 +0200

Simplify code further

...after 9ad0e56be46df46b021109acfd6ece9d17ce84f8 "fixes for >>= with rhs 
Any"

Change-Id: Idf7b7033bd0ef5501e2884841ba897f8691a5f77

diff --git a/filter/source/flash/swffilter.cxx 
b/filter/source/flash/swffilter.cxx
index 5ac39b8..81ec8a0 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -262,9 +262,7 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const 
css::uno::Sequence< css::bean
 
 if(xSelection.is())
 {
-Any aSelection = xSelection->getSelection();
-if (aSelection.hasValue())
-aSelection >>= mxSelectedShapes;
+xSelection->getSelection() >>= mxSelectedShapes;
 }
 }
 }
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index bd6dae6..c1faa06 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -235,12 +235,8 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< 
PropertyValue >& rDescripto
 
 if (xSelection.is())
 {
-uno::Any aSelection = xSelection->getSelection();
-
-if (aSelection.hasValue())
-{
-bGotSelection = ( aSelection >>= maShapeSelection );
-}
+bGotSelection
+= ( xSelection->getSelection() >>= maShapeSelection );
 }
 }
 
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 09d6adf..a22ee35 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2583,27 +2583,23 @@ void XMLShapeExport::ImpExportConnectorShape(
 }
 }
 
+// get PolygonBezier
 aAny = xProps->getPropertyValue("PolyPolygonBezier");
-if( aAny.hasValue() )
+auto pSourcePolyPolygon = 
o3tl::tryAccess(aAny);
+if(pSourcePolyPolygon && pSourcePolyPolygon->Coordinates.getLength())
 {
-// get PolygonBezier
-auto pSourcePolyPolygon = 
o3tl::tryAccess(aAny);
-
-if(pSourcePolyPolygon && pSourcePolyPolygon->Coordinates.getLength())
-{
-const basegfx::B2DPolyPolygon aPolyPolygon(
-basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
-*pSourcePolyPolygon));
-const OUString aPolygonString(
-basegfx::tools::exportToSvgD(
-aPolyPolygon,
-true,   // bUseRelativeCoordinates
-false,  // bDetectQuadraticBeziers: not used in 
old, but maybe activated now
-true)); // bHandleRelativeNextPointCompatible
-
-// write point array
-mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString);
-}
+const basegfx::B2DPolyPolygon aPolyPolygon(
+basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
+*pSourcePolyPolygon));
+const OUString aPolygonString(
+basegfx::tools::exportToSvgD(
+aPolyPolygon,
+true,   // bUseRelativeCoordinates
+false,  // bDetectQuadraticBeziers: not used in old, 
but maybe activated now
+true)); // bHandleRelativeNextPointCompatible
+
+// write point array
+mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aPolygonString);
 }
 
 // get matrix
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source libreofficekit/source

[Noel Grandin]

 desktop/source/lib/init.cxx  |2 +-
 libreofficekit/source/gtk/lokdocview.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 610f59651563205564a0f4818b5c1d347ca02132
Author: Noel Grandin 
Date:   Mon Oct 24 10:56:08 2016 +0200

fix "cppcheck:stlIfStrFind"

in commit 5c1bb338ef0d781648d5b33ffc9d64c2be6d9926, compare does not do
a startswith

Change-Id: If518b3f6880848a5b5463c09fb73974d972010fd

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8ce8443..29a9bfe 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -356,7 +356,7 @@ struct RectangleAndPart
 static RectangleAndPart Create(const std::string& rPayload)
 {
 RectangleAndPart aRet;
-if (rPayload.compare("EMPTY") == 0) // payload starts with "EMPTY"
+if (rPayload.rfind("EMPTY") == 0) // payload starts with "EMPTY"
 {
 if (comphelper::LibreOfficeKit::isPartInInvalidation())
 aRet.m_nPart = std::stol(rPayload.substr(6));
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index fd67264..8f23995 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1136,7 +1136,7 @@ callback (gpointer pData)
 {
 case LOK_CALLBACK_INVALIDATE_TILES:
 {
-if (pCallback->m_aPayload.compare("EMPTY") != 0) // payload doesn't 
start with "EMPTY"
+if (pCallback->m_aPayload.rfind("EMPTY") != 0) // payload doesn't 
start with "EMPTY"
 {
 GdkRectangle aRectangle = payloadToRectangle(pDocView, 
pCallback->m_aPayload.c_str());
 setTilesInvalid(pDocView, aRectangle);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - 2517 commits - accessibility/inc accessibility/source android/source animations/source apple_remote/source avmedia/inc avmedia/M

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit a674654214aefbb9afaec2627d46c0fa28b059a2
Author: Katarina Behrens 
Date:   Mon Oct 24 10:47:10 2016 +0200

screenshot annotation: Make this a default button

Change-Id: I1a1db338696cf56062306a54a43c746a21a3431d

diff --git a/cui/uiconfig/ui/screenshotannotationdialog.ui 
b/cui/uiconfig/ui/screenshotannotationdialog.ui
index 71f0dff..76e368b 100644
--- a/cui/uiconfig/ui/screenshotannotationdialog.ui
+++ b/cui/uiconfig/ui/screenshotannotationdialog.ui
@@ -40,6 +40,8 @@
 save
 True
 True
+True
+True
 True
   
   
commit ee8b4060ec737d1f658dc8c3638a0bc1324cb36b
Author: Katarina Behrens 
Date:   Thu Oct 20 20:31:40 2016 +0200

screenshot annotation: insert markup for annotated widgets

Change-Id: I82b8c541239271e3acfa6d8ad45b752fa1554931

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index 2f7c2d6..ca56d1f 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -78,6 +78,15 @@ namespace
 OUString("");
 return aRet;
 }
+
+OUString lcl_Bookmark( const OUString& rWidgetId )
+{
+OUString aRet = ""  + 
SAL_NEWLINE_STRING;
+aRet += OUString("") + SAL_NEWLINE_STRING;
+return aRet;
+}
 }
 
 class ControlDataEntry
@@ -93,6 +102,8 @@ public:
 return maB2IRange;
 }
 
+const OString GetHelpId() const { return mrControl.GetHelpId(); }
+
 private:
 basegfx::B2IRange   maB2IRange;
 };
@@ -156,6 +167,7 @@ private:
 
 // save as text
 OUStringmaSaveAsText;
+OUStringmaMainMarkupText;
 
 // folder URL
 static OUString maLastFolderURL;
@@ -237,7 +249,8 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 if (mpText)
 {
 OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), 
RTL_TEXTENCODING_UTF8 );
-mpText->SetText( lcl_ParagraphWithImage( aHelpId) );
+maMainMarkupText = lcl_ParagraphWithImage( aHelpId);
+mpText->SetText( maMainMarkupText );
 mpText->SetReadOnly(true);
 }
 
@@ -572,6 +585,14 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, 
pictureFrameListener, VclWindowEvent&, r
 maSelected.insert(mpHilighted);
 }
 
+OUString aBookmarks;
+for (auto&& rCandidate : maSelected)
+{
+OUString aHelpId = OStringToOUString( 
rCandidate->GetHelpId(), RTL_TEXTENCODING_UTF8 );
+aBookmarks += lcl_Bookmark( aHelpId );
+}
+
+mpText->SetText( maMainMarkupText + aBookmarks );
 bRepaint = true;
 }
 break;
commit 7c1cfa76871be9527dc9c2070d5dbdc1b55adbe5
Author: Katarina Behrens 
Date:   Tue Oct 18 19:29:00 2016 +0200

screenshot annotation: Display markup for embedding the image

Change-Id: I06fd744fabd66ee02123790718a899d9e0dcb6b7

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx 
b/cui/source/dialogs/screenshotannotationdlg.cxx
index 357e9b1..2f7c2d6 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -40,6 +42,44 @@
 
 using namespace com::sun::star;
 
+namespace
+{
+OUString lcl_genRandom( const OUString &rId )
+{
+//FIXME: plus timestamp
+unsigned int nRand = comphelper::rng::uniform_uint_distribution(0, 
0x);
+return OUString( rId + OUString::number( nRand ) );
+}
+
+
+OUString lcl_AltDescr()
+{
+OUString aRet = OUString("") +
+OUString(" ") + //FIXME real dialog title or something
+OUString("");
+return aRet;
+}
+
+OUString lcl_Image( const OUString& rScreenshotId )
+{
+OUString aRet = OUString("") + //FIXME width + height
+lcl_AltDescr() +
+OUString("");
+return aRet;
+}
+
+OUString lcl_ParagraphWithImage( const OUString& rScreenshotId )
+{
+OUString aRet = OUString("") +
+lcl_Image( rScreenshotId ) +
+OUString("");
+return aRet;
+}
+}
+
 class ControlDataEntry
 {
 public:
@@ -196,8 +236,9 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
 // copying content to clipboard is allowed
 if (mpText)
 {
-mpText->SetText("The quick brown fox jumps over the lazy dog :)");
-mpText->SetReadOnly();
+OUString aHelpId = OStringToOUString( mrParentDialog.GetHelpId(), 
RTL_TEXTENCOD

[Libreoffice-commits] core.git: Branch 'feature/screenshotannotation' - cui/uiconfig

[Katarina Behrens]

 cui/uiconfig/ui/screenshotannotationdialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 48a9fb96c6799c91c5d35de0070753f969f6c0d4
Author: Katarina Behrens 
Date:   Mon Oct 24 10:47:10 2016 +0200

screenshot annotation: Make this a default button

Change-Id: I1a1db338696cf56062306a54a43c746a21a3431d

diff --git a/cui/uiconfig/ui/screenshotannotationdialog.ui 
b/cui/uiconfig/ui/screenshotannotationdialog.ui
index 71f0dff..76e368b 100644
--- a/cui/uiconfig/ui/screenshotannotationdialog.ui
+++ b/cui/uiconfig/ui/screenshotannotationdialog.ui
@@ -40,6 +40,8 @@
 save
 True
 True
+True
+True
 True
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Blind fix to TBs

[Stephan Bergmann]

On 10/24/2016 10:39 AM, julien2412 wrote:

I thought there was just some allocation of 1024 but size would stay at 0,
that's why I tried with capacity.

I can revert the patch if you want.


Yes, please.  (While implementations may create aBuf not only with a 
size but also with a capacity of 1024, I don't think that's guaranteed.)

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

[Libreoffice-commits] core.git: sd/inc sd/qa sd/source sfx2/source slideshow/source

[Noel Grandin]

 sd/inc/sdpage.hxx |2 +-
 sd/qa/unit/filters-test.cxx   |2 +-
 sd/qa/unit/sdmodeltestbase.hxx|2 +-
 sd/source/filter/ppt/pptin.cxx|2 +-
 sd/source/ui/animations/CustomAnimationDialog.hxx |2 +-
 sd/source/ui/inc/DrawDocShell.hxx |   10 +-
 sd/source/ui/inc/DrawViewShell.hxx|4 ++--
 sd/source/ui/inc/GraphicDocShell.hxx  |6 +++---
 sd/source/ui/inc/GraphicViewShell.hxx |2 +-
 sd/source/ui/inc/OutlineViewShell.hxx |2 +-
 sd/source/ui/inc/PresentationViewShell.hxx|2 +-
 sd/source/ui/inc/dlgpage.hxx  |2 +-
 sd/source/ui/inc/optsitem.hxx |8 
 sd/source/ui/inc/unomodel.hxx |4 ++--
 sd/source/ui/view/sdview3.cxx |2 +-
 sfx2/source/appl/newhelp.hxx  |2 +-
 sfx2/source/inc/templdgi.hxx  |2 +-
 slideshow/source/engine/transitions/spiralwipe.hxx|2 +-
 slideshow/source/engine/transitions/waterfallwipe.hxx |2 +-
 19 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 1aa69bd5d4bdc8513892fb88760312fee52c310b
Author: Noel Grandin 
Date:   Mon Oct 24 10:43:29 2016 +0200

loplugin:countusersofdefaultparams in sd..slideshow

Change-Id: Iaf10935d8f231676333018a5954d97defe35acf6

diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 65d6cbd..dc23fed 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -151,7 +151,7 @@ protected:
 
 public:
 
-SdPage(SdDrawDocument& rNewDoc, bool bMasterPage=false);
+SdPage(SdDrawDocument& rNewDoc, bool bMasterPage);
 virtual ~SdPage() override;
 virtual SdrPage* Clone() const override;
 virtual SdrPage* Clone(SdrModel* pNewModel) const override;
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 961fae0..08babce 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -69,7 +69,7 @@ bool SdFiltersTest::load(const OUString &rFilter, const 
OUString &rURL,
 rUserData, OUString() ));
 const_cast(pFilter.get())->SetVersion(nFilterVersion);
 
-::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
+::sd::DrawDocShellRef xDocShRef = new 
::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
 SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ);
 pSrcMed->SetFilter(pFilter);
 bool bLoaded = xDocShRef->DoLoad(pSrcMed);
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 5b933c1..c0ed88e 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -134,7 +134,7 @@ protected:
 pFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 std::shared_ptr pFilt(pFilter);
 
-::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
+::sd::DrawDocShellRef xDocShRef = new 
::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
 SfxMedium* pSrcMed = new SfxMedium(rURL, StreamMode::STD_READ, pFilt, 
pParams);
 if ( !xDocShRef->DoLoad(pSrcMed) || !xDocShRef.Is() )
 {
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index d6a7d6d..3b22b8c 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2772,7 +2772,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL 
TestImportPPT(const OUString &rURL
 xDocStream->SetVersion(xStorage->GetVersion());
 xDocStream->SetCryptMaskKey(xStorage->GetKey());
 
-::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
+::sd::DrawDocShellRef xDocShRef = new 
::sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false);
 SdDrawDocument *pDoc = xDocShRef->GetDoc();
 
 bool bRet = ImportPPT(pDoc, *xDocStream, *xStorage, aSrcMed);
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx 
b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 6ccbddd..5244965 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -142,7 +142,7 @@ class STLPropertySet;
 class CustomAnimationDialog : public TabDialog
 {
 public:
-CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const 
OString& Page = OString());
+CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const 
OString& Page);
 virtual ~CustomAnimationDialog() override;
 virtual void dispose() override;
 
diff --git a/sd/source/ui/inc/DrawDocShell.hxx 
b/sd/source/ui/inc/DrawDocShell.hxx
index 89d9991..8d1ad05 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -58,19 +58,19 @@ private:
 
 public:
 DrawDocShell (
-SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED,
-bool bSdDataObj=false,
+  

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

[Yousuf Philips]

 include/svtools/svtools.hrc|1 +
 svtools/source/java/javaerror.src  |5 +
 svtools/source/java/javainteractionhandler.cxx |4 
 3 files changed, 10 insertions(+)

New commits:
commit 967436ba7c552ea8fa30fd3b7abced231e174951
Author: Yousuf Philips 
Date:   Thu Oct 20 00:13:40 2016 +0400

tdf#103259 Add java not found error for mac

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

diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc
index b5a38eb..92cc809 100644
--- a/include/svtools/svtools.hrc
+++ b/include/svtools/svtools.hrc
@@ -195,6 +195,7 @@
 #define STR_WARNING_INVALIDJAVASETTINGS_TITLE (STR_SVT_JAVAERROR_START+6)
 #define STR_ERROR_JVMCREATIONFAILED   (STR_SVT_JAVAERROR_START+7)
 #define STR_ERROR_JVMCREATIONFAILED_MAC   (STR_SVT_JAVAERROR_START+8)
+#define STR_WARNING_JAVANOTFOUND_MAC  (STR_SVT_JAVAERROR_START+9)
 #define STR_SVT_JAVAERROR_END (STR_ERROR_JVMCREATIONFAILED_MAC)
 
 // String array to match UI language names to LanguageType values and vice 
versa
diff --git a/svtools/source/java/javaerror.src 
b/svtools/source/java/javaerror.src
index f1d1386..60d7c72 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.src
@@ -24,6 +24,11 @@ String STR_WARNING_JAVANOTFOUND
 Text [ en-US ] ="%PRODUCTNAME requires a Java runtime environment (JRE) to 
perform this task. Please install a JRE and restart %PRODUCTNAME.";
 };
 
+String STR_WARNING_JAVANOTFOUND_MAC
+{
+Text [ en-US ] ="%PRODUCTNAME requires Oracle's Java Development Kit (JDK) 
on Mac OS X 10.10 or greater to perform this task. Please install them and 
restart %PRODUCTNAME.";
+};
+
 String STR_WARNING_INVALIDJAVASETTINGS_MAC
 {
 Text [ en-US ] ="The %PRODUCTNAME configuration has been changed. Under 
%PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime 
environment you want to have used by %PRODUCTNAME.";
diff --git a/svtools/source/java/javainteractionhandler.cxx 
b/svtools/source/java/javainteractionhandler.cxx
index f947a28..860f3e0 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -122,7 +122,11 @@ void SAL_CALL JavaInteractionHandler::handle( const 
Reference< XInteractionReque
// No suitable JRE found
 SolarMutexGuard aSolarGuard;
 m_bJavaNotFound_Handled = true;
+#ifdef MACOSX
+ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, 
SvtResId(STR_WARNING_JAVANOTFOUND_MAC), VclMessageType::Warning);
+#else
 ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, 
SvtResId(STR_WARNING_JAVANOTFOUND), VclMessageType::Warning);
+#endif
 aWarningBox->SetText(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE));
 nResult = aWarningBox->Execute();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Blind fix to TBs

[julien2412]

sberg wrote
> On 10/23/2016 05:21 PM, Julien Nabet wrote:
>> commit f736c71dde8f4a84688b932b1531808d4c7cbd8c
>> Author: Julien Nabet <

> serval2412@

> >
>> Date:   Sun Oct 23 16:12:43 2016 +0200
>>
>> Blind fix to TBs
>>
>> Change-Id: I74165378255e3c844ee7f91a5d4eb09a573784bd
>> Reviewed-on: https://gerrit.libreoffice.org/30179
>> Reviewed-by: Julien Nabet <

> serval2412@

> >
>> Tested-by: Julien Nabet <

> serval2412@

> >
>>
>> diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx
>> b/xmlsecurity/source/pdfio/pdfdocument.cxx
>> index 6543734..753c308 100644
>> --- a/xmlsecurity/source/pdfio/pdfdocument.cxx
>> +++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
>> @@ -775,7 +775,7 @@ size_t PDFDocument::FindStartXRef(SvStream& rStream)
>>  // Find the "startxref" token, somewhere near the end of the
>> document.
>>  std::vector
> 
>  aBuf(1024);
>>  rStream.Seek(STREAM_SEEK_TO_END);
>> -rStream.SeekRel(-1 * aBuf.size());
>> +rStream.SeekRel(-1 * aBuf.capacity());
> 
> What problem does this attempt to fix?
> 
> The changed code looks rather broken to me:  After construction, aBuf is 
> guaranteed to have a size of 1024, while I think the standard doesn't 
> make a guarantee on its exact capacity.

Hi,

I thought there was just some allocation of 1024 but size would stay at 0,
that's why I tried with capacity.

I can revert the patch if you want.

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-Blind-fix-to-TBs-tp4198073p4198074.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] core.git: desktop/source include/opencl opencl/source

[Tomaž Vajngerl]

 desktop/source/app/opencl.cxx|4 +---
 include/opencl/openclwrapper.hxx |5 -
 opencl/source/openclwrapper.cxx  |   21 ++---
 3 files changed, 23 insertions(+), 7 deletions(-)

New commits:
commit 21e8ed8b5f032f63012a7ee84bce64fac218154f
Author: Tomaž Vajngerl 
Date:   Tue Oct 18 23:53:44 2016 +0200

tdf#103395 opencl: don't initialize OpenCL when disabled

If SAL_DISABLE_OPENCL is set we don't want to do any kind of
OpenCL initialization. Put an extra guard in fillOpenCLInfo
(and similar methods in opencl package) to prevent that.

Put the check if OpenCL can be used into one place which checks
SAL_DISABLE_OPENCL and UseOpenCL in configuration.

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

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 6d22e92..f436971b 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -119,9 +119,7 @@ bool testOpenCLCompute(const Reference< XDesktop2 > 
&xDesktop, const OUString &r
 
 void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 > &xDesktop)
 {
-if (getenv("SAL_DISABLE_OPENCL") ||
-Application::IsSafeModeEnabled() ||
-!officecfg::Office::Common::Misc::UseOpenCL::get())
+if (!opencl::canUseOpenCL() || Application::IsSafeModeEnabled())
 return;
 
 SAL_INFO("opencl", "Initiating test of OpenCL device");
diff --git a/include/opencl/openclwrapper.hxx b/include/opencl/openclwrapper.hxx
index 233412f..5f71b2a 100644
--- a/include/opencl/openclwrapper.hxx
+++ b/include/opencl/openclwrapper.hxx
@@ -26,7 +26,8 @@
 
 #include 
 
-namespace opencl {
+namespace opencl
+{
 
 struct KernelEnv
 {
@@ -56,6 +57,8 @@ struct OPENCL_DLLPUBLIC GPUEnv
 extern OPENCL_DLLPUBLIC GPUEnv gpuEnv;
 extern OPENCL_DLLPUBLIC sal_uInt64 kernelFailures;
 
+OPENCL_DLLPUBLIC bool canUseOpenCL();
+
 OPENCL_DLLPUBLIC bool generatBinFromKernelSource( cl_program program, const 
char * clFileName );
 OPENCL_DLLPUBLIC bool buildProgramFromBinary(const char* buildOption, GPUEnv* 
gpuEnv, const char* filename, int idx);
 OPENCL_DLLPUBLIC void setKernelEnv( KernelEnv *envInfo );
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index c876133..141ce8f 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -32,6 +32,8 @@
 
 #include 
 
+#include 
+
 #ifdef _WIN32
 #include 
 #include 
@@ -64,7 +66,8 @@ namespace opencl {
 GPUEnv gpuEnv;
 sal_uInt64 kernelFailures = 0;
 
-namespace {
+namespace
+{
 
 bool bIsInited = false;
 
@@ -704,7 +707,9 @@ bool createPlatformInfo(cl_platform_id nPlatformId, 
OpenCLPlatformInfo& rPlatfor
 const std::vector& fillOpenCLInfo()
 {
 static std::vector aPlatforms;
-if(!aPlatforms.empty())
+
+// return early if we already initialized or can't use OpenCL
+if (!aPlatforms.empty() || !canUseOpenCL())
 return aPlatforms;
 
 int status = clewInit(OPENCL_DLL_NAME);
@@ -785,9 +790,16 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId, 
size_t& rDeviceId, size_
 
 }
 
+bool canUseOpenCL()
+{
+if (getenv("SAL_DISABLE_OPENCL") || 
!officecfg::Office::Common::Misc::UseOpenCL::get())
+return false;
+return true;
+}
+
 bool switchOpenCLDevice(const OUString* pDevice, bool bAutoSelect, bool 
bForceEvaluation, OUString& rOutSelectedDeviceVersionIDString)
 {
-if(fillOpenCLInfo().empty() || getenv("SAL_DISABLE_OPENCL"))
+if (!canUseOpenCL() || fillOpenCLInfo().empty())
 return false;
 
 cl_device_id pDeviceId = nullptr;
@@ -863,6 +875,9 @@ bool switchOpenCLDevice(const OUString* pDevice, bool 
bAutoSelect, bool bForceEv
 
 void getOpenCLDeviceInfo(size_t& rDeviceId, size_t& rPlatformId)
 {
+if (!canUseOpenCL())
+return;
+
 int status = clewInit(OPENCL_DLL_NAME);
 if (status < 0)
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Blind fix to TBs

[Stephan Bergmann]

On 10/23/2016 05:21 PM, Julien Nabet wrote:

commit f736c71dde8f4a84688b932b1531808d4c7cbd8c
Author: Julien Nabet 
Date:   Sun Oct 23 16:12:43 2016 +0200

Blind fix to TBs

Change-Id: I74165378255e3c844ee7f91a5d4eb09a573784bd
Reviewed-on: https://gerrit.libreoffice.org/30179
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 6543734..753c308 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -775,7 +775,7 @@ size_t PDFDocument::FindStartXRef(SvStream& rStream)
 // Find the "startxref" token, somewhere near the end of the document.
 std::vector aBuf(1024);
 rStream.Seek(STREAM_SEEK_TO_END);
-rStream.SeekRel(-1 * aBuf.size());
+rStream.SeekRel(-1 * aBuf.capacity());


What problem does this attempt to fix?

The changed code looks rather broken to me:  After construction, aBuf is 
guaranteed to have a size of 1024, while I think the standard doesn't 
make a guarantee on its exact capacity.



 size_t nBeforePeek = rStream.Tell();
 size_t nSize = rStream.ReadBytes(aBuf.data(), aBuf.size());
 rStream.Seek(nBeforePeek);


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

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

[David Tardon]

 vcl/source/gdi/CommonSalLayout.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 38b895cddcff51b6cfb47c6b3bbb2044a6d7a6dd
Author: David Tardon 
Date:   Mon Oct 24 10:08:09 2016 +0200

impl. missing function

This is copied from vcl/unx/generic/glyphs/gcach_layout.cxx .

Change-Id: I778c1c862c80668a06db8e91c11773ecc9916078

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 4bd9f60..91d7762 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -104,6 +104,15 @@ static void scaleHbFont(hb_font_t* pHbFont, const 
FontSelectPattern& aFontSelDat
 }
 
 #if !HB_VERSION_ATLEAST(1, 1, 0)
+// Disabled Unicode compatibility decomposition, see fdo#66715
+static unsigned int unicodeDecomposeCompatibility(hb_unicode_funcs_t* 
/*ufuncs*/,
+  hb_codepoint_t  /*u*/,
+  hb_codepoint_t* 
/*decomposed*/,
+  void*   
/*user_data*/)
+{
+return 0;
+}
+
 static hb_unicode_funcs_t* getUnicodeFuncs()
 {
 static hb_unicode_funcs_t* ufuncs = 
hb_unicode_funcs_create(hb_icu_get_unicode_funcs());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 filter/source/flash/swffilter.cxx  |7 ++-
 filter/source/svg/svgfilter.cxx|4 ++--
 xmloff/source/draw/shapeexport.cxx |3 ++-
 3 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 9ad0e56be46df46b021109acfd6ece9d17ce84f8
Author: Jochen Nitschke 
Date:   Fri Oct 21 15:59:45 2016 +0200

fixes for >>= with rhs Any

this changes behaviour because >>= always returned true

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

diff --git a/filter/source/flash/swffilter.cxx 
b/filter/source/flash/swffilter.cxx
index b3db3bc..5ac39b8 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -262,12 +262,9 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const 
css::uno::Sequence< css::bean
 
 if(xSelection.is())
 {
-Any aSelection;
-
-if(xSelection->getSelection() >>= aSelection)
-{
+Any aSelection = xSelection->getSelection();
+if (aSelection.hasValue())
 aSelection >>= mxSelectedShapes;
-}
 }
 }
 }
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 7304a56..bd6dae6 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -235,9 +235,9 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< 
PropertyValue >& rDescripto
 
 if (xSelection.is())
 {
-uno::Any aSelection;
+uno::Any aSelection = xSelection->getSelection();
 
-if (xSelection->getSelection() >>= aSelection)
+if (aSelection.hasValue())
 {
 bGotSelection = ( aSelection >>= maShapeSelection );
 }
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 0fd26d7..09d6adf 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2583,7 +2583,8 @@ void XMLShapeExport::ImpExportConnectorShape(
 }
 }
 
-if( xProps->getPropertyValue("PolyPolygonBezier") >>= aAny )
+aAny = xProps->getPropertyValue("PolyPolygonBezier");
+if( aAny.hasValue() )
 {
 // get PolygonBezier
 auto pSourcePolyPolygon = 
o3tl::tryAccess(aAny);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits