[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/GridLayer.js | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 3dffe1ed624657bca5dd93a953c6485d35c5e9e0
Author: Mihai Varga
Date: Fri Jun 26 10:11:57 2015 +0300
This should handle doc resize caused by page deletion
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 4a8b5a6..64e3054 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -363,8 +363,8 @@ L.GridLayer = L.Layer.extend({
if (this._docWidthTwips === undefined || this._docHeightTwips
=== undefined) {
return;
}
- var docPixelLimits = new L.Point(this._docWidthTwips /
this._tileWidthTwips,
-
this._docHeightTwips / this._tileHeightTwips);
+ var docPixelLimits = new L.Point(this._docWidthTwips /
this.options.tileWidthTwips,
+
this._docHeightTwips / this.options.tileHeightTwips);
docPixelLimits = docPixelLimits.multiplyBy(this._tileSize);
var topLeft = new L.Point(0, 0);
@@ -377,10 +377,17 @@ L.GridLayer = L.Layer.extend({
this._map.setMaxBounds(new L.LatLngBounds(topLeft,
bottomRight));
}
else if (sizeChanged) {
+ // we just update the bounds without panning into the
new bounds,
+ // the scrollbars should handle that
this._map.options.maxBounds = new
L.LatLngBounds(topLeft, bottomRight);
}
- L.DomUtil.setStyle(this._map._mockDoc, 'width',
docPixelLimits.x + 'px');
- L.DomUtil.setStyle(this._map._mockDoc, 'height',
docPixelLimits.y + 'px');
+
+ var scrollPixelLimits = new L.Point(this._docWidthTwips /
this._tileWidthTwips,
+
this._docHeightTwips / this._tileHeightTwips);
+ scrollPixelLimits =
scrollPixelLimits.multiplyBy(this._tileSize);
+
+ L.DomUtil.setStyle(this._map._mockDoc, 'width',
scrollPixelLimits.x + 'px');
+ L.DomUtil.setStyle(this._map._mockDoc, 'height',
scrollPixelLimits.y + 'px');
},
_updateScrollOffset: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/control/tabletree.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 63384060ec6610ef08af57b981d028c8a177a028
Author: Takeshi Abe
Date: Fri Jun 26 16:18:55 2015 +0900
no need to capture _rTables
Change-Id: I78b4051ffdb625481b238cc3a5313aa4d086b87e
diff --git a/dbaccess/source/ui/control/tabletree.cxx
b/dbaccess/source/ui/control/tabletree.cxx
index feb00aa..61db99b 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -262,10 +262,10 @@ void OTableTreeListBox::UpdateTableList( const Reference<
XConnection >& _rxConn
{
OUString sRootEntryText;
if ( ::std::none_of(_rTables.begin(),_rTables.end(),
-[&_rTables] (TNames::value_type name) { return
!name.second; }) )
+[] (TNames::value_type name) { return
!name.second; }) )
sRootEntryText = ModuleRes(STR_ALL_TABLES);
else if ( ::std::none_of(_rTables.begin(),_rTables.end(),
- [&_rTables] (TNames::value_type name) {
return name.second; }) )
+ [] (TNames::value_type name) { return
name.second; }) )
sRootEntryText = ModuleRes(STR_ALL_VIEWS);
else
sRootEntryText = ModuleRes(STR_ALL_TABLES_AND_VIEWS);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 19 commits - sw/source
sw/source/core/crsr/crsrsh.cxx |4 -
sw/source/core/crsr/viscrs.cxx |2
sw/source/core/doc/notxtfrm.cxx |2
sw/source/core/draw/dpage.cxx|2
sw/source/core/frmedt/fews.cxx |2
sw/source/core/inc/frmtool.hxx |2
sw/source/core/inc/layact.hxx|6 -
sw/source/core/inc/pagefrm.hxx |4 -
sw/source/core/inc/viewimp.hxx | 20 -
sw/source/core/layout/anchoreddrawobject.cxx |4 -
sw/source/core/layout/layact.cxx | 39 +--
sw/source/core/layout/pagechg.cxx|4 -
sw/source/core/layout/paintfrm.cxx | 93 +--
sw/source/core/text/frmform.cxx | 12 +--
sw/source/core/text/inftxt.cxx | 64 --
sw/source/core/text/inftxt.hxx | 49 ++
sw/source/core/text/txtfly.cxx |2
sw/source/core/text/txtfrm.cxx |8 +-
sw/source/core/text/txtftn.cxx |2
sw/source/core/text/txthyph.cxx |3
sw/source/core/unocore/unoflatpara.cxx |2
sw/source/core/view/pagepreviewlayout.cxx|8 +-
sw/source/core/view/viewimp.cxx | 22 +-
sw/source/core/view/viewsh.cxx | 18 ++---
sw/source/core/view/vprint.cxx |2
sw/source/uibase/docvw/PageBreakWin.cxx |2
26 files changed, 198 insertions(+), 180 deletions(-)
New commits:
commit 783361da4efa20422769dcda64c59b615c31c6d6
Author: Miklos Vajna
Date: Thu Jun 25 17:38:24 2015 +0200
SwTextFormatInfo::SwTextFormatInfo: use vcl::RenderContext
(cherry picked from commit 54106fae68149c0b1dbb4f6ece133fefacacc322)
Conflicts:
sw/source/core/text/frmform.cxx
Change-Id: I8ff1647bdf8c46d395c398c97b97066d7b128cdb
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 1434a49..3f91ead 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -504,7 +504,7 @@ com::sun::star::uno::Sequence<
::com::sun::star::style::TabStop > SwTextFrm::Get
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs(1);
::com::sun::star::style::TabStop ts;
-SwTextFormatInfo aInf( this );
+SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this );
SwTextFormatter aLine( this, &aInf );
SwTextCursor TextCursor( this, &aInf );
const Point aCharPos( TextCursor.GetTopLeft() );
@@ -868,8 +868,8 @@ bool SwTextFrm::CalcPreps()
SWAP_IF_NOT_SWAPPED( this )
-SwTextFormatInfo aInf( this );
-SwTextFormatter aLine( this, &aInf );
+SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(),
this );
+SwTextFormatter aLine( this, &aInf );
WidowsAndOrphans aFrmBreak( this );
// Whatever the attributes say: we split the paragraph in
@@ -1665,7 +1665,7 @@ void SwTextFrm::_Format( SwParaPortion *pPara )
if ( IsVertical() )
SwapWidthAndHeight();
-SwTextFormatInfo aInf( this );
+SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this );
SwTextFormatter aLine( this, &aInf );
HideAndShowObjects();
@@ -1892,7 +1892,7 @@ bool SwTextFrm::FormatQuick( bool bForceQuickFormat )
SwFrmSwapper aSwapper( this, true );
TextFrmLockGuard aLock(this);
-SwTextFormatInfo aInf( this, false, true );
+SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this,
false, true );
if( 0 != aInf.MaxHyph() ) // Respect MaxHyphen!
return false;
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 741bef7..ae679c3 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1467,10 +1467,10 @@ void SwTextFormatInfo::Init()
SetPaintOfst(0);
}
-SwTextFormatInfo::SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyphL,
+SwTextFormatInfo::SwTextFormatInfo(OutputDevice* pRenderContext, SwTextFrm
*pFrame, const bool bInterHyphL,
const bool bQuickL, const bool bTst)
{
-CtorInitTextFormatInfo(pFrame->getRootFrm()->GetCurrShell()->GetOut(),
pFrame, bInterHyphL, bQuickL, bTst);
+CtorInitTextFormatInfo(pRenderContext, pFrame, bInterHyphL, bQuickL, bTst);
}
/**
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index fc28a0a..9c09bfc 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -563,7 +563,7 @@ class SwTextFormatInfo : public SwTextPaintInfo
public:
void CtorInitTextFormatInfo( OutputDevice* pRenderContext, SwTextFrm
*pFrm, const bool bInterHyph = false,
const bool bQuick = false, const bool bTst = false );
-SwTextFormatInfo(SwTextFrm *pFrame, const bool bInterHyp
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf89890.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 23 +++
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|2 +-
writerfilter/source/dmapper/NumberingManager.cxx | 14 ++
4 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit eab89b7f024a8c86decdcb3362c40c40a7df37df
Author: Miklos Vajna
Date: Fri Jun 26 09:02:31 2015 +0200
tdf#89890 DOCX import: fix too large num pic bullet
Reading SwWW8ImplReader::CoreLoad()'s "update graphic bullet
information" block, it turns out that the numbering picture bullet's
height should be independent from the supplied bitmap, and only its
aspect ratio should be respected.
Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e
Reviewed-on: https://gerrit.libreoffice.org/16500
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89890.docx
b/sw/qa/extras/ooxmlexport/data/tdf89890.docx
new file mode 100644
index 000..8b3e8eb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89890.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index fc05887..20be877 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -703,6 +703,29 @@ DECLARE_OOXMLEXPORT_TEST(testTdf79639, "tdf79639.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(1), xDrawPage->getCount());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx")
+{
+// Numbering picture bullet was too large.
+uno::Reference
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+uno::Reference
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+uno::Sequence aProps;
+xLevels->getByIndex(0) >>= aProps; // 1st level
+
+bool bFound = false;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+
+if (rProp.Name == "GraphicSize")
+{
+// Height of the graphic was too large: 4382 after import, then
2485 after roundtrip.
+CPPUNIT_ASSERT_EQUAL(static_cast(279),
rProp.Value.get().Height);
+bFound = true;
+}
+}
+CPPUNIT_ASSERT(bFound);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index cfeea16..f141900 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -353,7 +353,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx")
xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape",
"style", "width:6.4pt;height:6.4pt");
+assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape",
"style", "width:7.9pt;height:7.9pt");
}
DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,"fdo74153.docx")
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 4d4dae1..8d93fb8 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -859,6 +859,20 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
case NS_ooxml::LN_CT_NumPicBullet_pict:
{
uno::Reference xShape =
m_rDMapper.PopPendingShape();
+
+// Respect only the aspect ratio of the picture, not its size.
+awt::Size aPrefSize = xShape->getSize();
+// See SwDefBulletConfig::InitFont(), default height is 14.
+const int nFontHeight = 14;
+// Point -> mm100.
+const int nHeight = nFontHeight * 35;
+if (aPrefSize.Height * aPrefSize.Width != 0)
+{
+int nWidth = (nHeight * aPrefSize.Width) /
aPrefSize.Height;
+awt::Size aSize(nWidth, nHeight);
+xShape->setSize(aSize);
+}
+
m_pCurrentNumPicBullet->SetShape(xShape);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/inc sc/source
sc/inc/document.hxx |3 +++
sc/source/core/data/documen2.cxx | 15 +++
sc/source/ui/unoobj/docuno.cxx |2 +-
sc/source/ui/view/gridwin4.cxx |2 +-
4 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 44a534ab8706f78dd812a4cf68123963a52035af
Author: Jan Holesovsky
Date: Mon Jun 22 15:47:44 2015 +0200
sc tiled rendering: Set some minimal size of the document.
Let's default to 12x36 cells.
Change-Id: Ic39739ec036a6e5867d31b7e05b6da12ce2e46d2
Reviewed-on: https://gerrit.libreoffice.org/16413
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7ea90f1..69e6f5b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1157,6 +1157,9 @@ public:
SCROW& rEndRow, bool bNotes = true )
const;
voidInvalidateTableArea();
+/// Return the number of colums / rows that should be visible for the
tiled rendering.
+SC_DLLPUBLIC bool GetTiledRenderingArea(SCTAB nTab, SCCOL&
rEndCol, SCROW& rEndRow) const;
+
SC_DLLPUBLIC bool GetDataStart( SCTAB nTab, SCCOL& rStartCol,
SCROW& rStartRow ) const;
/**
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index eeec6ef..8d3e4e3 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -706,6 +706,21 @@ bool ScDocument::GetDataStart( SCTAB nTab, SCCOL&
rStartCol, SCROW& rStartRow )
return false;
}
+bool ScDocument::GetTiledRenderingArea(SCTAB nTab, SCCOL& rEndCol, SCROW&
rEndRow) const
+{
+if (!GetPrintArea(nTab, rEndCol, rEndRow, false))
+return false;
+
+// we need some reasonable minimal document size
+if (rEndCol < 12)
+rEndCol = 12;
+
+if (rEndRow < 36)
+rEndRow = 36;
+
+return true;
+}
+
bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress )
{
if (nOldPos == nNewPos)
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a195b8a..5375176 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -523,7 +523,7 @@ Size ScModelObj::getDocumentSize()
SCROW nEndRow = 0;
const ScDocument& rDoc = pDocShell->GetDocument();
-if (!rDoc.GetPrintArea( nTab, nEndCol, nEndRow, false ))
+if (!rDoc.GetTiledRenderingArea(nTab, nEndCol, nEndRow))
return aSize;
// convert to twips
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 3919ca5..ceaf3d8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -971,7 +971,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
SCROW nStartRow = 0, nEndRow = 0;
// size of the document including drawings, charts, etc.
-pDoc->GetPrintArea(nTab, nEndCol, nEndRow, false);
+pDoc->GetTiledRenderingArea(nTab, nEndCol, nEndRow);
double fPPTX = pViewData->GetPPTX();
double fPPTY = pViewData->GetPPTY();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source
sw/qa/extras/ww8export/data/fdo66304-1.odt |binary
sw/qa/extras/ww8export/ww8export.cxx|5 +++
sw/source/core/doc/DocumentContentOperationsManager.cxx | 25
3 files changed, 30 insertions(+)
New commits:
commit f8bf452949881aecf64a6b68d596489c158dcf77
Author: Caolán McNamara
Date: Wed Jun 24 15:57:03 2015 +0100
crashtesting: fix asserts on exporting fdo66304-1.odt to doc
Change-Id: Ia08207143d27f88d09bd45e64ba7c3c12cd2c1a1
(cherry picked from commit acdf113baf04263a03d574eac9a8c09f98598b7a)
Reviewed-on: https://gerrit.libreoffice.org/16468
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ww8export/data/fdo66304-1.odt
b/sw/qa/extras/ww8export/data/fdo66304-1.odt
new file mode 100644
index 000..c3fb9bc
Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo66304-1.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export.cxx
b/sw/qa/extras/ww8export/ww8export.cxx
index 2347fdc..e1626cd 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -529,6 +529,11 @@ DECLARE_WW8EXPORT_TEST(testCommentExport,
"comment-export.odt")
}
}
+DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt")
+{
+//the save must survive without asserting
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 06c0c4c..4f1c396 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1961,8 +1961,33 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM&
rPaM, SwPosition& rPos,
const std::shared_ptr
pContentStore(sw::mark::ContentIdxStore::Create());
pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(),
rPos.nContent.GetIndex(), true );
+SwTextNode * pOrigNode = pTNd;
+assert(*aSavePam.GetPoint() == *aSavePam.GetMark() &&
+ *aSavePam.GetPoint() == rPos);
+assert(aSavePam.GetPoint()->nContent.GetIdxReg() == pOrigNode);
+assert(aSavePam.GetPoint()->nNode == rPos.nNode.GetIndex());
+assert(rPos.nNode.GetIndex() == pOrigNode->GetIndex());
+
pTNd = pTNd->SplitContentNode( rPos )->GetTextNode();
+//A new node was inserted before the orig pTNd and the content up to
+//rPos moved into it. The old node is returned with the remainder
+//of the content in it.
+//
+//aSavePam was created with rPos, it continues to point to the
+//old node, but with the *original* content index into the node.
+//Seeing as all the orignode content before that index has
+//been removed, the new index into the original node should now be set
+//to 0 and the content index of rPos should also be adapted to the
+//truncated node
+assert(*aSavePam.GetPoint() == *aSavePam.GetMark() &&
+ *aSavePam.GetPoint() == rPos);
+assert(aSavePam.GetPoint()->nContent.GetIdxReg() == pOrigNode);
+assert(aSavePam.GetPoint()->nNode == rPos.nNode.GetIndex());
+assert(rPos.nNode.GetIndex() == pOrigNode->GetIndex());
+aSavePam.GetPoint()->nContent.Assign(pOrigNode, 0);
+rPos = *aSavePam.GetMark() = *aSavePam.GetPoint();
+
if( !pContentStore->Empty() )
pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 +++ 1 file changed, 3 insertions(+) New commits: commit 2e1d3b58f24d1ab97d9a9172b5125c162fcb5b7f Author: Yousuf Philips Date: Sat May 30 21:00:39 2015 +0400 Make track changes sidebar an experimental feature as its incomplete Change-Id: If373aa7a7efb338fd7a5305acbd19e95344a4bfc Reviewed-on: https://gerrit.libreoffice.org/15995 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit d5a0cb563bdc538a60938ea421183e4b67c0656f) Reviewed-on: https://gerrit.libreoffice.org/16470 Reviewed-by: Miklos Vajna diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 9a40006..504bf3b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -203,6 +203,9 @@ 600 + + true + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 92346] Copy functionality in the viewer
https://bugs.documentfoundation.org/show_bug.cgi?id=92346 Miklos Vajna changed: What|Removed |Added CC||libreoffice@lists.freedeskt ||op.org Whiteboard||easyHack ||difficultyInteresting ||skillJava topicUI -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 92346] Copy functionality in the viewer
https://bugs.documentfoundation.org/show_bug.cgi?id=92346 --- Comment #1 from Miklos Vajna --- > and it already can do searching. searching -> copying -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 56418272ca04b38933db30affa7f0f8166851200
Author: Mihai Varga
Date: Fri Jun 26 12:04:04 2015 +0300
Fixed keyCode on chrome
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 8dfd007..8b58104 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -755,15 +755,18 @@ L.TileLayer = L.GridLayer.extend({
return;
}
- if (e.type === 'keydown') {
- this._keyEvent = null;
- }
- else if (e.type === 'keypress') {
- this._keyEvent = e.originalEvent;
- this._postKeyboardEvent('input',
this._keyEvent.charCode, this._toUNOKeyCode(this._keyEvent.keyCode));
- }
- else if (e.type === 'keyup' && this._keyEvent) {
- this._postKeyboardEvent('up', this._keyEvent.charCode,
this._toUNOKeyCode(this._keyEvent.keyCode));
+ var charCode = e.originalEvent.charCode;
+ var keyCode = e.originalEvent.keyCode;
+ if (e.type === 'keypress') {
+ if (charCode === keyCode && charCode !== 13) {
+ // Chrome sets keyCode = charCode for printable
keys
+ // while LO requires it to be 0
+ keyCode = 0;
+ }
+ this._postKeyboardEvent('input', charCode,
this._toUNOKeyCode(keyCode));
+ }
+ else if (e.type === 'keyup') {
+ this._postKeyboardEvent('up', charCode,
this._toUNOKeyCode(keyCode));
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/inc pyuno/Library_pyuno.mk pyuno/Module_pyuno.mk pyuno/PythonTest_pytests.mk pyuno/PythonTest_pyuno_pytests_testcollections.mk pyuno/qa pyuno/source
pyuno/Library_pyuno.mk |1 pyuno/Module_pyuno.mk |1 pyuno/PythonTest_pytests.mk|1 pyuno/PythonTest_pyuno_pytests_testcollections.mk | 26 pyuno/inc/pyuno/pyuno.hxx |6 pyuno/qa/pytests/testcollections_XCellRange.py | 365 + pyuno/qa/pytests/testcollections_XEnumeration.py | 111 + pyuno/qa/pytests/testcollections_XEnumerationAccess.py | 131 ++ pyuno/qa/pytests/testcollections_XIndexAccess.py | 299 pyuno/qa/pytests/testcollections_XIndexContainer.py| 198 +++ pyuno/qa/pytests/testcollections_XIndexReplace.py | 219 +++ pyuno/qa/pytests/testcollections_XNameAccess.py| 182 ++ pyuno/qa/pytests/testcollections_XNameContainer.py | 116 + pyuno/qa/pytests/testcollections_XNameReplace.py | 73 + pyuno/qa/pytests/testcollections_base.py | 58 pyuno/qa/pytests/testcollections_misc.py | 75 + pyuno/qa/pytests/testcollections_mixednameindex.py | 48 pyuno/source/module/pyuno.cxx | 1039 - pyuno/source/module/pyuno_impl.hxx | 49 pyuno/source/module/pyuno_iterator.cxx | 312 + pyuno/source/module/pyuno_module.cxx | 24 pyuno/source/module/pyuno_runtime.cxx | 46 22 files changed, 3356 insertions(+), 24 deletions(-) New commits: commit af8143bc40cf2cfbc12e77c9bb7de01b655f7b30 Author: Matthew J. Francis Date: Mon Jun 1 18:34:04 2015 +0800 Make PyUNO provide more Pythonic behaviour - Simplifies working with UNO objects by giving the behaviour of Python lists, dicts and iterators to objects which implement UNO container interfaces - Applies a custom behaviour to allow objects which implement com::sun::star::table::XCellRange to yield cells and cell ranges by subscript - When UNO container objects are addressed in the new style, eliminates the requirement to manually construct Any objects for contained elements which are typed sequences - Allows lists and iterators to be passed wherever a UNO method accepts a sequence - Relaxes the requirements for initialising UNO structs to allow some members to be skipped when all initialisers are passed by name 1. Collection interfaces Objects which implement core UNO collection interfaces are made to behave in a way that is more natural for Python code. com::sun::star::container::XIndexAccess com::sun::star::container::XIndexReplace com::sun::star::container::XIndexContainer - Objects provide Python list access semantics num = len(obj) # Number of elements val = obj[0]# Access by index val1,val2 = obj[2:4]# Access by slice val1,val2 = obj[0:3:2] # Access by extended slice if val in obj: ... # Test value presence for val in obj: ... # Implicit iterator (values) itr = iter(obj) # Named iterator (values) obj[0] = val# Replace by index obj[2:4] = val1,val2# Replace by slice obj[0:3:2] = val1,val2 # Replace by extended slice obj[2:3] = val1,val2# Insert/replace by slice obj[2:2] = (val,) # Insert by slice obj[2:4] = (val,) # Replace/delete by slice obj[2:3] = () # Delete by slice (implicit) del obj[0] # Delete by index del obj[2:4]# Delete by slice com::sun::star::container::XNameAccess com::sun::star::container::XNameReplace com::sun::star::container::XNameContainer - Objects provide Python dict access semantics num = len(obj) # Number of keys val = obj[key] # Access by key if key in obj: ... # Test key presence for key in obj: ... # Implicit iterator (keys) itr = iter(obj) # Named iterator (keys) obj[key] = val # Replace by key obj[key] = val # Insert by key del obj[key]# Delete by key com::sun::star::container::XEnumerationAccess - Objects provide Python iterable semantics for val in obj: ... # Implicit iterator itr = iter(obj) # Named iterator com::sun::star::container::XEnumeration - Objects provide Python iterator semantics for val in itr: ... # Iteration of named iterator if val in itr: ... # Test value presence Objects which implement both XIndex* and XName* are supported, and respond to both integer and string keys. However, iterating over such an object will r
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/leaflet.css|3 +++
loleaflet/src/layer/tile/TileLayer.js | 12
2 files changed, 15 insertions(+)
New commits:
commit e901c6fe3460e2fb7a489cb35dda78e484d88df4
Author: Mihai Varga
Date: Fri Jun 26 12:43:57 2015 +0300
Set marker not clickable during mouse selection
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index f161094..3c03665 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -504,6 +504,9 @@
border: 1px solid #999;
}
+.leaflet-not-clickable {
+ pointer-events: none;
+ }
/* div icon */
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 8b58104..15b2d8b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -693,6 +693,12 @@ L.TileLayer = L.GridLayer.extend({
this._postMouseEvent('buttonup', mousePos.x,
mousePos.y, 1);
this._editMode = true;
+ if (this._startMarker._icon) {
+ L.DomUtil.removeClass(this._startMarker._icon,
'leaflet-not-clickable');
+ }
+ if (this._endMarker._icon) {
+ L.DomUtil.removeClass(this._endMarker._icon,
'leaflet-not-clickable');
+ }
}
else if (e.type === 'mousemove' && this._selecting) {
if (this._holdStart) {
@@ -704,6 +710,12 @@ L.TileLayer = L.GridLayer.extend({
}
mousePos = this._latLngToTwips(e.latlng);
this._postMouseEvent('move', mousePos.x, mousePos.y, 1);
+ if (this._startMarker._icon) {
+ L.DomUtil.addClass(this._startMarker._icon,
'leaflet-not-clickable');
+ }
+ if (this._endMarker._icon) {
+ L.DomUtil.addClass(this._endMarker._icon,
'leaflet-not-clickable');
+ }
}
else if (e.type === 'dblclick') {
mousePos = this._latLngToTwips(e.latlng);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/DrawViewShell.hxx |6 ++
sd/source/ui/view/drviews1.cxx | 10 ++
sd/source/ui/view/drviews5.cxx |8 +---
sd/source/ui/view/drviewsa.cxx |3 +++
4 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 1c481fe6522f4c7d883e77a4ac32f855b9bcb323
Author: Katarina Behrens
Date: Thu Jun 25 09:47:37 2015 +0200
tdf#87905: Use darker background colour for master view
for the area behind the slide, that is
Change-Id: Ie020f43a81e5eaa257c20d0a7b6feffce1614205
Reviewed-on: https://gerrit.libreoffice.org/16466
Tested-by: Jenkins
Reviewed-by: Philippe Jung
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index d706392..66a6e86 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -388,6 +388,9 @@ public:
OUString GetSidebarContextName() const;
+const Color& GetAppBackgroundColor() const { return mnAppBackgroundColor; }
+void SetAppBackgroundColor( Color nNewColor ) { mnAppBackgroundColor =
nNewColor; }
+
//move this method to ViewShell.
//void NotifyAccUpdate();
protected:
@@ -519,6 +522,9 @@ private:
::std::unique_ptr< ViewOverlayManager > mpViewOverlayManager;
std::vector> m_ExternalEdits;
+
+// The colour of the area behind the slide (used to be called "Wiese")
+Color mnAppBackgroundColor;
};
} // end of namespace sd
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 109d82c..8b605b0 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -316,6 +316,7 @@ bool DrawViewShell::PrepareClose( bool bUI )
return true;
}
+
/**
* Set status (enabled/disabled) of menu SfxSlots
*/
@@ -377,6 +378,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
GetViewShellBase().GetToolBarManager()->ResetToolBars(ToolBarManager::TBG_COMMON_TASK);
}
+svtools::ColorConfig aColorConfig;
+Color aFillColor = Color( aColorConfig.GetColorValue(
svtools::APPBACKGROUND ).nColor );
+
if (meEditMode == EM_PAGE)
{
/**
@@ -402,6 +406,8 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
maTabControl->SetCurPageId(nActualPageNum + 1);
+SetAppBackgroundColor( aFillColor );
+
SwitchPage(nActualPageNum);
}
else
@@ -438,6 +444,9 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
}
}
+aFillColor.DecreaseLuminance( 64 );
+SetAppBackgroundColor( aFillColor );
+
maTabControl->SetCurPageId(nActualMasterPageNum + 1);
SwitchPage(nActualMasterPageNum);
}
@@ -477,6 +486,7 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool
bIsLayerModeActive)
Invalidate( SID_TITLE_MASTERPAGE );
Invalidate( SID_NOTES_MASTERPAGE );
Invalidate( SID_HANDOUT_MASTERPAGE );
+InvalidateWindows();
SetContextName(GetSidebarContextName());
}
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 1c34b17..f0f9719 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -406,19 +406,13 @@ void DrawViewShell::PrePaint()
*/
void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
{
-// Fill var FillColor here to have it available on later call
-svtools::ColorConfig aColorConfig;
-Color aFillColor;
-
-aFillColor = Color( aColorConfig.GetColorValue( svtools::APPBACKGROUND
).nColor );
-
/* This is done before each text edit, so why not do it before every paint.
The default language is only used if the outliner only
contains one
character in a symbol font */
GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage(
GetDoc()->GetLanguage( EE_CHAR_LANGUAGE ) );
// Set Application Background color for usage in SdrPaintView(s)
-mpDrawView->SetApplicationBackgroundColor(aFillColor);
+mpDrawView->SetApplicationBackgroundColor(GetAppBackgroundColor());
/* This is done before each text edit, so why not do it before every paint.
The default language is only used if the outliner only
contains one
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 6385349..a1b332e 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -209,6 +209,9 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh,
PageKind eInitialPageKind)
mbPastePossible = false;
mbIsLayerModeActive = false;
+svtools::ColorConfig aColorConfig;
+mnAppBackgroundColor = Color( aColorConfig.GetColorValue(
svtools::APPBACKGROUND ).nColor );
+
mpFrameView->Connect
[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - 24 commits - config_host.mk.in dbaccess/source download.lst external/libetonyek icon-themes/breeze include/LibreOfficeKit libreo
Rebased ref, commits from common ancestor:
commit 614485f2778476b45706455ed767114bb2a0f112
Author: Pranav Kant
Date: Wed Jun 24 02:02:39 2015 +0530
lokdocview: Handle DELETE key
Change-Id: I58d0c36decf81c812c108458b449402416ebcc2d
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index ca7167b..62f1e61 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -245,6 +245,9 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
case GDK_KEY_BackSpace:
nKeyCode = com::sun::star::awt::Key::BACKSPACE;
break;
+case GDK_KEY_Delete:
+nKeyCode = com::sun::star::awt::Key::DELETE;
+break;
case GDK_KEY_Return:
nKeyCode = com::sun::star::awt::Key::RETURN;
break;
commit 2f6b0216649c07f98088d13a938179003c661bfb
Author: Pranav Kant
Date: Tue Jun 23 14:37:09 2015 +0530
tilebuffer: Add timer to measure paintTile() call
Change-Id: I2645863c7445e17d77e2c4e2dc24e22f8685034e
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx
b/libreofficekit/source/gtk/tilebuffer.cxx
index 3f22f98..60aa16f 100644
--- a/libreofficekit/source/gtk/tilebuffer.cxx
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
@@ -91,7 +91,7 @@ Tile& TileBuffer::getTile(int x, int y, float aZoom)
aTileRectangle.x = pixelToTwip(nTileSizePixels, aZoom) * y;
aTileRectangle.y = pixelToTwip(nTileSizePixels, aZoom) * x;
-g_info ("Rendering (%d, %d)", x, y);
+g_test_timer_start();
m_pLOKDocument->pClass->paintTile(m_pLOKDocument,
pBuffer,
nTileSizePixels, nTileSizePixels,
@@ -99,6 +99,9 @@ Tile& TileBuffer::getTile(int x, int y, float aZoom)
pixelToTwip(nTileSizePixels, aZoom),
pixelToTwip(nTileSizePixels, aZoom));
+double elapsedTime = g_test_timer_elapsed();
+g_info ("Rendered (%d, %d) in %f seconds", x, y, elapsedTime);
+
//create a mapping for it
m_mTiles[index].setPixbuf(pPixBuf);
m_mTiles[index].valid = true;
commit c31e0efbf65191e3e92e84347ec223ce4aa87c21
Author: Pranav Kant
Date: Tue Jun 23 02:58:38 2015 +0530
lokdocview: Remove superfluous *_post_key()
Instead directly let LOKDocView handle the input.
Change-Id: I260a460df23c3e2e5c78d8b363bb864ae5c63dab
diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 3a1628b..962f9d9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -74,10 +74,6 @@ void lok_doc_view_post_command
(LOKDocView*
const
char* pCommand,
const
char* pArguments);
-/// Posts a keyboard event to LibreOfficeKit.
-void lok_doc_view_post_key
(LOKDocView* pDocView,
-GdkEvent*
pEvent);
-
float lok_doc_view_pixel_to_twip
(LOKDocView* pDocView,
float
fInput);
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index c854288..18815d6 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -191,19 +191,6 @@ static void getVisibleAreaTwips(GdkRectangle* pArea)
#endif
}
-
-/// Handles the key-press-event of the window.
-static gboolean signalKey(GtkWidget* /*pWidget*/, GdkEvent* pEvent, gpointer/*
pData*/)
-{
-LOKDocView* pLOKDocView = LOK_DOC_VIEW(pDocView);
-if (!gtk_widget_get_visible(pFindbar) &&
bool(lok_doc_view_get_edit(pLOKDocView)))
-{
-lok_doc_view_post_key(pLOKDocView, pEvent);
-return TRUE;
-}
-return FALSE;
-}
-
/// Searches for the next or previous text of pFindbarEntry.
static void doSearch(bool bBackwards)
{
@@ -541,10 +528,6 @@ int main( int argc, char* argv[] )
g_signal_connect(pDocView, "part-changed", G_CALLBACK(signalPart), NULL);
g_signal_connect(pDocView, "hyperlink-clicked",
G_CALLBACK(signalHyperlink), NULL);
-// Input handling.
-g_signal_connect(pWindow, "key-press-event", G_CALLBACK(signalKey),
pDocView);
-g_signal_connect(pWindow, "key-release-event", G_CALLBACK(signalKey),
pDocView);
-
// Scrolled window for DocView
pScrolledWindow = gtk_scrolled_window_new(0, 0);
gtk_widget_set_hexpand (pScrolledWindow, TRUE);
@@ -568,6 +551,11 @@ int main( int argc, char* argv[] )
g_signal_connect(G_OBJECT(pPartModeComboBox), "c
[Libreoffice-commits] core.git: unotest/source
unotest/source/python/org/libreoffice/unotest.py |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3b25116986bfe019f0f3ba7146a02e088690ea30 Author: Matthew J. Francis Date: Fri Jun 26 19:05:21 2015 +0800 Python 2.7 compatibility for unotest.py Change-Id: Ic7a54b211f6d55ff50cad0fde12058fe33e8892e diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index ab3cd8a..f0a43b1 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -7,6 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +from __future__ import print_function + import subprocess import time import uuid ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/txtfrm.hxx |2 +-
sw/source/core/text/frmform.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6b88a6501a4de7aeb02da8f5efed28925aafc144
Author: Miklos Vajna
Date: Fri Jun 26 10:59:57 2015 +0200
SwTextFrm::_Format: use vcl::RenderContext
Change-Id: Ia37257286cce7a4a4a6fdffd2dd0d896d46db548
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 0ca7591..1e5737d 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -142,7 +142,7 @@ class SwTextFrm: public SwContentFrm
// In order to safe stack space, we split this method:
// _Format calls _Format with parameters
-void _Format( SwParaPortion *pPara );
+void _Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPara );
void _Format( SwTextFormatter &rLine, SwTextFormatInfo &rInf,
const bool bAdjust = false );
void FormatOnceMore( SwTextFormatter &rLine, SwTextFormatInfo &rInf );
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index c42f059..868580e 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1623,7 +1623,7 @@ void SwTextFrm::FormatOnceMore( SwTextFormatter &rLine,
SwTextFormatInfo &rInf )
}
}
-void SwTextFrm::_Format( SwParaPortion *pPara )
+void SwTextFrm::_Format( vcl::RenderContext* pRenderContext, SwParaPortion
*pPara )
{
const bool bIsEmpty = GetText().isEmpty();
@@ -1650,7 +1650,7 @@ void SwTextFrm::_Format( SwParaPortion *pPara )
if ( IsVertical() )
SwapWidthAndHeight();
-SwTextFormatInfo aInf( getRootFrm()->GetCurrShell()->GetOut(), this );
+SwTextFormatInfo aInf( pRenderContext, this );
SwTextFormatter aLine( this, &aInf );
HideAndShowObjects();
@@ -1802,7 +1802,7 @@ void SwTextFrm::Format( const SwBorderAttrs * )
}
do
{
-_Format( aAccess.GetPara() );
+_Format( getRootFrm()->GetCurrShell()->GetOut(),
aAccess.GetPara() );
if( pFootnoteBoss && nFootnoteHeight )
{
const SwFootnoteContFrm* pCont =
pFootnoteBoss->FindFootnoteCont();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - solenv/gbuild
solenv/gbuild/ExternalProject.mk | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 975a62b4caa5fa1308ef300c549d45f5ffd4c455 Author: David Tardon Date: Wed Jun 24 15:08:16 2015 +0200 restore gb_ExternalProject_use_unpacked, with diff. purpose Change-Id: I7d7cbe85219615f80069155a954f917781bc5b71 (cherry picked from commit 3f040ce5ef691c1f93eb788eb67f3de8d772f07a) Reviewed-on: https://gerrit.libreoffice.org/16503 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 59fc678..92bb7df 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -86,9 +86,15 @@ $(call gb_Helper_make_userfriendly_targets,$(1),ExternalProject) endef -# replaced by second parameter to ctor +# Depend on an unpacked tarball +# +# This is needed to express dependencies on header-only projects, which +# do not have any ExternalProject. +# +# gb_ExternalProject_use_unpacked project unpacked define gb_ExternalProject_use_unpacked -$(call gb_Output_error,gb_ExternalProject_use_unpacked was removed) +$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(2)) + endef # Register a target in state directory ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c7e8938e4458eff85e1b6710a537e950fc32cb2 Author: David Tardon Date: Wed Jun 24 15:08:48 2015 +0200 mdds is header-only Change-Id: I27e5ae913474001154fa6352a3ccefaee16e309c (cherry picked from commit 7fffbdc4c21f2c21d062a2f224b42e4b87beb6f0) Reviewed-on: https://gerrit.libreoffice.org/16504 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 47e4d17..1d7b09c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -132,7 +132,7 @@ endef else # !SYSTEM_MDDS define gb_ExternalProject__use_mdds_headers -$(call gb_ExternalProject_use_external_project,$(1),mdds) +$(call gb_ExternalProject_use_unpacked,$(1),mdds) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/marker/Cursor.js |1 +
loleaflet/src/layer/tile/TileLayer.js |3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bee60c69e89de101f916acea01e5797380c49a81
Author: Mihai Varga
Date: Fri Jun 26 14:34:18 2015 +0300
Move the cursor to the left by half its size
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index 9c5b4f8..648f543 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -86,6 +86,7 @@ L.Cursor = L.Layer.extend({
setSize: function (size) {
this._container.style.lineHeight = size.y + 'px';
this._span.style.fontSize = size.y - 2 + 'px';
+ this._container.style.left = '-' +
this._container.clientWidth/2 + 'px';
}
});
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 15b2d8b..d46617d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -797,8 +797,7 @@ L.TileLayer = L.GridLayer.extend({
var pixBounds =
L.bounds(this._map.latLngToLayerPoint(this._visibleCursor.getSouthWest()),
this._map.latLngToLayerPoint(this._visibleCursor.getNorthEast()));
- var latBounds =
L.rectangle(this._visibleCursor).getLatLngs();
- this._cursorMarker = L.cursor(latBounds[2], {color:
'red'});
+ this._cursorMarker =
L.cursor(this._visibleCursor.getNorthWest());
this._map._bDisableKeyboard = true;
this._map.addLayer(this._cursorMarker);
this._cursorMarker.setSize(pixBounds.getSize());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - config_host.mk.in
config_host.mk.in |1 + 1 file changed, 1 insertion(+) New commits: commit ba6feca9d5f268d9639f2d2916959104763b6e68 Author: David Tardon Date: Wed Jun 24 15:15:22 2015 +0200 allow to skip check for mdds in bundled projects PKG_CHECK_MODULES requires both _CFLAGS and _LIBS to be set to skip the check. Change-Id: Ia4ae0576f186eb0c002c40bdb66f3a11a972a0c3 (cherry picked from commit 969255f05bdffe5b92804a003cd0c8f1bfda5a1a) Reviewed-on: https://gerrit.libreoffice.org/16505 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/config_host.mk.in b/config_host.mk.in index e0e01e3..5e5851e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -389,6 +389,7 @@ export LIBMARIADB_PATH=@LIBMARIADB_PATH@ export BUNDLE_MARIADB=@BUNDLE_MARIADB@ export MD5SUM=@MD5SUM@ export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@ +export MDDS_LIBS=$(gb_SPACE)@MDDS_LIBS@ export MERGELIBS=@MERGELIBS@ export MINGWCXX=@MINGWCXX@ export MINGWSTRIP=@MINGWSTRIP@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst
download.lst |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit b50c60e9c70a3b2a7548fa75ccb927b21c95819b Author: David Tardon Date: Fri Jun 19 09:37:15 2015 +0200 upload mdds 0.12.1 Change-Id: Ie6516be4ced938b5c969a12a4974b0feee27177f (cherry picked from commit 40e64af9e242206b9e0d01a6c8d7020fc0815520) Reviewed-on: https://gerrit.libreoffice.org/16507 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/download.lst b/download.lst index b069609..78b12c2 100644 --- a/download.lst +++ b/download.lst @@ -100,7 +100,8 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz -export MDDS_TARBALL := 17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2 +export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe +export MDDS_TARBALL := mdds_0.12.1.tar.bz2 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 export MWAW_MD5SUM := bdc58bbf89aaaf6d29b3516d96830a06 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/coinmp external/libetonyek external/libmwaw external/libodfgen external/libwpd external/libwpg external/libwps external/libxslt exte
external/coinmp/ExternalProject_coinmp.mk |3 + external/coinmp/UnpackedTarball_coinmp.mk |3 + external/coinmp/rpath.patch | 50 ++ external/libetonyek/ExternalProject_libetonyek.mk |3 + external/libetonyek/UnpackedTarball_libetonyek.mk |1 external/libetonyek/rpath.patch | 10 external/libmwaw/ExternalProject_libmwaw.mk |3 + external/libmwaw/UnpackedTarball_libmwaw.mk |8 +++ external/libmwaw/rpath.patch | 10 external/libodfgen/ExternalProject_libodfgen.mk |3 + external/libodfgen/UnpackedTarball_libodfgen.mk |6 ++ external/libodfgen/rpath.patch| 10 external/libwpd/ExternalProject_libwpd.mk |3 + external/libwpd/UnpackedTarball_libwpd.mk |3 + external/libwpd/rpath.patch | 10 external/libwpg/ExternalProject_libwpg.mk |3 + external/libwpg/UnpackedTarball_libwpg.mk |6 ++ external/libwpg/rpath.patch | 10 external/libwps/ExternalProject_libwps.mk |5 +- external/libwps/UnpackedTarball_libwps.mk |1 external/libwps/rpath.patch.0 | 10 external/libxslt/UnpackedTarball_xslt.mk |1 external/libxslt/rpath.patch.0| 10 external/redland/UnpackedTarball_raptor.mk|1 external/redland/UnpackedTarball_rasqal.mk|3 + external/redland/UnpackedTarball_redland.mk |3 + external/redland/raptor/rpath.patch | 21 + external/redland/rasqal/rpath.patch | 21 + external/redland/redland/rpath.patch | 10 29 files changed, 229 insertions(+), 2 deletions(-) New commits: commit 25630d6bba6cb8a9656f517c3343eab179bb9370 Author: Stephan Bergmann Date: Fri Jun 12 14:38:02 2015 +0200 Fix Linux RPATH of various external modules ...as discussed in 371cc81bd9ccbfbed25f810e70899c044280349e "external/liborcus: Fix Linux RPATH:" * When an external module produces multiple libraries (that we all install) that depend on each other, they need to contain $ORIGIN in RPATH (strictly speaking, those that do not depend on any other libraries from the module would not need that, but it is harmless and easier to do that way). * When an external module's libraries depend on other external modules' libraries, and (at least some of) those other external modules are not configuread as --with-system-*, they need to contain $ORIGIN in RPATH (again, for simplicity, some libraries may get that even if they would not strictly need it). * Try to outsmart the external modules' libtool instances to not add (ultimately bogus) paths to RPATH for dependencies on libraries from external modules (either from the same module, or from anohter module not configured as --with-system-*). The only time we do not outsmart libtool, and instead rely on it (hopefully?) doing the right thing is when a given external modules' libraries depend on libraries from excatly one other external module, and the latter is configured as --with-system-*. * That outsmarting means that if an external library depends both on external libraries provided by modules not configured as --with-system-* (so RPATH contains $ORIGIN, and the outsmarting is not suppressed) and on external libraries provided by modules configured as --with-system-*: Then if the latter are in unusual locations on the system that would require an RPATH entry (which might be provided via the corresponding "pkg-config --libs", say, and presumably would be honoured by libtool if we did not outsmart it), then those paths are now erroneously missing from RPATH. * That outsmarting also causes linking of some utility applications in module redland to fail, but those are ultimately unused, so cut them off by patching their respective sub-directory Makefile.in. (cherry picked from commit 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1) Change-Id: Iec05b3568fbcf04987018322c328b769ae4f5dab Reviewed-on: https://gerrit.libreoffice.org/16506 Tested-by: Jenkins Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index 8405248..d8bfaac 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -31,6 +31,9 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : $(if $(DISABLE_DYNLOADING),--disable-shared) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/notxtfrm.cxx|4 ++--
sw/source/core/inc/bodyfrm.hxx |2 +-
sw/source/core/inc/cellfrm.hxx |2 +-
sw/source/core/inc/flyfrm.hxx |2 +-
sw/source/core/inc/flyfrms.hxx |2 +-
sw/source/core/inc/frame.hxx |2 +-
sw/source/core/inc/ftnfrm.hxx |2 +-
sw/source/core/inc/hffrm.hxx |2 +-
sw/source/core/inc/layfrm.hxx |2 +-
sw/source/core/inc/notxtfrm.hxx|2 +-
sw/source/core/inc/rowfrm.hxx |2 +-
sw/source/core/inc/sectfrm.hxx |2 +-
sw/source/core/inc/tabfrm.hxx |2 +-
sw/source/core/inc/txtfrm.hxx |2 +-
sw/source/core/layout/calcmove.cxx | 12 ++--
sw/source/core/layout/fly.cxx |2 +-
sw/source/core/layout/flyincnt.cxx |7 ---
sw/source/core/layout/flylay.cxx |2 +-
sw/source/core/layout/ftnfrm.cxx |2 +-
sw/source/core/layout/hffrm.cxx|4 ++--
sw/source/core/layout/pagechg.cxx |2 +-
sw/source/core/layout/sectfrm.cxx |4 ++--
sw/source/core/layout/tabfrm.cxx | 10 +-
sw/source/core/layout/unusedf.cxx |2 +-
sw/source/core/layout/wsfrm.cxx|2 +-
sw/source/core/text/frmform.cxx|4 ++--
sw/source/core/text/inftxt.cxx |2 +-
sw/source/core/text/txtfrm.cxx |2 +-
28 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit 05e50b570f602c17218bb6e82bcaac2fbdd943c1
Author: Miklos Vajna
Date: Fri Jun 26 11:46:05 2015 +0200
SwTextFrm::Format: use vcl::RenderContext
Change-Id: I468d662a612c951dc1482cfc685dee800bb11f82
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 14e7d3e..d040d35 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -480,13 +480,13 @@ void SwNoTextFrm::MakeAll()
if ( !mbValidSize )
{ mbValidSize = true;
-Format();
+Format(getRootFrm()->GetCurrShell()->GetOut());
}
}
}
/** Calculate the Bitmap's site, if needed */
-void SwNoTextFrm::Format( const SwBorderAttrs * )
+void SwNoTextFrm::Format( vcl::RenderContext* /*pRenderContext*/, const
SwBorderAttrs * )
{
const Size aNewSize( GetSize() );
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 5e3e0be..375dec9 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -27,7 +27,7 @@ class SwBorderAttrs;
class SwBodyFrm: public SwLayoutFrm
{
protected:
-virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+virtual void Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
public:
SwBodyFrm( SwFrameFormat*, SwFrm* );
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index efd3796..040cc03 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -36,7 +36,7 @@ class SwCellFrm: public SwLayoutFrm
virtual ~SwCellFrm();
protected:
-virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+virtual void Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 59f33db..be422b4 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -121,7 +121,7 @@ protected:
Point m_aContentPos;// content area's position relatively to Frm
bool m_bValidContentPos;
-virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+virtual void Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void MakePrtArea( const SwBorderAttrs &rAttrs );
void MakeContentPos( const SwBorderAttrs &rAttrs );
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 73dda04..4608577 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -195,7 +195,7 @@ public:
SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
-virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+virtual void Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void SetRefPoint( const Point& rPoint, const Point &rRelAttr,
const Point &rRelPos );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 2072d40..9c9f76a 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -573,7 +573,7 @@ public:
// environment (not e.g. for repeating table headlines)
bool IsFootnoteAllowed() const;
-virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+virtual void Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttrs = 0 );
virtual void CheckDirection( bool bVer
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst external/libetonyek
download.lst |4
external/libetonyek/0001-add-missing-breaks.patch.1 | 36
external/libetonyek/0001-add-missing-include.patch.1 | 25
external/libetonyek/0001-missing-include.patch.1 | 25
external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 | 45
external/libetonyek/0002-remove-surplus-breaks.patch.1 | 38
external/libetonyek/ExternalProject_libetonyek.mk|3
external/libetonyek/Library_etonyek.mk | 30
external/libetonyek/UnpackedTarball_libetonyek.mk|5
external/libetonyek/assert.patch | 11
external/libetonyek/generated/IWORKToken.inc | 721 ---
external/libetonyek/generated/KEY1Token.inc | 540
external/libetonyek/generated/KEY2Token.inc | 216 ---
external/libetonyek/generated/NUM1Token.inc | 147 --
external/libetonyek/generated/NUMToken.inc | 146 --
external/libetonyek/generated/PAG1Token.inc | 158 --
external/libetonyek/generated/PAGToken.inc | 158 --
external/libetonyek/ubsan.patch | 20
18 files changed, 114 insertions(+), 2214 deletions(-)
New commits:
commit 60e38140db23ce714b172f8e60d71da4e4c495e5
Author: David Tardon
Date: Tue Jun 2 17:49:48 2015 +0200
upload libetonyek 0.1.3
(cherry picked from commit ee3d40b30816a8fc6d4e8f984659c8dfac19ec3b)
Change-Id: I451f02ee93a798c9c1712082d59a7ff96b0d4a4e
Reviewed-on: https://gerrit.libreoffice.org/16508
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/download.lst b/download.lst
index 78b12c2..0896f3e 100644
--- a/download.lst
+++ b/download.lst
@@ -34,8 +34,8 @@ export DBGHELP_DLL :=
13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export ETONYEK_MD5SUM := 1704a75df7621d8073b921f8b6506951
-export ETONYEK_VERSION_MICRO := 2
+export ETONYEK_MD5SUM := e5947373dd7834f27e93f1636faa419f
+export ETONYEK_VERSION_MICRO := 3
export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
export FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5
diff --git a/external/libetonyek/0001-add-missing-breaks.patch.1
b/external/libetonyek/0001-add-missing-breaks.patch.1
deleted file mode 100644
index 7e11682..000
--- a/external/libetonyek/0001-add-missing-breaks.patch.1
+++ /dev/null
@@ -1,36 +0,0 @@
-From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Tue, 26 May 2015 16:56:56 +0200
-Subject: [PATCH 1/2] add missing breaks
-
-Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d
- src/lib/KEY2Parser.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
-index bb58efd..4ba70d2 100644
a/src/lib/KEY2Parser.cpp
-+++ b/src/lib/KEY2Parser.cpp
-@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char
*const value)
- {
- case IWORKToken::NS_URI_SFA | IWORKToken::x :
- m_point.first = lexical_cast(value);
-+break;
- case IWORKToken::NS_URI_SFA | IWORKToken::y :
- m_point.second = lexical_cast(value);
-+break;
- }
- }
-
-@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const
char *const value)
- ETONYEK_DEBUG_MSG(("unknown point path type: %s\n", value));
- break;
- }
-+break;
- }
- default :
- KEY2XMLElementContextBase::attribute(name, value);
---
-2.4.1
-
diff --git a/external/libetonyek/0001-add-missing-include.patch.1
b/external/libetonyek/0001-add-missing-include.patch.1
new file mode 100644
index 000..9c80674
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-include.patch.1
@@ -0,0 +1,25 @@
+From 00f7e36ce2a3996ebef672561014ab101eee7f3a Mon Sep 17 00:00:00 2001
+From: David Tardon
+Date: Thu, 25 Jun 2015 12:00:49 +0200
+Subject: [PATCH] add missing include
+
+Change-Id: I8bfcacb064b3d0f9d7d5db9d2f32108b0ceea792
+---
+ src/lib/IWORKTypes_fwd.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/IWORKTypes_fwd.h b/src/lib/IWORKTypes_fwd.h
+index f7a4fb2..1096df8 100644
+--- a/src/lib/IWORKTypes_fwd.h
b/src/lib/IWORKTypes_fwd.h
+@@ -9,6 +9,7 @@
+ #ifndef IWORKTYPES_FWD_H_INCLUDED
+ #define IWORKTYPES_FWD_H_INCLUDED
+
++#include
+ #include
+
+ #include
+--
+2.4.2
+
diff --git a/external/libetonyek/0001-missing-include.patch.1
b/external/libetonyek/0001-missing-include.patch.1
deleted file mode 100644
index f3e4e24..000
--- a/external/libetonyek/0001-missing-include.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3663b7b44646e1ed1218598aeb0b
[Libreoffice-commits] core.git: 35 commits - compilerplugins/clang connectivity/source cppu/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source framework/so
compilerplugins/clang/stringconstant.cxx | 12 ++- connectivity/source/drivers/mork/mork_helper.cxx |2 cppu/source/uno/lbenv.cxx|5 - cui/source/dialogs/hldocntp.cxx |2 cui/source/options/optgenrl.cxx |2 cui/source/options/optjava.cxx |2 cui/source/options/optpath.cxx | 44 +--- cui/source/options/webconninfo.cxx | 13 +-- dbaccess/source/ui/querydesign/QTableWindow.cxx |3 dbaccess/source/ui/querydesign/QueryDesignView.cxx |8 +- dbaccess/source/ui/querydesign/QueryTableView.cxx|2 desktop/source/migration/services/basicmigration.cxx |4 - editeng/source/editeng/editeng.cxx |2 editeng/source/editeng/impedit3.cxx |2 extensions/source/abpilot/fieldmappingimpl.cxx |5 - filter/source/svg/svgexport.cxx |7 - framework/source/accelerators/storageholder.cxx | 26 ++- framework/source/fwe/xml/statusbardocumenthandler.cxx|3 framework/source/fwe/xml/toolboxdocumenthandler.cxx |3 helpcompiler/inc/HelpCompiler.hxx|3 idl/source/prj/command.cxx |4 - include/rtl/stringconcat.hxx |5 - include/rtl/ustring.h| 24 ++ include/rtl/ustring.hxx | 18 + javaunohelper/source/javaunohelper.cxx |2 linguistic/source/lngsvcmgr.cxx | 54 +++ package/source/zippackage/zipfileaccess.cxx |6 - pyuno/source/module/pyuno_runtime.cxx|4 - sal/qa/osl/file/osl_File.cxx | 16 ++-- sal/qa/osl/process/osl_process.cxx |6 - sal/qa/rtl/process/rtl_Process.cxx | 10 -- sal/qa/rtl/strings/test_oustring_concat.cxx |8 ++ sal/rtl/bootstrap.cxx|2 sal/rtl/ustring.cxx | 24 ++ sal/util/sal.map |1 sc/qa/extras/macros-test.cxx |2 sc/source/core/data/global2.cxx |5 - sc/source/core/tool/addincol.cxx | 30 +++- sc/source/core/tool/rangeutl.cxx |6 - sc/source/core/tool/unitconv.cxx |9 -- sc/source/filter/excel/xicontent.cxx |4 - sc/source/filter/excel/xihelper.cxx |2 sc/source/ui/docshell/impex.cxx |3 sc/source/ui/optdlg/tpusrlst.cxx |4 - sc/source/ui/vba/vbapane.cxx | 16 ++-- sc/source/ui/vba/vbarange.cxx|2 sc/source/ui/view/prevwsh.cxx|6 - sd/source/core/drawdoc3.cxx |3 sd/source/ui/animations/CustomAnimationPane.cxx |3 sd/source/ui/annotations/annotationtag.cxx |6 - sd/source/ui/dlg/tpaction.cxx|3 sd/source/ui/func/fuprobjs.cxx |5 - sfx2/source/dialog/dialoghelper.cxx |6 - sfx2/source/notify/eventsupplier.cxx |7 - shell/source/backends/macbe/macbackend.mm|2 svgio/source/svgreader/svgcharacternode.cxx |2 svtools/source/misc/transfer.cxx | 41 +++ svtools/source/urlobj/inetimg.cxx| 16 ++-- svx/source/customshapes/EnhancedCustomShape2d.cxx| 18 ++--- svx/source/svdraw/svdotxat.cxx |3 svx/source/xml/xmlxtexp.cxx |2 sw/qa/core/uwriter.cxx |2 sw/source/core/edit/autofmt.cxx |8 +- sw/source/core/fields/cellfml.cxx|4 - sw/source/core/fields/macrofld.cxx |2 sw/source/core/unocore/unoidx.cxx|2 sw/source/filter/ww8/ww8par5.cxx |2 sw/source/ui/index/cnttab.cxx|2 sw/source/uibase/dbui/dbmgr.cxx |4 - sw/source/uibase/envelp/envimg.cxx |2 sw/source/uibase/shells/textsh.cxx |5 - sw/source/uibase/utlui/content.cxx |6 - sw/source/uibase/utlui/gloslst.cxx |8 +- ucbhelper/source/provider/providerhelper.cxx
Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering
On Mon, Jun 15, 2015 at 02:32:23PM +0200, Miklos Vajna wrote: > On Wed, Jun 03, 2015 at 02:54:45PM +0200, Lionel Elie Mamane > wrote: >>> What are those autogen.input options? Can you follow the instructions of >>> the failed test and get a backtrace? >> Both are attached. To me the backtrace looks unrelated to "tile >> rendering", but then this is the only failing thing in a >> make check -k > I only have an implicit --without-system-libs dbgutil build from > libreoffice-5-0, and there I don't see this problem. It would be > interesting to know if the failure is indeed conditional on > --with-system-libs or it's something else. > An other approach is to see if the branch point was good for you, if so, > then bisect what commit broke the test with your build options. After further testing... I have two directories (checkouts): libreoffice-5-0 containing my working branch based on libreoffice-5-0 libreoffice-5-1 containing my working branch based on master The test fails in directory libreoffice-5-0 but succeeds in directory libreoffice-5-1. Now, what happens is that if I do: cd libreoffice-5-0 checkout master make CppunitTest_libreofficekit_tiledrendering The test still fails. So the failure seems to be related to something else than code... Maybe the contents of "instdir/user"? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno_runtime.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7f9a65862b37ee1fa596916ceb7c243e04612499
Author: Stephan Bergmann
Date: Fri Jun 26 14:03:46 2015 +0200
loplugin:loopvartoosmall
Change-Id: I19d801444e4d1db5576b5742c60fc138384d3b70
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 1aba10a..e92ad56 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -766,7 +766,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum
ConversionMode mode ) con
{
Py_ssize_t l = PyList_Size (o);
Sequence s (l);
-for (int i = 0; i < l; i++)
+for (Py_ssize_t i = 0; i < l; i++)
{
s[i] = pyObject2Any (PyList_GetItem (o, i), mode );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno_iterator.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e29a7ff18771eea77b385efc517baa6204df37f9 Author: Stephan Bergmann Date: Fri Jun 26 14:04:43 2015 +0200 loplugin:salbool Change-Id: I9975a87f6df2b7a79c376130864e9eb54bc3452b diff --git a/pyuno/source/module/pyuno_iterator.cxx b/pyuno/source/module/pyuno_iterator.cxx index f9dd8d0..9fa7971 100644 --- a/pyuno/source/module/pyuno_iterator.cxx +++ b/pyuno/source/module/pyuno_iterator.cxx @@ -63,7 +63,7 @@ PyObject* PyUNO_iterator_next( PyObject *self ) PyUNO_iterator* me = reinterpret_cast(self); Runtime runtime; -sal_Bool hasMoreElements = sal_False; +bool hasMoreElements = false; Any aRet; try ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c44021f754148dda502c700716c54efd1c6e7cf9
Author: Stephan Bergmann
Date: Fri Jun 26 14:05:44 2015 +0200
loplugin:salbool
Change-Id: I4875b12807aed36f758d81c731e2ac52a3a606e4
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index ce9983e..c4f82d3 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1346,8 +1346,8 @@ int PyUNO_contains( PyObject *self, PyObject *pKey )
xNameAccess.set( me->members->wrappedObject, UNO_QUERY );
if ( xNameAccess.is() )
{
-sal_Bool hasKey = xNameAccess->hasByName( sKey );
-return hasKey == sal_True ? 1 : 0;
+bool hasKey = xNameAccess->hasByName( sKey );
+return hasKey ? 1 : 0;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2a807ca13748af3ef82f4720c497a511b30a3ec7
Author: Stephan Bergmann
Date: Fri Jun 26 14:06:45 2015 +0200
loplugin:passstuffbyref
Change-Id: I66410932347b4f65c4b24b5316009ecffc8aef06
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index c4f82d3..8c6fc5f 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -358,7 +358,7 @@ int lcl_PySlice_GetIndicesEx( PyObject *pObject, sal_Int32
nLen, sal_Int32 *nSta
return 0;
}
-bool lcl_hasInterfaceByName( Any &object, OUString interfaceName )
+bool lcl_hasInterfaceByName( Any const &object, OUString const & interfaceName
)
{
Reference< XInterface > xInterface( object, UNO_QUERY );
TypeDescription typeDesc( interfaceName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8811c41abcbcb39ff79f570dfa094587e8cb95f2
Author: Stephan Bergmann
Date: Fri Jun 26 14:07:54 2015 +0200
loplugin:cstylecast
Change-Id: I5f0bceb240a492c7c010b4356bc8efafdd83bf24
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 8c6fc5f..413cab0 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -338,7 +338,7 @@ int lcl_PySlice_GetIndicesEx( PyObject *pObject, sal_Int32
nLen, sal_Int32 *nSta
{
Py_ssize_t nStart_ssize, nStop_ssize, nStep_ssize, nSliceLength_ssize;
-int nResult = PySlice_GetIndicesEx( (PySliceObject_t*)pObject, nLen,
&nStart_ssize, &nStop_ssize, &nStep_ssize, &nSliceLength_ssize );
+int nResult = PySlice_GetIndicesEx(
static_cast(pObject), nLen, &nStart_ssize, &nStop_ssize,
&nStep_ssize, &nSliceLength_ssize );
if (nResult == -1)
return -1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/module/pyuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ce75e5b931373368b35dc9a150250c014454d82a
Author: Stephan Bergmann
Date: Fri Jun 26 14:10:03 2015 +0200
loplugin:implicitboolconversion
Change-Id: If495a415d4263d1932c03a31d07a517218533847
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 413cab0..8f7a6a6 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -558,7 +558,7 @@ int PyUNO_bool( PyObject* self )
{
int nLen = lcl_detach_getLength( me );
if (nLen >= 0)
-return !!nLen;
+return nLen == 0 ? 0 : 1;
// Anything which doesn't have members is a scalar object and
therefore true
return 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/3928a1514c9202a52d698570022c197ecc8703eb/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/expat
external/expat/UnpackedTarball_expat.mk |2 +- external/expat/expat-2.1.0.patch| 13 - 2 files changed, 1 insertion(+), 14 deletions(-) New commits: commit 6d0a9ccffe57d0438f46ccd0f4e63c06a9e1c9eb Author: Michael Stahl Date: Fri Jun 26 14:20:02 2015 +0200 expat: remove duplicate patch Change-Id: Ie813234b78b9f8d2c61c9640546317d754f66004 diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 1ea97b5..60e933d 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat)) $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,expat,\ - external/expat/expat-2.1.0.patch \ + external/expat/expat-winapi.patch \ )) # This is a bit hackish. diff --git a/external/expat/expat-2.1.0.patch b/external/expat/expat-2.1.0.patch deleted file mode 100644 index 070dafc..000 --- a/external/expat/expat-2.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.37500 + -+++ misc/build/expat-2.1.0/lib/expat_external.h2009-11-16 08:53:34.703125000 + -@@ -7,10 +7,6 @@ - - /* External API definitions */ - --#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) --#define XML_USE_MSC_EXTENSIONS 1 --#endif -- - /* Expat tries very hard to make the API boundary very specifically -defined. There are two macros defined to control this boundary; -each of these can be defined before including this header to ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2015-06-24
* Present: Andreas, Heiko, Jay, Kendy, Marek, Mattias * Completed Action Items: + https://bugs.documentfoundation.org/show_bug.cgi?id=90790 - fixed (Kendy) * UI changes integrated the last week: + New Sifr icons (Matthias) + Additional tweaks to the standard, draw and text toolbars (Jay) + Breeze icon tweaks and new icons (Andreas) + New Galaxy icons (Andreas) + Fix cropped buttons in the start center (Kendy) + Fix missing Breeze icons in the icons*.zip (Kendy) + .ui files improvements (Adolfo) + lint-ui.py improvements (Rosemary) + Equalize width and height for impress/draw (Caolán) + http://caolanm.blogspot.com/2015/06/equalize-widthheight.html * LibreOffice Conference + September 23-25, 2015, Aarhus, Denmark + http://conference.libreoffice.org/2015/call-for-papers/ + would be great to have you all there :-) - please submit a paper! * Icon Updates / Issues (Jay) + LibreLogo icons are not theme-able (Jay) + it's an integrated extension, not theme-able from principle :-( (Kendy) https://bugs.documentfoundation.org/show_bug.cgi?id=92287 + would need change in how the extensions can get the icons (Kendy) + Tango (Alex/Adolfo/Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing + Sifr (Papamatti/Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing + Papamatti has pushed new icons (Jay) + Breeze (Andreas/Jay) + Latest status of updates available here (Jay) https://docs.google.com/document/d/1dpMFgmkQy4BsyRIKH97ZLPTU6NdvXIYk3Yossj6sSQM/edit?usp=sharing + Andreas has pushed some changes (Jay) + Breeze Dark (Andreas) + still in Kendy's action items... :-) (Jay) + Extra-Large (32x32) Icons for large resolutions + Status - https://docs.google.com/document/d/1mPqD2gGsMkfVCI6ByUd2XYX1NJm26hcGjRVe6gcCSEU/edit?usp=sharing * Templates Competition (Jay) + Wiki page setup https://wiki.documentfoundation.org/Design/Whiteboards/Templates_for_LibreOffice_5.0 + templates competion out, announced last Thursday + not much submissions yet + will do something by himself in the meantime (Jay) + some dark theme + other basic ones (Jay) * LibreOffice 5.0 splash + start center + about box new theme (Kendy) + vote is ongoing in the Visual Identity group + results will be tomorrow, then finalized for the next RC + implementation of the new colors for the start center ongoing (Kendy) + https://bugs.documentfoundation.org/show_bug.cgi?id=90452#c45 * UI Guidelines (Heiko) + https://docs.google.com/document/d/1hSYOFoG6jnj2G0zWDbUYkrGZoj7YCSI9j3onkTZ65bU/edit + context menus discussed, happy with the results + sidebar will be next + context menu now in the wiki + next steps: sidebar, dialogs * Next Friday's design session (Jay) + Friday session this week + sidebar is next + 1:00pm CEST / 11:00 UTC + List of possible future topics + https://docs.google.com/document/d/1XiJauFHrSmM5LsaV0AlglhfUh8D1IxAg8qistP0KAQA/edit?usp=sharing + Steve wants the sidebar "configuration menu" icon gone: "it's useless confusing, thus user unfriendly, creates frustration and clutters the UI." https://bugs.documentfoundation.org/show_bug.cgi?id=91824 * Calc default styles + https://bugs.documentfoundation.org/show_bug.cgi?id=90937 + https://docs.google.com/spreadsheets/d/1Bt2Gr0JslOLL86xb-bCl76mji5AhHT_8VI-5Wp5Qyq0/edit?usp=sharing + agreed the new default: H217:H238 in the spreadsheet + cleaned version: https://bugs.documentfoundation.org/show_bug.cgi?id=90937#c5 + Moggi busy now, for now will add him to the CC: of the bug + code for the hard-coded styles is here: + http://cgit.freedesktop.org/libreoffice/core/tree/sc/source/core/data/stlpool.cxx#n275 * Improving the Use of Styles in Writer (Jay) + https://docs.google.com/document/d/1onHj7GLNs-x9jMJBRsYaRLv_xsN3UJhP13P690L6ci8/edit?usp=sharing + many have contributed already, add your thoughts too (Jay) + main idea: encourage more people to use styles (Jay) + currently too hard to use, make it easier (Jay) + lots of missing visual clues missing for the paragraph vs. character style, and then it looks like Clear Direct Formatting does not work, etc. (Jay) + needs to be improved so that the styles are more used by more people (Jay) + everybody welcome to contribute! (Jay) * Formula bar function wizard button should open the functions pane of sidebar (Jay) + https://bugs.documentfoundation.org/show_bug.cgi?id=92219 +
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |1 +
vcl/unx/gtk/a11y/atkbridge.cxx |5 +++--
vcl/unx/gtk/a11y/atkfactory.cxx|5 +
vcl/unx/gtk/a11y/atkutil.cxx | 12 ++--
vcl/unx/gtk/a11y/atkutil.hxx |1 +
vcl/unx/gtk/window/gtksalframe.cxx | 15 +++
6 files changed, 35 insertions(+), 4 deletions(-)
New commits:
commit aff0d4b29681ee8008ff438885c8cc2b461f4dd5
Author: Caolán McNamara
Date: Fri Jun 26 13:50:28 2015 +0100
Related: tdf#92293 gtk3 a11y: I suspect that all of this is redundant
in favor of hooking in via get_accessible
Change-Id: I8c265e0d9a5f8bdf02b7ba4be71fc58194cf5aa4
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index 4bfe5b2..42cd704 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -26,6 +26,9 @@
bool InitAtkBridge()
{
+#if GTK_CHECK_VERSION(3,0,0)
+ooo_atk_util_ensure_event_listener();
+#else
const char* pVersion = atk_get_toolkit_version();
if( ! pVersion )
return false;
@@ -55,13 +58,15 @@ bool InitAtkBridge()
AtkRegistry * registry = atk_get_default_registry();
if( registry )
atk_registry_set_factory_type( registry, OOO_TYPE_FIXED,
OOO_TYPE_WRAPPER_FACTORY );
-
+#endif
return true;
}
void DeInitAtkBridge()
{
+#if !GTK_CHECK_VERSION(3,0,0)
restore_gail_window_vtable();
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index cc2fe84..2ad3124 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -714,12 +714,20 @@ ooo_atk_util_class_init (AtkUtilClass *)
atk_class->get_toolkit_name = ooo_atk_util_get_toolkit_name;
atk_class->get_toolkit_version = ooo_atk_util_get_toolkit_version;
-Application::AddEventListener( g_aEventListenerLink );
+ooo_atk_util_ensure_event_listener();
}
} // extern "C"
-/*/
+void ooo_atk_util_ensure_event_listener()
+{
+static bool bInited;
+if (!bInited)
+{
+Application::AddEventListener( g_aEventListenerLink );
+bInited = true;
+}
+}
GType
ooo_atk_util_get_type()
diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx
index 89cb61a..9524188 100644
--- a/vcl/unx/gtk/a11y/atkutil.hxx
+++ b/vcl/unx/gtk/a11y/atkutil.hxx
@@ -25,6 +25,7 @@
#define OOO_TYPE_ATK_UTIL ooo_atk_util_get_type()
GType ooo_atk_util_get_type();
+void ooo_atk_util_ensure_event_listener();
#endif
commit 093d7b8142d0cb224fcf23506f3b36f7a3a10d2c
Author: Caolán McNamara
Date: Fri Jun 26 13:24:19 2015 +0100
Resolves: tdf#92293 gtk3: get a11y working
Change-Id: I89cfde9b4c97852d36817b716ac08bd32096915b
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index f759bf6..5086d14 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -471,6 +471,7 @@ public:
extern "C" {
GType ooo_fixed_get_type();
+AtkObject* ooo_fixed_get_accessible(GtkWidget *obj);
} // extern "C"
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index 9f14e08..4bfe5b2 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -26,7 +26,6 @@
bool InitAtkBridge()
{
-#if !GTK_CHECK_VERSION(3,0,0)
const char* pVersion = atk_get_toolkit_version();
if( ! pVersion )
return false;
@@ -56,16 +55,13 @@ bool InitAtkBridge()
AtkRegistry * registry = atk_get_default_registry();
if( registry )
atk_registry_set_factory_type( registry, OOO_TYPE_FIXED,
OOO_TYPE_WRAPPER_FACTORY );
-#endif
return true;
}
void DeInitAtkBridge()
{
-#if !GTK_CHECK_VERSION(3,0,0)
restore_gail_window_vtable();
-#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index 581f4d0..b6beda5 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -140,6 +140,11 @@ wrapper_factory_create_accessible( GObject *obj )
return NULL;
}
+AtkObject* ooo_fixed_get_accessible(GtkWidget *obj)
+{
+return wrapper_factory_create_accessible(G_OBJECT(obj));
+}
+
static void
wrapper_factory_class_init( AtkObjectFactoryClass *klass )
{
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 94bdbce..d9d57af 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -970,6 +970,17 @@ void GtkSalFrame::resizeWindow( long nWidth, long nHeight )
window_resize(nWidth, nHeight);
}
+#if GTK_CHECK_VERSION(3,2,0)
+
+static void
+ooo_fixed_class_init(GtkFixedClass *klass)
+{
+GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+widget_class->get_accessible = ooo_fixed_get_accessible;
+}
+
+#endif
+
/*
* Always use a sub-clas
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/envelp/envimg.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 198b5aac12751e7f64e398935313077d8c412a8b
Author: Stephan Bergmann
Date: Fri Jun 26 15:17:35 2015 +0200
Fix WNT
Change-Id: I184787f3effe5d5ee673de246c94aa4a4b4b290c
diff --git a/sw/source/uibase/envelp/envimg.cxx
b/sw/source/uibase/envelp/envimg.cxx
index 135db95..766c155 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -35,9 +35,9 @@
#include
#ifdef WNT
-#define NEXTLINE OUString("\r\n")
+#define NEXTLINE "\r\n"
#else
-#define NEXTLINE '\n'
+#define NEXTLINE "\n"
#endif
using namespace utl;
@@ -66,7 +66,7 @@ OUString MakeSender()
else if (sToken == "CR")
{
if(bLastLength)
-sRet += OUStringLiteral1();
+sRet += NEXTLINE;
bLastLength = true;
}
else if (sToken == "FIRSTNAME")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/address.cxx | 46
1 file changed, 42 insertions(+), 4 deletions(-)
New commits:
commit 0c8778ce1df92ca3bc2a8dd2f64568fb257e9e39
Author: Eike Rathke
Date: Fri Jun 26 15:12:46 2015 +0200
tdf#44419 allow A:A and 1:1 references also in Calc A1 and ODF syntax
They still get displayed as A1:A1048576 and A1:AMJ1 but are accepted as
input.
Change-Id: I6a44ce56767695af874e9f5122501a4c7925b0d6
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 18087a4..dbcfb15 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1031,14 +1031,21 @@ static sal_uInt16 lcl_ScRange_Parse_XL_A1( ScRange& r,
/**
@param ppointer to null-terminated sal_Unicode string
+@param rRawRes returns SCA_... flags without the final check for full
+validity that is applied to the return value, with which
+two addresses that form a column or row singleton range,
+e.g. A:A or 1:1, can be detected. Used in
+lcl_ScRange_Parse_OOo().
@param pRange pointer to range where rAddr effectively is *pRange->aEnd,
used in conjunction with pExtInfo to determine the tab span
of a 3D reference.
*/
static sal_uInt16 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument*
pDoc, ScAddress& rAddr,
+ sal_uInt16& rRawRes,
ScAddress::ExternalInfo* pExtInfo =
NULL, ScRange* pRange = NULL )
{
sal_uInt16 nRes = 0;
+rRawRes = 0;
OUString aDocName; // the pure Document Name
OUString aTab;
boolbExtDoc = false;
@@ -1263,6 +1270,8 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const
sal_Unicode* p, ScDocument* pDo
}
}
+rRawRes |= nRes;
+
if ( !(nRes & SCA_VALID_ROW) && (nRes & SCA_VALID_COL)
&& !( (nRes & SCA_TAB_3D) && (nRes & SCA_VALID_TAB)) )
{ // no Row, no Tab, but Col => DM (...), B (...) et al
@@ -1309,7 +1318,8 @@ static sal_uInt16 lcl_ScAddress_Parse ( const
sal_Unicode* p, ScDocument* pDoc,
default :
case formula::FormulaGrammar::CONV_OOO:
{
-return lcl_ScAddress_Parse_OOo( p, pDoc, rAddr, pExtInfo, NULL );
+sal_uInt16 nRawRes = 0;
+return lcl_ScAddress_Parse_OOo( p, pDoc, rAddr, nRawRes, pExtInfo,
NULL );
}
}
}
@@ -1460,10 +1470,35 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange&
rRange,
OUStringBuffer aTmp(r);
aTmp[nPos] = 0;
const sal_Unicode* p = aTmp.getStr();
-if( (nRes1 = lcl_ScAddress_Parse_OOo( p, pDoc, rRange.aStart,
pExtInfo, NULL ) ) != 0 )
+sal_uInt16 nRawRes1 = 0;
+if (((nRes1 = lcl_ScAddress_Parse_OOo( p, pDoc, rRange.aStart,
nRawRes1, pExtInfo, NULL)) != 0) ||
+((nRawRes1 & (SCA_VALID_COL | SCA_VALID_ROW)) && (nRawRes1 &
SCA_VALID_TAB)))
{
rRange.aEnd = rRange.aStart; // sheet must be initialized
identical to first sheet
-if ( (nRes2 = lcl_ScAddress_Parse_OOo( p + nPos+ 1, pDoc,
rRange.aEnd, pExtInfo, &rRange ) ) != 0 )
+sal_uInt16 nRawRes2 = 0;
+nRes2 = lcl_ScAddress_Parse_OOo( p + nPos+ 1, pDoc, rRange.aEnd,
nRawRes2, pExtInfo, &rRange);
+if (!((nRes1 & SCA_VALID) && (nRes2 & SCA_VALID)) &&
+// If not fully valid addresses, check if both have a valid
+// column or row, and both have valid (or omitted) sheet
references.
+(nRawRes1 & (SCA_VALID_COL | SCA_VALID_ROW)) && (nRawRes1
& SCA_VALID_TAB) &&
+(nRawRes2 & (SCA_VALID_COL | SCA_VALID_ROW)) && (nRawRes2
& SCA_VALID_TAB) &&
+// Both must be column XOR row references, A:A or 1:1 but
not A:1 or 1:A
+((nRawRes1 & (SCA_VALID_COL | SCA_VALID_ROW)) == (nRawRes2
& (SCA_VALID_COL | SCA_VALID_ROW
+{
+nRes1 = nRawRes1 | SCA_VALID;
+nRes2 = nRawRes2 | SCA_VALID;
+if (nRawRes1 & SCA_VALID_COL)
+{
+rRange.aStart.SetRow(0);
+rRange.aEnd.SetRow(MAXROW);
+}
+else
+{
+rRange.aStart.SetCol(0);
+rRange.aEnd.SetCol(MAXCOL);
+}
+}
+if (nRes1 && nRes2)
{
// PutInOrder / Justify
sal_uInt16 nMask, nBits1, nBits2;
@@ -1503,7 +1538,10 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange& rRange,
nRes2 |= SCA_TAB_ABSOLUTE;
}
else
-nRes1 = 0; // keine Tokens aus halben Sachen
+{
+// Don't leave around valid half references.
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/helper/ProcessHandler.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14d988583a2f2d2b300e4804faa426f8a694b2e2 Author: Noel Grandin Date: Thu Jun 25 10:18:09 2015 +0200 fix spelling correcly -> correctly Change-Id: I76f9b791c10fb5c5736dd025abc125ae4a50ec7a diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java index 313a160..212b2c98 100644 --- a/qadevOOo/runner/helper/ProcessHandler.java +++ b/qadevOOo/runner/helper/ProcessHandler.java @@ -286,7 +286,7 @@ public class ProcessHandler * exits. * * @return true if process was successfully - * started and correcly exits (exit code doesn't affect + * started and correctly exits (exit code doesn't affect * to this result). */ public boolean executeSynchronously() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - basebmp/test
basebmp/test/bmpmasktest.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 83632a63a177f5c94cdab4db8c66104c886d6c6c
Author: Michael Meeks
Date: Sat Jun 20 21:28:42 2015 +0100
basebmp: back-port un-expected enumeration changes.
Change-Id: Ic96e1b1394cf0277535b48630c2a1ae77e4db670
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 46ec462..cbc34c0 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -61,7 +61,7 @@ private:
mpMaskBmp1bpp,
aSourceRect,
aDestAll,
-DrawMode_PAINT );
+DrawMode::DrawMode_PAINT );
CPPUNIT_ASSERT_MESSAGE("number of rendered pixel is not 30",
countPixel( rDevice, aCol ) == 30);
}
@@ -165,7 +165,7 @@ public:
basebmp::Format nFormat;
-nFormat = Format::OneBitMsbPal;
+nFormat = FORMAT_ONE_BIT_MSB_PAL;
//nFormat = Format::OneBitMsbGrey; // FIXME - un-comment me to
crash hard.
xMask = createBitmapDevice( aSize, false /* bTopDown */,
nFormat,
@@ -180,20 +180,20 @@ public:
basegfx::tools::importFromSvgD( aPoly, "m 2 2 h4 v8 h-4z",
false, NULL );
xMask->fillPolyPolygon( aPoly, basebmp::Color( 0xff, 0xff, 0xff ),
-DrawMode::Paint );
+DrawMode::DrawMode_PAINT );
xBitmap = createBitmapDevice( aSize, false,
- Format::ThirtyTwoBitTcMaskBGRX,
+ FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX,
basebmp::getBitmapDeviceStrideForWidth(
-
Format::ThirtyTwoBitTcMaskBGRX, aSize.getX()) );
+
FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX, aSize.getX() ) );
xBitmap->clear(Color(0x80808080));
}
{ // mpOutput & mpBitmap
const basegfx::B2ISize aSize(9, 9);
xOutput = createBitmapDevice( aSize, false,
- Format::ThirtyTwoBitTcMaskBGRX,
+ FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX,
basebmp::getBitmapDeviceStrideForWidth(
-
Format::ThirtyTwoBitTcMaskBGRX, aSize.getX()) );
+
FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX, aSize.getX()) );
xOutput->clear(Color(0x));
}
@@ -203,7 +203,7 @@ public:
xOutput->drawMaskedBitmap(
xBitmap, xMask,
aSourceRect, aDestAll,
-DrawMode::Paint );
+DrawMode::DrawMode_PAINT );
CPPUNIT_ASSERT_MESSAGE( "output not cleared to white",
xOutput->getPixelData( basegfx::B2IPoint( 0, 0
) ) == 0xff );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/address.cxx | 46
1 file changed, 42 insertions(+), 4 deletions(-)
New commits:
commit 7f939c3e6edb86f0b7e66e06dff8743830c18ef9
Author: Eike Rathke
Date: Fri Jun 26 15:12:46 2015 +0200
tdf#44419 allow A:A and 1:1 references also in Calc A1 and ODF syntax
They still get displayed as A1:A1048576 and A1:AMJ1 but are accepted as
input.
Change-Id: I6a44ce56767695af874e9f5122501a4c7925b0d6
(cherry picked from commit 0c8778ce1df92ca3bc2a8dd2f64568fb257e9e39)
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 18087a4..dbcfb15 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1031,14 +1031,21 @@ static sal_uInt16 lcl_ScRange_Parse_XL_A1( ScRange& r,
/**
@param ppointer to null-terminated sal_Unicode string
+@param rRawRes returns SCA_... flags without the final check for full
+validity that is applied to the return value, with which
+two addresses that form a column or row singleton range,
+e.g. A:A or 1:1, can be detected. Used in
+lcl_ScRange_Parse_OOo().
@param pRange pointer to range where rAddr effectively is *pRange->aEnd,
used in conjunction with pExtInfo to determine the tab span
of a 3D reference.
*/
static sal_uInt16 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument*
pDoc, ScAddress& rAddr,
+ sal_uInt16& rRawRes,
ScAddress::ExternalInfo* pExtInfo =
NULL, ScRange* pRange = NULL )
{
sal_uInt16 nRes = 0;
+rRawRes = 0;
OUString aDocName; // the pure Document Name
OUString aTab;
boolbExtDoc = false;
@@ -1263,6 +1270,8 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const
sal_Unicode* p, ScDocument* pDo
}
}
+rRawRes |= nRes;
+
if ( !(nRes & SCA_VALID_ROW) && (nRes & SCA_VALID_COL)
&& !( (nRes & SCA_TAB_3D) && (nRes & SCA_VALID_TAB)) )
{ // no Row, no Tab, but Col => DM (...), B (...) et al
@@ -1309,7 +1318,8 @@ static sal_uInt16 lcl_ScAddress_Parse ( const
sal_Unicode* p, ScDocument* pDoc,
default :
case formula::FormulaGrammar::CONV_OOO:
{
-return lcl_ScAddress_Parse_OOo( p, pDoc, rAddr, pExtInfo, NULL );
+sal_uInt16 nRawRes = 0;
+return lcl_ScAddress_Parse_OOo( p, pDoc, rAddr, nRawRes, pExtInfo,
NULL );
}
}
}
@@ -1460,10 +1470,35 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange&
rRange,
OUStringBuffer aTmp(r);
aTmp[nPos] = 0;
const sal_Unicode* p = aTmp.getStr();
-if( (nRes1 = lcl_ScAddress_Parse_OOo( p, pDoc, rRange.aStart,
pExtInfo, NULL ) ) != 0 )
+sal_uInt16 nRawRes1 = 0;
+if (((nRes1 = lcl_ScAddress_Parse_OOo( p, pDoc, rRange.aStart,
nRawRes1, pExtInfo, NULL)) != 0) ||
+((nRawRes1 & (SCA_VALID_COL | SCA_VALID_ROW)) && (nRawRes1 &
SCA_VALID_TAB)))
{
rRange.aEnd = rRange.aStart; // sheet must be initialized
identical to first sheet
-if ( (nRes2 = lcl_ScAddress_Parse_OOo( p + nPos+ 1, pDoc,
rRange.aEnd, pExtInfo, &rRange ) ) != 0 )
+sal_uInt16 nRawRes2 = 0;
+nRes2 = lcl_ScAddress_Parse_OOo( p + nPos+ 1, pDoc, rRange.aEnd,
nRawRes2, pExtInfo, &rRange);
+if (!((nRes1 & SCA_VALID) && (nRes2 & SCA_VALID)) &&
+// If not fully valid addresses, check if both have a valid
+// column or row, and both have valid (or omitted) sheet
references.
+(nRawRes1 & (SCA_VALID_COL | SCA_VALID_ROW)) && (nRawRes1
& SCA_VALID_TAB) &&
+(nRawRes2 & (SCA_VALID_COL | SCA_VALID_ROW)) && (nRawRes2
& SCA_VALID_TAB) &&
+// Both must be column XOR row references, A:A or 1:1 but
not A:1 or 1:A
+((nRawRes1 & (SCA_VALID_COL | SCA_VALID_ROW)) == (nRawRes2
& (SCA_VALID_COL | SCA_VALID_ROW
+{
+nRes1 = nRawRes1 | SCA_VALID;
+nRes2 = nRawRes2 | SCA_VALID;
+if (nRawRes1 & SCA_VALID_COL)
+{
+rRange.aStart.SetRow(0);
+rRange.aEnd.SetRow(MAXROW);
+}
+else
+{
+rRange.aStart.SetCol(0);
+rRange.aEnd.SetCol(MAXCOL);
+}
+}
+if (nRes1 && nRes2)
{
// PutInOrder / Justify
sal_uInt16 nMask, nBits1, nBits2;
@@ -1503,7 +1538,10 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange& rRange,
nRes2 |= SCA_TAB_ABSOLUTE;
}
else
-nRes1 = 0; // keine Tokens aus halben Sachen
+
Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering
On Fri, Jun 26, 2015 at 02:00:51PM +0200, Lionel Elie Mamane wrote: > On Mon, Jun 15, 2015 at 02:32:23PM +0200, Miklos Vajna wrote: >> On Wed, Jun 03, 2015 at 02:54:45PM +0200, Lionel Elie Mamane >> wrote: What are those autogen.input options? Can you follow the instructions of the failed test and get a backtrace? >>> Both are attached. To me the backtrace looks unrelated to "tile >>> rendering", but then this is the only failing thing in a make >>> check -k >> I only have an implicit --without-system-libs dbgutil build from >> libreoffice-5-0, and there I don't see this problem. It would be >> interesting to know if the failure is indeed conditional on >> --with-system-libs or it's something else. >> An other approach is to see if the branch point was good for you, if so, >> then bisect what commit broke the test with your build options. > After further testing... I have two directories (checkouts): > libreoffice-5-0 containing my working branch based on libreoffice-5-0 > libreoffice-5-1 containing my working branch based on master > The test fails in directory libreoffice-5-0 but succeeds in directory > libreoffice-5-1. Now, what happens is that if I do: > cd libreoffice-5-0 > checkout master > make CppunitTest_libreofficekit_tiledrendering > The test still fails. So the failure seems to be related to something > else than code... Maybe the contents of "instdir/user"? I deleted the "instdir" directory and it still fails. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/inc/cuitabarea.hxx|6 --
cui/source/inc/cuitabline.hxx|3 ---
cui/source/tabpages/tparea.cxx |6 ++
cui/source/tabpages/tpbitmap.cxx |3 +--
cui/source/tabpages/tpgradnt.cxx |3 +--
cui/source/tabpages/tphatch.cxx |3 +--
cui/source/tabpages/tpline.cxx |3 +--
cui/source/tabpages/tplnedef.cxx |3 +--
cui/source/tabpages/tplneend.cxx |3 +--
cui/source/tabpages/tpshadow.cxx |3 +--
10 files changed, 9 insertions(+), 27 deletions(-)
New commits:
commit ce5711267c09a8c85decbd2ad043149d584f8fe7
Author: Stephan Bergmann
Date: Fri Jun 26 16:01:26 2015 +0200
-fsanitize=vptr: wrong, unnecessary downcasts
(and the pXPool members are not even necessary)
Change-Id: I321f06387ca1f1e98d8f731ec2b070212c82c28a
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index a25966a..4b00e3e 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -140,7 +140,6 @@ class SvxTransparenceTabPage : public SvxTabPage
VclPtrm_pCtlXRectPreview;
boolbBitmap;
-XOutdevItemPool*pXPool;
XFillAttrSetItemaXFillAttr;
SfxItemSet& rXFSet;
@@ -253,7 +252,6 @@ private:
bool* pbAreaTP;
-XOutdevItemPool*pXPool;
XFillAttrSetItemaXFillAttr;
SfxItemSet& rXFSet;
@@ -348,7 +346,6 @@ private:
boolbDisable;
-XOutdevItemPool*pXPool;
XFillAttrSetItemaXFillAttr;
SfxItemSet& rXFSet;
SfxMapUnit ePoolUnit;
@@ -420,7 +417,6 @@ private:
sal_Int32* pPos;
bool* pbAreaTP;
-XOutdevItemPool*pXPool;
XFillStyleItem aXFStyleItem;
XFillGradientItem aXGradientItem;
XFillAttrSetItemaXFillAttr;
@@ -497,7 +493,6 @@ private:
sal_Int32* pPos;
bool* pbAreaTP;
-XOutdevItemPool*pXPool;
XFillStyleItem aXFStyleItem;
XFillHatchItem aXHatchItem;
XFillAttrSetItemaXFillAttr;
@@ -584,7 +579,6 @@ private:
boolbBmpChanged;
-XOutdevItemPool*pXPool;
XFillStyleItem aXFStyleItem;
XFillBitmapItem aXBitmapItem;
XFillAttrSetItemaXFillAttr;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 678042b..d659409 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -150,7 +150,6 @@ private:
RECT_POINT eRP;
boolbObjSelected;
-XOutdevItemPool*pXPool;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
XLineDashItem aXDash;
@@ -267,7 +266,6 @@ private:
XDash aDash;
boolbObjSelected;
-XOutdevItemPool*pXPool;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
XLineDashItem aXDash;
@@ -349,7 +347,6 @@ private:
const SdrObject*pPolyObj;
boolbObjSelected;
-XOutdevItemPool*pXPool;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
XLineColorItem aXColor;
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ae3f3f3..538c4612 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -258,8 +258,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window*
pParent, const SfxIt
nPageType (0),
nDlgType(0),
bBitmap ( false ),
-pXPool ( static_cast(rInAttrs.GetPool()) ),
-aXFillAttr ( pXPool ),
+aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
get(m_pRbtTransOff,"RBT_TRANS_OFF");
@@ -624,8 +623,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const
SfxItemSet& rInAttrs
// init with pointer to fixed bool
pbAreaTP(&maFixed_sal_Bool),
-pXPool ( static_cast( rInAttrs.GetPool() )
),
-aXFillAttr ( pXPool ),
+aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() ),
ePoolUnit(SFX_MAPUNIT_100TH_MM),
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 71c23e6..8c3427d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -67,10 +67,9 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent,
const SfxItemSet& rIn
bBmpChanged ( false ),
-pXPool ( static_cast( rInAttrs.GetPool() )),
aXFStyleItem( drawing::FillStyle_BITMAP ),
aXBitmapItem( OUString(), Graphic() ),
-aXFillAttr ( pXPool ),
+aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
get(m_pBxPixelEditor,"maingrid");
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgr
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/doc/notxtfrm.cxx|2 +-
sw/source/core/inc/cntfrm.hxx |2 +-
sw/source/core/inc/flyfrms.hxx |6 +++---
sw/source/core/inc/frame.hxx |2 +-
sw/source/core/inc/layfrm.hxx |2 +-
sw/source/core/inc/notxtfrm.hxx|2 +-
sw/source/core/inc/pagefrm.hxx |2 +-
sw/source/core/inc/rootfrm.hxx |2 +-
sw/source/core/inc/rowfrm.hxx |2 +-
sw/source/core/inc/sectfrm.hxx |2 +-
sw/source/core/inc/tabfrm.hxx |2 +-
sw/source/core/layout/calcmove.cxx | 20 ++--
sw/source/core/layout/fly.cxx |8
sw/source/core/layout/flycnt.cxx |4 ++--
sw/source/core/layout/flyincnt.cxx |2 +-
sw/source/core/layout/flylay.cxx |2 +-
sw/source/core/layout/pagechg.cxx |2 +-
sw/source/core/layout/paintfrm.cxx |2 +-
sw/source/core/layout/sectfrm.cxx |4 ++--
sw/source/core/layout/tabfrm.cxx | 10 +-
20 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 4cd3f9a7749b8ef285012a59d031dc9f2e4b5e43
Author: Miklos Vajna
Date: Fri Jun 26 15:20:14 2015 +0200
fix crash on exporting kde140265-1.doc to ODT
properties.pSGlobalShell can be legitimately 0 here.
No testcase, for some reason the export does not crash if it's done by
CppunitTest_sw_filters_test or CppunitTest_sw_odfexport; but it does
crash with '--headless --convert-to odt kde140265-1.doc'.
Change-Id: I50936f9e5236763cc987aba14d8fc897c4b789bf
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 017389b..67e6e15 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1510,7 +1510,7 @@ static void lcl_CalcBorderRect( SwRect &rRect, const
SwFrm *pFrm,
}
}
-::SwAlignRect( rRect, properties.pSGlobalShell,
properties.pSGlobalShell->GetOut() );
+::SwAlignRect( rRect, properties.pSGlobalShell, properties.pSGlobalShell ?
properties.pSGlobalShell->GetOut() : 0 );
}
/**
commit a3413204d2eb0563a4a2e1104905951f81e417bc
Author: Miklos Vajna
Date: Fri Jun 26 14:58:43 2015 +0200
SwPageFrm::MakeAll: use vcl::RenderContext
One tricky part is that in generic SwFrm methods SwRootFrm may not have
a shell and doesn't need a vcl::RenderContext, either; so check for that
situation explicitly where the frame may be a root one.
Change-Id: I48f39fb7195290393fca34f75d8798fb5f960f46
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index d040d35..811f97b 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -463,7 +463,7 @@ const Size& SwNoTextFrm::GetSize() const
return pFly->Prt().SSize();
}
-void SwNoTextFrm::MakeAll()
+void SwNoTextFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/)
{
SwContentNotify aNotify( this );
SwBorderAttrAccess aAccess( SwFrm::GetCache(), this );
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 94a597a..18e137b 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -45,7 +45,7 @@ class SwContentFrm: public SwFrm, public SwFlowFrm
bool bTstMove,
const bool bObjsInNewUpper );
-virtual void MakeAll() SAL_OVERRIDE;
+virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE;
void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 4608577..c096a4b 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -71,7 +71,7 @@ public:
// #i28701#
TYPEINFO_OVERRIDE();
-virtual void MakeAll() SAL_OVERRIDE;
+virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE;
// #i37068# - accessors for member
inline void SetNoMoveOnCheckClip( const bool _bNewNoMoveOnCheckClip )
@@ -138,7 +138,7 @@ protected:
class SwFlyAtCntFrm : public SwFlyFreeFrm
{
protected:
-virtual void MakeAll() SAL_OVERRIDE;
+virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE;
// #i28701#
virtual bool _InvalidationAllowed( const InvalidationType _nInvalid )
const SAL_OVERRIDE;
@@ -186,7 +186,7 @@ class SwFlyInCntFrm : public SwFlyFrm
protected:
virtual void NotifyBackground( SwPageFrm *pPage,
const SwRect& rRect, PrepareHint eHint)
SAL_OVERRIDE;
-virtual void MakeAll() SAL_OVERRIDE;
+virtual void MakeAll(vcl::RenderContext* pRenderContext) SAL_OVERRIDE;
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* )
SAL_OVERRIDE;
public:
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 9c9f76a..9677a5f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -378,7 +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |1 +
vcl/unx/gtk/a11y/atkbridge.cxx |5 +++--
vcl/unx/gtk/a11y/atkfactory.cxx|5 +
vcl/unx/gtk/a11y/atkutil.cxx | 12 ++--
vcl/unx/gtk/a11y/atkutil.hxx |1 +
vcl/unx/gtk/window/gtksalframe.cxx | 23 +++
6 files changed, 39 insertions(+), 8 deletions(-)
New commits:
commit dbba5f026cd94002fc76dc94a0d131d494bc4301
Author: Caolán McNamara
Date: Fri Jun 26 13:50:28 2015 +0100
Related: tdf#92293 gtk3 a11y: I suspect that all of this is redundant
in favor of hooking in via get_accessible
Change-Id: I8c265e0d9a5f8bdf02b7ba4be71fc58194cf5aa4
(cherry picked from commit aff0d4b29681ee8008ff438885c8cc2b461f4dd5)
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index 9a89a8f..c649c25 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -27,6 +27,9 @@
bool InitAtkBridge()
{
+#if GTK_CHECK_VERSION(3,0,0)
+ooo_atk_util_ensure_event_listener();
+#else
const char* pVersion = atk_get_toolkit_version();
if( ! pVersion )
return false;
@@ -56,13 +59,15 @@ bool InitAtkBridge()
AtkRegistry * registry = atk_get_default_registry();
if( registry )
atk_registry_set_factory_type( registry, OOO_TYPE_FIXED,
OOO_TYPE_WRAPPER_FACTORY );
-
+#endif
return true;
}
void DeInitAtkBridge()
{
+#if !GTK_CHECK_VERSION(3,0,0)
restore_gail_window_vtable();
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index 03f08e4..bb0a238 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.cxx
@@ -714,12 +714,20 @@ ooo_atk_util_class_init (AtkUtilClass *)
atk_class->get_toolkit_name = ooo_atk_util_get_toolkit_name;
atk_class->get_toolkit_version = ooo_atk_util_get_toolkit_version;
-Application::AddEventListener( g_aEventListenerLink );
+ooo_atk_util_ensure_event_listener();
}
} // extern "C"
-/*/
+void ooo_atk_util_ensure_event_listener()
+{
+static bool bInited;
+if (!bInited)
+{
+Application::AddEventListener( g_aEventListenerLink );
+bInited = true;
+}
+}
GType
ooo_atk_util_get_type()
diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx
index 89cb61a..9524188 100644
--- a/vcl/unx/gtk/a11y/atkutil.hxx
+++ b/vcl/unx/gtk/a11y/atkutil.hxx
@@ -25,6 +25,7 @@
#define OOO_TYPE_ATK_UTIL ooo_atk_util_get_type()
GType ooo_atk_util_get_type();
+void ooo_atk_util_ensure_event_listener();
#endif
commit cfcae6481a9180d057a34e3a4a157dbc2f96918e
Author: Caolán McNamara
Date: Fri Jun 26 13:24:19 2015 +0100
Resolves: tdf#92293 gtk3: get a11y working
(cherry picked from commit 093d7b8142d0cb224fcf23506f3b36f7a3a10d2c)
Change-Id: I89cfde9b4c97852d36817b716ac08bd32096915b
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index e0547ed..0adeecd 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -471,6 +471,7 @@ public:
extern "C" {
GType ooo_fixed_get_type();
+AtkObject* ooo_fixed_get_accessible(GtkWidget *obj);
} // extern "C"
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index e3ffdc6..9a89a8f 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -27,7 +27,6 @@
bool InitAtkBridge()
{
-#if !GTK_CHECK_VERSION(3,0,0)
const char* pVersion = atk_get_toolkit_version();
if( ! pVersion )
return false;
@@ -57,16 +56,13 @@ bool InitAtkBridge()
AtkRegistry * registry = atk_get_default_registry();
if( registry )
atk_registry_set_factory_type( registry, OOO_TYPE_FIXED,
OOO_TYPE_WRAPPER_FACTORY );
-#endif
return true;
}
void DeInitAtkBridge()
{
-#if !GTK_CHECK_VERSION(3,0,0)
restore_gail_window_vtable();
-#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index fb0cc77..99ed750 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -140,6 +140,11 @@ wrapper_factory_create_accessible( GObject *obj )
return NULL;
}
+AtkObject* ooo_fixed_get_accessible(GtkWidget *obj)
+{
+return wrapper_factory_create_accessible(G_OBJECT(obj));
+}
+
static void
wrapper_factory_class_init( AtkObjectFactoryClass *klass )
{
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index a7b9b88..55fce4d 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -971,6 +971,17 @@ void GtkSalFrame::resizeWindow( long nWidth, long nHeight )
window_resize(nWidth, nHeight);
}
+#if GTK_CHECK_VERSION(3,2,0)
+
+static void
+ooo_fixed_class_init(GtkFixedClass *klass)
+{
+Gtk
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
New commits:
commit ce07affe888db8d32315b18c851f860a270631ba
Author: Caolán McNamara
Date: Fri Jun 26 15:27:02 2015 +0100
gtk3: fpicker, try removing both locations
Change-Id: I0f10d03c1e4481e8efa765e52b5264071c86a3cf
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 6512434..9936f8c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -419,29 +419,30 @@ shrinkFilterName( const OUString &rFilterName, bool
bAllowNoStar = false )
}
static void
+dialog_remove_buttons(GtkWidget *pActionArea)
+{
+GList *pChildren =
+gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
+
+for( GList *p = pChildren; p; p = p->next )
+gtk_widget_destroy( GTK_WIDGET( p->data ) );
+
+g_list_free( pChildren );
+}
+
+static void
dialog_remove_buttons( GtkDialog *pDialog )
{
g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
-GtkWidget *pActionArea;
-
#if GTK_CHECK_VERSION(3,0,0)
#if GTK_CHECK_VERSION(3,12,0)
-pActionArea = gtk_dialog_get_header_bar(pDialog);
-#else
-pActionArea = gtk_dialog_get_action_area(pDialog);
+dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
#endif
+dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
#else
-pActionArea = pDialog->action_area;
+dialog_remove_buttons(pDialog->action_area);
#endif
-
-GList *pChildren =
-gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
-
-for( GList *p = pChildren; p; p = p->next )
-gtk_widget_destroy( GTK_WIDGET( p->data ) );
-
-g_list_free( pChildren );
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 114 +-
1 file changed, 48 insertions(+), 66 deletions(-)
New commits:
commit 976add10b35e482251ed4c75957baeb6811e6e2c
Author: Justin Luth
Date: Thu Jun 18 09:40:29 2015 +0300
tdf#87348 allow non-sequentially processed textboxes to be linked
The existing code design ONLY allowed textboxes to be linked if they
were basically processed sequentially or reverse sequentially.
It appears that the processing is actually based on the order that
the textboxes were created, which is usually sequential
but not necessarily.
Change-Id: Ieb7b37d4cbd4b3a5b5d474803abccfa198a5864b
Reviewed-on: https://gerrit.libreoffice.org/16353
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ff6ce1d..38a4c07 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2449,91 +2449,73 @@ static uno::Any lcl_getGrabBagValue( const
uno::Sequence&
//Link the text frames.
void DomainMapper_Impl::ChainTextFrames()
{
-if( 0 == m_vTextFramesForChaining.size() )
+//can't link textboxes if there are not even two of them...
+if( 2 > m_vTextFramesForChaining.size() )
return ;
+struct TextFramesForChaining {
+css::uno::Reference< css::drawing::XShape > xShape;
+sal_Int32 nId;
+sal_Int32 nSeq;
+TextFramesForChaining(): xShape(0), nId(0), nSeq(0) {}
+} ;
+typedef std::map ChainMap;
+
try
{
-sal_Int32 nTxbxId1 = 0 ; //holds id for the shape in outer loop
-sal_Int32 nTxbxId2 = 0 ; //holds id for the shape in inner loop
-sal_Int32 nTxbxSeq1 = 0 ; //holds seq number for the shape in outer
loop
-sal_Int32 nTxbxSeq2 = 0 ; //holds seq number for the shape in inner
loop
-OUString sName1 ; //holds the text box Name for the shape in outer loop
-OUString sName2 ; //holds the text box Name for the shape in outer loop
+ChainMap aTextFramesForChainingHelper;
OUString sChainNextName("ChainNextName");
-OUString sChainPrevName("ChainPrevName");
-for( std::vector >::iterator
outer_itr = m_vTextFramesForChaining.begin();
- outer_itr != m_vTextFramesForChaining.end(); )
+//learn about ALL of the textboxes and their chaining values first -
because frames are processed in no specific order.
+std::vector >::iterator iter;
+for( iter = m_vTextFramesForChaining.begin(); iter !=
m_vTextFramesForChaining.end(); ++iter )
{
-bool bIsTxbxChained = false ;
-uno::Reference xTextContent1(*outer_itr,
uno::UNO_QUERY_THROW);
-uno::Reference xPropertySet1(xTextContent1,
uno::UNO_QUERY);
-uno::Sequence aGrabBag1;
-uno::Reference xServiceInfo1(xPropertySet1,
uno::UNO_QUERY);
-if (xServiceInfo1->supportsService("com.sun.star.text.TextFrame"))
+uno::Reference xTextContent(*iter,
uno::UNO_QUERY_THROW);
+uno::Reference xPropertySet(xTextContent,
uno::UNO_QUERY);
+uno::Sequence aGrabBag;
+uno::Reference xServiceInfo(xPropertySet,
uno::UNO_QUERY);
+
+TextFramesForChaining aChainStruct = TextFramesForChaining();
+OUString sShapeName;
+
+if ( xServiceInfo->supportsService("com.sun.star.text.TextFrame") )
{
-xPropertySet1->getPropertyValue("FrameInteropGrabBag") >>=
aGrabBag1;
-xPropertySet1->getPropertyValue("LinkDisplayName") >>= sName1;
+xPropertySet->getPropertyValue("FrameInteropGrabBag") >>=
aGrabBag;
+xPropertySet->getPropertyValue("LinkDisplayName") >>=
sShapeName;
}
else
{
-xPropertySet1->getPropertyValue("InteropGrabBag") >>=
aGrabBag1;
-xPropertySet1->getPropertyValue("ChainName") >>= sName1;
+xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
+xPropertySet->getPropertyValue("ChainName") >>= sShapeName;
}
-lcl_getGrabBagValue( aGrabBag1, "Txbx-Id") >>= nTxbxId1;
-lcl_getGrabBagValue( aGrabBag1, "Txbx-Seq") >>= nTxbxSeq1;
-
-//Check which text box in the document links/(is a link) to this
one.
-std::vector >::iterator
inner_itr = ( outer_itr + 1 );
-for( ; inner_itr != m_vTextFramesForChaining.end(); ++inner_itr )
-{
-uno::Reference xTextContent2(*inner_itr,
uno::UNO_QUERY_THROW);
-uno::Reference
xPropertySet2(xTextContent2, uno::UNO_QUERY);
-uno::Sequence aGrabBag2;
-uno::Reference
xServiceInfo2(xPropertySet1, uno::UNO_QUERY);
-
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 29 +++--
1 file changed, 15 insertions(+), 14 deletions(-)
New commits:
commit fbd9069824ae8acd6f83ddac694c56021a2c1cba
Author: Caolán McNamara
Date: Fri Jun 26 15:27:02 2015 +0100
gtk3: fpicker, try removing both locations
Change-Id: I0f10d03c1e4481e8efa765e52b5264071c86a3cf
(cherry picked from commit ce07affe888db8d32315b18c851f860a270631ba)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index b0b8573..8e6154f 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -419,29 +419,30 @@ shrinkFilterName( const OUString &rFilterName, bool
bAllowNoStar = false )
}
static void
+dialog_remove_buttons(GtkWidget *pActionArea)
+{
+GList *pChildren =
+gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
+
+for( GList *p = pChildren; p; p = p->next )
+gtk_widget_destroy( GTK_WIDGET( p->data ) );
+
+g_list_free( pChildren );
+}
+
+static void
dialog_remove_buttons( GtkDialog *pDialog )
{
g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
-GtkWidget *pActionArea;
-
#if GTK_CHECK_VERSION(3,0,0)
#if GTK_CHECK_VERSION(3,12,0)
-pActionArea = gtk_dialog_get_header_bar(pDialog);
-#else
-pActionArea = gtk_dialog_get_action_area(pDialog);
+dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
#endif
+dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
#else
-pActionArea = pDialog->action_area;
+dialog_remove_buttons(pDialog->action_area);
#endif
-
-GList *pChildren =
-gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
-
-for( GList *p = pChildren; p; p = p->next )
-gtk_widget_destroy( GTK_WIDGET( p->data ) );
-
-g_list_free( pChildren );
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/address.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 4091b4fbdce40262eba46ab94653287b1fd928e8
Author: Eike Rathke
Date: Fri Jun 26 16:30:12 2015 +0200
entire rows/cols have absolute col/row anchors, tdf#44419 follow-up
Change-Id: I2ae8c1c81734efd7c80558ba5337253985e8e8b7
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index dbcfb15..8ac9d1a 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1491,11 +1491,15 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange&
rRange,
{
rRange.aStart.SetRow(0);
rRange.aEnd.SetRow(MAXROW);
+nRes1 |= SCA_ROW_ABSOLUTE;
+nRes2 |= SCA_ROW_ABSOLUTE;
}
else
{
rRange.aStart.SetCol(0);
rRange.aEnd.SetCol(MAXCOL);
+nRes1 |= SCA_COL_ABSOLUTE;
+nRes2 |= SCA_COL_ABSOLUTE;
}
}
if (nRes1 && nRes2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/treeopt.cxx | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) New commits: commit b15019d84f52f546294c0336382ea6217f833ed2 Author: Stephan Bergmann Date: Fri Jun 26 16:37:09 2015 +0200 -fsanitize=vptr: SID_ATTR_*LANGUAGE are of type SvxLanguageItem Change-Id: If00273e3836aeb70adee36f49f0ef502b6a7aebb diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 7bfc713..9df70c3 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -1252,11 +1252,23 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) const SfxPoolItem* pItem = NULL; SfxDispatcher* pDispatch = pViewFrame->GetDispatcher(); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_LANGUAGE, pItem)) -pRet->Put(SfxUInt16Item(SID_ATTR_LANGUAGE, static_cast(pItem)->GetLanguage())); +pRet->Put( +SvxLanguageItem( +(static_cast(pItem) + ->GetLanguage()), +SID_ATTR_LANGUAGE)); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CJK_LANGUAGE, pItem)) -pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CJK_LANGUAGE, static_cast(pItem)->GetLanguage())); +pRet->Put( +SvxLanguageItem( +(static_cast(pItem) + ->GetLanguage()), +SID_ATTR_CHAR_CJK_LANGUAGE)); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_ATTR_CHAR_CTL_LANGUAGE, pItem)) -pRet->Put(SfxUInt16Item(SID_ATTR_CHAR_CTL_LANGUAGE, static_cast(pItem)->GetLanguage())); +pRet->Put( +SvxLanguageItem( +(static_cast(pItem) + ->GetLanguage()), +SID_ATTR_CHAR_CTL_LANGUAGE)); pRet->Put(aHyphen); if(SfxItemState::DEFAULT <= pDispatch->QueryState(SID_AUTOSPELL_CHECK, pItem)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/address.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 627d50e7d432463d6a625ba5b387df7e61e4fc76
Author: Eike Rathke
Date: Fri Jun 26 16:30:12 2015 +0200
entire rows/cols have absolute col/row anchors, tdf#44419 follow-up
Change-Id: I2ae8c1c81734efd7c80558ba5337253985e8e8b7
(cherry picked from commit 4091b4fbdce40262eba46ab94653287b1fd928e8)
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index dbcfb15..8ac9d1a 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1491,11 +1491,15 @@ static sal_uInt16 lcl_ScRange_Parse_OOo( ScRange&
rRange,
{
rRange.aStart.SetRow(0);
rRange.aEnd.SetRow(MAXROW);
+nRes1 |= SCA_ROW_ABSOLUTE;
+nRes2 |= SCA_ROW_ABSOLUTE;
}
else
{
rRange.aStart.SetCol(0);
rRange.aEnd.SetCol(MAXCOL);
+nRes1 |= SCA_COL_ABSOLUTE;
+nRes2 |= SCA_COL_ABSOLUTE;
}
}
if (nRes1 && nRes2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
DSN: failed (Good day)
This is a Delivery Status Notification (DSN). I was unable to deliver your message to marco.huggenber...@gmail.com. I said (end of message) And they gave me the error; 552-5.7.0 This message was blocked because its content presents a potential 552-5.7.0 security issue. Please visit 552-5.7.0 https://support.google.com/mail/answer/6590 to review our message 552 5.7.0 content and attachment content guidelines. om4si50824704pdb.237 - gsmtp Received: from lists.freedesktop.org ([151.42.215.110]) by by-night.ch for ; Fri, 26 Jun 2015 07:56:05 -0700 From: libreoffice@lists.freedesktop.org To: ma...@by-night.ch Subject: Good day Date: Fri, 26 Jun 2015 16:56:08 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_NextPart_000_0001_EC01F6FB.DBC6E0AD" X-Priority: 3 X-MSMail-Priority: Normal ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source include/formula include/o3tl sw/inc
bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx |2
bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx |8
bridges/source/cpp_uno/mingw_intel/share.hxx | 13 -
bridges/source/cpp_uno/mingw_x86-64/share.hxx | 13 -
include/formula/tokenarray.hxx|4
include/o3tl/typed_flags_set.hxx | 115 --
include/o3tl/underlying_type.hxx | 32 --
sw/inc/ring.hxx |6
8 files changed, 57 insertions(+), 136 deletions(-)
New commits:
commit 3a68a7dcf49f7be95086b747c8426aa310307e49
Author: Stephan Bergmann
Date: Fri Jun 26 17:28:43 2015 +0200
Remove workarounds for no longer supported GCC 4.6
In bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx, the #if also covered
Clang, which actually needs these declarations (for now; the right fix will
probably be to #include ).
Change-Id: I1eebd59e2371f3498d740ab78244927358c4f23f
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
index 15b357b..af20806 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/callvirtualmethod.cxx
@@ -58,7 +58,7 @@ void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
// unexpected size of int
assert(nStackLongs && pStackLongs); // no stack
-#if defined __clang__ || __GNUC__ == 4 && __GNUC_MINOR__ <= 6
+#if defined __clang__
if (! pAdjustedThisPtr)
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything("xxx"); // address something
#endif
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index 0185a2c..0c7bbbf 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -133,18 +133,10 @@ extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals
*__cxa_get_globals () throw(
namespace CPPU_CURRENT_NAMESPACE
{
-// The following are in cxxabi.h since GCC 4.7 (they are wrapped in
-// CPPU_CURRENT_NAMESPACE here as different GCC versions have slightly
different
-// declarations for them, e.g., with or without throw() specification, so would
-// complain about redeclarations of these somewhat implicitly declared
-// functions):
-#if __GNUC__ == 4 && __GNUC_MINOR__ <= 6
extern "C" void *__cxa_allocate_exception(
std::size_t thrown_size ) throw();
extern "C" void __cxa_throw (
void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
-#endif
-
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx
b/bridges/source/cpp_uno/mingw_intel/share.hxx
index b39ed6b..0ce7423 100644
--- a/bridges/source/cpp_uno/mingw_intel/share.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/share.hxx
@@ -84,19 +84,6 @@ extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals
*__cxa_get_globals () throw(
namespace CPPU_CURRENT_NAMESPACE
{
-// The following are in cxxabi.h since GCC 4.7 (they are wrapped in
-// CPPU_CURRENT_NAMESPACE here as different GCC versions have slightly
different
-// declarations for them, e.g., with or without throw() specification, so would
-// complain about redeclarations of these somewhat implicitly declared
-// functions):
-#if __GNUC__ == 4 && __GNUC_MINOR__ <= 6
-extern "C" void *__cxa_allocate_exception(
-std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
-#endif
-
-
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
diff --git a/bridges/source/cpp_uno/mingw_x86-64/share.hxx
b/bridges/source/cpp_uno/mingw_x86-64/share.hxx
index 61d278d..8093820 100644
--- a/bridges/source/cpp_uno/mingw_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/mingw_x86-64/share.hxx
@@ -79,19 +79,6 @@ extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals
*__cxa_get_globals () throw(
namespace CPPU_CURRENT_NAMESPACE
{
-// The following are in cxxabi.h since GCC 4.7 (they are wrapped in
-// CPPU_CURRENT_NAMESPACE here as different GCC versions have slightly
different
-// declarations for them, e.g., with or without throw() specification, so would
-// complain about redeclarations of these somewhat implicitly declared
-// functions):
-#if __GNUC__ == 4 && __GNUC_MINOR__ <= 6
-extern "C" void *__cxa_allocate_exception(
-std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
-#endif
-
-
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 58bb092..6d577ea 100644
--- a/i
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |6 +-
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |3 +++
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 17 ++---
vcl/unx/gtk/fpicker/SalGtkPicker.hxx |1 +
4 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit 30a5b304f2c1c3d89a2e3b76ac44f2c6376ee65f
Author: Caolán McNamara
Date: Fri Jun 26 16:30:02 2015 +0100
gtk3: gtk_window_set_transient_for on overwrite warning dlg
Change-Id: I91d21e3d1663880de14792ded0a1e079d1a40f09
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 9936f8c..2731162 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -918,6 +918,9 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw(
uno::RuntimeException, std
frame::Desktop::create(m_xContext),
UNO_QUERY_THROW );
+GtkWindow *pParent = RunDialog::GetTransientFor();
+if (pParent)
+gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop);
uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
while( GTK_RESPONSE_NO == btn )
@@ -1005,7 +1008,8 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw(
uno::RuntimeException, std
gtk_window_set_title( GTK_WINDOW( dlg ),
OUStringToOString(getResString(FILE_PICKER_TITLE_SAVE ),
RTL_TEXTENCODING_UTF8 ).getStr() );
-
+if (pParent)
+gtk_window_set_transient_for(GTK_WINDOW(dlg),
pParent);
RunDialog* pAnotherDialog = new RunDialog(dlg,
xToolkit, xDesktop);
uno::Reference < awt::XTopWindowListener >
xAnotherLifeCycle(pAnotherDialog);
btn = pAnotherDialog->run();
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 3a2fc6c..23efb79 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -145,6 +145,9 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw(
uno::RuntimeException, s
uno::Reference< frame::XDesktop > xDesktop(
frame::Desktop::create(m_xContext), uno::UNO_QUERY);
+GtkWindow *pParent = RunDialog::GetTransientFor();
+if (pParent)
+gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop);
uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
gint nStatus = pRunDialog->run();
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 6ada45b..c53a80b 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -103,10 +103,7 @@ extern "C"
}
}
-RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference<
awt::XExtendedToolkit >& rToolkit,
-uno::Reference< frame::XDesktop >& rDesktop ) :
-cppu::WeakComponentImplHelper2< awt::XTopWindowListener,
frame::XTerminateListener >( maLock ),
-mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop)
+GtkWindow* RunDialog::GetTransientFor()
{
GtkWindow *pParent = NULL;
@@ -117,8 +114,15 @@ RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference<
awt::XExtendedToolkit
if( pFrame )
pParent = GTK_WINDOW( pFrame->getWindow() );
}
-if (pParent)
-gtk_window_set_transient_for( GTK_WINDOW( mpDialog ), pParent );
+
+return pParent;
+}
+
+RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference<
awt::XExtendedToolkit >& rToolkit,
+uno::Reference< frame::XDesktop >& rDesktop ) :
+cppu::WeakComponentImplHelper2< awt::XTopWindowListener,
frame::XTerminateListener >( maLock ),
+mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop)
+{
}
RunDialog::~RunDialog()
@@ -132,7 +136,6 @@ void SAL_CALL RunDialog::windowOpened( const
::com::sun::star::lang::EventObject
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
-
g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0,
reinterpret_cast(canceldialog), this, NULL);
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 78d810c..dd98b3a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -115,6 +115,7 @@ public:
virtual ~RunDialog();
gint run();
void cancel();
+static GtkWindow* GetTransientFor();
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx | 52
1 file changed, 27 insertions(+), 25 deletions(-)
New commits:
commit 1ebe3004d6e9372ef5419d456b3c29059b539bc9
Author: László Németh
Date: Fri Jun 26 17:28:01 2015 +0200
fix style preview rendering
Change-Id: I10d3791a8d95b5db94af33690de57f3c443bc8fb
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 308f581..6bc67fb 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -79,7 +79,7 @@ namespace
class StyleLBoxString : public SvLBoxString
{
SfxStyleFamily meStyleFamily;
-std::unique_ptr mpStylePreviewRenderer;
+SvViewDataItem* mpViewData;
public:
StyleLBoxString(SvTreeListEntry* pEntry,
@@ -115,6 +115,16 @@ void StyleLBoxString::InitViewData(SvTreeListBox* pView,
SvTreeListEntry* pEntry
{
pViewData = pView->GetViewDataItem(pEntry, this);
}
+mpViewData = pViewData;
+}
+
+void StyleLBoxString::Paint(
+const Point& aPos, SvTreeListBox& rDevice, vcl::RenderContext&
rRenderContext,
+const SvViewDataEntry* pView, const SvTreeListEntry& rEntry)
+{
+std::unique_ptr pStylePreviewRenderer;
+
+bool bResult = false;
SfxObjectShell* pShell = SfxObjectShell::Current();
if (!pShell)
@@ -122,37 +132,29 @@ void StyleLBoxString::InitViewData(SvTreeListBox* pView,
SvTreeListEntry* pEntry
sfx2::StyleManager* pStyleManager = pShell->GetStyleManager();
-if (!pStyleManager)
+if (pStyleManager)
{
-return;
-}
-
mpStylePreviewRenderer.reset(pStyleManager->CreateStylePreviewRenderer(*pView,
GetText(), meStyleFamily, 32 * pView->GetDPIScaleFactor()));
+bool bInit = (!pStylePreviewRenderer);
-if (!mpStylePreviewRenderer)
-{
-return;
-}
+
pStylePreviewRenderer.reset(pStyleManager->CreateStylePreviewRenderer(rRenderContext,
GetText(), meStyleFamily, 32 * rRenderContext.GetDPIScaleFactor()));
-if (mpStylePreviewRenderer->recalculate())
-{
-pViewData->maSize = mpStylePreviewRenderer->getRenderSize();
-}
-else
-{
-SvLBoxString::InitViewData(pView, pEntry, pViewData);
+if (pStylePreviewRenderer)
+{
+if (pStylePreviewRenderer->recalculate())
+{
+mpViewData->maSize = pStylePreviewRenderer->getRenderSize();
+}
+else if (bInit)
+{
+SvLBoxString::InitViewData(
const_cast(&rDevice), const_cast(&rEntry),
mpViewData);
+}
+}
}
-}
-
-void StyleLBoxString::Paint(
-const Point& aPos, SvTreeListBox& /*rDevice*/, vcl::RenderContext&
rRenderContext,
-const SvViewDataEntry* pView, const SvTreeListEntry& /*rEntry*/)
-{
-bool bResult = false;
-if (mpStylePreviewRenderer)
+if (pStylePreviewRenderer)
{
Rectangle aPaintRectangle = pView->GetPaintRectangle();
-bResult = mpStylePreviewRenderer->render(aPaintRectangle);
+bResult = pStylePreviewRenderer->render(aPaintRectangle);
}
if (!bResult)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |6 +-
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx |3 +++
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 17 ++---
vcl/unx/gtk/fpicker/SalGtkPicker.hxx |1 +
4 files changed, 19 insertions(+), 8 deletions(-)
New commits:
commit ce707c3283259a0351d622534e4eb4a313641063
Author: Caolán McNamara
Date: Fri Jun 26 16:30:02 2015 +0100
gtk3: gtk_window_set_transient_for on overwrite warning dlg
Change-Id: I91d21e3d1663880de14792ded0a1e079d1a40f09
(cherry picked from commit 30a5b304f2c1c3d89a2e3b76ac44f2c6376ee65f)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 8e6154f..cee1e3e 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -918,6 +918,9 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw(
uno::RuntimeException, std
frame::Desktop::create(m_xContext),
UNO_QUERY_THROW );
+GtkWindow *pParent = RunDialog::GetTransientFor();
+if (pParent)
+gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop);
uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
while( GTK_RESPONSE_NO == btn )
@@ -1005,7 +1008,8 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw(
uno::RuntimeException, std
gtk_window_set_title( GTK_WINDOW( dlg ),
OUStringToOString(getResString(FILE_PICKER_TITLE_SAVE ),
RTL_TEXTENCODING_UTF8 ).getStr() );
-
+if (pParent)
+gtk_window_set_transient_for(GTK_WINDOW(dlg),
pParent);
RunDialog* pAnotherDialog = new RunDialog(dlg,
xToolkit, xDesktop);
uno::Reference < awt::XTopWindowListener >
xAnotherLifeCycle(pAnotherDialog);
btn = pAnotherDialog->run();
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 0754101..bf90682 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -145,6 +145,9 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw(
uno::RuntimeException, s
uno::Reference< frame::XDesktop > xDesktop(
frame::Desktop::create(m_xContext), uno::UNO_QUERY);
+GtkWindow *pParent = RunDialog::GetTransientFor();
+if (pParent)
+gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop);
uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
gint nStatus = pRunDialog->run();
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 4aaa69f..3069c2a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -104,10 +104,7 @@ extern "C"
}
}
-RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference<
awt::XExtendedToolkit >& rToolkit,
-uno::Reference< frame::XDesktop >& rDesktop ) :
-cppu::WeakComponentImplHelper2< awt::XTopWindowListener,
frame::XTerminateListener >( maLock ),
-mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop)
+GtkWindow* RunDialog::GetTransientFor()
{
GtkWindow *pParent = NULL;
@@ -118,8 +115,15 @@ RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference<
awt::XExtendedToolkit
if( pFrame )
pParent = GTK_WINDOW( pFrame->getWindow() );
}
-if (pParent)
-gtk_window_set_transient_for( GTK_WINDOW( mpDialog ), pParent );
+
+return pParent;
+}
+
+RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference<
awt::XExtendedToolkit >& rToolkit,
+uno::Reference< frame::XDesktop >& rDesktop ) :
+cppu::WeakComponentImplHelper2< awt::XTopWindowListener,
frame::XTerminateListener >( maLock ),
+mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop)
+{
}
RunDialog::~RunDialog()
@@ -133,7 +137,6 @@ void SAL_CALL RunDialog::windowOpened( const
::com::sun::star::lang::EventObject
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
-
g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0,
reinterpret_cast(canceldialog), this, NULL);
}
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 78d810c..dd98b3a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -115,6 +115,7 @@ public:
virtual ~RunDialog();
gint run();
void cancel();
+static GtkWindow* GetTransientFor();
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx | 88 ---
1 file changed, 65 insertions(+), 23 deletions(-)
New commits:
commit eeea41e2e726dd5d69cd323909e1666efb9de472
Author: Eike Rathke
Date: Fri Jun 26 17:43:36 2015 +0200
tdf#44419 display entire column/row references as A:A/1:1
... if both anchors of the other axis are absolute. Now that we can
parse them as of commit 0c8778ce1df92ca3bc2a8dd2f64568fb257e9e39 (and
follow-up 4091b4fbdce40262eba46ab94653287b1fd928e8).
Change-Id: Ie67127fe2d7546e7e598ee1a4d89133c0862
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 9d0a03a..9251731 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -762,12 +762,25 @@ struct ConventionOOO_A1 : public Convention_A1
rBuf.append('.');
}
+enum SingletonDisplay
+{
+SINGLETON_NONE,
+SINGLETON_COL,
+SINGLETON_ROW
+};
+
static void MakeOneRefStrImpl(
OUStringBuffer& rBuffer,
const OUString& rErrRef, const std::vector& rTabNames,
const ScSingleRefData& rRef, const ScAddress& rAbsRef,
-bool bForceTab, bool bODF )
+bool bForceTab, bool bODF, SingletonDisplay eSingletonDisplay )
{
+// For ODF override singleton so earlier releases still can read what
+// we write now as of 2015-06-26.
+/* TODO: we may want to change that in future in a few releases. */
+if (bODF)
+eSingletonDisplay = SINGLETON_NONE;
+
if( rRef.IsFlag3D() || bForceTab )
{
if (!ValidTab(rAbsRef.Tab()) || rRef.IsTabDeleted())
@@ -786,18 +799,45 @@ struct ConventionOOO_A1 : public Convention_A1
}
else if (bODF)
rBuffer.append('.');
-if (!rRef.IsColRel())
-rBuffer.append('$');
-if (!ValidCol(rAbsRef.Col()) || rRef.IsColDeleted())
-rBuffer.append(rErrRef);
-else
-MakeColStr(rBuffer, rAbsRef.Col());
-if (!rRef.IsRowRel())
-rBuffer.append('$');
-if (!ValidRow(rAbsRef.Row()) || rRef.IsRowDeleted())
-rBuffer.append(rErrRef);
-else
-MakeRowStr(rBuffer, rAbsRef.Row());
+
+if (eSingletonDisplay != SINGLETON_ROW)
+{
+if (!rRef.IsColRel())
+rBuffer.append('$');
+if (!ValidCol(rAbsRef.Col()) || rRef.IsColDeleted())
+rBuffer.append(rErrRef);
+else
+MakeColStr(rBuffer, rAbsRef.Col());
+}
+
+if (eSingletonDisplay != SINGLETON_COL)
+{
+if (!rRef.IsRowRel())
+rBuffer.append('$');
+if (!ValidRow(rAbsRef.Row()) || rRef.IsRowDeleted())
+rBuffer.append(rErrRef);
+else
+MakeRowStr(rBuffer, rAbsRef.Row());
+}
+}
+
+static SingletonDisplay getSingletonDisplay( const ScAddress& rAbs1, const
ScAddress& rAbs2,
+const ScComplexRefData& rRef )
+{
+// If any part is error, display as such.
+if (!ValidCol(rAbs1.Col()) || rRef.Ref1.IsColDeleted() ||
!ValidRow(rAbs1.Row()) || rRef.Ref1.IsRowDeleted() ||
+!ValidCol(rAbs2.Col()) || rRef.Ref2.IsColDeleted() ||
!ValidRow(rAbs2.Row()) || rRef.Ref2.IsRowDeleted())
+return SINGLETON_NONE;
+
+// A:A or $A:$A or A:$A or $A:A, both row anchors must be absolute.
+if (rAbs1.Row() == 0 && rAbs2.Row() == MAXROW && !rRef.Ref1.IsRowRel()
&& !rRef.Ref2.IsRowRel())
+return SINGLETON_COL;
+
+// 1:1 or $1:$1 or 1:$1 or $1:1, both column anchors must be absolute.
+if (rAbs1.Col() == 0 && rAbs2.Col() == MAXCOL && !rRef.Ref1.IsColRel()
&& !rRef.Ref2.IsColRel())
+return SINGLETON_ROW;
+
+return SINGLETON_NONE;
}
virtual void makeRefStr( OUStringBuffer& rBuffer,
@@ -808,18 +848,19 @@ struct ConventionOOO_A1 : public Convention_A1
bool bSingleRef,
bool /*bFromRangeName*/ ) const SAL_OVERRIDE
{
-ScComplexRefData aRef( rRef );
// In case absolute/relative positions weren't separately available:
// transform relative to absolute!
-ScAddress aAbs1 = aRef.Ref1.toAbs(rPos), aAbs2;
+ScAddress aAbs1 = rRef.Ref1.toAbs(rPos), aAbs2;
if( !bSingleRef )
-aAbs2 = aRef.Ref2.toAbs(rPos);
+aAbs2 = rRef.Ref2.toAbs(rPos);
-MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, aRef.Ref1, aAbs1,
false, false);
+SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE :
getSingletonDisplay( aAbs1, aAbs2, rRef);
+MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1,
false, false, eSingleton);
if (!bSingleRef)
{
rBuffer.append(':');
-MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, aRef.Ref2
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/leaflet.css|1 -
loleaflet/src/layer/tile/TileLayer.js | 14 +++---
loleaflet/src/map/Map.js |2 +-
loleaflet/src/map/handler/Map.Keyboard.js |8
4 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 9a3e71bad8a415d026547d6650a0736a4538a2ec
Author: Mihai Varga
Date: Fri Jun 26 19:20:21 2015 +0300
Keyboard input is handled in a hidden textarea
We now have a hidden text area where the user's input actually goes,
but it also fires events that are caught by leaflet and are sent
to the server
diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css
index 3c03665..25038ee 100644
--- a/loleaflet/dist/leaflet.css
+++ b/loleaflet/dist/leaflet.css
@@ -623,7 +623,6 @@
width: 0px;
height: 0px;
z-index: 100;
- display: none;
opacity: 0;
}
#clipboard {
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index d46617d..36e416e 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -154,6 +154,8 @@ L.TileLayer = L.GridLayer.extend({
}),
draggable: true
});
+ this._textArea = L.DomUtil.get('clipboard');
+ this._textArea.focus();
},
_initDocument: function () {
@@ -699,6 +701,7 @@ L.TileLayer = L.GridLayer.extend({
if (this._endMarker._icon) {
L.DomUtil.removeClass(this._endMarker._icon,
'leaflet-not-clickable');
}
+ this._textArea.focus();
}
else if (e.type === 'mousemove' && this._selecting) {
if (this._holdStart) {
@@ -767,6 +770,14 @@ L.TileLayer = L.GridLayer.extend({
return;
}
+ if (e.originalEvent.ctrlKey) {
+ // we prepare for a copy event
+ this._textArea.value = 'dummy text';
+ this._textArea.focus();
+ this._textArea.select();
+ return;
+ }
+
var charCode = e.originalEvent.charCode;
var keyCode = e.originalEvent.keyCode;
if (e.type === 'keypress') {
@@ -903,9 +914,6 @@ L.TileLayer = L.GridLayer.extend({
}
else {
e.clipboardData.setData('text/plain',
this._selectionTextContent);
- var clipboardContainer =
L.DomUtil.get('clipboard-container');
- L.DomUtil.setStyle(clipboardContainer, 'display',
'none');
- this._map._container.focus();
}
}
});
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 85ab119..4f25698 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -584,7 +584,7 @@ L.Map = L.Evented.extend({
L.DomEvent[onOff](this._container, 'click dblclick mousedown
mouseup ' +
'mouseover mouseout mousemove contextmenu keydown
keypress keyup', this._handleDOMEvent, this);
- L.DomEvent[onOff](L.DomUtil.get('clipboard'), 'copy',
this._handleDOMEvent, this);
+ L.DomEvent[onOff](L.DomUtil.get('clipboard'), 'copy keydown
keypress keyup', this._handleDOMEvent, this);
if (this.options.trackResize) {
L.DomEvent[onOff](window, 'resize', this._onResize,
this);
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Keyboard.js
index afc0763..e524ce8 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -125,14 +125,6 @@ L.Map.Keyboard = L.Handler.extend({
},
_onKeyDown: function (e) {
- if (e.ctrlKey) {
- var clipboardContainer =
L.DomUtil.get('clipboard-container');
- var textArea = L.DomUtil.get('clipboard');
- L.DomUtil.setStyle(clipboardContainer, 'display',
'inline');
- textArea.value = 'dummy text';
- textArea.focus();
- textArea.select();
- }
if (this._map._bDisableKeyboard || e.altKey || e.ctrlKey ||
e.metaKey) { return; }
var key = e.keyCode,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/compiler.cxx | 88 ---
1 file changed, 65 insertions(+), 23 deletions(-)
New commits:
commit 7511c2af96f9b0a6830c64d6a80cb4d6c8e7af8f
Author: Eike Rathke
Date: Fri Jun 26 17:43:36 2015 +0200
tdf#44419 display entire column/row references as A:A/1:1
... if both anchors of the other axis are absolute. Now that we can
parse them as of commit 0c8778ce1df92ca3bc2a8dd2f64568fb257e9e39 (and
follow-up 4091b4fbdce40262eba46ab94653287b1fd928e8).
Change-Id: Ie67127fe2d7546e7e598ee1a4d89133c0862
(cherry picked from commit eeea41e2e726dd5d69cd323909e1666efb9de472)
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ec2e796..ad5b0ec 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -763,12 +763,25 @@ struct ConventionOOO_A1 : public Convention_A1
rBuf.append('.');
}
+enum SingletonDisplay
+{
+SINGLETON_NONE,
+SINGLETON_COL,
+SINGLETON_ROW
+};
+
static void MakeOneRefStrImpl(
OUStringBuffer& rBuffer,
const OUString& rErrRef, const std::vector& rTabNames,
const ScSingleRefData& rRef, const ScAddress& rAbsRef,
-bool bForceTab, bool bODF )
+bool bForceTab, bool bODF, SingletonDisplay eSingletonDisplay )
{
+// For ODF override singleton so earlier releases still can read what
+// we write now as of 2015-06-26.
+/* TODO: we may want to change that in future in a few releases. */
+if (bODF)
+eSingletonDisplay = SINGLETON_NONE;
+
if( rRef.IsFlag3D() || bForceTab )
{
if (!ValidTab(rAbsRef.Tab()) || rRef.IsTabDeleted())
@@ -787,18 +800,45 @@ struct ConventionOOO_A1 : public Convention_A1
}
else if (bODF)
rBuffer.append('.');
-if (!rRef.IsColRel())
-rBuffer.append('$');
-if (!ValidCol(rAbsRef.Col()) || rRef.IsColDeleted())
-rBuffer.append(rErrRef);
-else
-MakeColStr(rBuffer, rAbsRef.Col());
-if (!rRef.IsRowRel())
-rBuffer.append('$');
-if (!ValidRow(rAbsRef.Row()) || rRef.IsRowDeleted())
-rBuffer.append(rErrRef);
-else
-MakeRowStr(rBuffer, rAbsRef.Row());
+
+if (eSingletonDisplay != SINGLETON_ROW)
+{
+if (!rRef.IsColRel())
+rBuffer.append('$');
+if (!ValidCol(rAbsRef.Col()) || rRef.IsColDeleted())
+rBuffer.append(rErrRef);
+else
+MakeColStr(rBuffer, rAbsRef.Col());
+}
+
+if (eSingletonDisplay != SINGLETON_COL)
+{
+if (!rRef.IsRowRel())
+rBuffer.append('$');
+if (!ValidRow(rAbsRef.Row()) || rRef.IsRowDeleted())
+rBuffer.append(rErrRef);
+else
+MakeRowStr(rBuffer, rAbsRef.Row());
+}
+}
+
+static SingletonDisplay getSingletonDisplay( const ScAddress& rAbs1, const
ScAddress& rAbs2,
+const ScComplexRefData& rRef )
+{
+// If any part is error, display as such.
+if (!ValidCol(rAbs1.Col()) || rRef.Ref1.IsColDeleted() ||
!ValidRow(rAbs1.Row()) || rRef.Ref1.IsRowDeleted() ||
+!ValidCol(rAbs2.Col()) || rRef.Ref2.IsColDeleted() ||
!ValidRow(rAbs2.Row()) || rRef.Ref2.IsRowDeleted())
+return SINGLETON_NONE;
+
+// A:A or $A:$A or A:$A or $A:A, both row anchors must be absolute.
+if (rAbs1.Row() == 0 && rAbs2.Row() == MAXROW && !rRef.Ref1.IsRowRel()
&& !rRef.Ref2.IsRowRel())
+return SINGLETON_COL;
+
+// 1:1 or $1:$1 or 1:$1 or $1:1, both column anchors must be absolute.
+if (rAbs1.Col() == 0 && rAbs2.Col() == MAXCOL && !rRef.Ref1.IsColRel()
&& !rRef.Ref2.IsColRel())
+return SINGLETON_ROW;
+
+return SINGLETON_NONE;
}
virtual void makeRefStr( OUStringBuffer& rBuffer,
@@ -809,18 +849,19 @@ struct ConventionOOO_A1 : public Convention_A1
bool bSingleRef,
bool /*bFromRangeName*/ ) const SAL_OVERRIDE
{
-ScComplexRefData aRef( rRef );
// In case absolute/relative positions weren't separately available:
// transform relative to absolute!
-ScAddress aAbs1 = aRef.Ref1.toAbs(rPos), aAbs2;
+ScAddress aAbs1 = rRef.Ref1.toAbs(rPos), aAbs2;
if( !bSingleRef )
-aAbs2 = aRef.Ref2.toAbs(rPos);
+aAbs2 = rRef.Ref2.toAbs(rPos);
-MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, aRef.Ref1, aAbs1,
false, false);
+SingletonDisplay eSingleton = bSingleRef ? SINGLETON_NONE :
getSingletonDisplay( aAbs1, aAbs2, rRef);
+MakeOneRefStrImpl(rBuffer, rErrRef, rTabNames, rRef.Ref1, aAbs1,
false, false, eSingleton);
if (!bSingleRef)
{
rBuffer.append(':
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/GridLayer.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe4ff86335ff77ab03b4cc32696c4c70d1a0df89
Author: Mihai Varga
Date: Fri Jun 26 19:29:02 2015 +0300
Temporarily disable client cache
Until we invalidate tiles from all zoom levels
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 64e3054..6885a01 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -587,7 +587,7 @@ L.GridLayer = L.Layer.extend({
// FIXME: this _tileCache is used for prev/next slide; but it is
// dangerous in connection with typing / invalidation, so let's
// comment it out for now
- this._tileCache[key] = tile.el.src;
+ //this._tileCache[key] = tile.el.src;
L.DomUtil.remove(tile.el);
delete this._tiles[key];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Anytime builder VMs for devs (was: test infrastructure ideas appreciated ...)
Hi Björn, *, On Thu, Jun 18, 2015 at 11:14 AM, Bjoern Michaelsen wrote: > On Wed, Jun 03, 2015 at 02:33:23PM +0100, Michael Meeks wrote: >> Constructive thoughts appreciated in reply here. > > Budget for 2-5 of our Hackfest VMs[1] to always be on standby for someone > wanting to do a fast build, and provision for Cloph to be able to hand out > log-ins at a quick ping on IRC. What is the suggested "standby time"? Creating a disk-image/EC2 virtual machine from a stored snapshot takes a while (>20min). ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools svtools/source ucb/source
include/svtools/ServerDetailsControls.hxx|1 +
svtools/source/dialogs/ServerDetailsControls.cxx |4
ucb/source/ucp/cmis/cmis_repo_content.cxx|1 +
3 files changed, 6 insertions(+)
New commits:
commit f7f79041f4cf652212834c58eb171d83751af487
Author: Szymon KÅos
Date: Fri Jun 26 17:54:11 2015 +0200
PlaceEditDialog: temporary error box (showing when auth failed)
Change-Id: I614c62df60e4da4f6bb36438cbd3360484cd518c
diff --git a/include/svtools/ServerDetailsControls.hxx
b/include/svtools/ServerDetailsControls.hxx
index e56f3e7..29c951a 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
class DetailsContainer
{
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx
b/svtools/source/dialogs/ServerDetailsControls.cxx
index c30b53b..08460cb 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -411,6 +411,10 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl )
}
catch ( const Exception& )
{
+ScopedVclPtrInstance< ErrorBox > pErrorBox( static_cast< vcl::Window*
>( NULL ),
+ WB_OK,
+ "Auth failed!" );
+pErrorBox->Execute( );
}
// Auto-select the first one
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 86be92c..5128b70 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -202,6 +202,7 @@ namespace cmis
catch (const libcmis::Exception& e)
{
SAL_INFO( "ucb.ucp.cmis", "Error getting repositories: "
<< e.what() );
+throw uno::Exception( );
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/refdata.hxx | 14 ++
sc/source/core/tool/compiler.cxx |8
2 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit dcbceb945b7a282c1a1309cf07e62ecc925e98f6
Author: Eike Rathke
Date: Fri Jun 26 20:05:54 2015 +0200
use ScComplexRefData::IsEntireCol() and IsEntireRow()
Change-Id: I4287019f5492825f6d295c4e364405f0d7329eb7
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index e0d9b80..c49682f 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -146,6 +146,20 @@ struct ScComplexRefData
tab if one sheet, or >=0 if more than one sheets. */
bool ValidExternal() const;
+/** Whether this references entire columns, A:A */
+inline bool IsEntireCol() const
+{
+// Both row anchors must be absolute.
+return Ref1.Row() == 0 && Ref2.Row() == MAXROW && !Ref1.IsRowRel() &&
!Ref2.IsRowRel();
+}
+
+/** Whether this references entire rows, 1:1 */
+inline bool IsEntireRow() const
+{
+// Both column anchors must be absolute.
+return Ref1.Col() == 0 && Ref2.Col() == MAXCOL && !Ref1.IsColRel() &&
!Ref2.IsColRel();
+}
+
SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
void SetRange( const ScRange& rRange, const ScAddress& rPos );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 9251731..e75bce8 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -829,12 +829,12 @@ struct ConventionOOO_A1 : public Convention_A1
!ValidCol(rAbs2.Col()) || rRef.Ref2.IsColDeleted() ||
!ValidRow(rAbs2.Row()) || rRef.Ref2.IsRowDeleted())
return SINGLETON_NONE;
-// A:A or $A:$A or A:$A or $A:A, both row anchors must be absolute.
-if (rAbs1.Row() == 0 && rAbs2.Row() == MAXROW && !rRef.Ref1.IsRowRel()
&& !rRef.Ref2.IsRowRel())
+// A:A or $A:$A or A:$A or $A:A
+if (rRef.IsEntireCol())
return SINGLETON_COL;
-// 1:1 or $1:$1 or 1:$1 or $1:1, both column anchors must be absolute.
-if (rAbs1.Col() == 0 && rAbs2.Col() == MAXCOL && !rRef.Ref1.IsColRel()
&& !rRef.Ref2.IsColRel())
+// 1:1 or $1:$1 or 1:$1 or $1:1
+if (rRef.IsEntireRow())
return SINGLETON_ROW;
return SINGLETON_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Improve user experience with CMIS – Weekly report #5
My work this week: * improved accessibility: now we can access breadcrumb, folder tree and file list with keyboard. The dialog still have a small bug: while using tab + shift (reversed direction) file list is omitted. * I added a type of service before it's name, like it is in the mockup * created a subclass of the SvTreeListBox and moved tree's code to it. Tree adds nodes in the RequestChildren method, not in the event handler. When user goes into a directory in the files listbox or breadcrumb, nodes are expanded. * handled open button, double click on file * Now the open button works and opening files is possible * If auth fails during attempt to create a new service, error message box appears * some small fixes like decoding text in edit boxes, cleaning code To do next: * [from previous report] user should be able to change password after failed authorization. * async operations * integrate dialog with FileDialogHelper, for example, in different contexts dialog should be filled with the proper filters Regards, Szymon ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/chart2/res/areas3d_52x60.png |binary icon-themes/breeze/chart2/res/areas_52x60.png |binary icon-themes/breeze/chart2/res/areasfull3d_52x60.png |binary icon-themes/breeze/chart2/res/areasfull_52x60.png |binary icon-themes/breeze/chart2/res/areaspiled3d_52x60.png |binary icon-themes/breeze/chart2/res/areaspiled_52x60.png|binary icon-themes/breeze/chart2/res/bar3d_52x60.png |binary icon-themes/breeze/chart2/res/bar3ddeep_52x60.png |binary icon-themes/breeze/chart2/res/bar_52x60.png |binary icon-themes/breeze/chart2/res/barpercent3d_52x60.png |binary icon-themes/breeze/chart2/res/barpercent_52x60.png|binary icon-themes/breeze/chart2/res/barstack3d_52x60.png|binary icon-themes/breeze/chart2/res/barstack_52x60.png |binary icon-themes/breeze/chart2/res/bubble_52x60.png|binary icon-themes/breeze/chart2/res/columnline_52x60.png|binary icon-themes/breeze/chart2/res/columnpercent3d_52x60.png |binary icon-themes/breeze/chart2/res/columnpercent_52x60.png |binary icon-themes/breeze/chart2/res/columns3d_52x60.png |binary icon-themes/breeze/chart2/res/columns3ddeep_52x60.png |binary icon-themes/breeze/chart2/res/columns_52x60.png |binary icon-themes/breeze/chart2/res/columnstack3d_52x60.png |binary icon-themes/breeze/chart2/res/columnstack_52x60.png |binary icon-themes/breeze/chart2/res/columnstackline_52x60.png |binary icon-themes/breeze/chart2/res/cone_52x60.png |binary icon-themes/breeze/chart2/res/conedeep_52x60.png |binary icon-themes/breeze/chart2/res/conehori_52x60.png |binary icon-themes/breeze/chart2/res/conehorideep_52x60.png |binary icon-themes/breeze/chart2/res/conehoripercent_52x60.png |binary icon-themes/breeze/chart2/res/conehoristack_52x60.png |binary icon-themes/breeze/chart2/res/conepercent_52x60.png |binary icon-themes/breeze/chart2/res/conestack_52x60.png |binary icon-themes/breeze/chart2/res/cylinder_52x60.png |binary icon-themes/breeze/chart2/res/cylinderdeep_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhori_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhorideep_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhoriprocent_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhoristack_52x60.png |binary icon-themes/breeze/chart2/res/cylinderpercent_52x60.png |binary icon-themes/breeze/chart2/res/cylinderstack_52x60.png |binary icon-themes/breeze/chart2/res/donut3d_52x60.png |binary icon-themes/breeze/chart2/res/donut3dexploded_52x60.png |binary icon-themes/breeze/chart2/res/donut_52x60.png |binary icon-themes/breeze/chart2/res/donutexploded_52x60.png |binary icon-themes/breeze/chart2/res/net_52x60.png |binary icon-themes/breeze/chart2/res/netfill_52x60.png |binary icon-themes/breeze/chart2/res/netlinepoint_52x60.png |binary icon-themes/breeze/chart2/res/netlinepointstack_52x60.png |binary icon-themes/breeze/chart2/res/netpoint_52x60.png |binary icon-themes/breeze/chart2/res/netpointstack_52x60.png |binary icon-themes/breeze/chart2/res/netstack_52x60.png |binary icon-themes/breeze/chart2/res/netstackfill_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png|binary icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png |binary icon-themes/breeze/chart2/res/nostackstepped3d_52x60.png |binary icon-themes/breeze/chart2/res/nostacksteppedboth_52x60.png|binary icon-themes/breeze/chart2/res/nostacksteppedlines_52x60.png |binary icon-themes/breeze/chart2/res/pie3d_52x60.png |binary icon-themes/breeze/chart2/res/pie3dexploded_52x60.png |binary icon-themes/breeze/chart2/res/pie_52x60.png |binary icon-themes/breeze/chart2/res/pieexploded_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirect3d_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirectboth_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirectlines_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirectpoints_52x60.png |binary 66 files changed New commits: commit 5c80ff5cce4da88014834329342d50a0365b6142 Author: andreask Date: Thu Jun 25 22:47:25 2015 +0200 Breeze: add chart diagramm type support Change-Id: I4aeef961b8a3e06cbff2762d7734eb2e877dba01 Reviewed-on: https://gerrit.libreoffice.org/16493 Tested-by:
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_draw.png |binary icon-themes/breeze/cmd/sc_draw.png |binary 2 files changed New commits: commit 3236c4926afb8598fc2d8623e539bd85694253c0 Author: andreask Date: Fri Jun 26 07:36:42 2015 +0200 Breeze: draw icon show an update symbol galaxy, tango show also an update symbol for the draw icon was used in math (update page) for example Change-Id: If68609ced00ab17dc7ca4074085a912985f7d647 Reviewed-on: https://gerrit.libreoffice.org/16499 Reviewed-by: andreas_kainz Tested-by: Jenkins Reviewed-by: Yousuf Philips diff --git a/icon-themes/breeze/cmd/lc_draw.png b/icon-themes/breeze/cmd/lc_draw.png index 4002e97..74ba581 100644 Binary files a/icon-themes/breeze/cmd/lc_draw.png and b/icon-themes/breeze/cmd/lc_draw.png differ diff --git a/icon-themes/breeze/cmd/sc_draw.png b/icon-themes/breeze/cmd/sc_draw.png index af8e66c..6486ddd 100644 Binary files a/icon-themes/breeze/cmd/sc_draw.png and b/icon-themes/breeze/cmd/sc_draw.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/inc sc/source
sc/inc/refdata.hxx | 14 ++
sc/source/core/tool/compiler.cxx |8
2 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit e8f83d8fca7cd24375a1b9ec5e4c8a25972276c7
Author: Eike Rathke
Date: Fri Jun 26 20:05:54 2015 +0200
use ScComplexRefData::IsEntireCol() and IsEntireRow()
Change-Id: I4287019f5492825f6d295c4e364405f0d7329eb7
(cherry picked from commit dcbceb945b7a282c1a1309cf07e62ecc925e98f6)
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index e0d9b80..c49682f 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -146,6 +146,20 @@ struct ScComplexRefData
tab if one sheet, or >=0 if more than one sheets. */
bool ValidExternal() const;
+/** Whether this references entire columns, A:A */
+inline bool IsEntireCol() const
+{
+// Both row anchors must be absolute.
+return Ref1.Row() == 0 && Ref2.Row() == MAXROW && !Ref1.IsRowRel() &&
!Ref2.IsRowRel();
+}
+
+/** Whether this references entire rows, 1:1 */
+inline bool IsEntireRow() const
+{
+// Both column anchors must be absolute.
+return Ref1.Col() == 0 && Ref2.Col() == MAXCOL && !Ref1.IsColRel() &&
!Ref2.IsColRel();
+}
+
SC_DLLPUBLIC ScRange toAbs( const ScAddress& rPos ) const;
void SetRange( const ScRange& rRange, const ScAddress& rPos );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ad5b0ec..22272fb 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -830,12 +830,12 @@ struct ConventionOOO_A1 : public Convention_A1
!ValidCol(rAbs2.Col()) || rRef.Ref2.IsColDeleted() ||
!ValidRow(rAbs2.Row()) || rRef.Ref2.IsRowDeleted())
return SINGLETON_NONE;
-// A:A or $A:$A or A:$A or $A:A, both row anchors must be absolute.
-if (rAbs1.Row() == 0 && rAbs2.Row() == MAXROW && !rRef.Ref1.IsRowRel()
&& !rRef.Ref2.IsRowRel())
+// A:A or $A:$A or A:$A or $A:A
+if (rRef.IsEntireCol())
return SINGLETON_COL;
-// 1:1 or $1:$1 or 1:$1 or $1:1, both column anchors must be absolute.
-if (rAbs1.Col() == 0 && rAbs2.Col() == MAXCOL && !rRef.Ref1.IsColRel()
&& !rRef.Ref2.IsColRel())
+// 1:1 or $1:$1 or 1:$1 or $1:1
+if (rRef.IsEntireRow())
return SINGLETON_ROW;
return SINGLETON_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx |5 +++--
bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx |5 -
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit c1e12b15e55a82f062960f40921e0c97afda2078
Author: Stephan Bergmann
Date: Fri Jun 26 17:35:41 2015 +0200
Use declarations from cxxabi.h
Change-Id: Ie9bf973e87bf571e19ba036dac3a41054eaed568
Reviewed-on: https://gerrit.libreoffice.org/16520
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index fb579a2..ab601dd 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -25,6 +25,7 @@
#include
#include
+#include
#include
#include "com/sun/star/uno/RuntimeException.hpp"
@@ -290,7 +291,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping *
pUno2Cpp )
OUString::unacquired( &pUnoExc->pType->pTypeName ) );
}
-pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
+pCppExc = __cxxabiv1::__cxa_allocate_exception( pTypeDescr->nSize );
::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
// destruct uno exception
@@ -321,7 +322,7 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping *
pUno2Cpp )
}
}
-__cxa_throw( pCppExc, rtti, deleteException );
+__cxxabiv1::__cxa_throw( pCppExc, rtti, deleteException );
}
void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc,
uno_Mapping * pCpp2Uno )
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
index 0c7bbbf..5d9ca46 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx
@@ -133,11 +133,6 @@ extern "C" CPPU_CURRENT_NAMESPACE::__cxa_eh_globals
*__cxa_get_globals () throw(
namespace CPPU_CURRENT_NAMESPACE
{
-extern "C" void *__cxa_allocate_exception(
-std::size_t thrown_size ) throw();
-extern "C" void __cxa_throw (
-void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
-
void raiseException(
uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit acfad75fc9c17e4f4c9a920ddac46ac0e1a95c3b
Author: Henry Castro
Date: Fri Jun 26 15:38:58 2015 -0400
loleaflet: Fix cursor visible when changing part.
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 36e416e..fc83fff 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -247,7 +247,7 @@ L.TileLayer = L.GridLayer.extend({
if (textMsg.startsWith('cursorvisible:')) {
var command = textMsg.match('cursorvisible: true');
- this._isCursorVisible = command === undefined ? false :
true;
+ this._isCursorVisible = command ? true : false;
this._isCursorOverlayVisible = true;
this._onUpdateCursor();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - icon-themes/breeze icon-themes/galaxy
icon-themes/breeze/chart2/res/areas3d_52x60.png |binary icon-themes/breeze/chart2/res/areas_52x60.png |binary icon-themes/breeze/chart2/res/areasfull3d_52x60.png |binary icon-themes/breeze/chart2/res/areasfull_52x60.png |binary icon-themes/breeze/chart2/res/areaspiled3d_52x60.png |binary icon-themes/breeze/chart2/res/areaspiled_52x60.png|binary icon-themes/breeze/chart2/res/bar3d_52x60.png |binary icon-themes/breeze/chart2/res/bar3ddeep_52x60.png |binary icon-themes/breeze/chart2/res/bar_52x60.png |binary icon-themes/breeze/chart2/res/barpercent3d_52x60.png |binary icon-themes/breeze/chart2/res/barpercent_52x60.png|binary icon-themes/breeze/chart2/res/barstack3d_52x60.png|binary icon-themes/breeze/chart2/res/barstack_52x60.png |binary icon-themes/breeze/chart2/res/bubble_52x60.png|binary icon-themes/breeze/chart2/res/columnline_52x60.png|binary icon-themes/breeze/chart2/res/columnpercent3d_52x60.png |binary icon-themes/breeze/chart2/res/columnpercent_52x60.png |binary icon-themes/breeze/chart2/res/columns3d_52x60.png |binary icon-themes/breeze/chart2/res/columns3ddeep_52x60.png |binary icon-themes/breeze/chart2/res/columns_52x60.png |binary icon-themes/breeze/chart2/res/columnstack3d_52x60.png |binary icon-themes/breeze/chart2/res/columnstack_52x60.png |binary icon-themes/breeze/chart2/res/columnstackline_52x60.png |binary icon-themes/breeze/chart2/res/cone_52x60.png |binary icon-themes/breeze/chart2/res/conedeep_52x60.png |binary icon-themes/breeze/chart2/res/conehori_52x60.png |binary icon-themes/breeze/chart2/res/conehorideep_52x60.png |binary icon-themes/breeze/chart2/res/conehoripercent_52x60.png |binary icon-themes/breeze/chart2/res/conehoristack_52x60.png |binary icon-themes/breeze/chart2/res/conepercent_52x60.png |binary icon-themes/breeze/chart2/res/conestack_52x60.png |binary icon-themes/breeze/chart2/res/cylinder_52x60.png |binary icon-themes/breeze/chart2/res/cylinderdeep_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhori_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhorideep_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhoriprocent_52x60.png |binary icon-themes/breeze/chart2/res/cylinderhoristack_52x60.png |binary icon-themes/breeze/chart2/res/cylinderpercent_52x60.png |binary icon-themes/breeze/chart2/res/cylinderstack_52x60.png |binary icon-themes/breeze/chart2/res/donut3d_52x60.png |binary icon-themes/breeze/chart2/res/donut3dexploded_52x60.png |binary icon-themes/breeze/chart2/res/donut_52x60.png |binary icon-themes/breeze/chart2/res/donutexploded_52x60.png |binary icon-themes/breeze/chart2/res/net_52x60.png |binary icon-themes/breeze/chart2/res/netfill_52x60.png |binary icon-themes/breeze/chart2/res/netlinepoint_52x60.png |binary icon-themes/breeze/chart2/res/netlinepointstack_52x60.png |binary icon-themes/breeze/chart2/res/netpoint_52x60.png |binary icon-themes/breeze/chart2/res/netpointstack_52x60.png |binary icon-themes/breeze/chart2/res/netstack_52x60.png |binary icon-themes/breeze/chart2/res/netstackfill_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png|binary icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png |binary icon-themes/breeze/chart2/res/nostackstepped3d_52x60.png |binary icon-themes/breeze/chart2/res/nostacksteppedboth_52x60.png|binary icon-themes/breeze/chart2/res/nostacksteppedlines_52x60.png |binary icon-themes/breeze/chart2/res/pie3d_52x60.png |binary icon-themes/breeze/chart2/res/pie3dexploded_52x60.png |binary icon-themes/breeze/chart2/res/pie_52x60.png |binary icon-themes/breeze/chart2/res/pieexploded_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirect3d_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirectboth_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirectlines_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisdirectpoints_52x60.png |binary icon-themes/breeze/cmd/lc_addprintarea.png|binary icon-themes/breeze/cmd/lc_addtable.png|binary icon-themes/breeze/cmd/lc_bezierinsert.png|binary icon-themes/breeze/cmd/lc_changecasetolower.png |binary icon-themes/breeze/cmd/lc_ch
[Libreoffice-commits] core.git: 3 commits - include/vcl vcl/headless vcl/inc vcl/osx vcl/qa vcl/source vcl/unx vcl/win
include/vcl/svapp.hxx |8 +
vcl/headless/svpinst.cxx|4 ++
vcl/inc/headless/svpinst.hxx|2 -
vcl/inc/osx/salinst.h |2 -
vcl/inc/salinst.hxx |2 -
vcl/inc/unx/gtk/gtkinst.hxx |2 -
vcl/inc/unx/salinst.h |2 -
vcl/inc/win/salinst.h | 22 +++
vcl/osx/salinst.cxx |4 ++
vcl/qa/cppunit/timer.cxx|2 -
vcl/source/app/svapp.cxx| 36 +
vcl/unx/generic/app/salinst.cxx |4 ++
vcl/unx/gtk/app/gtkinst.cxx |4 ++
vcl/win/source/app/salinst.cxx | 56
14 files changed, 111 insertions(+), 39 deletions(-)
New commits:
commit 7790b6a4544cf2d5ba0bcdfae31346cf2f9a0041
Author: Michael Stahl
Date: Fri Jun 26 23:09:29 2015 +0200
vcl: convert some BOOLs
Change-Id: I6d6d63a88ef125b12614f1daeab7afbab06c47ca
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 227d6af..8a79471 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -223,17 +223,17 @@ void ImplSalYieldMutexAcquireWithWait()
if ( pSalData->mnAppThreadId == nThreadId )
{
// wait till we get the Mutex
-bool bAcquire = FALSE;
+bool bAcquire = false;
do
{
if ( pInst->mpSalYieldMutex->tryToAcquire() )
-bAcquire = TRUE;
+bAcquire = true;
else
{
pInst->mpSalWaitMutex->acquire();
if ( pInst->mpSalYieldMutex->tryToAcquire() )
{
-bAcquire = TRUE;
+bAcquire = true;
pInst->mpSalWaitMutex->release();
}
else
@@ -273,7 +273,7 @@ bool ImplSalYieldMutexTryToAcquire()
if ( pInst )
return pInst->mpSalYieldMutex->tryToAcquire();
else
-return FALSE;
+return false;
}
void ImplSalYieldMutexRelease()
@@ -398,16 +398,16 @@ SalData::SalData()
mnStockBrushCount = 0; // count of static brushes
mnSalObjWantKeyEvt = 0; // KeyEvent for the SalObj hook
mnCacheDCInUse = 0; // count of CacheDC in use
-mbObjClassInit = FALSE; // is SALOBJECTCLASS initialised
-mbInPalChange = FALSE; // is in WM_QUERYNEWPALETTE
+mbObjClassInit = false; // is SALOBJECTCLASS initialised
+mbInPalChange = false; // is in WM_QUERYNEWPALETTE
mnAppThreadId = 0; // Id from Applikation-Thread
mbScrSvrEnabled = FALSE;// ScreenSaver enabled
mnSageStatus = 0; // status of Sage-DLL (DISABLE_AGENT == not
available)
mpSageEnableProc = 0; // funktion to deactivate the system agent
mpFirstIcon = 0;// icon cache, points to first icon, NULL if
none
mpTempFontItem = 0;
-mbThemeChanged = FALSE; // true if visual theme was changed: throw
away theme handles
-mbThemeMenuSupport = FALSE;
+mbThemeChanged = false; // true if visual theme was changed: throw
away theme handles
+mbThemeMenuSupport = false;
// init with NULL
gdiplusToken = 0;
@@ -905,7 +905,7 @@ bool WinSalInstance::AnyInput( VclInputFlags nType )
}
}
-return FALSE;
+return false;
}
void SalTimer::Start( sal_uLong nMS )
commit ea2be4ef9ecaacffb36e48bd678a4fe8916c617c
Author: Michael Stahl
Date: Fri Jun 26 23:06:25 2015 +0200
vcl: document the non-obvious WinSalInstance's WaitMutex members
Change-Id: I004f082c9e4a17aeb7a8bd778bf45dff93e47ee8
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index b3337ac..6eab9b3 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -27,11 +27,21 @@ class SalYieldMutex;
class WinSalInstance : public SalInstance
{
public:
-HINSTANCE mhInst; // Instance Handle
-HWNDmhComWnd; // window, for communication
(between threads and the main thread)
-SalYieldMutex* mpSalYieldMutex;// Sal-Yield-Mutex
-osl::Mutex* mpSalWaitMutex; // Sal-Wait-Mutex
-sal_uInt16 mnYieldWaitCount; // Wait-Count
+/// Instance Handle
+HINSTANCE mhInst;
+/// invisible Window so non-main threads can SendMessage() the main thread
+HWNDmhComWnd;
+/// The Yield mutex ensures that only one thread calls into VCL
+SalYieldMutex* mpSalYieldMutex;
+/// The Wait mutex ensures increment of mnYieldWaitCount and acquisition
+/// or release of mpSalYieldMutex is atomic
+osl::Mutex* mpSalWaitMutex;
+/// count main thread's pending ImplSalYieldMutexAcquireWithWait() calls
+/// (it's not clear to me if this will be > 1 in practice; it would be
+/// possible if main thread's handling of SAL_MSG_* sent by other threads
+/// via SendMessage() ends
Re: vcl::Window::dispose deadlock
On 09.06.2015 11:36, Michael Stahl wrote:
> On 09.06.2015 10:02, Noel Grandin wrote:
>> On 2015-06-09 09:58 AM, Stephan Bergmann wrote:
>>> On Windows, with master as of last night, "make check" happened to run into
>>> a deadlock in soffice.bin as below. The
>>> main thread is trying to re-acquire the SolarMutex (after a
>>> SolarMutexReleaser) from within the event loop, while an
>>> incoming URP thread (apparently holding the SolarMutex) does
>>> vcl::Window::dispose which, on Windows, blocks on sending a
>>> message into the event loop.
>
> this started happening for me in sc_unoapi on a --enable-dbgutil build
> almost always since half a year or so; before that it was less likely
> for whatever reason but still did happen. (the deadlock moved from
> ~Window to Window::dispose due to VclPtr refactoring.)
>
> the deadlock does not appear easily fixable; the last slide of my
> threading talk last year was about it actually.
now something i read in the MSDN documentation of GetMessage gave me an
idea, and it turns out that...
i think i understand one quite surprising aspect of the Win32 SAL
implementation:
the SolarMutex is not *really* a mutex, or rather, it is not implemented
purely as a mutex on this platform.
non-main threads block on a osl::Mutex mpSalYieldMutex to acquire the
SolarMutex, but the main thread does a very peculiar dance in
ImplSalYieldMutexAcquireWithWait():
> do
> {
> if ( pInst->mpSalYieldMutex->tryToAcquire() )
> bAcquire = TRUE;
> else
> {
> pInst->mpSalWaitMutex->acquire();
> if ( pInst->mpSalYieldMutex->tryToAcquire() )
> {
> bAcquire = TRUE;
> pInst->mpSalWaitMutex->release();
> }
> else
> {
> pInst->mnYieldWaitCount++;
> pInst->mpSalWaitMutex->release();
> MSG aTmpMsg;
> GetMessageW( &aTmpMsg, pInst->mhComWnd,
> SAL_MSG_RELEASEWAITYIELD, SAL_MSG_RELEASEWAITYIELD );
> pInst->mnYieldWaitCount--;
> if ( pInst->mnYieldWaitCount )
> PostMessageW( pInst->mhComWnd, SAL_MSG_RELEASEWAITYIELD,
> 0, 0 );
> }
> }
> }
> while ( !bAcquire );
if the mpSalYieldMutex is locked by another thread, the main thread does
not block on the mpSalYieldMutex, but instead blocks in Win32 GetMessage().
the reason why it does that, is that GetMessage() will not only get you
the message with the type you pass in as parameter; in fact the first
thing GetMessage() does is to look if another thread has a pending
SendMessage() to a window on the current thread, and if so immediately
dispatch that message.
this means that the main thread can in fact handle the SendMessage()
calls from other threads to create/destroy Windows and DCs without
deadlocking, if it waits in ImplSalYieldMutexAcquireWithWait().
to prevent deadlocks on Windows, as soon as other threads are running,
the main thread *must* acquire SolarMutex only via
ImplSalYieldMutexAcquireWithWait().
unfortunately the Application::AcquireSolarMutex() does not do this but
blocks on locking the mpSalYieldMutex.
this is used by SolarMutexReleaser, and thus SolarMutexReleaser causes
deadlocks on Windows (whereas all the entry points from Win32 WndProcs
already do the right thing).
my hope is that the main thread only first-acquires the SolarMutex via
VCL internal code or via SolarMutexReleaser, and not with the ordinary
SolarMutexGuard that is used in UNO entry points.
commit 482c52e91fe41a52e68827e9bf64a9736427d517 should fix this deadlock
scenario on master, and thus there are no known unfixable deadlock
issues that would prevent running "make check" on Windows tinderboxes.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/marker/Cursor.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 551672c08da48571cbaec820195f441cf0d8a7c1
Author: Jan Holesovsky
Date: Fri Jun 26 13:45:40 2015 +0200
Further tweaks to the cursor position.
diff --git a/loleaflet/src/layer/marker/Cursor.js
b/loleaflet/src/layer/marker/Cursor.js
index 648f543..cbe683d 100644
--- a/loleaflet/src/layer/marker/Cursor.js
+++ b/loleaflet/src/layer/marker/Cursor.js
@@ -86,7 +86,8 @@ L.Cursor = L.Layer.extend({
setSize: function (size) {
this._container.style.lineHeight = size.y + 'px';
this._span.style.fontSize = size.y - 2 + 'px';
- this._container.style.left = '-' +
this._container.clientWidth/2 + 'px';
+ this._container.style.left = '-' + (this._container.clientWidth
- size.x)/2 + 'px';
+ this._container.style.top = '-' + (this._container.clientHeight
- size.y - 2)/2 + 'px';
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - download.lst external/libetonyek
David Tardon wrote: > commit 60e38140db23ce714b172f8e60d71da4e4c495e5 > Author: David Tardon > Date: Tue Jun 2 17:49:48 2015 +0200 > > upload libetonyek 0.1.3 > > (cherry picked from commit ee3d40b30816a8fc6d4e8f984659c8dfac19ec3b) > > Change-Id: I451f02ee93a798c9c1712082d59a7ff96b0d4a4e > Reviewed-on: https://gerrit.libreoffice.org/16508 > Reviewed-by: Michael Stahl > Tested-by: Michael Stahl > Hi David, sadly that breaks on gcc4.6: configure:17296: result: yes configure:17318: checking for MDDS configure:17403: result: yes configure:17407: checking checking if mdds::flat_segment_tree can store values of any type configure:17419: /usr/bin/ccache /usr/bin/g++-4.6 -c -g -O2 -I/src/libo_tb-5-0/workdir/UnpackedTarball/mdds/include -I/src/libo_tb-5-0/workdir/UnpackedTarball/boost conftest.cpp >&5 In file included from /src/libo_tb-5-0/workdir/UnpackedTarball/mdds/include/mdds/flat_segment_tree.hpp:35:0, from conftest.cpp:45: /usr/include/c++/4.6/limits: In static member function 'static _Tp std::numeric_limits<_Tp>::max() [with _Tp = Value]': /src/libo_tb-5-0/workdir/UnpackedTarball/mdds/include/mdds/flat_segment_tree_def.inl:49:5: instantiated from 'mdds::flat_segment_tree<_Key, _Value>::flat_segment_tree(mdds::flat_segment_tree<_Key, _Value>::key_type, mdds::flat_segment_tree<_Key, _Value>::key_type, mdds::flat_segment_tree<_Key, _Value>::value_type) [with _Key = int, _Value = Value, mdds::flat_segment_tree<_Key, _Value>::key_type = int, mdds::flat_segment_tree<_Key, _Value>::value_type = Value]' conftest.cpp:47:55: instantiated from here /usr/include/c++/4.6/limits:313:48: error: no matching function for call to 'Value::Value(int)' /usr/include/c++/4.6/limits:313:48: note: candidates are: conftest.cpp:46:8: note: Value::Value() conftest.cpp:46:8: note: candidate expects 0 arguments, 1 provided conftest.cpp:46:8: note: Value::Value(const Value&) conftest.cpp:46:8: note: no known conversion for argument 1 from 'int' to 'const Value&' configure:17419: $? = 1 configure: failed program was: | /* confdefs.h */ Any easy workaround I should try? Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Looking for help for clipboard in Math
Hi Michael (and others who are interested in Math), Michael Stahl schrieb: On 23.06.2015 20:46, Regina Henschel wrote: But now I have this problem: I start module Math with a fresh document, I write a formula into the command window (e.g. a^2+b^2) and then try to save as *.mml. I get the errors cited below. I have not used any operations with the clipboard. A build from current trunk does not have this error, so it must be something, which I have introduced. But I do not know, what are possible causes and where to start. Errormessages: Locking problem. Sharing violation while accessing the object. this is a problem with file locking that generally only manifests on Windows: a file has been opened once and is opened a second time; the second opening fails. for example, the SvStream class uses file locking by default. check for code that opens the file for debug purpose and forgets to close it, or memory leak of something that contains an open file handle. There was nothing which uses the file. or perhaps you have the file open in a text editor? No, the file does not exist when the error occurred. if it's not obvious try SysInternals Process Monitor, it can trace system calls and their return values, and even display stack traces of the calls. https://technet.microsoft.com/en-us/sysinternals/bb896645.aspx With Process Monitor I could see, that there was no error in file access. I then revert all my changes and add them piece by piece, testing after each step. I found, that the error was, that I had added a clipboard format in filter/source/config/fragments/types/math_MathML_XML_Math.xcu I have attached the current version to https://bz.apache.org/ooo/show_bug.cgi?id=107734. I still have no environment for LibreOffice, so Gerrit is currently no option for me. If you nevertheless will have a look at it, that would be nice. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu |6 ++ 1 file changed, 6 insertions(+) New commits: commit 6d86e27c8467780133e0c3f7c195dd7758c9f490 Author: Yousuf Philips Date: Sat Jun 27 03:44:21 2015 +0400 Enable icons for a few chart formatting toolbar buttons Change-Id: Ibd70f1cd7cf50d7bd50347e5b428bb3a12521fc3 Reviewed-on: https://gerrit.libreoffice.org/16530 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu index 4fa9411..3f9b85e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu @@ -108,6 +108,9 @@ ~Data Ranges... + + 1 + @@ -222,6 +225,9 @@ ~All Axes... + + 1 + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/address.cxx |4 ++
sc/source/core/tool/refupdat.cxx | 10 +++--
sc/source/core/tool/token.cxx| 78 ++-
3 files changed, 78 insertions(+), 14 deletions(-)
New commits:
commit dc34bb9b05cf7b5261122a73fa9c6f5356802c19
Author: Eike Rathke
Date: Sat Jun 27 00:13:20 2015 +0200
tdf#90573 do not shift/move entire col/row references and ranges
This gets significant now that we have regular A:A/1:1 references.
Change-Id: I6cee35173cb1c13b03f6bf4dfc0dce9949536e23
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 8ac9d1a..60d6d2e 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2116,6 +2116,10 @@ bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz,
ScDocument* pDoc )
bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* pDoc )
{
+if (dy && aStart.Row() == 0 && aEnd.Row() == MAXROW)
+dy = 0; // Entire column not to be moved.
+if (dx && aStart.Col() == 0 && aEnd.Col() == MAXCOL)
+dx = 0; // Entire row not to be moved.
bool b = aStart.Move( dx, dy, dz, pDoc );
b &= aEnd.Move( dx, dy, dz, pDoc );
return b;
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index a1f39be..6aa2c3f 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -208,7 +208,8 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eUpdateRefMo
{
bool bExpand = pDoc->IsExpandRefs();
if ( nDx && (theRow1 >= nRow1) && (theRow2 <= nRow2) &&
-(theTab1 >= nTab1) && (theTab2 <= nTab2) )
+(theTab1 >= nTab1) && (theTab2 <= nTab2) &&
+!(theCol1 == 0 && theCol2 == MAXCOL) )
{
bool bExp = (bExpand && IsExpand( theCol1, theCol2, nCol1, nDx ));
bCut1 = lcl_MoveStart( theCol1, nCol1, nDx, MAXCOL );
@@ -227,7 +228,8 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eUpdateRefMo
}
}
if ( nDy && (theCol1 >= nCol1) && (theCol2 <= nCol2) &&
-(theTab1 >= nTab1) && (theTab2 <= nTab2) )
+(theTab1 >= nTab1) && (theTab2 <= nTab2) &&
+!(theRow1 == 0 && theRow2 == MAXROW) )
{
bool bExp = (bExpand && IsExpand( theRow1, theRow2, nRow1, nDy ));
bCut1 = lcl_MoveStart( theRow1, nRow1, nDy, MAXROW );
@@ -272,14 +274,14 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eUpdateRefMo
if ((theCol1 >= nCol1-nDx) && (theRow1 >= nRow1-nDy) && (theTab1 >=
nTab1-nDz) &&
(theCol2 <= nCol2-nDx) && (theRow2 <= nRow2-nDy) && (theTab2 <=
nTab2-nDz))
{
-if ( nDx )
+if ( nDx && !(theCol1 == 0 && theCol2 == MAXCOL) )
{
bCut1 = lcl_MoveItCut( theCol1, nDx, MAXCOL );
bCut2 = lcl_MoveItCut( theCol2, nDx, MAXCOL );
if ( bCut1 || bCut2 )
eRet = UR_UPDATED;
}
-if ( nDy )
+if ( nDy && !(theRow1 == 0 && theRow2 == MAXROW) )
{
bCut1 = lcl_MoveItCut( theRow1, nDy, MAXROW );
bCut2 = lcl_MoveItCut( theRow2, nDy, MAXROW );
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index c2a9f5b..4ada501 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2569,13 +2569,18 @@ void setRefDeleted( ScComplexRefData& rRef, const
sc::RefUpdateContext& rCxt )
}
}
-bool shrinkRange( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, const
ScRange& rDeletedRange )
+bool shrinkRange( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, const
ScRange& rDeletedRange,
+const ScComplexRefData& rRef )
{
if (!rDeletedRange.Intersects(rRefRange))
return false;
if (rCxt.mnColDelta < 0)
{
+if (rRef.IsEntireRow())
+// Entire rows are not affected, columns are anchored.
+return false;
+
// Shifting left.
if (rRefRange.aStart.Row() < rDeletedRange.aStart.Row() ||
rDeletedRange.aEnd.Row() < rRefRange.aEnd.Row())
// Deleted range is only partially overlapping in vertical
direction. Bail out.
@@ -2614,6 +2619,10 @@ bool shrinkRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
}
else if (rCxt.mnRowDelta < 0)
{
+if (rRef.IsEntireCol())
+// Entire columns are not affected, rows are anchored.
+return false;
+
// Shifting up.
if (rRefRange.aStart.Col() < rDeletedRange.aStart.Col() ||
rDeletedRange.aEnd.Col() < rRefRange.aEnd.Col())
@@ -2655,13 +2664,18 @@ bool shrinkRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
return false;
}
-bool expandRange( const s
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/address.cxx |4 ++
sc/source/core/tool/refupdat.cxx | 10 +++--
sc/source/core/tool/token.cxx| 78 ++-
3 files changed, 78 insertions(+), 14 deletions(-)
New commits:
commit b07e0269e5dc266828c4d621d7daae085d644df4
Author: Eike Rathke
Date: Sat Jun 27 00:13:20 2015 +0200
tdf#90573 do not shift/move entire col/row references and ranges
This gets significant now that we have regular A:A/1:1 references.
Change-Id: I6cee35173cb1c13b03f6bf4dfc0dce9949536e23
(cherry picked from commit dc34bb9b05cf7b5261122a73fa9c6f5356802c19)
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 8ac9d1a..60d6d2e 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2116,6 +2116,10 @@ bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz,
ScDocument* pDoc )
bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* pDoc )
{
+if (dy && aStart.Row() == 0 && aEnd.Row() == MAXROW)
+dy = 0; // Entire column not to be moved.
+if (dx && aStart.Col() == 0 && aEnd.Col() == MAXCOL)
+dx = 0; // Entire row not to be moved.
bool b = aStart.Move( dx, dy, dz, pDoc );
b &= aEnd.Move( dx, dy, dz, pDoc );
return b;
diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx
index a1f39be..6aa2c3f 100644
--- a/sc/source/core/tool/refupdat.cxx
+++ b/sc/source/core/tool/refupdat.cxx
@@ -208,7 +208,8 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eUpdateRefMo
{
bool bExpand = pDoc->IsExpandRefs();
if ( nDx && (theRow1 >= nRow1) && (theRow2 <= nRow2) &&
-(theTab1 >= nTab1) && (theTab2 <= nTab2) )
+(theTab1 >= nTab1) && (theTab2 <= nTab2) &&
+!(theCol1 == 0 && theCol2 == MAXCOL) )
{
bool bExp = (bExpand && IsExpand( theCol1, theCol2, nCol1, nDx ));
bCut1 = lcl_MoveStart( theCol1, nCol1, nDx, MAXCOL );
@@ -227,7 +228,8 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eUpdateRefMo
}
}
if ( nDy && (theCol1 >= nCol1) && (theCol2 <= nCol2) &&
-(theTab1 >= nTab1) && (theTab2 <= nTab2) )
+(theTab1 >= nTab1) && (theTab2 <= nTab2) &&
+!(theRow1 == 0 && theRow2 == MAXROW) )
{
bool bExp = (bExpand && IsExpand( theRow1, theRow2, nRow1, nDy ));
bCut1 = lcl_MoveStart( theRow1, nRow1, nDy, MAXROW );
@@ -272,14 +274,14 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc,
UpdateRefMode eUpdateRefMo
if ((theCol1 >= nCol1-nDx) && (theRow1 >= nRow1-nDy) && (theTab1 >=
nTab1-nDz) &&
(theCol2 <= nCol2-nDx) && (theRow2 <= nRow2-nDy) && (theTab2 <=
nTab2-nDz))
{
-if ( nDx )
+if ( nDx && !(theCol1 == 0 && theCol2 == MAXCOL) )
{
bCut1 = lcl_MoveItCut( theCol1, nDx, MAXCOL );
bCut2 = lcl_MoveItCut( theCol2, nDx, MAXCOL );
if ( bCut1 || bCut2 )
eRet = UR_UPDATED;
}
-if ( nDy )
+if ( nDy && !(theRow1 == 0 && theRow2 == MAXROW) )
{
bCut1 = lcl_MoveItCut( theRow1, nDy, MAXROW );
bCut2 = lcl_MoveItCut( theRow2, nDy, MAXROW );
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 26c2032..4c041be 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2569,13 +2569,18 @@ void setRefDeleted( ScComplexRefData& rRef, const
sc::RefUpdateContext& rCxt )
}
}
-bool shrinkRange( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, const
ScRange& rDeletedRange )
+bool shrinkRange( const sc::RefUpdateContext& rCxt, ScRange& rRefRange, const
ScRange& rDeletedRange,
+const ScComplexRefData& rRef )
{
if (!rDeletedRange.Intersects(rRefRange))
return false;
if (rCxt.mnColDelta < 0)
{
+if (rRef.IsEntireRow())
+// Entire rows are not affected, columns are anchored.
+return false;
+
// Shifting left.
if (rRefRange.aStart.Row() < rDeletedRange.aStart.Row() ||
rDeletedRange.aEnd.Row() < rRefRange.aEnd.Row())
// Deleted range is only partially overlapping in vertical
direction. Bail out.
@@ -2614,6 +2619,10 @@ bool shrinkRange( const sc::RefUpdateContext& rCxt,
ScRange& rRefRange, const Sc
}
else if (rCxt.mnRowDelta < 0)
{
+if (rRef.IsEntireCol())
+// Entire columns are not affected, rows are anchored.
+return false;
+
// Shifting up.
if (rRefRange.aStart.Col() < rDeletedRange.aStart.Col() ||
rDeletedRange.aEnd.Col() < rRefRange.aEnd.Col())
@@ -2655,13 +2664,18 @@ bool shrinkRange( const sc::RefUpdateContext& rCxt,
ScRang
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4025a5d0cbc14c8fbe8dffcd1ac2f302186e6d5e Author: Christian Lohmaier Date: Sat Jun 27 01:30:52 2015 +0200 Updated core Project: translations 7ec7a7a803df44e1c864943345cc4822f1691689 update translations for 5.0.0 rc2 and force-fix errors using pocheck Change-Id: I487b0459260934f7f89ca815abd4cceab32323d1 diff --git a/translations b/translations index ee68f18..7ec7a7a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit ee68f1889c700deb99c9ee4737eaa55f12e28318 +Subproject commit 7ec7a7a803df44e1c864943345cc4822f1691689 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl vcl/generic vcl/source
include/vcl/print.hxx |1 +
vcl/generic/print/prtsetup.cxx |6 +-
vcl/generic/print/prtsetup.hxx |5 +
vcl/source/gdi/print3.cxx |9 -
4 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 1802e4c903a0597c9cb5c2ef752fe68486e197b1
Author: Katarina Behrens
Date: Wed Jun 24 17:31:32 2015 +0200
tdf#91362: Don't override printer page autodetection
if printer settings haven't been modified
Change-Id: I68b0096ce6fa0f9e50db640a0acb3039ff7e66b5
Reviewed-on: https://gerrit.libreoffice.org/16529
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 9f381b4..81f8656 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -310,6 +310,7 @@ public:
const OUString& GetName() const { return
maPrinterName; }
const OUString& GetDriverName() const { return maDriver;
}
boolIsDefPrinter() const{ return
mbDefPrinter; }
+voidSetDefPrinter(bool bDef){ mbDefPrinter =
bDef; }
boolIsDisplayPrinter() const{ return
mpDisplayDev != nullptr; }
boolIsValid() const { return
!IsDisplayPrinter(); }
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 738d00d..e4355f0 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -281,6 +281,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
}
if( pKey )
{
+m_pParent->SetDataModified( true );
PPDValue* pValue = static_cast(pBox->GetSelectEntryData());
m_pParent->m_aJobData.m_aContext.setValue( pKey, pValue );
update();
@@ -461,6 +462,7 @@ IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
FillValueBox( pKey );
}
}
+m_pParent->SetDataModified( true );
return 0;
}
@@ -504,10 +506,12 @@ int SetupPrinterDriver(::psp::PrinterInfo& rJobData)
int nRet = 0;
ScopedVclPtrInstance< RTSDialog > aDialog( rJobData, nullptr );
+// return 0 if cancel was pressed or if the data
+// weren't modified, 1 otherwise
if( aDialog->Execute() )
{
rJobData = aDialog->getSetup();
-nRet = 1;
+nRet = aDialog->GetDataModified() ? 1 : 0;
}
return nRet;
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 67b6cd2..1be4927 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -56,6 +56,8 @@ class RTSDialog : public TabDialog
// some resources
OUStringm_aInvalidString;
+bool mbDataModified;
+
DECL_LINK( ActivatePage, TabControl* );
DECL_LINK( ClickButton, Button* );
@@ -67,6 +69,9 @@ public:
virtual void dispose() SAL_OVERRIDE;
const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
+
+void SetDataModified( bool bModified ) { mbDataModified = bModified; }
+bool GetDataModified() const { return mbDataModified; }
};
class RTSPaperPage : public TabPage
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index e29d1cc..8ccde00 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -815,7 +815,12 @@ bool PrinterController::setupPrinter( vcl::Window*
i_pParent )
// reset paper size back to last configured size, not
// whatever happens to be the current page
-resetPaperToLastConfigured();
+// (but only if the printer config has changed, otherwise
+// don't override printer page auto-detection - tdf#91362)
+if (!mpImplData->mxPrinter->IsDefPrinter())
+{
+resetPaperToLastConfigured();
+}
// call driver setup
bRet = mpImplData->mxPrinter->Setup( i_pParent );
@@ -844,6 +849,8 @@ bool PrinterController::setupPrinter( vcl::Window*
i_pParent )
{
mpImplData->maPageCache.invalidate();
}
+// Settings have been modified (i.e. this printer is no longer
default )
+mpImplData->mxPrinter->SetDefPrinter( false );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf89890.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 23 +++
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|2 +-
writerfilter/source/dmapper/NumberingManager.cxx | 14 ++
4 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit 6cef4a01e0ef59cd025cf3ee3e5d93eb0a89dda1
Author: Miklos Vajna
Date: Fri Jun 26 09:02:31 2015 +0200
tdf#89890 DOCX import: fix too large num pic bullet
Reading SwWW8ImplReader::CoreLoad()'s "update graphic bullet
information" block, it turns out that the numbering picture bullet's
height should be independent from the supplied bitmap, and only its
aspect ratio should be respected.
(cherry picked from commit eab89b7f024a8c86decdcb3362c40c40a7df37df)
Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e
Reviewed-on: https://gerrit.libreoffice.org/16502
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89890.docx
b/sw/qa/extras/ooxmlexport/data/tdf89890.docx
new file mode 100644
index 000..8b3e8eb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89890.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index fc05887..20be877 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -703,6 +703,29 @@ DECLARE_OOXMLEXPORT_TEST(testTdf79639, "tdf79639.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(1), xDrawPage->getCount());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx")
+{
+// Numbering picture bullet was too large.
+uno::Reference
xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY);
+uno::Reference
xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
+uno::Sequence aProps;
+xLevels->getByIndex(0) >>= aProps; // 1st level
+
+bool bFound = false;
+for (int i = 0; i < aProps.getLength(); ++i)
+{
+const beans::PropertyValue& rProp = aProps[i];
+
+if (rProp.Name == "GraphicSize")
+{
+// Height of the graphic was too large: 4382 after import, then
2485 after roundtrip.
+CPPUNIT_ASSERT_EQUAL(static_cast(279),
rProp.Value.get().Height);
+bFound = true;
+}
+}
+CPPUNIT_ASSERT(bFound);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 21140f3..3727353 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -353,7 +353,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx")
xmlDocPtr pXmlDoc = parseExport("word/numbering.xml");
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape",
"style", "width:6.4pt;height:6.4pt");
+assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape",
"style", "width:7.9pt;height:7.9pt");
}
DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,"fdo74153.docx")
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 481dbdf..b19b861 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -887,6 +887,20 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
case NS_ooxml::LN_CT_NumPicBullet_pict:
{
uno::Reference xShape =
m_rDMapper.PopPendingShape();
+
+// Respect only the aspect ratio of the picture, not its size.
+awt::Size aPrefSize = xShape->getSize();
+// See SwDefBulletConfig::InitFont(), default height is 14.
+const int nFontHeight = 14;
+// Point -> mm100.
+const int nHeight = nFontHeight * 35;
+if (aPrefSize.Height * aPrefSize.Width != 0)
+{
+int nWidth = (nHeight * aPrefSize.Width) /
aPrefSize.Height;
+awt::Size aSize(nWidth, nHeight);
+xShape->setSize(aSize);
+}
+
m_pCurrentNumPicBullet->SetShape(xShape);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/grouparealistener.cxx | 33 +-
1 file changed, 32 insertions(+), 1 deletion(-)
New commits:
commit d8541c2a62121894bf87c91f1f89aea1ea30d680
Author: Eike Rathke
Date: Sat Jun 27 03:14:05 2015 +0200
tdf#90717 prevent crash, not really fixed
Try to resync shared group top and length.
Change-Id: I31bd0db7c1dceb880a22274edc4c3f20ce253095
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index 46155f9..ac9ea7f 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -194,10 +194,41 @@ void FormulaGroupAreaListener::collectFormulaCells(
ScFormulaCell* const * pp = mpColumn->GetFormulaCellBlockAddress(
mnTopCellRow, nBlockSize);
if (!pp)
{
-SAL_WARN("sc", "GetFormulaCellBlockAddress not found");
+SAL_WARN("sc.core", "GetFormulaCellBlockAddress not found");
return;
}
+/* FIXME: this is tdf#90717, when deleting a row fixed size area listeners
+ * such as BCA_ALWAYS or entire row listeners are (rightly) not destroyed,
+ * but mnTopCellRow and mnGroupLen also not updated, which needs fixing.
+ * Until then pull things as straight as possible here in such situation
+ * and prevent crash. */
+if (!(*pp)->IsSharedTop())
+{
+SCROW nRow = (*pp)->GetSharedTopRow();
+if (nRow < 0)
+SAL_WARN("sc.core",
"FormulaGroupAreaListener::collectFormulaCells() no shared top");
+else
+{
+
SAL_WARN("sc.core","FormulaGroupAreaListener::collectFormulaCells() syncing
mnTopCellRow from " <<
+mnTopCellRow << " to " << nRow);
+const_cast(this)->mnTopCellRow = nRow;
+pp = mpColumn->GetFormulaCellBlockAddress( mnTopCellRow,
nBlockSize);
+if (!pp)
+{
+SAL_WARN("sc.core", "GetFormulaCellBlockAddress not found");
+return;
+}
+}
+}
+SCROW nLen = (*pp)->GetSharedLength();
+if (nLen != mnGroupLen)
+{
+SAL_WARN("sc.core", "FormulaGroupAreaListener::collectFormulaCells()
syncing mnGroupLen from " <<
+mnGroupLen << " to " << nLen);
+const_cast(this)->mnGroupLen = nLen;
+}
+
/* FIXME: with tdf#89957 it happened that the actual block size in column
* AP (shifted from AO) of sheet 'w' was smaller than the remembered group
* length and correct. This is just a very ugly workaround, the real cause
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.0.0.2'
Tag 'libreoffice-5.0.0.2' created by Christian Lohmaier at 2015-06-27 02:26 -0700 Tag libreoffice-5.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVjfu1AAoJEPQ0oe+v7q6jaa0P/2Fro/AkKOhXpF7YO17GMKW/ 5QkrpfEMiYmwK4hGCxwDq20DgnNsr6k1Cr7QwdCqHgafF4UuUBHIZQtXFaTVVZNM jn7odN3U4otwGQJI5xp552TOEuTJF/i6AqInOONEV+FQH3oFYkASTW08/k2TIdCN HUa7pAoNdKr1GRovaknOgiinI+M416mpF3XnwMTEqzVgXKI/WzJvhtq2nPczqhTn bYIjKyCUf7zNbSvigVT9a2Q+P1SisTdwTv25uuHXFq2g7ZlGHc6izpF4sYP9/u/K 0iBd0C6sNDf7lr0gFfShlibrXXfuFdNyWdm9nHumBYBRYA0h6qAz2gtcALpCyiNE pPmysJZUMTd13YFz+366Z3ZIUc7k9efCtWMHOmKvp7Xexkv9QW9BOlQ8v6VHVHtX 7MvCNfskATxB1MLXAAsfOM1wKE0ECwscSxmZFVedHVH1h/deehHJdKfQ+5HtKr8U ol4XTopt9I62fiyZtc5YhcseMQnAuMZ89WK2x/Bz+PsCNndvJ27Var6RZJ+k5ffo pTsCs7r1T5sNkA3RlAbNeku9kjC/DVxxFgcycY4D9zMcYIYOh/JTsK4fciFASCLW Ge/c3eCgmeFsvKu2Y3KGakt+kWJ8a2CNSx9cLNP7YTfrZSCEr8m1racXOpNOVBtV Xq6AJU+jjLpWmPpG/ly3 =scj5 -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 36b9a717ad96913d4c89135c82794cd611707f8c Author: Christian Lohmaier Date: Sat Jun 27 03:27:35 2015 +0200 bump product version to 5.0.0.2.0+ Change-Id: Ifb5756d693e73072b735dba257a762728dfffca8 diff --git a/configure.ac b/configure.ac index 20b2d67..25fc69d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.0.0.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.0.0.2.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.0.0.2'
Tag 'libreoffice-5.0.0.2' created by Christian Lohmaier at 2015-06-27 02:26 -0700 Tag libreoffice-5.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVjfu8AAoJEPQ0oe+v7q6jIq4P/31O/ivR9Cj0ALuJwKy5raO8 bh8CSBYzOVQDHXQQlAY0pYQS+Wc0c7GYaaS7yZk5wDdGypDKdwmH3xdowoYhbkDC wyDmDqtD07nn2Xw2krwycDA7aTFZ8rOvxLGc5edmaNRqRNmGak0UGyrNiCVDxatZ Px+HOmMJcjFuGdqeObb3ykLaAEJ92/cENF89d5+i7j+zf8ClsxNzguot2VBZPlyo QrlT+RC5idN+3mrE9pyDDygvbSgRUi8cBv6b19lMo9O+Ee9KYof1uF4aulBSUIz0 tUR/a55Umys84xMy2621qPsdDoV/N5oQ2F+F5SvOw24lW7hUkuSBpkqczOp18Was OVfegHwfKAqD52hUNbBJGpmIAF8wJj37cU8neGuIjICeffN4fnd7feBMT4Lwj+Bl zmceZmle0LqzuLKBtCR66VTj0beG823UwxNuNKsjwnyq13ofXYkxooAbKPAUCurU D7s0oLkAFzS8+eYrShrvHJvcig100cQyMXd22HfqDC5KcZ+dMz9400Ml/2Qrbi0v ZJTesqZ5W3sJCPYZZ01u52SoXc3MjjEWY9Bi1Wy0++VjKmH5jKG7aPZwu9jRHNgn SZ+IOV6R86bNjwoRae3lgA9yuC1lV/hA4rphbOL4nonKu37ACiBBzaH6TuutGfva K9flASDPFaBJItZLCCV6 =29dq -END PGP SIGNATURE- Changes since cp-5.0-branch-point-438: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.0.0.2'
Tag 'libreoffice-5.0.0.2' created by Christian Lohmaier at 2015-06-27 02:26 -0700 Tag libreoffice-5.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVjfu4AAoJEPQ0oe+v7q6jRrYQALQdIaja8R9+44yrc2HZcq25 TqV2IAIuMhtC+CqmRLnnJY5jPga6xEO9M4gr1Nz2wMej/oguItN68vZhJrBJk4id aN0jqeVziq5Ak2Ay97xWPZikqPVeMcesnd8+06i2xvhYKQD9JJ/yh6Mm/iHqQkHS TxAZd++f7WD4fBSwujYFuLepJBVH9k3hXUjMHzgeX1yykpuhdHC67Wd61V5wy2kj LjRvK/3ae1g+/pbBOMBMu3i0WVwXthdcHm+vsOqJOcTwWpYFUmtGYlZgw5++XacR h6KKJ1SYis8IDJe5ONRkYHaYZzXe9zkNON/xd4kbNUNBYGmIvDCNCVmZ0GrXNdui 96MkMhzeY9oMNi6lOkWm+QTERA8ZXFL/50nm5fdfPKizFqW7uAlVcS/JvYnDT3q5 kC6bLEXevsEGvwTX/qbdQE0dqxwqZqaeZOtRkcnEO0SXOUR0XcMHy5I/z1roTy90 VPD0rsi3jMKbLsCJFdSltn/gJINaPuKfowHT2Pa4Q7N4dD7wmtUXimORuPFXzDRs T34sKr5819XZDH41Ah/0kmDxmM6XPoL+F3YQ1/OgcTLceiVoN0xXCFTQS19cdZbE GGhzxahROceLZzscqxhuW007SOEuO4CXaPZi0Vl/OQEHxamGzND11NeasQBGgGaY /Wv9WCcmarNnH3TPCSck =SuUd -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-14: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.0.0.2'
Tag 'libreoffice-5.0.0.2' created by Christian Lohmaier at 2015-06-27 02:26 -0700 Tag libreoffice-5.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJVjfuwAAoJEPQ0oe+v7q6jl1IP/igk//abfXqQJxub3GgvRRu6 QAz+FRUajnwfEBtanJAWoJI3t/tLmi9SNb9Al+vcg6nCPRPsTB//q8UEkxuOucD2 kbPzsQkQxq/ZWBclkCF405BiTlILeVFSIgUzKyN4OopXx7MEGzruVISXQ+EFnJXm ysGJxKdsG4FvTzLMMgAtuLo+VsWQBT+M3lx9XSQITMj5Abj6eWYJvomO2r3gOppp TqSopI11JvLec5A5INeByRwkFPXifxoR/4daSNbYNBJ+rfqSizaQqW6MLAFcFiVy 5vwn/PkQe1/Kr6MR7olfWV2WSZhXir22rjhVqagsnYBngmV6KQ7Y4Bvz2p0NmioA Epayq8KmJW3pHh4Iz8yHGFDt8MUchuTS8pCcf1xX6sZFKhs1ZNHqt5jvFrdnM7T5 uXAfWIWoaWIIPVDx/rrmjX/iiPsz2XTYdx7Bds4OkVAlAHV2iMcyEwAO6L4a4an4 WvKRiYp8YqwbY9QQN9E9ESMwLAkNGaF9ATIDQF3ifivJLfFyOwNl2wfkBmwHHzRC 6CJZWuuJJ/WrGCrBuq1yFDbGhXcz+ALjE2i6bndxZAf4xfMsICGCv4rNF9ahX9zm H3L+UQFK5BDhlUfKzkUytwY0Nv7cMV2UCzemgEM1gAAngoFQXIvaS+snmRg+rRJS HTlEOaQ3oYDOZ0zf2Lam =2/H0 -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png |binary icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png|binary icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png |binary icon-themes/breeze/chart2/res/nostacksmooth3d_52x60.png |binary icon-themes/breeze/chart2/res/nostacksmoothboth_52x60.png |binary icon-themes/breeze/chart2/res/nostacksmoothlines_52x60.png|binary icon-themes/breeze/chart2/res/nostackstepped3d_52x60.png |binary icon-themes/breeze/chart2/res/nostacksteppedboth_52x60.png|binary icon-themes/breeze/chart2/res/nostacksteppedlines_52x60.png |binary icon-themes/breeze/chart2/res/pyramind_52x60.png |binary icon-themes/breeze/chart2/res/pyraminddeep_52x60.png |binary icon-themes/breeze/chart2/res/pyramindhori_52x60.png |binary icon-themes/breeze/chart2/res/pyramindhorideep_52x60.png |binary icon-themes/breeze/chart2/res/pyramindhoripercent_52x60.png |binary icon-themes/breeze/chart2/res/pyramindhoristack_52x60.png |binary icon-themes/breeze/chart2/res/pyramindpercent_52x60.png |binary icon-themes/breeze/chart2/res/pyramindstack_52x60.png |binary icon-themes/breeze/chart2/res/stackdirect3d_52x60.png |binary icon-themes/breeze/chart2/res/stackdirectboth_52x60.png |binary icon-themes/breeze/chart2/res/stackdirectlines_52x60.png |binary icon-themes/breeze/chart2/res/stackdirectpoints_52x60.png |binary icon-themes/breeze/chart2/res/stacksmooth3d_52x60.png |binary icon-themes/breeze/chart2/res/stacksmoothboth_52x60.png |binary icon-themes/breeze/chart2/res/stacksmoothlines_52x60.png |binary icon-themes/breeze/chart2/res/stackstepped3d_52x60.png|binary icon-themes/breeze/chart2/res/stacksteppedboth_52x60.png |binary icon-themes/breeze/chart2/res/stacksteppedlines_52x60.png |binary icon-themes/breeze/chart2/res/stock_52x60.png |binary icon-themes/breeze/chart2/res/stockblock_52x60.png|binary icon-themes/breeze/chart2/res/stockcolumns_52x60.png |binary icon-themes/breeze/chart2/res/stockcolumnsattach_52x60.png|binary icon-themes/breeze/chart2/res/valueaxissmooth3d_52x60.png |binary icon-themes/breeze/chart2/res/valueaxissmoothboth_52x60.png |binary icon-themes/breeze/chart2/res/valueaxissmoothlines_52x60.png |binary icon-themes/breeze/chart2/res/valueaxisstepped3d_52x60.png|binary icon-themes/breeze/chart2/res/valueaxissteppedboth_52x60.png |binary icon-themes/breeze/chart2/res/valueaxissteppedlines_52x60.png |binary 38 files changed New commits: commit 24b29b14de3a14da804a4dacc5e0ff6b32346cf6 Author: andreask Date: Sat Jun 27 01:54:44 2015 +0200 Breeze: last chart icons Change-Id: I057073e7622271bf75ab5563c8798ddce56078bd Reviewed-on: https://gerrit.libreoffice.org/16532 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png b/icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png index e9885d7..9b2575a 100644 Binary files a/icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png and b/icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png differ diff --git a/icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png b/icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png index efd9384..380b01b 100644 Binary files a/icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png and b/icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png differ diff --git a/icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png b/icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png index 78b76eb..4a7cf87 100644 Binary files a/icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png and b/icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png differ diff --git a/icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png b/icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png index 927cc6f..751b64d 100644 Binary files a/icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png and b/icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png differ diff --git a/icon-themes/breeze/chart2/res/nostacksmooth3d_52x60.png b/icon-themes/breeze/chart2/res/nostacksmooth3d_52x60.png new file mode 100644 index 000..e52bb38 Binary files /dev/null and b/icon-themes/breeze/chart2/res/nostacksmooth3d_52x60.png differ diff --git a/icon-themes/breeze/chart2/res/nostacksmoothboth_52x60.png b/icon-themes/breeze/chart2/res/nostacksmoothboth_52x60.png new file mode 100644 index 000..9f20535 Binary files /dev/null and b/icon-themes/breeze/chart2/res/nostacksmoothboth_52x60.png differ diff --git a/icon-themes/breeze/chart2/res/nostacksmoothlines_52x60.png b/icon-themes/breeze/chart2/res/nostacksmoothlines_52x60.png new file mode 100644 index 000..dfaedf8 Binar
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/tool/grouparealistener.cxx | 33 +-
1 file changed, 32 insertions(+), 1 deletion(-)
New commits:
commit acb543b31dd7fe6c3370acec53e0710ed80a85f6
Author: Eike Rathke
Date: Sat Jun 27 03:14:05 2015 +0200
tdf#90717 prevent crash, not really fixed
Try to resync shared group top and length.
Change-Id: I31bd0db7c1dceb880a22274edc4c3f20ce253095
(cherry picked from commit d8541c2a62121894bf87c91f1f89aea1ea30d680)
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index 46155f9..ac9ea7f 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -194,10 +194,41 @@ void FormulaGroupAreaListener::collectFormulaCells(
ScFormulaCell* const * pp = mpColumn->GetFormulaCellBlockAddress(
mnTopCellRow, nBlockSize);
if (!pp)
{
-SAL_WARN("sc", "GetFormulaCellBlockAddress not found");
+SAL_WARN("sc.core", "GetFormulaCellBlockAddress not found");
return;
}
+/* FIXME: this is tdf#90717, when deleting a row fixed size area listeners
+ * such as BCA_ALWAYS or entire row listeners are (rightly) not destroyed,
+ * but mnTopCellRow and mnGroupLen also not updated, which needs fixing.
+ * Until then pull things as straight as possible here in such situation
+ * and prevent crash. */
+if (!(*pp)->IsSharedTop())
+{
+SCROW nRow = (*pp)->GetSharedTopRow();
+if (nRow < 0)
+SAL_WARN("sc.core",
"FormulaGroupAreaListener::collectFormulaCells() no shared top");
+else
+{
+
SAL_WARN("sc.core","FormulaGroupAreaListener::collectFormulaCells() syncing
mnTopCellRow from " <<
+mnTopCellRow << " to " << nRow);
+const_cast(this)->mnTopCellRow = nRow;
+pp = mpColumn->GetFormulaCellBlockAddress( mnTopCellRow,
nBlockSize);
+if (!pp)
+{
+SAL_WARN("sc.core", "GetFormulaCellBlockAddress not found");
+return;
+}
+}
+}
+SCROW nLen = (*pp)->GetSharedLength();
+if (nLen != mnGroupLen)
+{
+SAL_WARN("sc.core", "FormulaGroupAreaListener::collectFormulaCells()
syncing mnGroupLen from " <<
+mnGroupLen << " to " << nLen);
+const_cast(this)->mnGroupLen = nLen;
+}
+
/* FIXME: with tdf#89957 it happened that the actual block size in column
* AP (shifted from AO) of sheet 'w' was smaller than the remembered group
* length and correct. This is just a very ugly workaround, the real cause
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/guide/multi_tables.xhp |1 - source/text/shared/optionen/01060100.xhp |4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit a178283c34717e687b3d6112fdb2f8e573aafc24 Author: Stanislav Horacek Date: Thu Jun 25 23:04:55 2015 +0200 sheet tabs and scrollbar are not in one line anymore Change-Id: Ia131b4b0f8e0392895019e9f8847c562eccd1f5b Reviewed-on: https://gerrit.libreoffice.org/16495 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/source/text/scalc/guide/multi_tables.xhp b/source/text/scalc/guide/multi_tables.xhp index 871de42..b353819 100644 --- a/source/text/scalc/guide/multi_tables.xhp +++ b/source/text/scalc/guide/multi_tables.xhp @@ -56,7 +56,6 @@ - If there is insufficient space to display all the sheet tabs, you can increase it by pointing to the separator between the scrollbar and the sheet tabs, pressing the mouse button and, keeping the mouse button pressed, dragging to the right. In doing so you will be sharing the available space between the sheet tabs and horizontal scrollbar. diff --git a/source/text/shared/optionen/01060100.xhp b/source/text/shared/optionen/01060100.xhp index 14604ea..630e8f2 100644 --- a/source/text/shared/optionen/01060100.xhp +++ b/source/text/shared/optionen/01060100.xhp @@ -138,7 +138,7 @@ Horizontal scrollbar - Specifies whether to display a horizontal scrollbar at the bottom of the document window. Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end. + Specifies whether to display a horizontal scrollbar at the bottom of the document window. Vertical scrollbar @@ -147,7 +147,7 @@ Sheet tabs Specifies whether to display the sheet tabs at the bottom of the spreadsheet document. If this box is not checked, you will only be able to switch between the sheets through the Navigator -Navigator. Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end. +Navigator. Outline symbols ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efa2c05e84d0696b31bd822d3234798be43853ad Author: Stanislav Horacek Date: Thu Jun 25 22:53:36 2015 +0200 Updated core Project: help 30ef8ce4bed6aeaea2a9d2aeacb956c8ee127ec3 rename items of Zoom toolbar in Impress to correspond with UI Change-Id: If1012ce7bb7e2384393500d838911c2249871ef9 Reviewed-on: https://gerrit.libreoffice.org/16494 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index a178283..30ef8ce 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a178283c34717e687b3d6112fdb2f8e573aafc24 +Subproject commit 30ef8ce4bed6aeaea2a9d2aeacb956c8ee127ec3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/simpress/02/1002.xhp | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 30ef8ce4bed6aeaea2a9d2aeacb956c8ee127ec3 Author: Stanislav Horacek Date: Thu Jun 25 22:53:36 2015 +0200 rename items of Zoom toolbar in Impress to correspond with UI Change-Id: If1012ce7bb7e2384393500d838911c2249871ef9 Reviewed-on: https://gerrit.libreoffice.org/16494 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/source/text/simpress/02/1002.xhp b/source/text/simpress/02/1002.xhp index 5f8b390..db9c2eb 100644 --- a/source/text/simpress/02/1002.xhp +++ b/source/text/simpress/02/1002.xhp @@ -163,7 +163,7 @@ -Zoom Page +Entire Page Displays the entire slide on your screen. @@ -173,14 +173,14 @@ -Zoom Page +Entire Page -Zoom Page Width +Page Width Displays the complete width of the slide. The top and bottom edges of the slide may not be visible. @@ -190,14 +190,14 @@ -Zoom Page Width +Page Width -Optimal +Optimal View Resizes the display to include all of the objects on the slide. @@ -207,7 +207,7 @@ -Optimal +Optimal View ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55da0ec7fcd2aa3630cfcf33cf9bee6420fd09a4 Author: Stanislav Horacek Date: Thu Jun 25 23:04:55 2015 +0200 Updated core Project: help a178283c34717e687b3d6112fdb2f8e573aafc24 sheet tabs and scrollbar are not in one line anymore Change-Id: Ia131b4b0f8e0392895019e9f8847c562eccd1f5b Reviewed-on: https://gerrit.libreoffice.org/16495 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index aac176c..a178283 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aac176ceb2ae281dd29026d47fbc44eb139a52a3 +Subproject commit a178283c34717e687b3d6112fdb2f8e573aafc24 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu |6 ++ 1 file changed, 6 insertions(+) New commits: commit 77aef1bb4d54b595edbf142fe92e2e833ab0cb8d Author: Yousuf Philips Date: Sat Jun 27 03:44:21 2015 +0400 Enable icons for a few chart formatting toolbar buttons Change-Id: Ibd70f1cd7cf50d7bd50347e5b428bb3a12521fc3 Reviewed-on: https://gerrit.libreoffice.org/16530 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips (cherry picked from commit 6d86e27c8467780133e0c3f7c195dd7758c9f490) Reviewed-on: https://gerrit.libreoffice.org/16531 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu index e3d3b70..4f036b2 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu @@ -99,6 +99,9 @@ ~Data Ranges... + + 1 + @@ -204,6 +207,9 @@ ~All Axes... + + 1 + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: not able to clone translations from git
Hi Yes, Norbert I cloned source code via this link git clone http://anongit.freedesktop.org/git/libreoffice/core.git # slower I am trying to configure it for Indian Languages, For.e.g "hi" after /usr/bin/make It tries to clone translation repo. and yes, our organization hasve a proxy server -- :( Please help!! - Original Message - From: "Norbert Thiebaud" To: "rachnag" Cc: "libreoffice" Sent: Friday, June 26, 2015 4:25 AM Subject: Re: not able to clone translations from git On Thu, Jun 25, 2015 at 7:14 AM, rachnag wrote: fatal: unable to connect to gerrit.libreoffice.org: gerrit.libreoffice.org[0: 89.238.68.148]: errno=Connection refused Clone of 'git://gerrit.libreoffice.org/translations' into submodule path 'translations' failed Makefile:210: recipe for target 'get-submodules' failed make: *** [get-submodules] Error 1 I understand its not able to get translations from git. Any help in this regard is highly appreciable. I did not have the time at which you did this.. but I looked at the logs a little before you sent that email and git-deamon is serving things fine... I can see in the log that we are serving /translation.git as well bear in mind that git:// protocol operate on port 9418.. so let me make a guess here: you downloaded a tarball of core.git unpacked it and then try to configure it for a language... build tried to then clone the translation repo because it was not available (not downloaded as a tarball) and there is a firewall between your machine and our host that blocked that. How close am I ? Norbert --- [ C-DAC is on Social-Media too. Kindly follow us at: Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ] This e-mail is for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies and the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email is strictly prohibited and appropriate legal action will be taken. --- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |4 1 file changed, 4 insertions(+) New commits: commit c5b235e16287d786e036424c6229bcee5579684b Author: László Németh Date: Sat Jun 27 04:04:15 2015 +0200 tdf#92368 fix saved positions of arcs, segments drawn by LibreLogo Change-Id: I8f622680ddd31d0a7048c14c85932ae495ae0f5e diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 327648c..081431c 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1064,6 +1064,7 @@ def __boxshape__(shapetype, l): if shapetype == "Rectangle" and len(l) > 2: shape.CornerRadius = (l[2] * __PT_TO_TWIP__) / __MM10_TO_TWIP__ elif shapetype == "Ellipse" and len(l) > 2: +oldBoundRect = shape.BoundRect try: shape.CircleKind = __SECTION__ shape.CircleStartAngle = (-l[3] - 270) * 100 @@ -1071,6 +1072,9 @@ def __boxshape__(shapetype, l): shape.CircleKind = [__FULL__, __SECTION__, __CUT__, __ARC__][l[4]] except: pass +pos.X = pos.X + shape.BoundRect.X - oldBoundRect.X +pos.Y = pos.Y + shape.BoundRect.Y - oldBoundRect.Y +shape.setPosition(pos) __visible__(shape, True) __removeshape__(__ACTUAL__) _.shapecache[__ACTUAL__] = shape ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 92346] Copy functionality in the viewer
https://bugs.documentfoundation.org/show_bug.cgi?id=92346 tommy27 changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||ba...@quipo.it Ever confirmed|0 |1 Severity|normal |enhancement --- Comment #2 from tommy27 --- valid enhancement request. status NEW -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2015-06-27
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + tdf#91055 Pass by Address - lcl_createWindowInfo in https://gerrit.libreoffice.org/16537 from Daniel L. Robertson about module vcl + tdf#68016 Speed up ScChart2DataSequence by caching addresses in https://gerrit.libreoffice.org/16485 from Tobias Lippert about module sc + tdf#68016 Write fixture for current behaviour of SfxListener in https://gerrit.libreoffice.org/16483 from Tobias Lippert about module svl + tdf#68016 Make deletion of listeners in SfxBroadcaster faster in https://gerrit.libreoffice.org/16484 from Tobias Lippert about module svl + tdf#87702: Addition of Shadow sidebar tab in https://gerrit.libreoffice.org/16375 from Rishabh Kumar about module cui, include, officecfg, sc, sd, svx + tdf#39468 Translate German Comments - scaddins/ in https://gerrit.libreoffice.org/16525 from Phillip Sz about module scaddins + tdf#39468 Translate German Comments - reportdesign/ in https://gerrit.libreoffice.org/16527 from Phillip Sz about module reportdesign + Fix typos in https://gerrit.libreoffice.org/16522 from Andrea Gelmini about module basegfx, basic, connectivity, cppcanvas, dbaccess, drawinglayer, editeng, embeddedobj, extensions, framework, include, libreofficekit, lotuswordpro, odk, package, qadevOOo, reportdesign, sc, sd, sfx2, solenv, svx, sw, vcl, wizards, xmloff, xmlsecurity + tdf#87348 enable docx exporting linked textboxes that LO can import in https://gerrit.libreoffice.org/16516 from Justin Luth about module sw + Fix typos in https://gerrit.libreoffice.org/16523 from Andrea Gelmini about module basic, canvas, chart2, drawinglayer, editeng, filter, framework, include, linguistic, lotuswordpro, odk, sal, sc, scripting, sd, sot, svx, sw, ucb, vcl, wizards, xmloff + Translated Korean comments in https://gerrit.libreoffice.org/16409 from Andrea Gelmini about module hwpfilter + Line Controls are disabled when none entry is checked in https://gerrit.libreoffice.org/16146 from Rishabh Kumar about module svx + tdf#92353 FileSave: Not confirmed for overwrite a file (unix) in https://gerrit.libreoffice.org/16517 from juergen funk about module vcl End of freshness + calc mapmode: Refactor DrawExtraShadow to use logic units in https://gerrit.libreoffice.org/16511 from Krisztian Pinter about module sc + calc mapmode: Pass RenderContext as reference in DrawNoteMarks in https://gerrit.libreoffice.org/16512 from Krisztian Pinter about module sc + calc mapmode: Refactor DrawNoteMarks to use logic units in https://gerrit.libreoffice.org/16513 from Krisztian Pinter about module sc + calc mapmode: Pass RenderContext as reference in DrawExtraShadow in https://gerrit.libreoffice.org/16510 from Krisztian Pinter about module sc + calc mapmode: Pass RenderContext as reference in DrawFrame in https://gerrit.libreoffice.org/16509 from Krisztian Pinter about module sc + stop double code in ScInterpreter::ScSum and ScInterpreter::IterateParame in https://gerrit.libreoffice.org/15362 from Winfried Donkers about module sc * Merged changes on master for project core changed in the last 25 hours: + Breeze: last chart icons in https://gerrit.libreoffice.org/16532 from andreas_kainz + Enable icons for a few chart formatting toolbar buttons in https://gerrit.libreoffice.org/16530 from Yousuf Philips + vcl: fix Win32 deadlocks from SolarMutexReleaser in https://gerrit.libreoffice.org/16515 from Michael Stahl + Use declarations from cxxabi.h in https://gerrit.libreoffice.org/16520 from Stephan Bergmann + Breeze: draw icon show an update symbol in https://gerrit.libreoffice.org/16499 from andreas_kainz + Breeze: add chart diagramm type support in https://gerrit.libreoffice.org/16493 from andreas_kainz + tdf#87348 allow non-sequentially processed textboxes to be linked in https://gerrit.libreoffice.org/16353 from Justin Luth + tdf#87905: Use darker background colour for master view in https://gerrit.libreoffice.org/16466 from Katarina Behrens + Make PyUNO provide more Pythonic behaviour in https://gerrit.libreoffice.org/16272 from Matthew Francis + tdf#89890 DOCX import: fix too large num pic bullet in https://gerrit.libreoffice.org/16500 from Miklos Vajna * Abandoned changes on master for project core changed in the last 25 hours: + tdf#91055 Pass by Address - lcl_createWindowInfo in https://gerrit.libreoffice.org/16536 from Daniel L. Robertson + tdf#91055 Pass by Address - lcl_createWindowInfo in https://gerrit.libreoffice.org/16535 from Daniel L. Robertson + tdf#91055 Pass by Address - lcl_createWindowInfo in https://gerrit.libreoffice.org/16498 from Daniel L. Robertson + tdf#91594 misinterprets letters from Symbol font in docx files in https://gerrit.libreoffice.org/16433 from Mark Hung + Breeze: Math wrong update icon in https://gerrit.libreoffice.org/16463 from andreas
LibreOffice Gerrit News for submodules on 2015-06-27
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + rename items of Zoom toolbar in Impress to correspond with UI in https://gerrit.libreoffice.org/16494 from Stanislav Horáček + sheet tabs and scrollbar are not in one line anymore in https://gerrit.libreoffice.org/16495 from Stanislav Horáček * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
