[Libreoffice-commits] core.git: Changes to 'feature/cib_contract138'

[Katarina Behrens]

New branch 'feature/cib_contract138' available with the following commits:
commit 469b4e2db7cb66451319f48d7c0fe0181cbc0e05
Author: Katarina Behrens 
Date:   Thu Mar 9 10:08:06 2017 +0100

tdf#35636: Match also empty cells (backport of the idea)

Change-Id: I11fc198ef43250618b43e3c11e7c192accc6b7b8

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

[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py bin/find-unused-rid.py sd/inc

[Noel Grandin]

 bin/find-unused-defines-in-hrc-files.py |  109 
 bin/find-unused-rid.py  |  103 --
 sd/inc/sdattr.hrc   |   57 +---
 3 files changed, 115 insertions(+), 154 deletions(-)

New commits:
commit 2589f090875f3b81d91211e72cf36a6f1441c01a
Author: Noel Grandin 
Date:   Tue Mar 14 15:53:49 2017 +0200

remove unused HRC defines in sd/

improve the existing 'find unused RID constants' script

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

diff --git a/bin/find-unused-rid.py b/bin/find-unused-defines-in-hrc-files.py
similarity index 51%
rename from bin/find-unused-rid.py
rename to bin/find-unused-defines-in-hrc-files.py
index 82ea293..f24e1a6 100755
--- a/bin/find-unused-rid.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -1,10 +1,11 @@
 #!/usr/bin/python
 
-# Search for unused RID_ constants.
+# Search for unused constants in .hrc files.
 #
-# Note that sometimes RID constants are calculated, so some careful checking 
of the output is necessary.
+# Note that sometimes these constants are calculated, so some careful checking 
of the output is necessary.
+#
+# Takes about 4 hours to run this on a fast machine with an SSD
 #
-# Takes about 30min to run this on a fast machine.
 
 import subprocess
 import sys
@@ -55,49 +56,54 @@ exclusionSet = set([
 "RID_SVXSTR_TRASNGR",
 # other places doing calculations
 "RID_SVXSTR_DEPTH",
-"RID_SUBSETSTR_"
+"RID_SUBSETSTR_",
+"ANALYSIS_"
 ])
 
 
-def startswith_one_of( a, aset ):
-for f in aset:
+def in_exclusion_set( a ):
+for f in exclusionSet:
 if a.startswith(f):
 return True;
 return False;
 
-a = subprocess.Popen("git grep -P '^#define\s+RID_\w+\s+' -- *.hrc | sort -u", 
stdout=subprocess.PIPE, shell=True)
+a = subprocess.Popen("git grep -hP '^#define\s+\w+\s+' -- *.hrc | sort -u", 
stdout=subprocess.PIPE, shell=True)
 
 with a.stdout as txt:
 for line in txt:
 idx1 = line.find("#define ")
 idx2 = line.find(" ", idx1 + 9)
-ridName = line[idx1+8 : idx2]
+idName = line[idx1+8 : idx2]
 # the various _START and _END constants are normally unused outside of 
the .hrc and .src files, and that's fine
-if ridName.endswith("_START"): continue
-if ridName.endswith("_BEGIN"): continue
-if ridName.endswith("_END"): continue
-if ridName == "RID_GROUPS_SFXOFFSET": continue
-if ridName == "RID_SVX_FIRSTFREE": continue
-if startswith_one_of(ridName, exclusionSet): continue
+if idName.endswith("_START"): continue
+if idName.endswith("_BEGIN"): continue
+if idName.endswith("_END"): continue
+if idName.startswith("RID_"):
+if idName == "RID_GROUPS_SFXOFFSET": continue
+if idName == "RID_SVX_FIRSTFREE": continue
+if in_exclusion_set(idName): continue
 # search for the constant
-b = subprocess.Popen(["git", "grep", "-w", ridName], 
stdout=subprocess.PIPE)
-# check if we found one in actual code
-found_in_code = False
-# check that the constant is not being used as an identifier by 
MenuItem entries in .src files
-found_menu_identifier = False
-# check that the constant is not being used by the property controller 
extension or report inspection, which use macros
-# to declare constants, hiding them from a search
-found_property_macros = False
+b = subprocess.Popen(["git", "grep", "-wl", idName], 
stdout=subprocess.PIPE)
+found_reason_to_exclude = False
 with b.stdout as txt2:
 for line2 in txt2:
-if not line2.endswith(".hrc") and not line2.endswith(".src"): 
found_in_code = True
-if line2.find("Identifier = ") != -1: found_menu_identifier = 
True
-if line2.find("extensions/source/propctrlr") != -1: 
found_property_macros = True
-if 
line2.find("reportdesign/source/ui/inspection/inspection.src") != -1: 
found_property_macros = True
-if not found_in_code and not found_menu_identifier and not 
found_property_macros:
-sys.stdout.write(ridName + '\n')
+line2 = line2.strip() # otherwise the comparisons below will 
not work
+# check if we found one in actual code
+if not line2.endswith(".hrc") and not line2.endswith(".src"): 
found_reason_to_exclude = True
+if idName.startswith("RID_"):
+# check that the constant is not being used as an 
identifier by entries in .src files
+if line2.endswith(".src") and line2.find("Identifier = 
") != -1: found_reason_to_exclude = True
+# check that the constant is not being used by the 
prope

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

[Noel Grandin]

 sw/inc/grfatr.hxx   |   14 ++---
 sw/qa/extras/ww8export/ww8export.cxx|2 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 
 sw/source/core/doc/notxtfrm.cxx |   22 
 sw/source/core/graphic/grfatr.cxx   |   42 
 sw/source/core/graphic/ndgrf.cxx|   12 ++--
 sw/source/core/inc/UndoInsert.hxx   |3 -
 sw/source/core/layout/atrfrm.cxx|8 +--
 sw/source/core/undo/unins.cxx   |4 -
 sw/source/filter/html/htmlflywriter.cxx |8 +--
 sw/source/filter/ww8/wrtw8esh.cxx   |8 +--
 sw/source/filter/ww8/ww8graf.cxx|   14 ++---
 sw/source/ui/frmdlg/frmpage.cxx |   22 
 sw/source/uibase/shells/grfsh.cxx   |   30 +--
 sw/source/uibase/utlui/attrdesc.cxx |8 +--
 15 files changed, 98 insertions(+), 101 deletions(-)

New commits:
commit 7f8bc0af4b35c22ead1310984926b26749b3143d
Author: Noel Grandin 
Date:   Tue Mar 14 13:55:21 2017 +0200

convert MirrorGraph to scoped enum

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

diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index b169ce4..396c443 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -29,14 +29,12 @@
 #include 
 #include 
 
-enum MirrorGraph
+enum class MirrorGraph
 {
-RES_MIRROR_GRAPH_BEGIN,
-RES_MIRROR_GRAPH_DONT = RES_MIRROR_GRAPH_BEGIN,
-RES_MIRROR_GRAPH_VERT,
-RES_MIRROR_GRAPH_HOR,
-RES_MIRROR_GRAPH_BOTH,
-RES_MIRROR_GRAPH_END
+Dont,
+Vertical,
+Horizontal,
+Both
 };
 
 class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem
@@ -44,7 +42,7 @@ class SW_DLLPUBLIC SwMirrorGrf : public 
SfxEnumItem
 bool bGrfToggle; // Flip graphics on even pages.
 
 public:
-SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT )
+SwMirrorGrf( MirrorGraph eMiro = MirrorGraph::Dont )
 : SfxEnumItem( RES_GRFATR_MIRRORGRF, eMiro ), bGrfToggle( false )
 {}
 SwMirrorGrf( const SwMirrorGrf &rMirrorGrf )
diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index a2c95ca..4e70aa3 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1202,7 +1202,7 @@ DECLARE_WW8EXPORT_TEST(testRES_MIRROR_GRAPH_BOTH, 
"tdf56321_flipImage_both.doc")
 SwNode* pNode = pDoc->GetNodes()[ n ];
 if (SwGrfNode *pGrfNode = pNode->GetGrfNode())
 {
-CPPUNIT_ASSERT_EQUAL(RES_MIRROR_GRAPH_BOTH, 
pGrfNode->GetSwAttrSet().GetMirrorGrf().GetValue());
+CPPUNIT_ASSERT_EQUAL((int)MirrorGraph::Both, 
(int)pGrfNode->GetSwAttrSet().GetMirrorGrf().GetValue());
 break;
 }
 }
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 18f1c71..f935aa0 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2710,7 +2710,7 @@ void DocumentContentOperationsManager::ReRead( SwPaM& 
rPam, const OUString& rGrf
 }
 
 // Because we don't know if we can mirror the graphic, the mirror 
attribute is always reset
-if( RES_MIRROR_GRAPH_DONT != pGrfNd->GetSwAttrSet().
+if( MirrorGraph::Dont != pGrfNd->GetSwAttrSet().
 GetMirrorGrf().GetValue() )
 pGrfNd->SetAttr( SwMirrorGrf() );
 
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index ebcca78..e4e945f 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -325,15 +325,15 @@ void SwNoTextFrame::Paint(vcl::RenderContext& 
rRenderContext, SwRect const& rRec
 @param Size   the graphic's size (also returned)
 @param nMirror the current mirror attribute
 */
-static void lcl_CalcRect( Point& rPt, Size& rDim, sal_uInt16 nMirror )
+static void lcl_CalcRect( Point& rPt, Size& rDim, MirrorGraph nMirror )
 {
-if( nMirror == RES_MIRROR_GRAPH_VERT || nMirror == RES_MIRROR_GRAPH_BOTH )
+if( nMirror == MirrorGraph::Vertical || nMirror == MirrorGraph::Both )
 {
 rPt.setX(rPt.getX() + rDim.Width() -1);
 rDim.Width() = -rDim.Width();
 }
 
-if( nMirror == RES_MIRROR_GRAPH_HOR || nMirror == RES_MIRROR_GRAPH_BOTH )
+if( nMirror == MirrorGraph::Horizontal || nMirror == MirrorGraph::Both )
 {
 rPt.setY(rPt.getY() + rDim.Height() -1);
 rDim.Height() = -rDim.Height();
@@ -351,7 +351,7 @@ void SwNoTextFrame::GetGrfArea( SwRect &rRect, SwRect* 
pOrigRect ) const
 
 const SwAttrSet& rAttrSet = GetNode()->GetSwAttrSet();
 cons

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

[Takeshi Abe]

 starmath/inc/parse.hxx|1 +
 starmath/source/parse.cxx |   19 ---
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 516a320ad496604296433f1471e2dd5434f4872d
Author: Takeshi Abe 
Date:   Tue Mar 14 19:07:19 2017 +0900

starmath: Separate SmParser::DoError() from Error()

for incoming refactoring.

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

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index d402213..afb4d9c 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -90,6 +90,7 @@ class SmParser
 voidDoMatrix();
 voidDoSpecial();
 SmGlyphSpecialNode *DoGlyphSpecial();
+SmExpressionNode *DoError(SmParseError Error);
 // end of grammar
 
 voidError(SmParseError Error);
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3edefe7..8a8ca21 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2255,20 +2255,25 @@ SmGlyphSpecialNode *SmParser::DoGlyphSpecial()
 return pNode.release();
 }
 
-void SmParser::Error(SmParseError eError)
+SmExpressionNode *SmParser::DoError(SmParseError eError)
 {
-SmStructureNode *pSNode = new SmExpressionNode(m_aCurToken);
+auto pSNode = o3tl::make_unique(m_aCurToken);
 SmErrorNode *pErr   = new SmErrorNode(m_aCurToken);
 pSNode->SetSubNodes(pErr, nullptr);
 
+AddError(eError, pSNode.get());
+
+NextToken();
+
+return pSNode.release();
+}
+
+void SmParser::Error(SmParseError eError)
+{
 //! put a structure node on the stack (instead of the error node itself)
 //! because sometimes such a node is expected in order to attach some
 //! subnodes
-m_aNodeStack.push_front(std::unique_ptr(pSNode));
-
-AddError(eError, pSNode);
-
-NextToken();
+m_aNodeStack.emplace_front(DoError(eError));
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier]

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

New commits:
commit 821c3bdfb4c4e31867b63d05c72cb721354d060b
Author: Olivier 
Date:   Tue Mar 14 14:17:58 2017 -0300

Updated core
Project: help  6ecc6435e33713129f7e56de1c28c5064128dc13

Remove useless tag

Change-Id: I3ba1ea5632401645682955ecfc7ba8b740099746
Reviewed-on: https://gerrit.libreoffice.org/35195
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index caa80eb..6ecc643 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit caa80eb9b85837042dde3493c381eeae0fc37e9d
+Subproject commit 6ecc6435e33713129f7e56de1c28c5064128dc13
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier]

 source/text/scalc/guide/scenario.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ecc6435e33713129f7e56de1c28c5064128dc13
Author: Olivier 
Date:   Tue Mar 14 14:17:58 2017 -0300

Remove useless tag

Change-Id: I3ba1ea5632401645682955ecfc7ba8b740099746
Reviewed-on: https://gerrit.libreoffice.org/35195
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/guide/scenario.xhp 
b/source/text/scalc/guide/scenario.xhp
index 5e8a329..6255959 100644
--- a/source/text/scalc/guide/scenario.xhp
+++ b/source/text/scalc/guide/scenario.xhp
@@ -39,7 +39,7 @@
 To create a scenario, select all the cells that provide the data 
for the scenario. 
 
 
-Select the cells that contain the values that will change between 
scenarios. To select multiple cells, hold down the CommandCtrl key as you click each cell.
+Select the cells that contain the values that will change between 
scenarios. To select multiple cells, hold down the CommandCtrl key as you click each 
cell.
 
 
 Choose Tools - Scenarios. The Create 
Scenario dialog appears.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 loleaflet/dist/toolbar/toolbar.js |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 4a99210f97ce30eead381aa38943be69d9e4f81d
Author: Aron Budea 
Date:   Fri Mar 10 19:18:43 2017 +0100

loleaflet: Don't clear ids in unoCmdToToolbarId(...)

Since 40307955841b070483736117d41b9dff88013cfb spreadsheets
start with Undo/Redo/Doc. Repair buttons enabled, because
of this.

Change-Id: I20a22f483324289435825c3514894389176f57f3
Reviewed-on: https://gerrit.libreoffice.org/35056
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 19b86f4..04e7011 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -735,8 +735,6 @@ function unoCmdToToolbarId(commandname)
case 'alignright':
id = 'rightpara';
break;
-   default:
-   id = null;
}
}
return id;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 7 commits - net/Socket.cpp net/Socket.hpp net/SslSocket.hpp net/WebSocketHandler.hpp wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/LOOLWSD.cpp

[Ashod Nakashian]

 net/Socket.cpp   |3 
 net/Socket.hpp   |   57 +---
 net/SslSocket.hpp|6 
 net/WebSocketHandler.hpp |   21 +--
 wsd/ClientSession.cpp|   60 +
 wsd/ClientSession.hpp|7 -
 wsd/LOOLWSD.cpp  |  300 ++-
 7 files changed, 261 insertions(+), 193 deletions(-)

New commits:
commit 969fcbefb3173b3e4b1700956f21787322c176f4
Author: Ashod Nakashian 
Date:   Tue Mar 14 23:58:49 2017 -0400

wsd: move convert-to handling into ConvertToHandler

ClientSession still isn't getting the notification,
so document is not uploaded to the client just yet.

Change-Id: Ifda8ed394f6df1ec1a5bc1975d296dea496c0aed

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e5f6ece..056b2e2 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1618,6 +1618,92 @@ private:
 }
 };
 
+/// Handles dispatching socket traffic to the ClientSession.
+class ConvertToHandler : public SocketHandlerInterface
+{
+public:
+ConvertToHandler(const std::shared_ptr& clientSession) :
+_clientSession(clientSession)
+{
+}
+
+private:
+
+/// Set the socket associated with this ResponseClient.
+void onConnect(const std::weak_ptr& socket) override
+{
+LOG_ERR("onConnect");
+_socket = socket;
+}
+
+void onDisconnect() override
+{
+LOG_ERR("onDisconnect");
+}
+
+void handleIncomingMessage() override
+{
+LOG_ERR("handleIncomingMessage");
+}
+
+bool hasQueuedWrites() const override
+{
+LOG_ERR("hasQueuedWrites");
+return true;
+}
+
+void performWrites() override
+{
+LOG_ERR("performWrites");
+auto socket = _socket.lock();
+
+// Send it back to the client.
+try
+{
+Poco::URI 
resultURL(_clientSession->getSaveAsUrl(COMMAND_TIMEOUT_MS));
+LOG_TRC("Save-as URL: " << resultURL.toString());
+
+if (!resultURL.getPath().empty())
+{
+const std::string mimeType = "application/octet-stream";
+std::string encodedFilePath;
+URI::encode(resultURL.getPath(), "", encodedFilePath);
+LOG_TRC("Sending file: " << encodedFilePath);
+HttpHelper::sendFile(socket, encodedFilePath, mimeType);
+}
+}
+catch (const std::exception& ex)
+{
+LOG_ERR("Failed to get save-as url: " << ex.what());
+}
+
+// auto docLock = docBroker->getLock();
+// sessionsCount = docBroker->removeSession(_id);
+// if (sessionsCount == 0)
+// {
+// // At this point we're done.
+// LOG_DBG("Removing DocumentBroker for docKey [" << docKey << 
"].");
+// DocBrokers.erase(docKey);
+// docBroker->terminateChild(docLock, "");
+// LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after 
removing [" << docKey << "].");
+// }
+// else
+// {
+// LOG_ERR("Multiple sessions during conversion. " << 
sessionsCount << " sessions remain.");
+// }
+
+// Clean up the temporary directory the HTMLForm ctor created.
+// Path tempDirectory(fromPath);
+// tempDirectory.setFileName("");
+// FileUtil::removeFile(tempDirectory, /*recursive=*/true);
+}
+
+private:
+// The socket that owns us (we can't own it).
+std::weak_ptr _socket;
+std::shared_ptr _clientSession;
+};
+
 /// Handles incoming connections and dispatches to the appropriate handler.
 class ClientRequestDispatcher : public SocketHandlerInterface
 {
@@ -1954,75 +2040,45 @@ private:
 LOG_TRC("Have " << DocBrokers.size() << " DocBrokers after 
inserting [" << docKey << "].");
 
 // Load the document.
-auto session = std::make_shared(_id, 
docBroker, uriPublic);
-
-auto lock = docBroker->getLock();
-size_t sessionsCount = docBroker->queueSession(session);
-lock.unlock();
-LOG_TRC(docKey << ", ws_sessions++: " << sessionsCount);
-
-docBrokersLock.unlock();
-
-std::string encodedFrom;
-URI::encode(docBroker->getPublicUri().getPath(), "", 
encodedFrom);
-const std::string load = "load url=" + encodedFrom;
-std::vector loadRequest(load.begin(), load.end());
-session->handleMessage(true, 
WebSocketHandler::WSOpCode::Text, loadRequest);
-
-// FIXME: Check for security violations.
-Path toPath(docBroker->getPublicUri().getPath());
-toPath.setExtension(format);
-const std::string toJailURL = "file://" + 
std::string(JAILED_DOCUMENT_ROOT) + toPath.getFileName();
-std::string encodedTo;

Atef Hares license statement

[Atef Hares]

Hi,

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


Atef.


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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/qa solenv/bin

[Matthias Seidel]

 filter/qa/complex/filter/detection/typeDetection/files.csv |4 +--
 solenv/bin/modules/installer/patch/Msi.pm  |   14 ++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit a22f48c226a5e1fe3c81421f5cfd27cdbe801455
Author: Matthias Seidel 
Date:   Wed Mar 15 01:18:34 2017 +

Fixed typos

diff --git a/filter/qa/complex/filter/detection/typeDetection/files.csv 
b/filter/qa/complex/filter/detection/typeDetection/files.csv
index 84b593f..5bc5835 100644
--- a/filter/qa/complex/filter/detection/typeDetection/files.csv
+++ b/filter/qa/complex/filter/detection/typeDetection/files.csv
@@ -2,8 +2,8 @@ fileAlias;fileURL;defaultFileType;streamFileType
 #**
 #** N O T E
 #**
-#** The detection for template filter amd wirter_text_encoded
-#** will be chenged on following childworkspsace
+#** The detection for template filter and writer_text_encoded
+#** will be changed on following childworkspaces
 #**
 #**
 ###
diff --git a/solenv/bin/modules/installer/patch/Msi.pm 
b/solenv/bin/modules/installer/patch/Msi.pm
index f6d4497..9a5ce59 100644
--- a/solenv/bin/modules/installer/patch/Msi.pm
+++ b/solenv/bin/modules/installer/patch/Msi.pm
@@ -69,7 +69,7 @@ sub FindAndCreate($)
 
 =head2 new($class, $filename, $version, $is_current_version, $language, 
$product_name)
 
-Create a new object of the Msi class.  The values of $version, $language, 
and $product_name define
+Create a new object of the Msi class. The values of $version, $language, 
and $product_name define
 where to look for the msi file.
 
 If construction fails then IsValid() will return false.
@@ -136,7 +136,7 @@ sub IsValid ($)
 
 =head2 Commit($self)
 
-Write all modified tables back into the databse.
+Write all modified tables back into the database.
 
 =cut
 
@@ -172,8 +172,8 @@ sub Commit ($)
 
 =head2 GetTable($seld, $table_name)
 
-Return an MsiTable object for $table_name.  Table objects are kept
-alive for the life time of the Msi object.  Therefore the second
+Return an MsiTable object for $table_name. Table objects are kept
+alive for the life time of the Msi object. Therefore the second
 call for the same table is very cheap.
 
 =cut
@@ -212,7 +212,7 @@ sub GetTable ($$)
 
 =head2 PutTable($self, $table)
 
-Write the given table back to the databse.
+Write the given table back to the database.
 
 =cut
 
@@ -290,7 +290,7 @@ sub EnsureAYoungerThanB ($$)
 
 Split $name (typically from the 'FileName' column in the 'File'
 table or 'DefaultDir' column in the 'Directory' table) at the '|'
-into short (8.3) and long names.  If there is no '|' in $name then
+into short (8.3) and long names. If there is no '|' in $name then
 $name is returned as both short and long name.
 
 Returns long and short name (in this order) as array.
@@ -316,7 +316,7 @@ sub SplitLongShortName ($)
 =head2 SplitTargetSourceLongShortName ($name)
 
 Split $name first at the ':' into target and source parts and each
-of those at the '|'s into long and short parts.  Names that follow
+of those at the '|'s into long and short parts. Names that follow
 this pattern come from the 'DefaultDir' column in the 'Directory'
 table.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 sc/qa/unit/ucalc.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 152e9869f8c32fb2c353bfae22db214eba342507
Author: Laurent Balland-Poirier 
Date:   Sun Mar 12 15:17:30 2017 +0100

tdf#106253 Test Precision as shown for thousand separators

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

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 86aa877..13d163e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6780,14 +6780,17 @@ void Test::testPrecisionAsShown()
 checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
 checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
 }
-{   // thousand rounding bogus tdf#106253
+{   // thousand rounding tdf#106253
 aCode = "0,,";
 fValue = 4.0e9 / 7.0;
-fExpectedRoundVal = 571e6; // actual is 571428571
-//checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
-fValue = -4.0e8 / 7.0;
-fExpectedRoundVal = -57e6; // actual is 57142857
-//checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
+fExpectedRoundVal = 571e6;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+aCode = "\"k\"[$$-409]* #,;[RED]-\"k\"[$$-409]* #,";
+fValue = 4.0e8 / 7.0;
+fExpectedRoundVal = 57.143e6;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
 }
 {   // percent rounding
 aCode = "0.00%";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 loleaflet/src/layer/tile/ImpressTileLayer.js |   60 ++-
 1 file changed, 42 insertions(+), 18 deletions(-)

New commits:
commit 00fb1aeddd458327aedc63c81cc3b1d5a6fadfaf
Author: Henry Castro 
Date:   Tue Mar 14 20:41:40 2017 -0400

loleaflet: fix annotations of each slide

Change-Id: I85a27aadad9b03c8a190d3a4b2af7bcb86550a01

diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js 
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 8afd5c7..2584679 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -12,6 +12,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
},
 
beforeAdd: function (map) {
+   map.on('updateparts', this.onUpdateParts, this);
map.on('AnnotationCancel', this.onAnnotationCancel, this);
map.on('AnnotationSave', this.onAnnotationSave, this);
map.on('AnnotationScrollUp', this.onAnnotationScrollUp, this);
@@ -19,17 +20,25 @@ L.ImpressTileLayer = L.TileLayer.extend({
},
 
getAnnotation: function (id) {
-   for (var index in this._annotations) {
-   if (this._annotations[index]._data.id === id) {
-   return this._annotations[index];
+   var annotations = 
this._annotations[this._partHashes[this._selectedPart]];
+   for (var index in annotations) {
+   if (annotations[index]._data.id === id) {
+   return annotations[index];
}
}
return null;
},
 
+   hideAnnotations: function (part) {
+   var annotations = this._annotations[this._partHashes[part]];
+   for (var index in annotations) {
+   annotations[index].hide();
+   }
+   },
+
onAdd: function (map) {
L.TileLayer.prototype.onAdd.call(this, map);
-   this._annotations = [];
+   this._annotations = {};
},
 
onAnnotationCancel: function (e) {
@@ -82,7 +91,7 @@ L.ImpressTileLayer = L.TileLayer.extend({
},
 
onAnnotationScrollDown: function (e) {
-   this._topAnnotation = Math.min(++this._topAnnotation, 
this._annotations.length - 1);
+   this._topAnnotation = Math.min(++this._topAnnotation, 
this._annotations[this._partHashes[this._selectedPart]].length - 1);
this.layoutAnnotations();
},
 
@@ -91,21 +100,30 @@ L.ImpressTileLayer = L.TileLayer.extend({
this.layoutAnnotations();
},
 
+   onUpdateParts: function (e) {
+   if (typeof this._prevSelectedPart === 'number') {
+   this.hideAnnotations(this._prevSelectedPart);
+   this.layoutAnnotations();
+   }
+   },
+
removeAnnotation: function (id) {
-   for (var index in this._annotations) {
-   if (this._annotations[index]._data.id == id) {
-   this._map.removeLayer(this._annotations[index]);
-   this._annotations.splice(index, 1);
+   var annotations = 
this._annotations[this._partHashes[this._selectedPart]];
+   for (var index in annotations) {
+   if (annotations[index]._data.id == id) {
+   this._map.removeLayer(annotations[index]);
+   annotations.splice(index, 1);
break;
}
}
},
 
layoutAnnotations: function () {
+   var annotations = 
this._annotations[this._partHashes[this._selectedPart]];
var topRight = 
this._map.latLngToLayerPoint(this._map.options.maxBounds.getNorthEast()).add(L.point(this.options.marginX,
 this.options.marginY));
var bounds, annotation;
-   for (var index in this._annotations) {
-   annotation = this._annotations[index];
+   for (var index in annotations) {
+   annotation = annotations[index];
if (index >= this._topAnnotation) {
annotation.setLatLng(bounds ? 
this._map.layerPointToLatLng(bounds.getBottomLeft()) : 
this._map.layerPointToLatLng(topRight));
bounds = annotation.getBounds();
@@ -133,9 +151,13 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
 
if (values.comments) {
+   this._annotations = {};
for (var index in values.comments) {
comment = values.comments[index];
-   
this._annotations.push(L.annotation(this._map.options.maxBounds.getSouthEast(), 
comment).addTo(this._map));
+

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

[Laurent Balland-Poirier]

 svl/source/numbers/zformat.cxx  |3 ++-
 svl/source/numbers/zforscan.cxx |   10 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit f1a108f4dfd3d82dd39a9606f54a25a076ac516d
Author: Laurent Balland-Poirier 
Date:   Sun Mar 12 23:33:24 2017 +0100

Following tdf#106190 Treat blank after fraction bar

To consider that denominator is found (bDenom=true)
there must be some digits found after fraction bar

Dummy format # ?/ ? can now work again (even with
blank as thousands delimiter).
However such format can not be saved (except in XLS)

Change-Id: I657e97e09a6ae4c08a29ad6d0b586c85a9968e3d
Reviewed-on: https://gerrit.libreoffice.org/35111
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 4e1448d43e08d3f0a6ff67e75346e9559ad2af09)
Reviewed-on: https://gerrit.libreoffice.org/35196

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index be19e33..ac622bf 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2212,7 +2212,8 @@ OUString lcl_GetDenominatorString(const 
ImpSvNumberformatInfo &rInfo, sal_uInt16
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC )
 {
-for( i++; i < nAnz; i++ )
+while ( ( ++i < nAnz ) && rInfo.nTypeArray[i] == 
NF_SYMBOLTYPE_STRING );
+for( ; i < nAnz; i++ )
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC_FDIV || 
rInfo.nTypeArray[i] == NF_SYMBOLTYPE_DIGIT )
 aDenominatorString.append( rInfo.sStrArray[i] );
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 1cceda7..363a621 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1670,7 +1670,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 }
 else if ( sStrArray[i][0] == ' ' )
 nTypeArray[i] = NF_SYMBOLTYPE_FRACBLANK;
-else if ( bFrac )
+else if ( bFrac && ( nCounter > 0 ) )
 bDenomin = true; // following elements are no more 
part of denominator
 }
 else if (nTypeArray[i] == NF_KEY_THAI_T)
@@ -1714,7 +1714,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 }
 else
 {
-if ( bFrac )
+if ( bFrac && ( nCounter > 0 ) )
 bDenomin = true;// next content should be treated 
as outside denominator
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
 }
@@ -1834,7 +1834,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 else
 {
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
-if ( bFrac )
+if ( bFrac && (nCounter > 0) )
 bDenomin = true; // end of denominator
 }
 }
@@ -2002,7 +2002,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 nCntPre = nCounter;
 nCounter = 0;
 }
-if ( bFrac )
+if ( bFrac && (nCounter > 0) )
 bDenomin = true; // next content is not part 
of denominator
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
 nPos = nPos + sStrArray[i].getLength();
@@ -2010,7 +2010,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 else
 {
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
-if ( bFrac )
+if ( bFrac && (nCounter > 0) )
 bDenomin = true; // next content is not part 
of denominator
 nPos = nPos + rStr.getLength();
 i++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 include/svl/zformat.hxx  |6 ++
 sc/source/core/data/documen4.cxx |6 ++
 2 files changed, 12 insertions(+)

New commits:
commit 60d7644a46970e6eaee882e0c5d65692da206c24
Author: Laurent Balland-Poirier 
Date:   Sun Mar 12 14:11:36 2017 +0100

tdf#106253 Precision as shown for thousand dividor

Info().nThousand contains number of thousands dividors
after which digits are not displayed, i.e. 12345 is displayed
as 12 with format 0, (in en_US)

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

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 1dd05d2..2f382d8 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -226,6 +226,12 @@ public:
 sal_uInt16 GetFormatIntegerDigits( sal_uInt16 nIx = 0 ) const
 { return NumFor[nIx].Info().nCntPre; }
 
+/** Count of hidden integer digits with thousands dividor:
+ * formats like "0," to show only thousands
+ */
+sal_uInt16 GetThousandDivisorPrecision( sal_uInt16 nIx = 0 ) const
+{ return NumFor[nIx].Info().nThousand * 3; }
+
 //! Read/write access on a special sal_uInt16 component, may only be used 
on the
 //! standard format 0, 1, ... and only by the number formatter!
 struct FormatterPrivateAccess { friend SvNumberFormatter; private: 
FormatterPrivateAccess() {} };
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 6bb280b..1cdc777 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -692,6 +692,12 @@ double ScDocument::RoundValueAsShown( double fVal, 
sal_uInt32 nFormat ) const
 {
 return pFormat->GetRoundFractionValue( fVal );
 }
+case css::util::NumberFormat::NUMBER:
+case css::util::NumberFormat::CURRENCY:
+{   // tdf#106253 Thousands dividors for format "0,"
+nPrecision -=  pFormat->GetThousandDivisorPrecision( nIdx 
);
+break;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |4 +-
 sc/source/ui/dbgui/dbnamdlg.cxx   |   38 +++---
 sc/source/ui/dbgui/foptmgr.cxx|9 ++---
 sc/source/ui/dbgui/imoptdlg.cxx   |4 +-
 sc/source/ui/dbgui/scendlg.cxx|4 +-
 sc/source/ui/dbgui/scuiimoptdlg.cxx   |4 +-
 sc/source/ui/dbgui/sfiltdlg.cxx   |   25 ++
 sc/source/ui/dbgui/tpsubt.cxx |   10 ++---
 8 files changed, 48 insertions(+), 50 deletions(-)

New commits:
commit aaa3fc0192c02389be2cde2ecd38085d0c304c44
Author: Johnny_M 
Date:   Sat Mar 4 16:30:54 2017 +

Translate German comments in sc/source/ui (part of its sub-dirs)

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

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f4d2190..f146fd4 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -424,7 +424,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const 
SfxHint& rHint)
 {
 switch (pSdrHint->GetKind())
 {
-case SdrHintKind::ObjectChange : // Objekt geaendert
+case SdrHintKind::ObjectChange : // object changed
 {
 uno::Reference xShape 
(pObj->getUnoShape(), uno::UNO_QUERY);
 if (xShape.is())
@@ -435,7 +435,7 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const 
SfxHint& rHint)
 }
 }
 break;
-case SdrHintKind::ObjectInserted :// Neues Zeichenobjekt 
eingefuegt
+case SdrHintKind::ObjectInserted :// new drawing object 
inserted
 {
 uno::Reference xShape 
(pObj->getUnoShape(), uno::UNO_QUERY);
 if (xShape.is())
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 4596729..c4cc4ce 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -148,7 +148,7 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* 
pCW, vcl::Window* pPar
 m_pFTSource->SetStyle(m_pFTSource->GetStyle() | WB_NOLABEL);
 m_pFTOperations->SetStyle(m_pFTOperations->GetStyle() | WB_NOLABEL);
 
-//  damit die Strings in der Resource bei den FixedTexten bleiben koennen:
+//  so that the strings in the resource can stay with fixed texts:
 aStrSource  = m_pFTSource->GetText();
 aStrOperations  = m_pFTOperations->GetText();
 
@@ -223,7 +223,7 @@ void ScDbNameDlg::Init()
 
 if ( pDBColl )
 {
-// Feststellen, ob definierter DB-Bereich markiert wurde:
+// determine if the defined DB area has been marked:
 pDBData = pDBColl->GetDBAtCursor( nStartCol, nStartRow, nStartTab, 
ScDBDataPortion::TOP_LEFT );
 if ( pDBData )
 {
@@ -283,8 +283,8 @@ void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData )
 m_pFTOperations->SetText(aBuf.makeStringAndClear());
 }
 
-// Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
-//  neue Selektion im Referenz-Fenster angezeigt wird.
+// Transfer of a table area selected with the mouse, which is then displayed
+// as a new selection in the reference window.
 
 void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
@@ -313,9 +313,9 @@ void ScDbNameDlg::SetActive()
 {
 m_pEdAssign->GrabFocus();
 
-//  kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen
-//  (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder 
angezeigt)
-//  (der ausgewaehlte DB-Name hat sich auch nicht veraendert)
+//  No NameModifyHdl, because otherwise areas can not be changed
+//  (the old content would be displayed again after the reference 
selection is pulled)
+//  (the selected DB name has not changed either)
 
 RefInputDone();
 }
@@ -392,9 +392,9 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl, Button*, void)
 {
 AddBtnHdl( nullptr );
 
-// Der View die Aenderungen und die Remove-Liste uebergeben:
-// beide werden nur als Referenz uebergeben, so dass an dieser
-// Stelle keine Speicherleichen entstehen koennen:
+// Pass the changes and the remove list to the view: both are
+// transferred as a reference only, so that no dead memory can
+// be created at this point:
 if ( pViewData )
 {
 ScDBDocFunc aFunc(*pViewData->GetDocShell());
@@ -418,7 +418,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl, Button*, void)
 {
 if ( ScRangeData::IsNameValid( aNewName, pDoc ) == 
ScRangeData::NAME_VALID && aNewName != STR_DB_LOCAL_NONAME )
 {
-//  we

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

[Caolán McNamara]

 vcl/source/filter/ixbm/xbmread.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit d4873496e8c74192f50f061cd8ab512e706a44ad
Author: Caolán McNamara 
Date:   Tue Mar 14 21:23:12 2017 +

return early on clearly broken xbms

Change-Id: Ic94a75aacb6bcd47d594a12e0df999a58b04b061

diff --git a/vcl/source/filter/ixbm/xbmread.cxx 
b/vcl/source/filter/ixbm/xbmread.cxx
index 38475fd..d3d21c4 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -308,6 +308,11 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
 else
 bStatus = false;
 
+//xbms are a minimum of one character per 8 pixels, so 
if the file isn't
+//even that long, its not all there
+if (rIStm.remainingSize() < 
(static_cast(nWidth) * nHeight) / 8)
+bStatus = false;
+
 if ( bStatus && nWidth && nHeight )
 {
 aBmp1 = Bitmap( Size( nWidth, nHeight ), 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_features.h.in config_host.mk.in configure.ac extensions/Module_extensions.mk Repository.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk sd/qa

[Tor Lillqvist]

 Repository.mk |   30 ++-
 config_host.mk.in |2 -
 config_host/config_features.h.in  |5 
 configure.ac  |   33 --
 extensions/Module_extensions.mk   |4 ---
 scp2/InstallScript_setup_osl.mk   |2 -
 scp2/Module_scp2.mk   |2 -
 sd/qa/unit/export-tests-ooxml2.cxx|9 
 setup_native/Module_setup_native.mk   |2 -
 shell/Module_shell.mk |   12 +++---
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |3 --
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |   12 --
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   12 --
 13 files changed, 18 insertions(+), 110 deletions(-)

New commits:
commit e597ef0489d9d5504721d21eefa15c65da0fb240
Author: Tor Lillqvist 
Date:   Tue Mar 14 11:59:12 2017 +0200

No need for --disable-activex and --disable-atl any longer

Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b
Reviewed-on: https://gerrit.libreoffice.org/35174
Reviewed-by: David Ostrovsky 
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/Repository.mk b/Repository.mk
index 322650a..391d8bb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -346,7 +346,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(if $(ENABLE_OPENGL_CANVAS),oglcanvas) \
drawinglayer \
editeng \
-   $(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
+   $(if $(filter WNT,$(OS)),emser) \
evtatt \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -456,7 +456,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
mozbootstrap \
$(if $(filter $(OS),WNT), \
ado \
-   $(if $(DISABLE_ATL),,oleautobridge) \
+   oleautobridge \
smplmail \
wininetbe1 \
) \
@@ -604,7 +604,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_JAVA), \
$(if $(filter $(OS),MACOSX),,officebean) \
) \
-   $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \
+   emboleobj \
package2 \
$(if $(USING_X11),recentfile) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
@@ -636,11 +636,9 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
dtrans \
fps \
ftransl \
-   $(if $(DISABLE_ATL),,\
-   inprocserv \
-   UAccCOM \
-   winaccessibility \
-   ) \
+   inprocserv \
+   UAccCOM \
+   winaccessibility \
) \
 ))
 
@@ -652,24 +650,18 @@ endif
 
 ifeq ($(OS),WNT)
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \
-   $(if $(DISABLE_ACTIVEX),,\
-   regactivex \
-   ) \
+   regactivex \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \
-   $(if $(DISABLE_ACTIVEX),,\
-   so_activex \
-   spsupp \
-   ) \
+   so_activex \
+   spsupp \
 ))
 
 ifneq ($(BUILD_X64),)
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \
-   $(if $(DISABLE_ACTIVEX),,\
-   so_activex_x64 \
-   spsupp_x64 \
-   ) \
+   so_activex_x64 \
+   spsupp_x64 \
 ))
 endif
 
diff --git a/config_host.mk.in b/config_host.mk.in
index 176546e..ae77925 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -91,8 +91,6 @@ export DCONF_CFLAGS=@DCONF_CFLAGS@
 export DCONF_LIBS=@DCONF_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
-export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
-export DISABLE_ATL=@DISABLE_ATL@
 export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
 export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@
 export DISABLE_OPENSSL=@DISABLE_OPENSSL@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 8e52a65..2df958a 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -160,11 +160,6 @@
 #define HAVE_FEATURE_BREAKPAD 0
 
 /*
- * Whether to enable ATL
- */
-#define HAVE_FEATURE_ATL 0
-
-/*
  *  Whether OpenGL is enabled
  */
 #define HAVE_FEATURE_OPENGL 0
diff --git a/configure.ac b/configure.ac
index 6b35424..9276012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1130,16 +1130,6 @@ libo_FUZZ_ARG_ENABLE(directx,
  compile. (DirectX SDK, GDI+ libs)])
 )
 
-libo_FUZZ_ARG_ENABLE(activex,
-AS_HELP_STRING([--disable-activex],
-[Disable the use of ActiveX for a Windows build.])
-,)
-
-libo_FUZZ_ARG_ENABLE(atl,
-AS_HELP_STRING([--disable-atl],
-[Disable the use of ATL for a 

[Libreoffice-commits] core.git: Makefile.in Repository.mk vcl/Executable_olefuzzer.mk vcl/Module_vcl.mk vcl/workben

[David Tardon]

 Makefile.in |2 -
 Repository.mk   |1 
 vcl/Executable_olefuzzer.mk |   47 +++
 vcl/Module_vcl.mk   |1 
 vcl/workben/olefuzzer.cxx   |   66 
 5 files changed, 116 insertions(+), 1 deletion(-)

New commits:
commit 3fa34da687ba4be98319888a90cba6414b9f3fbe
Author: David Tardon 
Date:   Tue Mar 14 10:17:41 2017 +0100

add a separate fuzzer for OLE2

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

diff --git a/Makefile.in b/Makefile.in
index 9c934dd..3f07dde 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ $(foreach ide,\
 eclipsecdt,\
 $(eval $(call gb_Top_GbuildToIdeIntegrationNS,$(ide
 
-fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg 
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools 
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc 
Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 
Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services 
udkapi offapi Library_clew Library_gie Library_icg Library_reflection 
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices 
Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts 
StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer 
Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer 
Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer 
Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer 
Executable_ppmfuzzer E
 xecutable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer 
Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer 
Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer 
Executable_lwpfuzzer AllLangResTarget_sd
+fuzzers: Library_sal Library_salhelper Library_reg Library_store 
Library_unoidl codemaker Library_cppu Library_i18nlangtag Library_cppuhelper 
Library_comphelper StaticLibrary_ulingu StaticLibrary_jpeg 
StaticLibrary_findsofficepath Library_tl Library_basegfx Library_canvastools 
Library_cppcanvas Library_dbtools Library_deploymentmisc Library_deploymentmisc 
Library_editeng Library_fwe Library_fwi Library_i18nutil Library_localebe1 
Library_sax Library_sofficeapp Library_ucbhelper Library_opencl Rdb_services 
udkapi offapi Library_clew Library_gie Library_icg Library_reflection 
Library_invocadapt Library_bootstrap Library_introspection Library_stocservices 
Library_xmlreader Library_gcc3_uno instsetoo_native more_fonts 
StaticLibrary_fuzzer Executable_wmffuzzer Executable_jpgfuzzer 
Executable_giffuzzer Executable_xbmfuzzer Executable_xpmfuzzer 
Executable_pngfuzzer Executable_bmpfuzzer Executable_svmfuzzer 
Executable_pcdfuzzer Executable_dxffuzzer Executable_metfuzzer 
Executable_ppmfuzzer E
 xecutable_psdfuzzer Executable_epsfuzzer Executable_pctfuzzer 
Executable_pcxfuzzer Executable_rasfuzzer Executable_tgafuzzer 
Executable_tiffuzzer Executable_hwpfuzzer Executable_602fuzzer 
Executable_lwpfuzzer Executable_olefuzzer AllLangResTarget_sd
 
 endif # MAKE_RESTARTS
 
diff --git a/Repository.mk b/Repository.mk
index ec73404..322650a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -115,6 +115,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,hwpfuzzer) \
$(call gb_Helper_optional,FUZZERS,602fuzzer) \
$(call gb_Helper_optional,FUZZERS,lwpfuzzer) \
+   $(call gb_Helper_optional,FUZZERS,olefuzzer) \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/vcl/Executable_olefuzzer.mk b/vcl/Executable_olefuzzer.mk
new file mode 100644
index 000..d339f4c
--- /dev/null
+++ b/vcl/Executable_olefuzzer.mk
@@ -0,0 +1,47 @@
+# -*- 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/.
+#
+
+include $(SRCDIR)/vcl/commonfuzzer.mk
+
+$(eval $(call gb_Executable_Executable,olefuzzer))
+
+$(eval $(call gb_Executable_use_api,olefuzzer,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_externals,olefuzzer,\
+   $(fuzzer_externals) \
+))
+
+$(eval $(call gb_Executable_set_include,olefuzzer,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,olefuzzer,\
+   $(fuzzer_libraries) \
+))
+
+$(eval $(c

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

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/stack-1.lwp |binary
 lotuswordpro/source/filter/lwptblformula.cxx  |4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e68faf7d42179c4f9b90b514f5b3bfcb7f1e9cb0
Author: Caolán McNamara 
Date:   Tue Mar 14 20:40:15 2017 +

ofz#866 crash in LwpFormulaInfo::ReadArguments

Change-Id: Id301c21c8a4a0556b6326b621171aa62bd939d8d

diff --git a/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp 
b/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp
new file mode 100644
index 000..60eb8e39
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/stack-1.lwp 
differ
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx 
b/lotuswordpro/source/filter/lwptblformula.cxx
index 70eeebb..f926677 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -297,9 +297,9 @@ void LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
 break;
 }
 
-if (bArgument)
+if (bArgument && !m_aStack.empty())
 {
-aFunc.AddArg( m_aStack.back() );
+aFunc.AddArg(m_aStack.back());
 m_aStack.pop_back();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwptblformula.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1565c6bed3289f8f14b311b17ffb2e99d155bddb
Author: Caolán McNamara 
Date:   Tue Mar 14 20:36:55 2017 +

improve scoping

Change-Id: Ie5a5eacddba747d3b9cff6b8252add54473eb3f2

diff --git a/lotuswordpro/source/filter/lwptblformula.cxx 
b/lotuswordpro/source/filter/lwptblformula.cxx
index 5ec8fba..70eeebb 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -262,13 +262,11 @@ void LwpFormulaInfo::MarkUnsupported(sal_uInt16 TokenType)
 void LwpFormulaInfo::ReadArguments(LwpFormulaFunc& aFunc)
 {
 sal_uInt16 NumberOfArguments = m_pObjStrm->QuickReaduInt16();
-sal_uInt16 ArgumentDiskLength, Count;
-sal_uInt8 ArgumentType;
 
-for (Count = 0; Count < NumberOfArguments; Count++)
+for (sal_uInt16 Count = 0; Count < NumberOfArguments; Count++)
 {
-ArgumentType = (sal_uInt8) m_pObjStrm->QuickReaduInt16(); // written 
as lushort
-ArgumentDiskLength = m_pObjStrm->QuickReaduInt16();
+sal_uInt8 ArgumentType = (sal_uInt8) m_pObjStrm->QuickReaduInt16(); // 
written as lushort
+sal_uInt16 ArgumentDiskLength = m_pObjStrm->QuickReaduInt16();
 bool bArgument = true;
 
 switch(ArgumentType)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sot/qa/cppunit/data/pass/loop-1.compound |binary
 sot/source/sdstor/stgdir.cxx |   18 ++
 2 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit 9e83222bb1bf18ebcfa354f958606677a63ab1d9
Author: Caolán McNamara 
Date:   Tue Mar 14 16:11:40 2017 +

check full chain upwards

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

diff --git a/sot/qa/cppunit/data/pass/loop-1.compound 
b/sot/qa/cppunit/data/pass/loop-1.compound
new file mode 100644
index 000..eddb916
Binary files /dev/null and b/sot/qa/cppunit/data/pass/loop-1.compound differ
diff --git a/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index a4c682d..7d49622 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.cxx
@@ -800,23 +800,17 @@ void StgDirStrm::SetupEntry( sal_Int32 n, StgDirEntry* 
pUpper )
 
 if( nLeaf != 0 && nLeft != 0 && nRight != 0 )
 {
-//fdo#41642 Do we need to check full chain upwards for loops ?
-if (pUpper)
+//fdo#41642
+StgDirEntry *pUp = pUpper;
+while (pUp)
 {
-if (pUpper->m_aEntry.GetLeaf(STG_CHILD) == nLeaf)
+if (pUp->m_aEntry.GetLeaf(STG_CHILD) == nLeaf)
 {
-OSL_FAIL("Leaf node of upper StgDirEntry is same as 
current StgDirEntry's leaf node. Circular entry chain, discarding link");
-delete pCur;
-return;
-}
-
-StgDirEntry *pUpperUpper = pUpper->m_pUp;
-if (pUpperUpper && pUpperUpper->m_aEntry.GetLeaf(STG_CHILD) == 
nLeaf)
-{
-OSL_FAIL("Leaf node of upper-upper StgDirEntry is same as 
current StgDirEntry's leaf node. Circular entry chain, discarding link");
+SAL_WARN("sot", "Leaf node of upper StgDirEntry is same as 
current StgDirEntry's leaf node. Circular entry chain, discarding link");
 delete pCur;
 return;
 }
+pUp = pUp->m_pUp;
 }
 
 if( StgAvlNode::Insert
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/core/tool/interpr1.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 69def929aa5b07e5a67279d5da20001c844fdf06
Author: Eike Rathke 
Date:   Tue Mar 14 21:13:06 2017 +0100

properly align the confusing braces

Change-Id: Idd02e2eace5313ae419bfe99e3ad34e67e1c970b

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index d5fb4dc..96fee0f 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -643,12 +643,12 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
 aRange.aEnd.Col() != aRange.aStart.Col())
 || (nRow > 
static_cast(aRange.aEnd.Row()) &&
 aRange.aEnd.Row() != aRange.aStart.Row()))
-  {
+{
 fVal = CreateDoubleError( 
FormulaError::NotAvailable );
 pJumpMatrix->PutResultDouble( fVal, nC, nR );
-  }
-  else
-  {
+}
+else
+{
 // Replicate column and/or row of a vector if it is
 // one. Note that this could be a range reference
 // that in fact consists of only one cell, e.g. 
A1:A1
@@ -662,7 +662,7 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
 if (aCell.hasEmptyValue())
 pJumpMatrix->PutResultEmpty( nC, nR );
 else if (aCell.hasNumeric())
-  {
+{
 double fCellVal = GetCellValue(aAdr, aCell);
 if ( nGlobalError != FormulaError::NONE )
 {
@@ -671,9 +671,9 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
 nGlobalError = FormulaError::NONE;
 }
 pJumpMatrix->PutResultDouble( fCellVal, nC, nR 
);
-  }
-  else
-  {
+}
+else
+{
 svl::SharedString aStr;
 GetCellString(aStr, aCell);
 if ( nGlobalError != FormulaError::NONE )
@@ -685,7 +685,7 @@ bool ScInterpreter::JumpMatrix( short nStackLevel )
 else
 pJumpMatrix->PutResultString(aStr, nC, nR);
 }
-  }
+}
 SCSIZE nParmCols = aRange.aEnd.Col() - 
aRange.aStart.Col() + 1;
 SCSIZE nParmRows = aRange.aEnd.Row() - 
aRange.aStart.Row() + 1;
 lcl_AdjustJumpMatrix( pJumpMatrix, nParmCols, 
nParmRows );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[aleksandar-stefanovic]

 android/source/build.gradle |2 +-
 android/source/gradle/wrapper/gradle-wrapper.properties |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c619f311cee3dc6d1af593413f6f38ba2383eeb0
Author: aleksandar-stefanovic 
Date:   Tue Mar 14 19:31:33 2017 +0100

Bumped Gradle version to 3.3, gradle plugin to 2.3

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

diff --git a/android/source/build.gradle b/android/source/build.gradle
index f3ed892..d5fc5c9 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 jcenter()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:2.2.3'
+classpath 'com.android.tools.build:gradle:2.3.0'
 }
 }
 
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties 
b/android/source/gradle/wrapper/gradle-wrapper.properties
index 5e709c7..5dc276a 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 27 20:49:11 CEST 2016
+#Tue Mar 14 19:29:07 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

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

New commits:
commit 409a7799ba06f3c6b9965f2f35169283a948bc30
Author: Eike Rathke 
Date:   Tue Mar 14 19:57:04 2017 +0100

no assert for one reference while destroying the Undo document

Change-Id: Idf9e0b2600d503ff50cd6269e8d528c0fad12a3e

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 3addea4..2c96466 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -1106,8 +1106,9 @@ void ScPostIt::RemoveCaption()
 }
 }
 // Either the caption object is gone or, because of Undo or clipboard is
-// held in at least two instances.
-assert(!maNoteData.mxCaption || maNoteData.mxCaption.getRefs() >= 2);
+// held in at least two instances, or the Undo document is just destroyed
+// which leaves us with one reference.
+assert(!maNoteData.mxCaption || maNoteData.mxCaption.getRefs() >= 2 || 
(mrDoc.IsUndo() && mrDoc.IsInDtorClear()));
 maNoteData.mxCaption.reset(nullptr);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sc/source/ui/view/cellsh1.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d9128bc895bfa9740cd85c766a10217e35aaa937
Author: Markus Mohrhard 
Date:   Mon Feb 13 19:27:57 2017 +0100

don't forget to set the managed flag, tdf#105544

Change-Id: I46d534a157b05ce22ba42e269ca8266e3403ecd2
Reviewed-on: https://gerrit.libreoffice.org/34229
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
(cherry picked from commit 0b9e33cceb635cd3c173bd1f461af98cfd6f6ed2)
Reviewed-on: https://gerrit.libreoffice.org/35182
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index f17de35..2fa4fb6 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1947,6 +1947,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
 const ScCondFormatDlgItem* pDlgItem = 
static_cast(pItem);
 nIndex = pDlgItem->GetIndex();
+bManaged = true;
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Pushing code to Gerrit

[Aditya Dewan]

Hi,

I just resolved this issue. This issue was there because ssh was unable to
route to the internet because of the proxy i work behind.

The following thread

 helped.
and adding

ProxyCommand  nc -X connect -x proxyhost:proxyport %h %p


in the ssh config file resolved this issue.

Thanks for your help. :)

On Tue, Mar 14, 2017 at 11:28 PM, Eike Rathke  wrote:

> Hi Aditya,
>
> On Tuesday, 2017-03-14 20:54:04 +0530, Aditya Dewan wrote:
>
> > Please let me know what i am doing wrong, and how i can rectify it.
>
> Probably nothing, your config looks good but
>
> > > ssh: Could not resolve hostname gerrit.libreoffice.org: Temporary
> failure
> > > in name resolution
>
> indicates it's rather a DNS problem and to try again later. Or you have
> a more severe problem routing ssh to the Internet..
>
> You could try the simple command
> ssh gerrit.libreoffice.org
> which if successful should give some kind of welcome screen and that
> shells are disabled.
>
>   Eike
>
> --
> LibreOffice Calc developer. Number formatter stricken i18n
> transpositionizer.
> GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563
> 2D3A
> Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
> Care about Free Software, support the FSFE https://fsfe.org/support/?erack
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Udayan Baidya license statement

[Udayan Baidya]

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

--

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

Re: Pushing code to Gerrit

[Eike Rathke]

Hi Aditya,

On Tuesday, 2017-03-14 20:54:04 +0530, Aditya Dewan wrote:

> Please let me know what i am doing wrong, and how i can rectify it.

Probably nothing, your config looks good but

> > ssh: Could not resolve hostname gerrit.libreoffice.org: Temporary failure
> > in name resolution

indicates it's rather a DNS problem and to try again later. Or you have
a more severe problem routing ssh to the Internet..

You could try the simple command
ssh gerrit.libreoffice.org
which if successful should give some kind of welcome screen and that
shells are disabled.

  Eike

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


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

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

[Stephan Bergmann]

 include/vcl/texteng.hxx  |8 --
 vcl/source/edit/textdat2.hxx |   24 ++
 vcl/source/edit/textdata.cxx |   18 --
 vcl/source/edit/texteng.cxx  |   55 +--
 vcl/source/edit/textview.cxx |4 ++-
 5 files changed, 62 insertions(+), 47 deletions(-)

New commits:
commit b481928a2104bb659021bd0795c73fcf64129c99
Author: Stephan Bergmann 
Date:   Tue Mar 14 18:22:21 2017 +0100

Clean up uses of integer types in vcl/texteng

Change-Id: Ic70f57784e69cd82910d834c43a65bce4c00caea

diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 469594e..58c4b58 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_VCL_TEXTENG_HXX
 #define INCLUDED_VCL_TEXTENG_HXX
 
+#include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -174,7 +178,7 @@ protected:
 boolCreateLines( sal_uInt32 nPara );
 voidCreateAndInsertEmptyLine( sal_uInt32 nPara );
 voidImpBreakLine( sal_uInt32 nPara, TextLine* pLine, 
TETextPortion* pPortion, sal_Int32 nPortionStart, long nRemainingWidth );
-sal_uInt16  SplitTextPortion( sal_uInt32 nPara, sal_Int32 nPos );
+std::size_t SplitTextPortion( sal_uInt32 nPara, sal_Int32 nPos );
 voidCreateTextPortions( sal_uInt32 nPara, sal_Int32 
nStartPos );
 voidRecalcTextPortion( sal_uInt32 nPara, sal_Int32 
nStartPos, sal_Int32 nNewChars );
 voidSeekCursor( sal_uInt32 nNode, sal_Int32 nPos, 
vcl::Font& rFont, OutputDevice* pOutDev );
@@ -192,7 +196,7 @@ protected:
 sal_Int32   GetCharPos( sal_uInt32 nPara, 
std::vector::size_type nLine, long nDocPosX, bool bSmart = false );
 Rectangle   GetEditCursor( const TextPaM& rPaM, bool bSpecial, 
bool bPreferPortionStart = false );
 sal_Int32   ImpFindIndex( sal_uInt32 nPortion, const Point& 
rPosInPara, bool bSmart );
-longImpGetPortionXOffset( sal_uInt32 nPara, TextLine* 
pLine, sal_uInt16 nTextPortion );
+longImpGetPortionXOffset( sal_uInt32 nPara, TextLine* 
pLine, std::size_t nTextPortion );
 longImpGetXPos( sal_uInt32 nPara, TextLine* pLine, 
sal_Int32 nIndex, bool bPreferPortionStart = false );
 longImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, 
sal_Int32 nIndex, sal_Int32 nIndex2 );
 sal_uInt8   ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos );
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 90b5f85..96e0cec 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 
+#include 
+#include 
 #include 
 
 class TextNode;
@@ -73,24 +75,26 @@ private:
 std::vector maPortions;
 
 public:
+static constexpr auto npos = std::numeric_limits::max();
+
 TETextPortionList();
 ~TETextPortionList();
 
-TETextPortion* operator[]( size_t nPos );
+TETextPortion* operator[]( std::size_t nPos );
 std::vector::iterator begin();
 std::vector::const_iterator begin() const;
 std::vector::iterator end();
 std::vector::const_iterator end() const;
 bool empty() const;
-size_t size() const;
+std::size_t size() const;
 std::vector::iterator erase( 
std::vector::iterator aIter );
 std::vector::iterator insert( 
std::vector::iterator aIter,
   TETextPortion* pTP );
 void push_back( TETextPortion* pTP );
 
 voidReset();
-sal_uInt16  FindPortion( sal_Int32 nCharPos, sal_Int32& rPortionStart, 
bool bPreferStartingPortion = false );
-voidDeleteFromPortion( size_t nDelFrom );
+std::size_t FindPortion( sal_Int32 nCharPos, sal_Int32& rPortionStart, 
bool bPreferStartingPortion = false );
+voidDeleteFromPortion( std::size_t nDelFrom );
 };
 
 struct TEWritingDirectionInfo
@@ -110,8 +114,8 @@ class TextLine
 private:
 sal_Int32   mnStart;
 sal_Int32   mnEnd;
-sal_uInt16  mnStartPortion;
-sal_uInt16  mnEndPortion;
+std::size_t mnStartPortion;
+std::size_t mnEndPortion;
 
 short   mnStartX;
 
@@ -136,11 +140,11 @@ public:
 voidSetEnd( sal_Int32 n )   { mnEnd = n; }
 sal_Int32   GetEnd() const  { return mnEnd; }
 
-voidSetStartPortion( sal_uInt16 n ) { mnStartPortion = n; }
-sal_uInt16  GetStartPortion() const { return mnStartPortion; }
+voidSetStartPortion( std::size_t n ) { mnStartPortion = n; }
+std::size_t GetStartPortion() const { return mnStartPortion; }
 
-voidSetEndPortion( sal_uInt16 n )   { mnEndPortion = n; }
-sal_uInt16  GetEndPortion() const   { return mnEndPortion; }
+voidSetEndPorti

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

[Laurent Balland-Poirier]

 svl/source/numbers/zformat.cxx  |3 ++-
 svl/source/numbers/zforscan.cxx |   10 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 4e1448d43e08d3f0a6ff67e75346e9559ad2af09
Author: Laurent Balland-Poirier 
Date:   Sun Mar 12 23:33:24 2017 +0100

Following tdf#106190 Treat blank after fraction bar

To consider that denominator is found (bDenom=true)
there must be some digits found after fraction bar

Dummy format # ?/ ? can now work again (even with
blank as thousands delimiter).
However such format can not be saved (except in XLS)

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

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 4bd1a9e..2d1f874 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2212,7 +2212,8 @@ OUString lcl_GetDenominatorString(const 
ImpSvNumberformatInfo &rInfo, sal_uInt16
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC )
 {
-for( i++; i < nAnz; i++ )
+while ( ( ++i < nAnz ) && rInfo.nTypeArray[i] == 
NF_SYMBOLTYPE_STRING );
+for( ; i < nAnz; i++ )
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC_FDIV || 
rInfo.nTypeArray[i] == NF_SYMBOLTYPE_DIGIT )
 aDenominatorString.append( rInfo.sStrArray[i] );
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 5644c2b..788cd42 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1670,7 +1670,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 }
 else if ( sStrArray[i][0] == ' ' )
 nTypeArray[i] = NF_SYMBOLTYPE_FRACBLANK;
-else if ( bFrac )
+else if ( bFrac && ( nCounter > 0 ) )
 bDenomin = true; // following elements are no more 
part of denominator
 }
 else if (nTypeArray[i] == NF_KEY_THAI_T)
@@ -1714,7 +1714,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 }
 else
 {
-if ( bFrac )
+if ( bFrac && ( nCounter > 0 ) )
 bDenomin = true;// next content should be treated 
as outside denominator
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
 }
@@ -1834,7 +1834,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 else
 {
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
-if ( bFrac )
+if ( bFrac && (nCounter > 0) )
 bDenomin = true; // end of denominator
 }
 }
@@ -2002,7 +2002,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 nCntPre = nCounter;
 nCounter = 0;
 }
-if ( bFrac )
+if ( bFrac && (nCounter > 0) )
 bDenomin = true; // next content is not part 
of denominator
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
 nPos = nPos + sStrArray[i].getLength();
@@ -2010,7 +2010,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& 
rString )
 else
 {
 nTypeArray[i] = NF_SYMBOLTYPE_STRING;
-if ( bFrac )
+if ( bFrac && (nCounter > 0) )
 bDenomin = true; // next content is not part 
of denominator
 nPos = nPos + rStr.getLength();
 i++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - common/Png.hpp kit/Kit.cpp

[Michael Meeks]

 common/Png.hpp |   20 +
 kit/Kit.cpp|  117 -
 2 files changed, 135 insertions(+), 2 deletions(-)

New commits:
commit 71368bfd58e00fc2c33c7dfd9651c4c838e6c1d7
Author: Michael Meeks 
Date:   Mon Nov 21 11:42:01 2016 +

tdf#106273 Avoid PNG compression for un-changed tiles.

Change-Id: I563ce95663929a4be83d93c06a064d5baffd603e
Reviewed-on: https://gerrit.libreoffice.org/34787
Reviewed-by: Michael Meeks 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/common/Png.hpp b/common/Png.hpp
index cb05654..eb18aa9 100644
--- a/common/Png.hpp
+++ b/common/Png.hpp
@@ -157,6 +157,26 @@ bool encodeBufferToPNG(unsigned char* pixmap, int width, 
int height,
 return encodeSubBufferToPNG(pixmap, 0, 0, width, height, width, height, 
output, mode);
 }
 
+inline
+uint64_t hashSubBuffer(unsigned char* pixmap, size_t startX, size_t startY,
+   int width, int height, int bufferWidth, int 
bufferHeight)
+{
+if (bufferWidth < width || bufferHeight < height)
+return 0; // magic invalid hash.
+
+// assume a consistent mode - RGBA vs. BGRA for process
+uint64_t nHash = 1073741789;
+for (int y = 0; y < height; ++y)
+{
+size_t position = ((startY + y) * bufferWidth * 4) + (startX * 4);
+uint32_t *rgba = reinterpret_cast(pixmap + position);
+// Lameness for now.
+for (int x = 0; x < width; ++x)
+nHash = (nHash << 7) + rgba[x] - nHash;
+}
+return nHash;
+}
+
 static
 void readTileData(png_structp png_ptr, png_bytep data, png_size_t length)
 {
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 255e473..15fd559 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -261,6 +261,118 @@ namespace
 #endif
 }
 
+/// A quick & dirty cache of the last few PNGs
+/// and their hashes to avoid re-compression
+/// wherever possible.
+class PngCache
+{
+typedef std::shared_ptr< std::vector< char > > CacheData;
+struct CacheEntry {
+size_t_hitCount;
+CacheData _data;
+CacheEntry(size_t defaultSize) :
+_hitCount(0),
+_data( new std::vector< char >() )
+{
+_data->reserve( defaultSize );
+}
+} ;
+size_t _cacheSize;
+std::map< uint64_t, CacheEntry > _cache;
+
+void balanceCache()
+{
+// A normalish PNG image size for text in a writer document is
+// around 4k for a content tile, and sub 1k for a background one.
+if (_cacheSize > (1024 * 4 * 32) /* 128k of cache */)
+{
+size_t avgHits = 0;
+for (auto it = _cache.begin(); it != _cache.end(); ++it)
+avgHits += it->second._hitCount;
+
+LOG_DBG("cache " << _cache.size() << " items total size " <<
+_cacheSize << " total hits " << avgHits << " at balance 
start");
+avgHits /= _cache.size();
+
+for (auto it = _cache.begin(); it != _cache.end();)
+{
+if (it->second._hitCount <= avgHits)
+{
+_cacheSize -= it->second._data->size();
+_cache.erase(it++);
+}
+else
+{
+it->second._hitCount /= 2;
+++it;
+}
+}
+
+LOG_DBG("cache " << _cache.size() << " items total size " <<
+_cacheSize << " after balance");
+}
+}
+
+bool cacheEncodeSubBufferToPNG(unsigned char* pixmap, size_t startX, 
size_t startY,
+   int width, int height,
+   int bufferWidth, int bufferHeight,
+   std::vector& output, 
LibreOfficeKitTileMode mode)
+{
+uint64_t hash = png::hashSubBuffer(pixmap, startX, startY, width, 
height,
+   bufferWidth, bufferHeight);
+if (hash) {
+auto it = _cache.find(hash);
+if (it != _cache.end())
+{
+LOG_DBG("PNG cache with hash " << hash << " hit.");
+output.insert(output.end(),
+  it->second._data->begin(),
+  it->second._data->end());
+it->second._hitCount++;
+return true;
+}
+}
+LOG_DBG("PNG cache with hash " << hash << " missed.");
+CacheEntry newEntry(bufferWidth * bufferHeight * 1);
+if (png::encodeSubBufferToPNG(pixmap, startX, startY, width, height,
+  bufferWidth, bufferHeight,
+  *newEntry._data, mode))
+{
+if (hash)
+{
+_cache.insert(std::pair< uint64_t, CacheEntry >( hash, 
newEntry ));
+_cacheSize += newEntry._data->size();
+}
+   

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

[Samuel Mehrbrodt]

 include/vcl/menu.hxx   |1 +
 vcl/source/window/menu.cxx |   11 ---
 vcl/unx/gtk/gtksalmenu.cxx |   28 
 3 files changed, 33 insertions(+), 7 deletions(-)

New commits:
commit 449733a5c3b59c7b56db1db3dbc7fd0dcefd1a55
Author: Samuel Mehrbrodt 
Date:   Fri Mar 3 15:55:40 2017 +0100

tdf#106271 Cannot disable Menubar under Unity

Empty the global menu when the user wants to hide the menubar.
When showing it again, the global menu is refilled.

(cherry picked from commit f2fa5951bf3d02439a3e96d1f9d89962f0901edc)

The following commits have been squashed into this commit:

1.
Destroy menu widget when enabling Unity integration

Like GtkSalMenu::ShowMenuBar did before
f2fa5951bf3d02439a3e96d1f9d89962f0901edc
("tdf#106271 Cannot disable Menubar under Unity")

Should fix https://lists.freedesktop.org/archives/libreoffice/2017-
March/077225.html

(cherry-picked from commit 27f89f08cf4086802ce67f12389414bef6ab64ca)

2.
Don't use SetDisplayable when enabling Unity mode

because now it tracks the global menu too, but all we need
here is to hide the in-window menubar widget.

(cherry-picked from commit 3daa6c66eb9a4c334d6f72a8fd4bb09d7360a913)

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

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 959d54d..3c132cc 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -478,6 +478,7 @@ public:
 // if the menubar is unattached an empty rectangle is returned
 Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId );
 void RemoveMenuBarButton( sal_uInt16 nId );
+void LayoutChanged();
 };
 
 inline MenuBar& MenuBar::operator=( const MenuBar& rMenu )
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e88914c..b327f3d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2464,6 +2464,13 @@ void MenuBar::ShowButtons( bool bClose, bool bFloat, 
bool bHide )
 }
 }
 
+void MenuBar::LayoutChanged()
+{
+MenuBarWindow* pMenuWin = getMenuBarWindow();
+if (pMenuWin)
+pMenuWin->LayoutChanged();
+}
+
 void MenuBar::SetDisplayable( bool bDisplayable )
 {
 if( bDisplayable != mbDisplayable )
@@ -2472,9 +2479,7 @@ void MenuBar::SetDisplayable( bool bDisplayable )
 ImplGetSalMenu()->ShowMenuBar( bDisplayable );
 
 mbDisplayable = bDisplayable;
-MenuBarWindow* pMenuWin = getMenuBarWindow();
-if (pMenuWin)
-pMenuWin->LayoutChanged();
+LayoutChanged();
 }
 }
 
diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 2cf072a..807470a 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -766,6 +766,9 @@ static gboolean MenuBarSignalKey(GtkWidget*, GdkEventKey* 
pEvent, gpointer menu)
 void GtkSalMenu::CreateMenuBarWidget()
 {
 #if GTK_CHECK_VERSION(3,0,0)
+if (mpMenuBarContainerWidget)
+return;
+
 GtkGrid* pGrid = mpFrame->getTopLevelGridWidget();
 mpMenuBarContainerWidget = gtk_grid_new();
 
@@ -1153,16 +1156,33 @@ void GtkSalMenu::Deactivate(const gchar* pCommand)
 
 void GtkSalMenu::EnableUnity(bool bEnable)
 {
-if (bUnityMode != bEnable)
+bUnityMode = bEnable;
+
+MenuBar* pMenuBar(static_cast(mpVCLMenu.get()));
+
+if (bEnable)
+DestroyMenuBarWidget();
+else
 {
-bUnityMode = bEnable;
-static_cast(mpVCLMenu.get())->SetDisplayable(!bEnable);
+Update();
+if (pMenuBar->IsDisplayable())
+CreateMenuBarWidget();
 }
+
+pMenuBar->LayoutChanged();
 }
 
 void GtkSalMenu::ShowMenuBar( bool bVisible )
 {
-if (bVisible && !bUnityMode && !mpMenuBarContainerWidget)
+// Unity tdf#106271: Can't hide global menu, so empty it instead when user 
wants to hide menubar,
+if (bUnityMode)
+{
+if (bVisible)
+Update();
+else if (mpMenuModel && 
g_menu_model_get_n_items(G_MENU_MODEL(mpMenuModel)) > 0)
+g_lo_menu_remove(G_LO_MENU(mpMenuModel), 0);
+}
+else if (bVisible)
 CreateMenuBarWidget();
 else
 DestroyMenuBarWidget();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 jvmfwk/inc/vendorbase.hxx   |2 +
 jvmfwk/inc/vendorplugin.hxx |1 
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |6 +++-
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx|   26 +++-
 4 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit c8f0a37ff804e6329b21a4b7bfabb0667263c6e5
Author: Samuel Mehrbrodt 
Date:   Thu Mar 9 20:43:09 2017 +0100

Related tdf#54443 List only matching JREs

I.e. show only 64bit JRE for 64bit LO and 32bit JRE for 32bit LO

Change-Id: Id5e890637c7e1014bcb4e6fdd9ed9a33765112d5
Reviewed-on: https://gerrit.libreoffice.org/35026
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 9143dd4ebe37b608e43d04434cf831624bf55b65)
Reviewed-on: https://gerrit.libreoffice.org/35162
Reviewed-by: Thorsten Behrens 

diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index 2a24c95..c9ebcb2 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -133,6 +133,7 @@ public:
 const OUString & getRuntimeLibrary() const;
 const OUString & getLibraryPath() const;
 bool supportsAccessibility() const;
+bool isValidArch() const;
  /* determines if prior to running java something has to be done,
 like setting the LD_LIBRARY_PATH. This implementation checks
 if an LD_LIBRARY_PATH (getLD_LIBRARY_PATH) needs to be set and
@@ -178,6 +179,7 @@ protected:
 OUString m_sHome;
 OUString m_sRuntimeLibrary;
 OUString m_sLD_LIBRARY_PATH;
+OUString m_sArch;
 bool m_bAccessibility;
 
 
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 8df13b1..426157b 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -55,6 +55,7 @@ enum class javaPluginError
 FailedVersion,
 NoJre,
 WrongVendor,
+WrongArch,
 VmCreationFailed
 };
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 63791bc..d69b439 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -227,6 +227,10 @@ javaPluginError checkJavaVersionRequirements(
 rtl_uString * * arExcludeList,
 sal_Int32  nLenList)
 {
+if (!aVendorInfo->isValidArch())
+{
+return javaPluginError::WrongArch;
+}
 if (!sMinVersion.isEmpty())
 {
 try
@@ -334,7 +338,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
 javaPluginError err = checkJavaVersionRequirements(
 cur, sMinVersion, sMaxVersion, arExcludeList, nLenList);
 
-if (err == javaPluginError::FailedVersion)
+if (err == javaPluginError::FailedVersion || err == 
javaPluginError::WrongArch)
 continue;
 else if (err == javaPluginError::WrongVersionFormat)
 return err;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 9b580cc..ef9da17 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -62,12 +62,14 @@ bool VendorBase::initialize(vector 
> props)
 OUString sVendorProperty("java.vendor");
 OUString sVersionProperty("java.version");
 OUString sHomeProperty("java.home");
+OUString sArchProperty("os.arch");
 OUString sAccessProperty("javax.accessibility.assistive_technologies");
 
 bool bVersion = false;
 bool bVendor = false;
 bool bHome = false;
 bool bAccess = false;
+bool bArch = false;
 
 typedef vector >::const_iterator it_prop;
 for (it_prop i = props.begin(); i != props.end(); ++i)
@@ -103,6 +105,11 @@ bool VendorBase::initialize(vector > props)
bHome = true;
 #endif
 }
+else if (!bArch && sArchProperty.equals(i->first))
+{
+m_sArch = i->second;
+bArch = true;
+}
 else if (!bAccess && sAccessProperty.equals(i->first))
 {
 if (!i->second.isEmpty())
@@ -115,7 +122,7 @@ bool VendorBase::initialize(vector 
> props)
 //must search through all properties.
 
 }
-if (!bVersion || !bVendor || !bHome)
+if (!bVersion || !bVendor || !bHome || !bArch)
 return false;
 
 // init m_sRuntimeLibrary
@@ -201,6 +208,23 @@ const OUString & VendorBase::getRuntimeLibrary() const
 {
 return m_sRuntimeLibrary;
 }
+
+bool VendorBase::isValidArch() const
+{
+// Warning: These values come from the "os.arch" property.
+// It is not defined what the exact values are.
+// Oracle JRE 8 has "x86" and "amd64", the others were found at 
http://lopica.sourceforge.net/os.html .
+// There might still be missing some options; we need to extend the check 
once we find out.
+#if defined _WIN32
+return m_sArch == "x86" || m_sArch == "i386" || m_sArch == "i686";
+#elif defined _WIN

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

[Eike Rathke]

 cui/source/tabpages/numfmt.cxx |   13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit be37bbdc4902933e45869537eb33eefa7fc1cc81
Author: Eike Rathke 
Date:   Tue Mar 14 17:52:24 2017 +0100

use SvxLanguageBoxBase::SetLanguageList()

... to benefit from whatever replacements and tweaks known.

Change-Id: Ic19400bc4664fcdd5d7b8e5bf07c2dfacdb5e18f

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index ae6f6ea..9b3e0e5 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -368,19 +368,8 @@ void SvxNumberFormatTabPage::Init_Impl()
 
 // initialize language ListBox
 
+m_pLbLanguage->SetLanguageList( SvxLanguageListFlags::ALL | 
SvxLanguageListFlags::ONLY_KNOWN, false);
 m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
-/* TODO: any reason we're doing a manual init here instead of using
- * SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags::ONLY_KNOWN, 
...)? */
-// Don't list ambiguous locales where we won't be able to convert the
-// LanguageType back to an identical Language_Country name and therefore
-// couldn't load the i18n LocaleData. Show DebugMsg in non-PRODUCT version.
-css::uno::Sequence< sal_uInt16 > xLang = 
LocaleDataWrapper::getInstalledLanguageTypes();
-sal_Int32 nCount = xLang.getLength();
-for ( sal_Int32 i=0; iInsertLanguage( xLang[i] );
-}
 }
 
 VclPtr SvxNumberFormatTabPage::Create( vcl::Window* pParent,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/xml/xmlimpit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78608b2e3594f81d7d1c5843820e8bd1c054dacc
Author: Miklos Vajna 
Date:   Tue Mar 14 17:52:16 2017 +0100

sw: fix Android -Werror=maybe-uninitialized

Change-Id: Ia9e10c7f2243a964863f2315bc74872f988c00e4

diff --git a/sw/source/filter/xml/xmlimpit.cxx 
b/sw/source/filter/xml/xmlimpit.cxx
index 6b90a66..5c28432 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -588,7 +588,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
 case RES_BREAK:
 {
 SvxFormatBreakItem& rFormatBreak = 
dynamic_cast(rItem);
-sal_uInt16 eEnum;
+sal_uInt16 eEnum{};
 
 if( !SvXMLUnitConverter::convertEnum( eEnum, rValue, 
psXML_BreakType ) )
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 wsd/LOOLWSD.cpp |9 -
 1 file changed, 9 deletions(-)

New commits:
commit d71ff2240ad667c3ba5193cb7caf710591f05357
Author: Jan Holesovsky 
Date:   Tue Mar 14 17:41:54 2017 +0100

We don't expect the DocumentBroker isAlive() yet here.

Change-Id: Ib0349d3764ca2f8a71f6ac355b0ebc8799ee3d43

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index fa6d629..8ae2035 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1407,15 +1407,6 @@ static std::shared_ptr 
createNewClientSession(const WebSocketHand
 {
 auto lock = docBroker->getLock();
 
-// Validate the broker.
-if (!docBroker->isAlive())
-{
-LOG_ERR("DocBroker is invalid or premature termination of child 
process.");
-lock.unlock();
-removeDocBrokerSession(docBroker);
-return nullptr;
-}
-
 if (docBroker->isMarkedToDestroy())
 LOG_WRN("DocBroker is marked to destroy, attempting to add session 
anyway.");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent Balland-Poirier]

 include/svl/zformat.hxx  |3 -
 sc/qa/unit/ucalc.cxx |  103 +--
 sc/source/core/data/documen4.cxx |   20 ++-
 3 files changed, 97 insertions(+), 29 deletions(-)

New commits:
commit 5f2db66ad0de6fbbae309850516e17eaa17934cb
Author: Laurent Balland-Poirier 
Date:   Fri Mar 3 21:51:26 2017 +0100

tdf#106252 Engineering notation for Precision as shown

with more tests

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

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index 85250ac..1dd05d2 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -223,7 +223,8 @@ public:
 { return NumFor[nIx].Info().nCntPost; }
 
 /// Count of integer digits
-sal_uInt16 GetFormatIntegerDigits() const { return 
NumFor[0].Info().nCntPre; }
+sal_uInt16 GetFormatIntegerDigits( sal_uInt16 nIx = 0 ) const
+{ return NumFor[nIx].Info().nCntPre; }
 
 //! Read/write access on a special sal_uInt16 component, may only be used 
on the
 //! standard format 0, 1, ... and only by the number formatter!
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9a51d92..86aa877 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6773,10 +6773,12 @@ void Test::testPrecisionAsShown()
 aCode = "0.00";
 fValue = 1.0/3.0;
 fExpectedRoundVal = 0.33;
-checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
-fValue = -10.001;
-fExpectedRoundVal = -10.0;
-checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+fValue = 10.001;
+fExpectedRoundVal = 10.0;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
 }
 {   // thousand rounding bogus tdf#106253
 aCode = "0,,";
@@ -6791,54 +6793,105 @@ void Test::testPrecisionAsShown()
 aCode = "0.00%";
 fValue = 4.0 / 7.0;
 fExpectedRoundVal = 0.5714;
-checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
-fValue = -4.0 / 7.0;
-fExpectedRoundVal = -0.5714;
-checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+fValue = 40.0 / 7.0;
+fExpectedRoundVal = 5.7143;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
 }
 {   // scientific rounding
 aCode = "0.00E0";
 fValue = 40.0 / 7.0;
 fExpectedRoundVal = 57100.0;
-checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
 fValue = 4.0 / 7.0;
 fExpectedRoundVal = 5.71e-5;
-checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
-// engineering rounding bogus!!! tdf#106252
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+// engineering rounding tdf#106252
 aCode = "##0.000E0";
 fValue = 40.0 / 7.0;
-fExpectedRoundVal = 57143.0; // actual is 57140
-//checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
+fExpectedRoundVal = 57.143e3;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+fValue = 400.0 / 7.0;
+fExpectedRoundVal = 571.429e3;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+fValue = 4000.0 / 7.0;
+fExpectedRoundVal = 5.714e6;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
 fValue = 4.0 / 7.0;
-fExpectedRoundVal = 5.7143e-5; // actual is 5.714e-05
-//checkPrecisionAsShown( aCode, fValue, fExpectedRoundVal );
+fExpectedRoundVal = 57.143e-6;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+fValue = 4.0 / 7000.0;
+fExpectedRoundVal = 571.429e-6;
+checkPrecisionAsShown( aCode,  fValue,  fExpectedRoundVal );
+checkPrecisionAsShown( aCode, -fValue, -fExpectedRoundVal );
+fValue = 4.0 / 700.0;
+fExpectedRoundVal = 5.714e-3

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

[Miklos Vajna]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 578c8dea8ec7d377d738f8d821b741d0f3e8b9e4
Author: Miklos Vajna 
Date:   Tue Mar 14 17:08:03 2017 +0100

drawinglayer: work around Android build

Change-Id: I9ec4622314bb92cd8c99451c18146dec774a954b

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 216be6b..65b7718 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -56,6 +56,16 @@
 
 #include 
 
+#if defined(ANDROID)
+namespace std
+{
+template
+T round(T x)
+{
+return ::round(x);
+}
+}
+#endif
 
 using namespace com::sun::star;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 xmloff/source/text/XMLTextMarkImportContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3e9b8cce795c02536a0e41c49bd534713ef11dd
Author: Miklos Vajna 
Date:   Tue Mar 14 17:01:57 2017 +0100

xmloff: fix Android -Werror=maybe-uninitialized

Change-Id: I2b62b8606ad3652dc6cecfbb201f30b9f15e33da

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index dff7c78..58a0e10 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -180,7 +180,7 @@ void XMLTextMarkImportContext::EndElement()
 
 if (!m_sBookmarkName.isEmpty())
 {
-lcl_MarkType nTmp;
+lcl_MarkType nTmp{};
 if (SvXMLUnitConverter::convertEnum(nTmp, GetLocalName(),
 lcl_aMarkTypeMap))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Collecting User Statistics

[Dennis Roczek]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Hi Jaskaran,

On 14.03.2017 16:17, Jaskaran Singh wrote:
> l10n team could also use this data to see where LO is gaining populari
ty
> and where they should focus their efforts on. The dev team could also
> make use of it. But I can't think of any at the moment.
If you speak - say - 2 languages (English + native) then you can only
translate one language and you won't start learning (e.g.) Mongolian.

Or did I miss something?

Dennis
-BEGIN PGP SIGNATURE-
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBCAAGBQJYyA+FAAoJEM4+Qf3OKrbZgXMQAIpimGKDTq1shAAP/6FEHsrm
BUr3fceufA8vOx4y8b29rg8UBIYelnLgZ5EvIkMBsz2KI+hBq3ugRzQxMXBM5dkm
u2CjnUESAEAQu4d3MS9VblQq4Tx+EUDhDDDHff/DDDi40xBRWbbni2T6GCn0FUaD
9nB0FDSi+ri58K1LXVeshT3ghdEUWTyw3sNKpNOBzRbuXinSsP5XU9JP20aHoaZv
+zNkgayes91YlNxm2zmiaFPRRAcRLEcLCoH5e9hVbfCMLTlsgqqB1bV1V0EK+ism
R8SO1EMhQPaqbBJsIL5nTz+BtIEqMxcBXw8SnDkzACXdVWsKPVVb7RPPc6iRfv+i
REFxvT+vD7Pjfdzv6lxdgMXa5/pJ2cB69zc9b7jlAEzOHy3glawl4NOFo/twp7CP
hkn51zPK7OGKmO6Y9B8XIpFxom9212rQSfgolhfob4KXX3mX8P6zTZcEGo8tpQh4
KtDA/3lu0klwi9bbK5WfYSc8F3KSomiYcs/o00V2OATKZVpklw8c2MbT8Pm1ZW5a
r2WqJKh7Ue+55BZ8AqGBZkqHKJ411pffXalZF1rUMkCR1w0Y2k7lXu4d8POcO5Oc
ngQ3u1yBoZzHAlapOtzPUXBcsUMCoSrGsUeP1l38MrUlnEsVcr6HcLCoEgn80fc+
MamsgICAZwVAcKJ9dmJ5
=PoBX
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 solenv/qa/python/gbuildtojson.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b00f3c87ac71301d23cde53de0b50f5ba7d446f4
Author: Miklos Vajna 
Date:   Tue Mar 14 13:59:21 2017 +0100

Revert "Is gbuildtojson missing support for ExternalPackage?"

This reverts commit d8a47a23114ce9b4a743d0da35dfb93dadc07d11. It does
not seem to be necessary after ee9cb85e9adc03693141a106630a4f278b4e93ac
(gpgme: change gb_LinkTarget__use_gpgmepp to depend on package,
2017-03-10) fixed the root cause.

Change-Id: I0e421d29d37853b0f4dd9d2ce4acf0cc1d09882f

diff --git a/solenv/qa/python/gbuildtojson.py b/solenv/qa/python/gbuildtojson.py
index 7e55650..ab27497 100644
--- a/solenv/qa/python/gbuildtojson.py
+++ b/solenv/qa/python/gbuildtojson.py
@@ -123,7 +123,7 @@ class CheckGbuildToJsonModules(unittest.TestCase):
 shutil.rmtree(self.tempwork)
 
 def test_gbuildtojson(self):
-modules = ['accessibility', 'android', 'animations', 'apple_remote', 
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 
'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 
'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 
'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'mysqlc', 
'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 
'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 
'reportbuilder', 'reportdesign', 'ridljar', 'rsc', 'salhelper', 'sax', 'sc', 
'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 
'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 
'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtoo
 ls', 'toolkit', 'tubes', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 
'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 
'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 
'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript']
+modules = ['accessibility', 'android', 'animations', 'apple_remote', 
'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 
'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 
'drawinglayer', 'dtrans', 'editeng', 'embeddedobj', 'embedserv', 
'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 
'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'idlc', 
'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 
'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'mysqlc', 
'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'onlineupdate', 'oovbaapi', 'oox', 
'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 
'reportbuilder', 'reportdesign', 'ridljar', 'rsc', 'salhelper', 'sax', 'sc', 
'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 
'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 
'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtoo
 ls', 'toolkit', 'tubes', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 
'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 
'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 
'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript', 
'xmlsecurity']
 if os.environ['OS'] == 'WNT':
 # for now, use a limited subset for testing on windows as it is so 
annoyingly slow on this
 modules = ['chart2', 'cui', 'dbaccess', 'framework', 'oox', 
'sfx2', 'svl', 'svtools', 'svx', 'toolkit', 'vcl', 'xmloff']
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Pushing code to Gerrit

[Aditya Dewan]

Hi,

I have been trying to push my code for review, but i have been unable to do
so as this is my first time and i am not familiar with gerrit.

I have followed the steps in the wiki and have searched on the net
regarding this also.

git review -s runs fine and the output is nothing.
Whenever i run 'git review -l', i get this output

$ git review -l
> Cannot fetch review information from gerrit
> The following command failed with exit code 255
> "ssh -xp29418 dewana-de...@gerrit.libreoffice.org gerrit query
> --format=JSON project:online status:open"
> ---
> ssh: Could not resolve hostname gerrit.libreoffice.org: Temporary failure
> in name resolution
> ---


other than that

this is the output of 'git remote -v'

$ git remote -v
> origin https://anongit.freedesktop.org/git/libreoffice/online.git (fetch)
> origin ssh://dewana-de...@gerrit.libreoffice.org:29418/online (push)


and this is the ssh config file

Host logerrit gerrit.libreoffice.org
> IdentityFile ~/.ssh/id_rsa
> User dewana-dewan
> Port 29418
> HostName gerrit.libreoffice.org


Please let me know what i am doing wrong, and how i can rectify it.

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

Re: Collecting User Statistics

[Jaskaran Singh]

Hi moggi,

Originally, my vision was to use the data collected for the help of our
marketing team. They would get to know the category of people they
should aim for. They could do all kinds of data mining stuff to get
what's useful for them.

l10n team could also use this data to see where LO is gaining popularity
and where they should focus their efforts on. The dev team could also
make use of it. But I can't think of any at the moment.

And yes, users could be very conscious of the data they share with us.
Maybe, a polite dialog box explaining them how their privacy isn't
compromised can work. But, quite a few of them would still opt out.

On Tuesday 14 March 2017 08:21 PM, Markus Mohrhard wrote:
> Hey Jaskaran,
> 
> On Thu, Mar 9, 2017 at 10:10 AM, Jaskaran Singh  > wrote:
> 
> Hi,
> 
> Currently we collect user stats when someone downloads LO from our
> website. Now these may not be very useful since only very limited
> information is obtained by this method. Also, not everyone gets to
> participate in this because not everyone downloads LO. Some just get it
> preinstalled on their O.S while others get a copy through their friends.
> 
> I believe it's important for us to know about our users as deeply as
> possible so as to make informed choices. The information which we should
> be looking for is:
> 
> 1. Operating System, word size and kernel version
> 2. RAM and Cache amount
> 3. CPU and GPU specs
> 4. Opencl driver
> 5. Display specs
> 6. Country
> 7. Default Language
> 8. 
> 
> Now, obviously this is sensitive information and most users would
> disagree to share it. So we could introduce a way to anonymously share
> this data. We could enable client to use a proxy to share this OR enable
> this data to be sent over Tor (Onion Router). But again, most users
> wouldn't want that.
> 
> So I've found another way of doing this. Have a look at Rappor[1]. It
> introduces some random noise so that we are never sure of the data that
> client sends us. The statistics that we would get would be in terms of
> probability. For example, if a system has i3 processor, it will roll a
> dice to determine whether it should speak the truth or not. And by
> default we could have 80% (?) chance of speaking the truth. So if we get
> the data that user is running i3 processor, we are 80% sure that he/she
> is. And 20% chance that he/she is reporting wrong info. So aggregate
> that for a large number of users and we would get a rough trend.
> 
> We could also share this data in the forms of numbers and graphs(and
> other representations) on our website.
> 
> So this would work this way. Whenever someone installs or upgrades LO
> and starts LO for the first time, a dialog box appears asking for
> permission to share some data while also explaining how this would not
> compromise their privacy.
> 
> I'd like to know your views on this. And I'd like to implement this if
> none of you want to. I may apply for this as a project in GSoC. So
> please inform me if you can be a mentor for this project.
> 
> 
> 
> So basically this requires an opt-in scheme instead of the opt-out that
> you have in mind. Users are very sensitive when it comes to collecting
> information that are perceived as personal. Based on that I think the
> value might not be as big as you hoped. Currently the plan is to collect
> info about the number of active users as part of the automatic update
> but not much more. Similar to Tor I'm not so sure if I see the value in
> having a huge collection of statistics that we are not planning to use.
> Besides the obviously problem of privacy the bigger your data set the
> more work you need to invest in processing the data.
> 
> Based on that it would help if you would provide some cases where having
> such detailed statistics would help us improve LibreOffice.
> 
> Regards,
> Markus

Regards,
Jaskaran

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

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

[Markus Mohrhard]

 sc/source/filter/oox/condformatcontext.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e237c0109c94da27715c115cecee69d382d6c183
Author: Markus Mohrhard 
Date:   Sat Feb 18 02:30:11 2017 +0100

fix conditional format import from XLSB, tdf#105486

Change-Id: I2b781f45221e434c8ec0ee079afb54c505faf2b5
Reviewed-on: https://gerrit.libreoffice.org/34396
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
(cherry picked from commit aaea9beabcdfa16ffd36116591c5ebea25906b94)
Reviewed-on: https://gerrit.libreoffice.org/35154
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/source/filter/oox/condformatcontext.cxx 
b/sc/source/filter/oox/condformatcontext.cxx
index 79c92d2..4a87664 100644
--- a/sc/source/filter/oox/condformatcontext.cxx
+++ b/sc/source/filter/oox/condformatcontext.cxx
@@ -253,7 +253,9 @@ void CondFormatContext::onEndRecord()
 {
 case BIFF12_ID_CONDFORMATTING:
 if( mxCondFmt.get() )
-mxCondFmt->finalizeImport();
+{
+mxCondFmt->setReadyForFinalize();
+}
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8541cd1e46e903869144e68f9bb456f07ec8f14a
Author: Andras Timar 
Date:   Tue Mar 14 16:04:10 2017 +0100

add loolkitconfig.xcu to dist tarball

Change-Id: Icca000db16fca09ba2769dee8cb18e847496d48c

diff --git a/Makefile.am b/Makefile.am
index bf1c1b4..794e882 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,6 +191,7 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers) 
$(kit_headers) \
 
 EXTRA_DIST = discovery.xml \
  favicon.ico \
+ loolkitconfig.xcu \
  loolwsd.xml.in \
  loolwsd.service \
  robots.txt \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

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

New commits:
commit 0a010a08a30706bc10ca0f8c83fb0432b205f5ea
Author: Stephan Bergmann 
Date:   Tue Mar 14 15:52:04 2017 +0100

Use int to count to three

Change-Id: Ic44c13fb32f4563a776c18a49c408d2a021e55af

diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index b1eb9b4..46319e3 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -397,7 +397,7 @@ void ImpVclMEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
 
 void ImpVclMEdit::Resize()
 {
-size_t nIteration = 1;
+int nIteration = 1;
 do
 {
 WinBits nWinStyle( pVclMultiLineEdit->GetStyle() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Collecting User Statistics

[Markus Mohrhard]

Hey Jaskaran,

On Thu, Mar 9, 2017 at 10:10 AM, Jaskaran Singh  wrote:

> Hi,
>
> Currently we collect user stats when someone downloads LO from our
> website. Now these may not be very useful since only very limited
> information is obtained by this method. Also, not everyone gets to
> participate in this because not everyone downloads LO. Some just get it
> preinstalled on their O.S while others get a copy through their friends.
>
> I believe it's important for us to know about our users as deeply as
> possible so as to make informed choices. The information which we should
> be looking for is:
>
> 1. Operating System, word size and kernel version
> 2. RAM and Cache amount
> 3. CPU and GPU specs
> 4. Opencl driver
> 5. Display specs
> 6. Country
> 7. Default Language
> 8. 
>
> Now, obviously this is sensitive information and most users would
> disagree to share it. So we could introduce a way to anonymously share
> this data. We could enable client to use a proxy to share this OR enable
> this data to be sent over Tor (Onion Router). But again, most users
> wouldn't want that.
>
> So I've found another way of doing this. Have a look at Rappor[1]. It
> introduces some random noise so that we are never sure of the data that
> client sends us. The statistics that we would get would be in terms of
> probability. For example, if a system has i3 processor, it will roll a
> dice to determine whether it should speak the truth or not. And by
> default we could have 80% (?) chance of speaking the truth. So if we get
> the data that user is running i3 processor, we are 80% sure that he/she
> is. And 20% chance that he/she is reporting wrong info. So aggregate
> that for a large number of users and we would get a rough trend.
>
> We could also share this data in the forms of numbers and graphs(and
> other representations) on our website.
>
> So this would work this way. Whenever someone installs or upgrades LO
> and starts LO for the first time, a dialog box appears asking for
> permission to share some data while also explaining how this would not
> compromise their privacy.
>
> I'd like to know your views on this. And I'd like to implement this if
> none of you want to. I may apply for this as a project in GSoC. So
> please inform me if you can be a mentor for this project.
>
>

So basically this requires an opt-in scheme instead of the opt-out that you
have in mind. Users are very sensitive when it comes to collecting
information that are perceived as personal. Based on that I think the value
might not be as big as you hoped. Currently the plan is to collect info
about the number of active users as part of the automatic update but not
much more. Similar to Tor I'm not so sure if I see the value in having a
huge collection of statistics that we are not planning to use. Besides the
obviously problem of privacy the bigger your data set the more work you
need to invest in processing the data.

Based on that it would help if you would provide some cases where having
such detailed statistics would help us improve LibreOffice.

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

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

[Khaled Hosny]

 chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |   24 -
 chart2/qa/extras/xshape/data/reference/tdf90839-2.xml |   48 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-3.xml |   48 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-4.xml |   48 +-
 include/vcl/outdev.hxx|2 
 vcl/source/font/font.cxx  |4 -
 vcl/source/gdi/CommonSalLayout.cxx|6 ++
 vcl/source/gdi/sallayout.cxx  |2 
 vcl/source/outdev/font.cxx|   13 
 vcl/source/outdev/outdev.cxx  |1 
 vcl/source/outdev/text.cxx|4 -
 11 files changed, 96 insertions(+), 104 deletions(-)

New commits:
commit ded07624096183ed310187f29d4692bb39b7d24a
Author: Khaled Hosny 
Date:   Sun Feb 12 11:08:59 2017 +0200

tdf#105454: Stop ignoring font kerning setting

Make sure the default is for kerning to be enable, and honor the setting
to disable it.

This also updates the expectations for chart2_xshape tests for file that
had kerning disabled and was previously ignored.

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

diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
index 1e560ac..7dcbab78 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -175,11 +175,11 @@

   
  
- 
+ 
   
-   
+   
 
- 
+ 
   

 
@@ -227,9 +227,9 @@
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -238,15 +238,15 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

@@ -298,21 +298,21 @@

   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

   
   
-   
+   


   
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index 87ef26a..489b346 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -14,7 +14,7 @@

   
  
- 
+ 
   

 
@@ -30,7 +30,7 @@
  
 

-   
+   
 
 
 
@@ -39,12 +39,12 @@
 
 
 
- 
+ 
  
  
 

-   
+   
 
  
   
@@ -175,15 +175,15 @@

   
  
- 
+ 
   
-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -192,14 +192,14 @@
   
   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 
@@ -227,9 +227,9 @@
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -238,21 +238,21 @@
   
   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -261,14 +261,14 @@
   
   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 
@@ -298,35 +298,35 @@

   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

   
   
-   
+   


   
  
 
 
- 
+ 
  
  
 

   
   
-   
+   


   
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
index 5f4a235..5355dae 100644
---

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

[Stephan Bergmann]

 vcl/source/edit/textdat2.hxx |4 
 vcl/source/edit/textdata.cxx |8 
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit d3b9b4e41e31ce276d2d7354602a586b300adee9
Author: Stephan Bergmann 
Date:   Tue Mar 14 15:46:25 2017 +0100

Remove excess non-const getters

Change-Id: Ia66394560cda5c4d517f2a9fd047bed30c2c8975

diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 0607e1b..90b5f85 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -132,19 +132,15 @@ public:
 
 voidSetStart( sal_Int32 n ) { mnStart = n; }
 sal_Int32   GetStart() const{ return mnStart; }
-sal_Int32&  GetStart()  { return mnStart; }
 
 voidSetEnd( sal_Int32 n )   { mnEnd = n; }
 sal_Int32   GetEnd() const  { return mnEnd; }
-sal_Int32&  GetEnd(){ return mnEnd; }
 
 voidSetStartPortion( sal_uInt16 n ) { mnStartPortion = n; }
 sal_uInt16  GetStartPortion() const { return mnStartPortion; }
-sal_uInt16& GetStartPortion()   { return mnStartPortion; }
 
 voidSetEndPortion( sal_uInt16 n )   { mnEndPortion = n; }
 sal_uInt16  GetEndPortion() const   { return mnEndPortion; }
-sal_uInt16& GetEndPortion() { return mnEndPortion; }
 
 sal_Int32   GetLen() const  { return mnEnd - mnStart; }
 
diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx
index dd8fb43..010b585 100644
--- a/vcl/source/edit/textdata.cxx
+++ b/vcl/source/edit/textdata.cxx
@@ -252,11 +252,11 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine( 
sal_uInt16 nLastFormat
 {
 TextLine& rLine = maLines[ nL ];
 
-rLine.GetStartPortion() = rLine.GetStartPortion() + nPDiff;
-rLine.GetEndPortion() = rLine.GetEndPortion() + nPDiff;
+rLine.SetStartPortion(rLine.GetStartPortion() + nPDiff);
+rLine.SetEndPortion(rLine.GetEndPortion() + nPDiff);
 
-rLine.GetStart() = rLine.GetStart() + nTDiff;
-rLine.GetEnd() = rLine.GetEnd() + nTDiff;
+rLine.SetStart(rLine.GetStart() + nTDiff);
+rLine.SetEnd(rLine.GetEnd() + nTDiff);
 
 rLine.SetValid();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 15009c2a106957d800f1f258c8ac59a1249241f4
Author: Andras Timar 
Date:   Tue Mar 14 15:40:16 2017 +0100

add ServerSocket.hpp to dist tarball

Change-Id: I7f6241094580dae2212dfdf01999abaeeb49cf1f

diff --git a/Makefile.am b/Makefile.am
index 5284c33..bf1c1b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,6 +166,7 @@ shared_headers = common/Common.hpp \
  common/SigUtil.hpp \
  common/security.h \
  common/SpookyV2.h \
+ net/ServerSocket.hpp \
  net/Socket.hpp \
  net/WebSocketHandler.hpp \
  tools/Replay.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/toolbox.hxx   |2 
 vcl/source/window/toolbox.cxx |  273 ++
 2 files changed, 17 insertions(+), 258 deletions(-)

New commits:
commit 62b50cb69cbf2cb6b99da3b6ff78435af4927b77
Author: Stephan Bergmann 
Date:   Tue Mar 14 15:26:43 2017 +0100

ToolBox: Remove dead drag'n'drop "customization" support

There was support for an MOD2+drag operation in ToolBox, apparently 
intended to
allow customization by re-arranging items.  However, in
ImplTBDragMgr::EndDragging that operation would always have ended in doing
nothing:  Ever since at least 8ab086b6cc054501bfbf7ef6fa509c393691e860 
"initial
import", what happened was a call to virtual ToolBox::Customize, but which 
had
an empty body and wasn't overridden anywhere (and has since been cleaned 
away
over a series of commits).

Change-Id: I8c5962d7b29506dc7dc8d803f49847f30fb93ea1

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 17c31cb..864f3ab 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -132,7 +132,6 @@ private:
 ImplToolItems::size_type mnVisLines; // number of visible lines (for 
scrolling)
 ImplToolItems::size_type mnFloatLines; // number of lines during floating 
mode
 ImplToolItems::size_type mnDockLines;
-sal_uInt16  mnConfigItem;
 sal_uInt16  mnMouseClicks;
 sal_uInt16  mnMouseModifier;
 boolmbDrag:1,
@@ -255,7 +254,6 @@ public:
 SAL_DLLPRIVATE ImplToolItems::size_type ImplCalcLines( long nToolSize ) 
const;
 SAL_DLLPRIVATE sal_uInt16 ImplTestLineSize( const Point& rPos ) const;
 SAL_DLLPRIVATE void ImplLineSizing( const Point& rPos, Rectangle& rRect, 
sal_uInt16 nLineMode );
-SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( const Point& rPos ) const;
 static SAL_DLLPRIVATE ImplToolItems::size_type ImplFindItemPos( const 
ImplToolItem* pItem, const ImplToolItems& rList );
 SAL_DLLPRIVATE void ImplDrawMenuButton(vcl::RenderContext& rRenderContext, 
bool bHighlight);
 SAL_DLLPRIVATE void ImplDrawButton(vcl::RenderContext& rRenderContext, 
const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, 
bool bIsWindow);
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 02f8ee4..9614d22 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -66,7 +66,6 @@
 #define TB_SPIN_OFFSET  2
 #define TB_BORDER_OFFSET1   4
 #define TB_BORDER_OFFSET2   2
-#define TB_CUSTOMIZE_OFFSET 2
 #define TB_MAXLINES 5
 #define TB_MAXNOSCROLL  32765
 
@@ -86,14 +85,9 @@
 #define DOCK_LINETOP((sal_uInt16)0x8000)
 #define DOCK_LINEOFFSET 3
 
-typedef ::std::vector< VclPtr > ImplTBList;
-
-
 class ImplTBDragMgr
 {
 private:
-std::unique_ptr
-mpBoxList;
 VclPtr mpDragBox;
 Point   maMouseOff;
 Rectangle   maRect;
@@ -101,7 +95,6 @@ private:
 Accelerator maAccel;
 sal_uInt16  mnLineMode;
 ToolBox::ImplToolItems::size_type mnStartLines;
-void*   mpCustomizeData;
 boolmbShowDragRect;
 
 ImplTBDragMgr(const ImplTBDragMgr&) = delete;
@@ -110,27 +103,9 @@ private:
 public:
 ImplTBDragMgr();
 
-voidpush_back( ToolBox* pBox )
-{ mpBoxList->push_back( pBox ); }
-voiderase( ToolBox* pBox )
-{
-for ( ImplTBList::iterator it = mpBoxList->begin(); it 
!= mpBoxList->end(); ++it ) {
-if ( *it == pBox ) {
-mpBoxList->erase( it );
-break;
-}
-}
-}
-size_t  size() const
-{ return mpBoxList->size(); }
-
-ToolBox*FindToolBox( const Rectangle& rRect );
-
 voidStartDragging( ToolBox* pDragBox, const Point& rPos, const 
Rectangle& rRect, sal_uInt16 nLineMode );
 voidDragging( const Point& rPos );
 voidEndDragging( bool bOK = true );
-voidHideDragRect() { if ( mbShowDragRect ) 
mpDragBox->HideTracking(); }
-voidUpdateDragRect();
 DECL_LINK( SelectHdl, Accelerator&, void );
 };
 
@@ -1059,74 +1034,10 @@ void ToolBox::ImplLineSizing( const Point& rPos, 
Rectangle& rRect, sal_uInt16 nL
 mnDockLines = i;
 }
 
-sal_uInt16 ToolBox::ImplFindItemPos( const Point& rPos ) const
-{
-sal_uInt16  nPos = 0;
-longnLast = 0;
-Point   aPos = rPos;
-SizeaSize( mnDX, mnDY );
-
-if ( aPos.X() > aSize.Width()-TB_BORDER_OFFSET1 )
-aPos.X() = aSize.Width()-TB_BORDER_OFFSET1;
-if ( aPos.Y() > aSize.Height()-TB_BORDER_OFFSET1 )
-aPos.Y() = aSize.Height()-TB_BORDER_OFFSET1;
-
-// Item suchen, das geklickt wurde
-I

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

[Jochen Nitschke]

 sc/source/filter/excel/xeescher.cxx |4 ++--
 sc/source/filter/excel/xepage.cxx   |6 +++---
 sc/source/filter/excel/xestyle.cxx  |8 
 sc/source/filter/excel/xetable.cxx  |6 +++---
 sc/source/filter/inc/ftools.hxx |6 +-
 5 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit b20f10fc9fe6ec76e057b399bf42bbb0e3013a87
Author: Jochen Nitschke 
Date:   Tue Mar 14 13:51:51 2017 +0100

sc: remove GETITEMVALUE macro

the extra cast to the value was not helpful

Change-Id: I8fd16f2a59bc10a6f13b0bbdabcf3010f9d3bb46
Reviewed-on: https://gerrit.libreoffice.org/35131
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Jochen Nitschke 

diff --git a/sc/source/filter/excel/xeescher.cxx 
b/sc/source/filter/excel/xeescher.cxx
index 6571adc..b66503d 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1205,8 +1205,8 @@ XclExpNote::XclExpNote(const XclExpRoot& rRoot, const 
ScAddress& rScPos,
 mbLocked= pCaption->IsMoveProtect() || 
pCaption->IsResizeProtect();
 
 // AutoFill style would change if Postit.cxx object 
creation values are changed
-OUString aCol(((XFillColorItem &)GETITEM(aItemSet, 
XFillColorItem , XATTR_FILLCOLOR)).GetValue());
-mbAutoFill  = aCol.isEmpty() && (GETITEMVALUE(aItemSet, 
XFillStyleItem, XATTR_FILLSTYLE, sal_uLong) == drawing::FillStyle_SOLID);
+OUString aCol(GETITEM(aItemSet, XFillColorItem , 
XATTR_FILLCOLOR).GetValue());
+mbAutoFill  = aCol.isEmpty() && (GETITEM(aItemSet, 
XFillStyleItem, XATTR_FILLSTYLE).GetValue() == drawing::FillStyle_SOLID);
 mbRowHidden = 
(rRoot.GetDoc().RowHidden(maScPos.Row(),maScPos.Tab()));
 mbColHidden = 
(rRoot.GetDoc().ColHidden(maScPos.Col(),maScPos.Tab()));
 }
diff --git a/sc/source/filter/excel/xepage.cxx 
b/sc/source/filter/excel/xepage.cxx
index 31c17b6..e4bf6a5 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -227,7 +227,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& 
rRoot ) :
 maData.mbPrintGrid =  GETITEMBOOL( rItemSet, ATTR_PAGE_GRID  );
 maData.mbPrintNotes=  GETITEMBOOL( rItemSet, ATTR_PAGE_NOTES );
 
-maData.mnStartPage = GETITEMVALUE( rItemSet, SfxUInt16Item, 
ATTR_PAGE_FIRSTPAGENO, sal_uInt16 );
+maData.mnStartPage = GETITEM( rItemSet, SfxUInt16Item, 
ATTR_PAGE_FIRSTPAGENO ).GetValue();
 maData.mbManualStart   = maData.mnStartPage && (!nScTab || 
rDoc.NeedPageResetAfterTab( nScTab - 1 ));
 
 const SvxLRSpaceItem& rLRItem = GETITEM( rItemSet, SvxLRSpaceItem, 
ATTR_LRSPACE );
@@ -242,8 +242,8 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& 
rRoot ) :
 maData.SetScPaperSize( rSizeItem.GetSize(), !rPageItem.IsLandscape() );
 
 const ScPageScaleToItem& rScaleToItem = GETITEM( rItemSet, 
ScPageScaleToItem, ATTR_PAGE_SCALETO );
-sal_uInt16 nPages = GETITEMVALUE( rItemSet, SfxUInt16Item, 
ATTR_PAGE_SCALETOPAGES, sal_uInt16 );
-sal_uInt16 nScale = GETITEMVALUE( rItemSet, SfxUInt16Item, 
ATTR_PAGE_SCALE, sal_uInt16 );
+sal_uInt16 nPages = GETITEM( rItemSet, SfxUInt16Item, 
ATTR_PAGE_SCALETOPAGES ).GetValue();
+sal_uInt16 nScale = GETITEM( rItemSet, SfxUInt16Item, ATTR_PAGE_SCALE 
).GetValue();
 
 if( ScfTools::CheckItem( rItemSet, ATTR_PAGE_SCALETO, false ) && 
rScaleToItem.IsValid() )
 {
diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index 2a09842..f2a8673 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1471,14 +1471,14 @@ bool XclExpCellAlign::FillFromItemSet(
 {
 bool bUsed = false;
 SvxCellHorJustify eHorAlign = GETITEM( rItemSet, SvxHorJustifyItem, 
ATTR_HOR_JUSTIFY ).GetValue();
-SvxCellVerJustify eVerAlign = GETITEMVALUE( rItemSet, SvxVerJustifyItem, 
ATTR_VER_JUSTIFY, SvxCellVerJustify );
+SvxCellVerJustify eVerAlign = GETITEM( rItemSet, SvxVerJustifyItem, 
ATTR_VER_JUSTIFY ).GetValue();
 
 switch( eBiff )
 {
 case EXC_BIFF8: // attributes new in BIFF8
 {
 // text indent
-long nTmpIndent = GETITEMVALUE( rItemSet, SfxUInt16Item, 
ATTR_INDENT, sal_Int32 );
+long nTmpIndent = GETITEM( rItemSet, SfxUInt16Item, ATTR_INDENT 
).GetValue();
 (nTmpIndent += 100) /= 200; // 1 Excel unit == 10 pt == 200 twips
 mnIndent = limit_cast< sal_uInt8 >( nTmpIndent, 0, 15 );
 bUsed |= ScfTools::CheckItem( rItemSet, ATTR_INDENT, bStyle );
@@ -1511,7 +1511,7 @@ bool XclExpCellAlign::FillFromItemSet(
 else
 {
 // rotation
-sal_Int32 nScRot = GETITEMVALUE( rItemSet, SfxInt32Item, 
ATTR_ROTATE_VALUE, sal_Int32 );
+ 

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

[Andras Timar]

 Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5c94fa35c4aefd169448e2d9f5031f92ab6fdcb4
Author: Andras Timar 
Date:   Tue Mar 14 15:16:54 2017 +0100

add LOOLWebSocket.hpp to dist tarball

Change-Id: I997290c8af437c06bcacca49dc167533ab7917cf

diff --git a/Makefile.am b/Makefile.am
index 319a5b8..5284c33 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,6 +141,7 @@ wsd_headers = wsd/Admin.hpp \
   wsd/Exceptions.hpp \
   wsd/FileServer.hpp \
   wsd/LOOLWSD.hpp \
+  wsd/LOOLWebSocket.hpp \
   wsd/QueueHandler.hpp \
   wsd/SenderQueue.hpp \
   wsd/Storage.hpp \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18nlangtag/qa/cppunit/test_languagetag.cxx |   24 +++--
 i18nlangtag/source/isolang/isolang.cxx  |   50 
 i18nlangtag/source/isolang/mslangid.cxx |5 ++
 include/i18nlangtag/mslangid.hxx|5 ++
 svtools/source/misc/langtab.src |2 -
 5 files changed, 62 insertions(+), 24 deletions(-)

New commits:
commit b614ceb80c6648ccae4a0f431eec139aea6a6554
Author: Eike Rathke 
Date:   Tue Mar 14 15:02:46 2017 +0100

tdf#100462 prefer en-GB-oxendict over en-GB-oed

And make en-GB-oed just an alias of en-GB-oxendict.

Change-Id: I73c1208f85d06360dbd8def0b8d916cddfe59aca

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index c211c68..bec6ed9 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -387,26 +387,29 @@ void TestLanguageTag::testAllTags()
 // 'en-GB-oed' is known grandfathered for English, Oxford English
 // Dictionary spelling.
 // Deprecated as of 2015-04-17, prefer en-GB-oxendict instead.
+// As of 2017-03-14 we also alias to en-GB-oxendict.
 {
 OUString s_en_GB_oed( "en-GB-oed" );
+OUString s_en_GB_oxendict( "en-GB-oxendict" );
 LanguageTag en_GB_oed( s_en_GB_oed );
 lang::Locale aLocale = en_GB_oed.getLocale();
-CPPUNIT_ASSERT_EQUAL( s_en_GB_oed, en_GB_oed.getBcp47() );
+CPPUNIT_ASSERT_EQUAL( s_en_GB_oxendict, en_GB_oed.getBcp47() );
 CPPUNIT_ASSERT_EQUAL( OUString("qlt"), aLocale.Language );
-CPPUNIT_ASSERT_EQUAL( OUString("GB"), aLocale.Country );  // only 'GB' 
because we handle it, liblangtag would not fill this
-CPPUNIT_ASSERT_EQUAL( s_en_GB_oed, aLocale.Variant );
-CPPUNIT_ASSERT_EQUAL( 
static_cast(LANGUAGE_USER_ENGLISH_UK_OED), 
en_GB_oed.getLanguageType() );
+CPPUNIT_ASSERT_EQUAL( OUString("GB"), aLocale.Country );
+CPPUNIT_ASSERT_EQUAL( s_en_GB_oxendict, aLocale.Variant );
+CPPUNIT_ASSERT_EQUAL( 
static_cast(LANGUAGE_USER_ENGLISH_UK_OXENDICT), 
en_GB_oed.getLanguageType() );
 CPPUNIT_ASSERT( en_GB_oed.isValidBcp47() );
 CPPUNIT_ASSERT( !en_GB_oed.isIsoLocale() );
 CPPUNIT_ASSERT( !en_GB_oed.isIsoODF() );
 CPPUNIT_ASSERT_EQUAL( OUString("en"), en_GB_oed.getLanguageAndScript() 
);
-CPPUNIT_ASSERT_EQUAL( OUString("oed"), en_GB_oed.getVariants() );
+CPPUNIT_ASSERT_EQUAL( OUString("oxendict"), en_GB_oed.getVariants() );
 ::std::vector< OUString > en_GB_oed_Fallbacks( 
en_GB_oed.getFallbackStrings( true));
-CPPUNIT_ASSERT_EQUAL( static_cast(4), 
en_GB_oed_Fallbacks.size() );
-CPPUNIT_ASSERT_EQUAL( OUString("en-GB-oed"), en_GB_oed_Fallbacks[0]);
-CPPUNIT_ASSERT_EQUAL( OUString("en-GB-oxendict"), 
en_GB_oed_Fallbacks[1]);
-CPPUNIT_ASSERT_EQUAL( OUString("en-GB"), en_GB_oed_Fallbacks[2]);
-CPPUNIT_ASSERT_EQUAL( OUString("en"), en_GB_oed_Fallbacks[3]);
+CPPUNIT_ASSERT_EQUAL( static_cast(5), 
en_GB_oed_Fallbacks.size() );
+CPPUNIT_ASSERT_EQUAL( OUString("en-GB-oxendict"), 
en_GB_oed_Fallbacks[0]);
+CPPUNIT_ASSERT_EQUAL( OUString("en-GB-oed"), en_GB_oed_Fallbacks[1]);
+CPPUNIT_ASSERT_EQUAL( OUString("en-oxendict"), en_GB_oed_Fallbacks[2]);
+CPPUNIT_ASSERT_EQUAL( OUString("en-GB"), en_GB_oed_Fallbacks[3]);
+CPPUNIT_ASSERT_EQUAL( OUString("en"), en_GB_oed_Fallbacks[4]);
 // 'en-oed' is not a valid fallback!
 }
 
@@ -688,6 +691,7 @@ bool checkMapping( const OUString& rStr1, const OUString& 
rStr2 )
 if (rStr1 == "eu"  ) return rStr2 == "eu-ES";
 if (rStr1 == "crk-Latn-CN" ) return rStr2 == "crk-Latn-CA";
 if (rStr1 == "crk-Cans-CN" ) return rStr2 == "crk-Cans-CA";
+if (rStr1 == "en-GB-oed"   ) return rStr2 == "en-GB-oxendict";
 return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index bbe0c47..a35fef0 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -96,6 +96,7 @@ struct Bcp47CountryEntry
 const sal_Char* mpBcp47;
 sal_CharmaCountry[3];
 const sal_Char* mpFallback;
+LanguageTypemnOverride;
 
 /** Obtain a language tag string with '-' separator. */
 OUString getTagString() const;
@@ -756,12 +757,12 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 static Bcp47CountryEntry const aImplBcp47CountryEntries[] =
 {
 // MS-LangID  full BCP47, ISO3166, 
ISO639-Variant or other fallback
-{ LANGUAGE_CATALAN_VALENCIAN,   "ca-ES-valencia", "ES", "ca-valencia" 
},
-{ LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN, "ca-ES-valencia", "ES", "" },  
 // In case MS format files using the old value escaped into the wild, map them 
back.
-{ LANGUAGE_USER_ENGLISH_UK_OED,  "en-GB-oed", "GB", "" 

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

[Pranav Kant]

 sw/inc/docary.hxx  |6 ++
 sw/qa/extras/tiledrendering/tiledrendering.cxx |   20 
 sw/source/core/doc/docredln.cxx|   12 +---
 sw/source/core/txtnode/ndtxt.cxx   |   24 
 4 files changed, 55 insertions(+), 7 deletions(-)

New commits:
commit 1eb69f6b9c78b19d3944c90c17ff8d498affc316
Author: Pranav Kant 
Date:   Tue Mar 14 15:27:42 2017 +0530

sw lok: Notify when redline position is changed + unit test

Make RedlineNotification function a static member of SwRedlineTable
class

Change-Id: Ifbd6014198838b1106e873c9563d215e95b3572d
Reviewed-on: https://gerrit.libreoffice.org/35177
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index f9aa442..cc3bfb4 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -313,6 +313,9 @@ struct CompareSwRedlineTable
 bool operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) 
const;
 };
 
+// Notification type for notifying about redlines to LOK clients
+enum class RedlineNotification { Add, Remove, Modify };
+
 class SwRedlineTable
 {
 public:
@@ -362,6 +365,9 @@ public:
 vector_type::const_iterator begin() const { return maVector.begin(); }
 vector_type::const_iterator end() const { return maVector.end(); }
 voidResort() { maVector.Resort(); }
+
+// Notifies all LOK clients when redliens are added/modified/removed
+static void LOKRedlineNotification(RedlineNotification 
eType, SwRedlineTable::size_type nPos, SwRangeRedline* pRedline);
 };
 
 /// Table that holds 'extra' redlines, such as 'table row insert\delete', 
'paragraph moves' etc...
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 0a55c6c..6fbcded 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1375,6 +1375,26 @@ void SwTiledRenderingTest::testRedlineUpdateCallback()
 // This was 0, as LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED wasn't sent.
 CPPUNIT_ASSERT_EQUAL(1, m_nRedlineTableEntryModified);
 
+// Turn off the change tracking mode, make some modification to left of the
+// redline so that its position changes
+xPropertySet->setPropertyValue("RecordChanges", uno::makeAny(false));
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+pWrtShell->Insert("This text is left of the redline");
+
+// Position of the redline has changed => Modify callback
+CPPUNIT_ASSERT_EQUAL(2, m_nRedlineTableEntryModified);
+
+pWrtShell->DelLeft();
+// Deletion also emits Modify callback
+CPPUNIT_ASSERT_EQUAL(3, m_nRedlineTableEntryModified);
+
+// Make changes to the right of the redline => no position change in 
redline
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 100/*Go enough right 
*/, /*bBasicCall=*/false);
+pWrtShell->Insert("This text is right of the redline");
+
+// No Modify callbacks
+CPPUNIT_ASSERT_EQUAL(3, m_nRedlineTableEntryModified);
+
 comphelper::LibreOfficeKit::setActive(false);
 }
 
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 6ae2e29..555cff7 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -60,8 +60,6 @@
 
 using namespace com::sun::star;
 
-enum class RedlineNotification { Add, Remove, Modify };
-
 #ifdef DBG_UTIL
 
 void sw_DebugRedline( const SwDoc* pDoc )
@@ -304,7 +302,7 @@ bool SwExtraRedlineTable::DeleteTableCellRedline( SwDoc* 
pDoc, const SwTableBox&
 }
 
 /// Emits LOK notification about one addition / removal of a redline item.
-static void lcl_RedlineNotification(RedlineNotification nType, 
SwRedlineTable::size_type nPos, SwRangeRedline* pRedline)
+void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, 
SwRedlineTable::size_type nPos, SwRangeRedline* pRedline)
 {
 if (!comphelper::LibreOfficeKit::isActive())
 return;
@@ -363,7 +361,7 @@ bool SwRedlineTable::Insert( SwRangeRedline* p )
 {
 std::pair rv = maVector.insert( p );
 size_type nP = rv.first - begin();
-lcl_RedlineNotification(RedlineNotification::Add, nP, p);
+LOKRedlineNotification(RedlineNotification::Add, nP, p);
 p->CallDisplayFunc(nP);
 return rv.second;
 }
@@ -523,7 +521,7 @@ bool SwRedlineTable::Remove( const SwRangeRedline* p )
 
 void SwRedlineTable::Remove( size_type nP )
 {
-lcl_RedlineNotification(RedlineNotification::Remove, nP, maVector[nP]);
+LOKRedlineNotification(RedlineNotification::Remove, nP, maVector[nP]);
 SwDoc* pDoc = nullptr;
 if( !nP && 1 == size() )
 pDoc = maVector.front()->GetDoc();
@@ -550,7 +548,7 @@ void SwRedlineTable::DeleteAndDestroy( size_type nP, 
size_type nL )
 size_t nCount = 0;
 for( vector_type::cons

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

[Markus Mohrhard]

 sc/source/core/tool/interpr4.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 20bcaeb0f8509e4b12d72d4612b5f3c9bfde3489
Author: Markus Mohrhard 
Date:   Mon Mar 13 12:45:07 2017 +0100

tdf#106456, don't try to use invalid ranges in external ref code

Change-Id: I38e622df87dd4b5e37dd248c5181978e13890fda
Reviewed-on: https://gerrit.libreoffice.org/35132
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 951fcc6556346e19a028443c70dea27d0cbc9c36)
Reviewed-on: https://gerrit.libreoffice.org/35180
Reviewed-by: Eike Rathke 

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index f266491..7a0b08b 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1317,6 +1317,12 @@ void ScInterpreter::GetExternalDoubleRef(
 
 ScComplexRefData aData(rData);
 ScRange aRange = aData.toAbs(aPos);
+if (!ValidColRow(aRange.aStart.Col(), aRange.aStart.Row()) || 
!ValidColRow(aRange.aEnd.Col(), aRange.aEnd.Row()))
+{
+SetError(FormulaError::NoRef);
+return;
+}
+
 ScExternalRefCache::TokenArrayRef pArray = pRefMgr->getDoubleRefTokens(
 nFileId, rTabName, aRange, &aPos);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fe7a5fe993dc9c1361fbf974e725451adce6eef7
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:49:58 2017 +0100

loplugin:subtlezeroinit (clang-cl)

Change-Id: I0a36bcf15fff74ed2f707608e04ad6596614dfd1

diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index b468bf1..29e6d1d 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -381,7 +381,7 @@ css::uno::Sequence< css::uno::Reference< 
css::security::XCertificateExtension >
 if ( objId == "2.5.29.17" )
 xExtn = reinterpret_cast(new 
SanExtensionImpl());
 else
-xExtn = new CertificateExtension_XmlSecImpl() ;
+xExtn = new CertificateExtension_XmlSecImpl;
 if( xExtn == nullptr )
 throw RuntimeException() ;
 
@@ -406,7 +406,7 @@ css::uno::Reference< css::security::XCertificateExtension > 
SAL_CALL X509Certifi
 
 //TODO: Compare the oid
 if( false ) {
-xExtn = new CertificateExtension_XmlSecImpl() ;
+xExtn = new CertificateExtension_XmlSecImpl;
 if( xExtn == nullptr )
 throw RuntimeException() ;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 wsd/LOOLWSD.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60e86cfba8bd4abab9f06aa86f29976ddba5d2c3
Author: Pranav Kant 
Date:   Tue Mar 14 19:19:15 2017 +0530

clearer log message, insert space here

Change-Id: I883867e66060838d8f6c879b9bba44f93fb7bd51

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index be1d417..fa6d629 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2178,7 +2178,7 @@ private:
 void handleClientWsUpgrade(const Poco::Net::HTTPRequest& request, const 
std::string& url)
 {
 // requestHandler = new ClientRequestHandler();
-LOG_INF("Client WS request" << request.getURI() << ", url: " << url);
+LOG_INF("Client WS request: " << request.getURI() << ", url: " << url);
 
 // First Upgrade.
 WebSocketHandler ws(_socket, request);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/win/app/salshl.cxx|8 ++--
 vcl/win/gdi/winlayout.cxx |4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 2789a8c202151fc8ce3cc3c220513200d67e8b07
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:49:22 2017 +0100

loplugin:subtlezeroinit (clang-cl)

Change-Id: I34367cad2d07b9fc6c8f4607ee5e74625f12e78f

diff --git a/vcl/win/app/salshl.cxx b/vcl/win/app/salshl.cxx
index 3c3c710..3f8e5f5 100644
--- a/vcl/win/app/salshl.cxx
+++ b/vcl/win/app/salshl.cxx
@@ -102,12 +102,8 @@ bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& 
rSmallIcon )
 if( rIcon )
 {
 // add to icon cache
-pSalIcon = new SalIcon();
-pSalIcon->nId = nId;
-pSalIcon->hIcon = rIcon;
-pSalIcon->hSmallIcon = rSmallIcon;
-pSalIcon->pNext = pSalData->mpFirstIcon;
-pSalData->mpFirstIcon = pSalIcon;
+pSalData->mpFirstIcon = new SalIcon{
+nId, rIcon, rSmallIcon, pSalData->mpFirstIcon};
 }
 
 return (rSmallIcon != nullptr);
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index a8d71fc..b41ad59 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -249,13 +249,13 @@ TextOutRenderer & TextOutRenderer::get(bool bUseDWrite)
 {
 static std::unique_ptr 
_impl(D2DWriteTextOutRenderer::InitModules()
 ? static_cast(new D2DWriteTextOutRenderer())
-: static_cast(new ExTextOutRenderer()));
+: static_cast(new ExTextOutRenderer));
 
 return *_impl;
 }
 else
 {
-static std::unique_ptr _impl(new ExTextOutRenderer());
+static std::unique_ptr _impl(new ExTextOutRenderer);
 
 return *_impl;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/source/window/mouse.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3d7db868d466c0b972d83e4b7acd5e6a42f8bbeb
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:48:49 2017 +0100

loplugin:unoany (clang-cl)

Change-Id: I82f69e1fda3a63c7f1a521acbb2df6412d270455

diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index b4f2f6d..7efe874 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -735,8 +735,8 @@ Reference< css::datatransfer::dnd::XDragSource > 
Window::GetDragSource()
 #if defined(_WIN32)
 aDragSourceSN = 
"com.sun.star.datatransfer.dnd.OleDragSource";
 aDropTargetSN = 
"com.sun.star.datatransfer.dnd.OleDropTarget";
-aDragSourceAL[ 1 ] = makeAny( static_cast( 
reinterpret_cast(pEnvData->hWnd) ) );
-aDropTargetAL[ 0 ] = makeAny( static_cast( 
reinterpret_cast(pEnvData->hWnd) ) );
+aDragSourceAL[ 1 ] <<= static_cast( 
reinterpret_cast(pEnvData->hWnd) );
+aDropTargetAL[ 0 ] <<= static_cast( 
reinterpret_cast(pEnvData->hWnd) );
 #elif defined MACOSX
 /* FIXME: Mac OS X specific dnd interface does not exist! *
  * Using Windows based dnd as a temporary solution*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 canvas/source/directx/dx_canvasbitmap.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4084d5dd5bb47e39f79d46a62ba5098ffcc4663e
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:40:50 2017 +0100

loplugin:unoany (clang-cl)

Change-Id: I14351561764811562a2c2904b6f7db6148e55c9b

diff --git a/canvas/source/directx/dx_canvasbitmap.cxx 
b/canvas/source/directx/dx_canvasbitmap.cxx
index edc1c0a..ce20e6a 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -84,7 +84,7 @@ namespace dxcanvas
 {
 // sorry, no BitmapEx here...
 case 0:
-aRes = css::uno::Any( reinterpret_cast( nullptr ) );
+aRes <<= reinterpret_cast( nullptr );
 break;
 
 case 1:
@@ -95,7 +95,7 @@ namespace dxcanvas
 mpBitmap->getBitmap()->GetHBITMAP(Gdiplus::Color(), &aHBmp 
);
 
 uno::Sequence< uno::Any > args(1);
-args[0] = uno::Any( sal_Int64(aHBmp) );
+args[0] <<= sal_Int64(aHBmp);
 
 aRes <<= args;
 }
@@ -151,7 +151,7 @@ namespace dxcanvas
 pGDIPlusBitmap->UnlockBits( &aBmpData );
 
 uno::Sequence< uno::Any > args(1);
-args[0] = uno::Any( sal_Int64(hBmpBitmap) );
+args[0] <<= sal_Int64(hBmpBitmap);
 
 aRes <<= args;
 }
@@ -228,7 +228,7 @@ namespace dxcanvas
reinterpret_cast(&aDIB), 
DIB_RGB_COLORS );
 
 uno::Sequence< uno::Any > args(1);
-args[0] = uno::Any( sal_Int64(hBmpBitmap) );
+args[0] <<= sal_Int64(hBmpBitmap);
 
 aRes <<= args;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/qa/extras/uiwriter/uiwriter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f088b72bb2eecdbe2b8a28bb05048f3b17a2a6f
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:47:59 2017 +0100

-Werror,-Wformat (clang-cl)

Change-Id: I33e11937c578e4661aea47c0e14e0524b08e00b3

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 562bfd1..af266fa 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3617,7 +3617,7 @@ void SwUiWriterTest::testTdf77014()
 
 for (auto& rPortionItem : aHandler.mPortionItems)
 {
-printf ("-- Type: %s length: %d text type: %d\n",
+printf ("-- Type: %s length: %" SAL_PRIdINT32 " text type: %d\n",
 rPortionItem.msItemType.toUtf8().getStr(),
 rPortionItem.mnLength,
 rPortionItem.mnTextType);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 shell/inc/spsupp/COMOpenDocuments.hpp   |   15 +++
 shell/inc/spsupp/COMRefCounted.hpp  |6 +++---
 shell/inc/spsupp/registrar.hpp  |4 ++--
 shell/inc/spsupp/spsuppClassFactory.hpp |8 
 shell/inc/spsupp/spsuppServ.hpp |6 +++---
 shell/source/win32/ooofilereader/contentreader.cxx  |6 +++---
 shell/source/win32/ooofilereader/metainforeader.cxx |8 
 shell/source/win32/simplemail/smplmailsuppl.cxx |2 +-
 shell/source/win32/spsupp/COMOpenDocuments.cxx  |   20 +---
 shell/source/win32/spsupp/spsuppClassFactory.cxx|2 --
 shell/source/win32/spsupp/spsuppServ.cxx|   18 +++---
 11 files changed, 59 insertions(+), 36 deletions(-)

New commits:
commit 34604446fc81be99ccee28f1977bf85e6abfab45
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:46:49 2017 +0100

Various clang-cl/loplugin warnings

Change-Id: Ib18e04e5024d15f8bbbf4921932b07465fb1f32f

diff --git a/shell/inc/spsupp/COMOpenDocuments.hpp 
b/shell/inc/spsupp/COMOpenDocuments.hpp
index 1b2a529..a0f733e 100644
--- a/shell/inc/spsupp/COMOpenDocuments.hpp
+++ b/shell/inc/spsupp/COMOpenDocuments.hpp
@@ -7,10 +7,17 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _COMOPENDOCUMENTS_HPP_
-#define _COMOPENDOCUMENTS_HPP_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_COMOPENDOCUMENTS_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_COMOPENDOCUMENTS_HPP
 
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
 #include "spsupp_h.h"
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
 #include "COMRefCounted.hpp"
 #include "Objsafe.h"
 #include "assert.h"
@@ -28,7 +35,7 @@ public:
 };
 
 COMOpenDocuments();
-virtual ~COMOpenDocuments();
+virtual ~COMOpenDocuments() override;
 
 // IUnknown methods
 
@@ -210,6 +217,6 @@ private:
 COMObjectSafety m_aObjectSafety;
 };
 
-#endif // _COMOPENDOCUMENTS_HPP_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/spsupp/COMRefCounted.hpp 
b/shell/inc/spsupp/COMRefCounted.hpp
index 075923d..230f6c8 100644
--- a/shell/inc/spsupp/COMRefCounted.hpp
+++ b/shell/inc/spsupp/COMRefCounted.hpp
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _COMREFCOUNTED_HPP_
-#define _COMREFCOUNTED_HPP_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_COMREFCOUNTED_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_COMREFCOUNTED_HPP
 
 #include "objbase.h"
 
@@ -37,6 +37,6 @@ private:
 long m_nRef = 1; // Created referenced
 };
 
-#endif // _COMREFCOUNTED_HPP_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/spsupp/registrar.hpp b/shell/inc/spsupp/registrar.hpp
index 00b230e..ed41c4d 100644
--- a/shell/inc/spsupp/registrar.hpp
+++ b/shell/inc/spsupp/registrar.hpp
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _REGISTRAR_H
-#define _REGISTRAR_H
+#ifndef INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H
+#define INCLUDED_SHELL_INC_SPSUPP_REGISTRAR_H
 
 #include "windows.h"
 
diff --git a/shell/inc/spsupp/spsuppClassFactory.hpp 
b/shell/inc/spsupp/spsuppClassFactory.hpp
index 9d93791..9deccbd 100644
--- a/shell/inc/spsupp/spsuppClassFactory.hpp
+++ b/shell/inc/spsupp/spsuppClassFactory.hpp
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _SPSUPPCLASSFACTORY_H_
-#define _SPSUPPCLASSFACTORY_H_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_SPSUPPCLASSFACTORY_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_SPSUPPCLASSFACTORY_HPP
 
 #include "COMRefCounted.hpp"
 
@@ -16,7 +16,7 @@ class ClassFactory : public COMRefCounted
 {
 public:
 ClassFactory();
-virtual ~ClassFactory();
+virtual ~ClassFactory() override;
 
 // IUnknown methods
 
@@ -44,6 +44,6 @@ private:
 static long m_nLockCount;
 };
 
-#endif // _SPSUPPCLASSFACTORY_H_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/inc/spsupp/spsuppServ.hpp b/shell/inc/spsupp/spsuppServ.hpp
index 971e6bc..e3c78dc 100644
--- a/shell/inc/spsupp/spsuppServ.hpp
+++ b/shell/inc/spsupp/spsuppServ.hpp
@@ -7,14 +7,14 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef _SPSUPPSERV_HPP_
-#define _SPSUPPSERV_HPP_
+#ifndef INCLUDED_SHELL_INC_SPSUPP_SPSUPPSERV_HPP
+#define INCLUDED_SHELL_INC_SPSUPP_SPSUPPSERV_HPP
 
 #include 
 
 ITypeLib* GetTypeLib();
 const wchar_t* GetLOPath();
 
-#endif // _SPSUPPSERV_HPP_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx 
b/shell/source/win32/ooofilereader/contentreader.cxx
index 7a2cce5..1ecaf60 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -88,7 +88,7 @@ ITag* CContentReader::chooseTagReader( const std::wstring& 
tag_name, 

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

[Stephan Bergmann]

 fpicker/source/win32/filepicker/customcontrolfactory.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b30173fd76f322aa3ca1845e5208d6f580b2ab15
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:45:34 2017 +0100

loplugin:subtlezeroinit (clang-cl)

Change-Id: I19f41363e3efcc716d3258106ebee2424be25b6a

diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx 
b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index ea66e56..cfdb1d5 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
@@ -65,7 +65,7 @@ CCustomControl* 
CCustomControlFactory::CreateCustomControl(HWND aControlHandle,
 
 CCustomControl* CCustomControlFactory::CreateCustomControlContainer()
 {
-return new CCustomControlContainer();
+return new CCustomControlContainer;
 }
 
 /* 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: fpicker/source

[Stephan Bergmann]

 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0fa3fc8e50e5baca523e68fa5e6591591dde52f
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:45:00 2017 +0100

loplugin:unoany (clang-cl)

Change-Id: Id16f382fbf038db543cab02d10dfedab5beb2848

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index eb798d8..9600b0b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -1118,7 +1118,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const 
RequestRef& rRequest)
 BOOLbValue  = FALSE;
 HRESULT hResult = iCustom->GetCheckButtonState(nId, &bValue);
 if ( SUCCEEDED(hResult) )
-aValue = css::uno::makeAny(bool(bValue));
+aValue <<= bool(bValue);
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 editeng/source/editeng/editdbg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8b378dac00de37655b61d13efd8fbf312472391d
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:44:19 2017 +0100

-Werror,-Wformat (clang-cl)

Change-Id: I7a3f58e5967a31999f45ce15086f048fb39650c7

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index a1bd2c8..7a81902 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -411,13 +411,13 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, bool 
bInfoBox )
 EditLine& rLine = pPPortion->GetLines()[nLine];
 
 OString 
aLine(OUStringToOString(pPPortion->GetNode()->Copy(rLine.GetStart(), 
rLine.GetEnd() - rLine.GetStart()), RTL_TEXTENCODING_ASCII_US));
-fprintf( fp, "\nLine %i\t>%s<", nLine, aLine.getStr() );
+fprintf( fp, "\nLine %" SAL_PRIdINT32 "\t>%s<", nLine, 
aLine.getStr() );
 }
 // then the internal data ...
 for ( sal_Int32 nLine = 0; nLine < pPPortion->GetLines().Count(); 
nLine++ )
 {
 EditLine& rLine = pPPortion->GetLines()[nLine];
-fprintf( fp, "\nZeile %i:\tStart: %" SAL_PRIdINT32 ",\tEnd: %" 
SAL_PRIdINT32, nLine, rLine.GetStart(), rLine.GetEnd() );
+fprintf( fp, "\nZeile %" SAL_PRIdINT32 ":\tStart: %" SAL_PRIdINT32 
",\tEnd: %" SAL_PRIdINT32, nLine, rLine.GetStart(), rLine.GetEnd() );
 fprintf( fp, "\t\tPortions: %" SAL_PRIdINT32 " - %" SAL_PRIdINT32 
".\tHight: %i, Ascent=%i", rLine.GetStartPortion(), rLine.GetEndPortion(), 
rLine.GetHeight(), rLine.GetMaxAscent() );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 dtrans/source/win32/dtobj/DOTransferable.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08d8fd9dd82d8c1ca2b364b96c3aed600fd1e1c4
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:43:11 2017 +0100

loplugin:unoany (clang-cl)

Change-Id: Ia5211e7ad27332d4d4cab546d6968e32dfb71523

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx 
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 5588cda..58117c5 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -114,10 +114,10 @@ Any byteStreamToAny( CDOTransferable::ByteSequence_t& 
aByteStream, const Type& a
 if ( aRequestedDataType == CPPUTYPE_OUSTRING )
 {
 OUString str = byteStreamToOUString( aByteStream );
-aAny = makeAny( str );
+aAny <<= str;
 }
 else
-aAny = makeAny( aByteStream );
+aAny <<= aByteStream;
 
 return aAny;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/ado/AConnection.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd1a9bc6b64aeba2a25037af9a832162fde9d280
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:42:35 2017 +0100

loplugin:subtlezeroinit (clang-cl)

Change-Id: I3f080f0c77ba7c5976c8b764e0c7e1f7c78ab47d

diff --git a/connectivity/source/drivers/ado/AConnection.cxx 
b/connectivity/source/drivers/ado/AConnection.cxx
index c83d85d..6bee256 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -433,7 +433,7 @@ void OConnection::buildTypeInfo()
 do
 {
 sal_Int32 nPos = 1;
-OExtendedTypeInfo* aInfo= new OExtendedTypeInfo();
+OExtendedTypeInfo* aInfo= new OExtendedTypeInfo;
 aInfo->aSimpleType.aTypeName= 
ADOS::getField(pRecordset,nPos++).get_Value().getString();
 aInfo->eType= 
(DataTypeEnum)(sal_Int32)ADOS::getField(pRecordset,nPos++).get_Value().getInt32();
 if ( aInfo->eType == adWChar && aInfo->aSimpleType.aTypeName 
== s_sVarChar )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 sd/source/ui/inc/ViewShell.hxx   |1 +
 sd/source/ui/uitest/uiobject.cxx |1 +
 sd/source/ui/view/viewshe2.cxx   |   10 ++
 3 files changed, 12 insertions(+)

New commits:
commit d3003be764b02c5d2fdfe8bf1046aeded8a40fe9
Author: Markus Mohrhard 
Date:   Mon Mar 13 17:47:12 2017 +0100

uitest: add the impress zoom level to the state information

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

diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 68df8b5..3d4dc90 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -201,6 +201,7 @@ public:
 voidScroll(long nX, long nY);
 voidScrollLines(long nX, long nY);
 virtual voidSetZoom(long nZoom);
+longGetZoom() const;
 virtual voidSetZoomRect(const Rectangle& rZoomRect);
 voidInitWindows(const Point& rViewOrigin, const Size& rViewSize,
 const Point& rWinPos, bool bUpdate = false);
diff --git a/sd/source/ui/uitest/uiobject.cxx b/sd/source/ui/uitest/uiobject.cxx
index f47e131..a604f64 100644
--- a/sd/source/ui/uitest/uiobject.cxx
+++ b/sd/source/ui/uitest/uiobject.cxx
@@ -90,6 +90,7 @@ StringMap ImpressWindowUIObject::get_state()
 
 aMap["SelectedText"] = getViewShell(mxWindow)->GetSelectionText(false);
 aMap["CurrentSlide"] = 
OUString::number(getViewShell(mxWindow)->GetCurPageId());
+aMap["Zoom"] = OUString::number(getViewShell(mxWindow)->GetZoom());
 
 return aMap;
 }
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 82b529e..ae3a19a 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -359,6 +359,16 @@ void ViewShell::SetZoom(long nZoom)
 UpdateScrollBars();
 }
 
+long ViewShell::GetZoom() const
+{
+if (mpContentWindow)
+{
+mpContentWindow->GetZoom();
+}
+
+return 0;
+}
+
 /**
  * Set zoom rectangle for active window. Sets all split windows to the same 
zoom
  * factor.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svl/source/numbers/zformat.cxx  |   10 --
 svl/source/numbers/zforscan.cxx |   23 +--
 2 files changed, 21 insertions(+), 12 deletions(-)

New commits:
commit 0f7a1bce18b08045fd98d5de99bb9ed69a7d474d
Author: Eike Rathke 
Date:   Fri Mar 10 13:38:28 2017 +0100

string access out of bounds

 This is a combination of 3 commits.

string access out of bounds

Change-Id: I4f6e6e8e77cdabe593bca5719b6ef38aeecc5da7
(cherry picked from commit 77a8cf7eaf638276030d1c5be8705f5603f071a9)

prevent string access out of bounds

Though only the closing 0-character and the following check excludes that,
dbgutil asserts.

Change-Id: Ife1299042a60f6f058c4cf58b406d1cc022786a7
(cherry picked from commit c407fff205a270e02fe07885805b7250e71c28f8)

guard against a (theoretical?) endless loop of blanks only

Change-Id: I68d6cca1b359aa8fba42663bddb1107c31102415
(cherry picked from commit fe73eff36718b6d99d0cf92d750c457872cc4dcc)
Reviewed-on: https://gerrit.libreoffice.org/35043
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 09e024e..be19e33 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2817,9 +2817,15 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 bRes |= ImpNumberFill(sDiv, fNumber, k, j, nIx, NF_SYMBOLTYPE_FRAC);
 if ( !bHideFraction &&  sDenominatorFormat.getLength() > 0 )
 {
-while ( sDiv[0] == ' ' ) // left align denominator
+// Guard against a (theoretical?) endless loop of blanks only.
+sal_Int32 n = sDiv.getLength();
+sal_Int32 nDenominatorLen = sDenominatorFormat.getLength();
+while ( n-- > 0 && sDiv[0] == ' ' ) // left align denominator
 {
-sDiv.insert( sDenominatorFormat.getLength(), " " );
+if (sDiv.getLength() <= nDenominatorLen)
+sDiv.append(" ");
+else
+sDiv.insert( nDenominatorLen, " " );
 sDiv.remove( 0, 1 );
 }
 }
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 34137cb..1cceda7 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -814,18 +814,21 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 switch (cToken)
 {
 case '/': // AM/PM, A/P
-cNext = rStr[nPos];
-if ( cNext == 'P' || cNext == 'p' )
+if (nPos < rStr.getLength())
 {
-sal_Int32 nLen = sSymbol.getLength();
-if ( 1 <= nLen &&
- (sSymbol[0] == 'A' || sSymbol[0] == 'a') &&
- (nLen == 1 ||
-  (nLen == 2 && (sSymbol[1] == 'M' || sSymbol[1] 
== 'm')
-   && (rStr[nPos + 1] == 'M' || rStr[nPos + 1] == 
'm'
+cNext = rStr[nPos];
+if ( cNext == 'P' || cNext == 'p' )
 {
-sSymbol += OUStringLiteral1(cToken);
-bDontStop = true;
+sal_Int32 nLen = sSymbol.getLength();
+if ( 1 <= nLen &&
+(sSymbol[0] == 'A' || sSymbol[0] == 'a') &&
+(nLen == 1 ||
+ (nLen == 2 && (sSymbol[1] == 'M' || 
sSymbol[1] == 'm')
+  && (rStr[nPos + 1] == 'M' || rStr[nPos + 
1] == 'm'
+{
+sSymbol += OUStringLiteral1(cToken);
+bDontStop = true;
+}
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/toolbox.hxx|1 -
 vcl/source/window/toolbox.cxx  |4 +---
 vcl/source/window/toolbox2.cxx |2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3c9b1306384cc88d7afbfe3127ea40ba056a4822
Author: Stephan Bergmann 
Date:   Tue Mar 14 14:19:20 2017 +0100

ToolBox::mbCommandDrag is always false now

...after 5ac443e180c54dee69a65a1569c99afe151f2f97 "ToolBox::mbCustomizeMode 
is
always false"

Change-Id: I39bd9d07dfd8dee8e935aa612db35e11022f4ed3

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 3c4066e..17c31cb 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -137,7 +137,6 @@ private:
 sal_uInt16  mnMouseModifier;
 boolmbDrag:1,
 mbSelection:1,
-mbCommandDrag:1,
 mbUpper:1,
 mbLower:1,
 mbIn:1,
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 3d619b7..02f8ee4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1325,7 +1325,6 @@ void ToolBox::ImplInitToolBoxData()
 mnMouseModifier   = 0;
 mbDrag= false;
 mbSelection   = false;
-mbCommandDrag = false;
 mbUpper   = false;
 mbLower   = false;
 mbIn  = false;
@@ -3902,13 +3901,12 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 if ( ImplHandleMouseButtonUp( rMEvt ) )
 return;
 
-if ( mbDragging && (rMEvt.IsLeft() || mbCommandDrag) )
+if ( mbDragging && rMEvt.IsLeft() )
 {
 ImplTBDragMgr* pMgr = ImplGetTBDragMgr();
 pMgr->EndDragging();
 return;
 }
-mbCommandDrag = false;
 
 DockingWindow::MouseButtonUp( rMEvt );
 }
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c3245b7..b2d708d 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1134,8 +1134,6 @@ void ToolBox::StartSelection()
 
 void ToolBox::EndSelection()
 {
-mbCommandDrag = false;
-
 if ( mbDrag || mbSelection )
 {
 // reset
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/uibase/dbui/dbmgr.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 445b719b8bbff9181cea3601649bb21c27acd7b5
Author: Caolán McNamara 
Date:   Mon Mar 13 12:44:10 2017 +

Resolves: rhbz#1431540 crash in SwDBManager::releaseRevokeListener

Change-Id: I8e61163de7e6192bdf613ab6b58906326499d6c2
Reviewed-on: https://gerrit.libreoffice.org/35137
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit e1f36eddf4596901a51de42322ccbf8d1df9d139)
Reviewed-on: https://gerrit.libreoffice.org/35138

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2d85ff7..9adf98c 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -3118,8 +3118,11 @@ SwDoc* SwDBManager::getDoc() const
 
 void SwDBManager::releaseRevokeListener()
 {
-pImpl->m_xDataSourceRemovedListener->Dispose();
-pImpl->m_xDataSourceRemovedListener.clear();
+if (pImpl->m_xDataSourceRemovedListener.is())
+{
+pImpl->m_xDataSourceRemovedListener->Dispose();
+pImpl->m_xDataSourceRemovedListener.clear();
+}
 }
 
 
SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBManager&
 rManager)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a4d2433fbf2ef6f41b82482ea99ed79fb2d6735
Author: Caolán McNamara 
Date:   Mon Mar 13 12:28:12 2017 +

rhbz#1431476 dnd has started copying instead of moving slides

Is suspect something has changed in gtk3, and I think we're
not supposed to use gdk_drag_drop_succeeded at this point, but
instead we'd get a dragFailed signal on the failure case

Change-Id: I6b305db56a29255b468ca9182d1f7e57cb4c10f4
(cherry picked from commit 4ea76db5e53235971b597a2810a6d12618d6aaea)
Reviewed-on: https://gerrit.libreoffice.org/35135
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 4b65a55..2752fc7 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4241,7 +4241,7 @@ void GtkDragSource::dragEnd(GdkDragContext* context)
 {
 datatransfer::dnd::DragSourceDropEvent aEv;
 aEv.DropAction = 
GdkToVcl(gdk_drag_context_get_selected_action(context));
-aEv.DropSuccess = gdk_drag_drop_succeeded(context);
+aEv.DropSuccess = true;
 auto xListener = m_xListener;
 m_xListener.clear();
 xListener->dragDropEnd(aEv);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   65 +---
 1 file changed, 40 insertions(+), 25 deletions(-)

New commits:
commit 71f095d734c93e22279c2ab8afe788182eb5bdbb
Author: Caolán McNamara 
Date:   Sun Mar 12 17:37:05 2017 +

ofz#829 ensure palette can fulfil largest index used

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

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 48f985e..db1ddcc 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -52,6 +52,7 @@ private:
 Bitmap  aBitmap;
 BitmapWriteAccess*  pAcc;
 sal_uInt16  nDstBitsPerPixel;
+int nLargestPixelIndex;
 AlphaMask*  pAlphaMask;
 BitmapWriteAccess*  pMaskAcc;
 
@@ -120,6 +121,9 @@ private:
 // converts a Scanline to the Windows-BMP format
 
 bool HasAlphaChannel() const;
+
+void SetPixelIndex(BitmapWriteAccess *pAcc, long nY, long nX, sal_uInt8 
cIndex);
+
 public:
 
 TIFFReader()
@@ -127,6 +131,7 @@ public:
 , pTIFF(nullptr)
 , pAcc(nullptr)
 , nDstBitsPerPixel(0)
+, nLargestPixelIndex(-1)
 , pAlphaMask(nullptr)
 , pMaskAcc(nullptr)
 , nOrigPos(0)
@@ -783,6 +788,11 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, 
sal_uLong nBitsPos, sal_u
 return nRes;
 }
 
+void TIFFReader::SetPixelIndex(BitmapWriteAccess *pWriteAcc, long nY, long nX, 
sal_uInt8 cIndex)
+{
+pWriteAcc->SetPixelIndex(nY, nX, cIndex);
+nLargestPixelIndex = std::max(nLargestPixelIndex, cIndex);
+}
 
 bool TIFFReader::ConvertScanline(sal_Int32 nY)
 {
@@ -945,7 +955,7 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 for (sal_Int32 nx = 0; nx < nImageWidth; ++nx)
 {
 nLast += nx == 0 ? BYTESWAP( (sal_uInt8)*pt++ 
) : *pt++;
-pAcc->SetPixelIndex( nY, nx, nLast );
+SetPixelIndex(pAcc, nY, nx, nLast);
 }
 }
 else
@@ -953,7 +963,7 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 for (sal_Int32 nx = 0; nx < nImageWidth; ++nx)
 {
 sal_uInt8 nLast = *pt++;
-pAcc->SetPixelIndex( nY, nx, 
static_cast( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * 
nMinMax ) );
+SetPixelIndex(pAcc, nY, nx, 
static_cast( (BYTESWAP((sal_uLong)nLast) - nMinSampleValue) * 
nMinMax ));
 }
 }
 }
@@ -965,15 +975,14 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 for (sal_Int32 nx = 0; nx < nImageWidth; ++nx)
 {
 nLast += *pt++;
-pAcc->SetPixelIndex( nY, nx, nLast );
+SetPixelIndex(pAcc, nY, nx, nLast);
 }
 }
 else
 {
 for (sal_Int32 nx = 0; nx < nImageWidth; ++nx)
 {
-pAcc->SetPixelIndex( nY, nx, 
static_cast( ((sal_uLong)*pt++ - nMinSampleValue) * nMinMax ) );
-
+SetPixelIndex(pAcc, nY, nx, 
static_cast( ((sal_uLong)*pt++ - nMinSampleValue) * nMinMax ));
 }
 }
 }
@@ -990,7 +999,7 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 for (sal_Int32 nx = 0; nx < nImageWidth; ++nx)
 {
 nVal = ( GetBits( pt, nx * nBitsPerSample, 
nBitsPerSample ) - nMinSampleValue ) * nMinMax;
-pAcc->SetPixelIndex( nY, nx, 
static_cast(nVal));
+SetPixelIndex(pAcc, nY, nx, 
static_cast(nVal));
 }
 }
 break;
@@ -1011,28 +1020,28 @@ bool TIFFReader::ConvertScanline(sal_Int32 nY)
 while (nByteCount--)
 {
 nByteVal = *pt++;
-pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 );
+SetPixelIndex(pAcc, nY, nx++, nByteVal & 1);
 nByteVal >>= 1;
-pAcc->SetPixelIndex( nY, nx++, nByteVal & 1 );
+SetPixelIndex(pAcc, nY, nx++, nByteVal & 1);
 nByteVal >>= 1;
-pAcc->SetPixelIndex( nY, n

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

[Caolán McNamara]

 hwpfilter/source/drawing.h  |4 +--
 hwpfilter/source/hgzip.cxx  |8 +++
 hwpfilter/source/hgzip.h|2 -
 hwpfilter/source/hiodev.cxx |   48 ++--
 hwpfilter/source/hiodev.h   |   22 ++--
 5 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 4a7e226fa4bb5fe5e94a7cc5883b1747a4fd716b
Author: Caolán McNamara 
Date:   Sat Mar 11 17:44:52 2017 +

ofz#820 oom terminate

comments claim return is len of data, but negative numbers for compressed 
data errors
are returned. Make things return the amount of successful data read and 
turn into
unsigned size_t to match ofz#727

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

diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 00eef63..1967ddf 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -107,14 +107,14 @@ static bool SkipPrivateBlock(int type)
 {
 if (!hmem->read4b(n))
 return false;
-if (hmem->state() || hmem->skipBlock(n) != n)
+if (hmem->state() || hmem->skipBlock(n) != static_cast(n))
 return false;
 }
 if (!hmem->read4b(n))
 return false;
 if (hmem->state())
 return false;
-return hmem->skipBlock(n) == n;
+return hmem->skipBlock(n) == static_cast(n);
 }
 
 static int SizeExpected;
diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx
index 81dda52..d4adc69 100644
--- a/hwpfilter/source/hgzip.cxx
+++ b/hwpfilter/source/hgzip.cxx
@@ -148,17 +148,17 @@ static int destroy(gz_stream * s)
Reads the given number of uncompressed bytes from the compressed file.
gz_read returns the number of bytes actually read (0 for end of file).
 */
-int gz_read(gz_stream * file, voidp buf, unsigned len)
+size_t gz_read(gz_stream * file, voidp buf, unsigned len)
 {
 //printf("@@ gz_read : len : %d\t",len);
 gz_stream *s = file;
 Bytef *start = static_cast(buf); /* starting 
point for crc computation */
 Byte *next_out;   /* == stream.next_out but 
not forced far (for MSDOS) */
 if (s == nullptr)
-return Z_STREAM_ERROR;
+return 0;
 
 if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)
-return -1;
+return 0;
 if (s->z_err == Z_STREAM_END)
 return 0; /* EOF */
 
@@ -201,7 +201,7 @@ int gz_read(gz_stream * file, voidp buf, unsigned len)
 break;
 }
 s->crc = crc32(s->crc, start, (uInt) (s->stream.next_out - start));
-return (int) (len - s->stream.avail_out);
+return len - s->stream.avail_out;
 }
 
 /* ===
diff --git a/hwpfilter/source/hgzip.h b/hwpfilter/source/hgzip.h
index 4cff263..40260a9 100644
--- a/hwpfilter/source/hgzip.h
+++ b/hwpfilter/source/hgzip.h
@@ -80,7 +80,7 @@ int gz_close( gz_stream *file );
  * @param len Length of data to be read
  * @returns The number of bytes actually read
  */
-int gz_read ( gz_stream *file, voidp  buf, unsigned len );
+size_t gz_read ( gz_stream *file, voidp  buf, unsigned len );
 /**
  * Flushes all pending output into the compressed file
  * gz_flush should be called only when strictly necessary because it can
diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx
index 48d105f..45ccb98 100644
--- a/hwpfilter/source/hiodev.cxx
+++ b/hwpfilter/source/hiodev.cxx
@@ -34,7 +34,7 @@
 #include "hwpfile.h"
 #include "hstream.hxx"
 
-const int BUFSIZE = 1024;
+const size_t BUFSIZE = 1024;
 static uchar rBuf[BUFSIZE];
 
 // HIODev abstract class
@@ -55,14 +55,14 @@ void HIODev::init()
 }
 
 
-int HIODev::read1b(void *ptr, int nmemb)
+size_t HIODev::read1b(void *ptr, size_t nmemb)
 {
 uchar *p = static_cast(ptr);
-int ii;
 
 if (state())
-return -1;
-for (ii = 0; ii < nmemb; ii++)
+return 0;
+size_t ii;
+for (ii = 0; ii < nmemb; ++ii)
 {
 if (!read1b(p[ii]))
 break;
@@ -72,14 +72,14 @@ int HIODev::read1b(void *ptr, int nmemb)
 return ii;
 }
 
-int HIODev::read2b(void *ptr, int nmemb)
+size_t HIODev::read2b(void *ptr, size_t nmemb)
 {
 ushort *p = static_cast(ptr);
-int ii;
 
 if (state())
-return -1;
-for (ii = 0; ii < nmemb; ii++)
+return 0;
+size_t ii;
+for (ii = 0; ii < nmemb; ++ii)
 {
 if (!read2b(p[ii]))
 break;
@@ -89,14 +89,14 @@ int HIODev::read2b(void *ptr, int nmemb)
 return ii;
 }
 
-int HIODev::read4b(void *ptr, int nmemb)
+size_t HIODev::read4b(void *ptr, size_t nmemb)
 {
 uint *p = static_cast(ptr);
-int ii;
 
 if (state())
-return -1;
-for (ii = 0; ii < nmemb; ii++)
+return 0;
+size_t ii;
+for (ii = 0

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 31 commits - config_host/config_features.h.in config_host.mk.in configure.ac distro-configs/LibreOfficeCoverity.conf download.lst ext

[Miklos Vajna]

 Makefile.fetch|1 
 RepositoryExternal.mk |   11 
 config_host.mk.in |1 
 config_host/config_features.h.in  |5 
 configure.ac  |   18 
 distro-configs/LibreOfficeCoverity.conf   |1 
 download.lst  |1 
 external/Module_external.mk   |1 
 external/pdfium/Library_pdfium.mk |  636 ++
 external/pdfium/Makefile  |7 
 external/pdfium/Module_pdfium.mk  |   17 
 external/pdfium/README|   14 
 external/pdfium/UnpackedTarball_pdfium.mk |   32 
 external/pdfium/macos.patch.1 |   62 
 external/pdfium/msvc.patch.1  | 1344 ++
 external/pdfium/visibility.patch.1|   30 
 include/vcl/pdfwriter.hxx |4 
 include/xmlsecurity/pdfio/pdfdocument.hxx |  328 +++
 include/xmlsecurity/xmlsecuritydllapi.h   |   23 
 sd/qa/unit/data/odp/embedded-pdf.odp  |binary
 sd/qa/unit/export-tests.cxx   |2 
 sd/source/ui/view/drviews2.cxx|2 
 svtools/qa/unit/GraphicObjectTest.cxx |2 
 svtools/qa/unit/data/pdf.odt  |binary
 svtools/source/graphic/grfcache.cxx   |8 
 svx/qa/unit/xoutdev.cxx   |2 
 svx/source/svdraw/svdograf.cxx|4 
 sw/qa/extras/odfexport/data/embedded-pdf.odt  |binary
 sw/qa/extras/odfexport/odfexport.cxx  |   22 
 sw/source/core/graphic/ndgrf.cxx  |4 
 vcl/CppunitTest_vcl_pdfexport.mk  |   42 
 vcl/CppunitTest_vcl_wmf_test.mk   |1 
 vcl/Library_vcl.mk|1 
 vcl/Module_vcl.mk |1 
 vcl/qa/cppunit/pdfexport/data/tdf105093.odp   |binary
 vcl/qa/cppunit/pdfexport/data/tdf105461.odp   |binary
 vcl/qa/cppunit/pdfexport/data/tdf106059.odt   |binary
 vcl/qa/cppunit/pdfexport/data/tdf106206.odt   |binary
 vcl/qa/cppunit/pdfexport/pdfexport.cxx|  265 ++
 vcl/source/filter/graphicfilter.cxx   |2 
 vcl/source/filter/ipdf/pdfread.cxx|  161 -
 vcl/source/filter/ipdf/pdfread.hxx|5 
 vcl/source/gdi/impgraph.cxx   |   23 
 vcl/source/gdi/pdfextoutdevdata.cxx   |   11 
 vcl/source/gdi/pdfwriter.cxx  |8 
 vcl/source/gdi/pdfwriter_impl.cxx |  159 +
 vcl/source/gdi/pdfwriter_impl.hxx |   60 
 vcl/source/gdi/pdfwriter_impl2.cxx|4 
 writerfilter/source/rtftok/rtfdispatchflag.cxx|2 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx|2 
 xmlsecurity/Executable_pdfverify.mk   |5 
 xmlsecurity/Module_xmlsecurity.mk |2 
 xmlsecurity/inc/documentsignaturehelper.hxx   |2 
 xmlsecurity/inc/documentsignaturemanager.hxx  |2 
 xmlsecurity/inc/pdfio/pdfdocument.hxx |  250 --
 xmlsecurity/inc/pdfsignaturehelper.hxx|2 
 xmlsecurity/inc/xmlsecuritydllapi.h   |   23 
 xmlsecurity/inc/xmlsignaturehelper.hxx|2 
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |2 
 xmlsecurity/source/helper/ooxmlsecexporter.cxx|4 
 xmlsecurity/source/helper/pdfsignaturehelper.cxx  |2 
 xmlsecurity/source/pdfio/pdfdocument.cxx  |  199 --
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |8 
 xmlsecurity/workben/pdfverify.cxx |  128 +
 64 files changed, 3424 insertions(+), 536 deletions(-)

New commits:
commit 86510945198fd7f7e4b54d2bca01f424a8b9ac64
Author: Miklos Vajna 
Date:   Thu Mar 2 08:58:31 2017 +0100

tdf#106270 vcl PDF import: use BitmapWriteAccess::CopyScanline()

This requires one function call / row only, cross-platform and works
with OpenGL enabled as well.

Change-Id: I12fd0f52a1a7e8e683b50071ded95f63fecc4d40
Reviewed-on: https://gerrit.libreoffice.org/34774
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit f1d6f202e2b8ff555cedde6315685342325b16fc)

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/p

[Libreoffice-commits] libmspub.git: src/fuzz

[David Tardon]

 src/fuzz/.gitignore|2 +-
 src/fuzz/Makefile.am   |8 
 src/fuzz/pubfuzz.cpp   |   27 ---
 src/fuzz/pubfuzzer.cpp |   27 +++
 4 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit e62697efe1efbb34f216be7929eabf77feb17f0f
Author: David Tardon 
Date:   Tue Mar 14 13:30:44 2017 +0100

rename

Change-Id: I5bfd248db6e93a8c7d3f1a23b21b38919623e1c3

diff --git a/src/fuzz/.gitignore b/src/fuzz/.gitignore
index f44c6ed..1ffee5e 100644
--- a/src/fuzz/.gitignore
+++ b/src/fuzz/.gitignore
@@ -5,4 +5,4 @@
 *.o
 Makefile
 Makefile.in
-pubfuzz
+pubfuzzer
diff --git a/src/fuzz/Makefile.am b/src/fuzz/Makefile.am
index 61b3902..7da4f18 100644
--- a/src/fuzz/Makefile.am
+++ b/src/fuzz/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = pubfuzz
+bin_PROGRAMS = pubfuzzer
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc \
$(REVENGE_GENERATORS_CFLAGS) \
@@ -6,12 +6,12 @@ AM_CXXFLAGS = -I$(top_srcdir)/inc \
$(REVENGE_STREAM_LIBS) \
$(DEBUG_CXXFLAGS)
 
-pubfuzz_LDADD = \
+pubfuzzer_LDADD = \

$(top_builddir)/src/lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la 
\
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
-lFuzzingEngine
 
-pubfuzz_SOURCES = \
-   pubfuzz.cpp
+pubfuzzer_SOURCES = \
+   pubfuzzer.cpp
diff --git a/src/fuzz/pubfuzz.cpp b/src/fuzz/pubfuzz.cpp
deleted file mode 100644
index 7a9ab5f..000
--- a/src/fuzz/pubfuzz.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * This file is part of the libmspub project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include 
-#include 
-
-#include 
-
-#include 
-
-#include 
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
-{
-librevenge::RVNGStringStream input(data, size);
-librevenge::RVNGRawDrawingGenerator generator(true);
-libmspub::MSPUBDocument::parse(&input, &generator);
-return 0;
-}
-
-/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/fuzz/pubfuzzer.cpp b/src/fuzz/pubfuzzer.cpp
new file mode 100644
index 000..7a9ab5f
--- /dev/null
+++ b/src/fuzz/pubfuzzer.cpp
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libmspub project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+#include 
+
+#include 
+
+#include 
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+librevenge::RVNGStringStream input(data, size);
+librevenge::RVNGRawDrawingGenerator generator(true);
+libmspub::MSPUBDocument::parse(&input, &generator);
+return 0;
+}
+
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 wsd/LOOLWSD.cpp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9efb0e8701017cb2133c928c90f861979193a2a6
Author: Pranav Kant 
Date:   Tue Mar 14 18:04:02 2017 +0530

loolwsd: Fix dump states output

Change-Id: Idf578e1833b0013bb694e8cd5a8630bf48938c56

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 9f44137..be1d417 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2386,16 +2386,16 @@ public:
<< "  NewChildren: " << NewChildren.size() << "\n"
<< "  OutstandingForks: " << OutstandingForks << "\n";
 
-std::cerr << "Server poll:\n";
+os << "Server poll:\n";
 _acceptPoll.dumpState(os);
 
-std::cerr << "Web Server poll:\n";
+os << "Web Server poll:\n";
 WebServerPoll.dumpState(os);
 
-std::cerr << "Prisoner poll:\n";
+os << "Prisoner poll:\n";
 PrisonerPoll.dumpState(os);
 
-std::cerr << "Document Broker polls "
+os << "Document Broker polls "
   << "[ " << DocBrokers.size() << " ]:\n";
 for (auto &i : DocBrokers)
 i.second->dumpState(os);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpobjstrm.cxx |   39 +++---
 lotuswordpro/source/filter/lwpobjstrm.hxx |3 +-
 2 files changed, 12 insertions(+), 30 deletions(-)

New commits:
commit d18421575c7f1eb97d08cde6184c082e5ab828c3
Author: Caolán McNamara 
Date:   Tue Mar 14 12:03:59 2017 +

ofz: use std::vector for long buffers

and set size of buffer to successfully read data for short reads

Change-Id: I8d132446682104f2a4b8c476b7f2bda188bb3cdf

diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx 
b/lotuswordpro/source/filter/lwpobjstrm.cxx
index bc968a5..398a45d 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -71,24 +71,16 @@ LwpObjectStream::LwpObjectStream(LwpSvStream *pStrm, bool 
isCompressed, sal_uInt
 if (size >= IO_BUFFERSIZE)
 throw std::range_error("bad Object size");
 // read object data from stream
-if(m_nBufSize == 0)
-{
-m_pContentBuf = nullptr;
-}
-else
-{
+if (m_nBufSize > 0)
 Read2Buffer();
-}
 }
+
 /**
  * @descr  read object data from stream to buffer
  */
 void LwpObjectStream::Read2Buffer()
 {
-if( m_pContentBuf )
-{
-ReleaseBuffer();
-}
+ReleaseBuffer();
 
 m_nReadPos = 0;
 
@@ -98,7 +90,7 @@ void LwpObjectStream::Read2Buffer()
 
 sal_uInt8* pCompressBuffer = xCompressBuf.get();
 memset(pCompressBuffer, 0, m_nBufSize);
-m_pStrm->Read(pCompressBuffer, m_nBufSize);
+m_nBufSize = m_pStrm->Read(pCompressBuffer, m_nBufSize);
 
 sal_uInt8 pTempDst[IO_BUFFERSIZE];
 m_nBufSize = DecompressBuffer(pTempDst, pCompressBuffer, m_nBufSize);
@@ -106,13 +98,11 @@ void LwpObjectStream::Read2Buffer()
 
 m_pContentBuf = AllocBuffer(m_nBufSize);
 memcpy(m_pContentBuf, pTempDst, m_nBufSize);
-//delete [] pTempDst;
-
 }
 else
 {
 m_pContentBuf = AllocBuffer(m_nBufSize);
-m_pStrm->Read(m_pContentBuf, m_nBufSize);
+m_nBufSize = m_pStrm->Read(m_pContentBuf, m_nBufSize);
 }
 }
 /**
@@ -120,14 +110,12 @@ void LwpObjectStream::Read2Buffer()
  */
 sal_uInt8* LwpObjectStream::AllocBuffer(sal_uInt16 size)
 {
-if(size<=100)
+if (size<=100)
 {
 return m_SmallBuffer;
 }
-else
-{
-return new sal_uInt8[size];
-}
+m_BigBuffer.resize(size);
+return m_BigBuffer.data();
 }
 /**
  * @descr  signal complete to release object buffer
@@ -146,15 +134,8 @@ LwpObjectStream::~LwpObjectStream()
  */
 void LwpObjectStream::ReleaseBuffer()
 {
-
-if(m_nBufSize>100)
-{
-if(m_pContentBuf)
-{
-delete [] m_pContentBuf;
-m_pContentBuf = nullptr;
-}
-}
+m_BigBuffer.clear();
+m_pContentBuf = nullptr;
 }
 
 sal_uInt16 LwpObjectStream::remainingSize() const
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx 
b/lotuswordpro/source/filter/lwpobjstrm.hxx
index 83062ee..28efe29 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -76,11 +76,12 @@ public:
 private:
 sal_uInt8* m_pContentBuf;   //The content buffer of the object
 sal_uInt8 m_SmallBuffer[100];   //To avoid frequent new
+std::vector m_BigBuffer; //otherwise use this
 enum
 {
 IO_BUFFERSIZE = 0xFF00  //Refer to LWP, not sure if it is enough
 };
-sal_uInt16 m_nBufSize;  //The total size of m_pContentBuf
+sal_uInt16 m_nBufSize;  //The total size of m_pContentBuf
 sal_uInt16 m_nReadPos;  //The position of the quick read
 LwpSvStream* m_pStrm;
 bool m_bCompressed;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 include/svtools/langtab.hxx |2 
 include/svx/langbox.hxx |2 
 svtools/source/misc/langtab.cxx |   15 ++-
 svx/source/dialog/langbox.cxx   |   82 ++--
 4 files changed, 79 insertions(+), 22 deletions(-)

New commits:
commit bde834ee6b0cb43cebece47cac55cc9b80aadc24
Author: Eike Rathke 
Date:   Tue Mar 14 11:52:52 2017 +0100

display raw language tags in curly brackets

Place raw language tags in curly brackets {}, so all on-the-fly tags are
grouped together at the top of a listbox (but behind the "[None]"
entry).

Change-Id: I01d388150241a8482a1f39f8eda26cdd5bb1d832

diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 56d0618..5cfe392 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -48,7 +48,7 @@ public:
 
 @param  rString
 UI visible description string. If empty, the rLanguageTag Bcp47
-string is used instead.
+string placed in curly brackets is used instead, e.g. "{en-DK}"
  */
 static sal_uInt32   AddLanguageTag( const LanguageTag& rLanguageTag, const 
OUString& rString );
 };
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 1c303f9..9214780 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -175,6 +175,17 @@ bool SvtLanguageTable::HasLanguageType( const LanguageType 
eType )
 return theLanguageTable::get().HasType( eType );
 }
 
+OUString lcl_getDescription( const OUString& rBcp47 )
+{
+// Place in curly brackets, so all on-the-fly tags are grouped together at
+// the top of a listbox (but behind the "[None]" entry), and not sprinkled
+// all over, which alphabetically might make sense in an English UI only
+// anyway. Also a visual indicator that it is a programmatical name, IMHO.
+/* TODO: pulling descriptive names (language, script, country, subtags)
+ * from liblangtag or ISO databases might be nice, but those are English
+ * only. Maybe ICU, that has translations for language and country. */
+return "{" + rBcp47 + "}";
+}
 
 const OUString SvtLanguageTableImpl::GetString( const LanguageType eType, bool 
bUserInterfaceSelection ) const
 {
@@ -185,7 +196,7 @@ const OUString SvtLanguageTableImpl::GetString( const 
LanguageType eType, bool b
 return ResStringArray::GetString( nPos );
 
 //Rather than return a fairly useless "Unknown" name, return a geeky but 
usable-in-a-pinch lang-tag
-OUString sLangTag(LanguageTag::convertToBcp47(eType));
+OUString sLangTag( lcl_getDescription( 
LanguageTag::convertToBcp47(eType)));
 SAL_WARN("svtools.misc", "Language: 0x"
 << std::hex << eType
 << " with unknown name, so returning lang-tag of: "
@@ -259,7 +270,7 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( 
sal_uInt32 nIndex )
 
 sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, 
const OUString& rString )
 {
-return theLanguageTable::get().AddItem( (rString.isEmpty() ? 
rLanguageTag.getBcp47() : rString),
+return theLanguageTable::get().AddItem( (rString.isEmpty() ? 
lcl_getDescription(rLanguageTag.getBcp47()) : rString),
 rLanguageTag.getLanguageType());
 }
 
commit bf63e5a3a6ae458ffe10061c1bcf969a534760c5
Author: Eike Rathke 
Date:   Tue Mar 14 00:03:16 2017 +0100

tdf#100462 inject language tags provided by spell-checkers to language list

... so they are available already at the first instanciation without having 
to
be added manually, depending on which listing is requested.

Change-Id: Idcb8f7fcbc82c757a2b06b8f04b81e88197a0a5b

diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 4a309e2..9292ab5 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -68,6 +68,8 @@ public:
 bool bHasLangNone, bool bLangNoneIsLangAll = false,
 bool bCheckSpellAvail = false );
 
+voidAddLanguages( const css::uno::Sequence< sal_Int16 >& 
rLanguageTypes, SvxLanguageListFlags nLangList );
+
 sal_Int32   InsertLanguage( const LanguageType eLangType );
 voidInsertDefaultLanguage( sal_Int16 nType );
 voidInsertSystemLanguage();
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 60e5278..8839c45 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -174,6 +174,50 @@ SvxLanguageBoxBase::~SvxLanguageBoxBase()
 }
 
 
+bool lcl_isPrerequisite( LanguageType nLangType, SvxLanguageListFlags 
nLangList )
+{
+return
+nLangType != LANGUAGE_DONTKNOW &&
+nLangType != LANGUAGE_SYSTEM &&
+nLangType != LANGUAGE_NONE &&
+!MsLangId::isLegacy( nLangType) &&
+(MsLangId::getSubLanguage( nLangType) ||
+ bool(nLangList & SvxLanguageListFlags::ALSO_PRIMARY_ONLY));
+}
+
+bool lcl_

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

[Noel Grandin]

 sw/source/core/edit/autofmt.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 104d72b00c2c328f63591b26b9e65dd7355649b4
Author: Noel Grandin 
Date:   Tue Mar 14 13:29:59 2017 +0200

remove WITH_ALPHANUM_AS_NUMFMT code

never been used since commit
70de0c38fd177b3c95837118c5fb35e380c87e90
"MWS_SRX644: migrate branch mws_srx644 -> HEAD" in 2003.

Change-Id: I794aa890a222bcffb692db86772f8a1a5e76cb6c

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 65c8d28..fbc2421 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -792,14 +792,7 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTextNode& 
rNd, sal_Int32& rPos,
 
 // Roman numbers are "mdclxvi". Since we want to start numbering 
with c or d more often,
 // convert first to characters and later to roman numbers if 
needed.
-#ifdef WITH_ALPHANUM_AS_NUMFMT
-// detection of 'c' and 'd' a ROMAN numbering should not be done 
here
-if( 256 > cLow  &&( (eScan & (LOWER_ROMAN|UPPER_ROMAN))
-? strchr( "mdclxvi", cLow )
-: strchr( "mlxvi", cLow ) ))
-#else
-if( 256 > cLow  && ( strchr( "mdclxvi", cLow ) ))
-#endif
+if( 256 > cLow  && strchr( "mdclxvi", cLow ) )
 {
 if( bIsUpper )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dev/null|binary
 vcl/qa/cppunit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp |binary
 vcl/source/gdi/dibtools.cxx |3 ++-
 3 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f25cdaf6cba85a6a161755fe5f8067e479ab0414
Author: Caolán McNamara 
Date:   Tue Mar 14 11:18:35 2017 +

ofz: reject broken rle bmps

Change-Id: I1354d4aa4d7e46cd3bf463e3350071aad3ff5674

diff --git 
a/vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp 
b/vcl/qa/cppunit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp
similarity index 100%
rename from vcl/qa/cppunit/graphicfilter/data/bmp/pass/afl-sample-bad-rle-1.bmp
rename to vcl/qa/cppunit/graphicfilter/data/bmp/fail/afl-sample-bad-rle-1.bmp
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 534a50d..1559a6a 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -538,7 +538,8 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, 
BitmapWriteAccess& r
 {
 return false;
 }
-ImplDecodeRLE(pBuffer.get(), rHeader, rAcc, RLE_4 == 
rHeader.nCompression);
+if (!ImplDecodeRLE(pBuffer.get(), rHeader, rAcc, RLE_4 == 
rHeader.nCompression))
+return false;
 }
 else
 {
___
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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf105729.rtf|9 +
 sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper.cxx |6 --
 3 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 2cc5f18d10cf6ef1349d9518e6f67977f7c5d9bf
Author: Miklos Vajna 
Date:   Tue Mar 14 09:38:44 2017 +0100

tdf#105729 RTF import: \ltrpar should not override \qc from style

This is similar to commit 92fd894ea18672cba4cf961bdc4c0bc98f168102
(tdf#94435 RTF import: \ltrpar should not override \qc, 2015-10-05),
except that here the \qc is inherited from the style, it's not a direct
formatting. The problematic code was added in commit
2638faa2e834c2da4c195224fd88d32c29b3d0cc (writerfilter08ooo330: applied
patch for writerfilter08, 2010-07-28), and it's not really clear to me
what is its purpose, given that the DOC import equivalent in
SwWW8ImplReader::Read_ParaBiDi() doesn't set the paragraph alignment.

Fix the situation by not touching the paragraph alignment for the RTF
case at least.

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

diff --git a/sw/qa/extras/rtfimport/data/tdf105729.rtf 
b/sw/qa/extras/rtfimport/data/tdf105729.rtf
new file mode 100644
index 000..996dd37
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf105729.rtf
@@ -0,0 +1,9 @@
+{\rtf1
+{\stylesheet
+{\s16\qc
+Titel 1;}
+}
+\pard\plain \ltrpar\s16\qc
+Centered Title
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 098a210..68d71db 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2797,6 +2797,12 @@ DECLARE_RTFIMPORT_TEST(testTdf104287, "tdf104287.rtf")
 CPPUNIT_ASSERT(xShape->getAnchor().is());
 }
 
+DECLARE_RTFIMPORT_TEST(testTdf105729, "tdf105729.rtf")
+{
+// This was style::ParagraphAdjust_LEFT, \ltrpar undone the effect of \qc 
from style.
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")));
+}
+
 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 8c42966..2c44cbb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1445,12 +1445,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 if (nIntValue != 0)
 {
 rContext->Insert(PROP_WRITING_MODE, uno::makeAny( 
text::WritingMode2::RL_TB ));
-rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( 
style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false);
+if (!IsRTFImport())
+rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( 
style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false);
 }
 else
 {
 rContext->Insert(PROP_WRITING_MODE, uno::makeAny( 
text::WritingMode2::LR_TB ));
-rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( 
style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false);
+if (!IsRTFImport())
+rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( 
style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/vcl/toolbox.hxx   |1 
 vcl/source/window/toolbox.cxx |  215 +-
 2 files changed, 30 insertions(+), 186 deletions(-)

New commits:
commit 5ac443e180c54dee69a65a1569c99afe151f2f97
Author: Stephan Bergmann 
Date:   Tue Mar 14 12:20:07 2017 +0100

ToolBox::mbCustomizeMode is always false

...after b2262e8be35d51cc18afeb60486f19576a81adc0 "callcatcher: remove some
unused methods" (and other clean-up of unused functionality that came 
before)
identified ToolBox::ImplStartCusomizeMode as unused.

Change-Id: Ic2c6720ca5519842796c7e993064aed637503aa2

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 93a8a47..3c4066e 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -148,7 +148,6 @@ private:
 mbScroll:1,
 mbLastFloatMode:1,
 mbCustomize:1,
-mbCustomizeMode:1,
 mbDragging:1,
 mbIsShift:1,
 mbIsKeyEvent:1,
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index f4f1b6c..3d619b7 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -67,11 +67,9 @@
 #define TB_BORDER_OFFSET1   4
 #define TB_BORDER_OFFSET2   2
 #define TB_CUSTOMIZE_OFFSET 2
-#define TB_RESIZE_OFFSET3
 #define TB_MAXLINES 5
 #define TB_MAXNOSCROLL  32765
 
-#define TB_MIN_WIN_WIDTH20
 #define TB_DRAGWIDTH8  // the default width of the drag grip
 
 #define TB_CALCMODE_HORZ1
@@ -101,12 +99,9 @@ private:
 Rectangle   maRect;
 Rectangle   maStartRect;
 Accelerator maAccel;
-longmnMinWidth;
-longmnMaxWidth;
 sal_uInt16  mnLineMode;
 ToolBox::ImplToolItems::size_type mnStartLines;
 void*   mpCustomizeData;
-boolmbResizeMode;
 boolmbShowDragRect;
 
 ImplTBDragMgr(const ImplTBDragMgr&) = delete;
@@ -131,8 +126,7 @@ public:
 
 ToolBox*FindToolBox( const Rectangle& rRect );
 
-voidStartDragging( ToolBox* pDragBox, const Point& rPos, const 
Rectangle& rRect, sal_uInt16 nLineMode,
-   bool bResizeItem );
+voidStartDragging( ToolBox* pDragBox, const Point& rPos, const 
Rectangle& rRect, sal_uInt16 nLineMode );
 voidDragging( const Point& rPos );
 voidEndDragging( bool bOK = true );
 voidHideDragRect() { if ( mbShowDragRect ) 
mpDragBox->HideTracking(); }
@@ -1130,12 +1124,9 @@ sal_uInt16 ToolBox::ImplFindItemPos( const Point& rPos ) 
const
 ImplTBDragMgr::ImplTBDragMgr()
 : mpBoxList(new ImplTBList)
 , mpDragBox(nullptr)
-, mnMinWidth(0)
-, mnMaxWidth(0)
 , mnLineMode(0)
 , mnStartLines(0)
 , mpCustomizeData(nullptr)
-, mbResizeMode(false)
 , mbShowDragRect(false)
 {
 maAccel.InsertItem( KEY_RETURN, vcl::KeyCode( KEY_RETURN ) );
@@ -1174,7 +1165,7 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& 
rRect )
 
 void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
const Point& rPos, const Rectangle& rRect,
-   sal_uInt16 nDragLineMode, bool bResizeItem )
+   sal_uInt16 nDragLineMode )
 {
 mpDragBox = pToolBox;
 pToolBox->CaptureMouse();
@@ -1189,20 +1180,10 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
 else
 {
 mpCustomizeData = nullptr;
-mbResizeMode = bResizeItem;
 pToolBox->Activate();
 pToolBox->mnCurItemId = pToolBox->mnConfigItem;
 pToolBox->Highlight();
 pToolBox->mnCurItemId = 0;
-if ( mbResizeMode )
-{
-if ( rRect.GetWidth() < TB_MIN_WIN_WIDTH )
-mnMinWidth = rRect.GetWidth();
-else
-mnMinWidth = TB_MIN_WIN_WIDTH;
-mnMaxWidth = pToolBox->GetSizePixel().Width()-rRect.Left()-
- TB_SPIN_SIZE-TB_BORDER_OFFSET1-(TB_SPIN_OFFSET*2);
-}
 }
 
 // MouseOffset berechnen
@@ -1227,21 +1208,8 @@ void ImplTBDragMgr::Dragging( const Point& rPos )
 }
 else
 {
-if ( mbResizeMode )
-{
-long nXOff = rPos.X()-maStartRect.Left();
-nXOff += maMouseOff.X()+(maStartRect.Right()-maStartRect.Left());
-if ( nXOff < mnMinWidth )
-nXOff = mnMinWidth;
-if ( nXOff > mnMaxWidth )
-nXOff = mnMaxWidth;
-maRect.Right() = maStartRect.Left()+nXOff;
-}
-else
-{
-maRect.SetPos( rPos );
-maRect.Move( maMouseOff.X(), maMouseOff.Y() );
-}
+maRect.SetPos( rPos );
+maRect.Move( maMouseOff.X(), maMouseOff.Y() );
 mpDragBox->ShowT

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

[Caolán McNamara]

 vcl/source/gdi/svmconverter.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b36c2961b279c8e8b96b1c6d9682e59eeac3854a
Author: Caolán McNamara 
Date:   Tue Mar 14 10:26:35 2017 +

ofz: reject invalid mapmodes early

Change-Id: I7fae0eb980b6dc655254da8b401fc1e71a4e65cf

diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 2cadb22..1b2a8a8 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -165,6 +165,12 @@ bool ImplReadMapMode(SvStream& rIStm, MapMode& rMapMode)
 return false;
 }
 
+if (nUnit < sal_Int16(MapUnit::Map100thMM) || nUnit > 
sal_Int16(MapUnit::LAST))
+{
+SAL_WARN("vcl.gdi", "Parsing error: invalid mapmode");
+return false;
+}
+
 rMapMode = MapMode( (MapUnit) nUnit, aOrg, Fraction( nXNum, nXDenom ), 
Fraction( nYNum, nYDenom ) );
 
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sd/qa/unit/tiledrendering/tiledrendering.cxx |   17 +
 sd/source/ui/view/Outliner.cxx   |   10 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

New commits:
commit 986ab0b771e8e921d132059fda4971b18064c1aa
Author: Jan Holesovsky 
Date:   Mon Mar 13 19:03:48 2017 +0100

sd lok: Don't search on master pages & notes in Impress.

Change-Id: I43ed9f53618dca09e0289bffadc2c05056e0eebb
Reviewed-on: https://gerrit.libreoffice.org/35149
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 10fb24b..58e146a 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -72,6 +72,7 @@ public:
 void testSearchAllSelections();
 void testSearchAllNotifications();
 void testSearchAllFollowedBySearch();
+void testDontSearchInMasterPages();
 void testInsertDeletePage();
 void testInsertTable();
 void testPartHash();
@@ -106,6 +107,7 @@ public:
 CPPUNIT_TEST(testSearchAllSelections);
 CPPUNIT_TEST(testSearchAllNotifications);
 CPPUNIT_TEST(testSearchAllFollowedBySearch);
+CPPUNIT_TEST(testDontSearchInMasterPages);
 CPPUNIT_TEST(testInsertDeletePage);
 CPPUNIT_TEST(testInsertTable);
 CPPUNIT_TEST(testPartHash);
@@ -624,6 +626,21 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
 CPPUNIT_ASSERT_EQUAL(OString("match"), 
pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
 }
 
+void SdTiledRenderingTest::testDontSearchInMasterPages()
+{
+comphelper::LibreOfficeKit::setActive();
+SdXImpressDocument* pXImpressDocument = createDoc("dummy.odp");
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+
pViewShell->GetViewShellBase().registerLibreOfficeKitViewCallback(&SdTiledRenderingTest::callback,
 this);
+
+// This should trigger the not-found callback ("date" is present only on
+// the master page)
+lcl_search("date");
+CPPUNIT_ASSERT_EQUAL(false, m_bFound);
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 namespace
 {
 
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 55f0f37..0858912 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1073,8 +1073,12 @@ void SdOutliner::ProvideNextTextObject()
 if (maObjectIterator != sd::outliner::OutlinerContainer(this).end())
 {
 maCurrentPosition = *maObjectIterator;
+
+// LOK: do not descent to notes or master pages when searching
+bool bForbiddenPage = comphelper::LibreOfficeKit::isActive() && 
(maCurrentPosition.mePageKind != PageKind::Standard || 
maCurrentPosition.meEditMode != EditMode::Page);
+
 // Switch to the current object only if it is a valid text object.
-if (IsValidTextObject (maCurrentPosition))
+if (!bForbiddenPage && IsValidTextObject(maCurrentPosition))
 {
 // Don't set yet in case of searching: the text object may not 
match.
 if (meMode != SEARCH)
@@ -1084,9 +1088,9 @@ void SdOutliner::ProvideNextTextObject()
 }
 ++maObjectIterator;
 
-if (mpObj != nullptr)
+if (mpObj)
 {
-PutTextIntoOutliner ();
+PutTextIntoOutliner();
 
 std::shared_ptr pViewShell 
(mpWeakViewShell.lock());
 if (pViewShell != nullptr)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 hwpfilter/source/hwpfile.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 65dcd1d8195069c8c8acb3a188b8e5616c51029c
Author: Caolán McNamara 
Date:   Tue Mar 14 09:19:50 2017 +

ofz#860 clear old data before reading new data

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

diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index f4f96dc..90fdfdb 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -357,6 +357,8 @@ void HWPFile::TagsRead()
 return;
  }
 
+ _hwpInfo.back_info.data.clear();
+
  //read potentially compressed data in blocks as its more
  //likely large values are simply broken and we'll run out
  //of data before we need to realloc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens]

 sc/source/ui/unoobj/viewuno.cxx |   95 +++-
 1 file changed, 47 insertions(+), 48 deletions(-)

New commits:
commit 42f2a87520153981e918e4bccf3410c382fb52d4
Author: Katarina Behrens 
Date:   Thu Feb 23 11:56:25 2017 +0100

Translate some German comments in sc

Change-Id: Ia6f2cc3a85f81c4853beea7a9f7b267a7fe89285

diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index cd626b2..3ed0583 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -74,9 +74,9 @@
 
 using namespace com::sun::star;
 
-//! Clipping-Markierungen
+//! Clipping Marks
 
-//  alles ohne Which-ID, Map nur fuer PropertySetInfo
+//  no Which-ID here, Map only for PropertySetInfo
 
 static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
 {
@@ -190,7 +190,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn()
 
 return rViewData.GetPosX( eWhichH );
 }
-OSL_FAIL("keine View ?!?"); //! Exception?
+OSL_FAIL("no View ?!?"); //! Exception?
 return 0;
 }
 
@@ -223,7 +223,7 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow()
 
 return rViewData.GetPosY( eWhichV );
 }
-OSL_FAIL("keine View ?!?"); //! Exception?
+OSL_FAIL("no View ?!?"); //! Exception?
 return 0;
 }
 
@@ -256,13 +256,13 @@ table::CellRangeAddress SAL_CALL 
ScViewPaneBase::getVisibleRange()
 ScHSplitPos eWhichH = WhichH( eWhich );
 ScVSplitPos eWhichV = WhichV( eWhich );
 
-//  VisibleCellsX gibt nur komplett sichtbare Zellen,
-//  VisibleRange in Excel auch teilweise sichtbare.
-//! anpassen ???
+//  VisibleCellsX returns only completely visible cells
+//  VisibleRange in Excel also partially visible ones
+//! do the same ???
 
 SCCOL nVisX = rViewData.VisibleCellsX( eWhichH );
 SCROW nVisY = rViewData.VisibleCellsY( eWhichV );
-if (!nVisX) nVisX = 1;  // irgendwas muss ja im Range sein
+if (!nVisX) nVisX = 1;  // there has to be something in the range
 if (!nVisY) nVisY = 1;
 aAdr.Sheet   = rViewData.GetTabNo();
 aAdr.StartColumn = rViewData.GetPosX( eWhichH );
@@ -282,7 +282,7 @@ uno::Reference SAL_CALL 
ScViewPaneBase::getReferredCells()
 {
 ScDocShell* pDocSh = pViewShell->GetViewData().GetDocShell();
 
-table::CellRangeAddress aAdr(getVisibleRange());//! 
Hilfsfunktion mit ScRange?
+table::CellRangeAddress aAdr(getVisibleRange());//! helper 
function with ScRange?
 ScRange aRange( (SCCOL)aAdr.StartColumn, (SCROW)aAdr.StartRow, 
aAdr.Sheet,
 (SCCOL)aAdr.EndColumn, (SCROW)aAdr.EndRow, aAdr.Sheet 
);
 if ( aRange.aStart == aRange.aEnd )
@@ -436,7 +436,7 @@ void SAL_CALL ScViewPaneObj::release() throw()
 OWeakObject::release();
 }
 
-//  Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
+//  We need default ctor for SMART_REFLECTION_IMPLEMENTATION
 
 ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
 ScViewPaneBase( pViewSh, SC_VIEWPANE_ACTIVE ),
@@ -456,7 +456,7 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
 
 ScTabViewObj::~ScTabViewObj()
 {
-//! Listening oder so
+//! Listening or something along that line
 if (!aMouseClickHandlers.empty())
 {
 acquire();
@@ -707,13 +707,13 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& 
aSelection )
 uno::Reference xShapeSel( xInterface, uno::UNO_QUERY );
 SvxShape* pShapeImp = SvxShape::getImplementation( xShapeSel );
 
-if (pRangesImp) // Zell-Ranges
+if (pRangesImp) // Cell ranges
 {
 ScViewData& rViewData = pViewSh->GetViewData();
 if ( rViewData.GetDocShell() == pRangesImp->GetDocShell() )
 {
-//  Zuerst evtl. Drawing-Selektion aufheben
-//  (MarkListHasChanged hebt Tabellen-Selektion auf)
+//  perhaps remove drawing selection first
+//  (MarkListHasChanged removes sheet selection)
 
 ScDrawView* pDrawView = pViewSh->GetScDrawView();
 if (pDrawView)
@@ -724,15 +724,15 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& 
aSelection )
 FuPoor* pFunc = pViewSh->GetDrawFuncPtr();
 if ( pFunc && pFunc->GetSlotID() != SID_OBJECT_SELECT )
 {
-//  Slot der Zeichenfunktion nochmal ausfuehren -> abschalten
+//  execute the slot of drawing function again -> switch off
 SfxDispatcher* pDisp = pViewSh->GetDispatcher();
 if (pDisp)
 pDisp->Execute( pFunc->GetSlotID(), SfxCallMode::SYNCHRON 
);
 }
 pViewSh->SetDrawShell(false);
-pViewSh->SetDrawSelMode(false); // nach dem Dispatcher-Execute
+pViewSh->SetDrawSelMode(false); // after Dispatche

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

[Tor Lillqvist]

 chart2/source/view/main/GL3DRenderer.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a203e8112090b384b17679e22852ed2ae6eb30a8
Author: Tor Lillqvist 
Date:   Tue Mar 14 10:43:39 2017 +0200

Revert "loplugin:implicitboolconversion"

This is not needed; the problem was in the Fedora 25 epoxy headers:
They got badly broken in an update, and should not be used from C++
code. If you use Fedora 25, make sure to use --without-system-epoxy
for now. See https://bugzilla.redhat.com/show_bug.cgi?id=1431994

This reverts commit cbb2e6b76868d5c67a713b68310b44be59bfab3e.

Change-Id: I55c77ff279f1716004ac77cd3a08c4bb3fdf644b

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index d629681..c00bd18 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -934,7 +934,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& 
polygon)
 float maxCoordX = m_fMinCoordX + m_fMaxCoordX;
 glUniform1fv(maResources.m_3DMinCoordXID, 1, &minCoordX);
 glUniform1fv(maResources.m_3DMaxCoordXID, 1, &maxCoordX);
-glUniform1i(maResources.m_3DUndrawID, 
static_cast(m_bUndrawFlag));
+glUniform1i(maResources.m_3DUndrawID, m_bUndrawFlag);
 CHECK_GL_ERROR();
 //update light information
 glUniform4fv(maResources.m_3DLightColorID, m_iLightNum, 
reinterpret_cast(m_LightColor));
@@ -948,7 +948,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& 
polygon)
 glUniform4fv(maResources.m_3DMaterialDiffuseID, 1, 
&polygon.material.diffuse[0]);
 glUniform4fv(maResources.m_3DMaterialSpecularID, 1, 
&polygon.material.specular[0]);
 glUniform4fv(maResources.m_3DMaterialColorID, 1, 
&polygon.material.materialColor[0]);
-glUniform1i(maResources.m_3DMaterialTwoSidesID, 
static_cast(polygon.material.twoSidesLighting));
+glUniform1i(maResources.m_3DMaterialTwoSidesID, 
polygon.material.twoSidesLighting);
 glUniform1f(maResources.m_3DMaterialShininessID, 
polygon.material.shininess);
 CHECK_GL_ERROR();
 }
@@ -1619,7 +1619,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
 {
 glUniform1fv(maResources.m_3DMinCoordXID, 1, &m_fMinCoordX);
 glUniform1fv(maResources.m_3DMaxCoordXID, 1, &m_fMaxCoordX);
-glUniform1i(maResources.m_3DUndrawID, 
static_cast(m_bUndrawFlag));
+glUniform1i(maResources.m_3DUndrawID, m_bUndrawFlag);
 //update light information
 glUniform4fv(maResources.m_3DLightColorID, m_iLightNum, 
reinterpret_cast(m_LightColor));
 glUniform4fv(maResources.m_3DLightPosID, m_iLightNum, 
reinterpret_cast(m_PositionWorldspace));
@@ -1680,7 +1680,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
 glUniform4fv(maResources.m_3DMaterialDiffuseID, 1, 
&extrude3DInfo.material.diffuse[0]);
 glUniform4fv(maResources.m_3DMaterialSpecularID, 1, 
&extrude3DInfo.material.specular[0]);
 glUniform4fv(maResources.m_3DMaterialColorID, 1, 
&extrude3DInfo.material.materialColor[0]);
-glUniform1i(maResources.m_3DMaterialTwoSidesID, 
static_cast(extrude3DInfo.material.twoSidesLighting));
+glUniform1i(maResources.m_3DMaterialTwoSidesID, 
extrude3DInfo.material.twoSidesLighting);
 glUniform1f(maResources.m_3DMaterialShininessID, 
extrude3DInfo.material.shininess);
 }
 }
@@ -2501,7 +2501,7 @@ void OpenGL3DRenderer::RenderBatchBars(bool bNewScene)
 {
 glUniform1fv(maResources.m_3DBatchMinCoordXID, 1, &m_fMinCoordX);
 glUniform1fv(maResources.m_3DBatchMaxCoordXID, 1, &m_fMaxCoordX);
-glUniform1i(maResources.m_3DBatchUndrawID, 
static_cast(m_bUndrawFlag));
+glUniform1i(maResources.m_3DBatchUndrawID, m_bUndrawFlag);
 glUniformMatrix4fv(maResources.m_3DBatchTransMatrixID, 1, GL_FALSE, 
&m_ScrollMoveMatrix[0][0]);
 }
 glUniformMatrix4fv(maResources.m_3DBatchViewID, 1, GL_FALSE, 
&m_3DView[0][0]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 7 commits - include/vcl sd/source sw/source vcl/source

[Miklos Vajna]

 include/vcl/pdfextoutdevdata.hxx|   10 +
 include/vcl/pdfwriter.hxx   |9 +
 sd/source/ui/unoidl/unomodel.cxx|   19 +++
 sw/source/core/text/EnhancedPDFExportHelper.cxx |   43 ++-
 vcl/source/gdi/pdfextoutdevdata.cxx |   56 +
 vcl/source/gdi/pdfwriter.cxx|   16 ++
 vcl/source/gdi/pdfwriter_impl.cxx   |  146 
 vcl/source/gdi/pdfwriter_impl.hxx   |   37 --
 8 files changed, 323 insertions(+), 13 deletions(-)

New commits:
commit 8012b806c545f9c1e9a37205848adca7db66a2e6
Author: Miklos Vajna 
Date:   Thu Jan 5 10:55:57 2017 +0100

Related: tdf#105093 sw PDF export: handle embedded videos

Use vcl::PDFExtOutDevData::SetScreenStream() for embedded media to make
sure that vnd.sun.star.Package: URLs don't end up in PDF out literally.
Acrobat Reader obviously doesn't understand that protocol.

Change-Id: I384891b3ef2dcea25bbf591bd210ccf899d30a61
(cherry picked from commit 46153bdcf2f89e88607dfb0dd0003108796424e9)

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index ce971f3..993935d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1813,7 +1813,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 }
 else if (pFrameFormat->Which() == RES_DRAWFRMFMT)
 {
-// Handle linked videos.
+// Turn media shapes into Screen annotations.
 if (SdrObject* pObject = pFrameFormat->FindRealSdrObject())
 {
 SwRect aSnapRect = pObject->GetSnapRect();
@@ -1834,7 +1834,16 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 for (sal_Int32 nScreenPageNum : aScreenPageNums)
 {
 sal_Int32 nScreenId = 
pPDFExtOutDevData->CreateScreen(aPDFRect, nScreenPageNum);
-pPDFExtOutDevData->SetScreenURL(nScreenId, 
aMediaURL);
+if 
(aMediaURL.startsWith("vnd.sun.star.Package:"))
+{
+// Embedded media.
+OUString aTempFileURL;
+
xShapePropSet->getPropertyValue("PrivateTempFileURL") >>= aTempFileURL;
+
pPDFExtOutDevData->SetScreenStream(nScreenId, aTempFileURL);
+}
+else
+// Linked media.
+pPDFExtOutDevData->SetScreenURL(nScreenId, 
aMediaURL);
 }
 }
 }
commit 35941f2d670a6b197980f226343419cdd729560d
Author: Miklos Vajna 
Date:   Wed Jan 4 17:41:07 2017 +0100

Related: tdf#105093 sd PDF export: handle css.presentation.MediaShape as 
well

It's exactly the same as css.drawing.MediaShape in this context.

Change-Id: I4be114ef731e85222f0dd1d897f646ad8da3849d
(cherry picked from commit 64d80d22851a38eb3f320f4e2b2bdf875da4d8b4)

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c71b4b7..7791e41 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1669,7 +1669,7 @@ void ImplPDFExportShapeInteraction( const uno::Reference< 
drawing::XShape >& xSh
 Rectangle   aLinkRect( Point( aShapePos.X, aShapePos.Y ), Size( 
aShapeSize.Width, aShapeSize.Height ) );
 
 // Handle linked videos.
-if (xShape->getShapeType() == "com.sun.star.drawing.MediaShape")
+if (xShape->getShapeType() == "com.sun.star.drawing.MediaShape" || 
xShape->getShapeType() == "com.sun.star.presentation.MediaShape")
 {
 OUString aMediaURL;
 xShapePropSet->getPropertyValue("MediaURL") >>= aMediaURL;
commit 62ae0997ac331dea2cc7837ca2320cf49d3eb6b3
Author: Miklos Vajna 
Date:   Wed Jan 4 15:28:41 2017 +0100

tdf#105093 sd PDF export: handle embedded videos

In practie embedded files always have a temp file URL, so from the PDF
export's point of view they are still URLs, just at the end the contents
of the URL is embedded to the PDF, not just the URL itself.

So add a SetScreenStream() that's similar to SetScreenURL(), but it's
for embedded, not linked videos.

Change-Id: Ifcc60357ef0f5fed0bdec02e0c84cb16ee147781
Reviewed-on: https://gerrit.libreoffice.org/32727
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 4ad249af88d15f2c8a09f0721a59d82718fcc201)

diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx
index e3a05d9..566ff2a 100644
--- a/include/vcl/

[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/inc basctl/source bin/find-unused-rid.py cui/source dbaccess/source desktop/source editeng/source extensions/source forms/

[Noel Grandin]

 accessibility/inc/helper/accessiblestrings.hrc  |3 
 accessibility/source/helper/accessiblestrings.src   |   14 -
 basctl/inc/basidesh.hrc |   15 -
 basctl/source/basicide/basidesh.src |   60 --
 bin/find-unused-rid.py  |  103 +++
 cui/source/customize/cfg.src|   14 -
 cui/source/customize/macropg.src|   20 --
 cui/source/dialogs/hyperdlg.src |5 
 cui/source/dialogs/passwdomdlg.src  |5 
 cui/source/dialogs/scriptdlg.src|   17 -
 cui/source/inc/cuires.hrc   |   24 --
 cui/source/options/optchart.src |5 
 cui/source/options/personalization.src  |5 
 cui/source/tabpages/strings.src |   24 --
 dbaccess/source/core/inc/core_resource.hrc  |4 
 dbaccess/source/core/resource/strings.src   |   20 --
 dbaccess/source/ui/app/app.src  |5 
 dbaccess/source/ui/app/dbu_app.hrc  |1 
 dbaccess/source/ui/browser/sbabrw.src   |5 
 dbaccess/source/ui/inc/dbu_brw.hrc  |1 
 dbaccess/source/ui/inc/dbu_qry.hrc  |2 
 dbaccess/source/ui/querydesign/query.src|   10 -
 desktop/source/deployment/registry/script/dp_script.hrc |1 
 desktop/source/deployment/registry/script/dp_script.src |5 
 editeng/source/items/svxitems.src   |   54 -
 editeng/source/misc/lingu.src   |4 
 editeng/source/outliner/outliner.src|4 
 extensions/source/abpilot/abpresid.hrc  |   11 -
 extensions/source/bibliography/bib.hrc  |2 
 extensions/source/bibliography/bib.src  |9 
 extensions/source/dbpilots/dbpresid.hrc |   11 -
 forms/source/inc/frm_resource.hrc   |3 
 forms/source/resource/xforms.src|   15 -
 fpicker/source/office/OfficeFilePicker.hrc  |1 
 include/editeng/editrids.hrc|   20 --
 include/sfx2/dialogs.hrc|3 
 include/sfx2/sfx.hrc|3 
 include/svx/dialogs.hrc |   63 --
 include/svx/fmresids.hrc|   10 -
 include/svx/svxitems.hrc|   45 
 reportdesign/inc/RptResId.hrc   |   13 -
 reportdesign/source/core/inc/core_resource.hrc  |3 
 reportdesign/source/core/resource/strings.src   |5 
 reportdesign/source/ui/report/report.src|   57 --
 sc/inc/sc.hrc   |3 
 sc/inc/scres.hrc|7 
 sc/source/ui/inc/filter.hrc |4 
 sc/source/ui/src/filter.src |   16 -
 sfx2/inc/app.hrc|3 
 sfx2/inc/doc.hrc|1 
 sfx2/source/appl/app.src|   13 -
 sfx2/source/sidebar/Sidebar.hrc |2 
 starmath/inc/starmath.hrc   |   17 -
 starmath/source/commands.src|   35 ---
 svx/inc/accessibility.hrc   |2 
 svx/inc/gallery.hrc |   19 --
 svx/source/accessibility/accessibility.src  |8 
 svx/source/dialog/sdstring.src  |   26 --
 svx/source/engine3d/float3d.src |5 
 svx/source/engine3d/string3d.src|   24 --
 svx/source/form/datanavi.src|   20 --
 svx/source/form/fmstring.src|   32 ---
 svx/source/gallery2/gallery.src |   77 
 svx/source/items/svxitems.src   |  147 
 svx/source/tbxctrls/tbcontrl.src|5 
 sw/source/uibase/inc/ribbar.hrc |4 
 66 files changed, 104 insertions(+), 1070 deletions(-)

New commits:
commit f645294d3959ab204ac0efb6619e74b5ba85efa6
Author: Noel Grandin 
Date:   Mon Mar 13 14:33:47 2017 +0200

remove unused RID constants

found with the attached bin/find-unused-rid.py script

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

diff --git a/accessibility/inc/helper/accessiblestrings.hrc 
b/accessibility/inc/helper/accessiblestrings.hrc
index f957ab9..780e0b5 100644
--- a/accessibility/inc

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

[Tor Lillqvist]

 chart2/source/view/main/GL3DRenderer.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit cbb2e6b76868d5c67a713b68310b44be59bfab3e
Author: Tor Lillqvist 
Date:   Tue Mar 14 10:27:22 2017 +0200

loplugin:implicitboolconversion

For some reason this was not detected earlier, but now when the epoxy
headers in f25 were updated, it is.

Change-Id: I7be830153792414b0f913aaaecb2a1336ebf6fce

diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index c00bd18..d629681 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -934,7 +934,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& 
polygon)
 float maxCoordX = m_fMinCoordX + m_fMaxCoordX;
 glUniform1fv(maResources.m_3DMinCoordXID, 1, &minCoordX);
 glUniform1fv(maResources.m_3DMaxCoordXID, 1, &maxCoordX);
-glUniform1i(maResources.m_3DUndrawID, m_bUndrawFlag);
+glUniform1i(maResources.m_3DUndrawID, 
static_cast(m_bUndrawFlag));
 CHECK_GL_ERROR();
 //update light information
 glUniform4fv(maResources.m_3DLightColorID, m_iLightNum, 
reinterpret_cast(m_LightColor));
@@ -948,7 +948,7 @@ void OpenGL3DRenderer::RenderPolygon3D(const Polygon3DInfo& 
polygon)
 glUniform4fv(maResources.m_3DMaterialDiffuseID, 1, 
&polygon.material.diffuse[0]);
 glUniform4fv(maResources.m_3DMaterialSpecularID, 1, 
&polygon.material.specular[0]);
 glUniform4fv(maResources.m_3DMaterialColorID, 1, 
&polygon.material.materialColor[0]);
-glUniform1i(maResources.m_3DMaterialTwoSidesID, 
polygon.material.twoSidesLighting);
+glUniform1i(maResources.m_3DMaterialTwoSidesID, 
static_cast(polygon.material.twoSidesLighting));
 glUniform1f(maResources.m_3DMaterialShininessID, 
polygon.material.shininess);
 CHECK_GL_ERROR();
 }
@@ -1619,7 +1619,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
 {
 glUniform1fv(maResources.m_3DMinCoordXID, 1, &m_fMinCoordX);
 glUniform1fv(maResources.m_3DMaxCoordXID, 1, &m_fMaxCoordX);
-glUniform1i(maResources.m_3DUndrawID, m_bUndrawFlag);
+glUniform1i(maResources.m_3DUndrawID, 
static_cast(m_bUndrawFlag));
 //update light information
 glUniform4fv(maResources.m_3DLightColorID, m_iLightNum, 
reinterpret_cast(m_LightColor));
 glUniform4fv(maResources.m_3DLightPosID, m_iLightNum, 
reinterpret_cast(m_PositionWorldspace));
@@ -1680,7 +1680,7 @@ void OpenGL3DRenderer::RenderExtrude3DObject()
 glUniform4fv(maResources.m_3DMaterialDiffuseID, 1, 
&extrude3DInfo.material.diffuse[0]);
 glUniform4fv(maResources.m_3DMaterialSpecularID, 1, 
&extrude3DInfo.material.specular[0]);
 glUniform4fv(maResources.m_3DMaterialColorID, 1, 
&extrude3DInfo.material.materialColor[0]);
-glUniform1i(maResources.m_3DMaterialTwoSidesID, 
extrude3DInfo.material.twoSidesLighting);
+glUniform1i(maResources.m_3DMaterialTwoSidesID, 
static_cast(extrude3DInfo.material.twoSidesLighting));
 glUniform1f(maResources.m_3DMaterialShininessID, 
extrude3DInfo.material.shininess);
 }
 }
@@ -2501,7 +2501,7 @@ void OpenGL3DRenderer::RenderBatchBars(bool bNewScene)
 {
 glUniform1fv(maResources.m_3DBatchMinCoordXID, 1, &m_fMinCoordX);
 glUniform1fv(maResources.m_3DBatchMaxCoordXID, 1, &m_fMaxCoordX);
-glUniform1i(maResources.m_3DBatchUndrawID, m_bUndrawFlag);
+glUniform1i(maResources.m_3DBatchUndrawID, 
static_cast(m_bUndrawFlag));
 glUniformMatrix4fv(maResources.m_3DBatchTransMatrixID, 1, GL_FALSE, 
&m_ScrollMoveMatrix[0][0]);
 }
 glUniformMatrix4fv(maResources.m_3DBatchViewID, 1, GL_FALSE, 
&m_3DView[0][0]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source drawinglayer/source include/editeng include/svx include/xmloff sc/source sfx2/source svx/source sw/inc sw/sdi sw/source vcl/source xmloff/inc xmloff/source

[Noel Grandin]

 cui/source/factory/dlgfact.cxx|1 
 cui/source/factory/dlgfact.hxx|2 
 cui/source/inc/page.hxx   |6 -
 cui/source/tabpages/bbdlg.cxx |5 -
 cui/source/tabpages/page.cxx  |   53 +++---
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx |2 
 include/editeng/brushitem.hxx |2 
 include/svx/hdft.hxx  |1 
 include/svx/pagectrl.hxx  |3 
 include/svx/svxdlg.hxx|2 
 include/svx/svxids.hrc|1 
 include/svx/unobrushitemhelper.hxx|2 
 include/xmloff/PageMasterStyleMap.hxx |6 -
 include/xmloff/prstylei.hxx   |   10 +-
 include/xmloff/xmltypes.hxx   |1 
 sc/source/core/data/documen9.cxx  |4 -
 sfx2/source/dialog/tabdlg.cxx |2 
 svx/source/dialog/hdft.cxx|   31 +++-
 svx/source/dialog/pagectrl.cxx|8 --
 svx/source/unodraw/unobrushitemhelper.cxx |4 -
 sw/inc/doc.hxx|2 
 sw/inc/format.hxx |6 -
 sw/inc/frmfmt.hxx |4 -
 sw/inc/hintids.hxx|2 
 sw/inc/ndtxt.hxx  |4 -
 sw/inc/node.hxx   |3 
 sw/inc/swatrset.hxx   |2 
 sw/inc/swunohelper.hxx|6 -
 sw/inc/unomap.hxx |2 
 sw/inc/unoprnms.hxx   |2 
 sw/sdi/_frmsh.sdi |   13 ---
 sw/source/core/access/accpara.cxx |2 
 sw/source/core/attr/format.cxx|   21 ++---
 sw/source/core/attr/swatrset.cxx  |6 -
 sw/source/core/bastyp/init.cxx|6 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx   |6 -
 sw/source/core/doc/DocumentDrawModelManager.cxx   |   40 --
 sw/source/core/doc/DocumentStylePoolManager.cxx   |2 
 sw/source/core/doc/docdesc.cxx|4 -
 sw/source/core/doc/docfly.cxx |2 
 sw/source/core/doc/docfmt.cxx |2 
 sw/source/core/doc/docnew.cxx |3 
 sw/source/core/doc/notxtfrm.cxx   |6 -
 sw/source/core/doc/poolfmt.cxx|2 
 sw/source/core/docnode/node.cxx   |1 
 sw/source/core/inc/frame.hxx  |2 
 sw/source/core/layout/atrfrm.cxx  |9 --
 sw/source/core/layout/findfrm.cxx |1 
 sw/source/core/layout/frmtool.cxx |5 -
 sw/source/core/layout/paintfrm.cxx|   21 +
 sw/source/core/layout/wsfrm.cxx   |2 
 sw/source/core/text/inftxt.cxx|5 -
 sw/source/core/txtnode/fntcache.cxx   |2 
 sw/source/core/txtnode/ndtxt.cxx  |7 -
 sw/source/core/undo/rolbck.cxx|2 
 sw/source/core/unocore/swunohelper.cxx|3 
 sw/source/core/unocore/unoframe.cxx   |   37 +++--
 sw/source/core/unocore/unomap1.cxx|   36 -
 sw/source/core/unocore/unomapproperties.hxx   |5 -
 sw/source/core/unocore/unoparagraph.cxx   |   12 +--
 sw/source/core/unocore/unostyle.cxx   |   53 ++
 sw/source/ui/chrdlg/pardlg.cxx|8 +-
 sw/source/ui/fmtui/tmpdlg.cxx |   18 ++--
 sw/source/ui/frmdlg/frmdlg.cxx|   18 +---
 sw/source/uibase/app/docst.cxx|3 
 sw/source/uibase/app/docstyle.cxx |   15 +--
 sw/source/uibase/frmdlg/colex.cxx |   15 +--
 sw/source/uibase/frmdlg/frmmgr.cxx|2 
 sw/source/uibase/inc/frmsh.hxx|2 
 sw/source/uibase/shells/basesh.cxx|6 -
 sw/source/uibase/shells/frmsh.cxx |   12 +--
 sw/source/uibase/shells/grfsh.cxx |8 +-
 sw/source/uibase/shells/textsh1.cxx 

Re: Umang Jain license statement

[Umang Jain]

Thanks Jan.
I should have noticed the status of the bug instead of "committer" and
commit hash.

Cheers,
uajain

I didn't notice the "Status"
On Tue, Mar 14, 2017 at 1:47 PM, Jan Iversen 
wrote:

>
>
> I have submitted a patch https://gerrit.libreoffice.org/#/c/35150/ but I
> am not sure whether it's merged or not. It is just because I cannot see my
> commit in the libreoffice master tree.
>
> Click on the link and see the status “waiting for review”, when in master
> it will have status “merged” :-)
>
>
> I am new to gerrit in general. :)
>
> Sometimes it is good just to try.
>
> rgds
> jan I.
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Umang Jain license statement

[Jan Iversen]

> 
> I have submitted a patch https://gerrit.libreoffice.org/#/c/35150/ 
>  but I am not sure whether it's 
> merged or not. It is just because I cannot see my commit in the libreoffice 
> master tree.
Click on the link and see the status “waiting for review”, when in master it 
will have status “merged” :-)

> 
> I am new to gerrit in general. :)
> 
Sometimes it is good just to try.

rgds
jan I.

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

Re: Umang Jain license statement

[Umang Jain]

Thank you for such a welcoming reply.

I have submitted a patch https://gerrit.libreoffice.org/#/c/35150/ but I am
not sure whether it's merged or not. It is just because I cannot see my
commit in the libreoffice master tree.

I am new to gerrit in general. :)

On Tue, Mar 14, 2017 at 1:23 PM, Jan Iversen 
wrote:

> WELCOME
> Thanks for your license statement.
>
> We suggest you add yourself to our wiki (remark this is not a demand)
> https://wiki.documentfoundation.org/Development/Developers
>
> If you want help to get started or have any questions, then please contact
> me. I am here to help you (and others) in getting their first patch
> submitted.
>
> LibreOffice is a very big program and getting it built, setting up gerrit,
> and getting the first patch right can be a bit challenging, therefore do
> not hesitate to email me if you want help.
>
> We have made a step by step guide to help you get started:
> https://wiki.documentfoundation.org/Development/GetInvolved
>
> rgds
> Jan Iversen.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source editeng/source include/editeng include/svx sc/source sw/source

[Jochen Nitschke]

 cui/source/tabpages/page.cxx |6 +++---
 cui/source/tabpages/paragrph.cxx |2 +-
 editeng/source/items/frmitems.cxx|   14 +++---
 include/editeng/frmdiritem.hxx   |9 ++---
 include/svx/frmdirlbox.hxx   |2 +-
 sc/source/filter/excel/xestyle.cxx   |2 +-
 sw/source/core/doc/docdraw.cxx   |9 ++---
 sw/source/ui/table/tabledlg.cxx  |   15 ---
 sw/source/uibase/shells/annotsh.cxx  |2 ++
 sw/source/uibase/shells/drwtxtex.cxx |2 ++
 sw/source/uibase/shells/txtattr.cxx  |2 +-
 11 files changed, 34 insertions(+), 31 deletions(-)

New commits:
commit 250995d2b8d8ad544110d3daeb2f61089bff0aa5
Author: Jochen Nitschke 
Date:   Tue Mar 14 08:00:33 2017 +0100

change SvxFrameDirectionItem base to SfxEnumItem

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

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 81b367b..d85c1aa 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -649,10 +649,10 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
 true, &pItem );
 if( SfxItemState::UNKNOWN != eState )
 {
-sal_uInt32 nVal  = SfxItemState::SET == eState
+SvxFrameDirection nVal  = SfxItemState::SET == eState
 ? static_cast(pItem)->GetValue()
-: 0;
-m_pTextFlowBox->SelectEntryValue( static_cast< SvxFrameDirection >( 
nVal ) );
+: FRMDIR_HORI_LEFT_TOP;
+m_pTextFlowBox->SelectEntryValue(nVal);
 
 m_pTextFlowBox->SaveValue();
 m_pBspWin->SetFrameDirection(nVal);
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 6387621..e92a056 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1259,7 +1259,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
 if( SfxItemState::DEFAULT <= rSet->GetItemState( _nWhich ) )
 {
 const SvxFrameDirectionItem& rFrameDirItem = static_cast( rSet->Get( _nWhich ) );
-m_pTextDirectionLB->SelectEntryValue( 
(SvxFrameDirection)rFrameDirItem.GetValue() );
+m_pTextDirectionLB->SelectEntryValue( rFrameDirItem.GetValue() );
 m_pTextDirectionLB->SaveValue();
 }
 
diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index b10159b..7e01d0c 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -4041,7 +4041,7 @@ void SvxBrushItem::dumpAsXml(xmlTextWriterPtr pWriter) 
const
 
 SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
 sal_uInt16 _nWhich )
-: SfxUInt16Item( _nWhich, (sal_uInt16)nValue )
+: SfxEnumItem( _nWhich, nValue )
 {
 }
 
@@ -4069,15 +4069,7 @@ SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & 
rStrm, sal_uInt16 /*nVer*
 {
 sal_uInt16 nValue;
 rStrm.ReadUInt16( nValue );
-return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
-}
-
-
-SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ 
) const
-{
-sal_uInt16 nValue = GetValue();
-rStrm.WriteUInt16( nValue );
-return rStrm;
+return new SvxFrameDirectionItem( static_cast(nValue), 
Which() );
 }
 
 
@@ -4093,7 +4085,7 @@ bool SvxFrameDirectionItem::GetPresentation(
 MapUnit /*ePresUnit*/,
 OUString&   rText, const IntlWrapper *) const
 {
-rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetValue() );
+rText = EE_RESSTR( RID_SVXITEMS_FRMDIR_BEGIN + GetEnumValue() );
 return true;
 }
 
diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index c1b6b36..949b151 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_EDITENG_FRMDIRITEM_HXX
 #define INCLUDED_EDITENG_FRMDIRITEM_HXX
 
-#include 
+#include 
 #include 
 #include 
 
@@ -32,7 +32,7 @@
 layout text for Western, CJK and CTL languages.
 */
 
-class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public 
SfxEnumItem
 {
 public:
 SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/,
@@ -41,7 +41,6 @@ public:
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 virtual SfxPoolItem*Create(SvStream &, sal_uInt16) const override;
-virtual SvStream&   Store(SvStream & rStrm, sal_uInt16 nIVer) const 
override;
 virtual sal_uInt16  GetVersion( sal_uInt16 nFileVersion ) const 
override;
 virtual booloperator==( const SfxPoolItem& ) const override;
 
@@ -54,6 +53,10 @@ public:
 virtual boolQuer

Re: Umang Jain license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

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


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

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

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


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

Re: Ximeng Zu license statement

[Jan Iversen]

WELCOME
Thanks for your license statement.

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


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

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

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


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

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

[Justin Luth]

 dev/null|binary
 sw/qa/extras/ooxmlexport/data/fdo55381.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |   10 ++
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|9 -
 4 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit a09fc7dd097357b60931739b6ed281a0b931aa73
Author: Justin Luth 
Date:   Mon Mar 13 08:35:00 2017 +0300

ooxmlimport: move tdf#55381 unit test to ooxmlexport

This test wasn't round-trippable because the page breaks were
all lost, and all of the frames ended up on page 1.

fixed in 5.3 daily debug bibisect 12a5c2be4d64199c6540969c645118112084a639
best guess: author Tamás Zolnai 2016-10-28 14:10:41 (GMT)
best guess: commit b927c1f4b334f80d2c2965e5b7327d6b6a685105
tdf#103544: DOCX exp.: Image loss when have a frame anchored to the same 
para.

This doc still needs some work - the frames are shifted backwards one page,
so frame 1 is on page 2 and the last page contains two frames.

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

diff --git a/sw/qa/extras/ooxmlimport/data/fdo55381.docx 
b/sw/qa/extras/ooxmlexport/data/fdo55381.docx
similarity index 100%
rename from sw/qa/extras/ooxmlimport/data/fdo55381.docx
rename to sw/qa/extras/ooxmlexport/data/fdo55381.docx
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index d60b332..176c918 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -37,6 +37,16 @@ protected:
 }
 };
 
+DECLARE_OOXMLEXPORT_TEST(testFdo55381, "fdo55381.docx")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(4), xCursor->getPage());
+//TODO: frames not located on the correct pages
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf92045, "tdf92045.docx")
 {
 // This was true,  resulted in setting the 
blinking font effect.
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bbc8ef0..367b894 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -873,15 +873,6 @@ DECLARE_OOXMLIMPORT_TEST(testFdo75722dml, 
"fdo75722-dml.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int64(3128), nRot);
 }
 
-DECLARE_OOXMLIMPORT_TEST(testFdo55381, "fdo55381.docx")
-{
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(4), xCursor->getPage());
-}
-
 DECLARE_OOXMLIMPORT_TEST(testFdo76803, "fdo76803.docx")
 {
 // The ContourPolyPolygon was wrong
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits