[Libreoffice-commits] core.git: Branch 'aoo/trunk' - external_deps.lst python/makefile.mk python/prj python/python-2.7.8-mingw.patch python/python-2.7.8-nohardlink.patch python/python-2.7.8-pcbuild.pa
external_deps.lst |6 python/makefile.mk|2 python/prj/d.lst | 108 +- python/python-2.7.8-mingw.patch | 1056 python/python-2.7.8-nohardlink.patch | 11 python/python-2.7.8-pcbuild.patch | 1768 -- python/python-2.7.8-sysbase.patch | 14 python/python-2.7.9-mingw.patch | 1056 python/python-2.7.9-nohardlink.patch | 11 python/python-2.7.9-pcbuild.patch | 1750 + python/python-2.7.9-sysbase.patch | 14 python/python-freebsd.patch | 125 -- python/python-md5.patch |6 python/python-solaris.patch |4 python/python-solver-before-std.patch |8 python/python-ssl.patch | 18 python/pyversion.mk |2 17 files changed, 2933 insertions(+), 3026 deletions(-) New commits: commit 0b44f5c65c2674aa5e39273f696a9040beb99bb9 Author: Pedro Giffuni Date: Fri Sep 2 04:43:14 2016 + python: update to version 2.7.9. The new version contains many fixes including the following vulnerabilities: CVE-2013-1752 CVE-2013-1753 Which may or may not apply to AOO. It is also an important step as it uses features from the newer OpenSSL version that was imported in r1756954. Tested on FreeBSD, may still need adjustments for MS-Windows. diff --git a/external_deps.lst b/external_deps.lst index bfbaaf1..8012615 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -204,9 +204,9 @@ if (ENABLE_MEDIAWIKI == YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_PYTHON != YES) -MD5 = d4bca0159acb0b44a781292b5231936f -name = Python-2.7.8.tgz -URL1 = http://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz +MD5 = 5eebcaa0030dc4061156d3429657fb83 +name = Python-2.7.9.tgz +URL1 = http://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (SYSTEM_BOOST != YES) diff --git a/python/makefile.mk b/python/makefile.mk index 2a146a1..5ab7893 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -42,7 +42,7 @@ all: TARFILE_NAME=Python-$(PYVERSION) -TARFILE_MD5=d4bca0159acb0b44a781292b5231936f +TARFILE_MD5=5eebcaa0030dc4061156d3429657fb83 PATCH_FILES=\ python-solaris.patch \ python-freebsd.patch \ diff --git a/python/prj/d.lst b/python/prj/d.lst index ac5bd1d..39ee038 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -36,51 +36,51 @@ mkdir: %_DEST%\lib%_EXT%\python\multiprocessing\dummy mkdir: %_DEST%\lib%_EXT%\python\unittest mkdir: %_DEST%\lib%_EXT%\python\python2.7\config -..\%__SRC%\misc\build\Python-2.7.8\Lib\* %_DEST%\lib%_EXT%\python\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\* %_DEST%\lib%_EXT%\python\email\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\compiler\* %_DEST%\lib%_EXT%\python\compiler\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\hotshot\* %_DEST%\lib%_EXT%\python\hotshot\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\* %_DEST%\lib%_EXT%\python\distutils\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\distutils\command\* %_DEST%\lib%_EXT%\python\distutils\command\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\* %_DEST%\lib%_EXT%\python\xml\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\dom\* %_DEST%\lib%_EXT%\python\xml\dom\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\parsers\* %_DEST%\lib%_EXT%\python\xml\parsers\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\xml\sax\* %_DEST%\lib%_EXT%\python\xml\sax\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\curses\* %_DEST%\lib%_EXT%\python\curses\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\plat-linux2\* %_DEST%\lib%_EXT%\python\plat-linux2\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\config\* %_DEST%\lib%_EXT%\python\config\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\bsddb\* %_DEST%\lib%_EXT%\python\bsddb\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\logging\* %_DEST%\lib%_EXT%\python\logging\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\* %_DEST%\lib%_EXT%\python\idlelib\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\idlelib\Icons\* %_DEST%\lib%_EXT%\python\idlelib\Icons\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\wsgiref\* %_DEST%\lib%_EXT%\python\wsgiref\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\json\* %_DEST%\lib%_EXT%\python\json\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\* %_DEST%\lib%_EXT%\python\lib2to3\* -..\%__SRC%\misc\build\Python-2.7.8\Lib\lib2to3\fixes\* %_DEST%\lib%_EXT%\pytho
Re: [Libreoffice-qa] minutes of ESC call ...
Michael Meeks wrote on 01-09-16 18:02: > + bugs suggested for attention by Cor: Thanks for the flowers.. > tdf#62717, tdf#89760, tdf#92837, tdf#94319, tdf#97597 > + are they marked high prio. regressions ? (Michael) >+ had a look through the non-mentioned ones (Robinson) >+ not all high prio. I've set another of those to high prio (with explanation). Now all are high prio apart from tdf#97597, which I didn't mark as such now, since more reserach (prolly network stuff) needed. Will see if I can mediate in that. The issue is of the sort you really don't want to see in a prof.envir.; marked for dataloss. Ciao - Cor -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/node.hxx| 60 --
starmath/source/visitors.cxx | 242 +++
2 files changed, 155 insertions(+), 147 deletions(-)
New commits:
commit c9f445d1dee474cf6e7435ba176318735aa2ae67
Author: Takeshi Abe
Date: Thu Sep 1 11:01:33 2016 +0900
Replace SmNodeIterator with std::vector's iterator
and drop obsolete comments in SmCaretPosGraphBuildingVisitor's ctor.
Change-Id: Ibbe5a810ff265eb558906552bb560f9145eaf0cd
Reviewed-on: https://gerrit.libreoffice.org/28571
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 3ecacb1..91414ec 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -220,64 +220,6 @@ private:
};
-/** A simple auxiliary iterator class for SmNode
- *
- * Example of iteration over children of pMyNode:
- * \code
- * //Node to iterate over:
- * SmNode* pMyNode = 0;// A pointer from somewhere
- * //The iterator:
- * SmNodeIterator it(pMyNode);
- * //The iteration:
- * while(it.Next()) {
- * it->SetSelected(true);
- * }
- * \endcode
- */
-class SmNodeIterator{
-public:
-SmNodeIterator(SmNode* node, bool bReverse = false){
-pNode = node;
-nSize = pNode->GetNumSubNodes();
-nIndex = 0;
-pChildNode = nullptr;
-bIsReverse = bReverse;
-}
-/** Get the subnode or NULL if none */
-SmNode* Next(){
-while(!bIsReverse && nIndex < nSize){
-if(nullptr != (pChildNode = pNode->GetSubNode(nIndex++)))
-return pChildNode;
-}
-while(bIsReverse && nSize > 0){
-if(nullptr != (pChildNode = pNode->GetSubNode((nSize--)-1)))
-return pChildNode;
-}
-pChildNode = nullptr;
-return nullptr;
-}
-/** Get the current child node, NULL if none */
-SmNode* Current(){
-return pChildNode;
-}
-/** Get the current child node, NULL if none */
-SmNode* operator->(){
-return pChildNode;
-}
-private:
-/** Current child */
-SmNode* pChildNode;
-/** Node whos children we're iterating over */
-SmNode* pNode;
-/** Size of the node */
-sal_uInt16 nSize;
-/** Current index in the node */
-sal_uInt16 nIndex;
-/** Move reverse */
-bool bIsReverse;
-};
-
-
/** Abstract baseclass for all composite node
*
* Subclasses of this class can have subnodes. Nodes that doesn't derivate from
@@ -309,6 +251,8 @@ public:
SmNodeArray::iterator begin() {return aSubNodes.begin();}
SmNodeArray::iterator end() {return aSubNodes.end();}
+SmNodeArray::reverse_iterator rbegin() {return aSubNodes.rbegin();}
+SmNodeArray::reverse_iterator rend() {return aSubNodes.rend();}
/** Get the index of a child node
*
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 48f8d0e..19a244f9 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -537,12 +537,13 @@ void SmDrawingVisitor::DrawChildren( SmStructureNode*
pNode )
Point rPosition = maPosition;
-SmNodeIterator it( pNode );
-while( it.Next( ) )
+for( auto pChild : *pNode )
{
-Point aOffset ( it->GetTopLeft( ) - pNode->GetTopLeft( ) );
+if(!pChild)
+continue;
+Point aOffset ( pChild->GetTopLeft( ) - pNode->GetTopLeft( ) );
maPosition = rPosition + aOffset;
-it->Accept( this );
+pChild->Accept( this );
}
}
@@ -566,13 +567,15 @@ SmSetSelectionVisitor::SmSetSelectionVisitor( SmCaretPos
startPos, SmCaretPos en
SAL_WARN_IF(mbSelecting, "starmath", "Caret positions needed to set
mbSelecting about, shouldn't be possible!");
//Visit lines
-SmNodeIterator it( pTree );
-while( it.Next( ) ) {
-it->Accept( this );
+for( auto pChild : *static_cast(pTree) )
+{
+if(!pChild)
+continue;
+pChild->Accept( this );
//If we started a selection in this line and it haven't ended, we
do that now!
if(mbSelecting) {
mbSelecting = false;
-SetSelectedOnAll(it.Current());
+SetSelectedOnAll(pChild);
//Set maStartPos and maEndPos to invalid positions, this
ensures that an unused
//start or end (because we forced end above), doesn't start a
new selection.
maStartPos = maEndPos = SmCaretPos();
@@ -590,10 +593,15 @@ SmSetSelectionVisitor::SmSetSelectionVisitor( SmCaretPos
startPos, SmCaretPos en
void SmSetSelectionVisitor::SetSelectedOnAll( SmNode* pSubTree, bool
IsSelected ) {
pSubTree->SetSelected( IsSelected );
+if(pSubTree->GetNumSubNodes() == 0)
+return;
//Quick BFS to set all selections
-SmNodeIterator it( pSubTree );
-while( it.Next( ) )
-SetSelectedOnAll( it.Current( ), IsSelect
[Libreoffice-commits] core.git: cui/source
cui/source/options/personalization.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit a8a7b7114d96b2013b00e9bc0ced81aad5495457
Author: Julien Nabet
Date: Thu Sep 1 21:47:05 2016 +0200
Revert "tdf#101629: fix https://addons.mozilla.org/ case"
This reverts commit 454e1ebcfc589ce82c8c2d5585e22bea1ea5fc79.
Change-Id: Id296e622dc8e14bd20549325d890196d8d36b1a5
Reviewed-on: https://gerrit.libreoffice.org/28605
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 29a7ac4..4b2658f 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -160,11 +160,9 @@ IMPL_LINK_TYPED( SelectPersonaDialog, SearchPersonas,
Button*, pButton, void )
// 15 results so that invalid and duplicate search results whose names
can't be retrieved can be skipped
OUString rSearchURL =
"https://services.addons.mozilla.org/en-US/firefox/api/1.5/search/"; +
searchTerm + "/9/15";
-sal_Int32 nIndexOfFirefox = searchTerm.indexOf( "firefox" );
-
-if ( searchTerm.startsWith( "https://addons.mozilla.org/"; ) &&
nIndexOfFirefox != -1 )
+if ( searchTerm.startsWith( "https://addons.mozilla.org/"; ) )
{
-searchTerm = "https://addons.mozilla.org/en-US/"; + searchTerm.copy(
nIndexOfFirefox );
+searchTerm = "https://addons.mozilla.org/en-US/"; + searchTerm.copy(
searchTerm.indexOf( "firefox" ) );
m_pSearchThread = new SearchAndParseThread( this, searchTerm, true );
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source
filter/source/xsltfilter/containerhelper.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9c219419475f35bc4535ad82b67121dd90a38883
Author: Don Lewis
Date: Fri Sep 2 02:16:21 2016 +
Fix typos in forEachMem() template functions.
diff --git a/filter/source/xsltfilter/containerhelper.hxx
b/filter/source/xsltfilter/containerhelper.hxx
index 4c7fba0..8b52c4b 100644
--- a/filter/source/xsltfilter/containerhelper.hxx
+++ b/filter/source/xsltfilter/containerhelper.hxx
@@ -73,13 +73,13 @@ public:
template
inline void forEachMem(FuncType pFunc, ParamType1 aParam1, ParamType2
aParam2) const
{
-forEach( ::boost::bind(pFunc, -1, aParam1, aParam2 ));
+forEach( ::boost::bind(pFunc, _1, aParam1, aParam2 ));
}
template
-inline void forEachMem( FuncType pFunc, ParamType1 aParam1, ParamType2
aParam2, ParamType3 aParam3 ) const
+inline void forEachMem(FuncType pFunc, ParamType1 aParam1, ParamType2
aParam2, ParamType3 aParam3 ) const
{
-forEach( ::boost::bind(pFunc, _1, aParam2, aParam2, aParam3 ));
+forEach( ::boost::bind(pFunc, _1, aParam1, aParam2, aParam3 ));
}
template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source
sc/source/ui/app/inputhdl.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit d8879103a152c7db6ba420af9cda87790996fee8
Author: Eike Rathke
Date: Thu Sep 1 12:17:36 2016 +0200
exclude also single quoted strings from function name suggestion
These may be sheet names or label names, but never function names.
For example, typing ='e should not suggest "[EASTERSUNDAY], EDATE, ..."
Change-Id: I818b91b533b868ccb6d2eb1eef74112162d2fe3d
(cherry picked from commit b9a2c849a657bdb9d5953b96f60409cb877b0005)
Reviewed-on: https://gerrit.libreoffice.org/28586
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e7cd682..f268dbf 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1242,14 +1242,21 @@ void ScInputHandler::UseFormulaData()
miAutoPosFormula = findTextAll(*pFormulaData,
miAutoPosFormula, aText, aNewVec, false);
if (miAutoPosFormula != pFormulaData->end())
{
-// check if partial function name is not Between quotes
-bool bBetweenQuotes = false;
+// check if partial function name is not between quotes
+sal_Unicode cBetweenQuotes = 0;
for ( int n = 0; n < aSelText.getLength(); n++ )
{
-if ( aSelText[ n ] == '"' )
-bBetweenQuotes = !bBetweenQuotes;
+if (cBetweenQuotes)
+{
+if (aSelText[n] == cBetweenQuotes)
+cBetweenQuotes = 0;
+}
+else if ( aSelText[ n ] == '"' )
+cBetweenQuotes = '"';
+else if ( aSelText[ n ] == '\'' )
+cBetweenQuotes = '\'';
}
-if ( bBetweenQuotes )
+if ( cBetweenQuotes )
return; // we're between quotes
ShowFuncList(aNewVec);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source sd/source svx/inc svx/source sw/source
sc/source/ui/drawfunc/fudraw.cxx |2 +-
sc/source/ui/drawfunc/futext.cxx |2 +-
sd/source/ui/animations/motionpathtag.cxx |6 +++---
sd/source/ui/func/fupoor.cxx |2 +-
sd/source/ui/func/fusel.cxx |4 ++--
svx/inc/svx/svdmrkv.hxx |4 ++--
svx/source/dialog/graphctl.cxx|2 +-
sw/source/ui/ribbar/drawbase.cxx |4 ++--
8 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit d8e7261d2d1992eb7e36ff9fbb58b26688168bf3
Author: Don Lewis
Date: Thu Sep 1 22:08:51 2016 +
Fix by far the largest source of -Wtautological-undefined-compare
compile warnings.
The class definition for SdrMarkView in svx/inc/svx/svdmrkv.hxx
contains two inline methods that take a reference argument and
perform an &rArg == NULL test on it. The compiler warns that this
condition should always be false because dereferencing a NULL pointer
to generate a reference is not valid in C++ and a valid reference will
never be at address 0. Warnings are generated every time this header
is included in a .cxx file.
It turns out that there are no callers for the IsGluePoint() method,
so just comment out its definition.
It also turns out that all the callers of IsPointMarked() pass it
a dereferenced pointer, so convert IsPointMarked() to take a pointer
argument and modify all the callers to pass a pointer without
dereferencing it first.
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index fb17aa1..26c6c1d 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -637,7 +637,7 @@ sal_Bool __EXPORT FuDraw::KeyInput(const KeyEvent& rKEvt)
sal_uInt32 nPol(pHdl->GetPolyNum());
sal_uInt32 nPnt(pHdl->GetPointNum());
-if(pView->IsPointMarked(*pHdl))
+if(pView->IsPointMarked(pHdl))
{
if(rKEvt.GetKeyCode().IsShift())
{
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index d14e6ec..404fce3 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -163,7 +163,7 @@ sal_Bool __EXPORT FuText::MouseButtonDown(const MouseEvent&
rMEvt)
{
if (pView->HasMarkablePoints() && pView->IsPointMarkable(*pHdl))
{
-sal_Bool bPointMarked=pView->IsPointMarked(*pHdl);
+sal_Bool bPointMarked=pView->IsPointMarked(pHdl);
if ( rMEvt.IsShift() )
{
diff --git a/sd/source/ui/animations/motionpathtag.cxx
b/sd/source/ui/animations/motionpathtag.cxx
index 1fc0f66..71010a4 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -552,7 +552,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent&
rMEvt, SmartHdl& rHdl )
else
{
SmartHdl* pHdl = &rHdl;
-if (!mrView.IsPointMarked(*pHdl) || rMEvt.IsShift())
+if (!mrView.IsPointMarked(pHdl) || rMEvt.IsShift())
{
if (!rMEvt.IsShift())
{
@@ -561,7 +561,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent&
rMEvt, SmartHdl& rHdl )
}
else
{
-if (mrView.IsPointMarked(*pHdl) )
+if (mrView.IsPointMarked(pHdl) )
{
mrView.UnmarkPoint(*pHdl);
pHdl = NULL;
@@ -698,7 +698,7 @@ bool MotionPathTag::OnMarkHandle( const KeyEvent& rKEvt )
sal_uInt32 nPol(pHdl->GetPolyNum());
sal_uInt32 nPnt(pHdl->GetPointNum());
-if(mrView.IsPointMarked(*pHdl))
+if(mrView.IsPointMarked(pHdl))
{
if(rKEvt.GetKeyCode().IsShift())
{
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 9c042d4..eb0da7b 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -596,7 +596,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
sal_uInt32 nPol(pHdl->GetPolyNum());
sal_uInt32 nPnt(pHdl->GetPointNum());
-if(mpView->IsPointMarked(*pHdl))
+if(mpView->IsPointMarked(pHdl))
{
if(rKEvt.GetKeyCode().IsShift())
{
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 617f666..7ed3d92 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -497,7 +497,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent&
rMEvt)
/**
Re: LibreOffice's New Area Dialog Box crashes when compiled with Clang
I sent the backtrace to Stephan directly, which he used to resolve the clang crash with https://cgit.freedesktop.org/libreoffice/core/commit/?id=e11931da72eabd98f9ea49ae93bd76039b283268 Why was this working with gcc and MSVC? Undefined behavior or a compiler bug? Thanks Stephan! -- View this message in context: http://nabble.documentfoundation.org/LibreOffice-s-New-Area-Dialog-Box-crashes-when-compiled-with-Clang-tp4191943p4192391.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Changes to 'refs/tags/1.9.0'
Tag '1.9.0' created by Andras Timar at 2016-09-01 21:44 + 1.9.0 Changes since collabora-online-1-9-branch-point-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 4 commits - loleaflet/src loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/LOOLKit.cpp loolwsd/MessageQu
loleaflet/src/layer/tile/TileLayer.js |2 -
loolwsd/DocumentBroker.cpp| 17 +
loolwsd/DocumentBroker.hpp|6 ++-
loolwsd/LOOLKit.cpp | 59 +++---
loolwsd/MessageQueue.cpp | 43
loolwsd/PrisonerSession.cpp | 10 -
loolwsd/TileCache.cpp |4 +-
loolwsd/TileDesc.hpp |7
loolwsd/protocol.txt |4 +-
9 files changed, 118 insertions(+), 34 deletions(-)
New commits:
commit 1b61e1d52fd950e9969ee85fe98af50426a8efdf
Author: Ashod Nakashian
Date: Thu Sep 1 16:45:04 2016 -0400
loolwsd: replace old tile requests with more recent ones
A new queue with own thread now processes tile requests
so we have a chance to cull backlogged tile requests
that have since been invalidated.
This reduces load on the server significantly, especially
with multiple view at different zoom levels, and very fast
typing.
Change-Id: I6599939cd363dc71c30187f40d542aa37260dc56
Reviewed-on: https://gerrit.libreoffice.org/28607
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 0613aa7..b62754d 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#define LOK_USE_UNSTABLE_API
#include
@@ -396,18 +397,23 @@ public:
Document(const std::shared_ptr& loKit,
const std::string& jailId,
const std::string& docKey,
- const std::string& url)
+ const std::string& url,
+ std::shared_ptr queue,
+ const std::shared_ptr& ws)
: _multiView(std::getenv("LOK_VIEW_CALLBACK")),
_loKit(loKit),
_jailId(jailId),
_docKey(docKey),
_url(url),
+_queue(queue),
+_ws(ws),
_docPassword(""),
_haveDocPassword(false),
_isDocPasswordProtected(false),
_docPasswordType(PasswordType::ToView),
_stop(false),
_isLoading(0),
+_tilesThread(tilesThread, this),
_clientViews(0)
{
Log::info("Document ctor for url [" + _url + "] on child [" + _jailId +
@@ -1188,6 +1194,44 @@ private:
Log::debug("Thread finished.");
}
+static void tilesThread(Document* pThis)
+{
+Util::setThreadName("tile_renderer");
+
+Log::debug("Thread started.");
+
+try
+{
+while (true)
+{
+const auto input = pThis->_queue->get();
+const std::string message(input.data(), input.size());
+StringTokenizer tokens(message, " ",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+
+if (tokens[0] == "eof")
+{
+Log::info("Received EOF. Finishing.");
+break;
+}
+
+if (tokens[0] == "tile")
+{
+pThis->renderTile(tokens, pThis->_ws);
+}
+else if (tokens[0] == "tilecombine")
+{
+pThis->renderCombinedTiles(tokens, pThis->_ws);
+}
+}
+}
+catch (const std::exception& exc)
+{
+Log::error(std::string("QueueHandler::run: Exception: ") +
exc.what());
+}
+
+Log::debug("Thread finished.");
+}
+
private:
const bool _multiView;
@@ -1199,6 +1243,8 @@ private:
std::string _renderOpts;
std::shared_ptr _loKitDocument;
+std::shared_ptr _queue;
+std::shared_ptr _ws;
// Document password provided
std::string _docPassword;
@@ -1216,6 +1262,7 @@ private:
std::map> _viewIdToCallbackDescr;
std::map> _connections;
Poco::Thread _callbackThread;
+std::thread _tilesThread;
Poco::NotificationQueue _callbackQueue;
std::atomic_size_t _clientViews;
};
@@ -1420,9 +1467,11 @@ void lokit_main(const std::string& childRoot,
auto ws = std::make_shared(cs, request, response);
ws->setReceiveTimeout(0);
+auto queue = std::make_shared();
+
const std::string socketName = "ChildControllerWS";
IoUtil::SocketProcessor(ws,
-[&socketName, &ws, &document, &loKit](const std::vector&
data)
+[&socketName, &ws, &document, &loKit, &queue](const
std::vector& data)
{
std::string message(data.data(), data.size());
@@ -1449,7 +1498,7 @@ void lokit_main(const std::string& childRoot,
if (!document)
{
-document = std::make_shared(loKit,
jailId, docKey, url);
+document = std::make_shared(loKit,
jailId, docKey, url, queue, ws);
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/index.fods | 4228 ++ 1 file changed, 4228 insertions(+) New commits: commit 91ee1cdce712d50e1e6951bcd7ba82dac50d8038 Author: ZdenÄk Crhonek Date: Thu Sep 1 21:48:27 2016 +0200 add INDEX test case Change-Id: I88f8db37fe9951e534e8a6701d2e3e8b215e3fa0 Reviewed-on: https://gerrit.libreoffice.org/28606 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/index.fods b/sc/qa/unit/data/functions/fods/index.fods new file mode 100644 index 000..3ec5632 --- /dev/null +++ b/sc/qa/unit/data/functions/fods/index.fods @@ -0,0 +1,4228 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/139d3b3e8b157c1f365f888126269f0902acbaa2 + + + 0 + 0 + 51980 + 9475 + + + view1 + + + 2 + 12 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 75 + 60 + true + false + + + 4 + 10 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 75 + 60 + true + false + + + Sheet2 + 1241 + 0 + 75 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + false + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + de + DE + + + + + + en + US + + + + + + nl + NL + + + + + + true + true + 3 + 1 + true + 1 + true + kQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + + + + + + + ( + + ) + + + + - + + + + + + + + + + + + + + + + + KÄ + + + - + + + KÄ + + + + + + KÄ + + + - + + + KÄ + + + + + + KÄ + + + + - + + + KÄ + +
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp loolwsd/MessageQueue.cpp
loolwsd/LOOLKit.cpp | 59 +++
loolwsd/MessageQueue.cpp | 43 ++
2 files changed, 82 insertions(+), 20 deletions(-)
New commits:
commit 2663f9b63f986e97d092244ba793b56b347101cd
Author: Ashod Nakashian
Date: Thu Sep 1 16:45:04 2016 -0400
loolwsd: replace old tile requests with more recent ones
A new queue with own thread now processes tile requests
so we have a chance to cull backlogged tile requests
that have since been invalidated.
This reduces load on the server significantly, especially
with multiple view at different zoom levels, and very fast
typing.
Change-Id: I6599939cd363dc71c30187f40d542aa37260dc56
Reviewed-on: https://gerrit.libreoffice.org/28607
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 0613aa7..b62754d 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#define LOK_USE_UNSTABLE_API
#include
@@ -396,18 +397,23 @@ public:
Document(const std::shared_ptr& loKit,
const std::string& jailId,
const std::string& docKey,
- const std::string& url)
+ const std::string& url,
+ std::shared_ptr queue,
+ const std::shared_ptr& ws)
: _multiView(std::getenv("LOK_VIEW_CALLBACK")),
_loKit(loKit),
_jailId(jailId),
_docKey(docKey),
_url(url),
+_queue(queue),
+_ws(ws),
_docPassword(""),
_haveDocPassword(false),
_isDocPasswordProtected(false),
_docPasswordType(PasswordType::ToView),
_stop(false),
_isLoading(0),
+_tilesThread(tilesThread, this),
_clientViews(0)
{
Log::info("Document ctor for url [" + _url + "] on child [" + _jailId +
@@ -1188,6 +1194,44 @@ private:
Log::debug("Thread finished.");
}
+static void tilesThread(Document* pThis)
+{
+Util::setThreadName("tile_renderer");
+
+Log::debug("Thread started.");
+
+try
+{
+while (true)
+{
+const auto input = pThis->_queue->get();
+const std::string message(input.data(), input.size());
+StringTokenizer tokens(message, " ",
StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+
+if (tokens[0] == "eof")
+{
+Log::info("Received EOF. Finishing.");
+break;
+}
+
+if (tokens[0] == "tile")
+{
+pThis->renderTile(tokens, pThis->_ws);
+}
+else if (tokens[0] == "tilecombine")
+{
+pThis->renderCombinedTiles(tokens, pThis->_ws);
+}
+}
+}
+catch (const std::exception& exc)
+{
+Log::error(std::string("QueueHandler::run: Exception: ") +
exc.what());
+}
+
+Log::debug("Thread finished.");
+}
+
private:
const bool _multiView;
@@ -1199,6 +1243,8 @@ private:
std::string _renderOpts;
std::shared_ptr _loKitDocument;
+std::shared_ptr _queue;
+std::shared_ptr _ws;
// Document password provided
std::string _docPassword;
@@ -1216,6 +1262,7 @@ private:
std::map> _viewIdToCallbackDescr;
std::map> _connections;
Poco::Thread _callbackThread;
+std::thread _tilesThread;
Poco::NotificationQueue _callbackQueue;
std::atomic_size_t _clientViews;
};
@@ -1420,9 +1467,11 @@ void lokit_main(const std::string& childRoot,
auto ws = std::make_shared(cs, request, response);
ws->setReceiveTimeout(0);
+auto queue = std::make_shared();
+
const std::string socketName = "ChildControllerWS";
IoUtil::SocketProcessor(ws,
-[&socketName, &ws, &document, &loKit](const std::vector&
data)
+[&socketName, &ws, &document, &loKit, &queue](const
std::vector& data)
{
std::string message(data.data(), data.size());
@@ -1449,7 +1498,7 @@ void lokit_main(const std::string& childRoot,
if (!document)
{
-document = std::make_shared(loKit,
jailId, docKey, url);
+document = std::make_shared(loKit,
jailId, docKey, url, queue, ws);
}
// Validate and create session.
@@ -1463,7 +1512,7 @@ void lokit_main(const std::string& childRoot,
{
if (document)
{
-document->renderTile(tokens, ws);
+queue->put(message);
}
[Libreoffice-commits] online.git: 2 commits - loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/PrisonerSession.cpp loolwsd/protocol.txt loolwsd/TileCache.cpp loolwsd/TileDesc.hpp
loolwsd/DocumentBroker.cpp | 17 ++---
loolwsd/DocumentBroker.hpp |6 +-
loolwsd/PrisonerSession.cpp | 10 +++---
loolwsd/TileCache.cpp |4 +++-
loolwsd/TileDesc.hpp|7 +++
loolwsd/protocol.txt|4 +++-
6 files changed, 35 insertions(+), 13 deletions(-)
New commits:
commit 6bce292c4410ba61f41bd015cee00176238140af
Author: Michael Meeks
Date: Thu Sep 1 21:17:56 2016 +0100
Send intermediate tiles back even when we they are older.
Should improve interactivity and avoid jerky feedback.
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 9b76a15..0f6936a 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -140,17 +140,19 @@ std::unique_ptr TileCache::lookupTile(const
TileDesc& tile)
return nullptr;
}
-void TileCache::saveTileAndNotify(const TileDesc& tile, const char *data,
const size_t size, const bool priority)
+void TileCache::saveTileAndNotify(const TileDesc& tile, const char *data,
const size_t size, const bool /* priority */)
{
std::unique_lock lock(_tilesBeingRenderedMutex);
std::shared_ptr tileBeingRendered =
findTileBeingRendered(tile);
+#if 0
if (!priority && tileBeingRendered && tileBeingRendered->getVersion() !=
tile.getVersion())
{
Log::trace() << "Skipping unexpected tile ver: " << tile.getVersion()
<< ", waiting for ver " <<
tileBeingRendered->getVersion() << Log::end;
return;
}
+#endif
// Save to disk.
const auto cachedName = (tileBeingRendered ?
tileBeingRendered->getCacheName()
commit 8182dd8c54ca83407e666c429d25f199e5ccc570
Author: Michael Meeks
Date: Thu Sep 1 21:15:13 2016 +0100
Assign priority based on intersection with the cursor.
Should help to reduce visual tearing when cursor spans a tile join.
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index a89b9d3..043218f 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -111,6 +111,8 @@ DocumentBroker::DocumentBroker(const Poco::URI& uriPublic,
_lastEditableSession(false),
_cursorPosX(0),
_cursorPosY(0),
+_cursorWidth(0),
+_cursorHeight(0),
_isLoaded(false),
_isModified(false),
_isEditLockHeld(false),
@@ -572,8 +574,8 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
continue;
}
else
-if (_cursorPosX >= tile.getTilePosX() && _cursorPosX <=
tile.getTilePosX() + tile.getTileWidth() &&
-_cursorPosY >= tile.getTilePosY() && _cursorPosY <=
tile.getTilePosY() + tile.getTileHeight())
+if (tile.intersectsWithRect(_cursorPosX, _cursorPosY,
+_cursorWidth, _cursorHeight))
{
// If this tile is right under the cursor, give it priority.
const auto req = tile.serialize("tile");
@@ -628,11 +630,12 @@ void DocumentBroker::handleTileResponse(const
std::vector& payload)
if (firstLine.size() < static_cast(length) - 1)
{
// If the tile right under the cursor, give it priority.
-const auto priority = (_cursorPosX >= tile.getTilePosX() &&
- _cursorPosX <= tile.getTilePosX() +
tile.getTileWidth() &&
- _cursorPosY >= tile.getTilePosY() &&
- _cursorPosY <= tile.getTilePosY() +
tile.getTileHeight());
-tileCache().saveTileAndNotify(tile, buffer + firstLine.size() + 1,
length - firstLine.size() - 1, priority);
+const bool priority = tile.intersectsWithRect(
+_cursorPosX, _cursorPosY,
+_cursorWidth, _cursorHeight);
+tileCache().saveTileAndNotify(
+tile, buffer + firstLine.size() + 1,
+length - firstLine.size() - 1, priority);
}
else
{
diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index 54ca138..fd28ed8 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -203,10 +203,12 @@ public:
size_t removeSession(const std::string& id);
/// Invalidate the cursor position.
-void invalidateCursor(const int x, const int y)
+void invalidateCursor(int x, int y, int w, int h)
{
_cursorPosX = x;
_cursorPosY = y;
+_cursorWidth = w;
+_cursorHeight = h;
}
void handleTileRequest(TileDesc& tile,
@@ -252,6 +254,8 @@ private:
std::atomic _lastEditableSession;
int _cursorPosX;
int _cursorPosY;
+int _cursorWidth;
+int _cursorHeight;
bool _isLoaded;
bool _isModified;
mutable std::mutex _mutex;
diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index ba3c344..35ce139 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -228,13 +228,
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit de770a32e89d585fa8063849617ec30fb08007e9
Author: Pranav Kant
Date: Fri Sep 2 01:19:33 2016 +0530
loleaflet: Fix inconsistent user count for views going active
Iterating viewCursor object won't give correct number of live
viewids because inactive views don't receive any viewcursor
messages.
Rather use map._viewInfo object because as of now, we do receive
these 'addview' message for inactive views, so this place should
always remain updated and prevent giving inconsistent view counts
across different clients.
Change-Id: If210049e76b5f2b91371a21863f6019cbccdb9ca
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index a2d6850..388582f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -699,7 +699,7 @@ L.TileLayer = L.GridLayer.extend({
},
_onRemAllViewMsg: function(textMsg) {
- for (var viewId in this._viewCursors) {
+ for (var viewId in this._map._viewInfo) {
this._onRemViewMsg('remview: ' + viewId);
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/functions/fods/devsq.fods | 3781 ++ 1 file changed, 3781 insertions(+) New commits: commit b98f96a244b81082b009d5bf3c657ef857173d37 Author: ZdenÄk Crhonek Date: Wed Aug 31 19:57:49 2016 +0200 add DEVSQ test case Change-Id: I2212a305a16c834ef0a679b6c741778c94fd5f3c Reviewed-on: https://gerrit.libreoffice.org/28558 Tested-by: Jenkins Reviewed-by: Markus Mohrhard diff --git a/sc/qa/unit/data/functions/fods/devsq.fods b/sc/qa/unit/data/functions/fods/devsq.fods new file mode 100644 index 000..1e0373f --- /dev/null +++ b/sc/qa/unit/data/functions/fods/devsq.fods @@ -0,0 +1,3781 @@ + + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:form x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + 2016-08-31T19:57:03.661866076P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/139d3b3e8b157c1f365f888126269f0902acbaa2 + + + 0 + 0 + 34293 + 7330 + + + view1 + + + 2 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 75 + 60 + true + false + + + 4 + 8 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 75 + 60 + true + false + + + Sheet2 + 1241 + 0 + 75 + 60 + false + true + true + true + 12632256 + true + true + true + true + false + false + false + 1270 + 1270 + 1 + 1 + true + false + + + + + 7 + false + false + true + true + false + false + false + 1270 + 1270 + true + true + true + true + true + false + 12632256 + false + Lexmark-E352dn + + + cs + CZ + + + + + + de + DE + + + + + + en + US + + + + + + nl + NL + + + + + + true + true + 3 + 1 + true + 1 + true + kQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY= + false + 0 + + + + + http://openoffice.org/2004/office"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KÄ + + + + - + + + KÄ + + + + + + + + + + ( + + ) + + + + - + + + + + + + + + + + + + + + + + KÄ + + + - + + + KÄ + + + + + + KÄ + + + - + + + KÄ + + + + + + KÄ + + + + - + + + KÄ + + + +
[Libreoffice-commits] core.git: Branch 'feature/fixes34' -
0 files changed New commits: commit e2ae47d1f2e5dddc1175729902d0218be80e043e Author: László Németh Date: Thu Sep 1 21:35:15 2016 +0200 repeat (system restart) Change-Id: I88d4352fd8da0c239e95c926091036e88b2488a7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/filter/WriterFilter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 79054f270a9cb9b4838d0f184e9bc31c2fce3a53
Author: Justin Luth
Date: Thu Sep 1 10:58:42 2016 +0300
Formatting: consistent spot for TreatSingleColumnBreakAsPageBreak
I failed to keep this instance in a consistent position earlier.
Change-Id: I098e5e3f4c3d562d986ae9233cfd62d29fd0f4dd
Reviewed-on: https://gerrit.libreoffice.org/28600
Reviewed-by: Justin Luth
Tested-by: Justin Luth
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index ab7cdf4..9cc7bd1 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -291,13 +291,13 @@ void WriterFilter::setTargetDocument(const
uno::Reference< lang::XComponent >& x
xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true));
xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true));
xSettings->setPropertyValue("TabOverflow", uno::makeAny(true));
-xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak",
uno::makeAny(true));
xSettings->setPropertyValue("UnbreakableNumberings", uno::makeAny(true));
xSettings->setPropertyValue("FloattableNomargins", uno::makeAny(true));
xSettings->setPropertyValue("ClippedPictures", uno::makeAny(true));
xSettings->setPropertyValue("BackgroundParaOverDrawings",
uno::makeAny(true));
xSettings->setPropertyValue("TabOverMargin", uno::makeAny(true));
+xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak",
uno::makeAny(true));
xSettings->setPropertyValue("PropLineSpacingShrinksFirstLine",
uno::makeAny(true));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - 2 commits - loolwsd/IoUtil.cpp
loolwsd/IoUtil.cpp | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 8f54c13edd084a46ad5130618fabae03d2f67e15
Author: Pranav Kant
Date: Fri Sep 2 00:41:41 2016 +0530
loolwsd: Fix build
Change-Id: If55ad5dfe3f16c9cf4d15d57d199c392d8814e24
diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 8077cab..1e5db62 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -100,7 +100,7 @@ void SocketProcessor(const std::shared_ptr& ws,
{
n = receiveFrame(*ws, payload.data(), payload.capacity(),
flags);
}
-catch (const TimeoutException &)
+catch (const Poco::TimeoutException&)
{
Log::debug("SocketProcessor: Spurious TimeoutException,
ignored");
continue;
commit 4e7b6e31e462c2997d6ee1adad201f2e65299fff
Author: Tor Lillqvist
Date: Thu Sep 1 19:44:51 2016 +0300
Ignore unexpected TimeoutException from receiveFrame() in SocketProcessor()
Seems to get rid of some (maybe all) "unexpected connection error"
issues for me at least.
diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 868b4ba..8077cab 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -96,7 +96,15 @@ void SocketProcessor(const std::shared_ptr& ws,
}
payload.resize(payload.capacity());
-n = receiveFrame(*ws, payload.data(), payload.capacity(), flags);
+try
+{
+n = receiveFrame(*ws, payload.data(), payload.capacity(),
flags);
+}
+catch (const TimeoutException &)
+{
+Log::debug("SocketProcessor: Spurious TimeoutException,
ignored");
+continue;
+}
payload.resize(n > 0 ? n : 0);
if (n <= 0 || ((flags & WebSocket::FRAME_OP_BITMASK) ==
WebSocket::FRAME_OP_CLOSE))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/fixes34'
New branch 'feature/fixes34' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/IoUtil.cpp
loolwsd/IoUtil.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c43c5486fa97d6457857c3131f97d08c74934228
Author: Pranav Kant
Date: Fri Sep 2 00:41:41 2016 +0530
loolwsd: Fix build
Change-Id: If55ad5dfe3f16c9cf4d15d57d199c392d8814e24
diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 8077cab..1e5db62 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -100,7 +100,7 @@ void SocketProcessor(const std::shared_ptr& ws,
{
n = receiveFrame(*ws, payload.data(), payload.capacity(),
flags);
}
-catch (const TimeoutException &)
+catch (const Poco::TimeoutException&)
{
Log::debug("SocketProcessor: Spurious TimeoutException,
ignored");
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 4 commits - loleaflet/build loleaflet/dist loleaflet/src loolwsd/README loolwsd/test
loleaflet/build/deps.js | 22 ++
loleaflet/dist/leaflet.css|3
loleaflet/dist/spreadsheet.css| 70 ++-
loleaflet/src/control/Control.ColumnHeader.js | 142 ++--
loleaflet/src/control/Control.Header.js | 84 +
loleaflet/src/control/Control.MetricInput.js | 102 +++
loleaflet/src/control/Control.RowHeader.js| 147 +++-
loleaflet/src/control/Control.Scroll.js |4
loleaflet/src/control/Control.js |1
loleaflet/src/layer/tile/CalcTileLayer.js |7
loleaflet/src/map/Map.js | 13 +
loolwsd/README|6
loolwsd/test/data/empty.ods |binary
loolwsd/test/httpwstest.cpp | 228 ++
loolwsd/test/run_unit.sh.in | 11 +
loolwsd/test/test.cpp | 65 +--
16 files changed, 844 insertions(+), 61 deletions(-)
New commits:
commit 3d3a11d9c3080848a8f4cb22d1a86c7975069bd4
Author: Henry Castro
Date: Sat Aug 13 20:11:24 2016 -0400
loolwsd: test: column/row re-size
diff --git a/loolwsd/test/data/empty.ods b/loolwsd/test/data/empty.ods
new file mode 100755
index 000..86414ec
Binary files /dev/null and b/loolwsd/test/data/empty.ods differ
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 718b78f..bd57d03 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -83,6 +83,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testEditAnnotationWriter);
CPPUNIT_TEST(testInsertAnnotationCalc);
CPPUNIT_TEST(testStateUnoCommand);
+CPPUNIT_TEST(testColumnRowResize);
+CPPUNIT_TEST(testOptimalResize);
CPPUNIT_TEST_SUITE_END();
@@ -114,6 +116,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
void testEditAnnotationWriter();
void testInsertAnnotationCalc();
void testStateUnoCommand();
+void testColumnRowResize();
+void testOptimalResize();
void loadDoc(const std::string& documentURL);
@@ -141,6 +145,8 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
int newWidth, int newHeight)>
checkhandler);
void testStateChanged(const std::string& filename,
std::vector& vecComands);
+double getColRowSize(const std::string& property, const std::string&
message, int index);
+double getColRowSize(const std::shared_ptr& socket,
const std::string& item, int index);
public:
HTTPWSTest()
@@ -1846,6 +1852,228 @@ void HTTPWSTest::testStateUnoCommand()
}
}
+double HTTPWSTest::getColRowSize(const std::string& property, const
std::string& message, int index)
+{
+Poco::JSON::Parser parser;
+const auto result = parser.parse(message);
+const auto& command = result.extract();
+auto text = command->get("commandName").toString();
+
+CPPUNIT_ASSERT_EQUAL(std::string(".uno:ViewRowColumnHeaders"), text);
+CPPUNIT_ASSERT(command->isArray(property));
+
+auto array = command->getArray(property);
+
+CPPUNIT_ASSERT(array->isObject(index));
+
+auto item = array->getObject(index);
+
+CPPUNIT_ASSERT(item->has("size"));
+
+return item->getValue("size");
+}
+
+double HTTPWSTest::getColRowSize(const std::shared_ptr&
socket, const std::string& item, int index)
+{
+std::vector response;
+response = getResponseMessage(socket, "commandvalues:",
"testColumnRowResize ");
+CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message as
expected", !response.empty());
+std::vector json(response.begin() +
std::string("commandvalues:").length(), response.end());
+json.push_back(0);
+return getColRowSize(item, json.data(), index);
+}
+
+void HTTPWSTest::testColumnRowResize()
+{
+try
+{
+std::vector response;
+std::string documentPath, documentURL;
+double oldHeight, oldWidth;
+
+getDocumentPathAndURL("setclientpart.ods", documentPath, documentURL);
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
documentURL);
+
+auto socket = loadDocAndGetSocket(_uri, documentURL,
"testColumnRowResize ");
+
+const std::string commandValues = "commandvalues
command=.uno:ViewRowColumnHeaders";
+sendTextFrame(socket, commandValues);
+response = getResponseMessage(socket, "commandvalues:",
"testColumnRowResize ");
+CPPUNIT_ASSERT_MESSAGE("did not receive a commandvalues: message as
expected", !response.empty());
+{
+std::vector json(response.begin() +
std::string("commandvalues:").length(), response.end());
+json.push_back(0);
+
+// get column 2
+oldHeight = getColRowSize("rows", json.data(), 1);
+// get row 2
+oldWidth = getColRowSize("columns", json.data(), 1);
+}
+
+// send column width
+
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.1-5'
Tag 'cp-5.1-5' created by Andras Timar at 2016-09-01 16:49 + cp-5.1-5 Changes since cp-5.1-4-41: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.1-5'
Tag 'cp-5.1-5' created by Andras Timar at 2016-09-01 16:49 + cp-5.1-5 Changes since libreoffice-5-1-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.1-5'
Tag 'cp-5.1-5' created by Andras Timar at 2016-09-01 16:49 + cp-5.1-5 Changes since cp-5.1-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.1-5'
Tag 'cp-5.1-5' created by Andras Timar at 2016-09-01 16:49 + cp-5.1-5 Changes since cp-5.1-3: Andras Timar (1): Update pt_PT dictionary to version 16.7.4.1 --- pt_PT/description.xml |2 - pt_PT/pt_PT.aff | 25 +++-- pt_PT/pt_PT.dic | 93 +++--- 3 files changed, 74 insertions(+), 46 deletions(-) --- ___ 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.0' - 2 commits - sc/qa sc/sdi sc/source
sc/qa/unit/tiledrendering/tiledrendering.cxx | 43 +++
sc/sdi/scalc.sdi |8 +---
sc/source/ui/view/cellsh3.cxx| 49 +--
3 files changed, 92 insertions(+), 8 deletions(-)
New commits:
commit fb069a007d866132c6aacfc33b5671a94046a274
Author: Henry Castro
Date: Tue Aug 23 14:13:57 2016 -0400
sc lok: fix re-sizing several rows/columns at once
Reviewed-on: https://gerrit.libreoffice.org/28351
Tested-by: Jenkins
Reviewed-by: Henry Castro
Conflicts:
sc/source/ui/view/cellsh3.cxx
Change-Id: I7b3760432aa4b3120bfd586a1abc42a46fff0df8
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 75607e0..eade314 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -548,10 +548,19 @@ void ScCellShell::Execute( SfxRequest& rReq )
pReqArgs->HasItem( FN_PARAM_2, &pHeight ) )
{
std::vector aRanges;
-SCCOLROW nRow = static_cast(pRow)->GetValue() - 1;
-sal_uInt16 nHeight = static_cast(pHeight)->GetValue();
+SCCOLROW nRow = static_cast(pRow)->GetValue() - 1;
+sal_uInt16 nHeight = static_cast(pHeight)->GetValue();
+ScMarkData& rMark = GetViewData()->GetMarkData();
+
+if ( rMark.IsRowMarked( static_cast(nRow) ) )
+{
+aRanges = rMark.GetMarkedRowSpans();
+}
+else
+{
+aRanges.push_back(sc::ColRowSpan(nRow, nRow));
+}
-aRanges.push_back(sc::ColRowSpan(nRow, nRow));
pTabViewShell->SetWidthOrHeight(false, aRanges,
SC_SIZE_DIRECT, nHeight);
}
else if ( pReqArgs )
@@ -644,10 +653,19 @@ void ScCellShell::Execute( SfxRequest& rReq )
pReqArgs->HasItem( FN_PARAM_2, &pWidth ) )
{
std::vector aRanges;
-SCCOLROW nColumn = static_cast(pColumn)->GetValue() - 1;
-sal_uInt16 nWidth = static_cast(pWidth)->GetValue();
+SCCOLROW nColumn = static_cast(pColumn)->GetValue() - 1;
+sal_uInt16 nWidth = static_cast(pWidth)->GetValue();
+ScMarkData& rMark = GetViewData()->GetMarkData();
+
+if ( rMark.IsColumnMarked( static_cast(nColumn) ) )
+{
+aRanges = rMark.GetMarkedColSpans();
+}
+else
+{
+aRanges.push_back(sc::ColRowSpan(nColumn, nColumn));
+}
-aRanges.push_back(sc::ColRowSpan(nColumn, nColumn));
pTabViewShell->SetWidthOrHeight(true, aRanges,
SC_SIZE_DIRECT, nWidth);
}
else if ( pReqArgs )
commit dcec2e81a2f70e830ba7974ec1991cf92afd9133
Author: Henry Castro
Date: Fri Jul 29 15:00:49 2016 -0400
sc lok: add parameters for column/row resize
Reviewed-on: https://gerrit.libreoffice.org/27701
Tested-by: Jenkins
Reviewed-by: Henry Castro
Conflicts:
sc/qa/unit/tiledrendering/tiledrendering.cxx
Change-Id: I189178b6060c229dd8d93b6fdee7d4d81354ced5
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 82f126f..72b2002 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -58,6 +58,7 @@ public:
void testSortAscendingDescending();
void testPartHash();
void testDocumentSize();
+void testColRowResize();
#endif
CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
@@ -66,6 +67,7 @@ public:
CPPUNIT_TEST(testSortAscendingDescending);
CPPUNIT_TEST(testPartHash);
CPPUNIT_TEST(testDocumentSize);
+CPPUNIT_TEST(testColRowResize);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -320,6 +322,47 @@ void ScTiledRenderingTest::testDocumentSize()
comphelper::LibreOfficeKit::setActive(false);
}
+void ScTiledRenderingTest::testColRowResize()
+{
+comphelper::LibreOfficeKit::setActive();
+ScModelObj* pModelObj = createDoc("sort-range.ods");
+ScDocShell* pDocSh = dynamic_cast< ScDocShell* >(
pModelObj->GetEmbeddedObject() );
+CPPUNIT_ASSERT(pDocSh);
+
+ScTabViewShell* pViewShell = pDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pViewShell);
+
+
pViewShell->registerLibreOfficeKitViewCallback(&ScTiledRenderingTest::callback,
this);
+
+uno::Sequence aArgs(2);
+ScDocument& rDoc = pDocSh->GetDocument();
+// Col 3, Tab 0
+int nOldWidth = rDoc.GetColWidth(static_cast(2),
static_cast(0), false);
+
+aArgs[0].Name = OUString
[Libreoffice-commits] online.git: loolwsd/IoUtil.cpp
loolwsd/IoUtil.cpp | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit a97058705355c68f3ef3d5ba2cd02fab97bbb0ec
Author: Tor Lillqvist
Date: Thu Sep 1 19:44:51 2016 +0300
Ignore unexpected TimeoutException from receiveFrame() in SocketProcessor()
Seems to get rid of some (maybe all) "unexpected connection error"
issues for me at least.
diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 868b4ba..8077cab 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -96,7 +96,15 @@ void SocketProcessor(const std::shared_ptr& ws,
}
payload.resize(payload.capacity());
-n = receiveFrame(*ws, payload.data(), payload.capacity(), flags);
+try
+{
+n = receiveFrame(*ws, payload.data(), payload.capacity(),
flags);
+}
+catch (const TimeoutException &)
+{
+Log::debug("SocketProcessor: Spurious TimeoutException,
ignored");
+continue;
+}
payload.resize(n > 0 ? n : 0);
if (n <= 0 || ((flags & WebSocket::FRAME_OP_BITMASK) ==
WebSocket::FRAME_OP_CLOSE))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods: fails with Assertion
Hi Alex, On Wednesday, 2016-08-31 19:30:35 +0100, Alex McMurchy wrote: > When compiling LibreOffice I get a failed Unit test. The problem occurs in > sc/qa/unit/functions_test.cxx with > > > CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, rDoc.GetValue(1, 2, 0), 1e-14); > > whilst testing sc/qa/unit/data/functions/fods/chiinv.fods. The code > sc/qa/unit/functions_test.cxx looks to me as though it's performed for all > these .fods test files so why it should fail on one and not the rest is > strange indeed. Ah, finally someone who hopefully can reproduce such error.. ;-) > Any suggestions on how I can resolve this problem will be appreciated. Please load that document in your built office instance, i.e. ./instdir/program/soffice ./sc/qa/unit/data/functions/fods/chidist.fods & answer No to the question whether links should be updated, when loaded hit Shift+Ctrl+F9 and tell us where / in which cell on the second sheet (the first sheet is just the summary) it fails, and what the result of the calculated formula (column A) in that row is. Do not save the document as it is part of the repository's source tree and could get committed by accident. Which platform and compiler are you on btw? 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
minutes of ESC call ...
* Present: + Stephan, Sophie, Robinson, Lionel, Caolan, Heiko, Kendy, JanI, Miklos, Noel, Olivier, David Tardon, Michael M, Christian, Michael S, Norbert, Armin, Thorsten, Bubli, Xisco * Completed Action Items: + poke at missing CrashTest VM E-mails (Cloph) [ modified the send-email script to work with gmail; should send a mail, manually triggered - but not done yet ] + get GSOC students to write plain-text help (GSOC mentors) [ got feedback from a couple, thanks to mentors (Olivier) ] * Pending Action Items: + create mentor summit proposal (Thorsten) [ Moggi asking his teachers, any other mentors interested in going ? ] + poke at MSDN licenses (Michael) [ waiting for a response on new process, will poke again ] + investigate a cron job that queries & auto-merges (Norbert) [ the solution proposed by David - using his query & a JSON script to refine it - will work - needs a bit more python (Norbert) ] + tweak UI and get LiveConnect API key / build case for board (Christian) + still need to get API key, rest is done + attempt to re-build a recent gstreamer 1.0 / core spec file on our CentOS6 base (tdf#94508) (Christian) * Release Engineering update (Christian) + 5.2 → 5.2.1 RC2 + now public, announce at LibO con. + 5.2.2 RC1 September 6th + next week; Jan doing that. + 5.1 → 5.1.6 rc1 Oct 4th + 5.3 → 5.3.0 alpha 1 Oct 18th + Android & iOS Remote + building a new version of the Android code, to see if it works. + if so push this weekend. * LibreOffice Conference in Brno (Kendy) + if anyone had trouble booking the Hotel Vista + was 'booked' and wouldn't reserve at it - but is now free. + some big cancellation there. + prepare slides, make sure you've booked travel, etc. + register if you didn't do so already: http://conference.libreoffice.org/2016/registration/ + is there some way to check if you're registered ? (Miklos) + if you receive the mails from the conference@global list, then you are registered (Sophie) + please make sure to register even if you are a speaker (Cloph) + no auto-registration there + Cor - asked for a list of registrations + Sophie to publish a list; concerns (JanI) registered: * Stephan * Sophie * Lionel * Heiko * Kendy * Jani (twice :-) one for each presentation :-) * Miklos * Olivier * David * Christian * Michael S * Norbert * Armin * Thorsten * Bubli * Xisco not registered: * Robinson, thought I did -> [done] * Caolàn, oops, sure I did at some stage * Noel (not coming) * Michael M (will do) * Documentation (Olivier) + Committed new help pages on CMIS + needs linguistic review before translation. + Book "Getting Started 5.2" being updated + Next: + new pages with GSOC work (thanks to mentors and students!) + LibOCon + more GS 5.2 chapter updates * GSoC 2016 (Thorsten) + 1 student failed final evaluation + within the average & statistical variation. + happy; even failing students delivered some useful work after cleanup. * UX Update (Heiko) + needsUXAdvice of 2016-Sep-01: Total 514 (+7), Resolved 7, Created 7 Base 1 Calc 14 Draw 74 Extensions1 filters and storage1 (+1) framework 3 Impress 9 LibreOffice 356 (-1) Localization 1 UI 14 Writer 40 (+7) + Hot stuff * LibO as Dreamweaver/Pagemaker replacement (tdf#101772; rejected) + write a lot of tickets for UX advise review + some rejected + don't need another visual XML/HTML editor + not our primary goal * Cursor navigation (ctrl+up same as shift+ctrl+up; tdf#100777) + currently jump to the beginning of the previous paragraph. + flagging that those who care -> look at it (Michael) * Crashtest update (Caolan) + 1 import failure, 0 export failures 116 (last time 1680) coverity issues + great direction, new ones around move/assignment in C++11 * Hackfests (Thorsten) + next venues / suggestions + Akademy / FSFE summit - coming weekend & next-week (Thorsten) + plan to spend half a day over the weekend in Berlin. + Heiko coming on Sunday, perhaps Sat. evening too. + more suggestions welcome + Code for Hamburg (Eike) + Friday to Sunday hacking event https://redmine.documentfoundation.org/issues/1999 + Koerberstiftung: Digital Empowerment http://www.kampnagel.de/de/programm/datapolitics/?datum=&id_datum=4756 http://www.koerber-stiftung.de/innovation/im-fokus-digitale-muendigkeit.html + Leuphana? http://www.leuphana.de/en/research-cente
gerrit changes depending one on another (was: Maarten Bosmans license statement)
Hi Maarten, On Wednesday, 2016-08-31 10:49:11 +0200, Maarten Bosmans wrote: > What is the correct way to submit a patch series to gerrit? I'd like > to avoid squashing all patches into one commit, but there also has to > be a way for reviewers to see that all patches in a series are > related. I'm fine with separate changes that depend on another (preferrably if they're clean and wellformed and can be applied and built as is in order ;-) Gerrit indicates the relationship through the "Related Changes" list on the right hand side, but that sometimes can also be misleading. Adding a short "This depends on https://gerrit.libreoffice.org/" as gerrit comment / Reply after having submitted the changes is nice for reviewers. Having a topic name in the topic field for both changes is also a good indicator. A topic can be conveniently set already when pushing the changes to gerrit using the git-review tool: git review -t mytopic Or plain git: git push gerrit HEAD:refs/for/master/mytopic 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
Re: gerrit changes depending one on another (was: Maarten Bosmans license statement)
> On 01 Sep 2016, at 18:01, Eike Rathke wrote: > > Hi Maarten, > > On Wednesday, 2016-08-31 10:49:11 +0200, Maarten Bosmans wrote: > >> What is the correct way to submit a patch series to gerrit? I'd like >> to avoid squashing all patches into one commit, but there also has to >> be a way for reviewers to see that all patches in a series are >> related. > > I'm fine with separate changes that depend on another (preferrably if > they're clean and wellformed and can be applied and built as is in order ;-) > Gerrit indicates the relationship through the "Related Changes" list on > the right hand side, but that sometimes can also be misleading. As I was the one who made the first review comment about not submitting multiple changes to a single file, let me just say: I too am fine with separate changes, and even endorse it, because the git log will more accurately show what happened. > Adding a short "This depends on https://gerrit.libreoffice.org/" > as gerrit comment / Reply after having submitted the changes is nice for > reviewers. Had this line been there, then we would probably never have had this mail thread :-) reds jan I. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/compiler.hxx | 15 +--
sc/source/core/tool/token.cxx |5 +
2 files changed, 6 insertions(+), 14 deletions(-)
New commits:
commit dcc56d663059b3baced58e34bb8186a05ceadf53
Author: Eike Rathke
Date: Thu Sep 1 14:16:03 2016 +0200
remove now pointless comment about alignment boundaries
... and adapt ScRawToken size comment to reality.
Change-Id: Ia9c1cecc5d01f49c6d5fbe5b53472e6f0ef153cb
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1e68576..ba91d2a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -204,10 +204,7 @@ namespace
} // namespace
-// Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2)
-
-// Since RawTokens are temporary for the compiler, don't align on 4k and waste
memory.
-// ScRawToken size is FixMembers + MAXSTRLEN + ~4 ~= 1036
+// ScRawToken size is OpCode + StackVar + MAXSTRLEN+1 + ~20 ~= 1049
IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken )
// Need a whole bunch of ScSingleRefToken
commit f684d1edfd48b686549b893dc0612c31d9617bdc
Author: Eike Rathke
Date: Thu Sep 1 13:48:51 2016 +0200
cosmetics
Change-Id: I22d4c04db2917f96e3c9ca1a71c628e859ad13c5
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index ba32974..14e760e 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -91,7 +91,6 @@ class CompileFormulaContext;
// constants and data types internal to compiler
-
struct ScRawToken
{
friend class ScCompiler;
@@ -99,19 +98,19 @@ struct ScRawToken
// the private dtor) and know what they're doing..
friend class ScTokenArray;
protected:
-OpCode eOp;
-formula::StackVar eType;// type of data; this determines how the
unions are used
+OpCode eOp;
+formula::StackVar eType; // type of data; this determines how the
unions are used
public:
union {
double nValue;
struct {
-sal_uInt8cByte;
+sal_uInt8 cByte;
boolbIsInForceArray;
} sbyte;
ScComplexRefData aRef;
struct {
-sal_uInt16 nFileId;
-sal_Unicode cTabName[MAXSTRLEN+1];
+sal_uInt16 nFileId;
+sal_Unicode cTabName[MAXSTRLEN+1];
ScComplexRefDataaRef;
} extref;
struct {
commit ce23f28157e8925be815d7e7340e229e4302ce15
Author: Eike Rathke
Date: Thu Sep 1 13:32:12 2016 +0200
move comment to where it belongs
Change-Id: Ia3110b911e6d367a3b5d246a95384efc2f72f9f8
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 849e8ca..ba32974 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -91,10 +91,6 @@ class CompileFormulaContext;
// constants and data types internal to compiler
-/*
-OpCode eOp;// OpCode
-formula::StackVar eType; // type of data
- */
struct ScRawToken
{
@@ -104,7 +100,7 @@ struct ScRawToken
friend class ScTokenArray;
protected:
OpCode eOp;
-formula::StackVar eType;
+formula::StackVar eType;// type of data; this determines how the
unions are used
public:
union {
double nValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice's New Area Dialog Box crashes when compiled with Clang
On 08/31/2016 11:59 PM, slacka wrote: Here is the backtrace made with $ instdir/program/soffice --backtrace, and the steps listed in my first post. Is there anything else I can do? There's no backtrace here (or it was an attachment that got scrubbed by the mailing list; in which case just quote it inline in the mail body, with those "> " line prefixes). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-9' - loleaflet/dist
dev/null |binary
loleaflet/dist/toolbar.css|1 -
loleaflet/dist/toolbar/toolbar.js | 16
3 files changed, 17 deletions(-)
New commits:
commit 0dadbb8f43c146ec188327454755c680145fde98
Author: Andras Timar
Date: Thu Sep 1 17:20:14 2016 +0200
Revert "Add footnote and text wrap functions"
This reverts commit 5902700922d110aee29d67be6224094bb521132d.
diff --git a/loleaflet/dist/images/lc_insertfootnote.png
b/loleaflet/dist/images/lc_insertfootnote.png
deleted file mode 100644
index 65b110f..000
Binary files a/loleaflet/dist/images/lc_insertfootnote.png and /dev/null differ
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index aef6e23..40f53f5 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -246,7 +246,6 @@ button.leaflet-control-search-next
.w2ui-icon.save{ background: url('/loleaflet/dist/images/lc_save.png')
no-repeat center !important; }
.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/lc_saveas.png')
no-repeat center !important; }
.w2ui-icon.strikeout{ background:
url('/loleaflet/dist/images/lc_strikeout.png') no-repeat center !important; }
-.w2ui-icon.insertfootnote{ background:
url('/loleaflet/dist/images/lc_insertfootnote.png') no-repeat center
!important; }
.w2ui-icon.underline{ background:
url('/loleaflet/dist/images/lc_underline.png') no-repeat center !important; }
.w2ui-icon.undo{ background: url('/loleaflet/dist/images/lc_undo.png')
no-repeat center !important; }
.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/plus.png')
no-repeat center !important; }
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index f6597f2..218bb46 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -171,11 +171,6 @@ function onClick(id, item, subItem) {
else if (id === 'lastrecord') {
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
}
- else if (id.startsWith('menu:wrap:wrap-'))
- {
- var wrapType = id.substring('menu:wrap:wrap-'.length);
- map.toggleCommandState(wrapType);
- }
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
@@ -334,15 +329,6 @@ $(function () {
name: 'toolbar-up',
items: [
{type: 'html', id: 'left'},
- {type: 'menu', id: 'writer:menu:wrap', caption:
_('Textwrap'), items: [
- { text: _('No wrap'), id: 'wrap-WrapOff' },
- { text: _('Page wrap'), id: 'wrap-WrapOn' },
- { text: _('Wrap anchor only'), id:
'wrap-WrapAnchorOnly' },
- { text: _('Ideal wrap'), id: 'wrap-WrapIdeal' },
- { text: _('Left wrap'), id: 'wrap-WrapLeft' },
- { text: _('Right wrap'), id: 'wrap-WrapRight' },
- { text: _('Wrap through'), id:
'wrap-WrapThrough' }
- ]},
{type: 'button', id: 'save', img: 'save', hint:
_('Save'), uno: 'Save'},
{type: 'break'},
{type: 'button', id: 'undo', img: 'undo', hint:
_('Undo'), uno: 'Undo'},
@@ -358,8 +344,6 @@ $(function () {
{type: 'button', id: 'underline', img: 'underline',
hint: _('Underline'), uno: 'Underline'},
{type: 'button', id: 'strikeout', img: 'strikeout',
hint: _('Strikeout'), uno: 'Strikeout'},
{type: 'break'},
- {type: 'button', id: 'insertfootnote', img:
'insertfootnote', hint: _('Insert Footnote'), uno: 'InsertFootnote' },
- {type: 'break' },
{type: 'html', id: 'fontcolor-html', html: ''},
{type: 'button', id: 'fontcolor', img: 'color', hint:
_('Font color')},
{type: 'html', id: 'backcolor-html', html: ''},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'distro/collabora/collabora-online-1-9'
New branch 'distro/collabora/collabora-online-1-9' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/collabora-online-1-9-branch-point'
Tag 'collabora-online-1-9-branch-point' created by Andras Timar at 2016-09-01 15:18 + collabora-online-1-9-branch-point Changes since libreoffice-5-2-branch-point-513: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/PaletteManager.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e11931da72eabd98f9ea49ae93bd76039b283268
Author: Stephan Bergmann
Date: Thu Sep 1 17:04:06 2016 +0200
GetPaletteName() may change pColorList
...since 571866eaba914742a48938abb6c8495e97868bf1 "[GSoC] Rework of color
tab"
Change-Id: Ia4ad8bf675abe6b279527eaed0b0e5ebc5b2f180
diff --git a/svx/source/tbxctrls/PaletteManager.cxx
b/svx/source/tbxctrls/PaletteManager.cxx
index 13f53a5..db9b012 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -188,7 +188,8 @@ void PaletteManager::SetPalette( sal_Int32 nPos )
pColorList = XPropertyList::AsColorList(
XPropertyList::CreatePropertyListFromURL(
XPropertyListType::Color,
GetSelectedPalettePath()));
-pColorList->SetName(GetPaletteName());
+auto name = GetPaletteName(); // may change pColorList
+pColorList->SetName(name);
if(pColorList->Load())
{
SfxObjectShell* pShell = SfxObjectShell::Current();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/compiler.hxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 9f765added5d3c672de4bda4493b65f9ce1b8187
Author: Stephan Bergmann
Date: Thu Sep 1 17:01:51 2016 +0200
No more need for ScRawTokenBase
...since 05eda0dc19af81ed0d5167bdd0a92113e6e8bc60 "loplugin:unusedfields in
sc"
Change-Id: Id80ec49fc93a6d599e2b36727c0424af77fae693
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 9699c4a..849e8ca 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -96,19 +96,15 @@ class CompileFormulaContext;
formula::StackVar eType; // type of data
*/
-struct ScRawTokenBase
-{
-protected:
-OpCode eOp;
-formula::StackVar eType;
-};
-
-struct ScRawToken: private ScRawTokenBase
+struct ScRawToken
{
friend class ScCompiler;
// Friends that use a temporary ScRawToken on the stack (and therefore need
// the private dtor) and know what they're doing..
friend class ScTokenArray;
+protected:
+OpCode eOp;
+formula::StackVar eType;
public:
union {
double nValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/profilesafemode'
New branch 'feature/profilesafemode' available with the following commits: commit 767bee81dac519cb6f1bd9dd8e1c13945f501a61 Author: Armin Le Grand Date: Thu Sep 1 16:16:39 2016 +0200 profilesafe: Implemented BackupFileHelper Added helper class to allow easy creation/deployment of backups of a file (here: registrymodifications). It works like a 'stack' of backups, supüports easy push/pop of backed-up versions. Change-Id: Ie19e1209534f23a3dbd6106a5ca13b24b8fefe4d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/loolwsd.xml.in
loolwsd/LOOLWSD.cpp|4
loolwsd/loolwsd.xml.in |2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit e41e10750070210103b1a92b2905d38f38a74a2f
Author: Jan Holesovsky
Date: Thu Sep 1 16:24:22 2016 +0200
Fix --disable-ssl case.
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index db7f135..c2c7068 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1439,7 +1439,11 @@ void LOOLWSD::initialize(Application& self)
Log::warn("SSL support: SSL is disabled.");
}
+#if ENABLE_SSL
LOOLWSD::SSLTermination.set(getConfigValue(conf, "ssl.termination",
true));
+#else
+LOOLWSD::SSLTermination.set(false);
+#endif
Cache = getPathFromConfig("tile_cache_path");
SysTemplate = getPathFromConfig("sys_template_path");
diff --git a/loolwsd/loolwsd.xml.in b/loolwsd/loolwsd.xml.in
index 2cbf667..6ddba26 100644
--- a/loolwsd/loolwsd.xml.in
+++ b/loolwsd/loolwsd.xml.in
@@ -35,7 +35,7 @@
true
-true
+true
/etc/loolwsd/cert.pem
/etc/loolwsd/key.pem
/etc/loolwsd/ca-chain.cert.pem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loolwsd/IoUtil.cpp loolwsd/LOOLKit.cpp
loolwsd/IoUtil.cpp |2 +-
loolwsd/LOOLKit.cpp |4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit be4e71c0f0d62d7962396b6242f94e9e7dfc5f57
Author: Tor Lillqvist
Date: Thu Sep 1 17:16:46 2016 +0300
Fix misleading logging
Don't mention 'TerminationFlag' in the log line when that lovely
global variable isn't what we are logging there (but the local 'stop'
boolean variable). Also, output its value as "true" or "false", not
numerically.
diff --git a/loolwsd/IoUtil.cpp b/loolwsd/IoUtil.cpp
index 7b8adfc..868b4ba 100644
--- a/loolwsd/IoUtil.cpp
+++ b/loolwsd/IoUtil.cpp
@@ -164,7 +164,7 @@ void SocketProcessor(const std::shared_ptr& ws,
}
}
-Log::info() << "SocketProcessor finishing. TerminationFlag: " << stop
+Log::info() << "SocketProcessor finishing. stop: " << (stop ? "true" :
"false")
<< ", n: " << n
<< ", payload size: " << payload.size()
<< ", flags: " << std::hex << flags << Log::end;
commit eb4b4b6ca056d2a0221735e3d781a1be18278797
Author: Tor Lillqvist
Date: Thu Sep 1 17:04:02 2016 +0300
Remove leftover unused field Connection::_stop
Not sure what the stop() function should do now, if anything. Maybe
_stop should be kept and actually tested somewhere, like in the third
lambda passed to IoUtil::SocketProcessor() in Connection::run()?
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 84a02f2..0613aa7 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -241,7 +241,6 @@ public:
_sessionId(session->getId()),
_session(std::move(session)),
_ws(std::move(ws)),
-_stop(false),
_joined(false)
{
Log::info("Connection ctor in child for " + _sessionId);
@@ -270,7 +269,7 @@ public:
void stop()
{
-_stop = true;
+// What should we do here?
}
void join()
@@ -347,7 +346,6 @@ private:
std::shared_ptr _session;
std::shared_ptr _ws;
std::mutex _threadMutex;
-std::atomic _stop;
std::atomic _joined;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Library_gie.mk filter/source
filter/Library_gie.mk | 66 +-
filter/source/graphicfilter/idxf/dxfreprd.cxx | 64 ++---
filter/source/graphicfilter/idxf/dxfreprd.hxx | 16 ++
3 files changed, 98 insertions(+), 48 deletions(-)
New commits:
commit 1a9a77f84cac68bd5374df3e9ee4df88dc87a0ac
Author: Mike Kaganski
Date: Thu Sep 1 01:02:11 2016 +1000
Related: tdf#74299: use OEM encoding for ancient DXF
This patch analyses DXF version data to heuristically detect
which files use OEM text encoding (DOS versions of AutoCAD).
Also, it uses LO's currently-selected default document language,
instead of system locale, so that user can change that to match
language of the DXF, and get correct result.
Change-Id: I3aec7e24f3d7efca35d0dd1acca8b277a076f210
Reviewed-on: https://gerrit.libreoffice.org/28556
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk
index d39504b2..2c00c75 100644
--- a/filter/Library_gie.mk
+++ b/filter/Library_gie.mk
@@ -23,46 +23,50 @@ $(eval $(call gb_Library_use_external,gie,boost_headers))
$(eval $(call gb_Library_use_sdk_api,gie))
+$(eval $(call gb_Library_use_custom_headers,gie,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_use_libraries,gie,\
- basegfx \
+basegfx \
comphelper \
i18nlangtag \
svt \
- vcl \
+vcl \
utl \
- tl \
+tl \
tk \
- cppu \
- sal \
- $(gb_UWINAPI) \
+cppu \
+sal \
+$(gb_UWINAPI) \
))
$(eval $(call gb_Library_add_exception_objects,gie,\
- filter/source/graphicfilter/egif/egif \
- filter/source/graphicfilter/etiff/etiff \
- filter/source/graphicfilter/eps/eps \
- filter/source/graphicfilter/egif/giflzwc \
- filter/source/graphicfilter/itiff/ccidecom \
- filter/source/graphicfilter/itiff/itiff \
- filter/source/graphicfilter/itiff/lzwdecom \
- filter/source/graphicfilter/ipict/ipict \
- filter/source/graphicfilter/ipict/shape \
- filter/source/graphicfilter/ipcx/ipcx \
- filter/source/graphicfilter/iras/iras \
- filter/source/graphicfilter/itga/itga \
- filter/source/graphicfilter/ieps/ieps \
- filter/source/graphicfilter/ipsd/ipsd \
- filter/source/graphicfilter/ipbm/ipbm \
- filter/source/graphicfilter/ios2met/ios2met \
- filter/source/graphicfilter/idxf/dxf2mtf \
- filter/source/graphicfilter/idxf/dxfblkrd \
- filter/source/graphicfilter/idxf/dxfentrd \
- filter/source/graphicfilter/idxf/dxfgrprd \
- filter/source/graphicfilter/idxf/dxfreprd \
- filter/source/graphicfilter/idxf/dxftblrd \
- filter/source/graphicfilter/idxf/dxfvec \
- filter/source/graphicfilter/idxf/idxf \
- filter/source/graphicfilter/ipcd/ipcd \
+filter/source/graphicfilter/egif/egif \
+filter/source/graphicfilter/etiff/etiff \
+filter/source/graphicfilter/eps/eps \
+filter/source/graphicfilter/egif/giflzwc \
+filter/source/graphicfilter/itiff/ccidecom \
+filter/source/graphicfilter/itiff/itiff \
+filter/source/graphicfilter/itiff/lzwdecom \
+filter/source/graphicfilter/ipict/ipict \
+filter/source/graphicfilter/ipict/shape \
+filter/source/graphicfilter/ipcx/ipcx \
+filter/source/graphicfilter/iras/iras \
+filter/source/graphicfilter/itga/itga \
+filter/source/graphicfilter/ieps/ieps \
+filter/source/graphicfilter/ipsd/ipsd \
+filter/source/graphicfilter/ipbm/ipbm \
+filter/source/graphicfilter/ios2met/ios2met \
+filter/source/graphicfilter/idxf/dxf2mtf \
+filter/source/graphicfilter/idxf/dxfblkrd \
+filter/source/graphicfilter/idxf/dxfentrd \
+filter/source/graphicfilter/idxf/dxfgrprd \
+filter/source/graphicfilter/idxf/dxfreprd \
+filter/source/graphicfilter/idxf/dxftblrd \
+filter/source/graphicfilter/idxf/dxfvec \
+filter/source/graphicfilter/idxf/idxf \
+filter/source/graphicfilter/ipcd/ipcd \
))
# vim: set noet sw=4 ts=4:
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx
b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 6a80a96..838e270 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -19,8 +19,11 @@
#include
-#include
+#include "dxfreprd.hxx"
#include "osl/nlsupport.h"
+#include "officecfg/Setup.hxx"
+#include "officecfg/Office/Linguistic.hxx"
+#include "unotools/wincodepage.hxx"
//--DXFBoundingBox
@@ -128,9 +131,8 @@ void DXFPalette::SetColor(sal_uInt8 nIndex, sal_uInt8 nRed,
sal_uInt8 nGreen, sa
DXFRepresentation::DXFRepresentation()
-: bUseUTF8(false)
+: mEnc(RTL_TEXTENCODING_DONTKNOW)
{
-setTextEncoding(osl_getTextEncodingFromLocale(nullptr)); // Use default
encoding if none specified
setGlobalLineTypeScale
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - xmloff/source
xmloff/source/text/txtparae.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 92b384b197b8f6c85127e277b10e09936d0c6021
Author: Caolán McNamara
Date: Thu Sep 1 11:52:31 2016 +0100
Resolves: tdf#100182 index entries lost on save
regression from...
commit 3e6ba91e2d6d362f4af91566e740f5dbc310e026
Date: Wed Nov 25 10:53:40 2015 +0200
loplugin:unusedfields in include/xmloff
Change-Id: I979743671e9a2e868d815f917427588b7b0320ba
which removed ctor for sDocumentIndexMark and sDocumentIndex
when it should have just removed sDocumentIndeb
Change-Id: I5ed5a2d30a3f76c6b45bbf74a3720420d0fcf676
(cherry picked from commit 9292ca07dd3f9ee9dedd765ba7696a626bc25476)
Reviewed-on: https://gerrit.libreoffice.org/28588
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index efe5a79..3ff7615 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1180,6 +1180,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sCharStyleName("CharStyleName"),
sCharStyleNames("CharStyleNames"),
sContourPolyPolygon("ContourPolyPolygon"),
+sDocumentIndexMark("DocumentIndexMark"),
sEndNotice("EndNotice"),
sFootnote("Footnote"),
sFootnoteCounting("FootnoteCounting"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/edtwin.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 67192b3cfa54be7b0b60d450783ac2ac4c38bbc6
Author: Khaled Hosny
Date: Thu Sep 1 13:20:41 2016 +0200
tdf#101361: Fix cursor key movement in RTL text
Revert "tdf#32531 Fix for key movement in table cell of different
directionality"
This reverts commit a215cec969f7401b08cabb686c5b2b1d803399d0.
This seems like the wrong fix for the original issue, as it breaks how
âvisualâ cursor movement works in RTL text.
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index e493e71..942a01d 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1476,6 +1476,13 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
else if( KEY_LEFT == nKey ) nKey = KEY_DOWN;
else if( KEY_RIGHT == nKey ) nKey = KEY_UP;
}
+
+if ( rSh.IsInRightToLeftText() )
+{
+if( KEY_LEFT == nKey ) nKey = KEY_RIGHT;
+else if( KEY_RIGHT == nKey ) nKey = KEY_LEFT;
+}
+
aKeyEvent = KeyEvent( rKEvt.GetCharCode(),
vcl::KeyCode( nKey,
rKEvt.GetKeyCode().GetModifier() ),
rKEvt.GetRepeat() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loolwsd/ChildSession.cpp loolwsd/ClientSession.cpp loolwsd/ClientSession.hpp loolwsd/DocumentBroker.cpp loolwsd/DocumentBroker.hpp loolwsd/LOOLWSD.cpp loo
loolwsd/ChildSession.cpp|6
loolwsd/ClientSession.cpp |8 --
loolwsd/ClientSession.hpp |9 +++
loolwsd/DocumentBroker.cpp | 14 ++-
loolwsd/DocumentBroker.hpp |2 -
loolwsd/LOOLWSD.cpp | 28 +-
loolwsd/TileCache.cpp | 49 +---
loolwsd/TileCache.hpp |3 --
loolwsd/test/Makefile.am|1
loolwsd/test/TileCacheTests.cpp | 14 ---
loolwsd/test/helpers.hpp|9 ---
11 files changed, 53 insertions(+), 90 deletions(-)
New commits:
commit 16605b928999d10c8e75c3d9c0a959573f7ef55b
Author: Ashod Nakashian
Date: Thu Sep 1 08:27:18 2016 -0400
Revert "loolwsd: canceltiles re-designed using tilecache instead of queue"
This reverts commit 571ff06906960c9840cd65a35914ca0607f72a11.
Change-Id: Icf9caeafc640b815f64211f240cfdac8e91694a1
Reviewed-on: https://gerrit.libreoffice.org/28595
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 88ece98..93a2312 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -119,6 +119,12 @@ bool ChildSession::_handleInput(const char *buffer, int
length)
// Just to update the activity of a view-only client.
return true;
}
+else if (tokens[0] == "canceltiles")
+{
+// This command makes sense only on the command queue level.
+// Shouldn't get this here.
+return true;
+}
else if (tokens[0] == "commandvalues")
{
return getCommandValues(buffer, length, tokens);
diff --git a/loolwsd/ClientSession.cpp b/loolwsd/ClientSession.cpp
index 40d..901d138 100644
--- a/loolwsd/ClientSession.cpp
+++ b/loolwsd/ClientSession.cpp
@@ -147,8 +147,10 @@ bool ClientSession::_handleInput(const char *buffer, int
length)
}
else if (tokens[0] == "canceltiles")
{
-_docBroker->cancelTileRequests(shared_from_this());
-return true;
+if (!_peer.expired())
+{
+return forwardToPeer(_peer, buffer, length, false);
+}
}
else if (tokens[0] == "commandvalues")
{
diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index e313ae3..a89b9d3 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -616,13 +616,6 @@ void
DocumentBroker::handleTileCombinedRequest(TileCombined& tileCombined,
}
}
-void DocumentBroker::cancelTileRequests(const std::shared_ptr&
session)
-{
-std::unique_lock lock(_mutex);
-
-tileCache().cancelTiles(session);
-}
-
void DocumentBroker::handleTileResponse(const std::vector& payload)
{
const std::string firstLine = getFirstLine(payload);
diff --git a/loolwsd/DocumentBroker.hpp b/loolwsd/DocumentBroker.hpp
index 80bf0a3..54ca138 100644
--- a/loolwsd/DocumentBroker.hpp
+++ b/loolwsd/DocumentBroker.hpp
@@ -214,8 +214,6 @@ public:
void handleTileCombinedRequest(TileCombined& tileCombined,
const std::shared_ptr&
session);
-void cancelTileRequests(const std::shared_ptr& session);
-
void handleTileResponse(const std::vector& payload);
void handleTileCombinedResponse(const std::vector& payload);
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 8f05a14..9b76a15 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -461,26 +461,4 @@ int TileCache::subscribeToTileRendering(const TileDesc&
tile, const std::shared_
}
}
-void TileCache::cancelTiles(const std::shared_ptr &subscriber)
-{
-std::unique_lock lock(_tilesBeingRenderedMutex);
-
-const auto sub = subscriber.get();
-
-Log::trace("Cancelling tiles for " + subscriber->getName());
-
-for (auto it = _tilesBeingRendered.begin(); it !=
_tilesBeingRendered.end(); )
-{
-auto& subscribers = it->second->_subscribers;
-Log::trace("Tile " + it->first + " has " +
std::to_string(subscribers.size()) + " subscribers.");
-subscribers.erase(std::remove_if(subscribers.begin(),
subscribers.end(),
- [sub](std::weak_ptr&
ptr){ return ptr.lock().get() == sub; }),
- subscribers.end());
-Log::trace(" Tile " + it->first + " has " +
std::to_string(subscribers.size()) + " subscribers.");
-
-// Remove if there are no more subscribers on this tile.
-it = (subscribers.empty() ? _tilesBeingRendered.erase(it) : ++it);
-}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/TileCache.hpp b/loolwsd/TileCache.hpp
index 5703227..bbe5aa0 100644
--- a/loolwsd/TileCache.hpp
+++ b/loolwsd/TileCache.hpp
@@ -42,9 +42,6 @@ public:
/// Otherwise returns 0 to signify a subscription exists.
int subscribeToTileRendering(const TileDesc& tile, const
std::shared_ptr &subscriber);
-/// Cancels all
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
New commits:
commit f4c0a87991cb574ea86ea75d259cdc7c9a1a0eb9
Author: Ashod Nakashian
Date: Thu Sep 1 08:31:40 2016 -0400
Revert "loolwsd: remove queue thread from child socket handler"
This reverts commit a30526c87ea01026f6ff3f07671ddfc614aebc5e.
Change-Id: Idcbf2a6c4e228a5fb6a890e8cdd58b6137295666
Reviewed-on: https://gerrit.libreoffice.org/28596
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index d3c98b7..84a02f2 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -55,6 +55,7 @@
#include "LibreOfficeKit.hpp"
#include "Log.hpp"
#include "Png.hpp"
+#include "QueueHandler.hpp"
#include "Rectangle.hpp"
#include "TileDesc.hpp"
#include "Unit.hpp"
@@ -291,21 +292,27 @@ public:
try
{
+auto queue = std::make_shared();
+QueueHandler handler(queue, _session, "kit_queue_" +
_session->getId());
+
+Thread queueHandlerThread;
+queueHandlerThread.start(handler);
+std::shared_ptr session = _session;
+
IoUtil::SocketProcessor(_ws,
-[this](const std::vector& payload)
+[&queue](const std::vector& payload)
{
-if (!_session->handleInput(payload.data(), payload.size()))
-{
-Log::info("Socket handler flagged for finishing.");
-return false;
-}
-
+queue->put(payload);
return true;
},
-[this]() { _session->closeFrame(); },
-[]() { return !!TerminationFlag; });
+[&session]() { session->closeFrame(); },
+[&queueHandlerThread]() { return TerminationFlag ||
!queueHandlerThread.isRunning(); });
+
+queue->clear();
+queue->put("eof");
+queueHandlerThread.join();
-if (_session->isCloseFrame())
+if (session->isCloseFrame())
{
Log::trace("Normal close handshake.");
_ws->shutdown();
@@ -1410,7 +1417,6 @@ void lokit_main(const std::string& childRoot,
requestUrl += "&version=" + encodedVersionStr;
free(versionInfo);
}
-
HTTPRequest request(HTTPRequest::HTTP_GET, requestUrl);
HTTPResponse response;
auto ws = std::make_shared(cs, request, response);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_filters_test.mk
sw/CppunitTest_sw_filters_test.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4ec58562d48c26e2ddf4bfad1a692ce4d6cb018e Author: Stephan Bergmann Date: Thu Sep 1 13:56:46 2016 +0200 Missing dependency of test on instdir/share/template/common/internal/html.stw ...when testing sw/qa/core/exportdata/html/pass/cp168.odt, leading to the problem described in bf3c6237bb110d3eb84970e44593a7880e2e8536 "pTemplate can probably be null here" Change-Id: Ic96fabb3cab83b005a1ebae573a5bf4549270603 diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index d3cf68b..9a81076 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -87,4 +87,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) +$(call gb_CppunitTest_get_target,sw_filters_test): \ +$(call gb_Package_get_target,extras_tplwizdesktop) + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/css1atr.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bf3c6237bb110d3eb84970e44593a7880e2e8536
Author: Stephan Bergmann
Date: Thu Sep 1 13:50:06 2016 +0200
pTemplate can probably be null here
Observed with "make clean && make CppunitTest_sw_filters_test" (which
misses a
dependency, a bug to be fixed next, so happens to not set up m_pTemplate in
SwHTMLWriter::WriteStream, so dereferences a null pTemplate here. Don't
know
whether there's also legitimate scenarios that can lead to a null pTemplate
here, but at least the code in SwHTMLWriter::WriteStream setting up
m_pTemplate
takes into account that it can be set up as null, and the code in the called
SwHTMLWriter::GetTemplateFormat takes into account that the passed in
pTemplate
(which used to be the same object as the outer pTemplate/pDoc, before
breaking
IDocumentStylePoolAccess out of SwDoc, see below) can be null.
Regression introduced with 535971f3a166da6c0e44a6b7211c7f8c298f388f
"Refactored
IDocumentStylePoolAccess out of SwDoc."
Change-Id: Iabb4ae2ca018ce3a19756d62b9002b245cb409cd
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 44f0bd5..609b344 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1561,16 +1561,16 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const
SwFormat& rFormat,
switch( nDeep )
{
case CSS1_FMT_ISTAG:
-pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
&pTemplate->getIDocumentStylePoolAccess() );
+pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, pTemplate ==
nullptr ? nullptr : &pTemplate->getIDocumentStylePoolAccess() );
break;
case CSS1_FMT_CMPREF:
pRefFormat = SwHTMLWriter::GetTemplateFormat( nRefPoolId, pDoc );
-pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
&pTemplate->getIDocumentStylePoolAccess() );
+pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
pTemplate == nullptr ? nullptr : &pTemplate->getIDocumentStylePoolAccess() );
bClearSame = false;
break;
default:
pRefFormat = SwHTMLWriter::GetParentFormat( rFormat, nDeep );
-pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
&pTemplate->getIDocumentStylePoolAccess() );
+pRefFormatScript = SwHTMLWriter::GetTemplateFormat( nRefPoolId,
pTemplate == nullptr ? nullptr : &pTemplate->getIDocumentStylePoolAccess() );
bSetDefaults = false;
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/dibtools.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 802f2c88af919b18f08bf4568964ad7087bf9e8a
Author: Stephan Bergmann
Date: Thu Sep 1 13:48:04 2016 +0200
For Valgrind, zero out alignment bytes of 24-bit bitmap, too
...caused false warnings in CppunitTest_sw_filters_test testing
sw/qa/core/exportdata/html/pass/cp168.odt
Change-Id: I48943d5d4999e1b8c9a7ab50e39e65b2171b1b94
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index cf3f686..8814965 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1310,10 +1310,15 @@ bool ImplWriteDIBBits(SvStream& rOStm,
BitmapReadAccess& rAcc, BitmapReadAccess*
}
break;
+case 24:
+{
+//valgrind, zero out the trailing unused alignment bytes
+size_t nUnusedBytes = nAlignedWidth - nWidth * 3;
+memset(pBuf.get() + nAlignedWidth - nUnusedBytes, 0,
nUnusedBytes);
+}
+SAL_FALLTHROUGH;
// #i59239# fallback to 24 bit format, if bitcount is
non-default
default:
-// FALLTHROUGH intended
-case 24:
{
BitmapColor aPixelColor;
const bool bWriteAlpha(32 == nBitCount && pAccAlpha);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 2 commits - loolwsd/LOKitClient.cpp loolwsd/test
loolwsd/LOKitClient.cpp |3 +
loolwsd/test/Makefile.am |4 +-
loolwsd/test/UnitFuzz.cpp | 75 ++
3 files changed, 81 insertions(+), 1 deletion(-)
New commits:
commit db63cdda8d110b606f71895e92341d040e984bf9
Author: Michael Meeks
Date: Thu Sep 1 12:13:35 2016 +0100
Tolerate non-bundled headers.
diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 488644f..5cb96d5 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -69,6 +69,9 @@ extern "C"
CASE(ERROR);
CASE(CONTEXT_MENU);
#undef CASE
+default:
+std::cout << "Unknown callback " << nType;
+break;
}
std::cout << " payload: " << pPayload << std::endl;
}
commit ff442bc06d667fc9608cb950cffeabcba7ea65f8
Author: Michael Meeks
Date: Wed Jun 22 14:57:01 2016 +0100
Start of simpler input fuzzer.
diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 24c350c..9ce7c17 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -10,7 +10,8 @@ AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
noinst_LTLIBRARIES = \
unit-timeout.la unit-prefork.la \
unit-storage.la unit-fonts.la \
-unit-admin.la unit-tilecache.la
+unit-admin.la unit-tilecache.la \
+ unit-fuzz.la
MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION)
@@ -31,6 +32,7 @@ test_SOURCES = TileCacheTests.cpp WhiteBoxTests.cpp
integration-http-server.cpp
test_LDADD = $(CPPUNIT_LIBS)
# unit test modules:
+unit_fuzz_la_SOURCES = UnitFuzz.cpp
unit_admin_la_SOURCES = UnitAdmin.cpp
unit_admin_la_CPPFLAGS = -DTDOC=\"$(top_srcdir)/test/data\"
unit_fonts_la_SOURCES = UnitFonts.cpp
diff --git a/loolwsd/test/UnitFuzz.cpp b/loolwsd/test/UnitFuzz.cpp
new file mode 100644
index 000..57622b3
--- /dev/null
+++ b/loolwsd/test/UnitFuzz.cpp
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "Common.hpp"
+#include "IoUtil.hpp"
+#include "LOOLProtocol.hpp"
+#include "Unit.hpp"
+#include "Util.hpp"
+
+#include
+#include
+#include
+
+// Inside the WSD process
+class UnitFuzz : public UnitWSD
+{
+public:
+UnitFuzz()
+{
+std::cerr << "UnitFuzz startup\n";
+setHasKitHooks();
+}
+
+virtual bool filterHandleRequest(
+TestRequest /* type */,
+Poco::Net::HTTPServerRequest& /* request */,
+Poco::Net::HTTPServerResponse& /* response */) override
+{
+return false;
+}
+};
+
+// Inside the forkit & kit processes
+class UnitKitFuzz : public UnitKit
+{
+public:
+UnitKitFuzz()
+{
+std::cerr << "UnitKit Fuzz init !\n";
+}
+~UnitKitFuzz()
+{
+}
+
+virtual bool filterKitMessage(const std::shared_ptr
& /* ws */,
+ std::string & /* message */) override
+{
+return false;
+}
+};
+
+UnitBase *unit_create_wsd(void)
+{
+return new UnitFuzz();
+}
+
+UnitBase *unit_create_kit(void)
+{
+return new UnitKitFuzz();
+}
+
+/* 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: xmloff/source
xmloff/source/text/txtparae.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9292ca07dd3f9ee9dedd765ba7696a626bc25476
Author: Caolán McNamara
Date: Thu Sep 1 11:52:31 2016 +0100
Resolves: tdf#100182 index entries lost on save
regression from...
commit 3e6ba91e2d6d362f4af91566e740f5dbc310e026
Date: Wed Nov 25 10:53:40 2015 +0200
loplugin:unusedfields in include/xmloff
Change-Id: I979743671e9a2e868d815f917427588b7b0320ba
which removed ctor for sDocumentIndexMark and sDocumentIndex
when it should have just removed sDocumentIndeb
Change-Id: I5ed5a2d30a3f76c6b45bbf74a3720420d0fcf676
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 79b1678..12538b1 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1183,6 +1183,7 @@ XMLTextParagraphExport::XMLTextParagraphExport(
sCharStyleName("CharStyleName"),
sCharStyleNames("CharStyleNames"),
sContourPolyPolygon("ContourPolyPolygon"),
+sDocumentIndexMark("DocumentIndexMark"),
sEndNotice("EndNotice"),
sFootnote("Footnote"),
sFootnoteCounting("FootnoteCounting"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit b9a2c849a657bdb9d5953b96f60409cb877b0005
Author: Eike Rathke
Date: Thu Sep 1 12:17:36 2016 +0200
exclude also single quoted strings from function name suggestion
These may be sheet names or label names, but never function names.
For example, typing ='e should not suggest "[EASTERSUNDAY], EDATE, ..."
Change-Id: I818b91b533b868ccb6d2eb1eef74112162d2fe3d
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 0a4cfe1..d7e8160 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1242,14 +1242,21 @@ void ScInputHandler::UseFormulaData()
miAutoPosFormula = findTextAll(*pFormulaData,
miAutoPosFormula, aText, aNewVec, false);
if (miAutoPosFormula != pFormulaData->end())
{
-// check if partial function name is not Between quotes
-bool bBetweenQuotes = false;
+// check if partial function name is not between quotes
+sal_Unicode cBetweenQuotes = 0;
for ( int n = 0; n < aSelText.getLength(); n++ )
{
-if ( aSelText[ n ] == '"' )
-bBetweenQuotes = !bBetweenQuotes;
+if (cBetweenQuotes)
+{
+if (aSelText[n] == cBetweenQuotes)
+cBetweenQuotes = 0;
+}
+else if ( aSelText[ n ] == '"' )
+cBetweenQuotes = '"';
+else if ( aSelText[ n ] == '\'' )
+cBetweenQuotes = '\'';
}
-if ( bBetweenQuotes )
+if ( cBetweenQuotes )
return; // we're between quotes
ShowFuncList(aNewVec);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docredln.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit b4a1c54e6ca203fb364d37dccac5ce3160793989
Author: Tor Lillqvist
Date: Thu Sep 1 13:21:15 2016 +0300
More informative warning
No idea whether the warning is useful, though, but at least now it
tells what the value of Pos is and how much "too big" that is.
Change-Id: Ib2794f0484a660715c78e1341b1f8c66e3e2f77e
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 8a2e2be..a293c04 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1631,18 +1631,20 @@ bool SwRangeRedline::operator<( const SwRangeRedline&
rCmp ) const
return *Start() == *rCmp.Start() && *End() < *rCmp.End();
}
-const SwRedlineData & SwRangeRedline::GetRedlineData(sal_uInt16 nPos) const
+const SwRedlineData & SwRangeRedline::GetRedlineData(const sal_uInt16 nPos)
const
{
SwRedlineData * pCur = pRedlineData;
-while (nPos > 0 && nullptr != pCur->pNext)
+sal_uInt16 nP = nPos;
+
+while (nP > 0 && nullptr != pCur->pNext)
{
pCur = pCur->pNext;
-nPos--;
+nP--;
}
-OSL_ENSURE( 0 == nPos, "Pos is too big" );
+SAL_WARN_IF( nP != 0, "sw.core", "Pos " << nPos << " is " << nP << " too
big");
return *pCur;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c663ffa4a1a5d2ad15a5b114c15ea5484b1dbb9c Author: Michael Stahl Date: Wed Aug 24 14:46:44 2016 +0200 libpng: upgrade to release 1.6.24 Reviewed-on: https://gerrit.libreoffice.org/28364 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 1efbdfc97ec0834274d13abe0f0d318b5f3c) Reviewed-on: https://gerrit.libreoffice.org/28367 Reviewed-by: Christian Lohmaier (cherry picked from commit f90be96ed400a5471d6c3a5cfa5087957803a9fe) Change-Id: I5528522d866262655eadcfcf09c038e0c6097bb9 Reviewed-on: https://gerrit.libreoffice.org/28553 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/download.lst b/download.lst index 55abcda..f9b1771 100755 --- a/download.lst +++ b/download.lst @@ -120,8 +120,8 @@ export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary- export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_MD5SUM := 3121bdc77c365a87e054b9f859f421fe -export PNG_TARBALL := libpng-1.6.19.tar.gz +export PNG_MD5SUM := 65213080dd30a9b16193d9b83adc1ee9 +export PNG_TARBALL := libpng-1.6.24.tar.gz export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12 export POPPLER_TARBALL := poppler-0.26.4.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svgio/source
svgio/source/svgreader/svgstyleattributes.cxx | 24 ++--
1 file changed, 18 insertions(+), 6 deletions(-)
New commits:
commit 5811f80ca2b7a34acd43137b649fd7b362dc0048
Author: Xisco Fauli
Date: Tue Aug 30 16:21:52 2016 +0200
tdf#101237 SVGIO: Use black as default when parents' fill...
...attributes are empty or none and there's a reference
to a clip-path present.
Change-Id: I4dc4e3bcaac43a007fbdb8a1d006cbd39c737396
Reviewed-on: https://gerrit.libreoffice.org/28514
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index 1e8810b..8e569d5 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1986,14 +1986,26 @@ namespace svgio
if(pSvgStyleAttributes)
{
-return pSvgStyleAttributes->getFill();
+const basegfx::BColor* pFill =
pSvgStyleAttributes->getFill();
+
+if(mbIsClipPathContent)
+{
+if (pFill)
+{
+return pFill;
+}
+else
+{
+static basegfx::BColor aBlack(0.0, 0.0, 0.0);
+return &aBlack;
+}
+}
+else
+{
+return pFill;
+}
}
}
-else if(mbIsClipPathContent)
-{
-static basegfx::BColor aBlack(0.0, 0.0, 0.0);
-return &aBlack;
-}
return 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-1' - external/lcms2
external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 | 25 ++ external/lcms2/UnpackedTarball_lcms2.mk|1 2 files changed, 26 insertions(+) New commits: commit 94497dcf3006a22111f32c7335771b7e97cc9a33 Author: Michael Stahl Date: Mon Aug 29 13:07:03 2016 +0200 lcms2: Out-of-bounds read in Type_MLU_Read() (rhbz#1367357) Change-Id: I9c5a442125476412435ebefea29ad1b166faab8a (cherry picked from commit da7d3f708d0619fdb17128ffbaa430becb79121f) Reviewed-on: https://gerrit.libreoffice.org/28552 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 b/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 new file mode 100644 index 000..913f828 --- /dev/null +++ b/external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 @@ -0,0 +1,25 @@ +From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001 +From: Marti +Date: Mon, 15 Aug 2016 23:31:39 +0200 +Subject: [PATCH] Added an extra check to MLU bounds + +Thanks to Ibrahim el-sayed for spotting the bug +--- + src/cmstypes.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/cmstypes.c b/src/cmstypes.c +index cb61860..c7328b9 100644 +--- a/src/cmstypes.c b/src/cmstypes.c +@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU + + // Check for overflow + if (Offset < (SizeOfHeader + 8)) goto Error; ++if ((Offset + Len) > SizeOfTag + 8) goto Error; + + // True begin of the string + BeginOfThisString = Offset - SizeOfHeader - 8; +-- +2.7.4 + diff --git a/external/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk index 6490110..db22934 100644 --- a/external/lcms2/UnpackedTarball_lcms2.mk +++ b/external/lcms2/UnpackedTarball_lcms2.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\ external/lcms2/lcms2-vc2013-project.patch \ external/lcms2/lcms2-config-guess.patch.0 \ external/lcms2/ubsan.patch.0 \ + external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 \ )) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/sfx2 sc/source sd/source sfx2/source sw/source
include/sfx2/templdlg.hxx |8
sc/source/ui/view/formatsh.cxx |4 +-
sd/source/ui/view/drviewsf.cxx | 10 ++---
sd/source/ui/view/outlnvsh.cxx |2 -
sd/source/ui/view/viewshe3.cxx |4 +-
sfx2/source/dialog/templdlg.cxx | 69 ++--
sfx2/source/dialog/tplcitem.cxx |4 +-
sfx2/source/inc/templdgi.hxx|2 -
sw/source/uibase/app/docst.cxx |2 -
9 files changed, 53 insertions(+), 52 deletions(-)
New commits:
commit 056b394ae241c66fed6ff12a3ed086372a2870b1
Author: Michael Stahl
Date: Wed Aug 31 23:36:19 2016 +0200
let's make Impress crash less - SfxStyleFamily edition
Commit bcb41235deaf4b7ca90522bda3ba21a686819e6e - in addition to
introducing the enum SfxStyleFamily - inconsistently converted one
call of DrawDocShell::SetStyleFamily to use enum SfxStyleFamily
instead of a mysterious "5", but did not adapt all of the code that
extracts the SfxUInt16Item that subsequently extracts this value and
expects a number 0-5.
Since it's clearly inexcusably stupid to have 2 different public sets
of integers identifying styles, make the usage of the second "array
index" integers private to templdlg.cxx; the SfxUInt16 item now always
contains enum SfxStyleFamily.
(regression from bcb41235deaf4b7ca90522bda3ba21a686819e6e)
(cherry picked from commit 75c39b903f06b656293edf20ec4a5173a0755fb6)
sfx2: SfxCommonTemplateDialog_Impl can't even decide if...
...no family selection should be represented as "0" or "0x".
(cherry picked from commit 813a8944bdb337a0018208381aa30118151872ff)
Change-Id: I333575c504277c2046f8f5a6b36ae3f86b3b3201
Reviewed-on: https://gerrit.libreoffice.org/28569
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 94d2134..9ffded7 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -28,14 +28,6 @@
#include
#include
-namespace SfxTemplate
-{
-// converts from SFX_STYLE_FAMILY Ids to 1-5
-sal_uInt16 SFX2_DLLPUBLIC SfxFamilyIdToNId(SfxStyleFamily nFamily);
-// converts from 1-5 to SFX_STYLE_FAMILY Ids
-SfxStyleFamily SFX2_DLLPUBLIC NIdToSfxFamilyId(sal_uInt16 nId);
-}
-
class SfxTemplateDialog_Impl;
class SFX2_DLLPUBLIC SfxTemplatePanelControl : public vcl::Window
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index b7af7e0..9236462 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -217,7 +217,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
pTabViewShell->GetViewFrame()->GetBindings().QueryState(SID_STYLE_FAMILY,
pItem);
SfxUInt16Item* pFamilyItem =
dynamic_cast(pItem.get());
-bool bPage = pFamilyItem && SfxStyleFamily::Page ==
SfxTemplate::NIdToSfxFamilyId(pFamilyItem->GetValue());
+bool bPage = pFamilyItem && SfxStyleFamily::Page ==
static_cast(pFamilyItem->GetValue());
if ( bProtected || bPage )
rSet.DisableItem( nSlotId );
@@ -232,7 +232,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
std::unique_ptr pItem;
pTabViewShell->GetViewFrame()->GetBindings().QueryState(SID_STYLE_FAMILY,
pItem);
SfxUInt16Item* pFamilyItem =
dynamic_cast(pItem.get());
-bool bPage = pFamilyItem && SfxStyleFamily::Page ==
SfxTemplate::NIdToSfxFamilyId(pFamilyItem->GetValue());
+bool bPage = pFamilyItem && SfxStyleFamily::Page ==
static_cast(pFamilyItem->GetValue());
if ( bProtected && !bPage )
rSet.DisableItem( nSlotId );
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 15bb40e..66ee19e 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -491,7 +491,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
std::unique_ptr pItem;
GetViewFrame()->GetBindings().QueryState(SID_STYLE_FAMILY,
pItem);
SfxUInt16Item* pFamilyItem =
dynamic_cast(pItem.get());
-if (pFamilyItem &&
SfxTemplate::NIdToSfxFamilyId(pFamilyItem->GetValue()) ==
SD_STYLE_FAMILY_PSEUDO)
+if (pFamilyItem &&
static_cast(pFamilyItem->GetValue()) == SD_STYLE_FAMILY_PSEUDO)
rSet.Put(SfxBoolItem(nWhich,false));
else
{
@@ -506,7 +506,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
std::unique_ptr pItem;
GetViewFrame()->GetBindings().QueryState(SID_STYLE_FAMILY,
pItem);
SfxUInt16Item* pFamilyItem =
dynamic_cast(pItem.get());
-if (pFamilyItem &&
SfxTemplate::NIdToSfxFamilyId(pFamilyItem->GetValue())
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 10 commits - basic/source configure.ac include/basic linguistic/source readlicense_oo/license sd/source sw/qa sw/source writerfilter/
basic/source/runtime/dllmgr-x64.cxx|2 basic/source/runtime/dllmgr-x86.cxx|2 configure.ac |2 include/basic/sbxvar.hxx |2 linguistic/source/lngsvcmgr.cxx|8 readlicense_oo/license/CREDITS.fodt| 3060 +- sd/source/ui/func/fuchar.cxx |2 sw/qa/core/data/rtf/fail/table-1.rtf |binary sw/qa/core/data/rtf/pass/tabbox-1.rtf |binary sw/source/core/doc/docfld.cxx |4 sw/source/core/docnode/ndtbl.cxx |2 sw/source/core/unocore/unotext.cxx | 23 sw/source/ui/chrdlg/chardlg.cxx|2 writerfilter/qa/cppunittests/rtftok/data/fail/topcontext-2.rtf |binary writerfilter/source/dmapper/DomainMapper.cxx |3 15 files changed, 1595 insertions(+), 1517 deletions(-) New commits: commit 455b38e175b6a617f60107c79dcfb50ad7f1c1ce Author: Andras Timar Date: Thu Sep 1 12:15:28 2016 +0200 Bump version to 5.1-5 Change-Id: I2b39f5bf5462640e59bcd40602f45f4b6cc73af5 diff --git a/configure.ac b/configure.ac index e84cc16..e92986d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.1.10.4],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.1.10.5],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) commit a26115e31cfb2e86ca246a5ae7df3257b0ba724a Author: Caolán McNamara Date: Wed Aug 31 14:07:42 2016 +0100 Resolves: tdf#100094 hyperlink tabpage put hyperlink name in wrong field mismerge of commit 74593273655e475017bb2bd45aba3c6b132e372d Date: Thu Jan 9 12:59:28 2014 + Resolves: #i123988# assure that hyperlink attribute... Change-Id: I45391b112666a07a0edfa49b2a8682c446a92cf4 (cherry picked from commit 98294d715c72751d9dd47fd1995865e04b2bdf5a) Reviewed-on: https://gerrit.libreoffice.org/28549 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit a7b4f0efb90417922bfed3fc257ea7d02500c444) diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index fa8a26a..af609db 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -213,7 +213,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet) m_pURLED->SetText(INetURLObject::decode(pINetFormat->GetValue(), INetURLObject::DECODE_UNAMBIGUOUS)); m_pURLED->SaveValue(); -m_pURLED->SetText(pINetFormat->GetName()); +m_pNameED->SetText(pINetFormat->GetName()); OUString sEntry = pINetFormat->GetVisitedFormat(); if (sEntry.isEmpty()) commit ffd965086256f4370edc610c809998e82460ec40 Author: Michael Stahl Date: Wed Aug 31 14:45:17 2016 +0200 sd: fix un-sorted SidArray in FuChar::DoExecute() Triggers an assert in SfxBindings::Invalidate(). (regression from ecc7308efa973fd1f1985ff9a0a0f01414b73f2b) Change-Id: Ida5b6c006ef6b8a839962c4f09c8341eee980270 (cherry picked from commit 52bac50deb628cb21c88d5dcab032d4980bb8974) Reviewed-on: https://gerrit.libreoffice.org/28551 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit fb2f68f09750fd54a97fb2eba79bc49ab3ffbca2) diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 5fc88f4..baeb4e3 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -142,11 +142,11 @@ void FuChar::DoExecute( SfxRequest& rReq ) SID_ATTR_CHAR_UNDERLINE, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR, -SID_ATTR_CHAR_BACK_COLOR, SID_ATTR_CHAR_KERNING, SID_ATTR_CHAR_CASEMAP, SID_SET_SUPER_SCRIPT, SID_SET_SUB_SCRIPT, +SID_ATTR_CHAR_BACK_COLOR, 0 }; mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); commit dde63e0aee5361e716475a6394d8b9977ad64ae6 Author: Michael Stahl Date: Tue Aug 30 21:17:32 2016 +0200 Revert "fftester: non-contiguous cells" This reverts commit 9accbfa0a52433cf03fe186fc69334d387981eb9. ... and the code change of "avoid crashing on load of fdo54724-1.rtf" commit 4ee3eabd0f058b26544c84b2b5aaf5478d921817. It's much simpler to detect early in convertToTable that there is a row with no cells
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 3 commits - desktop/source sc/qa sc/source sfx2/source sw/source
desktop/source/lib/init.cxx | 19 +++
sc/qa/unit/tiledrendering/tiledrendering.cxx |6 ++
sc/source/ui/inc/gridwin.hxx |4 ++--
sc/source/ui/inc/tabvwsh.hxx |2 ++
sc/source/ui/view/gridwin.cxx | 21 -
sc/source/ui/view/tabvwshc.cxx|9 +
sfx2/source/view/lokhelper.cxx|4
sw/source/core/doc/DocumentRedlineManager.cxx |3 ++-
8 files changed, 56 insertions(+), 12 deletions(-)
New commits:
commit 945d7d44072e7a8d7d460c662729ad3cc7334ba2
Author: Miklos Vajna
Date: Thu Sep 1 10:04:24 2016 +0200
sfx2: nullptr pViewShell was seen in SfxLokHelper::getView()
I'm not sure how to trigger this reliably, but Pranav got this:
#0 0x7fb2f471bbf0 in SfxLokHelper::getView(SfxViewShell*)
(pViewShell=0x0) at sfx2/source/view/lokhelper.cxx:82
#1 0x7fb2f75edf4f in doc_paintPartTile(LibreOfficeKitDocument*,
unsigned char*, int, int, int, int, int, int, int) (pThis=0x7fb290253c40,
pBuffer=0x281fbd0 "", nPart=0, nCanvasWidth=1024, nCanvasHeight=256,
nTilePosX=0, nTilePosY=11520, nTileWidth=15360, nTileHeight=3840) at
desktop/source/lib/init.cxx:1338
Given that SfxViewShell::Current() may indeed return nullptr (e.g.
during shutdown), change SfxLokHelper::getView() to return -1 in that
case, and adapt client code to handle that.
Change-Id: Ia191c843c8a993f3d7157de432af57964c0a8f63
Reviewed-on: https://gerrit.libreoffice.org/28583
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit f96fa389f950dd97bd213402fb5ea6eb114f9ab7)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 616521d..b32792c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1335,7 +1335,10 @@ void doc_paintPartTile(LibreOfficeKitDocument* pThis,
// Disable callbacks while we are painting.
LibLODocument_Impl* pDocument = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
pDocument->mpCallbackFlushHandlers[nView]->setPartTilePainting(true);
try
{
@@ -1408,7 +1411,10 @@ static void doc_registerCallback(LibreOfficeKitDocument*
pThis,
SolarMutexGuard aGuard;
LibLODocument_Impl* pDocument = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
pDocument->mpCallbackFlushHandlers[nView].reset(new
CallbackFlushHandler(pThis, pCallback, pData));
if (SfxViewShell* pViewShell = SfxViewFrame::Current()->GetViewShell())
@@ -1477,7 +1483,9 @@ static void doc_postUnoCommand(LibreOfficeKitDocument*
pThis, const char* pComma
LibLODocument_Impl* pDocument = static_cast(pThis);
std::vector
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
// handle potential interaction
if (gImpl && aCommand == ".uno:Save")
@@ -1562,7 +1570,10 @@ static void doc_postMouseEvent(LibreOfficeKitDocument*
pThis, int nType, int nX,
}
LibLODocument_Impl* pLib = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
if (pLib->mpCallbackFlushHandlers[nView])
{
pLib->mpCallbackFlushHandlers[nView]->queue(LOK_CALLBACK_MOUSE_POINTER,
aPointerString.getStr());
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 6870787..0e7af55 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -79,6 +79,10 @@ int SfxLokHelper::getView(SfxViewShell* pViewShell)
{
if (!pViewShell)
pViewShell = SfxViewShell::Current();
+// Still no valid view shell? Then no idea.
+if (!pViewShell)
+return -1;
+
return pViewShell->GetViewShellId();
}
commit 2da960dbf792f07cc16b2b2743f83041286de1a1
Author: Miklos Vajna
Date: Thu Sep 1 09:11:37 2016 +0200
sc lok: implement SfxViewShell::NotifyCursor() API
This way a new Calc view gets the cell cursors of existing views even if
they don't move after registering the LOK callback in the new view.
Change-Id: I5babc9921d37217ac199d4c19ed33cbb9620d119
Reviewed-on: https://gerrit.libreoffice.org/28581
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit fcf417a77369853195d6727b2db8df290663256e)
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index e738807..a61397a 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -410,8 +410,14 @@ void ScTi
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx| 19 +++
sfx2/source/view/lokhelper.cxx |4
2 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit f96fa389f950dd97bd213402fb5ea6eb114f9ab7
Author: Miklos Vajna
Date: Thu Sep 1 10:04:24 2016 +0200
sfx2: nullptr pViewShell was seen in SfxLokHelper::getView()
I'm not sure how to trigger this reliably, but Pranav got this:
#0 0x7fb2f471bbf0 in SfxLokHelper::getView(SfxViewShell*)
(pViewShell=0x0) at sfx2/source/view/lokhelper.cxx:82
#1 0x7fb2f75edf4f in doc_paintPartTile(LibreOfficeKitDocument*,
unsigned char*, int, int, int, int, int, int, int) (pThis=0x7fb290253c40,
pBuffer=0x281fbd0 "", nPart=0, nCanvasWidth=1024, nCanvasHeight=256,
nTilePosX=0, nTilePosY=11520, nTileWidth=15360, nTileHeight=3840) at
desktop/source/lib/init.cxx:1338
Given that SfxViewShell::Current() may indeed return nullptr (e.g.
during shutdown), change SfxLokHelper::getView() to return -1 in that
case, and adapt client code to handle that.
Change-Id: Ia191c843c8a993f3d7157de432af57964c0a8f63
Reviewed-on: https://gerrit.libreoffice.org/28583
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f4f4622..5f7ac7a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1365,7 +1365,10 @@ static void doc_paintPartTile(LibreOfficeKitDocument*
pThis,
// Disable callbacks while we are painting.
LibLODocument_Impl* pDocument = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
pDocument->mpCallbackFlushHandlers[nView]->setPartTilePainting(true);
try
{
@@ -1438,7 +1441,10 @@ static void doc_registerCallback(LibreOfficeKitDocument*
pThis,
SolarMutexGuard aGuard;
LibLODocument_Impl* pDocument = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
pDocument->mpCallbackFlushHandlers[nView].reset(new
CallbackFlushHandler(pThis, pCallback, pData));
if (SfxViewShell* pViewShell = SfxViewFrame::Current()->GetViewShell())
@@ -1507,7 +1513,9 @@ static void doc_postUnoCommand(LibreOfficeKitDocument*
pThis, const char* pComma
LibLODocument_Impl* pDocument = static_cast(pThis);
std::vector
aPropertyValuesVector(jsonToPropertyValuesVector(pArguments));
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
// handle potential interaction
if (gImpl && aCommand == ".uno:Save")
@@ -1593,7 +1601,10 @@ static void doc_postMouseEvent(LibreOfficeKitDocument*
pThis, int nType, int nX,
}
LibLODocument_Impl* pLib = static_cast(pThis);
-std::size_t nView = SfxLokHelper::getView();
+int nView = SfxLokHelper::getView();
+if (nView < 0)
+return;
+
if (pLib->mpCallbackFlushHandlers[nView])
{
pLib->mpCallbackFlushHandlers[nView]->queue(LOK_CALLBACK_MOUSE_POINTER,
aPointerString.getStr());
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index c5fb171..8225474 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -83,6 +83,10 @@ int SfxLokHelper::getView(SfxViewShell* pViewShell)
{
if (!pViewShell)
pViewShell = SfxViewShell::Current();
+// Still no valid view shell? Then no idea.
+if (!pViewShell)
+return -1;
+
return pViewShell->GetViewShellId();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sw/source
sw/source/ui/chrdlg/chardlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b9939b0642afefe96ae33cd964d6726dc405843d Author: Caolán McNamara Date: Wed Aug 31 14:07:42 2016 +0100 Resolves: tdf#100094 hyperlink tabpage put hyperlink name in wrong field mismerge of commit 74593273655e475017bb2bd45aba3c6b132e372d Date: Thu Jan 9 12:59:28 2014 + Resolves: #i123988# assure that hyperlink attribute... Change-Id: I45391b112666a07a0edfa49b2a8682c446a92cf4 (cherry picked from commit 98294d715c72751d9dd47fd1995865e04b2bdf5a) Reviewed-on: https://gerrit.libreoffice.org/28548 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 860ecf1..2879815 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -213,7 +213,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet) m_pURLED->SetText(INetURLObject::decode(pINetFormat->GetValue(), INetURLObject::DECODE_UNAMBIGUOUS)); m_pURLED->SaveValue(); -m_pURLED->SetText(pINetFormat->GetName()); +m_pNameED->SetText(pINetFormat->GetName()); OUString sEntry = pINetFormat->GetVisitedFormat(); if (sEntry.isEmpty()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source
sw/source/ui/chrdlg/chardlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7b4f0efb90417922bfed3fc257ea7d02500c444 Author: Caolán McNamara Date: Wed Aug 31 14:07:42 2016 +0100 Resolves: tdf#100094 hyperlink tabpage put hyperlink name in wrong field mismerge of commit 74593273655e475017bb2bd45aba3c6b132e372d Date: Thu Jan 9 12:59:28 2014 + Resolves: #i123988# assure that hyperlink attribute... Change-Id: I45391b112666a07a0edfa49b2a8682c446a92cf4 (cherry picked from commit 98294d715c72751d9dd47fd1995865e04b2bdf5a) Reviewed-on: https://gerrit.libreoffice.org/28549 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index fa8a26a..af609db 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -213,7 +213,7 @@ void SwCharURLPage::Reset(const SfxItemSet* rSet) m_pURLED->SetText(INetURLObject::decode(pINetFormat->GetValue(), INetURLObject::DECODE_UNAMBIGUOUS)); m_pURLED->SaveValue(); -m_pURLED->SetText(pINetFormat->GetName()); +m_pNameED->SetText(pINetFormat->GetName()); OUString sEntry = pINetFormat->GetVisitedFormat(); if (sEntry.isEmpty()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 29 commits - comphelper/source connectivity/source dbaccess/source editeng/source forms/source i18npool/inc i18npool/source include/comphelper include/connectivity incl
comphelper/source/property/propagg.cxx|4 +---
connectivity/source/commontools/dbtools.cxx |4 ++--
connectivity/source/drivers/file/FPreparedStatement.cxx |2 +-
connectivity/source/drivers/file/FStatement.cxx |3 +--
connectivity/source/drivers/file/fcomp.cxx|4 ++--
connectivity/source/drivers/mork/MPreparedStatement.cxx |4 +---
connectivity/source/drivers/mork/MPreparedStatement.hxx |2 +-
connectivity/source/drivers/mork/MResultSet.cxx | 10 --
connectivity/source/drivers/mork/MResultSet.hxx |7 ---
connectivity/source/drivers/mork/MStatement.cxx |3 +--
connectivity/source/drivers/mork/MStatement.hxx |2 +-
connectivity/source/drivers/odbc/OStatement.cxx |2 +-
connectivity/source/inc/file/FPreparedStatement.hxx |2 +-
connectivity/source/inc/file/FStatement.hxx |2 +-
connectivity/source/inc/file/fcomp.hxx|4 ++--
connectivity/source/inc/odbc/OStatement.hxx |2 +-
dbaccess/source/core/api/CacheSet.cxx | 12 ++--
dbaccess/source/core/api/CacheSet.hxx | 12 ++--
dbaccess/source/core/api/KeySet.cxx |6 +++---
dbaccess/source/core/api/KeySet.hxx |6 +++---
dbaccess/source/core/api/StaticSet.cxx| 10 +-
dbaccess/source/core/api/StaticSet.hxx| 10 +-
dbaccess/source/core/api/WrappedResultSet.cxx |4 ++--
dbaccess/source/core/api/WrappedResultSet.hxx |4 ++--
editeng/source/uno/unonrule.cxx |2 +-
forms/source/component/FormComponent.cxx |4 ++--
forms/source/component/ListBox.cxx|2 +-
forms/source/component/ListBox.hxx|2 +-
forms/source/inc/FormComponent.hxx|4 ++--
i18npool/inc/indexentrysupplier_default.hxx |2 +-
i18npool/source/indexentry/indexentrysupplier_default.cxx |2 +-
include/comphelper/propagg.hxx|2 +-
include/connectivity/dbtools.hxx |4 ++--
include/editeng/unonrule.hxx |2 +-
include/svx/IAccessibleParent.hxx |2 +-
svl/source/inc/passwordcontainer.hxx |4 ++--
svl/source/passwordcontainer/passwordcontainer.cxx|8 ++--
sw/inc/accmap.hxx |2 +-
sw/source/core/access/accmap.cxx |2 +-
sw/source/core/docnode/ndtbl.cxx |8
sw/source/core/docnode/nodes.cxx |2 +-
sw/source/core/frmedt/fefly1.cxx |4 ++--
sw/source/core/frmedt/fews.cxx|9 ++---
43 files changed, 90 insertions(+), 98 deletions(-)
New commits:
commit 98ce52b6786723d2402bd423638947bddd0f2fd7
Author: Caolán McNamara
Date: Wed Aug 31 22:01:10 2016 +0100
coverity#1372406 Uncaught exception
Change-Id: I24fe9cb3aa9002d4b94b6f934e39aff243c1e09d
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 7a7d041..7352946 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1790,7 +1790,7 @@ void setObjectWithInfo(const Reference&
_xParams,
sal_Int32 parameterIndex,
const ::connectivity::ORowSetValue& _rValue,
sal_Int32 sqlType,
- sal_Int32 scale) throw(SQLException, RuntimeException)
+ sal_Int32 scale) throw(SQLException, RuntimeException,
std::exception)
{
if ( _rValue.isNull() )
_xParams->setNull(parameterIndex,sqlType);
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 32db2ec..5c791b6 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -590,7 +590,7 @@ namespace dbtools
sal_Int32 parameterIndex,
const ::connectivity::ORowSetValue& x,
sal_Int32 sqlType,
-sal_Int32 scale) throw(css::sdbc::SQLException,
css::uno::RuntimeException);
+sal_Int32 scale) throw(css::sdbc::SQLException,
css::uno::RuntimeException, std::exception);
/** implements XParameters::setObject
commit 02d1eb96e1f99eb85a7f997c98e3759f5575f1b6
Author: Caolán McNamara
Date: Wed Aug 31 22:00:24 2016 +0100
coverity#1372405 Uncaught exception
Change-Id: I9d2029be969d767eb096137017e8a7e646b69d2d
diff --git a/dbaccess/so
[Libreoffice-commits] core.git: compilerplugins/clang framework/inc framework/source include/vcl vcl/source
compilerplugins/clang/store/constantfunction.cxx |4
framework/inc/uielement/menubarmanager.hxx |1 -
framework/source/uielement/menubarmanager.cxx|6 --
include/vcl/menu.hxx |9 +
vcl/source/window/menu.cxx | 16
5 files changed, 1 insertion(+), 35 deletions(-)
New commits:
commit 671ac3a9221598febdc6304fceabbb2ade86f41e
Author: Maxim Monastirsky
Date: Thu Sep 1 10:19:04 2016 +0300
Looks like the menu highlight handler is now unused
Change-Id: I75ff4bce35e7940e07b760f672e08ffe0dd208f8
Reviewed-on: https://gerrit.libreoffice.org/28580
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/compilerplugins/clang/store/constantfunction.cxx
b/compilerplugins/clang/store/constantfunction.cxx
index 5381915..fd429ac 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -427,10 +427,6 @@ bool ConstantFunction::VisitFunctionDecl(const
FunctionDecl * pFunctionDecl) {
{
return true;
}
-// LINK callback which supplies a return value which means something
-if (aFunctionName == "framework::MenuBarManager::Highlight") {
-return true;
-}
if (aFunctionName == "sc::AlignedAllocator::operator!=") {
return true;
}
diff --git a/framework/inc/uielement/menubarmanager.hxx
b/framework/inc/uielement/menubarmanager.hxx
index 6e9920d..0fe3db5 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -152,7 +152,6 @@ class MenuBarManager : public css::frame::XStatusListener
,
void GetPopupController( PopupControllerCache& rPopupController );
protected:
-DECL_LINK_TYPED(Highlight, Menu *, bool);
DECL_LINK_TYPED( Activate, Menu *, bool );
DECL_LINK_TYPED( Deactivate, Menu *, bool );
DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void );
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 6379451..af030ff 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1033,11 +1033,6 @@ IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu,
bool )
return true;
}
-IMPL_LINK_NOARG_TYPED(MenuBarManager, Highlight, Menu *, bool)
-{
-return false;
-}
-
bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference<
XURLTransformer >& rTransformer )
{
if ( pPopupMenu )
@@ -1973,7 +1968,6 @@ void MenuBarManager::Init(const Reference< XFrame >&
rFrame,Menu* pAddonMenu,boo
void MenuBarManager::SetHdl()
{
-m_pVCLMenu->SetHighlightHdl( LINK( this, MenuBarManager, Highlight ));
m_pVCLMenu->SetActivateHdl( LINK( this, MenuBarManager, Activate ));
m_pVCLMenu->SetDeactivateHdl( LINK( this, MenuBarManager, Deactivate ));
m_pVCLMenu->SetSelectHdl( LINK( this, MenuBarManager, Select ));
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 989d852..efb55d5 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -140,8 +140,7 @@ private:
Link aActivateHdl; // Active-Handler
Link aDeactivateHdl; // Deactivate-Handler
-Link aHighlightHdl; // Highlight-Handler
-Link aSelectHdl; // Highlight-Handler
+Link aSelectHdl; // Select-Handler
std::list > maEventListeners;
@@ -235,7 +234,6 @@ public:
void Activate();
void Deactivate();
-virtual void Highlight();
virtual void Select();
void InsertItem(sal_uInt16 nItemId, const OUString& rStr,
@@ -344,11 +342,6 @@ public:
aDeactivateHdl = rLink;
}
-void SetHighlightHdl( const Link& rLink )
-{
-aHighlightHdl = rLink;
-}
-
void SetSelectHdl( const Link& rLink )
{
aSelectHdl = rLink;
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c82ecf5..ee20cec 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -271,18 +271,6 @@ void Menu::Deactivate()
}
}
-void Menu::Highlight()
-{
-ImplMenuDelData aDelData( this );
-
-Menu* pStartMenu = ImplGetStartMenu();
-if ( !aHighlightHdl.Call( this ) && !aDelData.isDeleted() )
-{
-if ( pStartMenu && ( pStartMenu != this ) )
-pStartMenu->aHighlightHdl.Call( this );
-}
-}
-
void Menu::ImplSelect()
{
MenuItemData* pData = GetItemList()->GetData( nSelectedId );
@@ -1229,7 +1217,6 @@ Menu& Menu::operator=( const Menu& rMenu )
nDefaultItem = rMenu.nDefaultItem;
aActivateHdl = rMenu.aActivateHdl;
aDeactivateHdl = rMenu.aDeactivateHdl;
-aHighlightHdl = rMenu.aHighlightHdl;
aSelectHdl = rMenu.aSelectHdl;
aTitleText = rMenu.aTitleText;
nTitleHeight = rMenu.nTitleHeight;
@@ -2166,10 +2153,7 @@ void Menu::ImplCallHighlight(sal_uInt16 nItem)
ImplCa
[Libreoffice-commits] core.git: svl/source
svl/source/numbers/zformat.cxx | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 662f5a5a16339ecda071ea6b95afefeea63c4fe9
Author: Laurent Balland-Poirier
Date: Sat Aug 27 19:14:39 2016 +0200
tdf#79398 Insert LCID in the correct sub-format
During XL export, LCID is insert in format if necessary.
If there are several sub-formats ([>0];[<0];[0])
this commit insert LCID in the correct one.
Change-Id: I016c38a3338634113bfc0aa7e20e028e2e01e201
Reviewed-on: https://gerrit.libreoffice.org/28427
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 767dadd..67f38ee 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4633,24 +4633,22 @@ static void lcl_SvNumberformat_AddLimitStringImpl(
OUString& rStr,
}
}
-void lcl_insertLCID( OUStringBuffer& aFormatStr, const OUString& rLCIDString )
+void lcl_insertLCID( OUStringBuffer& aFormatStr, const OUString& rLCIDString,
sal_Int32 nPosInsertLCID )
{
OUStringBuffer aLCIDString;
if ( !rLCIDString.isEmpty() )
{
aLCIDString = "[$-" + rLCIDString + "]";
}
-sal_Int32 nPosDBNum = aFormatStr.lastIndexOf("[DBNum");
-if ( nPosDBNum >= 0 )
-{
-if ( rLCIDString.getLength() > 4 ) // remove DBNumX code if long LCID
-aFormatStr.remove( nPosDBNum, 8 );
-else
-nPosDBNum += 8; // other insert LCID after DBNum
+// Search for only last DBNum which is the last element before insertion
position
+if ( nPosInsertLCID >= 8
+&& rLCIDString.getLength() > 4
+&& aFormatStr.indexOf( "[DBNum", nPosInsertLCID-8) == nPosInsertLCID-8
)
+{ // remove DBNumX code if long LCID
+nPosInsertLCID -= 8;
+aFormatStr.remove( nPosInsertLCID, 8 );
}
-else
-nPosDBNum = 0;
-aFormatStr.insert( nPosDBNum, aLCIDString.toString() );
+aFormatStr.insert( nPosInsertLCID, aLCIDString.toString() );
}
OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable&
rKeywords,
@@ -4774,6 +4772,7 @@ OUString SvNumberformat::GetMappedFormatstring( const
NfKeywordTable& rKeywords,
{
aStr.append( aPrefix );
}
+sal_Int32 nPosInsertLCID = aStr.getLength();
if ( nAnz )
{
const short* pType = NumFor[n].Info().nTypeArray;
@@ -4834,11 +4833,11 @@ OUString SvNumberformat::GetMappedFormatstring( const
NfKeywordTable& rKeywords,
MsLangId::getRealLanguage( aNatNum.GetLang()
) ==
LANGUAGE_THAI )
{
-lcl_insertLCID( aStr, "D07041E" ); // date in
Thai digit, Buddhist era
+lcl_insertLCID( aStr, "D07041E",
nPosInsertLCID ); // date in Thai digit, Buddhist era
}
else
{
-lcl_insertLCID( aStr, "107041E" ); // date in
Arabic digit, Buddhist era
+lcl_insertLCID( aStr, "107041E",
nPosInsertLCID ); // date in Arabic digit, Buddhist era
}
j = j+2;
bLCIDInserted = true;
@@ -4857,12 +4856,13 @@ OUString SvNumberformat::GetMappedFormatstring( const
NfKeywordTable& rKeywords,
rKeywords[NF_KEY_THAI_T] == "T" &&
MsLangId::getRealLanguage( aNatNum.GetLang()) == LANGUAGE_THAI
)
{
-lcl_insertLCID( aStr, "D00041E" ); // number in Thai digit
+lcl_insertLCID( aStr, "D00041E", nPosInsertLCID ); // number
in Thai digit
}
else if ( aNatNum.IsComplete() && aNatNum.GetDBNum() > 0 )
{
lcl_insertLCID( aStr, OUString::number(
sal::static_int_cast(
-MsLangId::getRealLanguage(
aNatNum.GetLang())), 16).toAsciiUpperCase());
+MsLangId::getRealLanguage(
aNatNum.GetLang())), 16).toAsciiUpperCase(),
+nPosInsertLCID);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/Makefile.am |4 +-
loolwsd/test/UnitFuzz.cpp | 75 ++
2 files changed, 78 insertions(+), 1 deletion(-)
New commits:
commit 1dce882fd13d676add9b50a4f4006e2f52b782af
Author: Michael Meeks
Date: Wed Jun 22 14:57:01 2016 +0100
Start of simpler input fuzzer.
diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index 2723dc2..53f7d97 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -10,7 +10,8 @@ AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
noinst_LTLIBRARIES = \
unit-timeout.la unit-prefork.la \
unit-storage.la unit-fonts.la \
-unit-admin.la unit-tilecache.la
+unit-admin.la unit-tilecache.la \
+ unit-fuzz.la
MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
AM_LDFLAGS = -pthread -module $(MAGIC_TO_FORCE_SHLIB_CREATION)
@@ -32,6 +33,7 @@ test_SOURCES = TileCacheTests.cpp WhiteBoxTests.cpp
integration-http-server.cpp
test_LDADD = $(CPPUNIT_LIBS)
# unit test modules:
+unit_fuzz_la_SOURCES = UnitFuzz.cpp
unit_admin_la_SOURCES = UnitAdmin.cpp
unit_admin_la_CPPFLAGS = -DTDOC=\"$(top_srcdir)/test/data\"
unit_fonts_la_SOURCES = UnitFonts.cpp
diff --git a/loolwsd/test/UnitFuzz.cpp b/loolwsd/test/UnitFuzz.cpp
new file mode 100644
index 000..57622b3
--- /dev/null
+++ b/loolwsd/test/UnitFuzz.cpp
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "Common.hpp"
+#include "IoUtil.hpp"
+#include "LOOLProtocol.hpp"
+#include "Unit.hpp"
+#include "Util.hpp"
+
+#include
+#include
+#include
+
+// Inside the WSD process
+class UnitFuzz : public UnitWSD
+{
+public:
+UnitFuzz()
+{
+std::cerr << "UnitFuzz startup\n";
+setHasKitHooks();
+}
+
+virtual bool filterHandleRequest(
+TestRequest /* type */,
+Poco::Net::HTTPServerRequest& /* request */,
+Poco::Net::HTTPServerResponse& /* response */) override
+{
+return false;
+}
+};
+
+// Inside the forkit & kit processes
+class UnitKitFuzz : public UnitKit
+{
+public:
+UnitKitFuzz()
+{
+std::cerr << "UnitKit Fuzz init !\n";
+}
+~UnitKitFuzz()
+{
+}
+
+virtual bool filterKitMessage(const std::shared_ptr
& /* ws */,
+ std::string & /* message */) override
+{
+return false;
+}
+};
+
+UnitBase *unit_create_wsd(void)
+{
+return new UnitFuzz();
+}
+
+UnitBase *unit_create_kit(void)
+{
+return new UnitKitFuzz();
+}
+
+/* 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: sc/qa sc/source
sc/qa/unit/tiledrendering/tiledrendering.cxx |6 ++
sc/source/ui/inc/gridwin.hxx |4 ++--
sc/source/ui/inc/tabvwsh.hxx |2 ++
sc/source/ui/view/gridwin.cxx| 21 -
sc/source/ui/view/tabvwshc.cxx |9 +
5 files changed, 35 insertions(+), 7 deletions(-)
New commits:
commit fcf417a77369853195d6727b2db8df290663256e
Author: Miklos Vajna
Date: Thu Sep 1 09:11:37 2016 +0200
sc lok: implement SfxViewShell::NotifyCursor() API
This way a new Calc view gets the cell cursors of existing views even if
they don't move after registering the LOK callback in the new view.
Change-Id: I5babc9921d37217ac199d4c19ed33cbb9620d119
Reviewed-on: https://gerrit.libreoffice.org/28581
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 8dec1ac..3ff46d0 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -432,8 +432,14 @@ void ScTiledRenderingTest::testViewCursors()
ViewCallback aView1;
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
&aView1);
SfxLokHelper::createView();
+
pModelObj->initializeForTiledRendering(uno::Sequence());
ViewCallback aView2;
+aView2.m_bViewCursorInvalidated = false;
+aView2.m_bOwnCursorInvalidated = false;
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
&aView2);
+// This was false, the new view did not get the view (cell) cursor of the
old view.
+CPPUNIT_ASSERT(aView2.m_bViewCursorInvalidated);
+CPPUNIT_ASSERT(aView2.m_bOwnCursorInvalidated);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::DOWN);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::DOWN);
Scheduler::ProcessEventsToIdle();
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 161f159..7f311dc 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -285,7 +285,6 @@ class ScGridWindow : public vcl::Window, public
DropTargetHelper, public DragSou
voidGetSelectionRects( ::std::vector< Rectangle >& rPixelRects
);
-voidupdateLibreOfficeKitCellCursor();
protected:
virtual voidPrePaint(vcl::RenderContext& rRenderContext) override;
virtual voidPaint(vcl::RenderContext& rRenderContext, const Rectangle&
rRect) override;
@@ -426,11 +425,12 @@ public:
/// @see ScModelObj::getCellCursor().
OString getCellCursor(const Fraction& rZoomX,
- const Fraction& rZoomY);
+ const Fraction& rZoomY) const;
OString getCellCursor(int nOutputWidth,
int nOutputHeight,
long nTileWidth,
long nTileHeight);
+void updateLibreOfficeKitCellCursor(SfxViewShell* pOtherShell) const;
ScViewData* getViewData();
virtual FactoryFunction GetUITestFactory() const override;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 6854648..2aef68d 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -386,6 +386,8 @@ public:
void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; }
/// See SfxViewShell::getPart().
int getPart() const override;
+/// See SfxViewShell::NotifyCursor().
+void NotifyCursor(SfxViewShell* pViewShell) const override;
};
#endif
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 94d38be..220cd6f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5682,7 +5682,8 @@ OString ScGridWindow::getCellCursor( int nOutputWidth,
int nOutputHeight,
return getCellCursor(zoomX, zoomY);
}
-OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction&
rZoomY) {
+OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction&
rZoomY) const
+{
// GridWindow stores a shown cell cursor in mpOOCursors, hence
// we can use that to determine whether we would want to be showing
// one (client-side) for tiled rendering too.
@@ -5714,12 +5715,22 @@ OString ScGridWindow::getCellCursor(const Fraction&
rZoomX, const Fraction& rZoo
return aRect.toString();
}
-void ScGridWindow::updateLibreOfficeKitCellCursor()
+void ScGridWindow::updateLibreOfficeKitCellCursor(SfxViewShell* pOtherShell)
const
{
OString aCursor = getCellCursor(pViewData->GetZoomX(),
pViewData->GetZoomY());
ScTabViewShell* pViewShell = pViewData->GetViewShell();
-pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR,
aCursor.getStr());
-SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_CELL_VIEW_C
[Libreoffice-commits] core.git: 20 commits - chart2/source cppu/source cui/source dbaccess/source drawinglayer/source include/svx include/toolkit include/vcl sc/source sd/inc sd/source sfx2/source sta
chart2/source/view/charttypes/GL3DBarChart.cxx |6 - chart2/source/view/inc/GL3DBarChart.hxx|4 cppu/source/threadpool/jobqueue.cxx|2 cppu/source/threadpool/jobqueue.hxx|5 cppu/source/threadpool/threadpool.cxx | 18 +-- cppu/source/threadpool/threadpool.hxx |7 - cui/source/factory/dlgfact.hxx |8 - dbaccess/source/core/api/CacheSet.cxx | 14 +- dbaccess/source/core/api/CacheSet.hxx |5 drawinglayer/source/primitive2d/textlayoutdevice.cxx |2 include/svx/SvxPresetListBox.hxx |2 include/svx/svdedtv.hxx|6 - include/svx/svdedxv.hxx|2 include/svx/svdglev.hxx|8 - include/svx/svdlayer.hxx |2 include/svx/svdmodel.hxx |8 - include/svx/svdmrkv.hxx| 18 +-- include/svx/svdoashp.hxx |2 include/svx/svdobj.hxx |4 include/svx/svdomeas.hxx |2 include/svx/svdotable.hxx |4 include/svx/svdotext.hxx |4 include/svx/svdpagv.hxx| 10 - include/svx/svdpntv.hxx| 18 +-- include/svx/svdpoev.hxx|2 include/svx/svdview.hxx|4 include/svx/svdxcgv.hxx|4 include/svx/svxdlg.hxx |8 - include/svx/txencbox.hxx |4 include/svx/unopage.hxx|2 include/svx/unoshape.hxx | 10 - include/svx/xoutbmp.hxx|4 include/svx/xtable.hxx |2 include/toolkit/awt/vclxcontainer.hxx |6 - include/toolkit/awt/vclxtabpagecontainer.hxx |4 include/toolkit/awt/vclxtopwindow.hxx |4 include/toolkit/awt/vclxwindow.hxx |8 - include/toolkit/awt/vclxwindows.hxx| 96 - include/toolkit/controls/controlmodelcontainerbase.hxx |1 include/toolkit/controls/unocontrolmodel.hxx |6 - include/vcl/virdev.hxx | 24 +--- sc/source/core/data/documen8.cxx |2 sc/source/filter/xml/XMLColumnRowGroupExport.cxx |8 - sc/source/filter/xml/XMLColumnRowGroupExport.hxx |5 sc/source/ui/unoobj/chart2uno.cxx | 11 - sd/inc/drawdoc.hxx |2 sd/source/core/CustomAnimationEffect.cxx |9 - sd/source/ui/animations/CustomAnimationPane.cxx|6 - sd/source/ui/app/sdmod.cxx |2 sfx2/source/appl/appdispatchprovider.cxx |7 - sfx2/source/view/sfxbasecontroller.cxx |6 - starmath/source/smmod.cxx |2 svtools/source/inc/unoiface.hxx| 32 ++--- svtools/source/uno/unoiface.cxx| 17 +-- svx/source/unodraw/shapeimpl.hxx |6 - sw/source/core/doc/DocumentDeviceManager.cxx |6 - sw/source/core/doc/tblcpy.cxx |3 sw/source/core/inc/scriptinfo.hxx |4 toolkit/inc/helper/unopropertyarrayhelper.hxx |4 toolkit/source/awt/vclxcontainer.cxx |2 toolkit/source/awt/vclxtabpagecontainer.cxx|2 toolkit/source/awt/vclxtopwindow.cxx |2 toolkit/source/awt/vclxwindow.cxx | 10 - toolkit/source/awt/vclxwindows.cxx | 48 toolkit/source/controls/unocontrolmodel.cxx|4 toolkit/source/helper/unopropertyarrayhelper.cxx |4 vcl/inc/unx/fontmanager.hxx| 17 +-- vcl/inc/unx/printergfx.hxx |3 vcl/source/gdi/pdfwriter_impl.cxx |2 vcl/source/gdi/virdev.cxx | 31 +++-- vcl/unx/generic/fontmanager/fontcache.cxx |6 - vcl/unx/generic/fontmanager/fontmanager.cxx| 29 ++--- vcl/unx/generic/print/printerjob.cxx |9 - vcl/unx/generic/print/text_gfx.cxx | 14 +- 74 files changed, 325 insertions(+), 340 deletions(-) New commits: commit b8ee524330d924456931ad602eb4701b55a2aa85 Author: Noel Grandin Date: Wed Aug 31 16:37:55 2016 +0200
Re: Tiago Santos license statement
WELCOME Thanks for your license statement. I have added you to our wiki: 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] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |6 --
1 file changed, 6 deletions(-)
New commits:
commit 53b768de0fed2d6e0243bb1a85fc37cacdfe14b6
Author: Pranav Kant
Date: Thu Sep 1 14:25:54 2016 +0530
loleaflet: Remove troublesome checks
... and fix the incosistency among view count in UI
Change-Id: I6b055b6d145c2de314830731f6341462287b244a
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index b43a7de..f6597f2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1368,9 +1368,6 @@ function updateUserListCount(userlist) {
}
map.on('addview', function(e) {
- if (!e.viewId || !e.username)
- return;
-
$('#tb_toolbar-down_item_userlist')
.w2overlay({
class: 'loleaflet-font',
@@ -1392,9 +1389,6 @@ map.on('addview', function(e) {
});
map.on('removeview', function(e) {
- if (!e.viewId || !e.username)
- return;
-
$('#tb_toolbar-down_item_userlist')
.w2overlay({
class: 'loleaflet-font',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentRedlineManager.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 3a897f7cbf44f44f2baa750f85d9aecbbbd2b6f9 Author: Miklos Vajna Date: Thu Sep 1 09:36:02 2016 +0200 CppunitTest_sw_filters_test: fix ASan build MaybeNotifyModification() should be called only in the POS_INSIDE case, not when POS_EQUAL gets there via the fallthrough. Change-Id: I8a05ee508a14f62b12e93799b2e98a33041d6f33 Reviewed-on: https://gerrit.libreoffice.org/28582 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 2672437..86c1e82 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -1215,7 +1215,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall } delete pNewRedl; pNewRedl = nullptr; -pRedl->MaybeNotifyModification(); +if (eCmpPos == POS_INSIDE) +pRedl->MaybeNotifyModification(); break; case POS_OUTSIDE: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e6/4b208bc03ba75fcc353d5f55d19666cda390d8
e6/4b208bc03ba75fcc353d5f55d19666cda390d8 |1 + 1 file changed, 1 insertion(+) New commits: commit 55c6663b04d2a37c5528ba4c17e7648efab30d7d Author: Caolán McNamara Date: Thu Sep 1 09:33:16 2016 +0100 Notes added by 'git notes add' diff --git a/e6/4b208bc03ba75fcc353d5f55d19666cda390d8 b/e6/4b208bc03ba75fcc353d5f55d19666cda390d8 new file mode 100644 index 000..eaddb47 --- /dev/null +++ b/e6/4b208bc03ba75fcc353d5f55d19666cda390d8 @@ -0,0 +1 @@ +prefer: 7c8e265b0b409f954f73832a4b6d6dc14bdc76b0 ___ 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.1' - 2 commits - include/sfx2 libreofficekit/source sfx2/source sw/inc sw/source
include/sfx2/lokhelper.hxx |2 ++
include/sfx2/viewsh.hxx |2 ++
libreofficekit/source/gtk/lokdocview.cxx |6 +-
sfx2/source/view/lokhelper.cxx | 26 +++---
sfx2/source/view/viewsh.cxx |9 ++---
sw/inc/crsrsh.hxx|3 +++
sw/inc/view.hxx |2 ++
sw/inc/viscrs.hxx|4 ++--
sw/source/core/crsr/crsrsh.cxx |5 +
sw/source/core/crsr/viscrs.cxx | 18 ++
sw/source/uibase/uiview/viewprt.cxx |5 +
11 files changed, 61 insertions(+), 21 deletions(-)
New commits:
commit 2a38d1b186428f0b23722f304addfae43e00677e
Author: Miklos Vajna
Date: Wed Aug 31 17:19:13 2016 +0200
sfx2 lok: introduce SfxViewShell::NotifyCursor()
It allows removing the hide/show cursor hack in
SfxViewShell::registerLibreOfficeKitViewCallback() introduced in commit
4d211384f048b689f20e46d4d586f342b110cb5c (sfx2 lok: fix missing view
cursors in a new view, 2016-06-20), and instead let the application code
in sw/sc/sd implement the best way to show existing cursors in a new
view.
This way the per-app cleanup of view cursors introduced in commit
bc9b4fd4c83af3532204237157821d4884c42d8e (lok::Document::destroyView:
clean up view cursors/selections, 2016-07-15) has matching per-app init
code.
This commit just adds the API + adapts existing sw code to use it, sc/sd
still has to be implemented.
Based on a patch by Marco Cecchetti, thanks!
Reviewed-on: https://gerrit.libreoffice.org/28557
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 7167c2b6548830b82280f2f3943d445e9afd6f5e)
Conflicts:
sw/inc/viscrs.hxx
sw/source/core/crsr/viscrs.cxx
Change-Id: I38510fa4962f405b1b96a79024206c9e7f33cad2
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index e7dfed4..852aa79 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -32,6 +32,8 @@ public:
/// Invoke the LOK callback of all views except pThisView, with a payload
of rKey-rPayload.
static void notifyOtherViews(SfxViewShell* pThisView, int nType, const
OString& rKey, const OString& rPayload);
+/// Same as notifyOtherViews(), but works on a selected "other" view, not
on all of them.
+static void notifyOtherView(SfxViewShell* pThisView, SfxViewShell*
pOtherView, int nType, const OString& rKey, const OString& rPayload);
};
#endif
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 0bda743..d74e8b7 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -342,6 +342,8 @@ public:
sal_uInt32 GetViewShellId() const override;
/// See OutlinerViewShell::NotifyOtherViews().
void NotifyOtherViews(int nType, const OString& rKey, const OString&
rPayload) override;
+/// Ask this view to send its cursor position to pViewShell.
+virtual void NotifyCursor(SfxViewShell* /*pViewShell*/) const;
};
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 4113160..6870787 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -88,6 +88,19 @@ std::size_t SfxLokHelper::getViews()
return rViewArr.size();
}
+void SfxLokHelper::notifyOtherView(SfxViewShell* pThisView, SfxViewShell*
pOtherView, int nType, const OString& rKey, const OString& rPayload)
+{
+boost::property_tree::ptree aTree;
+aTree.put("viewId", SfxLokHelper::getView(pThisView));
+aTree.put(rKey.getStr(), rPayload.getStr());
+aTree.put("part", pThisView->getPart());
+aTree.put(rKey.getStr(), rPayload.getStr());
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+OString aPayload = aStream.str().c_str();
+pOtherView->libreOfficeKitViewCallback(nType, aPayload.getStr());
+}
+
void SfxLokHelper::notifyOtherViews(SfxViewShell* pThisView, int nType, const
OString& rKey, const OString& rPayload)
{
if (SfxLokHelper::getViews() <= 1)
@@ -97,17 +110,8 @@ void SfxLokHelper::notifyOtherViews(SfxViewShell*
pThisView, int nType, const OS
while (pViewShell)
{
if (pViewShell != pThisView)
-{
-boost::property_tree::ptree aTree;
-aTree.put("viewId", SfxLokHelper::getView(pThisView));
-aTree.put(rKey.getStr(), rPayload.getStr());
-aTree.put("part", pThisView->getPart());
-aTree.put(rKey.getStr(), rPayload.getStr());
-std::stringstream aStream;
-boost::property_tree::write_json(aStream, aTree);
-OString aPayload = aStream.str().c_str();
-pViewShell->libreOfficeKitViewCallback(nType, aPayload.getStr());
-}
+notifyOtherView(pThisView, pViewShell, nType, rKey, rPayload);
+
pViewShell
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/04bffa5c633d7bc2064e3c643dbacfab79e281
72/04bffa5c633d7bc2064e3c643dbacfab79e281 |1 + 1 file changed, 1 insertion(+) New commits: commit 8da151ebd2d5d1fc3dc5c6690e602f3246991e58 Author: Caolán McNamara Date: Thu Sep 1 09:30:30 2016 +0100 Notes added by 'git notes add' diff --git a/72/04bffa5c633d7bc2064e3c643dbacfab79e281 b/72/04bffa5c633d7bc2064e3c643dbacfab79e281 new file mode 100644 index 000..afe1817 --- /dev/null +++ b/72/04bffa5c633d7bc2064e3c643dbacfab79e281 @@ -0,0 +1 @@ +prefer: e456a0804052a0ad0a4daef4fad9c5205bd7aa60 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cc/9823f5bde6f49eb75e4ad0e8f8a162bf341f34
cc/9823f5bde6f49eb75e4ad0e8f8a162bf341f34 |1 + 1 file changed, 1 insertion(+) New commits: commit b25907b24440d94499b3538614ceaac23228998e Author: Caolán McNamara Date: Thu Sep 1 09:29:07 2016 +0100 Notes added by 'git notes add' diff --git a/cc/9823f5bde6f49eb75e4ad0e8f8a162bf341f34 b/cc/9823f5bde6f49eb75e4ad0e8f8a162bf341f34 new file mode 100644 index 000..161771c --- /dev/null +++ b/cc/9823f5bde6f49eb75e4ad0e8f8a162bf341f34 @@ -0,0 +1 @@ +prefer: d6500b19afc6a15e63e679765317690eac0d4207 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/aac1afdebb39de5b5c43760c13bb64b429f1c8
6a/aac1afdebb39de5b5c43760c13bb64b429f1c8 |1 + 1 file changed, 1 insertion(+) New commits: commit 564b906fede23da2eeb900c8cc764fe0ca379dc8 Author: Caolán McNamara Date: Thu Sep 1 09:27:10 2016 +0100 Notes added by 'git notes add' diff --git a/6a/aac1afdebb39de5b5c43760c13bb64b429f1c8 b/6a/aac1afdebb39de5b5c43760c13bb64b429f1c8 new file mode 100644 index 000..0a42334 --- /dev/null +++ b/6a/aac1afdebb39de5b5c43760c13bb64b429f1c8 @@ -0,0 +1 @@ +prefer: 9885c35ddb9188e5b1549edf8697f6946232f7d3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/source
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 28 ---
sw/source/uibase/sidebar/SwPanelFactory.cxx | 12
2 files changed, 1 insertion(+), 39 deletions(-)
New commits:
commit ced120105884ba423d96d7129475a2a6cdd86987
Author: Susobhan Ghosh
Date: Thu Aug 25 11:00:21 2016 +
Hide/Disable the Page property Panel for Writer
Change-Id: I3d8769f59811863ab38abeaefb289213d2c37570
Reviewed-on: https://gerrit.libreoffice.org/28379
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 0e86926..f687aeb 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -373,34 +373,6 @@
-
-
- Page
-
-
- PagePropertyPanel
-
-
- PropertyDeck
-
-
- .uno:PageDialog
-
-
-
-Writer, Table,hidden ;
-Writer, Text, hidden ;
-Writer, default, hidden ;
-
-
-
-
private:resource/toolpanel/SwPanelFactory/PagePropertyPanel
-
-
- 300
-
-
-
Media Playback
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 8cca8e2..33c3132 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -21,7 +21,6 @@
#include
#include
-#include
#include
#include
#include
@@ -124,16 +123,7 @@ Reference SAL_CALL
SwPanelFactory::createUIElement (
"PanelFactory::createUIElement called without SfxBindings",
nullptr);
-if (rsResourceURL.endsWith("/PagePropertyPanel"))
-{
-VclPtr pPanel = sw::sidebar::PagePropertyPanel::Create(
pParentWindow, xFrame, pBindings );
-xElement = sfx2::sidebar::SidebarPanelBase::Create(
-rsResourceURL,
-xFrame,
-pPanel,
-ui::LayoutSize(-1,-1,-1));
-}
-else if(rsResourceURL.endsWith("/PageStylesPanel"))
+if(rsResourceURL.endsWith("/PageStylesPanel"))
{
VclPtr pPanel = sw::sidebar::PageStylesPanel::Create(
pParentWindow, xFrame, pBindings );
xElement = sfx2::sidebar::SidebarPanelBase::Create(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/3596887a07e85cf0b821baf748980ba86e7d25
6e/3596887a07e85cf0b821baf748980ba86e7d25 |1 + 1 file changed, 1 insertion(+) New commits: commit 79b1d2acea0cd52ab535bff0b2d3e83babf5893c Author: Caolán McNamara Date: Thu Sep 1 09:22:12 2016 +0100 Notes added by 'git notes add' diff --git a/6e/3596887a07e85cf0b821baf748980ba86e7d25 b/6e/3596887a07e85cf0b821baf748980ba86e7d25 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/6e/3596887a07e85cf0b821baf748980ba86e7d25 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1a/dcdc2d7895f8e873f6fbd1530b65ff1156e3f5
1a/dcdc2d7895f8e873f6fbd1530b65ff1156e3f5 |1 + 1 file changed, 1 insertion(+) New commits: commit fba19d7d1eb050bfcd4c58646e942022788e9c6f Author: Caolán McNamara Date: Thu Sep 1 09:20:08 2016 +0100 Notes added by 'git notes add' diff --git a/1a/dcdc2d7895f8e873f6fbd1530b65ff1156e3f5 b/1a/dcdc2d7895f8e873f6fbd1530b65ff1156e3f5 new file mode 100644 index 000..594fb78 --- /dev/null +++ b/1a/dcdc2d7895f8e873f6fbd1530b65ff1156e3f5 @@ -0,0 +1 @@ +prefer: 7b58b777bd15d5f34375e0325e4838e07f22dedc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b2/1a60bf36456a800fb862c4302480c82e639f7e
b2/1a60bf36456a800fb862c4302480c82e639f7e |1 + 1 file changed, 1 insertion(+) New commits: commit 5af6f9401d8c14ced98c5fd7835ed659a3688c1d Author: Caolán McNamara Date: Thu Sep 1 09:17:51 2016 +0100 Notes added by 'git notes add' diff --git a/b2/1a60bf36456a800fb862c4302480c82e639f7e b/b2/1a60bf36456a800fb862c4302480c82e639f7e new file mode 100644 index 000..482736c --- /dev/null +++ b/b2/1a60bf36456a800fb862c4302480c82e639f7e @@ -0,0 +1 @@ +prefer: 291544d481a79ce037018dd7cefbfec719b76f2d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/bastyp/calc.cxx | 223 -
1 file changed, 223 deletions(-)
New commits:
commit 6e781d5c9356e4cfa98cb5d9e2e51c4944f4b615
Author: Miklos Vajna
Date: Thu Sep 1 08:49:23 2016 +0200
sw: remove the old calculator implementation
It was disabled build-time + also one had to turn it on from a debugger,
doesn't seem to be useful anymore.
Change-Id: Id04a763e8dc9f09ce28374210da4ec39fbb2b3e1
Reviewed-on: https://gerrit.libreoffice.org/28579
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 6d12a7d..cf28e19 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -635,14 +635,6 @@ void SwCalc::Pop()
SwCalcOper SwCalc::GetToken()
{
-#if OSL_DEBUG_LEVEL > 1
-// static for switch back to the "old" implementation of the calculator
-// which doesn't use the I18N routines.
-static int nUseOld = 0;
-if( !nUseOld )
-{
-#endif
-
if( m_nCommandPos >= m_sCommand.getLength() )
return m_eCurrOper = CALC_ENDCALC;
@@ -854,221 +846,6 @@ SwCalcOper SwCalc::GetToken()
m_nCommandPos = aRes.EndPos;
};
-#if OSL_DEBUG_LEVEL > 1
-#define NextCh( s, n ) (nCommandPos < sCommand.getLength() ?
sCommand[nCommandPos++] : 0)
-
-}
-else
-{
-sal_Unicode ch;
-sal_Unicode cTSep = pLclData->getNumThousandSep()[0],
-cDSep = pLclData->getNumDecimalSep()[0];
-
-do {
-if( 0 == ( ch = NextCh( sCommand, nCommandPos ) ) )
-return eCurrOper = CALC_ENDCALC;
-} while ( ch == '\t' || ch == ' ' || ch == cTSep );
-
-if( ch == cDSep )
-ch = '.';
-
-switch( ch )
-{
-case ';':
-if( CALC_MONTH == eCurrListOper || CALC_DAY == eCurrListOper )
-{
-eCurrOper = eCurrListOper;
-break;
-} // else .. no break
-case '\n':
-{
-sal_Unicode c;
-while( nCommandPos < sCommand.getLength() &&
- ( ( c = sCommand[nCommandPos] ) == ' ' ||
- c == '\t' || c == '\x0a' || c == '\x0d' ))
-{
-++nCommandPos;
-}
-eCurrOper = CALC_PRINT;
-}
-break;
-
-case '%':
-case '^':
-case '*':
-case '/':
-case '+':
-case '-':
-case '(':
-case ')':
-eCurrOper = SwCalcOper(ch);
-break;
-
-case '=':
-if( '=' == sCommand[nCommandPos] )
-{
-++nCommandPos;
-eCurrOper = CALC_EQ;
-}
-else
-{
-eCurrOper = SwCalcOper(ch);
-}
-break;
-
-case '!':
-if( '=' == sCommand[nCommandPos] )
-{
-++nCommandPos;
-eCurrOper = CALC_NEQ;
-}
-else
-{
-eCurrOper = CALC_NOT;
-}
-break;
-
-case '>':
-case '<':
-eCurrOper = '>' == ch ? CALC_GRE : CALC_LES;
-if( '=' == (ch = sCommand[nCommandPos] ) )
-{
-++nCommandPos;
-eCurrOper = CALC_GRE == eCurrOper ? CALC_GEQ : CALC_LEQ;
-}
-else if( ' ' != ch )
-{
-eError = CALC_SYNTAX;
-eCurrOper = CALC_PRINT;
-}
-break;
-
-case cListDelim :
-eCurrOper = eCurrListOper;
-break;
-
-case '0': case '1': case '2': case '3': case '4':
-case '5': case '6': case '7': case '8': case '9':
-case ',':
-case '.':
-{
-double nVal;
---nCommandPos; // back to the first char
-if( Str2Double( sCommand, nCommandPos, nVal, pLclData ))
-{
-nNumberValue.PutDouble( nVal );
-eCurrOper = CALC_NUMBER;
-}
-else
-{
-// erroneous number
-eError = CALC_SYNTAX;
-eCurrOper = CALC_PRINT;
-}
-}
-break;
-
-case '[':
-{
-OUString aStr;
-bool bIgnore = false;
-do {
-while( 0 != ( ch = NextCh( sCommand, nCommandPos )) &&
- ch != ']' )
-{
-if( !bIgnore && '\\' == ch )
-bIgnore = true;
-else if( bIgnore )
-bIgnore = false;
-aStr += OUString(ch);
-
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 92/afbd9a164db8616dce4b8947b8f37fc96d4d43
92/afbd9a164db8616dce4b8947b8f37fc96d4d43 |1 + 1 file changed, 1 insertion(+) New commits: commit 204aa77f1c0af18f9875306f5f054707ca78c792 Author: Caolán McNamara Date: Thu Sep 1 09:15:45 2016 +0100 Notes added by 'git notes add' diff --git a/92/afbd9a164db8616dce4b8947b8f37fc96d4d43 b/92/afbd9a164db8616dce4b8947b8f37fc96d4d43 new file mode 100644 index 000..2011d23 --- /dev/null +++ b/92/afbd9a164db8616dce4b8947b8f37fc96d4d43 @@ -0,0 +1 @@ +prefer: 9598e9061f76439daa841f991fbec05412826971 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/atrfrm.cxx |5 ++---
sw/source/core/txtnode/thints.cxx |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 9472ed3fe6e46e18bad88e9e388af6c342436a32
Author: Caolán McNamara
Date: Wed Aug 31 16:02:58 2016 +0100
fix non-debug enable-assert-always-abort build
Change-Id: Ie120e56339d263ef7e2e7f1bdd04da62726d046c
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 42a876f..7fa9c73 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2546,12 +2546,11 @@ void SwFrameFormat::SetName( const OUString& rNewName,
bool bBroadcast )
SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName );
// As it's a non-unique list, rename should never fail!
-#if OSL_DEBUG_LEVEL > 0
-bool renamed =
-#endif
+bool const renamed =
m_ffList->m_PosIndex.modify( it,
change_name( rNewName ), change_name( m_aFormatName ) );
assert(renamed);
+(void)renamed; // unused in NDEBUG
if (bBroadcast) {
SwStringMsgPoolItem aNew( RES_NAME_CHANGED, rNewName );
ModifyNotification( &aOld, &aNew );
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index b53efe5..8afc3ba 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3296,7 +3296,7 @@ void SwpHints::DeleteAtPos( const size_t nPos )
bool const done = m_HintsByEnd.erase(pHt);
assert(done);
-(void) done; // unused in NDEBUG
+(void)done; // unused in NDEBUG
if( pHint->Which() == RES_TXTATR_FIELD )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 813a8944bdb337a0018208381aa30118151872ff Author: Michael Stahl Date: Thu Sep 1 09:26:49 2016 +0200 sfx2: SfxCommonTemplateDialog_Impl can't even decide if... ...no family selection should be represented as "0" or "0x". Change-Id: I08ef69bf35d130898cb995463dc29e72a372562c diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4aca5b7..15859ef 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -653,7 +653,7 @@ namespace SfxTemplate case SfxStyleFamily::Page: return 4; case SfxStyleFamily::Pseudo: return 5; case SfxStyleFamily::Table: return 6; -default: return 0; +default: return 0x; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/inc sc/inc
sal/inc/sal/types.h |8
sc/inc/compiler.hxx |6 +-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit cc9823f5bde6f49eb75e4ad0e8f8a162bf341f34
Author: Don Lewis
Date: Thu Sep 1 06:47:05 2016 +
Fix -Wunused-private-field errors in sc/inc/compiler.hxx. The structure
ScDoubleRawToken contains four unused private fields. Mark these as
unused to eliminate the warning message. We can't delete these fields
because we want the layout of this structure to match ScRawToken.
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 8f829d3..2bad6d6 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -235,6 +235,14 @@ typedef void * sal_Handle;
# define SAL_MAX_ENUM 0x7fff
#endif
+#if defined(__GNUC__) || defined(__clang__)
+#define SAL_UNUSED(__x__) __x__ __attribute((__unused__))
+#elif defined(_MSC_VER)
+#define SAL_UNUSED(__x__) __pragma(warning(suppress:4100;suppress:4101))
__x__
+#else
+#define SAL_UNUSED(__x__) __x__
+#endif
+
#if defined(_MSC_VER) || defined(__MINGW32__)
# define SAL_DLLPUBLIC_EXPORT__declspec(dllexport)
#if defined(_MSC_VER)
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index ffb2cab..bd05000 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -116,7 +116,11 @@ class ScTokenArray;
struct ScDoubleRawToken
{
private:
-SC_TOKEN_FIX_MEMBERS
+// SC_TOKEN_FIX_MEMBERS
+OpCode SAL_UNUSED(eOp);
+formula::StackVar SAL_UNUSED(eType);
+sal_uInt16 SAL_UNUSED(nRefCnt);
+sal_Bool SAL_UNUSED(bRaw);
public:
union
{ // union only to assure alignment identical to ScRawToken
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/README.vars
loolwsd/README.vars |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit c5d8e3c7996bbf9f15bb62003754b255ea5229a8 Author: Tor Lillqvist Date: Thu Sep 1 10:32:28 2016 +0300 Clarify that LOOL_NO_LOGCOLOR has no effect if stderr goes to a tty diff --git a/loolwsd/README.vars b/loolwsd/README.vars index 0e45420..d78b553 100644 --- a/loolwsd/README.vars +++ b/loolwsd/README.vars @@ -18,7 +18,8 @@ LOOL_NO_AUTOSAVE LOOL_NO_LOGCOLOR if set avoids use of colour escape sequences in the logging -output. +output when it is redirected. When stderr is going to a +terminal colour is always used. SLEEPFORDEBUGGER sleep seconds in the broken process after starting in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes33' -
0 files changed New commits: commit d2b935de70a6a1e6bde7129be5515b079a716e1f Author: László Németh Date: Thu Sep 1 09:30:37 2016 +0200 repeat (orig. graphic cache size) Change-Id: I7abd9f0f459d139ea4ee4a559f50423890682c60 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/fixes33'
New branch 'feature/fixes33' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist
loleaflet/dist/toolbar/toolbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d3eda7d19857c17d98e4000f712cde61066684fe
Author: Pranav Kant
Date: Thu Sep 1 12:40:58 2016 +0530
loleaflet: userlist l10n fix
Change-Id: Id2be29e018f1c23a8d5b61ad3fbaebc36f1222ec
diff --git a/loleaflet/dist/toolbar/toolbar.js
b/loleaflet/dist/toolbar/toolbar.js
index c9e4fa3..b43a7de 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1363,7 +1363,7 @@ function updateUserListCount(userlist) {
if (count > 1) {
userlist.caption = nUsers.replace('%n', count);
} else if (count === 1) {
- userlist.caption = '1 user';
+ userlist.caption = _('1 user');
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
