[Bug 30873] Field variables break with additional formats
https://bugs.documentfoundation.org/show_bug.cgi?id=30873 jan iversen changed: What|Removed |Added CC||j...@documentfoundation.org --- Comment #17 from jan iversen --- There are no code pointers ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable
https://bugs.documentfoundation.org/show_bug.cgi?id=40469 Andrei Furtuna changed: What|Removed |Added Assignee|furtunas...@gmail.com |libreoffice-b...@lists.free ||desktop.org --- Comment #18 from Andrei Furtuna --- Sorry community, I didn't figure it out. And I'm not working more at this bug. I'm changing the status. (In reply to jan iversen from comment #17) > Andrei@ A polite ping are you still working on this ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 97640] Beanshell Editor: Use fixed-width font
https://bugs.documentfoundation.org/show_bug.cgi?id=97640 --- Comment #11 from Commit Notification --- Chirag Manwani committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=38969497cbccacf2999d92b06a85946c1f71be05 tdf#97640 Fixed-Width Font for Beanshell Editor It will be available in 5.2.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 97640] Beanshell Editor: Use fixed-width font
https://bugs.documentfoundation.org/show_bug.cgi?id=97640 Commit Notification changed: What|Removed |Added Whiteboard|ToBeReviewed|ToBeReviewed target:5.2.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java |1 + 1 file changed, 1 insertion(+) New commits: commit 38969497cbccacf2999d92b06a85946c1f71be05 Author: Chirag Manwani Date: Wed Feb 17 02:52:45 2016 +0530 tdf#97640 Fixed-Width Font for Beanshell Editor Change-Id: I809253a4f0481c825368d9c608cac77e64376aa0 Reviewed-on: https://gerrit.libreoffice.org/22404 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java index 34aac4c..91e7b91 100644 --- a/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java +++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java @@ -98,6 +98,7 @@ public class PlainSourceView extends JScrollPane implements ta.setColumns(40); ta.setLineWrap(false); ta.insert(model.getText(), 0); +ta.setFont(new Font(Font.MONOSPACED, ta.getFont().getStyle(), ta.getFont().getSize())); linecount = ta.getLineCount(); gg = new GlyphGutter(this); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 97640] Beanshell Editor: Use fixed-width font
https://bugs.documentfoundation.org/show_bug.cgi?id=97640 Samuel Mehrbrodt (CIB) changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit b0facbbedf42a02449d9f35bb4ac8bd7ec2d8917
Author: Juergen Funk
Date: Wed Feb 10 14:54:24 2016 +0100
tdf#97526 - in copy/paste ignore unwanted page break on first paragraph
In copy/paste ignore the page break attribute from the first paragraph
of the document (see also tdf#39400)
Change-Id: I838c21c14647d4692673bd30df320e6704de1455
Reviewed-on: https://gerrit.libreoffice.org/22270
Reviewed-by: Oliver Specht
Tested-by: Oliver Specht
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index a82075e..750dcbe 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4180,6 +4180,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM&
rPam, SwPosition& rPos,
( (pDestTextNd && !pDestTextNd->GetText().getLength())
||
( !bOneNode && !rPos.nContent.GetIndex() ) );
bool bCopyBookmarks = true;
+bool bCopyPageSource = false;
bool bStartIsTextNode = nullptr != pSttTextNd;
// #i104585# copy outline num rule to clipboard (for ASCII filter)
@@ -,10 +4445,24 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM&
rPam, SwPosition& rPos,
pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTextNode()))
{
pDestTextNd->SetAttr( aBrkSet );
+bCopyPageSource = true;
}
}
} while( false );
+
+// it is not possible to make this test when copy from the clipBoard to
document
+// in this case the PageNum not exist anymore
+// tdf#39400 and tdf#97526
+// when copy from document to ClipBoard, and it is from the first page
+// and not the source has the page break
+if (pDoc->IsClipBoard() && (rPam.GetPageNum(pStt == rPam.GetPoint()) == 1)
&& !bCopyPageSource)
+{
+pDestTextNd->ResetAttr(RES_BREAK);// remove the page-break
+pDestTextNd->ResetAttr(RES_PAGEDESC);
+}
+
+
// Adjust position (in case it was moved / in another node)
rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
rPos.nContent.GetIndex() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 67544] FILESAVE: Slide transistion sound(other sound) is not included in presentation file
https://bugs.documentfoundation.org/show_bug.cgi?id=67544 jan iversen changed: What|Removed |Added Status|ASSIGNED|NEEDINFO CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #12 from jan iversen --- Removing assigned as it is not There are currently no code pointer ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 77667] Remove gcc3 workaround where it could handle instantiated objects as parameters
https://bugs.documentfoundation.org/show_bug.cgi?id=77667 jan iversen changed: What|Removed |Added CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 77667] Remove gcc3 workaround where it could handle instantiated objects as parameters
https://bugs.documentfoundation.org/show_bug.cgi?id=77667 jan iversen changed: What|Removed |Added Status|ASSIGNED|NEW --- Comment #5 from jan iversen --- Removing assigned as it is not. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39749] calc unit test writing
https://bugs.documentfoundation.org/show_bug.cgi?id=39749 jan iversen changed: What|Removed |Added Status|ASSIGNED|NEW CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | Assignee|kadertarl...@gmail.com |libreoffice-b...@lists.free ||desktop.org --- Comment #9 from jan iversen --- Very nice that you work on this task. It is however a task where multiple can work in parallel, so I am unassigning it (but remembering you work on it) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.documentfoundation.org/show_bug.cgi?id=30732 jan iversen changed: What|Removed |Added CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #36 from jan iversen --- A polite ping, are you still working on this ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 89387] improve performance for some matrix operations
https://bugs.documentfoundation.org/show_bug.cgi?id=89387 jan iversen changed: What|Removed |Added CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #29 from jan iversen --- A polite ping, are you still working on this ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82319] use modern OpenGL for OpenGL canvas
https://bugs.documentfoundation.org/show_bug.cgi?id=82319 jan iversen changed: What|Removed |Added Status|ASSIGNED|NEW CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #6 from jan iversen --- Changes status ASSIGNED, since it was not -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.documentfoundation.org/show_bug.cgi?id=63154 jan iversen changed: What|Removed |Added CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #71 from jan iversen --- Marcos: a polite ping, are you still working on this? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34882] Special character favorites
https://bugs.documentfoundation.org/show_bug.cgi?id=34882 jan iversen changed: What|Removed |Added CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #20 from jan iversen --- Steve@ A polite ping, are you still working on this ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 45615] Implement additional 3d slideshow transitions
https://bugs.documentfoundation.org/show_bug.cgi?id=45615 jan iversen changed: What|Removed |Added CC|libreoffice@lists.freedeskt |j...@documentfoundation.org |op.org | --- Comment #7 from jan iversen --- Andrzej: A polite ping are you still working on this ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 40469] Modifed Frame Style Options Not Preserved, "Keep Ratio" Option Unavailable
https://bugs.documentfoundation.org/show_bug.cgi?id=40469 --- Comment #17 from jan iversen --- Andrei@ A polite ping are you still working on this ? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/source
basic/source/comp/dim.cxx | 27 ++-
basic/source/comp/exprnode.cxx | 12 +++-
basic/source/comp/exprtree.cxx | 34 +-
basic/source/inc/expr.hxx | 11 ++-
basic/source/inc/parser.hxx|2 +-
5 files changed, 37 insertions(+), 49 deletions(-)
New commits:
commit f17a4694b07856292804c23b80ce92967d401bb8
Author: Arnaud Versini
Date: Sat Feb 13 20:17:41 2016 +0100
BASIC : use std::unique_ptr for storing SbiExprList
Change-Id: I37f2a1c837c6742cf6d403962d2730b5e80004ec
Reviewed-on: https://gerrit.libreoffice.org/22345
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 2f9fefa..ffd7174f 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::uno;
// Return-value: a new instance, which were inserted and then deleted.
// Array-Index were returned as SbiExprList
-SbiSymDef* SbiParser::VarDecl( SbiExprList** ppDim, bool bStatic, bool bConst )
+SbiSymDef* SbiParser::VarDecl( SbiExprListPtr* ppDim, bool bStatic, bool
bConst )
{
bool bWithEvents = false;
if( Peek() == WITHEVENTS )
@@ -50,7 +50,7 @@ SbiSymDef* SbiParser::VarDecl( SbiExprList** ppDim, bool
bStatic, bool bConst )
if( !TestSymbol() ) return nullptr;
SbxDataType t = eScanType;
SbiSymDef* pDef = bConst ? new SbiConstDef( aSym ) : new SbiSymDef( aSym );
-SbiExprList* pDim = nullptr;
+SbiExprListPtr pDim;
// Brackets?
if( Peek() == LPAREN )
{
@@ -68,10 +68,9 @@ SbiSymDef* SbiParser::VarDecl( SbiExprList** ppDim, bool
bStatic, bool bConst )
{
if(pDim->GetDims() )
Error( ERRCODE_BASIC_EXPECTED, "()" );
-delete pDim;
}
else if( ppDim )
-*ppDim = pDim;
+*ppDim = std::move(pDim);
return pDef;
}
@@ -294,7 +293,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
Error( ERRCODE_BASIC_UNEXPECTED, eCurTok );
}
SbiSymDef* pDef;
-SbiExprList* pDim;
+SbiExprListPtr pDim;
// #40689, Statics -> Modul-Initialising, skip in Sub
sal_uInt32 nEndOfStaticLbl = 0;
@@ -430,14 +429,14 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
aGen.Gen( _REDIMP_ERASE );
pDef->SetDims( pDim->GetDims() );
-SbiExpression aExpr2( this, *pDef, pDim );
+SbiExpression aExpr2( this, *pDef, std::move(pDim) );
aExpr2.Gen();
aGen.Gen( _DCREATE_REDIMP, pDef->GetId(),
pDef->GetTypeId() );
}
else
{
pDef->SetDims( pDim->GetDims() );
-SbiExpression aExpr( this, *pDef, pDim );
+SbiExpression aExpr( this, *pDef, std::move(pDim) );
aExpr.Gen();
aGen.Gen( _DCREATE, pDef->GetId(), pDef->GetTypeId() );
}
@@ -462,7 +461,6 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
if( pDim )
{
Error( ERRCODE_BASIC_SYNTAX );
-delete pDim;
}
SbiExpression aVar( this, *pDef );
if( !TestToken( EQ ) )
@@ -510,7 +508,7 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
pDef->SetDims( pDim->GetDims() );
if( bPersistantGlobal )
pDef->SetGlobal( true );
-SbiExpression aExpr( this, *pDef, pDim );
+SbiExpression aExpr( this, *pDef, std::move(pDim) );
aExpr.Gen();
pDef->SetGlobal( false );
aGen.Gen( (eOp == _STATIC) ? _DIM : eOp );
@@ -588,12 +586,12 @@ void SbiParser::DefType( bool bPrivate )
SbxObject *pType = new SbxObject(aSym);
-std::unique_ptr pElem;
-SbiExprList* pDim = nullptr;
bool bDone = false;
while( !bDone && !IsEof() )
{
+std::unique_ptr pElem;
+SbiExprListPtr pDim;
switch( Peek() )
{
case ENDTYPE :
@@ -675,8 +673,6 @@ void SbiParser::DefType( bool bPrivate )
}
pTypeMembers->Insert( pTypeElem, pTypeMembers->Count() );
}
-delete pDim, pDim = nullptr;
-pElem.reset();
}
}
@@ -713,7 +709,6 @@ void SbiParser::DefEnum( bool bPrivate )
pEnum->SetFlag( SbxFlagBits::Private );
}
SbiSymDef* pElem;
-SbiExprList* pDim;
bool bDone = false;
// Starting with -1 to make first default value 0 after ++
@@ -736,8 +731,7 @@ void SbiParser::DefEnum( bool bPrivate )
default:
{
-// TODO: Check existing!
-pDim = nullptr;
+SbiExprListPtr pDim;
pElem = Va
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgstyleattributes.hxx |2 +-
svgio/source/svgreader/svgstyleattributes.cxx| 17 +
2 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 7b7ffedfa6357b902a5e354d986dac39a3b2f462
Author: Xisco Fauli
Date: Wed Feb 17 00:25:15 2016 +0100
SVGIO: tdf#97539: clip-path elements might contain...
reference to other clip-paths
Change-Id: I0c426c892da2478293b78ea93db087d781275896
Reviewed-on: https://gerrit.libreoffice.org/22411
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 33258d5..011b5f3 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -441,7 +441,7 @@ namespace svgio
void setDesc(const OUString& rNew) { maDesc = rNew; }
// ClipPathXLink content
-const OUString getClipPathXLink() const { return maClipPathXLink; }
+OUString getClipPathXLink() const;
// MaskXLink content
const OUString getMaskXLink() const { return maMaskXLink; }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index 698f7e8..bf4f057 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2648,6 +2648,23 @@ namespace svgio
return nullptr;
}
+OUString SvgStyleAttributes::getClipPathXLink() const
+{
+if(!maClipPathXLink.isEmpty())
+{
+return maClipPathXLink;
+}
+
+const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
+
+if(pSvgStyleAttributes)
+{
+return pSvgStyleAttributes->getClipPathXLink();
+}
+
+return OUString();
+}
+
OUString SvgStyleAttributes::getMarkerStartXLink() const
{
if(!maMarkerStartXLink.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' - icon-themes/tango
icon-themes/tango/cmd/lc_numberformatpercent.png |binary icon-themes/tango/cmd/lc_resetattributes.png |binary icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 |binary icon-themes/tango/cmd/lc_togglesheetgrid.png |binary 4 files changed New commits: commit 398fcdd3abcab3dbd0418dbae87ed4ca7451315c Author: Yousuf Philips Date: Tue Feb 16 22:00:32 2016 +0400 Tango: Add clear formatting icon and update 2 calc icons Change-Id: I9d7ead5acec45fe8cfad75d66d4ffa44f54c1e9f Reviewed-on: https://gerrit.libreoffice.org/22401 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips (cherry picked from commit df8b1dca993d1c0d2b6d5fbfaf4741ffc4cb263b) Signed-off-by: Adolfo Jayme Barrientos diff --git a/icon-themes/tango/cmd/lc_numberformatpercent.png b/icon-themes/tango/cmd/lc_numberformatpercent.png index fc96863..910a779 100644 Binary files a/icon-themes/tango/cmd/lc_numberformatpercent.png and b/icon-themes/tango/cmd/lc_numberformatpercent.png differ diff --git a/icon-themes/tango/cmd/lc_resetattributes.png b/icon-themes/tango/cmd/lc_resetattributes.png new file mode 100644 index 000..d1234bc Binary files /dev/null and b/icon-themes/tango/cmd/lc_resetattributes.png differ diff --git a/icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 b/icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 new file mode 100644 index 000..4a160d3 Binary files /dev/null and b/icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_togglesheetgrid.png b/icon-themes/tango/cmd/lc_togglesheetgrid.png index b6c79ac..ffc57a4 100644 Binary files a/icon-themes/tango/cmd/lc_togglesheetgrid.png and b/icon-themes/tango/cmd/lc_togglesheetgrid.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/breakpad' - 99 commits - basic/source bin/symbolstore.py bin/upload_symbols.py config_host/config_features.h.in config_host.mk.in configure.ac cppuhelpe
Rebased ref, commits from common ancestor:
commit 7b8fa6af225a4b2d0687f1f1918216de8326d7ed
Author: Markus Mohrhard
Date: Tue Feb 16 10:59:24 2016 +0100
add missing file
Change-Id: I4931d66cf082c91db870ef8e698d36f5ae10fbd9
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
new file mode 100644
index 000..e8d1355
--- /dev/null
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -0,0 +1,67 @@
+
+
+
+
+
+False
+dialog
+
+
+False
+vertical
+2
+
+
+False
+end
+
+
+Send
report
+True
+True
+True
+
+
+True
+True
+0
+
+
+
+
+Don't send
report
+True
+True
+True
+
+
+True
+True
+1
+
+
+
+
+False
+False
+0
+
+
+
+
+True
+False
+We are sorry but it
seems that LibreOffice crashed the last time.
+You can help us fix this issue by sending the crash report to the
+LibreOffice crash reporting server.
+
+
+False
+True
+1
+
+
+
+
+
+
commit 9c2d0bfe5561bcadfdd7f652329875f1576f1549
Author: Markus Mohrhard
Date: Sun Feb 7 16:21:13 2016 +0100
fix indetation
Change-Id: Iea12f654d737cfdadae99461ff996220fcb7901c
diff --git a/sc/source/filter/lotus/filter.cxx
b/sc/source/filter/lotus/filter.cxx
index 06e9ba2..bc87806 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -47,12 +47,12 @@ generate_Opcodes(LotusContext &rContext, SvStream& aStream,
{
case eWK_1:
case eWK_2:
-pOps = rContext.pOpFkt;
-nOps = FKT_LIMIT;
+pOps = rContext.pOpFkt;
+nOps = FKT_LIMIT;
break;
case eWK123:
-pOps = rContext.pOpFkt123;
-nOps = FKT_LIMIT123;
+pOps = rContext.pOpFkt123;
+nOps = FKT_LIMIT123;
break;
case eWK3: return eERR_NI;
case eWK_Error: return eERR_FORMAT;
commit 5834b768743b10032d26ec4b099938f5d94cf194
Author: Markus Mohrhard
Date: Wed Feb 3 20:28:40 2016 +0100
tdf#93300, handle hard formatting with cond format correct
For number formats we always applied the conditional format above the
hard formatting.
Now we handle styles, conditional formatting and hard formatting
correctly.
Change-Id: I52dbeeb848b982985d6b17dad920baedffb218e4
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index eead1a6..fccfb43 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -1291,12 +1291,24 @@ bool ScPatternAttr::IsSymbolFont() const
return false;
}
+namespace {
+
+sal_uInt32 getNumberFormatKey(const SfxItemSet& rSet)
+{
+return static_cast(rSet.Get(ATTR_VALUE_FORMAT)).GetValue();
+}
+
+LanguageType getLanguageType(const SfxItemSet& rSet)
+{
+return static_cast(rSet.Get(ATTR_LANGUAGE_FORMAT)).GetLanguage();
+}
+
+}
+
sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const
{
-sal_uLong nFormat =
-static_cast(&GetItemSet().Get( ATTR_VALUE_FORMAT
))->GetValue();
-LanguageType eLang =
-static_cast(&GetItemSet().Get(
ATTR_LANGUAGE_FORMAT ))->GetLanguage();
+sal_uLong nFormat = getNumberFormatKey(GetItemSet());
+LanguageType eLang = getLanguageType(GetItemSet());
if ( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && eLang == LANGUAGE_SYSTEM )
; // it remains as it is
else if ( pFormatter )
@@ -1313,17 +1325,33 @@ sal_uLong ScPatternAttr::GetNumberFormat(
SvNumberFormatter* pFormatter,
if (!pCondSet)
return GetNumberFormat(pFormatter);
+/* In the case of a conditional format we need to overwrite a cell style
+ * but leave a hard cell formatting alone. So check first if the number
+ * format is set in the cell format, then the conditional format and
+ * finally in the style.
+ *
+ * The style is represented here if the name is empty.
+ */
+
const SfxPoolItem* pFormItem;
-if ( pCondSet->GetItemState(ATTR_VALUE_FORMAT,true,&pFormItem) !=
SfxItemState::SET )
-pFormItem = &GetItemSet().Get(ATTR_VALUE_FORMAT);
+sal_uLong nFormat = 0;
+if (GetItemSet().GetItemState(ATTR_VALUE_FORMAT, false, &pFormItem) ==
SfxItemState::SET)
+nFormat = static_cast(pFormItem)->GetValue();
+else if (pCondSet->GetItemState(ATTR_VALUE_FORMAT, true, &pFormItem) ==
SfxItemState::SET )
+n
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source
sc/source/core/data/document.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 71de3699a30267d989ef78096477d9ecca329974
Author: Damjan Jovanovic
Date: Wed Feb 17 00:03:50 2016 +
#i118023# Calc: Cut-and-paste between spreadsheets causes incorrect cell
reference changes
When pasting cut cells, Calc updates references to their old positions
to instead refer to their new positions. This is done using the tab index,
row and column, however the document is not taken into account. As a result,
when cutting and pasting between documents, cells in the target document
end up getting changed instead of in the source, potentially leading to
formula corruption, which is undoable but could easily go unnoticed,
causing data loss when the document is saved.
We don't really support inter-document reference updates anyway, so fix
this bug by restricting reference updates to the intra-document cut and
paste case only.
Patch by: me
Reviewed by: kschenk
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2aefa7a..0ccf481 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1965,7 +1965,8 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW
nRow1,
nClipTab = (nClipTab+1) % (MAXTAB+1);
}
}
-if ( pCBFCP->nInsFlag & IDF_CONTENTS )
+if ( (pCBFCP->nInsFlag & IDF_CONTENTS) &&
+(pCBFCP->pClipDoc->GetClipParam().getSourceDocID() ==
GetDocumentID()) ) // #118023# only update references for *intra-document* cut
and paste
{
nClipTab = 0;
for (SCTAB i = pCBFCP->nTabStart; i <= nTabEnd; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 64575] Photo Album: Better Image Layout
https://bugs.documentfoundation.org/show_bug.cgi?id=64575 --- Comment #9 from BezaM --- Yes it does! Thank you for the response! -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source
desktop/source/lib/init.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 4fff20024952c19b141f3c34c79ff9d116442fbc
Author: Henry Castro
Date: Tue Feb 16 21:21:24 2016 -0400
lok: add desktop terminate
When lokit is destroyed, the Desktop service
is still alive. So in order to avoid debug
assertion "Desktop disposed before terminating it",
terminate to quit application.
Change-Id: Id1391cde516915d915e5321799436e92b444e935
Reviewed-on: https://gerrit.libreoffice.org/22359
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 16d0c13..520b8ad 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2010,14 +2010,26 @@ LibreOfficeKit *libreofficekit_hook(const char*
install_path)
static void lo_destroy(LibreOfficeKit* pThis)
{
+bool bSuccess = false;
LibLibreOffice_Impl* pLib = static_cast(pThis);
gImpl = NULL;
SAL_INFO("lok", "LO Destroy");
comphelper::LibreOfficeKit::setStatusIndicatorCallback(0, 0);
+uno::Reference xDesktop = frame::Desktop::create (
::comphelper::getProcessComponentContext() );
+bSuccess = xDesktop.is() && xDesktop->terminate();
+
+if (!bSuccess)
+{
+bSuccess = GetpApp() && GetpApp()->QueryExit();
+}
+
+if (!bSuccess)
+{
+Application::Quit();
+}
-Application::Quit();
osl_joinWithThread(pLib->maThread);
osl_destroyThread(pLib->maThread);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fuinsert.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit dc9ec9f359ddc91a3aedbe38e6079b0555fb03f9
Author: Henry Castro
Date: Tue Feb 16 19:05:47 2016 -0400
tdf#97719: Canceling insert image dialog gives error dialog
Change-Id: I3ac9b0fe4d5a91d16af559ee8e38bc7be97cc694
Reviewed-on: https://gerrit.libreoffice.org/22408
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index f9cd4c9..b35a43f 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -139,13 +139,13 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
{
SvxOpenGraphicDialogaDlg(SdResId(STR_INSERTGRAPHIC));
-if( aDlg.Execute() == GRFILTER_OK )
-{
-nError = aDlg.GetGraphic(aGraphic);
-bAsLink = aDlg.IsAsLink();
-aFileName = aDlg.GetPath();
-aFilterName = aDlg.GetCurrentFilter();
-}
+if( aDlg.Execute() != GRFILTER_OK )
+return; // cancel dialog
+
+nError = aDlg.GetGraphic(aGraphic);
+bAsLink = aDlg.IsAsLink();
+aFileName = aDlg.GetPath();
+aFilterName = aDlg.GetCurrentFilter();
}
if( nError == GRFILTER_OK )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build failures in unit test when firebird is enabled
If this gets through, please Cc me on replies, I'm not subscribed. Was going to raise a bug, but apparently bugs in unit tests should be sent to this list. This is on 5.1.0.3, but I saw similar on 5.0 - at that time, I needed the app and I hadn't built gdb. Found a few references, and people building with firebird disabled, looks like the problem hits some people from time to time. This is on an i7 haswell. I recompiled LO with the debug information, but everything else on the system has been stripped. The error message is: [build DEP] LNK:CppunitTest/libtest_sw_ooxmlexport.so [build LNK] CppunitTest/libtest_sw_ooxmlexport.so Fatal exception: Signal 6 Stack: /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3(+0x396c0)[0x2b4bf344a6c0] /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3(+0x39a53)[0x2b4bf344aa53] /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3(+0x39b88)[0x2b4bf344ab88] /lib/libc.so.6(+0x33610)[0x2b4bf3e8d610] /lib/libc.so.6(gsignal+0x38)[0x2b4bf3e8d588] /lib/libc.so.6(abort+0x16a)[0x2b4bf3e8ea0a] /lib/libc.so.6(+0x77970)[0x2b4bf3ed1970] /scratch/working/libreoffice-5.1.0.3/instdir/program/libfbembed.so.2.5(+0x5751f)[0x2b4bfb1dd51f] /lib/libpthread.so.0(+0x7404)[0x2b4bf4409404] /lib/libc.so.6(clone+0x6d)[0x2b4bf3f4302d] It looks like /scratch/working/libreoffice-5.1.0.3/workdir/LinkTarget/Executable/cppunittester generated a core file at /scratch/working/libreoffice-5.1.0.3/workdir/CppunitTest/dbaccess_firebird_test.test.core/core Backtraces: [New LWP 28212] [New LWP 28096] [New LWP 28204] [New LWP 28215] [New LWP 28095] I'll attach the rest of the log, not sure if it is useful. My configure options (this is Beyond Linuxfromscratch) were reported as: Running ./configure with '--prefix=/usr --sysconfdir=/etc --with-vendor=BLFS --with-lang=fr en-GB --with-help --with-myspell-dicts --with-alloc=system --without-java --disable-dconf --disable-odk --disable-postgresql-sdbc --enable-release-build=yes --enable-python=system --with-system-boost --without-system-dicts --with-system-cairo --with-system-curl --with-system-expat --with-system-graphite --with-system-harfbuzz --with-system-icu --with-system-jpeg --with-system-lcms2 --with-system-libpng --with-system-libxml --with-system-neon --with-system-npapi-headers --with-system-nss --with-system-openssl --with-system-poppler --with-system-redland --with-system-zlib --with-parallelism=8 --srcdir=/scratch/working/libreoffice-5.1.0.3 --enable-option-checking=fatal' ĸen -- This email was written using 100% recycled letters. [build DEP] LNK:CppunitTest/libtest_sw_ooxmlexport.so [build LNK] CppunitTest/libtest_sw_ooxmlexport.so Fatal exception: Signal 6 Stack: /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3(+0x396c0)[0x2b4bf344a6c0] /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3(+0x39a53)[0x2b4bf344aa53] /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3(+0x39b88)[0x2b4bf344ab88] /lib/libc.so.6(+0x33610)[0x2b4bf3e8d610] /lib/libc.so.6(gsignal+0x38)[0x2b4bf3e8d588] /lib/libc.so.6(abort+0x16a)[0x2b4bf3e8ea0a] /lib/libc.so.6(+0x77970)[0x2b4bf3ed1970] /scratch/working/libreoffice-5.1.0.3/instdir/program/libfbembed.so.2.5(+0x5751f)[0x2b4bfb1dd51f] /lib/libpthread.so.0(+0x7404)[0x2b4bf4409404] /lib/libc.so.6(clone+0x6d)[0x2b4bf3f4302d] It looks like /scratch/working/libreoffice-5.1.0.3/workdir/LinkTarget/Executable/cppunittester generated a core file at /scratch/working/libreoffice-5.1.0.3/workdir/CppunitTest/dbaccess_firebird_test.test.core/core Backtraces: [New LWP 28212] [New LWP 28096] [New LWP 28204] [New LWP 28215] [New LWP 28095] warning: Could not load shared library symbols for linux-vdso.so.1. Do you need "set solib-search-path" or "set sysroot"? [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/libthread_db.so.1". Core was generated by `/scratch/working/libreoffice-5.1.0.3/workdir/LinkTarget/Executable/cppunitteste'. Program terminated with signal SIGABRT, Aborted. #0 0x2b4bf3e8d588 in raise () from /lib/libc.so.6 [Current thread is 1 (Thread 0x2b4bfee4c700 (LWP 28212))] warning: File "/scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3-gdb.py" auto-loading has been declined by your `auto-load safe-path' set to "$debugdir:$datadir/auto-load". To enable execution of this file add add-auto-load-safe-path /scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_sal.so.3-gdb.py line to your configuration file "/root/.gdbinit". To completely disable this security protection add set auto-load safe-path / line to your configuration file "/root/.gdbinit". For more information about this security protection see the "Auto-loading safe path" section in the GDB manual. E.g., run from the shell: info "(gdb)Auto-loading safe path" warning: File "/scratch/working/libreoffice-5.1.0.3/instdir/program/libuno_cppu.so.3-gdb.py" auto-loading has been
[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLWSD.cpp loolwsd/Util.cpp loolwsd/Util.hpp
loolwsd/LOOLBroker.cpp |2 +-
loolwsd/LOOLWSD.cpp|2 +-
loolwsd/Util.cpp | 12
loolwsd/Util.hpp |3 +++
4 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit a607159a8aa40ca6de4243ce19685b35233f69f2
Author: Henry Castro
Date: Tue Feb 16 17:25:51 2016 -0400
loolwsd: catch exception requestTermination
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index b29b4a9..9561be9 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -912,7 +912,7 @@ int main(int argc, char** argv)
for (auto& it : _childProcesses)
{
Log::info("Requesting child process " + std::to_string(it.first) + "
to terminate.");
-Process::requestTermination(it.first);
+Util::requestTermination(it.first);
}
// Wait and kill child processes
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 8d4cff1..b7cb356 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1088,7 +1088,7 @@ int LOOLWSD::main(const std::vector&
/*args*/)
// Terminate child processes
Util::writeFIFO(LOOLWSD::BrokerWritePipe, "eof\r\n");
Log::info("Requesting child process " + std::to_string(pidBroker) + " to
terminate");
-Process::requestTermination(pidBroker);
+Util::requestTermination(pidBroker);
// wait broker process finish
waitpid(pidBroker, &status, WUNTRACED);
diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 1685d38..697c1b5 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -543,6 +543,18 @@ namespace Util
return nRetVal;
}
+
+void requestTermination(const Poco::Process::PID& aPID)
+{
+try
+{
+Poco::Process::requestTermination(aPID);
+}
+catch(const Poco::Exception& exc)
+{
+Log::warn("Exception: " + exc.message());
+}
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/Util.hpp b/loolwsd/Util.hpp
index b6f6f08..4a72945 100644
--- a/loolwsd/Util.hpp
+++ b/loolwsd/Util.hpp
@@ -17,6 +17,7 @@
#include
#include
+#include
#include
#include
@@ -119,6 +120,8 @@ namespace Util
int getChildStatus(const int nCode);
int getSignalStatus(const int nCode);
+
+void requestTermination(const Poco::Process::PID& aPID);
};
//TODO: Move to own file.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp loolwsd/LOOLWSD.cpp
loolwsd/LOOLBroker.cpp |4 ++--
loolwsd/LOOLWSD.cpp|2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9b4099c41cd11d8cd05e90e4aa8c45c37a83207f
Author: Henry Castro
Date: Tue Feb 16 17:11:33 2016 -0400
loolwsd: check if the named pipes exists
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 0b41fee..b29b4a9 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -491,7 +491,7 @@ static int createLibreOfficeKit(const bool sharePages,
const Path pipePath = Path::forDirectory(childRoot + Path::separator() +
FIFO_PATH);
const std::string pipeKit = Path(pipePath, BROKER_PREFIX +
std::to_string(childCounter++) + BROKER_SUFIX).toString();
-if (mkfifo(pipeKit.c_str(), 0666) < 0)
+if (mkfifo(pipeKit.c_str(), 0666) < 0 && errno != EEXIST)
{
Log::error("Error: Failed to create pipe FIFO [" + pipeKit + "].");
return -1;
@@ -750,7 +750,7 @@ int main(int argc, char** argv)
int nFlags = O_RDONLY | O_NONBLOCK;
const std::string pipeBroker = Path(pipePath, FIFO_BROKER).toString();
-if (mkfifo(pipeBroker.c_str(), 0666) == -1)
+if (mkfifo(pipeBroker.c_str(), 0666) < 0 && errno != EEXIST)
{
Log::error("Error: Failed to create pipe FIFO [" + FIFO_BROKER + "].");
exit(Application::EXIT_SOFTWARE);
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ef37ab5..8d4cff1 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -941,7 +941,7 @@ int LOOLWSD::main(const std::vector& /*args*/)
}
const std::string pipeLoolwsd = Path(pipePath, FIFO_LOOLWSD).toString();
-if (mkfifo(pipeLoolwsd.c_str(), 0666) == -1)
+if (mkfifo(pipeLoolwsd.c_str(), 0666) < 0 && errno != EEXIST)
{
Log::error("Error: Failed to create pipe FIFO [" + pipeLoolwsd + "].");
return Application::EXIT_SOFTWARE;
___
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.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ad641c7bd9a05cbb08b35cb3656adf59cd8b8b6
Author: Henry Castro
Date: Tue Feb 16 17:04:21 2016 -0400
loolwsd: check if the pipe path exists
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1f1480e..ef37ab5 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -934,7 +934,7 @@ int LOOLWSD::main(const std::vector& /*args*/)
}
const Path pipePath = Path::forDirectory(ChildRoot + Path::separator() +
FIFO_PATH);
-if (!File(pipePath).createDirectory())
+if (!File(pipePath).exists() && !File(pipePath).createDirectory())
{
Log::error("Error: Failed to create pipe directory [" +
pipePath.toString() + "].");
return Application::EXIT_SOFTWARE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/tango
icon-themes/tango/cmd/lc_numberformatpercent.png |binary icon-themes/tango/cmd/lc_resetattributes.png |binary icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 |binary icon-themes/tango/cmd/lc_togglesheetgrid.png |binary 4 files changed New commits: commit df8b1dca993d1c0d2b6d5fbfaf4741ffc4cb263b Author: Yousuf Philips Date: Tue Feb 16 22:00:32 2016 +0400 Tango: Add clear formatting icon and update 2 calc icons Change-Id: I9d7ead5acec45fe8cfad75d66d4ffa44f54c1e9f Reviewed-on: https://gerrit.libreoffice.org/22401 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/icon-themes/tango/cmd/lc_numberformatpercent.png b/icon-themes/tango/cmd/lc_numberformatpercent.png index fc96863..910a779 100644 Binary files a/icon-themes/tango/cmd/lc_numberformatpercent.png and b/icon-themes/tango/cmd/lc_numberformatpercent.png differ diff --git a/icon-themes/tango/cmd/lc_resetattributes.png b/icon-themes/tango/cmd/lc_resetattributes.png new file mode 100644 index 000..d1234bc Binary files /dev/null and b/icon-themes/tango/cmd/lc_resetattributes.png differ diff --git a/icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 b/icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 new file mode 100644 index 000..4a160d3 Binary files /dev/null and b/icon-themes/tango/cmd/lc_resetattributes.xcf.bz2 differ diff --git a/icon-themes/tango/cmd/lc_togglesheetgrid.png b/icon-themes/tango/cmd/lc_togglesheetgrid.png index 908c0fc..ffc57a4 100644 Binary files a/icon-themes/tango/cmd/lc_togglesheetgrid.png and b/icon-themes/tango/cmd/lc_togglesheetgrid.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problem Building Libreoffice on Linux
On 16.02.2016 18:05, Pranav Ganorkar wrote: > Hi, I am trying to build Libreoffice on linux but it fails at this point: > /bin/sh: line 1: 23247 Segmentation fault (core dumped) well clearly it crashed, only question is why... > Error: a unit test failed, please do one of: > make CppunitTest_svgio CPPUNITTRACE="gdb --args" > # for interactive debugging on Linux try that and when it crashes type "bt" and post the backtrace. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem Building Libreoffice on Linux
Hi Pranav, you write: > No core file identified in directory > /mnt/D-Drive/LibreOffice/libreoffice/workdir/CppunitTest/svgio.test.core > To show backtraces for crashes during test execution, > enable core files with: > >ulimit -c unlimited > > [CUT] vcl_timer > > Error: a unit test failed, please do one of: > make CppunitTest_svgio CPPUNITTRACE="gdb --args" > # for interactive debugging on Linux > make CppunitTest_svgio VALGRIND=memcheck > # for memory checking > make CppunitTest_svgio DEBUGCPPUNIT=TRUE > # for exception catching > Did you try one of the above suggestions? There are usually three reasons a unit test would fail: * something is truly broken on master (compare with red tinderboxes on http://tinderbox.libreoffice.org/MASTER/status.html) * you have a buggy setup (noticing D-Drive in your path above, building on a vfat partition from linux is generally not working) * you are building on a system, or a particular configure switch combination, that is not yet supported & will need manual fixing Your question does not provide enough context to guess which of the cases you're hitting. HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unit test failure on building LibreOffice on Windows
Michael, et al, thank you for the suggestion of --disable-atl. Using it let the compile go through. Also for the good news, to root cause the ATL issue I reinstalled VS2013 community alongside VS2015 community and with that the compilation went through just fine. So no action on your side necessary and apologies for the spam. Regards Paul On Fri, Feb 12, 2016 at 3:20 PM, Paul Blinzer wrote: > Michael, > > thanks for the pointer, I have the "community edition" installed and I > have not used that option... The build install on that machine is pretty > much by the book (or better, the web page). > I'll gather up the files and send it to you via PM (unless I can glimpse > what's going on myself in which case, I'll send the solution :-)) > > Thanks > Paul > > On Fri, Feb 12, 2016 at 3:32 AM, Michael Stahl wrote: > >> On 12.02.2016 06:43, Paul Blinzer wrote: >> > Compilation went well until reaching unit test for the xmltesttools (see >> > below for output). >> >> > [build CUT] sc_condformats >> > >> C:/sources/libo-core/test/source/xmltesttools.cxx:70:SdExportTest::testBnc822341 >> > equality assertion failed >> > - Expected: 1 >> > - Actual : 0 >> > - In , XPath >> > >> '/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.wordprocessingml.document']' >> > number of nodes is incorrect >> >> oh that's my test... the only idea i have how that could happen is if >> you used --disable-atl, which is only recommended if you have Visual >> Studio Express - the "Community" one has the ATL stuff. >> >> if you aren't using --disable-atl then please mail me the file that it >> complains about, you might need to disable the >> "pTempFile->EnableKillingFile();" from sdmodeltestbase.hxx:203 to >> prevent it from getting deleted. >> >> > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Problem Building Libreoffice on Linux
Hi, I am trying to build Libreoffice on linux but it fails at this point:
**
[CUT] vcl_fontmetric
[CUT] vcl_complextext
[CUT] vcl_filters_test
/bin/sh: line 1: 23247 Segmentation fault (core dumped)
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program":$W/UnpackedTarball/cppunit/src/cppunit/.libs
MALLOC_CHECK_=2 MALLOC_PERTURB_=153 $W/LinkTarget/Executable/cppunittester
$W/LinkTarget/CppunitTest/libtest_svgio.so --headless
"-env:BRAND_BASE_DIR=file://$S/instdir" "-env:BRAND_SHARE_SUBDIR=share"
"-env:UserInstallation=file://$W/CppunitTest/svgio.test.user"
"-env:CONFIGURATION_LAYERS=xcsxcu:file://$I/share/registry
xcsxcu:file://$W/unittest/registry"
"-env:UNO_TYPES=file://$I/program/types/offapi.rdb
file://$I/program/types.rdb"
"-env:UNO_SERVICES=file://$W/ComponentTarget/CppunitTest/svgio/svgio.component
file://$W/Rdb/ure/services.rdb
file://$W/ComponentTarget/configmgr/source/configmgr.component
file://$W/ComponentTarget/dtrans/util/mcnttype.component
file://$W/ComponentTarget/framework/util/fwk.component
file://$W/ComponentTarget/i18npool/util/i18npool.component
file://$W/ComponentTarget/package/source/xstor/xstor.component
file://$W/ComponentTarget/package/util/package2.component
file://$W/ComponentTarget/toolkit/util/tk.component
file://$W/ComponentTarget/sfx2/util/sfx.component
file://$W/ComponentTarget/ucb/source/core/ucb1.component
file://$W/ComponentTarget/ucb/source/ucp/file/ucpfile1.component
file://$W/ComponentTarget/unotools/util/utl.component
file://$W/ComponentTarget/sax/source/expatwrap/expwrap.component"
-env:URE_INTERNAL_LIB_DIR=file://$I/program
-env:LO_LIB_DIR=file://$I/program
-env:LO_JAVA_DIR=file://$I/program/classes --protector
$W/LinkTarget/Library/unoexceptionprotector.so unoexceptionprotector
--protector $W/LinkTarget/Library/unobootstrapprotector.so
unobootstrapprotector --protector
$W/LinkTarget/Library/libvclbootstrapprotector.so vclbootstrapprotector
"-env:CPPUNITTESTTARGET=$W/CppunitTest/svgio.test" >
$W/CppunitTest/svgio.test.log 2>&1
[CUT] vcl_mapmode
[CUT] vcl_outdev
[CUT] vcl_wmf_test
No core file identified in directory
/mnt/D-Drive/LibreOffice/libreoffice/workdir/CppunitTest/svgio.test.core
To show backtraces for crashes during test execution,
enable core files with:
ulimit -c unlimited
[CUT] vcl_timer
Error: a unit test failed, please do one of:
make CppunitTest_svgio CPPUNITTRACE="gdb --args"
# for interactive debugging on Linux
make CppunitTest_svgio VALGRIND=memcheck
# for memory checking
make CppunitTest_svgio DEBUGCPPUNIT=TRUE
# for exception catching
/mnt/D-Drive/LibreOffice/libreoffice/solenv/gbuild/CppunitTest.mk:90:
recipe for target
'/mnt/D-Drive/LibreOffice/libreoffice/workdir/CppunitTest/svgio.test' failed
make[1]: ***
[/mnt/D-Drive/LibreOffice/libreoffice/workdir/CppunitTest/svgio.test] Error
1
make[1]: *** Waiting for unfinished jobs
Makefile:246: recipe for target 'build' failed
make: *** [build] Error 2
***
How to rectify it so that it builds properly
Regards,
Pranav
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/gstreamer/gstplayer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 580055d838650ac6d604ee8c7b6f348100eb291c
Author: Stephan Bergmann
Date: Tue Feb 16 18:00:34 2016 +0100
loplugin:cstylecast
Change-Id: I17025698070d3140eb2d09b705020ee4e0ee97c1
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index ea2c15a..8881b7d 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -916,7 +916,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL
Player::createPlayerWindow( co
{
mbUseGtkSink = true;
g_object_get(pVideosink, "widget", &mpGtkWidget, nullptr);
-GtkWidget *pParent = (GtkWidget*)(pEnvData->pWidget);
+GtkWidget *pParent =
static_cast(pEnvData->pWidget);
gtk_container_add (GTK_CONTAINER(pParent), mpGtkWidget);
g_object_set( G_OBJECT( mpPlaybin ), "video-sink",
pVideosink, 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' - include/vcl unusedcode.easy vcl/osx vcl/unx vcl/win
include/vcl/svapp.hxx |7 ---
unusedcode.easy |1 -
vcl/osx/salinst.cxx | 10 --
vcl/unx/generic/gdi/x11windowprovider.cxx | 16
vcl/win/source/app/saldata.cxx|9 -
5 files changed, 43 deletions(-)
New commits:
commit 32c6389cceda63391ff372987834fb7b0a25339a
Author: Juergen Funk
Date: Sat Dec 5 01:37:13 2015 +0100
unused vcl::IsWindowSystemAvailable
Change-Id: Ie903a6fe3237319661662c0533c23528766ffd08
Reviewed-on: https://gerrit.libreoffice.org/20404
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
(cherry picked from commit 6ded842ac4a0e06efcfcc312775d25063201eb68)
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index a8b813b..c5b52ca 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1649,13 +1649,6 @@ inline void Application::EndYield()
PostUserEvent( Link() );
}
-namespace vcl
-{
-
-VCL_DLLPUBLIC bool IsWindowSystemAvailable();
-
-}
-
#endif // _APP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index bce941f..89f4028 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -93,7 +93,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree, std::_Select1st >, std::less,
std::allocator > >::_M_move_data(std::_Rb_tree,
std::_Select1st >, std::less,
std::allocator > >&, std::integral_constant)
std::__cxx1998::vector, std::allocator > >::reserve(unsigned long)
-vcl::IsWindowSystemAvailable()
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
vcl::Region::IsInside(Rectangle const&) const
vcl::RenderSettings::PushAndApply(OutputDevice&)
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b7467be..4bfe5bc 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -1097,15 +1097,5 @@ NSImage* CreateNSImage( const Image& rImage )
return pImage;
}
-namespace vcl
-{
-
-bool IsWindowSystemAvailable()
-{
-// Yes I know the parens are not needed. I like them in cases like this.
So sue me.
-return ([NSScreen screens] != nil && [[NSScreen screens] count] > 0);
-}
-
-} // namespace vcl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/x11windowprovider.cxx
b/vcl/unx/generic/gdi/x11windowprovider.cxx
index 4f507c3..5f7d289 100644
--- a/vcl/unx/generic/gdi/x11windowprovider.cxx
+++ b/vcl/unx/generic/gdi/x11windowprovider.cxx
@@ -68,21 +68,5 @@ Display *OpenX11Display(OString& rDisplay)
return pDisp;
}
-namespace vcl
-{
-
-bool IsWindowSystemAvailable()
-{
-Display *pDisp;
-OString aDisplay;
-
-pDisp = OpenX11Display(aDisplay);
-if (pDisp)
-XCloseDisplay(pDisp);
-
-return (pDisp != nullptr);
-}
-
-} // namespace vcl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 18256ee..2a04b33 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -74,15 +74,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char*
pStr2 )
return nRet;
}
-namespace vcl
-{
-
-bool IsWindowSystemAvailable()
-{
-return true; // FIXME: we want this to return false if logged in
- // to some Cygwin ssh session for instance
-}
-} // namespace vcl
/* 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] online.git: loleaflet/src
loleaflet/src/map/handler/Map.Scroll.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9856a78067eb7a4fb522c82c64007948fd7a875
Author: Andras Timar
Date: Tue Feb 16 17:31:17 2016 +0100
loleaflet: enable scrollHandler
diff --git a/loleaflet/src/map/handler/Map.Scroll.js
b/loleaflet/src/map/handler/Map.Scroll.js
index fac8cbf..b07dec8 100644
--- a/loleaflet/src/map/handler/Map.Scroll.js
+++ b/loleaflet/src/map/handler/Map.Scroll.js
@@ -3,7 +3,7 @@
*/
L.Map.mergeOptions({
- scroll: true,
+ scrollHandler: true,
wheelDebounceTime: 40
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/Library_avmediagst.mk avmedia/source include/vcl vcl/unx
avmedia/Library_avmediagst.mk | 16 +++
avmedia/source/gstreamer/gstplayer.cxx | 154 +
avmedia/source/gstreamer/gstplayer.hxx |8 +
include/vcl/sysdata.hxx|2
vcl/unx/gtk/gtkobject.cxx |1
vcl/unx/gtk/gtksalframe.cxx|1
vcl/unx/gtk3/gtk3gtkframe.cxx |1
vcl/unx/gtk3/gtk3gtkobject.cxx |7 -
8 files changed, 129 insertions(+), 61 deletions(-)
New commits:
commit 8543fbc72fafc0d71a8760752ca2ef5b7119cb5c
Author: Caolán McNamara
Date: Tue Feb 16 16:01:02 2016 +
gtk3+wayland: play video via gtksink gstreamer element
Change-Id: Ib371fa06eda73962cbe94739e69a68b46c26e4bf
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index a20a32b..35a56ac 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -16,7 +16,21 @@ $(eval $(call gb_Library_set_include,avmediagst,\
-I$(SRCDIR)/avmedia/source/inc \
$(GSTREAMER_1_0_CFLAGS) \
))
-$(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_1_0_LIBS)))
+
+$(eval $(call gb_Library_add_libs,avmediagst,\
+$(GSTREAMER_1_0_LIBS) \
+))
+
+ifneq ($(ENABLE_GTK3),)
+$(eval $(call gb_Library_add_cxxflags,avmediagst,\
+$$(GTK3_CFLAGS) \
+-DENABLE_GTKSINK \
+))
+
+$(eval $(call gb_Library_add_libs,avmediagst,\
+$(GTK3_LIBS) \
+))
+endif
$(eval $(call gb_Library_use_external,avmediagst,boost_headers))
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index d77944e..ea2c15a 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -288,6 +288,10 @@ void MissingPluginInstallerThread::execute() {
Player::Player() :
GstPlayer_BASE( m_aMutex ),
mpPlaybin( nullptr ),
+#if defined(ENABLE_GTKSINK)
+mpGtkWidget( nullptr ),
+#endif
+mbUseGtkSink( false ),
mbFakeVideo (false ),
mnUnmutedVolume( 0 ),
mbPlayPending ( false ),
@@ -343,6 +347,14 @@ void SAL_CALL Player::disposing()
// Release the elements and pipeline
if( mbInitialized )
{
+#if defined(ENABLE_GTKSINK)
+if (mpGtkWidget)
+{
+gtk_widget_destroy(mpGtkWidget);
+mpGtkWidget = nullptr;
+}
+#endif
+
if( mpPlaybin )
{
gst_element_set_state( mpPlaybin, GST_STATE_NULL );
@@ -393,18 +405,20 @@ void Player::processMessage( GstMessage *message )
start();
break;
case GST_MESSAGE_STATE_CHANGED:
-if( message->src == GST_OBJECT( mpPlaybin ) ) {
+if (message->src == GST_OBJECT(mpPlaybin))
+{
GstState newstate, pendingstate;
gst_message_parse_state_changed (message, nullptr, &newstate,
&pendingstate);
-if( newstate == GST_STATE_PAUSED &&
-pendingstate == GST_STATE_VOID_PENDING &&
-mpXOverlay )
-gst_video_overlay_expose( mpXOverlay );
+if (!mbUseGtkSink && newstate == GST_STATE_PAUSED &&
+pendingstate == GST_STATE_VOID_PENDING && mpXOverlay)
+{
+gst_video_overlay_expose(mpXOverlay);
+}
-if (mbPlayPending)
-mbPlayPending = ((newstate == GST_STATE_READY) || (newstate ==
GST_STATE_PAUSED));
+if (mbPlayPending)
+mbPlayPending = ((newstate == GST_STATE_READY) || (newstate ==
GST_STATE_PAUSED));
}
default:
break;
@@ -450,23 +464,26 @@ GstBusSyncReply Player::processSyncMessage( GstMessage
*message )
}
#endif
+if (!mbUseGtkSink)
+{
#ifdef AVMEDIA_GST_0_10
-if (message->structure &&
-!strcmp( gst_structure_get_name( message->structure ),
"prepare-xwindow-id" ) )
+if (message->structure &&
+!strcmp( gst_structure_get_name( message->structure ),
"prepare-xwindow-id" ) )
#else
-if (gst_is_video_overlay_prepare_window_handle_message (message) )
+if (gst_is_video_overlay_prepare_window_handle_message (message) )
#endif
-{
-SAL_INFO( "avmedia.gstreamer", AVVERSION << this << "
processSyncMessage prepare window id: " <<
- GST_MESSAGE_TYPE_NAME( message ) << " " << (int)mnWindowID );
-if( mpXOverlay )
-g_object_unref( G_OBJECT ( mpXOverlay ) );
-g_object_set( GST_MESSAGE_SRC( message ), "force-aspect-ratio", FALSE,
nullptr );
-mpXOverlay = GST_VIDEO_OVERLAY( GST_MESSAGE_SRC( message ) );
-g_object_ref( G_OBJECT ( mpXOverlay ) );
-if ( mnWindowID != 0 )
-gst_video_overlay_set_window_handle( mpXOverlay, mnWindowID );
-return GST_BUS_DROP;
+{
+SAL_INFO( "avmedia.gstreamer", AVVERSION << this << "
processSyncMessage prepare window id: " <<
+ GST_MESSAGE_TYPE_NAME( message ) << " " <<
(int)mnWindowID );
+if( mpXOverlay )
+
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/bitmap.hxx | 17 ++
include/vcl/bitmapex.hxx |4 -
vcl/inc/impbmp.hxx |5 -
vcl/source/gdi/bitmap.cxx| 120 +--
vcl/source/gdi/bitmap3.cxx | 32 +++
vcl/source/gdi/bmpacc.cxx| 37 ++---
vcl/source/gdi/impbmp.cxx| 10 +--
vcl/source/outdev/bitmap.cxx | 12 ++--
vcl/source/outdev/mask.cxx |8 +-
9 files changed, 90 insertions(+), 155 deletions(-)
New commits:
commit 3cdb86054c09617cea85dfc24ecbaf9cba376d7b
Author: Caolán McNamara
Date: Tue Feb 16 10:39:28 2016 +
use std shared_ptr for sharing ImpBitmaps
Change-Id: I1a0360096964f6402bd3631f2b3f34bf9595ebc6
Reviewed-on: https://gerrit.libreoffice.org/22394
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 58fde12..e45c8f0 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -716,10 +716,9 @@ public:
public:
-SAL_DLLPRIVATE void ImplReleaseRef();
SAL_DLLPRIVATE void ImplMakeUnique();
-ImpBitmap* ImplGetImpBitmap() const { return mpImpBmp;}
-SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp );
+std::shared_ptr ImplGetImpBitmap() const { return mxImpBmp;}
+SAL_DLLPRIVATE void ImplSetImpBitmap( std::shared_ptr
xImpBmp );
SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap );
SAL_DLLPRIVATE void ImplAdaptBitCount(Bitmap& rNew) const;
@@ -787,7 +786,7 @@ public:
private:
-ImpBitmap* mpImpBmp;
+std::shared_ptr mxImpBmp;
MapMode maPrefMapMode;
SizemaPrefSize;
@@ -795,27 +794,27 @@ private:
inline bool Bitmap::operator!() const
{
-return( mpImpBmp == nullptr );
+return( mxImpBmp == nullptr );
}
inline bool Bitmap::operator==( const Bitmap& rBitmap ) const
{
-return( rBitmap.mpImpBmp == mpImpBmp );
+return( rBitmap.mxImpBmp == mxImpBmp );
}
inline bool Bitmap::operator!=( const Bitmap& rBitmap ) const
{
-return( rBitmap.mpImpBmp != mpImpBmp );
+return( rBitmap.mxImpBmp != mxImpBmp );
}
inline bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const
{
-return( rBitmap.mpImpBmp == mpImpBmp );
+return( rBitmap.mxImpBmp == mxImpBmp );
}
inline bool Bitmap::IsEmpty() const
{
-return( mpImpBmp == nullptr );
+return( mxImpBmp == nullptr );
}
inline const MapMode& Bitmap::GetPrefMapMode() const
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 1e8511c..a4dea75 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -445,8 +445,8 @@ public:
const Size &rSize );
public:
-SAL_DLLPRIVATE ImpBitmap* ImplGetBitmapImpBitmap() const { return
aBitmap.ImplGetImpBitmap(); }
-SAL_DLLPRIVATE ImpBitmap* ImplGetMaskImpBitmap() const { return
aMask.ImplGetImpBitmap(); }
+SAL_DLLPRIVATE std::shared_ptr ImplGetBitmapImpBitmap() const
{ return aBitmap.ImplGetImpBitmap(); }
+SAL_DLLPRIVATE std::shared_ptr ImplGetMaskImpBitmap() const {
return aMask.ImplGetImpBitmap(); }
private:
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 5787b3f..4d365a7 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -37,7 +37,6 @@ class Bitmap;
class ImpBitmap
{
private:
-sal_uLong mnRefCount;
SalBitmap* mpSalBitmap;
public:
@@ -63,10 +62,6 @@ public:
BitmapBuffer* ImplAcquireBuffer( BitmapAccessMode nMode );
voidImplReleaseBuffer( BitmapBuffer* pBuffer,
BitmapAccessMode nMode );
-sal_uLong ImplGetRefCount() const { return mnRefCount; }
-voidImplIncRefCount() { mnRefCount++; }
-voidImplDecRefCount() { mnRefCount--; }
-
BitmapChecksum ImplGetChecksum() const;
voidImplInvalidateChecksum();
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index f182eb2..89369ca 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -34,13 +34,11 @@
#include
#include
-Bitmap::Bitmap() :
-mpImpBmp( nullptr )
+Bitmap::Bitmap()
{
}
-Bitmap::Bitmap( const ResId& rResId ) :
-mpImpBmp( nullptr )
+Bitmap::Bitmap( const ResId& rResId )
{
const BitmapEx aBmpEx( rResId );
@@ -48,26 +46,23 @@ Bitmap::Bitmap( const ResId& rResId ) :
*this = aBmpEx.GetBitmap();
}
-Bitmap::Bitmap( const Bitmap& rBitmap ) :
-maPrefMapMode ( rBitmap.maPrefMapMode ),
-maPrefSize ( rBitmap.maPrefSize )
+Bitmap::Bitmap(const Bitmap& rBitmap)
+: mxImpBmp(rBitmap.mxImpBmp)
+, maPrefMapMode(rBitmap.maPrefMapMode)
+, maPrefSize(rBitmap.maPrefSize)
{
-mpImpBmp = rBitmap.mpImpBmp;
-
-if ( mpImpBmp )
-mpImpBmp->ImplIncRefCount();
}
-Bitmap::Bitmap( SalBitmap* pSalBitmap )
+Bitmap::Bitmap(SalBitmap* p
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/documentpropertiesdialog.ui |1 - 1 file changed, 1 deletion(-) New commits: commit ed88e6bf6a492008bd2e03a0e2ccab844fc8511e Author: Samuel Mehrbrodt Date: Tue Feb 16 15:36:40 2016 +0100 Make the document properties dialog resizable This helps reading document metadata with more than a few characters. Change-Id: Ia9f5bc4a05835ef5512bf6f4a4ec2b2e4274c41d Reviewed-on: https://gerrit.libreoffice.org/22398 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui b/sfx2/uiconfig/ui/documentpropertiesdialog.ui index 54890cc..b8155b7 100644 --- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui +++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui @@ -6,7 +6,6 @@ False 6 Properties of %1 -False dialog ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/Ashod/cp-5.0-preinit'
New branch 'private/Ashod/cp-5.0-preinit' available with the following commits: commit 5f1529cc95dcebf7066765f525d1e61776bfecda Author: Michael Meeks Date: Fri Jan 29 15:31:58 2016 +0100 headless: don't let windows become really visible to avoid paints. Paint at the wrong time has a habit of allocating over-large OutputDevice's for the drawing layer; saves 7Mb of heap for a dummy tilebench document. Change-Id: Ie06df705a55faadea2b06fd24b904d95ae64fd83 commit edaccf928c4e4e90a024e766aecd07181e29fd97 Author: Michael Meeks Date: Fri Jan 29 15:11:48 2016 +0100 headless: for now don't allocate big cairo surfaces for invisible frames. This was ~10Mb of RAM for a hello-world.odt under tile-bench. Change-Id: Ie0787676be754ac81eb8ec036c9757a1bb2f2220 commit 26d69c1c0321a657d159b5c850044df1aa317d43 Author: Michael Meeks Date: Fri Jan 29 12:11:50 2016 +0100 Use a custom allocator for strings. Change-Id: I627d56b08a72187b15d7992c42179a05bef71c2b commit 1c565696231ae5296a47bbb9df78d80d2da031f4 Author: Henry Castro Date: Mon Sep 7 17:21:38 2015 -0400 preInitBootstrap call takes context Change-Id: I85b951f7d28d3d8af40b7d5f86b310021a079428 commit ba29b6ddf4c079a93a8484e95aa42daf2b54a54b Author: Henry Castro Date: Sat Sep 12 12:11:43 2015 -0400 vcl: desktop terminate, to dispose objects In the preinit stage, the Desktop terminate() method is never called when lo_startmain thread is disposing objects. This produces debug assertions and osl assertions. It is forced to call terminate() method, when a tiled rendering case is active then it has a clean disposing objects process. However DBGGUI_DEINIT_SOLARMUTEXCHECK() check is moved at the end to prevent debug assertions solar mutex complains. Change-Id: I4a9b6398296d9150ab748a8d48868a08e7232909 commit fca0980ec866279cc40ed1233bbddb2e4abe2fae Author: Henry Castro Date: Mon Sep 7 17:43:04 2015 -0400 vcl: assign NULL after deleting In the preinit stage, the VCL initialization is done by the parent process and when the lo_startmain thread de-initialize the VCL, some services are disposed early, and it causes segmentation violation. So it is ensured that pointers to service objetcs is set NULL after the delete. Change-Id: I65ecfc2d2694a981ec2986988efabdfd28d0cce4 commit f0f7eb475ba402ceafa1d6f1956e7dfe7779615d Author: Henry Castro Date: Mon Sep 7 17:33:09 2015 -0400 vcl: add isInitVCL, to not initialize twice In the preinit stage, the VCL is initialized in the parent process and when the lo_startmain thread is started, the thread initialize VCL again. It is not necessary to initialize twice. Change-Id: I819cf0125afe7760c3f4d91c420d36a3a383902c commit 78df8373b6442ee3d3b09101988817cf621c189b Author: Henry Castro Date: Mon Sep 7 17:17:22 2015 -0400 cppuhelper: add preInitBootstrap symbol In the preinit stage, the preInitBootstrap is called to load implementations for each service registered by the service manager. All service requests are: initial Component Context and the process service factory is set. However, some services require that VCL is properly initialized. Change-Id: Ib116e3da172b860f2df4d672f6181b5de0b7e6b2 commit 0e008a27e7f4e9b08a7b2bbd33702df336f1bca4 Author: Henry Castro Date: Mon Sep 7 17:11:45 2015 -0400 cppuhelper: method 1, load implementations to invoke component factory In the preinit stage, for each library that is registered by the service manager, is loaded with the flag SAL_LOADMODULE_NOW and the component factory is invoked to initialize its data. Change-Id: Ie6f6d769b611c8440ddab802545e6bdc482d1476 commit 62a2d525a7db09c7223a21907e1a0f4989398c15 Author: Ashod Nakashian Date: Thu Jan 28 18:31:03 2016 -0500 Restoring preinit Change-Id: I65341c57d00308d246ec90deab8050b2c4bb3e61 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: libmspub.pc.in
libmspub.pc.in |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6d04330d0651829d6d926871e5bf8309d392a9da
Author: David Tardon
Date: Tue Feb 16 14:47:43 2016 +0100
librevenge-stream is not really needed
Change-Id: I4652481a10da8bd28258a67f540d8c524678392d
diff --git a/libmspub.pc.in b/libmspub.pc.in
index 9171530..f4cd33d 100644
--- a/libmspub.pc.in
+++ b/libmspub.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
Description: Library for parsing the Microsoft Publisher file format structure
Version: @VERSION@
-Requires: librevenge-0.0 librevenge-stream-0.0
+Requires: librevenge-0.0
Libs: -L${libdir} -lmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
Cflags: -I${includedir}/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/qa
sd/qa/unit/tiledrendering/tiledrendering.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 2368192433ac3a936fea765eaae5dfd4b46b4daa
Author: Stephan Bergmann
Date: Tue Feb 16 14:41:39 2016 +0100
loplugin:stringconstant
Change-Id: Id23a8ff3afa6e96e802d77b02f89ad2289c47460
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 1c99479..3fbe6c0 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -527,7 +527,7 @@ void SdTiledRenderingTest::testInsertPage()
uno::Reference xComponent;
xComponent = xLoader->loadComponentFromURL(
-getURLFromSrc(DATA_DIRECTORY) + OUString("insert-delete.odp"),
+getURLFromSrc(DATA_DIRECTORY) + "insert-delete.odp",
"_blank",
0,
aFilterOptions);
commit 7882a89147e8e33d8f7980756aa2f3d468cbd5b4
Author: Stephan Bergmann
Date: Tue Feb 16 14:41:22 2016 +0100
loplugin:loopvartoosmall
Change-Id: Ib5e7b7ffcd1e6421eb08f7b7d4cf16d0353ad6fa
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 770f03bd7..1c99479 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -572,9 +572,9 @@ void SdTiledRenderingTest::testInsertPage()
comphelper::dispatchCommand(".uno:InsertPage", aArgs);
// Verify inserted slides
-for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+for(auto i: m_aPageList)
{
-SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage);
}
@@ -585,9 +585,9 @@ void SdTiledRenderingTest::testInsertPage()
comphelper::dispatchCommand(".uno:DeletePage", aArgs);
// Verify deleted slides
-for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+for(auto i: m_aPageList)
{
-SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage == nullptr);
}
@@ -598,9 +598,9 @@ void SdTiledRenderingTest::testInsertPage()
comphelper::dispatchCommand(".uno:Undo", aArgs);
// Verify inserted slides
-for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+for(auto i: m_aPageList)
{
-SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage);
}
@@ -611,9 +611,9 @@ void SdTiledRenderingTest::testInsertPage()
comphelper::dispatchCommand(".uno:Redo", aArgs);
// Verify deleted slides
-for(unsigned nIterator=0; nIterator < m_aPageList.size(); nIterator++)
+for(auto i: m_aPageList)
{
-SdPage* pPage = pDoc->GetSdPage(m_aPageList[nIterator], PK_STANDARD);
+SdPage* pPage = pDoc->GetSdPage(i, PK_STANDARD);
CPPUNIT_ASSERT(pPage == 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' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|2 -
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 35 --
2 files changed, 15 insertions(+), 22 deletions(-)
New commits:
commit e84f75d538772ecb297fe07d241d78894a98bd49
Author: Caolán McNamara
Date: Tue Feb 16 12:27:29 2016 +
Related: tdf#97739 fix gtk3 spinbuttons for recent control region changes
Change-Id: Ia745cbe808395c4c9ec6a3c72612814a4834bbcb
(cherry picked from commit e6d255420a7fb00ed1050e0e96768eea57a92bc4)
Reviewed-on: https://gerrit.libreoffice.org/22395
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 2bb6029..d4ae5f0 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -163,7 +163,7 @@ private:
ControlPart nPart,
Rectangle aAreaRect,
ControlState nState );
- Rectangle PaintSpinButton(GtkStyleContext *context,
+ void PaintSpinButton(GtkStyleContext *context,
cairo_t *cr,
const Rectangle& rControlRectangle,
ControlType nType,
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 5205d13..20efd8a 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -610,14 +610,13 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext
*context,
gtk_icon_info_free(info);
}
-Rectangle GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
+void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
cairo_t *cr,
const Rectangle& rControlRectangle,
ControlType nType,
- ControlPart /*nPart*/,
+ ControlPart nPart,
const ImplControlValue& rValue )
{
-RectangleareaRect;
const SpinbuttonValue *pSpinVal = (rValue.getType() == CTRL_SPINBUTTONS) ?
static_cast(&rValue) : nullptr;
ControlPart upBtnPart = PART_BUTTON_UP;
ControlState upBtnState = ControlState::NONE;
@@ -633,26 +632,20 @@ Rectangle GtkSalGraphics::PaintSpinButton(GtkStyleContext
*context,
downBtnState = pSpinVal->mnLowerState;
}
-areaRect = rControlRectangle;
-
-gtk_render_background(context, cr,
- 0, 0,
- areaRect.GetWidth(), areaRect.GetHeight() );
-gtk_render_frame(context, cr,
- 0, 0,
- areaRect.GetWidth(), areaRect.GetHeight() );
-
-// CTRL_SPINBUTTONS pass their area in pSpinVal, not in rControlRectangle
-if (pSpinVal)
+if (nPart == PART_ENTIRE_CONTROL)
{
-areaRect = pSpinVal->maUpperRect;
-areaRect.Union( pSpinVal->maLowerRect );
+gtk_render_background(context, cr,
+ 0, 0,
+ rControlRectangle.GetWidth(),
rControlRectangle.GetHeight() );
+gtk_render_frame(context, cr,
+ 0, 0,
+ rControlRectangle.GetWidth(),
rControlRectangle.GetHeight() );
}
-PaintOneSpinButton(mpSpinUpStyle, cr, nType, upBtnPart, areaRect,
upBtnState );
-PaintOneSpinButton(mpSpinDownStyle, cr, nType, downBtnPart, areaRect,
downBtnState );
-
-return areaRect;
+cairo_translate(cr, -rControlRectangle.Left(), -rControlRectangle.Top());
+PaintOneSpinButton(mpSpinUpStyle, cr, nType, upBtnPart, rControlRectangle,
upBtnState );
+PaintOneSpinButton(mpSpinDownStyle, cr, nType, downBtnPart,
rControlRectangle, downBtnState );
+cairo_translate(cr, rControlRectangle.Left(), rControlRectangle.Top());
}
#define ARROW_SIZE 11 * 0.85
@@ -1481,7 +1474,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
PaintScrollbar(context, cr, rControlRegion, nType, nPart, rValue);
break;
case RENDER_SPINBUTTON:
-aDamageRect.Union(PaintSpinButton(context, cr, rControlRegion, nType,
nPart, rValue));
+PaintSpinButton(context, cr, rControlRegion, nType, nPart, rValue);
break;
case RENDER_COMBOBOX:
PaintCombobox(flags, cr, rControlRegion, nType, nPart, rValue);
___
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' - sc/source
sc/source/ui/view/gridwin.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 2cee81ff8d5e16bd912ba25abfd785d7f3745f38
Author: Pranav Kant
Date: Tue Feb 16 11:40:23 2016 +0530
sc lok: Notify LibreOfficeKit of empty selection
Change-Id: Ib77f2e008473a18460e7783b20ef3237ff885d57
Reviewed-on: https://gerrit.libreoffice.org/22387
Tested-by: Jenkins
Reviewed-by: David Tardon
(cherry picked from commit fe90ba29ad7345037e3707916b2696010213bda6)
Reviewed-on: https://gerrit.libreoffice.org/22397
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 55cd7e7..1829226 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6248,6 +6248,11 @@ void ScGridWindow::UpdateSelectionOverlay()
updateLibreOfficeKitSelection(pViewData, pDoc->GetDrawLayer(),
aPixelRects);
}
}
+else
+{
+ScDocument* pDoc = pViewData->GetDocument();
+
pDoc->GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION,
"EMPTY");
+}
if ( aOldMode != aDrawMode )
SetMapMode( aOldMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AutoInstall.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c998206afaace817b8c6a5ea4a661af68fa5fdcc Author: Michael Stahl Date: Tue Feb 16 13:57:32 2016 +0100 gbuild: add missing commas to fix build with make < 4.0 (regression from c33fb4828e2fda2648f11614a20ce0172d4af3db) Change-Id: I8d20343401cab13a3b6721d0d3016edaeb7dd898 diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index ebf3e30a..1d999d6 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -15,7 +15,7 @@ endef define gb_AutoInstall__make_define echo "#define auto_$*_ALL \ " >> $@ -$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "$(call gb_AutoInstall__escape$(binary)), \ " >> $@;) +$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "$(call gb_AutoInstall__escape,$(binary)), \ " >> $@;) echo "$(call gb_AutoInstall__escape,$(lastword $(1)))" >> $@; echo "" >> $@ endef @@ -50,7 +50,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \ $(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg))) $(foreach lib,$(gb_Library_MODULE_$*),\ - echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(call gb_AutoInstall__escape$(lib)),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) + echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(call gb_AutoInstall__escape,$(lib)),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) else $(file >$@,/* autogenerated installs for group $* */) $(call gb_AutoInstall__gen_define,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/table/ScenarioSelector.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 63579501ae4b92db1564dc051706feb34d101eba
Author: Stephan Bergmann
Date: Tue Feb 16 13:55:59 2016 +0100
Missing parenthesis
Change-Id: I27aef5d1a0920bb6b9fa9c2204a422b7372fd0cb
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 61b4b74..7f88829 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -235,7 +235,7 @@ public class ScenarioSelector extends FieldSelection
implements XItemListener, X
{
FieldDescription curfielddescription =
CurTableWizardUnoDialog.fielditems.get(fieldnames[i]);
PropertyValue[] aProperties =
curfielddescription.getPropertyValues();
-if (aProperties != null {
+if (aProperties != null) {
this.curtabledescriptor.addColumn(aProperties);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39440] cppcheck cleanliness
https://bugs.documentfoundation.org/show_bug.cgi?id=39440 --- Comment #72 from Commit Notification --- Arnold Dumas committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=fd3cb8d8222113cbc7bf472060ac77233706ea1f tdf#39440: reduce scope of local variables It will be available in 5.2.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 39440] cppcheck cleanliness
https://bugs.documentfoundation.org/show_bug.cgi?id=39440 Commit Notification changed: What|Removed |Added Whiteboard|ToBeReviewed|ToBeReviewed target:5.2.0 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/externalrefmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0e8ec9d6415a3381583c87c99f89b509594b68e1
Author: Stephan Bergmann
Date: Tue Feb 16 13:47:47 2016 +0100
loplugin:implicitboolconversion
Change-Id: Ib21fe1f18a48246fc38c8c26454c28de2efc699f
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 7bbf7b7..ee5efcc 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -797,7 +797,7 @@ void ScExternalRefCache::setCellRangeData(sal_uInt16
nFileId, const ScRange& rRa
};
ScFullMatrix::BoolOpFunction aBoolFunc = [=](size_t row, size_t col,
bool val) -> void
{
-pTabData->setCell(col + nCol1, row + nRow1, new
formula::FormulaDoubleToken(val), 0, false);
+pTabData->setCell(col + nCol1, row + nRow1, new
formula::FormulaDoubleToken(val ? 1.0 : 0.0), 0, false);
};
ScFullMatrix::StringOpFunction aStringFunc = [=](size_t row, size_t
col, svl::SharedString val) -> void
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source filter/source framework/source
basic/source/sbx/sbxdec.cxx |5 +
filter/source/msfilter/escherex.cxx |3 +--
framework/source/layoutmanager/layoutmanager.cxx |4 ++--
3 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit fd3cb8d8222113cbc7bf472060ac77233706ea1f
Author: Arnold Dumas
Date: Mon Feb 15 22:32:15 2016 +0100
tdf#39440: reduce scope of local variables
Change-Id: I6ba411d2e07240821518281996d543f71acf3259
Reviewed-on: https://gerrit.libreoffice.org/22378
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 1616771..b073ea1 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -354,15 +354,12 @@ void SbxDecimal::getString( OUString& rString )
#ifdef _WIN32
static LCID nLANGID = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US );
-bool bRet = false;
-
OLECHAR sz[100];
BSTR aBStr = SysAllocString( sz );
if( aBStr != NULL )
{
HRESULT hResult = VarBstrFromDec( &maDec, nLANGID, 0, &aBStr );
-bRet = ( hResult == S_OK );
-if( bRet )
+if( hResult == S_OK )
{
// Convert delimiter
sal_Unicode cDecimalSep;
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 1ee99db..79108f71b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1347,7 +1347,6 @@ bool EscherPropertyContainer::ImplCreateEmbeddedBmp(
const OString& rUniqueId )
void EscherPropertyContainer::CreateEmbeddedBitmapProperties(
const OUString& rBitmapUrl, css::drawing::BitmapMode eBitmapMode )
{
-bool bRetValue = false;
OUString aVndUrl( "vnd.sun.star.GraphicObject:" );
OUString aBmpUrl( rBitmapUrl );
sal_Int32 nIndex = aBmpUrl.indexOf( aVndUrl );
@@ -1357,7 +1356,7 @@ void
EscherPropertyContainer::CreateEmbeddedBitmapProperties(
if( aBmpUrl.getLength() > nIndex )
{
OString aUniqueId(OUStringToOString(aBmpUrl.copy(nIndex,
aBmpUrl.getLength() - nIndex), RTL_TEXTENCODING_UTF8));
-bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
+bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
if( bRetValue )
{
// bitmap mode property
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 163bbbf..c89a577 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -485,14 +485,14 @@ bool LayoutManager::readWindowStateData( const OUString&
aName, UIElement& rElem
GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings,
const Reference< XComponentContext > &rComponentContext )
{
-bool bGetSettingsState( false );
-
SolarMutexResettableGuard aWriteLock;
Reference< XNameAccess > xPersistentWindowState( rPersistentWindowState );
aWriteLock.clear();
if ( xPersistentWindowState.is() )
{
+bool bGetSettingsState( false );
+
aWriteLock.reset();
bool bGlobalSettings( bInGlobalSettings );
GlobalSettings* pGlobalSettings( nullptr );
___
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' - sc/source
sc/source/ui/view/gridwin.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit e4692801bf87984ddc4da42fa4061e36fc007428
Author: Pranav Kant
Date: Tue Feb 16 16:12:57 2016 +0530
sc lok: Handle left mouse button up events for tiled rendering
This solves two common problems: 1) Allow selections via mouse drag
2) Deselect when clicked inside already selected block of cells
Change-Id: I9c1b5f90b6c4dc6155b14c68852d6cad81e2290a
Reviewed-on: https://gerrit.libreoffice.org/22391
Tested-by: Jenkins
Reviewed-by: Andras Timar
(cherry picked from commit ab199e4748b45384602479c735dbac538e714d34)
Reviewed-on: https://gerrit.libreoffice.org/22396
Tested-by: Andras Timar
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d884af8..55cd7e7 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2438,6 +2438,14 @@ void ScGridWindow::MouseButtonUp( const MouseEvent&
rMEvt )
pEditView->MouseButtonUp( aEditEvt );
}
}
+
+if (bIsTiledRendering)
+{
+ScTabView* pTabView = pViewData->GetView();
+if (rMEvt.IsLeft() && pTabView->GetSelEngine()->SelMouseButtonUp(
rMEvt ))
+pTabView->SelectionChanged();
+}
+
return;
}
___
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/view/gridwin.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit ab199e4748b45384602479c735dbac538e714d34
Author: Pranav Kant
Date: Tue Feb 16 16:12:57 2016 +0530
sc lok: Handle left mouse button up events for tiled rendering
This solves two common problems: 1) Allow selections via mouse drag
2) Deselect when clicked inside already selected block of cells
Change-Id: I9c1b5f90b6c4dc6155b14c68852d6cad81e2290a
Reviewed-on: https://gerrit.libreoffice.org/22391
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 14f46e7..3033915 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2427,6 +2427,14 @@ void ScGridWindow::MouseButtonUp( const MouseEvent&
rMEvt )
pEditView->MouseButtonUp( aEditEvt );
}
}
+
+if (bIsTiledRendering)
+{
+ScTabView* pTabView = pViewData->GetView();
+if (rMEvt.IsLeft() && pTabView->GetSelEngine()->SelMouseButtonUp(
rMEvt ))
+pTabView->SelectionChanged();
+}
+
return;
}
___
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/scmatrix.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7fdd2cca692b66d15258402ecf670285a9449928 Author: Stephan Bergmann Date: Tue Feb 16 13:39:47 2016 +0100 -Werror,-Winconsistent-missing-override Change-Id: I93690dcfefbda9f642b8bbe55b9e2f4f348d446d diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index 84eda9e..99d859a 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -606,7 +606,7 @@ public: virtual std::vector Collect(bool bTextAsZero, const std::vector>& aOp) override; virtual void ExecuteOperation(const std::pair& rStartPos, const std::pair& rEndPos, -DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc) const; +DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc) const override; ScFullMatrix& operator+= ( const ScFullMatrix& r ); #if DEBUG_MATRIX @@ -816,7 +816,7 @@ public: virtual std::vector Collect(bool bTextAsZero, const std::vector>& aOp) override; virtual void ExecuteOperation(const std::pair& rStartPos, const std::pair& rEndPos, -DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc) const; +DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, StringOpFunction aStringFunc) const override; ScVectorRefMatrix& operator+=(const ScVectorRefMatrix& r); }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - qadevOOo/tests vcl/inc vcl/unx wizards/com xmerge/source
qadevOOo/tests/java/ifc/awt/_XWindow.java
|3
vcl/inc/unx/gtk/gtkgdi.hxx
|2
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
| 35 --
wizards/com/sun/star/wizards/form/FieldLinker.java
|8 +-
wizards/com/sun/star/wizards/table/ScenarioSelector.java
|4 -
wizards/com/sun/star/wizards/ui/FilterComponent.java
|4 +
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
|7 +-
7 files changed, 32 insertions(+), 31 deletions(-)
New commits:
commit e6d255420a7fb00ed1050e0e96768eea57a92bc4
Author: Caolán McNamara
Date: Tue Feb 16 12:27:29 2016 +
Related: tdf#97739 fix gtk3 spinbuttons for recent control region changes
Change-Id: Ia745cbe808395c4c9ec6a3c72612814a4834bbcb
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 2bb6029..d4ae5f0 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -163,7 +163,7 @@ private:
ControlPart nPart,
Rectangle aAreaRect,
ControlState nState );
- Rectangle PaintSpinButton(GtkStyleContext *context,
+ void PaintSpinButton(GtkStyleContext *context,
cairo_t *cr,
const Rectangle& rControlRectangle,
ControlType nType,
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 8cdb67b..df3f5c6 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -607,14 +607,13 @@ void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext
*context,
g_object_unref(pixbuf);
}
-Rectangle GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
+void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
cairo_t *cr,
const Rectangle& rControlRectangle,
ControlType nType,
- ControlPart /*nPart*/,
+ ControlPart nPart,
const ImplControlValue& rValue )
{
-RectangleareaRect;
const SpinbuttonValue *pSpinVal = (rValue.getType() == CTRL_SPINBUTTONS) ?
static_cast(&rValue) : nullptr;
ControlPart upBtnPart = PART_BUTTON_UP;
ControlState upBtnState = ControlState::NONE;
@@ -630,26 +629,20 @@ Rectangle GtkSalGraphics::PaintSpinButton(GtkStyleContext
*context,
downBtnState = pSpinVal->mnLowerState;
}
-areaRect = rControlRectangle;
-
-gtk_render_background(context, cr,
- 0, 0,
- areaRect.GetWidth(), areaRect.GetHeight() );
-gtk_render_frame(context, cr,
- 0, 0,
- areaRect.GetWidth(), areaRect.GetHeight() );
-
-// CTRL_SPINBUTTONS pass their area in pSpinVal, not in rControlRectangle
-if (pSpinVal)
+if (nPart == PART_ENTIRE_CONTROL)
{
-areaRect = pSpinVal->maUpperRect;
-areaRect.Union( pSpinVal->maLowerRect );
+gtk_render_background(context, cr,
+ 0, 0,
+ rControlRectangle.GetWidth(),
rControlRectangle.GetHeight() );
+gtk_render_frame(context, cr,
+ 0, 0,
+ rControlRectangle.GetWidth(),
rControlRectangle.GetHeight() );
}
-PaintOneSpinButton(mpSpinUpStyle, cr, nType, upBtnPart, areaRect,
upBtnState );
-PaintOneSpinButton(mpSpinDownStyle, cr, nType, downBtnPart, areaRect,
downBtnState );
-
-return areaRect;
+cairo_translate(cr, -rControlRectangle.Left(), -rControlRectangle.Top());
+PaintOneSpinButton(mpSpinUpStyle, cr, nType, upBtnPart, rControlRectangle,
upBtnState );
+PaintOneSpinButton(mpSpinDownStyle, cr, nType, downBtnPart,
rControlRectangle, downBtnState );
+cairo_translate(cr, rControlRectangle.Left(), rControlRectangle.Top());
}
#define ARROW_SIZE 11 * 0.85
@@ -1478,7 +1471,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
PaintScrollbar(context, cr, rControlRegion, nType, nPart, rValue);
break;
case RENDER_SPINBUTTON:
-aDamageRect.Union(PaintSpinButton(context, cr, rControlRegion, nType,
nPart, rValue));
+PaintSpinButton(context, cr, rControlRegion, nType, nPart, rValue);
break;
case RENDER_COMBOBOX:
PaintCombobox(flags, cr, rControlRegion, nType, nPart, rValue);
commit 7cdb46536db710d1173f410d02f3c49674939db8
Author: Caolán McNamara
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AutoInstall.mk | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) New commits: commit c33fb4828e2fda2648f11614a20ce0172d4af3db Author: Michael Stahl Date: Tue Feb 16 12:39:14 2016 +0100 gbuild: yet more substitution for AutoInstall Pyuno creates packages with a "/" in the name, so need to escape that too. Since it's getting a bit repetitive facotr out a function to do the escaping. Change-Id: I4481d6a291b384390723a04e3e82615e73edc7eb Reviewed-on: https://gerrit.libreoffice.org/22392 Reviewed-by: David Ostrovsky Tested-by: Jenkins diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 11ff644..ebf3e30a 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -9,24 +9,28 @@ # AutoInstall class +define gb_AutoInstall__escape +$(subst .,_,$(subst -,_,$(subst /,_,$(1 +endef + define gb_AutoInstall__make_define echo "#define auto_$*_ALL \ " >> $@ -$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "$(subst .,_,$(subst -,_,$(binary))), \ " >> $@;) -echo "$(subst .,_,$(subst -,_,$(lastword $(1" >> $@; +$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo "$(call gb_AutoInstall__escape$(binary)), \ " >> $@;) +echo "$(call gb_AutoInstall__escape,$(lastword $(1)))" >> $@; echo "" >> $@ endef define gb_AutoInstall__gen_define $(file >>$@,#define auto_$*_ALL \) $(foreach binary,$(filter-out $(lastword $(1)),$(1)),$(file >>$@,\ - $(subst .,_,$(subst -,_,$(binary))), \)) + $(call gb_AutoInstall__escape,$(binary)), \)) $(file >>$@,\ - $(subst .,_,$(subst -,_,$(lastword $(1) + $(call gb_AutoInstall__escape,$(lastword $(1 endef define gb_AutoInstall__gen_lib -$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(1))),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION))) +$(SCP2LIBTEMPLATE)(auto_$*_lib_$(call gb_AutoInstall__escape,$(1)),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION))) endef @@ -46,7 +50,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \ $(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg))) $(foreach lib,$(gb_Library_MODULE_$*),\ - echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(lib))),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) + echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(call gb_AutoInstall__escape$(lib)),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) else $(file >$@,/* autogenerated installs for group $* */) $(call gb_AutoInstall__gen_define,\ @@ -60,11 +64,11 @@ endif $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\ echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../program/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))" >> $@;) + echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(call gb_AutoInstall__escape,$(exe)),$(call gb_Executable_get_filename,$(exe))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))" >> $@;) $(foreach jar,$(gb_Jar_MODULE_$*),\ - echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst .,_,$(subst -,_,$(jar))),$(jar).jar)' >> $@;) + echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(call gb_AutoInstall__escape,$(jar)),$(jar).jar)' >> $@;) $(foreach pkg,$(gb_Package_MODULE_$*),\ - echo 'PACKAGE_FILELIST(auto_$*_pkg_$(subst -,_,$(pkg)),$(pkg).filelist)' >> $@;) + echo 'PACKAGE_FILELIST(auto_$*_pkg_$(call gb_AutoInstall__escape,$(pkg)),$(pkg).filelist)' >> $@;) $(call gb_AutoInstall_get_clean_target,%) : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New Defects reported by Coverity Scan for LibreOffice
Hi, On Tue, Feb 16, 2016 at 12:22 PM, Caolán McNamara wrote: > cid#1352479 and cid#1352479 point out > that 54e3ea8a86a309990f5edf78948bfe18dd2de96b "tdf#97715 fix inv. scale > calculation in DrawTransformedTexture" means that the calculations to > derive ixscale and iyscale are done with integers not floats so the > result is always an integer. > > Is that intentional ?, if it is then the ixscale could be changed to be > integers and then I suppose fastAreaScaling = ( ixscale == int( ixscale > ) && iyscale == int( iyscale )) becomes always true. Ups, that is not intentional. I'll fix it. Thanks. Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54169] LibO doesn’t obey OS setting “only show the accelerator underline when the Alt key is being pressed”
https://bugs.documentfoundation.org/show_bug.cgi?id=54169 --- Comment #29 from Pranav Ganorkar --- Thanks Samuel and Cor. I got it. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 90753] gbuild: Move packages to autoinstallation in scp2
https://bugs.documentfoundation.org/show_bug.cgi?id=90753 David Tardon changed: What|Removed |Added Keywords||topicCleanup CC||dtar...@redhat.com Whiteboard|ToBeReviewed| -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source
sw/source/core/layout/pagechg.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 77aa8f92aab6a66ca2186efd2e4cbfc0d1c9f0e8
Author: Michael Stahl
Date: Fri Feb 12 23:33:36 2016 +0100
sw: fix a STL assertion in lcl_MoveAllLowerObjs()
For OLE objects MoveObjectIfActive() ends up calling
SwSortedObjs::Update() which removes and re-inserts objects,
thus invalidating the pSortedObj iterator.
(regression from 04783fd91832fa01a5b096f395edd7ad4f9c0f6b)
Change-Id: I2628f1b4ecd1c20ebbc4e9dda4e4befc9fad4644
(cherry picked from commit cf91483690291272f48ff95c1aebd165da8ae4f0)
Reviewed-on: https://gerrit.libreoffice.org/22338
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 42ae8ac..1c9e803 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1761,8 +1761,11 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const
Point& rOffset )
if (pSortedObj == nullptr)
return;
-for (SwAnchoredObject* pAnchoredObj : *pSortedObj)
+// note: pSortedObj elements may be removed and inserted from
+// MoveObjectIfActive(), invalidating iterators
+for (size_t i = 0; i < pSortedObj->size(); ++i)
{
+SwAnchoredObject *const pAnchoredObj = (*pSortedObj)[i];
const SwFrameFormat& rObjFormat = pAnchoredObj->GetFrameFormat();
const SwFormatAnchor& rAnchor = rObjFormat.GetAnchor();
___
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' - sfx2/source sw/CppunitTest_sw_odfexport.mk sw/qa
sfx2/source/doc/objstor.cxx | 13 ++-
sw/CppunitTest_sw_odfexport.mk |1
sw/qa/extras/odfexport/data/2_MathType3.docx |binary
sw/qa/extras/odfexport/odfexport.cxx | 30 +++
4 files changed, 43 insertions(+), 1 deletion(-)
New commits:
commit 83f6dca40ff36697b426458962fa09564e5551bb
Author: Michael Stahl
Date: Fri Feb 12 18:22:51 2016 +0100
sfx2: related tdf#56270: loss of embedded objects imported from DOCX
After the import some of these are kept in RUNNING state. For Math
objects imported from MathType3 OLEs in particular, first a new
Math object is created and stored to the XStorage, only then is the
MathType3 stream imported. This means the Math object is modified and
contains data that must be stored.
The problem is then that SfxObjectShell::ImportFrom() simply calls
setModified(false), clearing the flag without storing the object.
For Flat ODF export we lose all the objects that are cached in sw's
SwOLELRUCache; for the bugdoc something more inexplicable happens for
ODT export where we lose "Object 214" (which is the first one in the
cache) but no other ones.
(The main difference is that for ODF there is an optimization to copy the
embedded object's storage without loading the object, but for Flat ODF
every object must be loaded and exported.)
(regression from 83777cd6e0f3f1a4458af896fd13344c696ecb1e)
Change-Id: Id1474fba9f4da2d5247c7ff4dc6819ddb9829fe8
(cherry picked from commit d81d104833f0ee9349ebcd0d79d2de84ba9a7262)
Reviewed-on: https://gerrit.libreoffice.org/22334
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 722630f..cbb3c8c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2280,8 +2280,19 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
if ( nState == embed::EmbedStates::LOADED || nState ==
embed::EmbedStates::RUNNING )// means that the object is not active
{
uno::Reference< util::XModifiable > xModifiable(
xObj->getComponent(), uno::UNO_QUERY );
-if ( xModifiable.is() )
+if (xModifiable.is() && xModifiable->isModified())
+{
+uno::Reference const xPers(xObj,
uno::UNO_QUERY);
+if (xPers.is())
+{ // store it before resetting modified!
+xPers->storeOwn();
+}
+else
+{
+SAL_WARN("sfx.doc", "Modified object without
persistence!");
+}
xModifiable->setModified(sal_False);
+}
}
}
}
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index c6434ac..3757e01 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
sd/util/sd \
svx/util/svxcore \
xmloff/source/transform/xof \
+xmlscript/util/xmlscript \
))
$(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\
diff --git a/sw/qa/extras/odfexport/data/2_MathType3.docx
b/sw/qa/extras/odfexport/data/2_MathType3.docx
new file mode 100644
index 000..0694921
Binary files /dev/null and b/sw/qa/extras/odfexport/data/2_MathType3.docx differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index e61c08a..5a661c1 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -73,10 +73,40 @@ public:
pBatch->commit();
return pResetter;
}
+if (OString(pFilename) == "2_MathType3.docx")
+{
+std::unique_ptr pResetter(new Resetter(
+[this] () {
+mpFilter = "writer8";
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Cache::Writer::OLE_Objects::set(20, pBatch);
+return pBatch->commit();
+}));
+mpFilter = "OpenDocument Text Flat XML"; // doesn't happen with
ODF package
+std::shared_ptr pBatch(
+comphelper::ConfigurationChanges::create());
+officecfg::Office::Common::Cache::Writer::OLE_Objects::set(1,
pBatch);
+pBatch->commit();
+return pResetter;
+}
return nullptr;
}
};
+DECLARE_ODFEXPORT_TEST(testMathObjectFlatExport, "2_MathType3.docx")
+{
+uno::Reference xModifiable(mxComponent, uno::UNO_QUERY);
+CPPUNIT_ASSERT(!xModifiable->isModified());
+
Re: New Defects reported by Coverity Scan for LibreOffice
cid#1352479 and cid#1352479 point out that 54e3ea8a86a309990f5edf78948bfe18dd2de96b "tdf#97715 fix inv. scale calculation in DrawTransformedTexture" means that the calculations to derive ixscale and iyscale are done with integers not floats so the result is always an integer. Is that intentional ?, if it is then the ixscale could be changed to be integers and then I suppose fastAreaScaling = ( ixscale == int( ixscale ) && iyscale == int( iyscale )) becomes always true. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/LibreOfficeKit sd/qa sd/source
include/LibreOfficeKit/LibreOfficeKitEnums.h| 12 +
sd/qa/unit/tiledrendering/data/insert-delete.odp|binary
sd/qa/unit/tiledrendering/tiledrendering.cxx| 128
sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx |4
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 36 +++-
5 files changed, 170 insertions(+), 10 deletions(-)
New commits:
commit 80d7c5859b9e7a834a915d7e8bbbe9bc2130108a
Author: Henry Castro
Date: Fri Feb 12 07:12:07 2016 -0400
sd lok: add LOK_CALLBACK_PARTS_COUNT_CHANGED callback
In the tiled rendering case, when a slide is deleted or inserted
the sorted slides are updated on client side.
However, when .uno:Undo and .uno:Redo actions are requested on
client side the sorted slides are required to update all
sorted slides.
So every time when .uno:InsertPage, .uno:DeletePage, .uno:Undo, .uno:Redo
actions are requested, it will notify verbose action (PageInserted,
PageDeleted)
with index on client side to update the sorted slide index.
Change-Id: Iebda2aa11be13aea8fbb6d0cc50442805d7485e9
Reviewed-on: https://gerrit.libreoffice.org/22309
Reviewed-by: Miklos Vajna
Tested-by: Henry Castro
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 901bf6b..e855b6a 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -280,6 +280,18 @@ typedef enum
* }
*/
LOK_CALLBACK_ERROR,
+
+/**
+ * A part has been added to or removed from the document.
+ *
+ * {
+ * "action" : "PartInserted" | "PartDeleted"
+ * "part" : "Part Index"
+ * }
+ *
+ * Note: this is currently emitted by Impress.
+ */
+LOK_CALLBACK_PARTS_COUNT_CHANGED
}
LibreOfficeKitCallbackType;
diff --git a/sd/qa/unit/tiledrendering/data/insert-delete.odp
b/sd/qa/unit/tiledrendering/data/insert-delete.odp
new file mode 100644
index 000..e388fb6
Binary files /dev/null and b/sd/qa/unit/tiledrendering/data/insert-delete.odp
differ
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 4bf086a..770f03bd7 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -25,10 +25,14 @@
#include
#include
+#include
+#include
+#include
#include
#include
#include
#include
+#include
using namespace css;
@@ -44,6 +48,7 @@ public:
virtual void tearDown() override;
#if !defined(WNT) && !defined(MACOSX)
+void testInsertPage();
void testRegisterCallback();
void testPostKeyEvent();
void testPostMouseEvent();
@@ -60,6 +65,7 @@ public:
CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
#if !defined(WNT) && !defined(MACOSX)
+CPPUNIT_TEST(testInsertPage);
CPPUNIT_TEST(testRegisterCallback);
CPPUNIT_TEST(testPostKeyEvent);
CPPUNIT_TEST(testPostMouseEvent);
@@ -90,6 +96,7 @@ private:
sal_Int32 m_nPart;
std::vector m_aSearchResultSelection;
std::vector m_aSearchResultPart;
+std::vector m_aPageList;
int m_nSelectionBeforeSearchResult;
int m_nSelectionAfterSearchResult;
#endif
@@ -216,6 +223,19 @@ void SdTiledRenderingTest::callbackImpl(int nType, const
char* pPayload)
}
}
break;
+case LOK_CALLBACK_PARTS_COUNT_CHANGED:
+{
+boost::property_tree::ptree aTree;
+std::stringstream aStream(pPayload);
+boost::property_tree::read_json(aStream, aTree);
+auto aAction = aTree.get("action", "");
+auto aPart = aTree.get("part", "");
+if (!aAction.empty() && !aPart.empty())
+{
+m_aPageList.push_back(std::atoi(aPart.data()));
+}
+}
+break;
}
}
@@ -499,6 +519,114 @@ void SdTiledRenderingTest::testSearchAllFollowedBySearch()
CPPUNIT_ASSERT_EQUAL(OString("match"),
pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
}
+void SdTiledRenderingTest::testInsertPage()
+{
+uno::Sequence aFilterOptions;
+uno::Reference xLoader(mxDesktop, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xLoader.is());
+
+uno::Reference xComponent;
+xComponent = xLoader->loadComponentFromURL(
+getURLFromSrc(DATA_DIRECTORY) + OUString("insert-delete.odp"),
+"_blank",
+0,
+aFilterOptions);
+CPPUNIT_ASSERT(xComponent.is());
+
+SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT(pFoundShell);
+
+::sd::DrawDocShell* xDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(xDocSh);
+
+sd::ViewShell* pViewShell = xDocSh->GetViewShell();
+CPPUNIT_ASSERT(pViewShell);
+
+sd::slidesorter::SlideSorterViewShell* pSSVS = nullptr;
+for (int i = 0; i < 1000; i++)
+{
+// Process all Tasks - slide sorter is created here
+
[Bug 54169] LibO doesn’t obey OS setting “only show the accelerator underline when the Alt key is being pressed”
https://bugs.documentfoundation.org/show_bug.cgi?id=54169 --- Comment #28 from Samuel Mehrbrodt (CIB) --- (In reply to Pranav Ganorkar from comment #26) > Hi , Samuel the links are not opening currentlyhave the files been moved > to some other place ? http://opengrok.libreoffice.org/xref/core/vcl/win/gdi/salnativewidgets-luna.cxx http://opengrok.libreoffice.org/xref/core/vcl/unx/gtk/salnativewidgets-gtk.cxx -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/frmedt/fecopy.cxx | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 3f7a0f7dba759ed3763c900112b5eeb7ccfdd84d
Author: Xisco Fauli
Date: Thu Feb 4 22:50:47 2016 +0100
tdf#97429: Fix crash on print selected area
Regression from 9eb61489ee03486a7147acdf923eaf5e3f355183
Use DelFlyInRange to iterate over nodes' range
Change-Id: I219c7ec83eaa69990340d423dc34546131bb372c
Reviewed-on: https://gerrit.libreoffice.org/22129
Tested-by: Jenkins
Reviewed-by: Xisco FaulÃ
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index b40a0bfd..dc7939d 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -90,6 +90,7 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString*
pNewClpText )
// delete content if ClpDocument contains content
SwNodeIndex aSttIdx( pClpDoc->GetNodes().GetEndOfExtras(), 2 );
+SwNodeIndex aEndNdIdx( *aSttIdx.GetNode().EndOfSectionNode() );
SwTextNode* pTextNd = aSttIdx.GetNode().GetTextNode();
if (!pTextNd || !pTextNd->GetText().isEmpty() ||
aSttIdx.GetIndex()+1 !=
pClpDoc->GetNodes().GetEndOfContent().GetIndex() )
@@ -102,11 +103,19 @@ bool SwFEShell::Copy( SwDoc* pClpDoc, const OUString*
pNewClpText )
}
// also delete surrounding FlyFrames if any
-for( auto pFormat : *pClpDoc->GetSpzFrameFormats() )
+for( const auto pFly : *pClpDoc->GetSpzFrameFormats() )
{
-SwFlyFrameFormat* pFly = static_cast(pFormat);
-pClpDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
+SwFormatAnchor const*const pAnchor = &pFly->GetAnchor();
+SwPosition const*const pAPos = pAnchor->GetContentAnchor();
+if (pAPos &&
+((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
+ (FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
+aSttIdx <= pAPos->nNode && pAPos->nNode <= aEndNdIdx )
+{
+pClpDoc->getIDocumentLayoutAccess().DelLayoutFormat( pFly );
+}
}
+
pClpDoc->GetDocumentFieldsManager().GCFieldTypes();// delete the
FieldTypes
// if a string was passed, copy it to the clipboard-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source connectivity/source cppuhelper/test desktop/source desktop/win32 drawinglayer/source extensions/source external/curl external/neon external/redland hwpfilt
basic/source/sbx/sbxdec.cxx| 10 +++---
basic/source/sbx/sbxdec.hxx|4 +-
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |4 +-
cppuhelper/test/bootstrap/bootstrap.test.cxx |2 -
desktop/source/app/cmdlineargs.cxx |2 -
desktop/win32/source/applauncher/launcher.cxx | 12 ---
drawinglayer/source/primitive2d/textlayoutdevice.cxx |6 +--
extensions/source/scanner/scanner.hxx |2 -
external/curl/curl-7.26.0_win-proxy.patch |6 +--
external/neon/configs/config.h |8 ++---
external/neon/neon.patch |4 +-
external/redland/raptor/raptor_config.h|2 -
hwpfilter/source/fontmap.cxx | 20 +
hwpfilter/source/hiodev.cxx|2 -
hwpfilter/source/htags.cxx |8 ++---
hwpfilter/source/htags.h |2 -
hwpfilter/source/hwpeq.cxx |4 +-
hwpfilter/source/hwpreader.cxx |2 -
hwpfilter/source/lexer.cxx |6 +--
hwpfilter/source/mzstring.cxx | 14 +
include/sal/config.h |2 -
onlineupdate/source/libmar/inc/mozilla/Assertions.h|2 -
onlineupdate/source/libmar/inc/mozilla/Types.h |2 -
onlineupdate/source/update/inc/mozilla/Assertions.h|2 -
onlineupdate/source/update/inc/mozilla/Types.h |2 -
registry/source/registry.cxx |2 -
sal/cppunittester/cppunittester.cxx|2 -
sal/qa/osl/file/osl_old_test_file.cxx |8 ++---
sc/source/core/opencl/formulagroupcl.cxx |2 -
sc/workben/opencl/platform_detect.cxx |2 -
sd/source/ui/remotecontrol/BluetoothServer.cxx |2 -
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx|4 +-
sd/source/ui/remotecontrol/DiscoveryService.cxx|4 +-
sdext/source/pdfimport/inc/pdfparse.hxx|2 -
sdext/source/pdfimport/pdfparse/pdfparse.cxx |4 +-
sfx2/source/doc/syspathw32.cxx |2 -
shell/inc/internal/zipfile.hxx |4 --
soltools/mkdepend/def.h|2 -
soltools/mkdepend/ifparser.c |2 -
soltools/mkdepend/imakemdep.h | 10 +++---
soltools/mkdepend/main.c |2 -
stoc/test/testregistry.cxx |2 -
stoc/test/testsmgr.cxx |2 -
svtools/source/config/optionsdrawinglayer.cxx |2 -
tools/qa/cppunit/test_urlobj.cxx | 12 +++
tools/source/fsys/urlobj.cxx |2 -
vcl/inc/salglyphid.hxx |2 -
vcl/inc/sft.hxx|2 -
vcl/opengl/win/WinDeviceInfo.cxx |2 -
vcl/source/fontsubset/sft.cxx |4 +-
vcl/source/outdev/transparent.cxx |2 -
51 files changed, 96 insertions(+), 120 deletions(-)
New commits:
commit ce43d0ae9279edbf1ad108fe0d8325327a038d49
Author: Noel Grandin
Date: Tue Feb 16 11:26:51 2016 +0200
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 8a956c8..1616771 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -34,7 +34,7 @@ SbxDecimal::SbxDecimal()
SbxDecimal::SbxDecimal( const SbxDecimal& rDec )
{
-#ifdef WIN32
+#ifdef _WIN32
maDec = rDec.maDec;
#else
(void)rDec;
@@ -45,7 +45,7 @@ SbxDecimal::SbxDecimal( const SbxDecimal& rDec )
SbxDecimal::SbxDecimal
( const css::bridge::oleautomation::Decimal& rAutomationDec )
{
-#ifdef WIN32
+#ifdef _WIN32
maDec.scale = rAutomationDec.Scale;
maDec.sign = rAutomationDec.Sign;
maDec.Lo32 = rAutomationDec.LowValue;
@@ -60,7 +60,7 @@ SbxDecimal::SbxDecimal
void SbxDecimal::fillAutomationDecimal
( css::bridge::oleautomation::Decimal& rAutomationDec )
{
-#ifdef WIN32
+#ifdef _WIN32
rAutomationDec.Scale = maDec.scale;
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source
vcl/source/control/spinfld.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7c1ba528722d859bca290c83dc583bb6b8c66099
Author: Michael Meeks
Date: Mon Feb 15 15:56:23 2016 +
tdf#97739 - ensure we have a valid rectangle for spin-button controls.
Otherwise OpenGL can't render, cache and diff these; so we loose them.
Change-Id: Iac4f3ee0fc68154f708a881d5e0255fc9f8df62d
Reviewed-on: https://gerrit.libreoffice.org/22374
Reviewed-by: Tomaž Vajngerl
Tested-by: Jenkins
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 5f86629..8f4bbca 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -81,7 +81,8 @@ bool ImplDrawNativeSpinfield(vcl::RenderContext&
rRenderContext, vcl::Window* pW
rRenderContext.IsNativeControlSupported(CTRL_SPINBOX,
rSpinbuttonValue.mnLowerPart))
{
// only paint the embedded spin buttons, all buttons are painted
at once
-bNativeOK = rRenderContext.DrawNativeControl(CTRL_SPINBOX,
PART_ALL_BUTTONS, Rectangle(),
+Rectangle aUpperAndLowerButtons(
rSpinbuttonValue.maUpperRect.GetUnion( rSpinbuttonValue.maLowerRect ) );
+bNativeOK = rRenderContext.DrawNativeControl(CTRL_SPINBOX,
PART_ALL_BUTTONS, aUpperAndLowerButtons,
ControlState::ENABLED, rSpinbuttonValue, OUString());
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests sal/qa
qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java | 13 -
sal/qa/rtl/random/rtl_random.cxx|3 +--
2 files changed, 1 insertion(+), 15 deletions(-)
New commits:
commit 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115
Author: Caolán McNamara
Date: Tue Feb 16 09:56:20 2016 +
coverity#1352448 Use of untrusted scalar value
and
coverity#1352449 Use of untrusted scalar value
I suspect this will fix the warning, given that "Casting narrower unsigned
pBuffer[i] to wider signed type short effectively tests its lower bound", so
if we pass it though as-is we probably quieten these
Change-Id: I2ece08f7301f5d548d905d221e5a6af0da51a2bb
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index e3a70e4..c91bb54 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -198,9 +198,8 @@ public:
}
~Statistics(){}
-void addValue(sal_Int16 _nIndex, sal_Int32 _nValue)
+void addValue(sal_uInt8 _nIndex, sal_Int32 _nValue)
{
-OSL_ASSERT(_nIndex >= 0 && _nIndex < 256);
m_nDispensation[_nIndex] += _nValue;
}
commit 7e06965243d1e3a98519c659b7ad580d1ff46ab5
Author: Caolán McNamara
Date: Tue Feb 16 09:51:47 2016 +
coverity#1327093 UrF: Unread field
Change-Id: I354f29592e6bd036d9a548c7c2c3a3722c8c9450
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
index c7400e4..519cd25 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
@@ -81,9 +81,6 @@ public class _XTreeControl extends MultiMethodTest {
boolean mTreeCollapsed2 = false;
boolean mTreeCollapsing2 = false;
-boolean mTreeNodeEditing1 = false;
-boolean mTreeNodeEdit1 = false;
-
public interface XTreeDataModelListenerEvent{
void fireEvent();
}
@@ -152,12 +149,10 @@ public class _XTreeControl extends MultiMethodTest {
public class TreeEditListenerImpl1 implements XTreeEditListener{
public void nodeEditing(XTreeNode xTreeNode) throws VetoException {
log.println("event at EditListener 1: nodeEditing");
-mTreeNodeEditing1 = true;
}
public void nodeEdited(XTreeNode xTreeNode, String string) {
log.println("event at EditListener 1: nodeEdited");
-mTreeNodeEdit1 = true;
}
public void disposing(EventObject eventObject) {
@@ -190,11 +185,6 @@ public class _XTreeControl extends MultiMethodTest {
mTreeCollapsing2 = false;
}
-private void resetEditListener(){
-mTreeNodeEditing1 = false;
-mTreeNodeEdit1 = false;
-}
-
@Override
public void before(){
mXNode = (XMutableTreeNode) tEnv.getObjRelation("XTreeControl_Node");
@@ -569,10 +559,7 @@ public class _XTreeControl extends MultiMethodTest {
log.println("add EditListener 2");
oObj.addTreeEditListener(mTreeEditListener2);
-resetEditListener();
-
try {
-
oObj.startEditingAtNode(mXNode);
} catch (com.sun.star.lang.IllegalArgumentException ex) {
log.println("ERROR: could not start editing at node: " +
ex.toString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - idl/inc idl/source sc/sdi
idl/inc/bastype.hxx |1
idl/inc/object.hxx|6 +-
idl/inc/parser.hxx|4 +
idl/inc/types.hxx |3 -
idl/source/objects/object.cxx |2
idl/source/prj/parser.cxx | 119 +-
sc/sdi/cellsh.sdi |3 -
sc/sdi/docsh.sdi |1
8 files changed, 128 insertions(+), 11 deletions(-)
New commits:
commit aa8c854590e76a437521596c566ce1327efffb6e
Author: Noel Grandin
Date: Tue Feb 16 11:49:07 2016 +0200
tighten up the attribute parsing, and drop some unused slots
Change-Id: I6f2ff99c919851b21ce120c40286c133bf65c778
diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx
index 78a62af..8059cfd 100644
--- a/idl/inc/parser.hxx
+++ b/idl/inc/parser.hxx
@@ -45,7 +45,7 @@ public:
voidReadInterfaceOrShell( SvMetaModule& rModule, MetaTypeType
aMetaTypeType );
voidReadInterfaceOrShellEntry( SvMetaClass& rClass );
boolReadInterfaceOrShellSlot( SvMetaSlot& rSlot );
-boolReadInterfaceOrShellAttribute( SvMetaAttribute& rAttr );
+boolReadInterfaceOrShellMethodOrAttribute( SvMetaAttribute& rAttr
);
voidReadItem();
voidReadStruct();
voidReadEnum();
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index 7773598..9d77a36 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -338,7 +338,7 @@ void SvIdlParser::ReadInterfaceOrShellEntry(SvMetaClass&
rClass)
else
{
xAttr = new SvMetaAttribute( pType );
-bOk = ReadInterfaceOrShellAttribute(*xAttr);
+bOk = ReadInterfaceOrShellMethodOrAttribute(*xAttr);
}
if( bOk )
bOk = xAttr->Test( rInStm );
@@ -392,20 +392,21 @@ bool SvIdlParser::ReadInterfaceOrShellSlot(SvMetaSlot&
rSlot)
return bOk;
}
-bool SvIdlParser::ReadInterfaceOrShellAttribute( SvMetaAttribute& rAttr )
+bool SvIdlParser::ReadInterfaceOrShellMethodOrAttribute( SvMetaAttribute&
rAttr )
{
sal_uInt32 nTokPos = rInStm.Tell();
bool bOk = false;
rAttr.SetName( ReadIdentifier() );
-rAttr.aSlotId.ReadSvIdl( rBase, rInStm );
+rAttr.aSlotId.setString( ReadIdentifier() );
+sal_uLong n;
+if( !rBase.FindId( rAttr.aSlotId.getString(), &n ) )
+throw SvParseException( rInStm, "no value for identifier <" +
rAttr.aSlotId.getString() + "> " );
+rAttr.aSlotId.SetValue(n);
bOk = true;
SvToken& rTok = rInStm.GetToken();
if( rTok.IsChar() && rTok.GetChar() == '(' )
{
-tools::SvRef xT(new SvMetaType() );
-xT->SetRef(rAttr.GetType() );
-rAttr.aType = xT;
bOk = rAttr.aType->ReadMethodArgs( rBase, rInStm );
}
if( bOk && rInStm.ReadIf( '[' ) )
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 126c6f7..cf94574 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -19,9 +19,6 @@
interface CellSelection
{
-SbxObject Movement
-[
-]
// Slot's die in der DrawShell disabled werden. {
FID_DEFINE_NAME [ ExecMethod = ExecuteEdit; StateMethod =
GetState; ]
FID_ADD_NAME[ ExecMethod = ExecuteEdit; StateMethod =
GetState; ]
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index d103ee7..6964d6b 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -71,7 +71,6 @@ interface TableDocument
SID_PIVOT_GET [ StateMethod = GetSbxState; ]
SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ]
SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ]
-SbxObject OLEObjects []
SID_CHART_SOURCE[ ExecMethod = Execute; ]
SID_CHART_ADDSOURCE [ ExecMethod = Execute; ]
FID_AUTO_CALC [ ExecMethod = Execute; StateMethod = GetState; ]
commit 314cb543fe69d2a08fa40084512f40062437bed1
Author: Noel Grandin
Date: Tue Feb 16 08:55:36 2016 +0200
parse shell/interface entries in SvIdlParser
Change-Id: Ief68b26be0a0890ffdfa02a5904ba9d2cb364c65
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index ef7a88c..afe3642 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -52,6 +52,7 @@ class SvIdentifier
sal_uInt32 nValue;
public:
SvIdentifier() : nValue( 0 ) {};
+SvIdentifier(sal_uInt32 n) : nValue( n ) {};
voidsetString(const OString& rStr) { m_aStr = rStr; }
const OString& getString() const { return m_aStr; }
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 12f5af2..6d56eeb 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -50,12 +50,12 @@ class SvMetaClass : public SvMetaType
{
public:
tools::SvRef aSuperClass;
-private:
-SvRefMemberList aAttrList;
std::vector aClassElementList;
-
+SvRefMemberList aAttrList;
boolTestAttribute( SvIdlDataBase & rBase,
SvTokenStream & rInStm,
[Libreoffice-commits] core.git: 5 commits - scripting/java sc/source xmerge/source
sc/source/ui/vba/vbaformat.cxx
|6 +-
sc/source/ui/vba/vbaformat.hxx
|6 +-
sc/source/ui/vba/vbarange.cxx
|2
sc/source/ui/vba/vbarange.hxx
|2
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
| 11 +---
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
| 14 -
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
| 24 +-
7 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit e384e3851de8d5c82c64be579456eccfa4c75959
Author: Caolán McNamara
Date: Tue Feb 16 09:48:38 2016 +
coverity#1326200 Explicit null dereferenced
Change-Id: I39ed18b55657e375b1c22f97c49a0e43aedce4f5
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index c84d4b7..90d66e3 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -215,6 +215,7 @@ public abstract class ScriptProvider implements
isPkgProvider = true;
if (!originalContextURL.equals(contextUrl)
+&& extensionRepository != null
&& !extensionRepository.equals("bundled")) {
contextUrl = PathUtils.make_url(contextUrl,
"uno_packages");
commit 84d126c6b64f156527abcc47a508a0127505147d
Author: Caolán McNamara
Date: Tue Feb 16 09:46:58 2016 +
coverity#1326199 Explicit null dereferenced
extensionDb is always the same
Change-Id: I57b59f09b3f55757844a6aab6c6698857da2e15b
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 9e7c4b6..c84d4b7 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -194,24 +194,20 @@ public abstract class ScriptProvider implements
m_container = new ParcelContainer(m_xContext, contextUrl,
language);
m_xModel = getModelFromDocUrl(originalContextURL);
} else {
-String extensionDb = null;
+String extensionDb =
"vnd.sun.star.expand:${$BRAND_INI_DIR/"
+ + PathUtils.BOOTSTRAP_NAME +
"::UserInstallation}/user";
+
String extensionRepository = null;
if (originalContextURL.startsWith("bundled")) {
contextUrl = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS";
-extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/"
- + PathUtils.BOOTSTRAP_NAME +
"::UserInstallation}/user";
extensionRepository = "bundled";
} else if (originalContextURL.startsWith("share")) {
contextUrl =
"vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR";
-extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/"
- + PathUtils.BOOTSTRAP_NAME +
"::UserInstallation}/user";
extensionRepository = "shared";
} else if (originalContextURL.startsWith("user")) {
contextUrl = "vnd.sun.star.expand:${$BRAND_INI_DIR/"
+ PathUtils.BOOTSTRAP_NAME +
"::UserInstallation}/user";
-extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/"
- + PathUtils.BOOTSTRAP_NAME +
"::UserInstallation}/user";
extensionRepository = "user";
}
commit bd7759e0e0e3ac40668adc2f21df13ebc13598e7
Author: Caolán McNamara
Date: Tue Feb 16 09:39:21 2016 +
coverity#1326257 Dereference after null check
Change-Id: I6159d6a9be17ceaffaa3e3a905abf87a8cf434ed
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
index 9fe83a2..7fb3efe 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocument.java
@@ -315,6 +315,10 @@ public abstract class OfficeDocument
}
}
+
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/blocklistparsertest.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 61699452c0dc8e025e4dc7123ebedf68ee95b4c6
Author: Stephan Bergmann
Date: Tue Feb 16 10:21:02 2016 +0100
Work around CPPUNIT_ASSERT_EQUAL shortcomings
Change-Id: I377c6b6817a432d1e9d740c7d43233f5b98cd2f6
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx
b/vcl/qa/cppunit/blocklistparsertest.cxx
index 66a4f70..b47b518 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -39,7 +39,8 @@ void BlocklistParserTest::testParse()
WinBlocklistParser aBlocklistParser(getURLFromSrc("vcl/qa/cppunit/") +
"test_blocklist_parse.xml", aDriveInfos);
aBlocklistParser.parse();
-CPPUNIT_ASSERT_EQUAL(20U, aDriveInfos.size());
+auto const n = aDriveInfos.size();
+CPPUNIT_ASSERT_EQUAL(static_cast(20), n);
size_t i = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/scmatrix.hxx | 12 ++
sc/source/core/tool/scmatrix.cxx | 130 +++
sc/source/ui/docshell/externalrefmgr.cxx | 42 +++---
3 files changed, 156 insertions(+), 28 deletions(-)
New commits:
commit f18cb2c196cc5b643b9832dfca1d940b82c832b0
Author: Markus Mohrhard
Date: Tue Feb 16 07:07:53 2016 +0100
single element access is really slow in mdds, tdf#67071
Change-Id: I5491ba0bc44a9ce8844b31126835671c5d5abcaa
Reviewed-on: https://gerrit.libreoffice.org/22386
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 9287f55..84eda9e 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -123,6 +123,10 @@ protected:
public:
enum Op { Add, Sub, Mul, Div };
+typedef std::function DoubleOpFunction;
+typedef std::function BoolOpFunction;
+typedef std::function
StringOpFunction;
+
/**
* When adding all numerical matrix elements for a scalar result such as
* summation, the interpreter wants to separate the first non-zero value
@@ -393,6 +397,9 @@ public:
virtual std::vector Collect(bool bTextAsZero,
const std::vector>& aOp) = 0;
+virtual void ExecuteOperation(const std::pair& rStartPos,
const std::pair& rEndPos,
+DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc,
StringOpFunction aStringFunc) const = 0;
+
#if DEBUG_MATRIX
void Dump() const;
#endif
@@ -598,6 +605,8 @@ public:
virtual std::vector Collect(bool bTextAsZero,
const std::vector>& aOp) override;
+virtual void ExecuteOperation(const std::pair& rStartPos,
const std::pair& rEndPos,
+DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc,
StringOpFunction aStringFunc) const;
ScFullMatrix& operator+= ( const ScFullMatrix& r );
#if DEBUG_MATRIX
@@ -806,6 +815,9 @@ public:
virtual std::vector Collect(bool bTextAsZero,
const std::vector>& aOp) override;
+virtual void ExecuteOperation(const std::pair& rStartPos,
const std::pair& rEndPos,
+DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc,
StringOpFunction aStringFunc) const;
+
ScVectorRefMatrix& operator+=(const ScVectorRefMatrix& r);
};
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 33879bc..6019cc2 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -300,6 +300,10 @@ public:
template
void ApplyOperation(T aOp, ScMatrixImpl& rMat);
+void ExecuteOperation(const std::pair& rStartPos,
+const std::pair& rEndPos,
ScFullMatrix::DoubleOpFunction aDoubleFunc,
+ScFullMatrix::BoolOpFunction aBoolFunc,
ScFullMatrix::StringOpFunction aStringFunc) const;
+
template
std::vector ApplyCollectOperation(bool
bTextAsZero, const std::vector>& aOp);
@@ -2169,6 +2173,117 @@ std::vector
ScMatrixImpl::ApplyCollectOperation(bool bT
return aFunc.getResult();
}
+namespace {
+
+class WalkElementBlockOperation
+{
+public:
+
+WalkElementBlockOperation(size_t nRowSize, size_t /*nColSize*/,
+ScFullMatrix::DoubleOpFunction aDoubleFunc,
+ScFullMatrix::BoolOpFunction aBoolFunc,
+ScFullMatrix::StringOpFunction aStringFunc):
+mnRowSize(nRowSize),
+mnRowPos(0),
+mnColPos(0),
+maDoubleFunc(aDoubleFunc),
+maBoolFunc(aBoolFunc),
+maStringFunc(aStringFunc)
+{
+}
+
+void operator()(const MatrixImplType::element_block_node_type& node)
+{
+switch (node.type)
+{
+case mdds::mtm::element_numeric:
+{
+typedef MatrixImplType::numeric_block_type block_type;
+
+block_type::const_iterator it = block_type::begin(*node.data);
+std::advance(it, node.offset);
+block_type::const_iterator itEnd = it;
+std::advance(itEnd, node.size);
+for (auto itr = it; itr != itEnd; ++itr)
+{
+maDoubleFunc(mnRowPos, mnColPos, *itr);
+++mnRowPos;
+if (mnRowPos >= mnRowSize)
+{
+mnRowPos = 0;
+++mnColPos;
+}
+}
+}
+break;
+case mdds::mtm::element_string:
+{
+typedef MatrixImplType::string_block_type block_type;
+
+block_type::const_iterator it = block_type::begin(*node.data);
+std::advance(it, node.offset);
+block_type::const_iterator itEnd = it;
+std::advance(itEnd, node.size);
+for (auto itr = it; itr != itEnd; ++itr)
+{
+maStringFunc(mnRowPos, mnColPos, *itr);
+++mnRowPos;
+if (mnRowPos >= mnRowSize)
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit fe90ba29ad7345037e3707916b2696010213bda6
Author: Pranav Kant
Date: Tue Feb 16 11:40:23 2016 +0530
sc lok: Notify LibreOfficeKit of empty selection
Change-Id: Ib77f2e008473a18460e7783b20ef3237ff885d57
Reviewed-on: https://gerrit.libreoffice.org/22387
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 935d730..14f46e7 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6229,6 +6229,11 @@ void ScGridWindow::UpdateSelectionOverlay()
updateLibreOfficeKitSelection(pViewData, pDoc->GetDrawLayer(),
aPixelRects);
}
}
+else
+{
+ScDocument* pDoc = pViewData->GetDocument();
+
pDoc->GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION,
"EMPTY");
+}
if ( aOldMode != aDrawMode )
SetMapMode( aOldMode );
___
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/filter/ww8/ww8graf.cxx | 18 ++
1 file changed, 18 insertions(+)
New commits:
commit c0ec06b19c0e14cfc7f69500e50e6ebb17a07ec0
Author: Justin Luth
Date: Tue Feb 16 08:32:33 2016 +0300
tdf#56321 - .doc import image flipped status
Although LO was exporting whether an image was flipped
horizontally or vertically, it wasn't reading it in during
an import.
Reviewed-on: https://gerrit.libreoffice.org/22344
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Michael Stahl
(cherry picked (minus unit tests)
from commit aa03fd09c0e18ace241c9fe151f7f52c6773f403)
Change-Id: Ia85e3459d00f40d852bbcd3fcfe15e7b53d518ba
Reviewed-on: https://gerrit.libreoffice.org/22384
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: David Tardon
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 7458609..66e0141 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2095,6 +2095,24 @@
SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
pGrfNd->SetAttr( aCrop );
}
+bool bFlipH = pRecord->nFlags & SHAPEFLAG_FLIPH;
+bool bFlipV = pRecord->nFlags & SHAPEFLAG_FLIPV;
+if ( bFlipH || bFlipV )
+{
+SwMirrorGrf aMirror = pGrfNd->GetSwAttrSet().GetMirrorGrf();
+if( bFlipH )
+{
+if( bFlipV )
+aMirror.SetValue(RES_MIRROR_GRAPH_BOTH);
+else
+aMirror.SetValue(RES_MIRROR_GRAPH_VERT);
+}
+else
+aMirror.SetValue(RES_MIRROR_GRAPH_HOR);
+
+pGrfNd->SetAttr( aMirror );
+}
+
if (pRecord->pObj)
{
const SfxItemSet& rOldSet = pRecord->pObj->GetMergedItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 97628] [NEWHELP] Move Help content media to helpcontent2/ subproject
https://bugs.documentfoundation.org/show_bug.cgi?id=97628 --- Comment #2 from Marcos Souza --- I'm working on this bug. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 97628] [NEWHELP] Move Help content media to helpcontent2/ subproject
https://bugs.documentfoundation.org/show_bug.cgi?id=97628 Marcos Souza changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |marcos.souza@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loolwsd/LOOLBroker.cpp
loolwsd/LOOLBroker.cpp | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 33ecd5ea2d6e1d13832d490748e7dba47f2ed239
Author: Tor Lillqvist
Date: Tue Feb 16 10:48:10 2016 +0200
Introduce environment variable SLEEPKITFORDEBUGGER
Sleeps a "kit" process after fork() for the specified number of
seconds to give you time to attach it in the debugger.
Also, if set, have the parent ("broker") process wait indefinitely the
fifo to become writable.
Also clarify the informative message for SLEEPFORDEBUGGER.
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 9e9089e..0b41fee 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -505,6 +505,14 @@ static int createLibreOfficeKit(const bool sharePages,
if (!(pid = fork()))
{
// child
+if (std::getenv("SLEEPKITFORDEBUGGER"))
+{
+std::cerr << "Sleeping " << std::getenv("SLEEPKITFORDEBUGGER")
+ << " seconds to give you time to attach debugger to
process "
+ << Process::id() << std::endl;
+Thread::sleep(std::stoul(std::getenv("SLEEPKITFORDEBUGGER")) *
1000);
+}
+
lokit_main(childRoot, sysTemplate, loTemplate, loSubPath, pipeKit);
_exit(Application::EXIT_OK);
}
@@ -544,11 +552,14 @@ static int createLibreOfficeKit(const bool sharePages,
// open non-blocking to make sure that a broken lokit process will not
// block the loolbroker forever
{
-short nRetries = 5;
+int nRetries = 5;
std::mutex aFIFOMutex;
std::condition_variable aFIFOCV;
std::unique_lock lock(aFIFOMutex);
+if (std::getenv("SLEEPKITFORDEBUGGER"))
+nRetries = std::numeric_limits::max();
+
while(nRetries && nFIFOWriter < 0)
{
aFIFOCV.wait_for(
@@ -620,7 +631,7 @@ int main(int argc, char** argv)
if (std::getenv("SLEEPFORDEBUGGER"))
{
std::cerr << "Sleeping " << std::getenv("SLEEPFORDEBUGGER")
- << " seconds to attach debugger to process "
+ << " seconds to give you time to attach debugger to process "
<< Process::id() << std::endl;
Thread::sleep(std::stoul(std::getenv("SLEEPFORDEBUGGER")) * 1000);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/rect.hxx| 13 +++--
starmath/source/node.cxx | 40
starmath/source/rect.cxx | 10 +-
3 files changed, 32 insertions(+), 31 deletions(-)
New commits:
commit 66b8bc9399a9b27b344a0fefdbcd61736176572b
Author: Takeshi Abe
Date: Fri Feb 12 14:24:56 2016 +0900
starmath: Convert RectCopyMBL to scoped enum
Change-Id: I44e4f3086f642adccdff8dcf82298e5f4e9cb282
Reviewed-on: https://gerrit.libreoffice.org/22305
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index b3cf949..3ef8ec4 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -80,12 +80,13 @@ enum class RectVerAlign
};
// different methods of copying baselines and mid's in 'ExtendBy' function
-enum RectCopyMBL
-{ RCP_THIS, // keep baseline of current object even if it has none
-RCP_ARG,// as above but for the argument
-RCP_NONE, // result will have no baseline
-RCP_XOR // if current object has a baseline keep it else copy
-// the arguments baseline (even if it has none)
+enum class RectCopyMBL
+{
+This, // keep baseline of current object even if it has none
+Arg,// as above but for the argument
+None, // result will have no baseline
+Xor // if current object has a baseline keep it else copy
+// the arguments baseline (even if it has none)
};
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 296887b..27c6755 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -714,7 +714,7 @@ void SmTableNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
if (i)
aPos.Y() += nDist;
pNode->MoveTo(aPos);
-ExtendBy(rNodeRect, nSize > 1 ? RCP_NONE : RCP_ARG);
+ExtendBy(rNodeRect, nSize > 1 ? RectCopyMBL::None :
RectCopyMBL::Arg);
}
}
// #i972#
@@ -811,7 +811,7 @@ void SmLineNode::Arrange(OutputDevice &rDev, const SmFormat
&rFormat)
aPos.X() += nDist;
pNode->MoveTo(aPos);
-ExtendBy( *pNode, RCP_XOR );
+ExtendBy( *pNode, RectCopyMBL::Xor );
}
}
@@ -861,7 +861,7 @@ void SmUnHorNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
SmRect::operator = (*pBody);
long nOldBot = GetBottom();
-ExtendBy(*pOper, RCP_XOR);
+ExtendBy(*pOper, RectCopyMBL::Xor);
// workaround for Bug 50865: "a^2 a^+2" have different baselines
// for exponents (if size of exponent is large enough)
@@ -948,9 +948,9 @@ void SmRootNode::Arrange(OutputDevice &rDev, const SmFormat
&rFormat)
}
SmRect::operator = (*pBody);
-ExtendBy(*pRootSym, RCP_THIS);
+ExtendBy(*pRootSym, RectCopyMBL::This);
if (pExtra)
-ExtendBy(*pExtra, RCP_THIS, true);
+ExtendBy(*pExtra, RectCopyMBL::This, true);
}
@@ -1000,7 +1000,7 @@ void SmDynIntegralNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
// override its own rectangle with pBody's
SmRect::operator = (*pBody);
// extends this rectangle with the symbol's one
-ExtendBy(*pDynIntegralSym, RCP_THIS);
+ExtendBy(*pDynIntegralSym, RectCopyMBL::This);
}
@@ -1050,13 +1050,13 @@ void SmBinHorNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
aPos = pOper->AlignTo(*this, RectPos::Right, RectHorAlign::Center,
RectVerAlign::Baseline);
aPos.X() += nDist;
pOper->MoveTo(aPos);
-ExtendBy(*pOper, RCP_XOR);
+ExtendBy(*pOper, RectCopyMBL::Xor);
aPos = pRight->AlignTo(*this, RectPos::Right, RectHorAlign::Center,
RectVerAlign::Baseline);
aPos.X() += nDist;
pRight->MoveTo(aPos);
-ExtendBy(*pRight, RCP_XOR);
+ExtendBy(*pRight, RectCopyMBL::Xor);
}
@@ -1117,7 +1117,7 @@ void SmBinVerNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
pDenom->MoveTo(aPos);
SmRect::operator = (*pNum);
-ExtendBy(*pDenom, RCP_NONE).ExtendBy(*pLine, RCP_NONE,
pLine->GetCenterY());
+ExtendBy(*pDenom, RectCopyMBL::None).ExtendBy(*pLine, RectCopyMBL::None,
pLine->GetCenterY());
}
void SmBinVerNode::CreateTextFromNode(OUString &rText)
@@ -1371,7 +1371,7 @@ void SmBinDiagonalNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
nTmpBaseline);
SmRect::operator = (*pLeft);
-ExtendBy(*pRight, RCP_NONE);
+ExtendBy(*pRight, RectCopyMBL::None);
// determine position and size of diagonal line
@@ -1386,7 +1386,7 @@ void SmBinDiagonalNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
pOper->MoveTo(aPos);
-ExtendBy(*pOper, RCP_NONE, nTmpBaseline);
+ExtendBy(*pOper, RectCopyMBL::None, nTmpBaseline);
}
@@ -1494,7 +1494,7 @@ void SmSubSupNode::Arrange(OutputDevice &rDev, const
SmFormat &rFormat)
}
pSubSup->MoveTo(aPos);
-ExtendBy(*pSubSup, RCP_THIS, tr
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit c44a445031a12f6c6e51fcff620d8a3cc94a8c7b
Author: Henry Castro
Date: Sun Feb 14 16:41:02 2016 -0400
lok: add desktop terminate
When lokit is destroyed, the Desktop service
is still alive. So in order to avoid debug
assertion "Desktop disposed before terminating it",
terminate to quit application.
Change-Id: Id1391cde516915d915e5321799436e92b444e935
Reviewed-on: https://gerrit.libreoffice.org/22359
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 75c17b4..bb480b3 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2024,14 +2024,26 @@ int lok_preinit(const char* install_path, const char*
user_profile_path)
static void lo_destroy(LibreOfficeKit* pThis)
{
+bool bSuccess = false;
LibLibreOffice_Impl* pLib = static_cast(pThis);
gImpl = nullptr;
SAL_INFO("lok", "LO Destroy");
comphelper::LibreOfficeKit::setStatusIndicatorCallback(nullptr, nullptr);
+uno::Reference xDesktop = frame::Desktop::create (
::comphelper::getProcessComponentContext() );
+bSuccess = xDesktop.is() && xDesktop->terminate();
+
+if (!bSuccess)
+{
+bSuccess = GetpApp() && GetpApp()->QueryExit();
+}
+
+if (!bSuccess)
+{
+Application::Quit();
+}
-Application::Quit();
osl_joinWithThread(pLib->maThread);
osl_destroyThread(pLib->maThread);
___
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' - vcl/CppunitTest_vcl_blocklistparser_test.mk vcl/inc vcl/Module_vcl.mk vcl/opengl vcl/qa
vcl/CppunitTest_vcl_blocklistparser_test.mk | 49
vcl/Module_vcl.mk |1
vcl/inc/opengl/win/WinDeviceInfo.hxx| 14 +-
vcl/inc/opengl/win/blocklist_parser.hxx | 43 +++
vcl/opengl/win/WinDeviceInfo.cxx| 57 +
vcl/opengl/win/blocklist_parser.cxx |2
vcl/opengl/win/blocklist_parser.hxx | 45 ---
vcl/qa/cppunit/blocklistparsertest.cxx | 161
vcl/qa/cppunit/test_blocklist_evaluate.xml | 47
vcl/qa/cppunit/test_blocklist_parse.xml | 75 +
10 files changed, 419 insertions(+), 75 deletions(-)
New commits:
commit 2f496d6a1e83ec234ce7479c5397c04dc126b12c
Author: Tomaž Vajngerl
Date: Mon Feb 15 15:10:03 2016 +0100
Unit test for opengl blocklist parsing and evaluating
Parsing unit test checks that the xml values are parsed correctly
and that the DriverInfo structure is populated with the expected
values.
Evaluate unit test checks that blacklisting / whitelisting
logic blocks OS/vendor/driver/device as expected.
Change-Id: Ib1b0926606f0835207c324193bbe19ba83f86bdc
Reviewed-on: https://gerrit.libreoffice.org/22377
Reviewed-by: Michael Meeks
Tested-by: Jenkins
diff --git a/vcl/CppunitTest_vcl_blocklistparser_test.mk
b/vcl/CppunitTest_vcl_blocklistparser_test.mk
new file mode 100644
index 000..95b7507
--- /dev/null
+++ b/vcl/CppunitTest_vcl_blocklistparser_test.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_blocklistparser_test))
+
+$(eval $(call gb_CppunitTest_set_include,vcl_blocklistparser_test,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_blocklistparser_test, \
+ vcl/qa/cppunit/blocklistparsertest \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,vcl_blocklistparser_test,\
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_blocklistparser_test, \
+ sal \
+ test \
+ unotest \
+ vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,vcl_blocklistparser_test,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_blocklistparser_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_blocklistparser_test))
+
+$(eval $(call gb_CppunitTest_use_components,vcl_blocklistparser_test,\
+ configmgr/source/configmgr \
+ i18npool/util/i18npool \
+ ucb/source/core/ucb1 \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_blocklistparser_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 1480504..90a16b3 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -121,6 +121,7 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_timer \
+ CppunitTest_vcl_blocklistparser_test \
))
endif
# vim: set noet sw=4 ts=4:
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx
b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 974d6b3..8dcbd55 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -10,7 +10,10 @@
#ifndef INCLUDED_VCL_OPENGL_WIN_WINDEVICEINFO_HXX
#define INCLUDED_VCL_OPENGL_WIN_WINDEVICEINFO_HXX
+#include
+
#include "opengl/DeviceInfo.hxx"
+
#include
#include
#include
@@ -60,14 +63,14 @@ enum DeviceVendor {
bool ParseDriverVersion(const OUString& rString, uint64_t& rVersion);
-struct DriverInfo
+struct VCL_DLLPUBLIC DriverInfo
{
DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp
op,
uint64_t driverVersion, bool bWhiteListed = false, const char
*suggestedVersion = nullptr);
DriverInfo();
-~DriverInfo();
+virtual ~DriverInfo();
OperatingSystem meOperatingSystem;
uint32_t mnOperatingSystemVersion;
@@ -96,7 +99,7 @@ struct DriverInfo
#define GFX_DRIVER_VERSION(a,b,c,d) \
((uint64_t(a)<<48) | (uint64_t(b)<<32) | (uint64_t(c)<<16) | uint64_t(d))
-inline uint64_t V(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
+inline VCL_DLLPUBLIC uint64_t V(uint32_t a, uint32_t b, uint32_t c, uint32_t d)
{
// We make sure every driver number is padded by 0s, this will allow us the
// easiest 'compare as if decimals' approach. See ParseDriverVersion for a
@@ -115,7 +118,7 @@ inline uint64_t V(uint32_t a, uint32_t b, uint32_t c,
uint32_t d)
}
-class WinOpenGLDeviceInfo : public OpenGLDeviceInfo
+class VCL_DLLPUBLIC WinOpenGLDeviceInfo : public OpenGLDeviceInfo
{
private:
OUString maDriverVersion;
@@ -204,6 +207,9 @@ public:
[Libreoffice-commits] dev-tools.git: scripts/esc-mentoring.py
scripts/esc-mentoring.py | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 7d5dc1e3b9a2eded1bca9a498cbe11ed96f05919
Author: jan iversen
Date: Tue Feb 16 09:34:18 2016 +0100
mentoring tool
Corrected error in finding gerrit patches without reviewers
Added better headings
diff --git a/scripts/esc-mentoring.py b/scripts/esc-mentoring.py
old mode 100644
new mode 100755
index 4216185..c8bf8c6
--- a/scripts/esc-mentoring.py
+++ b/scripts/esc-mentoring.py
@@ -119,7 +119,7 @@ def checkGerrit(checkType, patch, cDate=0, eDate=0) :
# True if there are reviewer
if 'labels' in patch and 'Code-Review' in patch['labels'] and 'all' in
patch['labels']['Code-Review'] :
for chk in patch['labels']['Code-Review']['all'] :
- name = chk['value']
+ name = chk['name']
if not name == 'Jenkins' and not name == patch['owner'] :
return True
return False
@@ -201,19 +201,19 @@ def DAY_report(isWeekend, easyHacks, gerritOpen,
gerritContributor) :
else :
cDate = datetime.date.today() - datetime.timedelta(days=1)
-print('*** day report ***')
-print('new easyHacks:')
+print("\n\n*** day report ***")
+print("\n\n*** new easyHacks:")
for key, row in easyHacks.items():
if row['created'] >= cDate :
print('', end='')
print(formatEasy(row))
-print('changed easyHacks:')
+print("\n\n*** changed easyHacks:")
for key, row in easyHacks.items():
if row['change'] >= cDate :
print('', end='')
print(formatEasy(row))
-print('Gerrit mangler reviewer:')
+print("\n\n*** Gerrit mangler reviewer:")
for row in gerritContributor:
if not checkGerrit(2, row) :
print('', end='')
@@ -224,7 +224,7 @@ def DAY_report(isWeekend, easyHacks, gerritOpen,
gerritContributor) :
cDate = datetime.date.today() - datetime.timedelta(days=5)
else :
cDate = datetime.date.today() - datetime.timedelta(days=3)
-print('Gerrit check for merge:')
+print("\n\n*** Gerrit check for merge:")
for row in gerritContributor:
if checkGerrit(3, row, cDate=cDate, eDate=eDate) :
print('', end='')
@@ -236,29 +236,29 @@ def MONTH_report(easyHacks, gerritOpen,
gerritContributor) :
cDate = datetime.date.today() - datetime.timedelta(days=30)
mDate = datetime.date(2016, month=2, day=11)
-print('*** month report ***')
+print("\n\n*** month report ***")
print('assigned easyHacks, no movement')
for key, row in easyHacks.items():
if row['change'] <= cDate and row['status'] == 'ASSIGNED':
print('', end='')
print(formatEasy(row))
-print('easyHacks with more than 5 comments:')
+print("\n\n*** easyHacks with more than 5 comments:")
for key, row in easyHacks.items():
if row['comments'] >= 5 :
print('', end='')
print(formatEasy(row))
-print('easyHacks needing review:')
+print("\n\n*** easyHacks needing review:")
for key, row in easyHacks.items():
if row['change'] <= mDate :
print('', end='')
print(formatEasy(row))
-print('easyHacks needing review due to whiteboard:')
+print("\n\ne*** asyHacks needing review due to whiteboard:")
for key, row in easyHacks.items():
if row['whiteboard'] == 'ToBeReviewed' :
print('', end='')
print(formatEasy(row))
-print('Gerrit check Abandon:')
+print("\n\n*** Gerrit check Abandon:")
for row in gerritOpen:
if checkGerrit(5, row, cDate=cDate) :
print('', end='')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0001.xhp | 12 source/text/shared/01/0604.xhp |5 +++-- source/text/shared/01/06040100.xhp |1 + source/text/shared/01/06040200.xhp | 11 ++- source/text/shared/01/06040300.xhp |7 --- source/text/shared/01/06040400.xhp |1 + source/text/shared/01/06040600.xhp |5 - 7 files changed, 31 insertions(+), 11 deletions(-) New commits: commit 9f126548f1640b34521037502dc7a1bc0d0d3094 Author: Olivier Hallot Date: Sun Feb 14 21:40:15 2016 -0200 tdf#86866 describe AutoCorrect Options dialog btns In Help, describe AutoCorrect Options "Ok, Cancel, Reset" buttons (all tabs of dialog) Added an embed tag with definition of OK, Cancel and reset buttons Change-Id: Ie0d55a06ebe0a94c965b25d048567b164f1697cc Reviewed-on: https://gerrit.libreoffice.org/22361 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/source/text/shared/00/0001.xhp b/source/text/shared/00/0001.xhp index 8c0df27..98e6def 100644 --- a/source/text/shared/00/0001.xhp +++ b/source/text/shared/00/0001.xhp @@ -206,6 +206,18 @@ oldref="70">Next Click the Next button, and the wizard uses the current dialog settings and proceeds to the next step. If you are on the last step, this button becomes Create. + + +Dialog Buttons +Reset +Resets modified values back to the tab page previous values. + + Cancel +Closes dialog and discards all changes. + +OK +Saves all changes and closes dialog. + http://www.apache.org/licenses/LICENSE-2.0 . --> - + AutoCorrect @@ -47,7 +47,8 @@ - + + diff --git a/source/text/shared/01/06040100.xhp b/source/text/shared/01/06040100.xhp index d4ef1c7..9dfe37c 100644 --- a/source/text/shared/01/06040100.xhp +++ b/source/text/shared/01/06040100.xhp @@ -270,5 +270,6 @@ Modifies the selected AutoCorrect option. + diff --git a/source/text/shared/01/06040200.xhp b/source/text/shared/01/06040200.xhp index 2a2c2c6..d80f03b 100644 --- a/source/text/shared/01/06040200.xhp +++ b/source/text/shared/01/06040200.xhp @@ -1,6 +1,6 @@ - + - - + + Replace @@ -40,7 +40,7 @@ Replace Edits the replacement table for automatically correcting or replacing words or abbreviations in your document. -To enable the replacement table, choose Tools - AutoCorrect Options, click the Options tab, and then select Use replacement table. To use the replacement table while you type, choose Format - AutoCorrect - While Typing. +To enable the replacement table, choose Tools - AutoCorrect Options, click the Options tab, and then select Use replacement table. To use the replacement table while you type, choose Format - AutoCorrect - While Typing. @@ -50,7 +50,7 @@ Replacement table Lists the entries for automatically replacing words, abbreviations or word parts while you type. To add an entry, enter text in the Replace and With boxes, and then click New. To edit an entry, select it, change the text in the With box, and then click Replace. To delete an entry, select it, and then click Delete. You can use the AutoCorrect feature to apply a specific character format to a word, abbreviation or a word part. Select the formatted text in your document, open this dialog, clear the Text only box, and then enter the text that you want to replace in the Replace box. -You can also include frames, graphics, and OLE objects in an AutoCorrect entry, so long as they are anchored as characters in the text. Select the frame, graphic or OLE object and at least one text character in front of and behind the object. Open this dialog, type a name for this AutoCorrect entry in the Replace box, and then click New. +You can also include frames, graphics, and OLE objects in an AutoCorrect entry, so long as they are anchored as characters in the text. Select the frame, graphic or OLE object and at least one text character in front of and behind the object. Open this dialog, type a name for this AutoCorrect entry in the Replace box, and then click New. Replace @@ -67,5 +67,6 @@ New Adds or replaces an entry in the replacement table. + diff --git a/source/text/shared/01/06040300.xhp b/source/text/shared/01/06040300.xhp index 0b9fb62..edb17cd 100644 --- a/source/text/shared/01/06040300.xhp +++ b/source/text/shared/01/06040300.xhp @@ -1,6 +1,6 @@ - + - - + + Exceptions @@ -60,5 +60,6 @@ AutoInclude Automatically adds abbreviations or words that start with two capital letters to the corresponding list of exceptions. This feature only works if the Correct TWo INitial CApitals option or the Capitalize first letter of every sentence option are selected in the [T] column onOptions tab of this dialog. + diff --git a/source/text/shared/01/06040400.x
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b2efa9db15500044cbb2bd2c94e819b9ee8c6f82 Author: Miklos Vajna Date: Tue Feb 16 09:20:00 2016 +0100 cid#1352648 uninitialized members Change-Id: I21faf2034c6253226637bfb65deb869d0c4eda07 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 4cf04b9..4a4035a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8479,6 +8479,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri m_startedHyperlink( false ), m_nHyperLinkCount(0), m_nFieldsInHyperlink( 0 ), + m_bExportingOutline(false), m_nChartCount(0), m_postponedChart( nullptr ), pendingPlaceholder( nullptr ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 980d5225ad485fe76aecdcea010b726b2343ad04 Author: Olivier Hallot Date: Sun Feb 14 21:40:15 2016 -0200 Updated core Project: help 9f126548f1640b34521037502dc7a1bc0d0d3094 tdf#86866 describe AutoCorrect Options dialog btns In Help, describe AutoCorrect Options "Ok, Cancel, Reset" buttons (all tabs of dialog) Added an embed tag with definition of OK, Cancel and reset buttons Change-Id: Ie0d55a06ebe0a94c965b25d048567b164f1697cc Reviewed-on: https://gerrit.libreoffice.org/22361 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/helpcontent2 b/helpcontent2 index 8259390..9f12654 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8259390d2d978d37dc73e8e2cb0f1fcd0299afdf +Subproject commit 9f126548f1640b34521037502dc7a1bc0d0d3094 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e9d5a562c4f09a8ea27f5c772050b3117288ce9 Author: Olivier Hallot Date: Fri Feb 12 14:41:48 2016 -0200 Updated core Project: help 8259390d2d978d37dc73e8e2cb0f1fcd0299afdf tdf#95281 Help page for the SKEWP function Write help page for SKEWP spreadsheet function Change-Id: Ib7fc372bc2be4c55663a6ab58f488aa204631d20 Reviewed-on: https://gerrit.libreoffice.org/22322 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/helpcontent2 b/helpcontent2 index e53a0d7..8259390 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e53a0d788c6a34d9375e33adc2e9946e2348ad23 +Subproject commit 8259390d2d978d37dc73e8e2cb0f1fcd0299afdf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1
source/text/scalc/01/04060185.xhp |4 ++
source/text/scalc/01/func_skewp.xhp | 53
3 files changed, 58 insertions(+)
New commits:
commit 8259390d2d978d37dc73e8e2cb0f1fcd0299afdf
Author: Olivier Hallot
Date: Fri Feb 12 14:41:48 2016 -0200
tdf#95281 Help page for the SKEWP function
Write help page for SKEWP spreadsheet function
Change-Id: Ib7fc372bc2be4c55663a6ab58f488aa204631d20
Reviewed-on: https://gerrit.libreoffice.org/22322
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 2d8f35a..bf50e99 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -215,6 +215,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
helpcontent2/source/text/scalc/01/func_numbervalue \
helpcontent2/source/text/scalc/01/func_now \
helpcontent2/source/text/scalc/01/func_second \
+helpcontent2/source/text/scalc/01/func_skewp \
helpcontent2/source/text/scalc/01/func_sumifs \
helpcontent2/source/text/scalc/01/func_time \
helpcontent2/source/text/scalc/01/func_timevalue \
diff --git a/source/text/scalc/01/04060185.xhp
b/source/text/scalc/01/04060185.xhp
index 856665d..7926cbf 100644
--- a/source/text/scalc/01/04060185.xhp
+++ b/source/text/scalc/01/04060185.xhp
@@ -106,6 +106,10 @@
=SKEW(A1:A50) calculates the value of
skew for the data referenced.
+
+
+
+
regression lines;FORECAST
function
extrapolations
diff --git a/source/text/scalc/01/func_skewp.xhp
b/source/text/scalc/01/func_skewp.xhp
new file mode 100644
index 000..8f2a833
--- /dev/null
+++ b/source/text/scalc/01/func_skewp.xhp
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+SKEWP function
+text/scalc/01/func_skewp.xhp
+
+
+
+
+
+
+ skewness;population
+ SKEWP function
+
+SKEWP
+Calculates the skewness of a distribution using
the population of a random variable.
+
+SKEWP(Number1; Number2;..., Number30)
+Number1, Number2, ..., Number30 are up to 30
numerical values or ranges.
+Calculates the skewness of a distribution using the
population, i.e. the possible outcomes, of a random variable. The sequence
shall contain three numbers at least.
+
+
+SKEWP(2;3;1;6;8;5) returns 0.2828158928
+
+SKEWP(A1:A6) returns 0.2828158928, when the range A1:A6
contains {2;3;1;6;8;5}
+SKEWP(Number1;Number2) returns zero allways, if Number1
and Number2 results in two numbers.
+SKEWP(Number1) returns Err:502 (Invalid argument) if
Number1 results in one number, because SKEWP cannot be calculated with one
value.
+
+
+
+SKEW
+
+
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1 source/text/scalc/01/04060106.xhp |4 ++ source/text/scalc/01/func_color.xhp | 49 3 files changed, 54 insertions(+) New commits: commit e53a0d788c6a34d9375e33adc2e9946e2348ad23 Author: Olivier Hallot Date: Thu Feb 11 19:42:16 2016 -0200 tdf#95282 Help page for the COLOR function Write help page for COLOR spreadsheet functions Change-Id: I2a34cb2b1f25f3d0013a93dff320b70d76a1f4d6 Reviewed-on: https://gerrit.libreoffice.org/22300 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 02b5688..2d8f35a 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -186,6 +186,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_averageif \ helpcontent2/source/text/scalc/01/func_averageifs \ helpcontent2/source/text/scalc/01/func_countifs \ +helpcontent2/source/text/scalc/01/func_color \ helpcontent2/source/text/scalc/01/func_date \ helpcontent2/source/text/scalc/01/func_datedif \ helpcontent2/source/text/scalc/01/func_datevalue \ diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp index 7860d0a..35112f1 100644 --- a/source/text/scalc/01/04060106.xhp +++ b/source/text/scalc/01/04060106.xhp @@ -1108,6 +1108,10 @@ See COUNTIF() for some more syntax examples that can be used with SUMIF(). + + + + diff --git a/source/text/scalc/01/func_color.xhp b/source/text/scalc/01/func_color.xhp new file mode 100644 index 000..978b42f --- /dev/null +++ b/source/text/scalc/01/func_color.xhp @@ -0,0 +1,49 @@ + + + + + + +COLOR function +text/scalc/01/func_color.xhp + + + + + + + Color;numerical value + Color;calculating in spreadsheet + COLOR function + +COLOR +Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system.The result depends on the color system used by your computer. + +COLOR(Red; Green; Blue; Alpha) +Red, Green and Blue â required arguments. The value for the red, green and blue components of the color. The values must be between 0 and 255. Zero means no color component and 255 means full color component. +Alpha â optional argument. The value for the alpha channel or alpha composite. Alpha is a integer value between 0 and 255. The value of zero for alpha means the color is fully transparent, whereas a value of 255 in the alpha channel gives a fully opaque color. + +COLOR(255;255;255;1) returns 33554431 +COLOR(0;0;255;0) returns 255 +COLOR(0;0;255;255) returns 4278190335 +COLOR(0;0;400;0) returns Err:502 (Invalid argument) because the blue value is greater than 255. + + + + \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12f8bb8b8530aed4bb4b4baa9bded84a278541a2 Author: Olivier Hallot Date: Thu Feb 11 19:42:16 2016 -0200 Updated core Project: help e53a0d788c6a34d9375e33adc2e9946e2348ad23 tdf#95282 Help page for the COLOR function Write help page for COLOR spreadsheet functions Change-Id: I2a34cb2b1f25f3d0013a93dff320b70d76a1f4d6 Reviewed-on: https://gerrit.libreoffice.org/22300 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/helpcontent2 b/helpcontent2 index f9a4ba4..e53a0d7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f9a4ba48ebcb885f1d025aa72e674a3b69c4e576 +Subproject commit e53a0d788c6a34d9375e33adc2e9946e2348ad23 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
sw/source/core/tox/ToxWhitespaceStripper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eeb7c6877d47bfb0a4871734a397be96eac46663
Author: Oliver Specht
Date: Wed Feb 10 16:57:14 2016 +0100
tdf#89505: replace tab character with space in table of contents
the ToxWhitespaceStripper now replaces also tab characters so that
they don't break the formatting
Change-Id: If66aaddcbc0f8c65461f53f07ca7031f8f1d11b4
Reviewed-on: https://gerrit.libreoffice.org/22271
Tested-by: Jenkins
Reviewed-by: Oliver Specht
(cherry picked from commit 5152c43109c9a35f30fc9b0f478c1fbaf01a1143)
Reviewed-on: https://gerrit.libreoffice.org/22284
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/source/core/tox/ToxWhitespaceStripper.cxx
b/sw/source/core/tox/ToxWhitespaceStripper.cxx
index 4918a73..c38079c 100644
--- a/sw/source/core/tox/ToxWhitespaceStripper.cxx
+++ b/sw/source/core/tox/ToxWhitespaceStripper.cxx
@@ -24,7 +24,7 @@ ToxWhitespaceStripper::ToxWhitespaceStripper(const OUString&
inputString)
for (sal_Int32 pos = 0; pos < inputString.getLength(); ++pos) {
sal_Unicode cur = inputString[pos];
-if (cur == ' ' || cur == '\n') {
+if (cur == ' ' || cur == '\n' || cur == '\t') {
// merge consecutive whitespaces (and translate them to spaces)
if (!lastCharacterWasWhitespace) {
buffer.append(' ');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Renaming sal_Unicode to a less misleading name?
On 02/15/2016 08:45 PM, Khaled Hosny wrote: On Mon, Feb 15, 2016 at 05:57:25PM +0100, Stephan Bergmann wrote: Instead of introducing yet more typedefs, we'll more and more move to C++11 char16_t, char32_t (which already started, now that sal_Unicode is a typedef for char16_t, for non-WNT LIBO_INTERNAL). That would be my preference as well, so what about replacing internal uses of sal_Unicode with char16_t? Real support for those Unicode character types and for Unicode string literals is only available in MSVC 2015, I think. Though it looks like MSVC 2013 already has some fake support for char16_t and char32_t (presumably in the form of predefined typedefs). So if you have an area of code where using char16_t would make sense, you can try it out and see whether it already works with all our current toolchains. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: offapi/com oox/source sw/qa writerfilter/inc writerfilter/source
offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl |2
oox/source/shape/ShapeContextHandler.cxx | 33 +--
oox/source/shape/ShapeContextHandler.hxx | 13 ++---
sw/qa/extras/ooxmlimport/data/libreoffice.png|binary
sw/qa/extras/ooxmlimport/data/tdf59699.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8 +++
writerfilter/inc/ooxml/OOXMLDocument.hxx |2
writerfilter/source/filter/WriterFilter.cxx |3 -
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 19 +---
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |6 +-
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|2
11 files changed, 47 insertions(+), 41 deletions(-)
New commits:
commit 6083a8f188e2cd3fe6849e2112a6b06fbf8e1ad3
Author: Miklos Vajna
Date: Tue Feb 16 09:16:43 2016 +0100
Related: tdf#59699 DOCX import: fix linked graphics with relative URLs
Because the writerfilter::ooxml::OOXMLFastContextHandlerShape
constructor only sent the input stream (and not the full media
descriptor) to oox::shape::ShapeContextHandler, it's startFastElement()
tried to reconstruct a media descriptor from just the input stream. As a
result, the base URL of the document got lost at the time the
oox::drawingml::BlipContext constructor tried to call getAbsoluteUrl(),
to convert the relative URL to an absolute one.
Fix the problem by sending not only the input stream, but the full media
descriptor to the shape importer. As a bonus that makes code simpler,
too.
Change-Id: I1f06c04d0745aa7e2e06d4848cf454790d5073ca
diff --git a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
index a15ae8d..301971a 100644
--- a/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/XFastShapeContextHandler.idl
@@ -40,11 +40,11 @@ interface XFastShapeContextHandler:
com::sun::star::xml::sax::XFastContextHandle
[attribute, readonly] com::sun::star::drawing::XShape Shape;
[attribute] com::sun::star::drawing::XDrawPage DrawPage;
[attribute] com::sun::star::frame::XModel Model;
-[attribute] com::sun::star::io::XInputStream InputStream;
[attribute] string RelationFragmentPath;
[attribute] long StartToken;
[attribute] com::sun::star::awt::Point Position;
[attribute] com::sun::star::document::XDocumentProperties
DocumentProperties;
+[attribute] sequence< com::sun::star::beans::PropertyValue >
MediaDescriptor;
};
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index ae14d44..6e256ac 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -272,13 +272,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-static const OUString sInputStream
-("InputStream");
-
-uno::Sequence aSeq(1);
-aSeq[0].Name = sInputStream;
-aSeq[0].Value <<= mxInputStream;
-mxFilterBase->filter(aSeq);
+mxFilterBase->filter(maMediaDescriptor);
mpThemePtr.reset(new Theme());
@@ -573,19 +567,6 @@ void SAL_CALL ShapeContextHandler::setModel
mxFilterBase->setTargetDocument(xComp);
}
-uno::Reference< io::XInputStream > SAL_CALL
-ShapeContextHandler::getInputStream() throw (uno::RuntimeException,
std::exception)
-{
-return mxInputStream;
-}
-
-void SAL_CALL ShapeContextHandler::setInputStream
-(const uno::Reference< io::XInputStream > & the_value)
-throw (uno::RuntimeException, std::exception)
-{
-mxInputStream = the_value;
-}
-
OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath()
throw (uno::RuntimeException, std::exception)
{
@@ -631,6 +612,18 @@ uno::Reference SAL_CALL
ShapeContextHandler::getD
return mxDocumentProperties;
}
+uno::Sequence SAL_CALL
ShapeContextHandler::getMediaDescriptor()
+throw (uno::RuntimeException, std::exception)
+{
+return maMediaDescriptor;
+}
+
+void SAL_CALL ShapeContextHandler::setMediaDescriptor(const
uno::Sequence& rMediaDescriptor)
+throw (uno::RuntimeException, std::exception)
+{
+maMediaDescriptor = rMediaDescriptor;
+}
+
OUString ShapeContextHandler::getImplementationName()
throw (css::uno::RuntimeException, std::exception)
{
diff --git a/oox/source/shape/ShapeContextHandler.hxx
b/oox/source/shape/ShapeContextHandler.hxx
index c336129..353b7c5 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -120,13 +120,6 @@ public:
(const css::uno::Reference< css::frame::XModel > & the_value)
throw (css::uno::RuntimeException, std::exception) override;
-virtual css::uno::Reference< css
[Bug 64575] Photo Album: Better Image Layout
https://bugs.documentfoundation.org/show_bug.cgi?id=64575 --- Comment #8 from Samuel Mehrbrodt (CIB) --- (In reply to BezaM from comment #7) > I am a student working with Shona (the assignee). If I understand this > problem correctly, we are looking to have a tickable option "crop" in the > dialog just like "keep aspect ratio" and "Add caption to each slide", and > once that option is selected, the user will be able to crop the image in the > dialog box before inserting. > > Then, do there need to also be a visual preview of the image inside the > dialog or a separate window, while the user does the cropping? (For example, > like crop features in photo editors, with adjustable grids) No, this isn't meant to provide a manual cropping dialog. Instead the two options should do the following: * Crop (maybe a better name is Fill): The image should fill the whole slide area while keeping the aspect ratio. So part of the image might be invisible because it's out of the slide area * Fit: The image should use all available space in the slide area, but should not stretch larger than it. So some blank space might show up with this option. This is already implemented with the "Keep Aspect Ratio" option. Hope this clears things up a little? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
