[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoDelete.hxx |4 ++--
sw/source/core/undo/undel.cxx | 14 ++
2 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 41e2cbc157ce70ea4db67be1a77f61810089b840
Author: Noel Grandin
Date: Thu Jul 12 17:05:52 2018 +0200
loplugin:useuniqueptr in SwUndoDelete
Change-Id: I942e55ffebf265a3138c25bedbb7ef882e6c0916
Reviewed-on: https://gerrit.libreoffice.org/57367
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoDelete.hxx
b/sw/source/core/inc/UndoDelete.hxx
index 81cc23e196bb..7a155fb20322 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -38,9 +38,9 @@ class SwUndoDelete
, private SwUndRng
, private SwUndoSaveContent
{
-SwNodeIndex* m_pMvStt;// Position of Nodes in UndoNodes-Array
+std::unique_ptr m_pMvStt;// Position of Nodes in
UndoNodes-Array
boost::optional m_aSttStr, m_aEndStr;
-SwRedlineSaveDatas* m_pRedlSaveData;
+std::unique_ptr m_pRedlSaveData;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart;
std::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd;
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index e4f3ea72f6b0..c76ee1c90ac7 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -122,11 +122,10 @@ SwUndoDelete::SwUndoDelete(
if( !pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() &&
!pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
{
-m_pRedlSaveData = new SwRedlineSaveDatas;
+m_pRedlSaveData.reset(new SwRedlineSaveDatas);
if( !FillSaveData( rPam, *m_pRedlSaveData ))
{
-delete m_pRedlSaveData;
-m_pRedlSaveData = nullptr;
+m_pRedlSaveData.reset();
}
}
@@ -302,7 +301,7 @@ SwUndoDelete::SwUndoDelete(
// Step 3: Moving into UndoArray...
m_nNode = rNds.GetEndOfContent().GetIndex();
rDocNds.MoveNodes( aRg, rNds, SwNodeIndex( rNds.GetEndOfContent() ));
-m_pMvStt = new SwNodeIndex( rNds, m_nNode );
+m_pMvStt.reset( new SwNodeIndex( rNds, m_nNode ) );
// remember difference!
m_nNode = rNds.GetEndOfContent().GetIndex() - m_nNode;
@@ -518,9 +517,9 @@ SwUndoDelete::~SwUndoDelete()
{
// Insert saves content in IconSection
m_pMvStt->GetNode().GetNodes().Delete( *m_pMvStt, m_nNode );
-delete m_pMvStt;
+m_pMvStt.reset();
}
-delete m_pRedlSaveData;
+m_pRedlSaveData.reset();
}
static SwRewriter lcl_RewriterFromHistory(SwHistory & rHistory)
@@ -974,8 +973,7 @@ void SwUndoDelete::RedoImpl(::sw::UndoRedoContext &
rContext)
"SwUndoDelete::Redo: used to have redline data, but now none?");
if (!bSuccess)
{
-delete m_pRedlSaveData;
-m_pRedlSaveData = nullptr;
+m_pRedlSaveData.reset();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/inc/UndoInsert.hxx|2 +-
sw/source/core/inc/UndoSplitMove.hxx |2 +-
sw/source/core/undo/unins.cxx|6 +++---
sw/source/core/undo/unspnd.cxx |4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 0673411c58529e6c4252b7973a16afae1f4363f1
Author: Noel Grandin
Date: Thu Jul 12 17:01:48 2018 +0200
loplugin:useuniqueptr in SwUndoSplitNode
Change-Id: Ib77b31a7558b5d3c928d774d3c6bdaeff26c177d
Reviewed-on: https://gerrit.libreoffice.org/57366
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoSplitMove.hxx
b/sw/source/core/inc/UndoSplitMove.hxx
index d4a86dea4cbc..08e59657c4d4 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -25,7 +25,7 @@
class SwUndoSplitNode: public SwUndo
{
std::unique_ptr m_pHistory;
-SwRedlineData* pRedlData;
+std::unique_ptr pRedlData;
sal_uLong nNode;
sal_Int32 nContent;
bool bTableFlag : 1;
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index 2253c3df5124..27d73ebd8ee7 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -56,7 +56,7 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const
SwPosition& rPos,
// consider Redline
if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
{
-pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() );
+pRedlData.reset( new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ) );
SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() );
}
@@ -66,7 +66,7 @@ SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const
SwPosition& rPos,
SwUndoSplitNode::~SwUndoSplitNode()
{
m_pHistory.reset();
-delete pRedlData;
+pRedlData.reset();
}
void SwUndoSplitNode::UndoImpl(::sw::UndoRedoContext & rContext)
commit 72a86870670ae3af7503a5c034282e5eaeaf4582
Author: Noel Grandin
Date: Thu Jul 12 17:00:34 2018 +0200
loplugin:useuniqueptr in SwUndoInsert
Change-Id: I229cace30597543fc63222ddb5acf78539d4ba39
Reviewed-on: https://gerrit.libreoffice.org/57365
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoInsert.hxx
b/sw/source/core/inc/UndoInsert.hxx
index 5f0b652f8ed6..b109abf344e1 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -44,7 +44,7 @@ class SwUndoInsert: public SwUndo, private SwUndoSaveContent
std::unique_ptr m_pUndoNodeIndex;
boost::optional maText;
boost::optional maUndoText;
-SwRedlineData* pRedlData;
+std::unique_ptr pRedlData;
sal_uLong nNode;
sal_Int32 nContent, nLen;
bool bIsWordDelim : 1;
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 59c28db7188b..b87a0e30c3a6 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -94,8 +94,8 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd)
pDoc = rNd.GetNode().GetDoc();
if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
{
-pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
-
pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() );
+pRedlData.reset( new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
+
pDoc->getIDocumentRedlineAccess().GetRedlineAuthor() ) );
SetRedlineFlags( pDoc->getIDocumentRedlineAccess().GetRedlineFlags() );
}
@@ -202,7 +202,7 @@ SwUndoInsert::~SwUndoInsert()
{
maText.reset();
}
-delete pRedlData;
+pRedlData.reset();
}
void SwUndoInsert::UndoImpl(::sw::UndoRedoContext & rContext)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sw/source
compilerplugins/clang/useuniqueptr.cxx |6 ++
sw/source/core/inc/UndoTable.hxx|8
sw/source/core/txtnode/SwGrammarContact.cxx | 22 +-
sw/source/core/undo/untbl.cxx | 26 --
4 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit c79bd83818dbd49dfd77ab82457057eff6a5d3d7
Author: Noel Grandin
Date: Thu Jul 12 16:57:07 2018 +0200
loplugin:useuniqueptr in SwUndoInsTable
Change-Id: If3f0f51415d0cae910fded9f1391219a8b5b7309
Reviewed-on: https://gerrit.libreoffice.org/57364
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 269644245dd0..88cece131191 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -48,10 +48,10 @@ class SwUndoInsTable : public SwUndo
{
OUString sTableNm;
SwInsertTableOptions aInsTableOpts;
-SwDDEFieldType* pDDEFieldType;
-std::vector *pColWidth;
-SwRedlineData* pRedlData;
-SwTableAutoFormat* pAutoFormat;
+std::unique_ptr pDDEFieldType;
+std::unique_ptr> pColWidth;
+std::unique_ptr pRedlData;
+std::unique_ptr pAutoFormat;
sal_uLong nSttNode;
sal_uInt16 nRows, nCols;
sal_uInt16 nAdjust;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 1f03b2e57441..927b489eba31 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -226,16 +226,16 @@ SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos,
sal_uInt16 nCl, sal_uInt
{
if( pColArr )
{
-pColWidth = new std::vector(*pColArr);
+pColWidth.reset( new std::vector(*pColArr) );
}
if( pTAFormat )
-pAutoFormat = new SwTableAutoFormat( *pTAFormat );
+pAutoFormat.reset( new SwTableAutoFormat( *pTAFormat ) );
// consider redline
SwDoc& rDoc = *rPos.nNode.GetNode().GetDoc();
if( rDoc.getIDocumentRedlineAccess().IsRedlineOn() )
{
-pRedlData = new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() );
+pRedlData.reset( new SwRedlineData( nsRedlineType_t::REDLINE_INSERT,
rDoc.getIDocumentRedlineAccess().GetRedlineAuthor() ) );
SetRedlineFlags( rDoc.getIDocumentRedlineAccess().GetRedlineFlags() );
}
@@ -244,10 +244,10 @@ SwUndoInsTable::SwUndoInsTable( const SwPosition& rPos,
sal_uInt16 nCl, sal_uInt
SwUndoInsTable::~SwUndoInsTable()
{
-delete pDDEFieldType;
-delete pColWidth;
-delete pRedlData;
-delete pAutoFormat;
+pDDEFieldType.reset();
+pColWidth.reset();
+pRedlData.reset();
+pAutoFormat.reset();
}
void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext & rContext)
@@ -280,9 +280,8 @@ void SwUndoInsTable::UndoImpl(::sw::UndoRedoContext &
rContext)
}
sTableNm = pTableNd->GetTable().GetFrameFormat()->GetName();
-if( dynamic_cast(&pTableNd->GetTable()) != nullptr )
-pDDEFieldType =
static_cast(static_cast(pTableNd->GetTable()).
-GetDDEFieldType()->Copy());
+if( auto pDDETable = dynamic_cast(&pTableNd->GetTable()) )
+pDDEFieldType.reset(
static_cast(pDDETable->GetDDEFieldType()->Copy()) );
rDoc.GetNodes().Delete( aIdx, pTableNd->EndOfSectionIndex() -
aIdx.GetIndex() + 1 );
@@ -300,7 +299,7 @@ void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext &
rContext)
SwPosition const aPos(SwNodeIndex(rDoc.GetNodes(), nSttNode));
const SwTable* pTable = rDoc.InsertTable( aInsTableOpts, aPos, nRows,
nCols,
nAdjust,
-pAutoFormat, pColWidth );
+pAutoFormat.get(), pColWidth.get()
);
static_cast(pTable->GetFrameFormat())->SetName( sTableNm );
SwTableNode* pTableNode = rDoc.GetNodes()[nSttNode]->GetTableNode();
@@ -310,8 +309,7 @@ void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext &
rContext)
*pDDEFieldType));
std::unique_ptr pDDETable(new SwDDETable(
pTableNode->GetTable(), pNewType ));
pTableNode->SetNewTable( std::move(pDDETable) );
-delete pDDEFieldType;
-pDDEFieldType = nullptr;
+pDDEFieldType.reset();
}
if( (pRedlData && IDocumentRedlineAccess::IsRedlineOn( GetRedlineFlags()
)) ||
@@ -340,7 +338,7 @@ void SwUndoInsTable::RepeatImpl(::sw::RepeatContext &
rContext)
{
rContext.GetDoc().InsertTable(
aInsTableOpts, *rContext.GetRepeatPaM().GetPoint(),
-nRows, nCols, nAdjust, pAutoFormat, pColWidth );
+nRows, nCols, nAdjust, pAutoFormat.get(), pColWidth.get() );
}
SwRewriter SwUndoInsTable::GetRewriter() const
commit c75f597722608732d991619f550063e7c5d7c485
Author: Noel Grandin
Da
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/XclExpChangeTrack.hxx |8
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 17 -
2 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 281f1281edbd0063b1d1d9151bcbfc1299a0082e
Author: Noel Grandin
Date: Thu Jul 12 16:38:14 2018 +0200
loplugin:useuniqueptr in XclExpChTrCellContent
Change-Id: I8002f1bbb45a48244b981051abc02c1414a2fa34
Reviewed-on: https://gerrit.libreoffice.org/57361
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 5bdcd7a7bdd9..f447747cd2d8 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -464,15 +464,15 @@ struct XclExpChTrData
class XclExpChTrCellContent final : public XclExpChTrAction, protected
XclExpRoot
{
-XclExpChTrData* pOldData;
-XclExpChTrData* pNewData;
+std::unique_ptr pOldData;
+std::unique_ptr pNewData;
sal_uInt16 nOldLength; // this is not the record size
ScAddress aPosition;
-static void MakeEmptyChTrData( XclExpChTrData*& rpData );
+static void MakeEmptyChTrData(
std::unique_ptr& rpData );
void GetCellData(
-const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*&
rpData,
+const XclExpRoot& rRoot, const ScCellValue& rScCell,
std::unique_ptr& rpData,
sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 );
virtual voidSaveActionData( XclExpStream& rStrm ) const
override;
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 240dfbc6336f..43492b6fb5c1 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -838,21 +838,21 @@ XclExpChTrCellContent::XclExpChTrCellContent(
XclExpChTrCellContent::~XclExpChTrCellContent()
{
-delete pOldData;
-delete pNewData;
+pOldData.reset();
+pNewData.reset();
}
-void XclExpChTrCellContent::MakeEmptyChTrData( XclExpChTrData*& rpData )
+void XclExpChTrCellContent::MakeEmptyChTrData(
std::unique_ptr& rpData )
{
if( rpData )
rpData->Clear();
else
-rpData = new XclExpChTrData;
+rpData.reset( new XclExpChTrData );
}
void XclExpChTrCellContent::GetCellData(
const XclExpRoot& rRoot, const ScCellValue& rScCell,
-XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 )
+std::unique_ptr& rpData, sal_uInt32& rXclLength1,
sal_uInt16& rXclLength2 )
{
MakeEmptyChTrData( rpData );
rXclLength1 = 0x003A;
@@ -860,8 +860,7 @@ void XclExpChTrCellContent::GetCellData(
if (rScCell.isEmpty())
{
-delete rpData;
-rpData = nullptr;
+rpData.reset();
return;
}
@@ -1069,7 +1068,7 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream&
rRevisionLogStrm )
FSEND );
if( pOldData )
{
-lcl_WriteCell( rRevisionLogStrm, XML_oc, aPosition, pOldData );
+lcl_WriteCell( rRevisionLogStrm, XML_oc, aPosition, pOldData.get() );
if (!pNewData)
{
pStream->singleElement(XML_nc,
@@ -1079,7 +1078,7 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream&
rRevisionLogStrm )
}
if( pNewData )
{
-lcl_WriteCell( rRevisionLogStrm, XML_nc, aPosition, pNewData );
+lcl_WriteCell( rRevisionLogStrm, XML_nc, aPosition, pNewData.get() );
}
// OOXTODO: XML_odxf, XML_ndxf, XML_extLst elements
pStream->endElement( XML_rcc );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/instbdlg.hxx |2 +-
sc/source/ui/miscdlgs/instbdlg.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 77a015f160d544827d298fd42b16418ace6a43c0
Author: Noel Grandin
Date: Thu Jul 12 16:40:47 2018 +0200
loplugin:useuniqueptr in ScInsertTableDlg
Change-Id: I239d3b1b585219125841dcc02104390f4a1ac3b7
Reviewed-on: https://gerrit.libreoffice.org/57362
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 7e8e2b29eee9..8a80e7183035 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -53,7 +53,7 @@ private:
ScViewData& rViewData;
ScDocument& rDoc;
ScDocShell* pDocShTables;
-sfx2::DocumentInserter* pDocInserter;
+std::unique_ptr pDocInserter;
SfxObjectShellRef aDocShTablesRef;
boolbMustClose;
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx
b/sc/source/ui/miscdlgs/instbdlg.cxx
index 3b6269622599..1c27d79e9398 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -66,7 +66,7 @@ ScInsertTableDlg::~ScInsertTableDlg()
{
if (pDocShTables)
pDocShTables->DoClose();
-delete pDocInserter;
+pDocInserter.reset();
}
void ScInsertTableDlg::Init_Impl( bool bFromFile )
@@ -262,8 +262,8 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl,
weld::Button&, void)
IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl, weld::Button&, void)
{
-delete pDocInserter;
-pDocInserter = new ::sfx2::DocumentInserter(m_xDialog.get(),
ScDocShell::Factory().GetFactoryName());
+pDocInserter.reset();
+pDocInserter.reset( new ::sfx2::DocumentInserter(m_xDialog.get(),
ScDocShell::Factory().GetFactoryName()) );
pDocInserter->StartExecuteModal( LINK( this, ScInsertTableDlg,
DialogClosedHdl ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng include/svx sc/source
editeng/source/items/CustomPropertyField.cxx |5 -
editeng/source/items/flditem.cxx | 82 ++-
editeng/source/items/svdfield.cxx|5 -
editeng/source/uno/unofield.cxx | 58 +--
editeng/source/uno/unotext.cxx | 13 +---
include/editeng/CustomPropertyField.hxx |2
include/editeng/flditem.hxx | 41 ++---
include/editeng/measfld.hxx |2
include/editeng/unofield.hxx |2
include/editeng/unotext.hxx |2
include/svx/ClassificationField.hxx |5 -
sc/source/filter/xml/xmlcelli.cxx| 16 ++---
sc/source/filter/xml/xmlcelli.hxx|6 -
sc/source/ui/unoobj/fielduno.cxx |2
14 files changed, 122 insertions(+), 119 deletions(-)
New commits:
commit ddef60b9c26b1d2990c6c49dbbda73e7831f21fb
Author: Noel Grandin
Date: Wed Jul 11 21:53:47 2018 +0200
pass SvxFieldData around by std::unique_ptr
Change-Id: I9c826547d348000dd6c80e45d833e048caae0ed8
Reviewed-on: https://gerrit.libreoffice.org/57308
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/items/CustomPropertyField.cxx
b/editeng/source/items/CustomPropertyField.cxx
index e8ef53ceebb2..3fbe5a89fe89 100644
--- a/editeng/source/items/CustomPropertyField.cxx
+++ b/editeng/source/items/CustomPropertyField.cxx
@@ -9,6 +9,7 @@
*/
#include
+#include
#include
#include
#include
@@ -29,9 +30,9 @@ CustomPropertyField::~CustomPropertyField()
SV_IMPL_PERSIST1(CustomPropertyField);
-tools::SvRef CustomPropertyField::Clone() const
+std::unique_ptr CustomPropertyField::Clone() const
{
-return new CustomPropertyField(msName, msCurrentPresentation);
+return o3tl::make_unique(msName,
msCurrentPresentation);
}
bool CustomPropertyField::operator==(const SvxFieldData& rOther) const
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index eca2d4a7ec78..722d54a710db 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
@@ -238,9 +239,6 @@ SvxFieldData* SvxFieldData::Create(const
uno::Reference& xTe
}
-SV_IMPL_PERSIST1( SvxFieldData );
-
-
SvxFieldData::SvxFieldData()
{
}
@@ -251,9 +249,9 @@ SvxFieldData::~SvxFieldData()
}
-tools::SvRef SvxFieldData::Clone() const
+std::unique_ptr SvxFieldData::Clone() const
{
-return new SvxFieldData;
+return o3tl::make_unique();
}
@@ -276,16 +274,22 @@ MetaAction* SvxFieldData::createEndComment()
}
+SvxFieldItem::SvxFieldItem( std::unique_ptr pField, const
sal_uInt16 nId ) :
+SfxPoolItem( nId )
+, mpField( std::move(pField) )
+{
+}
+
SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId )
:
SfxPoolItem( nId )
-, mxField( rField.Clone() )
+, mpField( rField.Clone() )
{
}
SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) :
SfxPoolItem ( rItem )
-, mxField( rItem.GetField() ? rItem.GetField()->Clone() : nullptr )
+, mpField( rItem.GetField() ? rItem.GetField()->Clone() : nullptr )
{
}
@@ -306,12 +310,12 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem )
const
assert(SfxPoolItem::operator==(rItem));
const SvxFieldData* pOtherFld = static_cast(rItem).GetField();
-if( mxField.get() == pOtherFld )
+if( mpField.get() == pOtherFld )
return true;
-if( mxField == nullptr || pOtherFld == nullptr )
+if( mpField == nullptr || pOtherFld == nullptr )
return false;
-return ( typeid(*mxField) == typeid(*pOtherFld) )
-&& ( *mxField == *pOtherFld );
+return ( typeid(*mpField) == typeid(*pOtherFld) )
+&& ( *mpField == *pOtherFld );
}
@@ -337,9 +341,9 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType
eT, SvxDateFormat eF
}
-tools::SvRef SvxDateField::Clone() const
+std::unique_ptr SvxDateField::Clone() const
{
-return new SvxDateField( *this );
+return o3tl::make_unique( *this );
}
@@ -448,9 +452,9 @@ SvxURLField::SvxURLField( const OUString& rURL, const
OUString& rRepres, SvxURLF
}
-tools::SvRef SvxURLField::Clone() const
+std::unique_ptr SvxURLField::Clone() const
{
-return new SvxURLField( *this );
+return o3tl::make_unique( *this );
}
@@ -484,9 +488,9 @@ SV_IMPL_PERSIST1( SvxPageTitleField );
SvxPageTitleField::SvxPageTitleField() {}
-tools::SvRef SvxPageTitleField::Clone() const
+std::unique_ptr SvxPageTitleField::Clone() const
{
-return new SvxPageTitleField();
+return o3tl::make_unique();
}
bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const
@@ -509,9 +513,9 @@ SV_IMPL_PERSIST1( SvxPageField );
SvxPageField::SvxPageField() {}
-tools::SvRef SvxPageField::Clone() const
+std::unique_ptr SvxPageField::Cl
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/XclExpChangeTrack.hxx |2 +-
sc/source/filter/xcl97/XclExpChangeTrack.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1ea64c9d0d73daec926390c87afc543d54e71fb0
Author: Noel Grandin
Date: Thu Jul 12 16:34:49 2018 +0200
loplugin:useuniqueptr in XclExpChTrData
Change-Id: I07ca61d4b3a1c85c4441938ece8106bc469173df
Reviewed-on: https://gerrit.libreoffice.org/57360
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index b20c1e167b21..5bdcd7a7bdd9 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -438,7 +438,7 @@ inline void XclExpChTrAction::WriteTabId( XclExpStream&
rStrm, SCTAB nTab ) cons
struct XclExpChTrData
{
-XclExpString* pString;
+std::unique_ptr pString;
XclExpStringRef mpFormattedString;
const ScFormulaCell*mpFormulaCell;
XclTokenArrayRefmxTokArr;
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 3035a774ac36..240dfbc6336f 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -763,7 +763,7 @@ XclExpChTrData::~XclExpChTrData()
void XclExpChTrData::Clear()
{
-DELETEZ( pString );
+pString.reset();
mpFormulaCell = nullptr;
mxTokArr.reset();
maRefLog.clear();
@@ -911,7 +911,7 @@ void XclExpChTrCellContent::GetCellData(
rRoot, EMPTY_OUSTRING, nullptr);
}
}
-rpData->pString = new XclExpString( sCellStr, XclStrFlags::NONE,
32766 );
+rpData->pString.reset( new XclExpString( sCellStr,
XclStrFlags::NONE, 32766 ) );
rpData->nType = EXC_CHTR_TYPE_STRING;
rpData->nSize = 3 + rpData->pString->GetSize();
rXclLength1 = 64 + (sCellStr.getLength() << 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source desktop/source editeng/source framework/source include/editeng include/framework include/sfx2 include/svl include
basctl/source/basicide/baside2.cxx |2 basctl/source/basicide/baside2.hxx |2 basctl/source/basicide/baside3.cxx |2 basctl/source/basicide/basidesh.cxx|4 basctl/source/basicide/bastypes.cxx|2 basctl/source/inc/baside3.hxx |2 basctl/source/inc/basidesh.hxx |2 basctl/source/inc/bastypes.hxx |8 chart2/source/model/main/UndoManager.cxx |4 cui/source/dialogs/SpellDialog.cxx |4 dbaccess/source/ui/misc/dbaundomanager.cxx |4 desktop/source/lib/init.cxx|2 editeng/source/editeng/editeng.cxx |4 editeng/source/editeng/impedit.hxx |6 editeng/source/outliner/outliner.cxx |4 framework/source/fwe/helper/undomanagerhelper.cxx | 63 +- include/editeng/editeng.hxx|6 include/editeng/outliner.hxx |9 include/framework/undomanagerhelper.hxx| 23 include/sfx2/shell.hxx | 12 include/svl/undo.hxx | 240 +++--- include/svx/svdedxv.hxx|2 include/vcl/texteng.hxx| 10 reportdesign/source/ui/report/ReportController.cxx |4 sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx |2 sc/source/ui/StatisticsDialogs/SamplingDialog.cxx |2 sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx |2 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx |2 sc/source/ui/docshell/docfunc.cxx | 12 sc/source/ui/docshell/docfuncutil.cxx |2 sc/source/ui/docshell/docsh.cxx|2 sc/source/ui/drawfunc/drawsh2.cxx |2 sc/source/ui/drawfunc/drtxtob.cxx |2 sc/source/ui/drawfunc/futext3.cxx |2 sc/source/ui/inc/docfuncutil.hxx |2 sc/source/ui/inc/docsh.hxx |2 sc/source/ui/inc/tabvwsh.hxx |2 sc/source/ui/view/auditsh.cxx |2 sc/source/ui/view/dbfunc3.cxx |2 sc/source/ui/view/drawview.cxx |2 sc/source/ui/view/editsh.cxx |2 sc/source/ui/view/formatsh.cxx |2 sc/source/ui/view/gridwin.cxx |2 sc/source/ui/view/pgbrksh.cxx |2 sc/source/ui/view/pivotsh.cxx |2 sc/source/ui/view/tabvwsh4.cxx |4 sc/source/ui/view/tabvwshb.cxx |4 sc/source/ui/view/tabvwshf.cxx |2 sc/source/ui/view/viewfun3.cxx |8 sc/source/ui/view/viewfun6.cxx |2 sd/inc/undo/undomanager.hxx|4 sd/source/core/drawdoc3.cxx|6 sd/source/core/sdpage.cxx | 12 sd/source/core/undo/undomanager.cxx|2 sd/source/ui/animations/CustomAnimationPane.cxx|4 sd/source/ui/animations/SlideTransitionPane.cxx|2 sd/source/ui/dlg/LayerTabBar.cxx |4 sd/source/ui/docshell/docshell.cxx |4 sd/source/ui/func/fubullet.cxx |4 sd/source/ui/func/fuoaprms.cxx |2 sd/source/ui/inc/DrawDocShell.hxx |3 sd/source/ui/inc/SlideSorterViewShell.hxx |2 sd/source/ui/inc/ViewShell.hxx |2 sd/source/ui/sidebar/DocumentHelper.cxx|4 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |2 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx|2 sd/source/ui/view/ViewShellImplementation.cxx |2 sd/source/ui/view/ViewShellManager.cxx |4 sd/source/ui/view/drviews2.cxx |4 sd/source/ui/view
Re: Calc functions and Calc option 'convert text to number'
Hi Eike, I'm working on tdf64132, which is about SUM and text values that are not converted to numbers. That bug is wrong and not a bug, I'll explain there, so all further speculations about changing behaviour and implied problems are moot ;-) Well, then some additional help text will probably be needed to avoid confusion amongst users/bug-evaluators oh, and me ;-) And I can start really looking into tdf118654. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: leading dot and trailing # in lock files
When tweaking lock files naming, please keep in mind why the lock files are used in the first place. One of their goals is telling other programs (it means, other LibreOffice/AOO/OOo instances opening same files from other sessions/boxes) that the file is in use (when OS/FS doesn't provide reliable FS locking), and also some basic information on who/where is using the file (so that it's possible to identify and do something sensible with that). Changing a lock file name means that all the other programs (e.g., old LO or AOO) will not be able to detect the lock files. Also, current LO would not be able to detect those legacy lock files, or will need to have more complex code to write/read two lock files. I'd say that writing a "safe" lockfile name *after* unsuccessful attempt to create a normal lockfile, *and* making sure that the normal lockfile is absent (so that the failure is not because of already-locked file)... could be ~reasonable (because that would mean that normal lockfile name is unavailable, so legacy soffices would not be able to use usual locking there anyway). But that is not just a "let's change our name for all cases" approach. And oh, this will introduce more complexity to our fragile and already too complex locking code... well - that may be worth it; see [1] for another example of situation where certain characters are prohibited and locking fails. Thank you for consideration. [1] https://bugs.documentfoundation.org/show_bug.cgi?id=115747 -- Best regards, Mike Kaganski. От: LibreOffice от имени Olivier Tilloy Отправлено: 13 июля 2018 г. 3:36 Кому: libreoffice@lists.freedesktop.org Тема: leading dot and trailing # in lock files Hi all, I maintain a snap package for libreoffice¹, and it has been reported that document files cannot be saved to $HOME/ ² because of the strict confinement rules of snappy, whereby writing hidden files (filename starting with a dot) in $HOME is forbidden. I looked into the document file lock code, and came up with a simple patch that removes the leading dot. So far, so good. It was pointed out to me that file managers like Nautilus also consider files with a trailing tilde (~) to be hidden, so I updated that patch so that lock files are represented like so: $HOME/foobar.odt -> $HOME/foobar.odt.lock~ I was wondering about the trailing # in the current lock file implementation. I dug into the git history, and it's always been there as far as I can tell, but I'm not sure why. Can anyone shed some light on this? Is it safe to replace "#" with ".lock~" (only in the context of the snap package, I don't intend to upstream that change unless it's deemed sensible) ? Cheers, Olivier ¹ https://snapcraft.io/libreoffice ² https://launchpad.net/bugs/1766192 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-49'
Tag 'cd-5.3-49' created by Jan Holesovsky at 2018-07-12 22:53 + cd-5.3-49 Changes since cd-5.3-48-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.2.2-6'
Tag 'cd-3.2.2-6' created by Jan Holesovsky at 2018-07-12 22:35 + cd-3.2.2-6 Changes since cd-3.2.2-5-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - common/Util.cpp wsd/ClientSession.cpp
common/Util.cpp |6 ++
wsd/ClientSession.cpp |4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 6acfdd5d3738a268667c0d61de7b398b8c5c5e8d
Author: Ashod Nakashian
Date: Thu Jul 12 18:00:33 2018 -0400
wsd: prevent anonymization to empty strings
Change-Id: Ib4f90db5d39e7bf2e2f0b6566b1927363e6afcec
Reviewed-on: https://gerrit.libreoffice.org/57377
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/common/Util.cpp b/common/Util.cpp
index b481d9e88..4b57d429a 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -549,6 +549,9 @@ namespace Util
void mapAnonymized(const std::string& plain, const std::string& anonymized)
{
+if (plain.empty() || anonymized.empty())
+return;
+
LOG_TRC("Anonymizing [" << plain << "] -> [" << anonymized << "].");
std::unique_lock lock(AnonymizedMutex);
@@ -563,7 +566,10 @@ namespace Util
const auto it = AnonymizedStrings.find(text);
if (it != AnonymizedStrings.end())
+{
+LOG_TRC("Found anonymized [" << text << "] -> [" << it->second
<< "].");
return it->second;
+}
}
// We just need something irreversible, short, and
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 87bf4e1db..a023453f7 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -309,12 +309,12 @@ bool ClientSession::loadDocument(const char* /*buffer*/,
int /*length*/,
std::string encodedUserId;
Poco::URI::encode(_userId, "", encodedUserId);
oss << " authorid=" << encodedUserId;
-oss << " xauthorid=" << LOOLWSD::anonymizeUsername(encodedUserId);
+oss << " xauthorid=" << LOOLWSD::anonymizeUsername(_userId);
std::string encodedUserName;
Poco::URI::encode(_userName, "", encodedUserName);
oss << " author=" << encodedUserName;
-oss << " xauthor=" << LOOLWSD::anonymizeUsername(encodedUserName);
+oss << " xauthor=" << LOOLWSD::anonymizeUsername(_userName);
}
if (!_userExtraInfo.empty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/Makefile.am
loleaflet/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2fad1aaec63fd8804edc12d0c385c0f3ac83f499 Author: Jan Holesovsky Date: Fri Jul 13 00:26:24 2018 +0200 Fix a packaging problem. Change-Id: Ie41ff717c77d58943502afc932440bb150866636 Reviewed-on: https://gerrit.libreoffice.org/57376 Reviewed-by: Aron Budea Tested-by: Aron Budea diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 495cd47d5..02d42b8be 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -29,7 +29,7 @@ node_modules: npm-shrinkwrap.json dist/$(JQUERY_UI_IMAGE_PATH)/%.png: $(JQUERY_UI_IMAGE_PATH)/%.png mkdir -p dist/$(JQUERY_UI_IMAGE_PATH) - cp -a $(JQUERY_UI_IMAGE_PATH)/* dist/$(JQUERY_UI_IMAGE_PATH)/ + cp -a $< dist/$(JQUERY_UI_IMAGE_PATH)/ dist/l10n/%.json: po/%.po @util/po2json.py $< -o $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'refs/tags/cd-3.2.2-6' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cd-3.2.2-6'
Tag 'cd-3.2.2-6' created by Jan Holesovsky at 2018-07-12 22:13 + cd-3.2.2-5 Changes since cd-3.2.2-5-9: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/dist
loleaflet/dist/l10n/uno/ja.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cef61dc6509473030bd43b9758b4ce6bd12d6078 Author: Aron Budea Date: Fri Jul 13 00:00:44 2018 +0200 Add missing comma Change-Id: I2f4ce5eba727329486170483b514a5cef429cbb7 Reviewed-on: https://gerrit.libreoffice.org/57375 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/l10n/uno/ja.json b/loleaflet/dist/l10n/uno/ja.json index e0139d3af..05a1e2a90 100644 --- a/loleaflet/dist/l10n/uno/ja.json +++ b/loleaflet/dist/l10n/uno/ja.json @@ -254,7 +254,7 @@ "~Show Sheet...":"シートを表示(~S)...", "~Sort...":"並べ替え(~S)...", "~Spacing":"間隔(~S)", -"~Spelling and Grammar...":"スペルと文法チェック(~S)..." +"~Spelling and Grammar...":"スペルと文法チェック(~S)...", "~Standard Filter...":"標準フィルター(~S)...", "~Subject":"テーマ(~S)", "~Table":"表(~T)", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/l10n/uno/ja.json |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b40c9a35ea1da406adfe89559c35990cdfe01995 Author: Aron Budea Date: Fri Jul 13 00:00:44 2018 +0200 Add missing comma Change-Id: I2f4ce5eba727329486170483b514a5cef429cbb7 Reviewed-on: https://gerrit.libreoffice.org/57374 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/l10n/uno/ja.json b/loleaflet/dist/l10n/uno/ja.json index b67901077..767e580d9 100644 --- a/loleaflet/dist/l10n/uno/ja.json +++ b/loleaflet/dist/l10n/uno/ja.json @@ -255,7 +255,7 @@ "~Show Sheet...":"シートを表示(~S)...", "~Sort...":"並べ替え(~S)...", "~Spacing":"間隔(~S)", -"~Spelling and Grammar...":"スペルと文法チェック(~S)..." +"~Spelling and Grammar...":"スペルと文法チェック(~S)...", "~Standard Filter...":"標準フィルター(~S)...", "~Subject":"テーマ(~S)", "~Table":"表(~T)", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - debian/changelog debian/control loolwsd.spec.in
debian/changelog |6 ++
debian/control |2 +-
loolwsd.spec.in |4 ++--
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit db7cb6857d70bfeeced5c80f0c7db399e419baef
Author: Jan Holesovsky
Date: Fri Jul 13 00:04:38 2018 +0200
Bump package version to 3.2.2-6
Change-Id: I49ebae7281baab96e5a754270fba8393142ee5b1
diff --git a/debian/changelog b/debian/changelog
index c9d77adb1..8b56842b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (3.2.2-6) unstable; urgency=medium
+
+ * see the git log: http://col.la/coolcd32
+
+ -- Jan Holesovsky Fri, 13 Jul 2018 00:01:00 +0200
+
loolwsd (3.2.2-5) unstable; urgency=medium
* see the git log: http://col.la/coolcd32
diff --git a/debian/control b/debian/control
index 0b4610669..3881b500c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio,
libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0,
libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1,
collaboraofficebasis5.3-calc (>= 5.3.10.48), collaboraofficebasis5.3-core (>=
5.3.10.48), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.48),
collaboraofficebasis5.3-images (>= 5.3.10.48), collaboraofficebasis5.3-impress
(>= 5.3.10.48), collaboraofficebasis5.3-ooofonts (>= 5.3.10.48),
collaboraofficebasis5.3-writer (>= 5.3.10.48), collaboraoffice5.3 (>=
5.3.10.48), collaboraoffice5.3-ure (>= 5.3.10.48),
collaboraofficebasis5.3-en-us (>= 5.3.10.48),
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.48),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.48),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.48), collaboraofficebasis5.3-draw
(>= 5.3.10.48), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.48)
, collaboraofficebasis5.3-filter-data (>= 5.3.10.48),
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.48)
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6,
libxinerama1, libxrender1, libgl1-mesa-glx, libcups2, libcurl3-gnutls, cpio,
libcap2-bin, libexpat1, libicu55, libjpeg-turbo8, libnss3, libpng12-0,
libpoppler58, libxcb-render0, libxcb-shm0, libxml2, libxslt1.1,
collaboraofficebasis5.3-calc (>= 5.3.10.49), collaboraofficebasis5.3-core (>=
5.3.10.49), collaboraofficebasis5.3-graphicfilter (>= 5.3.10.49),
collaboraofficebasis5.3-images (>= 5.3.10.49), collaboraofficebasis5.3-impress
(>= 5.3.10.49), collaboraofficebasis5.3-ooofonts (>= 5.3.10.49),
collaboraofficebasis5.3-writer (>= 5.3.10.49), collaboraoffice5.3 (>=
5.3.10.49), collaboraoffice5.3-ure (>= 5.3.10.49),
collaboraofficebasis5.3-en-us (>= 5.3.10.49),
collaboraofficebasis5.3-en-us-calc (>= 5.3.10.49),
collaboraofficebasis5.3-en-us-res (>= 5.3.10.49),
collaboraofficebasis5.3-noto-fonts (>= 5.3.10.49), collaboraofficebasis5.3-draw
(>= 5.3.10.49), collaboraofficebasis5.3-extension-pdf-import (>= 5.3.10.49)
, collaboraofficebasis5.3-filter-data (>= 5.3.10.49),
collaboraofficebasis5.3-ooolinguistic (>= 5.3.10.49)
Conflicts: collaboraofficebasis5.3-gnome-integration,
collaboraofficebasis5.3-kde-integration
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a6df23195..c8405c3b7 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:5%{?dist}
+Release:6%{?dist}
%if 0%{?suse_version} == 1110
Group: Productivity/Office/Suite
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -38,7 +38,7 @@ BuildRequires: libcap-progs linux-glibc-devel
systemd-rpm-macros
BuildRequires: libcap-progs
%endif
-Requires: collaboraoffice5.3 >= 5.3.10.48 collaboraoffice5.3-ure >=
5.3.10.48 collaboraofficebasis5.3-core >= 5.3.10.48
collaboraofficebasis5.3-writer >= 5.3.10.48 collaboraofficebasis5.3-impress >=
5.3.10.48 collaboraofficebasis5.3-graphicfilter >= 5.3.10.48
collaboraofficebasis5.3-en-US >= 5.3.10.48 collaboraofficebasis5.3-calc >=
5.3.10.48 collaboraofficebasis5.3-en-US-res >= 5.3.10.48
collaboraofficebasis5.3-en-US-calc >= 5.3.10.48
collaboraofficebasis5.3-ooofonts >= 5.3.10.48 collaboraofficebasis5.3-images >=
5.3.10.48 collaboraofficebasis5.3-noto-fonts >= 5.3.10.48
collaboraofficebasis5.3-draw >= 5.3.10.48
collaboraofficebasis5.3-extension-pdf-import >= 5.3.10.48
collaboraofficebasis5.3-filter-data >= 5.3.10.48
collaboraofficebasis5.3-ooolinguistic >= 5.3.10.48
+Requires: collaboraoffice5.3 >= 5.3.10.49 collaboraoffice5.3-ure >=
5.3.10.49 collaboraofficebasis5.3-core >= 5.3.10.49
collaboraofficebasis5.3-writer >= 5.3.10.49 collaboraofficebasis5.3-impress >=
5.3
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist
loleaflet/dist/l10n/uno/ja.json |4 1 file changed, 4 insertions(+) New commits: commit 7260936bd4acd07d7f46fef7c87e23f23cd563ad Author: Aron Budea Date: Thu Jul 12 23:44:51 2018 +0200 loleaflet: add missing Japanese translations Change-Id: I13ac03dfc72d4c60130c64b145876e2fd830ad57 Reviewed-on: https://gerrit.libreoffice.org/57372 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/l10n/uno/ja.json b/loleaflet/dist/l10n/uno/ja.json index 8f895c013..b67901077 100644 --- a/loleaflet/dist/l10n/uno/ja.json +++ b/loleaflet/dist/l10n/uno/ja.json @@ -60,6 +60,7 @@ "Format as Percent":"パーセントの書式", "Formatting Mark":"書式設定記号", "Forward One":"前面へ移動", +"For~matting Marks":"書式設定記号(~M)", "F~ormat":"書式(~O)", "F~ull Screen":"全画面表示(~U)", "He~ader":"ヘッダー(~A)", @@ -202,8 +203,10 @@ "~Delete Sheet...":"シートの削除(~D)...", "~Edit":"編集(~E)", "~Edit Style...":"スタイルの編集(~E)...", +"~Endnote":"文末脚注(~E)", "~File":"ファイル(~F)", "~First Paragraph":"最初の段落(~F)", +"~Footnote":"脚注(~F)", "~Format Cells...":"セルの書式設定(~F)...", "~Group and Outline":"グループ化およびアウトライン(~G)", "~Group...":"グループ化(~G)...", @@ -252,6 +255,7 @@ "~Show Sheet...":"シートを表示(~S)...", "~Sort...":"並べ替え(~S)...", "~Spacing":"間隔(~S)", +"~Spelling and Grammar...":"スペルと文法チェック(~S)..." "~Standard Filter...":"標準フィルター(~S)...", "~Subject":"テーマ(~S)", "~Table":"表(~T)", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/dist
loleaflet/dist/l10n/uno/ja.json |4 1 file changed, 4 insertions(+) New commits: commit 31f0b0286abc2626b688b767a380eaf5c7f7daea Author: Aron Budea Date: Thu Jul 12 23:44:51 2018 +0200 loleaflet: add missing Japanese translations Change-Id: I13ac03dfc72d4c60130c64b145876e2fd830ad57 Reviewed-on: https://gerrit.libreoffice.org/57373 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/l10n/uno/ja.json b/loleaflet/dist/l10n/uno/ja.json index 9c74de24d..e0139d3af 100644 --- a/loleaflet/dist/l10n/uno/ja.json +++ b/loleaflet/dist/l10n/uno/ja.json @@ -59,6 +59,7 @@ "Format as Percent":"パーセントの書式", "Formatting Mark":"書式設定記号", "Forward One":"前面へ移動", +"For~matting Marks":"書式設定記号(~M)", "F~ormat":"書式(~O)", "F~ull Screen":"全画面表示(~U)", "He~ader":"ヘッダー(~A)", @@ -201,8 +202,10 @@ "~Delete Sheet...":"シートの削除(~D)...", "~Edit":"編集(~E)", "~Edit Style...":"スタイルの編集(~E)...", +"~Endnote":"文末脚注(~E)", "~File":"ファイル(~F)", "~First Paragraph":"最初の段落(~F)", +"~Footnote":"脚注(~F)", "~Format Cells...":"セルの書式設定(~F)...", "~Group and Outline":"グループ化およびアウトライン(~G)", "~Group...":"グループ化(~G)...", @@ -251,6 +254,7 @@ "~Show Sheet...":"シートを表示(~S)...", "~Sort...":"並べ替え(~S)...", "~Spacing":"間隔(~S)", +"~Spelling and Grammar...":"スペルと文法チェック(~S)..." "~Standard Filter...":"標準フィルター(~S)...", "~Subject":"テーマ(~S)", "~Table":"表(~T)", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/src
loleaflet/src/core/Socket.js |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 59c62ea37de820b3a44da575345bcc35213a1a83
Author: Ashod Nakashian
Date: Thu Jul 12 08:25:04 2018 -0400
leaflet: detect WebSocket failure on IE11 and inform user
IE 11 has limitation on the number of WebSockets open
to a signle domain, 6 by default. Once the limitation
hit, creating a new WebSocket throws exception
(SecurityError).
This detects IE11 and lets the user know about this
limitation and how to extend it.
Change-Id: I8119fe35e0d460f1a52251d3f4bcd5136992c224
Reviewed-on: https://gerrit.libreoffice.org/57340
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index aae9f0f89..eb93d1f2f 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -35,7 +35,14 @@ L.Socket = L.Class.extend({
try {
this.socket = new WebSocket(map.options.server +
'/lool/' + encodeURIComponent(map.options.doc + '?' +
$.param(map.options.docParams)) + '/ws' + wopiSrc);
} catch (e) {
- this._map.fire('error', {msg: _('Oops, there is a
problem connecting to LibreOffice Online : ').replace('LibreOffice Online',
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice
Online')) + e, cmd: 'socket', kind: 'failed', id: 3});
+ // On IE 11 there is a limiation on the number of
WebSockets open to a single domain (6 by default and can go to 128).
+ // Detect this and hint the user.
+ var msgHint = '';
+ var isIE11 = !!window.MSInputMethodContext &&
!!document.documentMode; //
https://stackoverflow.com/questions/21825157/internet-explorer-11-detection
+ if (isIE11)
+ msgHint = 'Note: IE11 has limitation on the
maximum number of WebSockets open to a single domain. Please consult this page
on how to change this limit:
https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/general-info/ee330736(v=vs.85)#websocket-maximum-server-connections';
+
+ this._map.fire('error', {msg: _('Oops, there is a
problem connecting to LibreOffice Online : ').replace('LibreOffice Online',
(typeof brandProductName !== 'undefined' ? brandProductName : 'LibreOffice
Online')) + e + msgHint, cmd: 'socket', kind: 'failed', id: 3});
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - common/Session.cpp common/Util.cpp common/Util.hpp kit/Kit.cpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.
common/Session.cpp |4
common/Util.cpp| 32
common/Util.hpp|7 +++
kit/Kit.cpp|8
wsd/DocumentBroker.cpp |9 -
wsd/LOOLWSD.cpp|3 ++-
wsd/LOOLWSD.hpp|6 +-
wsd/Storage.cpp|8
8 files changed, 58 insertions(+), 19 deletions(-)
New commits:
commit 3ee643a6f3e24951dc2748a2adceea646d125d35
Author: Ashod Nakashian
Date: Tue Jul 10 23:09:27 2018 -0400
wsd: anonymize filename by using the WOPI file ID
Change-Id: I869cae3846c8630b192246bc68cc90e70c50d1fd
Reviewed-on: https://gerrit.libreoffice.org/57254
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/common/Session.cpp b/common/Session.cpp
index dc538ca89..7e174e2e3 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -163,6 +163,10 @@ void Session::parseDocOptions(const
std::vector& tokens, int& part,
}
}
+Util::mapAnonymized(_userId, _userIdAnonym);
+Util::mapAnonymized(_userName, _userNameAnonym);
+Util::mapAnonymized(_jailedFilePath, _jailedFilePathAnonym);
+
if (tokens.size() > offset)
{
if (getTokenString(tokens[offset], "options", _docOptions))
diff --git a/common/Util.cpp b/common/Util.cpp
index 30fbc20fe..b481d9e88 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -545,12 +545,26 @@ namespace Util
static std::map AnonymizedStrings;
static std::atomic AnonymizationSalt(0);
+static std::mutex AnonymizedMutex;
+
+void mapAnonymized(const std::string& plain, const std::string& anonymized)
+{
+LOG_TRC("Anonymizing [" << plain << "] -> [" << anonymized << "].");
+
+std::unique_lock lock(AnonymizedMutex);
+
+AnonymizedStrings[plain] = anonymized;
+}
std::string anonymize(const std::string& text)
{
-const auto it = AnonymizedStrings.find(text);
-if (it != AnonymizedStrings.end())
-return it->second;
+{
+std::unique_lock lock(AnonymizedMutex);
+
+const auto it = AnonymizedStrings.find(text);
+if (it != AnonymizedStrings.end())
+return it->second;
+}
// We just need something irreversible, short, and
// quite simple.
@@ -561,7 +575,7 @@ namespace Util
// Generate the anonymized string. The '#' is to hint that it's
anonymized.
// Prepend with salt to make it unique, in case we get collisions
(which we will, eventually).
const std::string res = '#' + Util::encodeId(AnonymizationSalt++, 0) +
'#' + Util::encodeId(hash, 0) + '#';
-AnonymizedStrings[text] = res;
+mapAnonymized(text, res);
return res;
}
@@ -582,6 +596,16 @@ namespace Util
return Util::anonymize(basename) + ext;
}
+std::string getFilenameFromPath(const std::string& path)
+{
+const std::size_t mid = path.find_last_of('/');
+if (mid != std::string::npos)
+return path.substr(mid + 1);
+
+// No path, treat as filename only.
+return path;
+}
+
std::string anonymizeUrl(const std::string& url)
{
const std::size_t mid = url.find_last_of('/');
diff --git a/common/Util.hpp b/common/Util.hpp
index c0baf188c..d8717b234 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -254,9 +254,16 @@ namespace Util
/// Called on strings to be logged or exposed.
std::string anonymize(const std::string& text);
+/// Sets the anonymized version of a given plain-text string.
+/// After this, 'anonymize(plain)' will return 'anonymized'.
+void mapAnonymized(const std::string& plain, const std::string&
anonymized);
+
/// Anonymize the basename of filenames only, preserving the path and
extension.
std::string anonymizeUrl(const std::string& url);
+/// Extract and return the filename given a path (i.e. the token after
last '/').
+std::string getFilenameFromPath(const std::string& path);
+
/// Given one or more patterns to allow, and one or more to deny,
/// the match member will return true if, and only if, the subject
/// matches the allowed list, but not the deny.
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 9b5ef8f48..3c70a8086 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -109,6 +109,7 @@ static LokHookFunction2* initFunction = nullptr;
#ifndef BUILDING_TESTS
static bool AnonymizeFilenames = false;
static bool AnonymizeUsernames = false;
+static std::string ObfuscatedFileId;
static std::string ObfuscatedUserId;
#endif
@@ -2240,8 +2241,8 @@ void lokit_main(const std::string& childRoot,
const std::string& sessionId = tokens[1];
const std::string& docKey = tokens[2];
const std::string& docId = tokens[3];
-if (tokens.size() > 4)
-ObfuscatedUserId = tokens
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - 2 commits - configure.ac desktop/source
configure.ac|2 -
desktop/source/lib/init.cxx | 50 ++--
2 files changed, 27 insertions(+), 25 deletions(-)
New commits:
commit 9247187ea846ca956d48330708a43932559c7be6
Author: Jan Holesovsky
Date: Thu Jul 12 23:14:19 2018 +0200
Bump version 5.3-49
Change-Id: I27cbc26e1623123ad522ceefdaf9aaa9b235bd25
diff --git a/configure.ac b/configure.ac
index 6d93aa49f500..daa8073287b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([Collabora Office],[5.3.10.48],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.49],[],[],[https://collaboraoffice.com/])
AC_PREREQ([2.59])
commit 0efaa14cda8fa607a57c465052a32dc1a9960931
Author: Ashod Nakashian
Date: Fri Jul 6 16:49:29 2018 -0400
desktop: move font initialization into preloadData
Change-Id: I66840512b45e987cc7b08b07b65bdb24f2023a41
Reviewed-on: https://gerrit.libreoffice.org/57160
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 72b441709be5..e63653507093 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3638,9 +3638,35 @@ static void preloadData()
images.getImageUrl("forcefed.png", "style", "FO_oo");
std::cerr << "Preload languages\n";
+
// force load language singleton
SvtLanguageTable::HasLanguageType(LANGUAGE_SYSTEM);
LanguageTag::isValidBcp47("foo");
+
+std::cerr << "Preload fonts\n";
+
+// Initialize fonts.
+css::uno::Reference xLangSrv =
css::linguistic2::LinguServiceManager::create(xContext);
+if (xLangSrv.is())
+{
+css::uno::Reference
xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY);
+css::uno::Reference
xLocales(xSpell, css::uno::UNO_QUERY);
+if (xLocales.is())
+aLocales = xLocales->getLocales();
+}
+
+for (const auto& aLocale : aLocales)
+{
+//TODO: Add more types and cache more aggessively. For now this
initializes the fontcache.
+using namespace ::com::sun::star::i18n::ScriptType;
+LanguageType nLang;
+nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), LATIN);
+OutputDevice::GetDefaultFont(DefaultFontType::LATIN_SPREADSHEET,
nLang, GetDefaultFontFlags::OnlyOne);
+nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), ASIAN);
+OutputDevice::GetDefaultFont(DefaultFontType::CJK_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
+nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), COMPLEX);
+OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
+}
}
static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const
char* pUserProfileUrl)
@@ -3760,30 +3786,6 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
preloadData();
-// Initialize fonts.
-css::uno::Sequence< css::lang::Locale > aLocales;
-css::uno::Reference
xLangSrv = css::linguistic2::LinguServiceManager::create(xContext);
-if (xLangSrv.is())
-{
-css::uno::Reference
xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY);
-css::uno::Reference
xLocales(xSpell, css::uno::UNO_QUERY);
-if (xLocales.is())
-aLocales = xLocales->getLocales();
-}
-
-for (const auto& aLocale : aLocales)
-{
-//TODO: Add more types and cache more aggessively. For now
this initializes the fontcache.
-using namespace ::com::sun::star::i18n::ScriptType;
-LanguageType nLang;
-nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), LATIN);
-
OutputDevice::GetDefaultFont(DefaultFontType::LATIN_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
-nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), ASIAN);
-
OutputDevice::GetDefaultFont(DefaultFontType::CJK_SPREADSHEET, nLang,
GetDefaultFontFlags::OnlyOne);
-nLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag::convertToLanguageType(aLocale,
false), COMPLEX);
-
OutputDevice::GetDefaultFont(DefaultFontType::CTL_SPREADSHEET, nLang,
GetDefaultFontFlags::On
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source odk/setsdkenv_unix.sh.in odk/settings sal/prj solenv/gbuild solenv/inc sw/source
desktop/source/pagein/makefile.mk |5 -
odk/setsdkenv_unix.sh.in | 10 +-
odk/settings/settings.mk | 34 +++
sal/prj/d.lst |4
solenv/gbuild/platform/macosx.mk |9 +-
solenv/inc/libs.mk| 13 +-
sw/source/ui/frmdlg/column.src| 170 +++---
7 files changed, 121 insertions(+), 124 deletions(-)
New commits:
commit 4c184a25474995d41296f1c59eef364b3c710842
Author: Jim Jagielski
Date: Thu Jul 12 18:50:38 2018 +
Update targets for macOS
diff --git a/desktop/source/pagein/makefile.mk
b/desktop/source/pagein/makefile.mk
index e4588785cd6a..fdf2988001fa 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -63,13 +63,8 @@ ALL: \
.INCLUDE : target.mk
ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
-.IF "$(OS)" == "MACOSX"
-UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
-UNODLLPOST=.uno$(DLLPOST)
-.ELSE
UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
UNODLLPOST=.uno$(DLLPOST)
-.ENDIF
DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default
URELIBPATH=..$/ure-link$/lib
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 7b3a39874ef0..5a7fa6382f64 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -293,15 +293,15 @@ then
if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}"
\
+ ln -s
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
fi
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 276fa3091b2a..f22d2d1eedb2 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -436,23 +436,23 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-luno_sal3
-CPPULIB=-luno_cppu3
-CPPUHELPERLIB=-luno_cppuhelper3$(COMID)
-SALHELPERLIB=-luno_salhelper3$(COMID)
-REGLIB=-lreg3
-STORELIB=-lstore3
-
-SALDYLIB=-Wl,-dylib_file,@__URELIB/libuno_sal3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppu3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppuhelper3'$(COMID).dylib:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_salhelper3$(COMID).dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__URELIB/libreg3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__URELIB/libstore3.dylib:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change
@__URELIB/libuno3_sal.dylib
@executable_path/libuno_sal3.dylib -change
@__URELIB/libuno_cppu3.dylib
@executable_path/libuno_cppu3.dylib -change
@__URELIB/libuno_cppuhelper$(COMID)3.dylib
@executable_path/libuno_cppuhelper$(COMID)3.dylib -change
@__URELIB/libuno_salhelper$(COMID)3.dylib
@executable_path/libuno_salhelper$(COMID)3.dylib -change
@__URELIB/libreg3.dylib
@executable_path/libreg3.dylib -change
@__URELIB/libstore3.dylib
@executable_path/libstore3.dylib
-
-INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change
@__URELIB/libuno_sal3.dylib
libuno_sal3.dylib -change
@__URELIB/libuno_cppu3.dylib
libu
[Libreoffice-commits] core.git: include/xmloff sc/source sw/source xmloff/inc xmloff/source
include/xmloff/xmlexp.hxx|3 ++
sc/source/filter/xml/xmlexprt.cxx| 32 +++--
sc/source/filter/xml/xmlexprt.hxx|2 +
sw/source/filter/xml/xmlexp.hxx |2 +
sw/source/filter/xml/xmlfmte.cxx | 34 +++
xmloff/inc/SchXMLExport.hxx |1
xmloff/source/chart/SchXMLExport.cxx | 25 +++
xmloff/source/core/xmlexp.cxx| 13 +++---
xmloff/source/draw/sdxmlexp.cxx | 30 +--
xmloff/source/draw/sdxmlexp_impl.hxx |2 +
xmloff/source/style/XMLFontAutoStylePool.cxx |2 -
11 files changed, 122 insertions(+), 24 deletions(-)
New commits:
commit 1a8435a23e84f3c580eb9d4404a738d9
Author: Tomaž Vajngerl
Date: Thu Jul 12 16:37:18 2018 +0200
tdf#65353 separate autostyle collection and export
To be able to look which fonts are in use, we need to collect the
autostyles which contains all styles that are used in a document.
Previously the autostyles were collected in the same process as
they were expoted, so with this commit we separate collaction and
export. First we collacte the auto styles, then e can use them in
embedded fonts export, the last we export the auto styles
themselves.
Change-Id: Ib939f1119f4af00a1e5d66fcd2e04b9d2add6881
Reviewed-on: https://gerrit.libreoffice.org/57348
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index eeedd1bc09fa..2764516728e2 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -264,6 +264,7 @@ protected:
void SetDocHandler( const css::uno::Reference<
css::xml::sax::XDocumentHandler > &rHandler );
+bool mbAutoStylesCollected;
public:
SvXMLExport(
@@ -291,6 +292,8 @@ public:
virtual ~SvXMLExport() override;
+virtual void collectAutoStyles();
+
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
static SvXMLExport* getImplementation( const css::uno::Reference<
css::uno::XInterface >& ) throw();
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 4f8b61980106..27c94380fa5c 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2271,8 +2271,13 @@ static uno::Any lcl_GetEnumerated(
uno::Reference
return aRet;
}
-void ScXMLExport::ExportAutoStyles_()
+void ScXMLExport::collectAutoStyles()
{
+SvXMLExport::collectAutoStyles();
+
+if (mbAutoStylesCollected)
+return;
+
if (!GetModel().is())
return;
@@ -2664,7 +2669,31 @@ void ScXMLExport::ExportAutoStyles_()
}
pChangeTrackingExportHelper->CollectAutoStyles();
+}
+
+if (getExportFlags() & SvXMLExportFlags::MASTERSTYLES)
+GetPageExport()->collectAutoStyles(true);
+
+mbAutoStylesCollected = true;
+}
+void ScXMLExport::ExportAutoStyles_()
+{
+if (!GetModel().is())
+return;
+
+uno::Reference xSpreadDoc( GetModel(),
uno::UNO_QUERY );
+if (!xSpreadDoc.is())
+return;
+
+uno::Reference xIndex( xSpreadDoc->getSheets(),
uno::UNO_QUERY );
+if (!xIndex.is())
+return;
+
+collectAutoStyles();
+
+if (getExportFlags() & SvXMLExportFlags::CONTENT)
+{
GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_COLUMN);
GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_ROW);
GetAutoStylePool()->exportXML(XML_STYLE_FAMILY_TABLE_TABLE);
@@ -2693,7 +2722,6 @@ void ScXMLExport::ExportAutoStyles_()
if (getExportFlags() & SvXMLExportFlags::MASTERSTYLES)
{
-GetPageExport()->collectAutoStyles(true);
GetPageExport()->exportAutoStyles();
}
diff --git a/sc/source/filter/xml/xmlexprt.hxx
b/sc/source/filter/xml/xmlexprt.hxx
index e0eeea036dc7..c551fbe2e96f 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -236,6 +236,8 @@ public:
virtual ~ScXMLExport() override;
+void collectAutoStyles() override;
+
static sal_Int16 GetMeasureUnit();
ScDocument* GetDocument() { return pDoc; }
const ScDocument*GetDocument() const { return pDoc; }
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 089521486998..211f50840da6 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -114,6 +114,8 @@ public:
virtual ~SwXMLExport() override;
+void collectAutoStyles() override;
+
virtual ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass =
::xmloff::token::XML_TOKEN_INVALID ) override;
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 6c2d08571f14..d099a91c9e12 100644
--- a/sw/source/fi
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svx/sdi
svx/sdi/svx.sdi | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 296f722e0447cf7bc43c556f861c3e6686f224b6 Author: Xisco Fauli Date: Sun Jul 8 15:51:38 2018 +0200 tdf#101778: Disable crop and rotate in read-only mode Change-Id: I26d6e98a768d40e97209e0a646cbb834d2635f9a Reviewed-on: https://gerrit.libreoffice.org/57158 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit cdd373e593557984dcd90c94bbb9b053655c1b83) Reviewed-on: https://gerrit.libreoffice.org/57321 diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 5fcf5d7585b4..d9be1425c8f4 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -4261,7 +4261,7 @@ SfxVoidItem RotateLeft SID_ROTATE_GRAPHIC_LEFT [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4277,7 +4277,7 @@ SfxVoidItem Rotate180 SID_ROTATE_GRAPHIC_180 [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4293,7 +4293,7 @@ SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4310,7 +4310,7 @@ SfxVoidItem RotateReset SID_ROTATE_GRAPHIC_RESET [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4327,7 +4327,7 @@ SfxBoolItem Crop SID_OBJECT_CROP [ AutoUpdate = TRUE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/uibase/uno/unotxdoc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 796ca86ce151b1887dd1dc2c6eac217d7835095d
Author: Thorsten Behrens
Date: Thu Jul 12 00:11:30 2018 +0200
Make setPagePrintSettings() accept IsLandscape again
Regression from 80c35d97b9b3b60a091aae77de0ffef38cbf531a - invert
the check for boost::optional validity.
Change-Id: If4e041e1fe349c1fcb2c74b2e5780bf57300486f
Reviewed-on: https://gerrit.libreoffice.org/57309
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 0853b05b1fabb231a7d57d811c5a06ee542d3295)
Reviewed-on: https://gerrit.libreoffice.org/57316
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 0a22921c96e6..1db55d3c5831 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1142,7 +1142,7 @@ void SwXTextDocument::setPagePrintSettings(const
Sequence< beans::PropertyValue
else if(sName == "IsLandscape")
{
auto b = o3tl::tryAccess(rVal);
-bException = bool(b);
+bException = !b;
if (b)
{
aData.SetLandscape(*b);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - desktop/source odk/setsdkenv_unix.sh.in odk/settings sal/prj solenv/gbuild solenv/inc
desktop/source/pagein/makefile.mk |5 +
odk/setsdkenv_unix.sh.in | 10 +-
odk/settings/settings.mk | 34 +-
sal/prj/d.lst |4 ++--
solenv/gbuild/platform/macosx.mk |6 ++
solenv/inc/libs.mk| 13 -
6 files changed, 39 insertions(+), 33 deletions(-)
New commits:
commit bb86fdd2cef9abc011e398dd4a4be17f3d332641
Author: Jim Jagielski
Date: Thu Jul 12 17:25:33 2018 +
Work on getting macOS building again w/ 4.2.0 and the versioning of libs...
what a cluster*
diff --git a/desktop/source/pagein/makefile.mk
b/desktop/source/pagein/makefile.mk
index fdf2988001fa..e4588785cd6a 100644
--- a/desktop/source/pagein/makefile.mk
+++ b/desktop/source/pagein/makefile.mk
@@ -63,8 +63,13 @@ ALL: \
.INCLUDE : target.mk
ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
+.IF "$(OS)" == "MACOSX"
+UDKDLLPOST=$(patsubst %.dylib,%$(UDK_MAJOR).dylib,$(DLLPOST)
+UNODLLPOST=.uno$(DLLPOST)
+.ELSE
UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
UNODLLPOST=.uno$(DLLPOST)
+.ENDIF
DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default
URELIBPATH=..$/ure-link$/lib
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 5a7fa6382f64..7b3a39874ef0 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -293,15 +293,15 @@ then
if [ "${OFFICE_HOME}" ]
then
mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppu3.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_cppuhelper3${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_sal3.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_salhelper3${comid}.${soext}" \
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s
"${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+ ln -s "${OO_SDK_OFFICE_LIB_DIR}/libuno_purpenvhelper3${comid}.${soext}"
\
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
fi
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index f22d2d1eedb2..276fa3091b2a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -436,23 +436,23 @@ URLPREFIX=file://
# Include UDK version numbers
include $(PRJ)/include/udkversion.mk
-SALLIB=-luno_sal
-CPPULIB=-luno_cppu
-CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-SALHELPERLIB=-luno_salhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
-
-SALDYLIB=-Wl,-dylib_file,@__URELIB/libuno_sal.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_sal.dylib'
-CPPUDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppu.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppu.dylib'
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_OFFICE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
-SALHELPERDYLIB=-Wl,-dylib_file,@__URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
-REGDYLIB=-Wl,-dylib_file,@__URELIB/libreg.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libreg.dylib'
-STOREDYLIB=-Wl,-dylib_file,@__URELIB/libstore.dylib.3:'$(OO_SDK_OFFICE_LIB_DIR)/libstore.dylib'
-
-INSTALL_NAME_URELIBS=$(INSTALLTOOL) -change
@__URELIB/libuno_sal.dylib.3
@executable_path/libuno_sal.dylib.3 -change
@__URELIB/libuno_cppu.dylib.3
@executable_path/libuno_cppu.dylib.3 -change
@__URELIB/libuno_cppuhelper$(COMID).dylib.3
@executable_path/libuno_cppuhelper$(COMID).dylib.3 -change
@__URELIB/libuno_salhelper$(COMID).dylib.3
@executable_path/libuno_salhelper$(COMID).dylib.3 -change
@__URELIB/libreg.dylib.3
@executable_path/libreg.dylib.3 -change
@__URELIB/libstore.dylib.3
@executable_path/libstore.dylib.3
-
-INSTALL_NAME_URELIBS_BIN=$(INSTALLTOOL) -change
@__URELIB/libuno_sal.dylib.3
libuno_sal.dylib.3 -change
@
leading dot and trailing # in lock files
Hi all, I maintain a snap package for libreoffice¹, and it has been reported that document files cannot be saved to $HOME/ ² because of the strict confinement rules of snappy, whereby writing hidden files (filename starting with a dot) in $HOME is forbidden. I looked into the document file lock code, and came up with a simple patch that removes the leading dot. So far, so good. It was pointed out to me that file managers like Nautilus also consider files with a trailing tilde (~) to be hidden, so I updated that patch so that lock files are represented like so: $HOME/foobar.odt -> $HOME/foobar.odt.lock~ I was wondering about the trailing # in the current lock file implementation. I dug into the git history, and it's always been there as far as I can tell, but I'm not sure why. Can anyone shed some light on this? Is it safe to replace "#" with ".lock~" (only in the context of the snap package, I don't intend to upstream that change unless it's deemed sensible) ? Cheers, Olivier ¹ https://snapcraft.io/libreoffice ² https://launchpad.net/bugs/1766192 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - filter/Library_svgfilter.mk filter/source svgio/source
filter/Library_svgfilter.mk |1
filter/source/svg/svgfilter.cxx | 76 +++---
svgio/source/svgreader/svgsvgnode.cxx | 17 +++
3 files changed, 80 insertions(+), 14 deletions(-)
New commits:
commit 1ebbe4193f5a7ea928fd4940c2a62bcb773c4a00
Author: Armin Le Grand
Date: Wed Jul 11 18:26:48 2018 +0200
tdf#118232 Allow load and insert of SVGs with no Geometry
Change-Id: Iaf3d6a0423c5f11dda1e623dd730af01dbd6551c
Reviewed-on: https://gerrit.libreoffice.org/57284
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 0613ce41da0b94bc481b94b8141afcf15df8abe7)
Reviewed-on: https://gerrit.libreoffice.org/57350
diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index bdd917a50a0c..21318aa1fd03 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
sax \
salhelper \
comphelper \
+ drawinglayer \
basegfx \
cppuhelper \
cppu \
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 9c50869ab593..a5f8ce32b072 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -49,6 +49,9 @@
#include
#include
+#include
+#include
+
#include "svgfilter.hxx"
#include "svgwriter.hxx"
@@ -208,17 +211,59 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence<
PropertyValue >& rDescripto
break;
}
+// tdf#118232 Get the sequence of primitives and check if geometry
is completely
+// hidden. If so, there is no need to add a SdrObject at all
+const VectorGraphicDataPtr&
rVectorGraphicData(aGraphic.getVectorGraphicData());
+bool bContainsNoGeometry(false);
+
+if(bool(rVectorGraphicData) && VectorGraphicDataType::Svg ==
rVectorGraphicData->getVectorGraphicDataType())
+{
+const drawinglayer::primitive2d::Primitive2DContainer
aContainer(rVectorGraphicData->getPrimitive2DSequence());
+
+if(!aContainer.empty())
+{
+bool bAllAreHiddenGeometry(true);
+
+for(const auto& rCandidate : aContainer)
+{
+if(rCandidate.is())
+{
+// try to cast to BasePrimitive2D implementation
+const drawinglayer::primitive2d::BasePrimitive2D*
pBasePrimitive(
+dynamic_cast< const
drawinglayer::primitive2d::BasePrimitive2D* >(rCandidate.get()));
+
+if(pBasePrimitive &&
PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D != pBasePrimitive->getPrimitive2DID())
+{
+bAllAreHiddenGeometry = false;
+break;
+}
+}
+}
+
+if(bAllAreHiddenGeometry)
+{
+bContainsNoGeometry = true;
+}
+}
+}
+
// create a SdrModel-GraphicObject to insert to page
SdrPage* pTargetSdrPage(pSvxDrawPage->GetSdrPage());
-std::unique_ptr< SdrGrafObj, SdrObjectFreeOp > aNewSdrGrafObj(
-new SdrGrafObj(
-pTargetSdrPage->getSdrModelFromSdrPage(),
-aGraphic));
+std::unique_ptr< SdrGrafObj, SdrObjectFreeOp > aNewSdrGrafObj;
-if(!aNewSdrGrafObj.get())
+// tdf#118232 only add an SdrGrafObj when we have Geometry
+if(!bContainsNoGeometry)
{
-// could not create GraphicObject
-break;
+aNewSdrGrafObj.reset(
+new SdrGrafObj(
+pTargetSdrPage->getSdrModelFromSdrPage(),
+aGraphic));
+
+if(!aNewSdrGrafObj.get())
+{
+// could not create GraphicObject
+break;
+}
}
// Evtl. adapt the GraphicPrefSize to target-MapMode of
target-Model
@@ -264,15 +309,18 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence<
PropertyValue >& rDescripto
nAllBorder,
nAllBorder);
-// set pos/size at SdrGraphicObj - use zero position for
+// tdf#118232 set pos/size at SdrGraphicObj - use zero position for
// better turn-around results
-aNewSdrGrafObj->SetSnapRect(
-tools::Rectangle(
-Point(0, 0),
-aGraphicSize));
+if(!bContainsNoGeometry)
+{
+aNewSdrGrafObj->SetSnapRect(
+tools::Rectangle(
+
[Libreoffice-commits] core.git: sc/CppunitTest_sc_styleloaderobj.mk
sc/CppunitTest_sc_styleloaderobj.mk | 41 +--- 1 file changed, 6 insertions(+), 35 deletions(-) New commits: commit 68d3a44bc96041982cb38c140c0f9628dc8547c5 Author: Jens Carl Date: Thu Jul 12 05:40:52 2018 + Remove obsolete (cargo-cult copied) dependencies Change-Id: I0ae7742cf7d0bf9a1de702dc78eea84abc8d21f6 Reviewed-on: https://gerrit.libreoffice.org/57314 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/CppunitTest_sc_styleloaderobj.mk b/sc/CppunitTest_sc_styleloaderobj.mk index d0f37d43424d..61e1bdb552bf 100644 --- a/sc/CppunitTest_sc_styleloaderobj.mk +++ b/sc/CppunitTest_sc_styleloaderobj.mk @@ -14,48 +14,19 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_styleloaderobj)) $(eval $(call gb_CppunitTest_use_external,sc_styleloaderobj,boost_headers)) $(eval $(call gb_CppunitTest_add_exception_objects,sc_styleloaderobj, \ -sc/qa/extras/scstyleloaderobj \ + sc/qa/extras/scstyleloaderobj \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_styleloaderobj, \ -basegfx \ -comphelper \ -cppu \ -cppuhelper \ -drawinglayer \ -editeng \ -for \ -forui \ -i18nlangtag \ -msfilter \ -oox \ -sal \ -salhelper \ -sax \ -sb \ -sc \ -sfx \ -sot \ -subsequenttest \ -svl \ -svt \ -svx \ -svxcore \ + cppu \ + sal \ + subsequenttest \ test \ -tk \ -tl \ -ucbhelper \ unotest \ -utl \ -vbahelper \ -vcl \ -xo \ )) $(eval $(call gb_CppunitTest_set_include,sc_styleloaderobj,\ --I$(SRCDIR)/sc/source/ui/inc \ --I$(SRCDIR)/sc/inc \ -$$(INCLUDE) \ + $$(INCLUDE) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,sc_styleloaderobj)) @@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_styleloaderobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_styleloaderobj)) $(eval $(call gb_CppunitTest_use_components,sc_styleloaderobj,\ -$(sc_unoapi_common_components) \ + $(sc_unoapi_common_components) \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_styleloaderobj)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc functions and Calc option 'convert text to number'
Hi Winfried, On Thursday, 2018-07-12 16:21:25 +0200, Winfried Donkers wrote: > I'm working on tdf64132, which is about SUM and text values that are not > converted to numbers. That bug is wrong and not a bug, I'll explain there, so all further speculations about changing behaviour and implied problems are moot ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 33 commits - download.lst editeng/source expat/expat-2.1.0.patch expat/StaticLibrary_expat.mk expat/StaticLibrary_expa
Makefile.fetch| 6 download.lst | 13 editeng/source/editeng/impedit3.cxx | 6 expat/StaticLibrary_expat.mk | 1 expat/StaticLibrary_expat_x64.mk | 1 expat/UnpackedTarball_expat.mk| 3 expat/expat-2.1.0.patch | 13 graphite/README | 3 graphite/StaticLibrary_graphite.mk| 9 graphite/UnpackedTarball_graphite.mk | 8 graphite/graphite2.issue1030.patch.1 | 12 graphite/graphite2.issue1115.patch.1 | 6 graphite/graphite2.patch | 29 graphite/graphite2.win64.patch.1 | 60 graphite/ubsan.patch | 40 libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1 | 116 + libxml2/0001-Fix-handling-of-parameter-entity-references.patch.1 | 287 +++ libxml2/0001-Fix-type-confusion-in-xmlValidateOneNamespace.patch.1| 43 libxml2/0001-Increase-buffer-space-for-port-in-HTTP-redirect-supp.patch.1 | 31 libxml2/0001-Prevent-unwanted-external-entity-reference.patch.1 | 35 libxml2/ExternalPackage_xml2.mk | 10 libxml2/UnpackedTarball_xml2.mk | 14 libxml2/libxml2-aix.patch | 21 libxml2/libxml2-android.patch | 2 libxml2/libxml2-config.patch.1| 69 libxml2/libxml2-configure.patch | 152 - libxml2/libxml2-global-symbols.patch | 4 libxml2/libxml2-gnome599717.patch | 20 libxml2/libxml2-latin.patch | 32 libxml2/libxml2-long-path.patch | 34 libxml2/libxml2-mingw.patch | 11 libxml2/libxml2-no-c99.patch | 31 libxml2/libxml2-vc10.patch| 17 libxml2/libxml2-xpath.patch | 70 libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 | 29 libxslt/ExternalPackage_xslt.mk | 19 libxslt/ExternalProject_xslt.mk | 1 libxslt/UnpackedTarball_xslt.mk | 7 libxslt/libxslt-aix.patch | 21 libxslt/libxslt-config.patch.1| 35 libxslt/libxslt-configure.patch | 99 - libxslt/libxslt-freebsd.patch.1 | 28 libxslt/libxslt-internal-symbols.patch| 12 libxslt/libxslt-mingw.patch | 36 libxslt/libxslt-win_manifest.patch| 11 solenv/gbuild/UnpackedTarball.mk | 3 vcl/generic/glyphs/gcach_ftyp.cxx | 5 vcl/inc/graphite_features.hxx | 1 vcl/inc/graphite_layout.hxx | 11 vcl/inc/graphite_static.hxx | 17 vcl/inc/win/salgdi.h | 3 vcl/source/fontsubset/sft.cxx | 3 vcl/source/gdi/pdfwriter_impl.cxx | 15 vcl/source/gdi/textlayout.cxx | 2 vcl/source/glyphs/graphite_layout.cxx | 800 +++--- vcl/source/window/winproc.cxx | 11 vcl/win/source/gdi/winlayout.cxx | 15 vcl/win/source/window/salframe.cxx| 4 58 files changed, 1214 insertions(+), 1183 deletions(-) New commits: commit b7bdb072112076668268296d848f7af8a
Calc functions and Calc option 'convert text to number'
Hi Eike, I'm working on tdf64132, which is about SUM and text values that are not converted to numbers. SUM uses ScInterpreter::IterateParameters(), which is used by various other Calc functions as well. ScInterpreter::IterateParameters() does not handle the configuration settings for converting text to numbers properly. For stack type svString I have a patch almost ready. The unit test is a problem for me, as the 'convert text to numbers' configuration is not in the test document and therefore unknown. But the larger challenge lies with stack type svDoubleRef (probably the most used one). Here a sc::ColumnSpanSet is used with sc::ColumnSpanSet::ColumnAction (a.o. FuncSum), which in turn uses NumericCellAccumulator. And that class handles only sc::element_type_numeric and sc::element_type_formula, so text is discarded. I could add sc::element_type_string and the conversion to numbers depending on the configuration settings. As that will have consequences beyond the Calc functions SUM and the like, I would like you opinion on this before I start implementing. And all this leads to the question if all Calc functions expecting numeric arguments handle the 'convert tekst to numbers' configuration as advertised. It looks like I can keep myself occupied for quite some time with this ;-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - 29 commits - configure.ac desktop/source g icon-themes/galaxy include/oox include/tools instsetoo_native/inc_common instsetoo_nati
Rebased ref, commits from common ancestor:
commit 18c9c74eafa3bff35e6e7ce35a41eb7b6cb29111
Author: Samuel Mehrbrodt
Date: Thu Jan 12 16:46:45 2017 +0100
Disable crash reporter UI
Change-Id: I8106ec674080ede7072581dab2e6700040de5828
(cherry picked from commit b981aa30c3eb5ddd0cf6c35e4c37ab687667f71b)
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 583ea189165f..3b5947751671 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -919,7 +919,8 @@ bool crashReportInfoExists()
#if HAVE_FEATURE_BREAKPAD
void handleCrashReport()
{
-static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
@@ -933,7 +934,7 @@ void handleCrashReport()
css::util::URL aURL;
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyValue >());
bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
}
#endif
commit b4a0377636486fa7bc6551ce7e868f1afca959ae
Author: Thorsten Behrens
Date: Mon Jul 2 18:11:47 2018 +0200
./g: don't exit early on ./g checkout -f
Reviewed-on: https://gerrit.libreoffice.org/56822
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit 5fce97a58b8f764e35bf98128591c9a89537da05)
Change-Id: I33f54c365bce64feb1c58fc8e4faddb7ad77
Reviewed-on: https://gerrit.libreoffice.org/56916
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit dca20728ebe798ada1045ea3dabcb981166e2b9d)
diff --git a/g b/g
index 49ece9ff6880..649ccf3611de 100755
--- a/g
+++ b/g
@@ -209,7 +209,7 @@ local module
git checkout "$@" || return $?
for cmd in "$@" ; do
if [ "$cmd" = "-f" ]; then
- return 0
+ continue
elif [ "$cmd" = "-b" ] ; then
create_branch=1
elif [ "$create_branch" = "1" ] ; then
commit 50408e452ef7087b6c9eef0ea7dffd42c161ee72
Author: Katarina Behrens
Date: Wed Feb 10 14:42:18 2016 +0100
Branded images for msi installer
The sizes are 122 x 234, 374 x 44 installed units respectively, according to
http://msdn.microsoft.com/de-de/library/windows/desktop/aa369490%28v=vs.85%29.aspx
it is 163x312, 499x58 pixels at 96 dpi. I bumped dpi to 120 and it still
looks pixelated,
but it's as good as it gets.
For better results, we need different graphics, with less fine details
given the very limited
space
Change-Id: I4a7eafed16fd79f377d27afa8151cfab614b464b
diff --git
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 5a163cf86c23..471eea4c22e6 100644
Binary files
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index b4210d131ba2..2703670952bd 100644
Binary files
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
commit 3c4aaf3396078fb05efd5c4ebcec03fb2c04ab43
Author: Katarina Behrens
Date: Tue Feb 9 11:09:30 2016 +0100
Branded application icons
sadly, this doesn't replace Windows taskbar icon, that must be living
somewhere
else. It works on Linux though.
Conflicts:
icon-themes/galaxy/res/main128.png
icon-themes/galaxy/res/mainapp_16.png
icon-themes/galaxy/res/mainapp_16_8.png
icon-themes/galaxy/res/mainapp_32.png
icon-themes/galaxy/res/mainapp_32_8.png
icon-themes/galaxy/res/mainapp_48_8.png
Change-Id: I028fc68d96f02113622c5e1ec3ed830ac797be0b
diff --git a/icon-themes/galaxy/res/main128.png
b/icon-themes/galaxy/res/main128.png
index 2779337e7b0a..818b7330c25b 100644
Binary files a/icon-themes/galaxy/res/main128.png and
b/icon-themes/galaxy/res/main128.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16.png
b/icon-themes/galaxy/res/mainapp_16.png
old mode 100755
new mode 100644
index 4a96735b6bb6..13945eeadfd4
Binary files a/icon-themes/galaxy/res/mainapp_16.png and
b/icon-themes/galaxy/res/mainapp_16.png differ
diff --git a/icon-themes/galaxy/res/mainapp_16_8.png
b/icon-themes/galaxy/res/mainapp_16_8.png
index 94abb952996b..13945eeadfd4 100644
Binary files a/icon-themes/galaxy/res/mainapp_16_8.png and
b/icon-themes/galaxy/res/mainapp_16_8.png differ
diff --git a/icon-themes/galaxy/
[Libreoffice-commits] core.git: cui/source
cui/source/options/dbregister.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 1a5ef55b7de60131efa7a831309186b29cb6214e
Author: Eike Rathke
Date: Thu Jul 12 18:26:05 2018 +0200
SvTreeListBox::DoubleClickHdl: DbRegistrationOptionsPage more, tdf#115950
rel.
Change-Id: I820ce28a4df108f17cbb65210834acae6b0f8946
diff --git a/cui/source/options/dbregister.cxx
b/cui/source/options/dbregister.cxx
index 40ec9d950f87..91e0d16dbf35 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -284,7 +284,9 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl, Button*,
void)
IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathBoxDoubleClickHdl,
SvTreeListBox*, bool)
{
EditHdl(nullptr);
-return false;
+// Signal more to be done, i.e. when entry removed/inserted via
+// openLinkDialog().
+return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - desktop/source
desktop/source/app/app.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b981aa30c3eb5ddd0cf6c35e4c37ab687667f71b
Author: Samuel Mehrbrodt
Date: Thu Jan 12 16:46:45 2017 +0100
Disable crash reporter UI
Change-Id: I8106ec674080ede7072581dab2e6700040de5828
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7c5191debf49..1f33167a307c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1049,7 +1049,8 @@ bool crashReportInfoExists()
#if HAVE_FEATURE_BREAKPAD
void handleCrashReport()
{
-static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
@@ -1063,7 +1064,7 @@ void handleCrashReport()
css::util::URL aURL;
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyValue >());
bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
sw/source/ui/chrdlg/swuiccoll.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 32003187445f62fa6f390a09a85949b6d42b55f7
Author: Eike Rathke
Date: Thu Jul 12 14:51:00 2018 +0200
SvTreeListBox::DoubleClickHdl: SwCondCollPage more, tdf#115950 related
Change-Id: I179c791aac5eb522aefb3ce20931fe44dd7248c6
(cherry picked from commit 3d73f76a91260becf171ea77589190714577b267)
Reviewed-on: https://gerrit.libreoffice.org/57344
Reviewed-by: Eike Rathke
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 5767642ac6d9..59c00d5622c1 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -228,7 +228,7 @@ IMPL_LINK( SwCondCollPage, AssignRemoveClickHdl, Button*,
pBtn, void)
IMPL_LINK( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn,
bool)
{
AssignRemove(pBtn);
-return false;
+return true;// signal more to be done
}
IMPL_LINK( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source
sc/source/ui/navipi/content.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c73b9d69abf1b26dc2c6f9d6700b2a5f2c9e6f36 Author: Eike Rathke Date: Thu Jul 12 13:24:57 2018 +0200 SvTreeListBox::DoubleClickHdl: Navigator return more to be done, tdf#117063 Change-Id: I2b232cd9ea791273e8a776bf88fa45ee0ad5edf0 (cherry picked from commit 08ac6e6f991cffcb1fed7bd1bb4ec67e94817507) Reviewed-on: https://gerrit.libreoffice.org/57329 Reviewed-by: Eike Rathke Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 34df68b39cd9..3f8271c43999 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -438,7 +438,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) ScNavigatorDlg::ReleaseFocus(); // set focus into document } -return false; +return true; } void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/ClientSession.cpp wsd/ClientSession.hpp wsd/LOOLWSD.cpp
wsd/ClientSession.cpp | 43 -
wsd/ClientSession.hpp | 12 -
wsd/LOOLWSD.cpp | 64 --
3 files changed, 110 insertions(+), 9 deletions(-)
New commits:
commit 405b66c8db71c314c2d26c4b18e9d74806c76bf1
Author: Tor Lillqvist
Date: Thu Jul 12 15:50:04 2018 +0300
Add a cache of "thumbnails" (PNG images) generated using the convert-to API
When asked to "convert" a document to a PNG image, i.e. what one can
call a thumbnail, check if we have a cached PNG for the same docuemnt
already, and in that case return it.
When we have done such a convert-to operation to PNG, save the result
in the cache for later re-use.
This change adds no thumbnail cache cleanup mechanism. That will have
to be implemented separately using a cron job or whatever.
There are further improvement possibilities: For instance, if the
document is of a type that contains an embedded thumbnail (like ODF),
just extract and return that. For ODF that embedded thumbnail even
already is in PNG format.
Change-Id: I882efe97acc1d81041dc7a4ccb222995940e4836
Reviewed-on: https://gerrit.libreoffice.org/57345
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index ee2a3f941..353b73263 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -13,6 +13,7 @@
#include
+#include
#include
#include
#include
@@ -35,15 +36,20 @@ using Poco::StringTokenizer;
ClientSession::ClientSession(const std::string& id,
const std::shared_ptr& docBroker,
const Poco::URI& uriPublic,
- const bool readOnly) :
+ const bool readOnly,
+ const bool creatingPngThumbnail,
+ const std::string& thumbnailFile) :
Session("ToClient-" + id, id, readOnly),
_docBroker(docBroker),
_uriPublic(uriPublic),
+_creatingPngThumbnail(creatingPngThumbnail),
+_thumbnailFile(thumbnailFile),
_isDocumentOwner(false),
_isAttached(false),
_isViewLoaded(false),
_keyEvents(1)
{
+assert(!creatingPngThumbnail || thumbnailFile != "");
const size_t curConnections = ++LOOLWSD::NumConnections;
LOG_INF("ClientSession ctor [" << getName() << "], current number of
connections: " << curConnections);
}
@@ -722,6 +728,41 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
response.set("Content-Disposition", "attachment;
filename=\"" + fileName + "\"");
HttpHelper::sendFile(_saveAsSocket, encodedFilePath, mimeType,
response);
+
+if (_creatingPngThumbnail)
+{
+// Save the created PNG "thumbnail" under a name
constructed from the SHA1 of
+// the document contents.
+
+// FIXME: We could first try to simply hardlink the result
as the thumbnail.
+
+
Poco::File(Poco::Path(_thumbnailFile).parent()).createDirectories();
+std::ofstream thumbnail(_thumbnailFile, std::ios::binary);
+
+if (thumbnail.is_open() && thumbnail.good())
+{
+std::ifstream result(resultURL.getPath(),
std::ios::binary);
+if (result.is_open() && result.good())
+{
+Poco::StreamCopier::copyStream(result, thumbnail);
+if (!result.bad() && thumbnail.good())
+{
+LOG_TRC("Created cached thumbnail " <<
_thumbnailFile);
+}
+else
+{
+thumbnail.close();
+unlink(_thumbnailFile.c_str());
+}
+}
+}
+else
+{
+if (thumbnail.is_open())
+thumbnail.close();
+unlink(_thumbnailFile.c_str());
+}
+}
}
// Conversion is done, cleanup this fake session.
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index 2366ca78b..df7faa45f 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -26,7 +26,9 @@ public:
ClientSession(const std::string& id,
const std::shared_ptr& docBroker,
const Poco::URI& uriPublic,
- const bool isReadOnly = false);
+ const bool isReadOnly = false,
+ const bool creatingPngThumbnail = false,
+ const std::string& thumbnail
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-3' - desktop/Library_crashreport.mk desktop/source
desktop/Library_crashreport.mk |1 +
desktop/source/app/app.cxx |5 +++--
desktop/source/app/crashreport.cxx | 33 -
3 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit b9872d6593892216ff4dde890ce45bcf8dea37fc
Author: Samuel Mehrbrodt
Date: Thu Jan 12 16:46:45 2017 +0100
Disable crash reporter UI, add local store option
- add build id to crash metadata
- disable CrashReportUI
- make crash directory configurable
Change-Id: I8106ec674080ede7072581dab2e6700040de5828
diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk
index ba2f3483a416..d6d9b8b91cc5 100644
--- a/desktop/Library_crashreport.mk
+++ b/desktop/Library_crashreport.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,crashreport,\
cppuhelper \
sal \
salhelper \
+utl \
$(gb_UWINAPI) \
))
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1f9307d0c26f..90529e05c93c 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1073,7 +1073,8 @@ bool crashReportInfoExists()
#if HAVE_FEATURE_BREAKPAD
void handleCrashReport()
{
-static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
+// Don't show the dialog since we don't offer upload - only want the dumps
+/*static const char SERVICENAME_CRASHREPORT[] =
"com.sun.star.comp.svx.CrashReportUI";
css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
@@ -1087,7 +1088,7 @@ void handleCrashReport()
css::util::URL aURL;
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL,
css::uno::Sequence< css::beans::PropertyValue >());
bool bRet = false;
-aRet >>= bRet;
+aRet >>= bRet;*/
}
#endif
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 9715fde513c9..bb3a035524a1 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include
#include
@@ -73,6 +74,7 @@ void CrashReporter::writeCommonInfo()
std::ofstream minidump_file(ini_path, std::ios_base::trunc);
minidump_file << "ProductName=LibreOffice\n";
minidump_file << "Version=" LIBO_VERSION_DOTTED "\n";
+minidump_file << "BuildID=" << utl::Bootstrap::getBuildIdData("") << "\n";
minidump_file << "URL=http://crashreport.libreoffice.org/submit/\n";;
for (auto& keyValue : maKeyValues)
{
@@ -88,22 +90,35 @@ void CrashReporter::writeCommonInfo()
namespace {
-OUString getCrashUserProfileDirectory()
+OUString getCrashDirectory()
{
-OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/crash/");
-rtl::Bootstrap::expandMacros(url);
-osl::Directory::create(url);
+OUString aCrashURL;
-OUString aProfilePath;
-osl::FileBase::getSystemPathFromFileURL(url, aProfilePath);
-return aProfilePath;
+// First check whether a user-defined path is available (crashreport.ini)
+OUString aCrashPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("crashreport") ":CrashDirectory}");
+rtl::Bootstrap::expandMacros(aCrashPath);
+osl::FileBase::getFileURLFromSystemPath(aCrashPath, aCrashURL);
+
+// Fall back to user profile
+if (aCrashPath.isEmpty())
+{
+aCrashURL = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/crash";
+rtl::Bootstrap::expandMacros(aCrashURL);
+}
+
+if (!aCrashURL.endsWith("/"))
+aCrashURL += "/";
+osl::FileBase::RC rc = osl::Directory::create(aCrashURL);
+(void)rc;
+osl::FileBase::getSystemPathFromFileURL(aCrashURL, aCrashPath);
+return aCrashPath;
}
}
void CrashReporter::updateMinidumpLocation()
{
-OUString aURL = getCrashUserProfileDirectory();
+OUString aURL = getCrashDirectory();
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
OString aOStringUrl = OUStringToOString(aURL, RTL_TEXTENCODING_UTF8);
google_breakpad::MinidumpDescriptor descriptor(aOStringUrl.getStr());
@@ -120,7 +135,7 @@ void
CrashReporter::storeExceptionHandler(google_breakpad::ExceptionHandler* pEx
std::string CrashReporter::getIniFileName()
{
-OUString url = getCrashUserProfileDirectory() + "dump.ini";
+OUString url = getCrashDirectory() + "dump.ini";
OString aUrl = OUStringToOString(url, RTL_TEXTENCODING_UTF8);
std::string aRet(aUrl.getStr());
return aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd.xml.in
loolwsd.xml.in |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 63a24e0082b595d023e606992fd3ae4df7f3102f
Author: Tor Lillqvist
Date: Thu Jul 12 18:31:36 2018 +0300
Accept also localhost and IPv4-mapped IPv6 addresses
Change-Id: Ifc295d164276c0dd17592ff27066a522482fe04a
Reviewed-on: https://gerrit.libreoffice.org/57351
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index d4ca9b3ea..b2e9a4518 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -65,7 +65,10 @@
all
-192\.168\.[0-9]{1,3}\.[0-9]{1,3}
+192\.168\.[0-9]{1,3}\.[0-9]{1,3}
+:::192\.168\.[0-9]{1,3}\.[0-9]{1,3}
+127\.0\.0\.1
+:::127\.0\.0\.1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - kit/Kit.cpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp wsd/Storage.cpp wsd/Storage.hpp
kit/Kit.cpp|9 ++---
wsd/DocumentBroker.cpp | 17 ++---
wsd/LOOLWSD.cpp|7 +--
wsd/LOOLWSD.hpp|9 +++--
wsd/Storage.cpp| 10 --
wsd/Storage.hpp| 16 ++--
6 files changed, 46 insertions(+), 22 deletions(-)
New commits:
commit a5e3878767c84cf179d9af3a53f988d828747677
Author: Ashod Nakashian
Date: Sun Jul 8 22:50:09 2018 -0400
wsd: use obfascated user id when provided by WOPI
Change-Id: I69a17dff0e5e6b27e4538d9fe9019e4d1eebb16f
Reviewed-on: https://gerrit.libreoffice.org/57171
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 24be99808..9b5ef8f48 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -109,6 +109,7 @@ static LokHookFunction2* initFunction = nullptr;
#ifndef BUILDING_TESTS
static bool AnonymizeFilenames = false;
static bool AnonymizeUsernames = false;
+static std::string ObfuscatedUserId;
#endif
#if ENABLE_DEBUG
@@ -2239,6 +2240,8 @@ void lokit_main(const std::string& childRoot,
const std::string& sessionId = tokens[1];
const std::string& docKey = tokens[2];
const std::string& docId = tokens[3];
+if (tokens.size() > 4)
+ObfuscatedUserId = tokens[4];
std::string url;
URI::decode(docKey, url);
@@ -2425,10 +2428,10 @@ std::string anonymizeUrl(const std::string& url)
std::string anonymizeUsername(const std::string& username)
{
#ifndef BUILDING_TESTS
-return AnonymizeUsernames ? Util::anonymize(username) : username;
-#else
-return username;
+if (AnonymizeUsernames)
+return !ObfuscatedUserId.empty() ? ObfuscatedUserId :
Util::anonymize(username);
#endif
+return username;
}
#if !defined(BUILDING_TESTS) && !defined(KIT_IN_PROCESS)
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 60e480294..6ad82d6b3 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -457,7 +457,7 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
assert(_storage != nullptr);
// Call the storage specific fileinfo functions
-std::string userid, username;
+std::string userId, username;
std::string userExtraInfo;
std::string watermarkText;
std::chrono::duration getInfoCallDuration(0);
@@ -465,7 +465,8 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
if (wopiStorage != nullptr)
{
std::unique_ptr wopifileinfo =
wopiStorage->getWOPIFileInfo(session->getAuthorization());
-userid = wopifileinfo->_userid;
+userId = wopifileinfo->_userId;
+LOOLWSD::ObfuscatedUserId = wopifileinfo->_obfuscatedUserId;
username = wopifileinfo->_username;
userExtraInfo = wopifileinfo->_userExtraInfo;
watermarkText = wopifileinfo->_watermarkText;
@@ -516,7 +517,7 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
session->sendMessage("wopi: " + ossWopiInfo.str());
// Mark the session as 'Document owner' if WOPI hosts supports it
-if (userid == _storage->getFileInfo()._ownerId)
+if (userId == _storage->getFileInfo()._ownerId)
{
LOG_DBG("Session [" << sessionId << "] is the document owner");
session->setDocumentOwner(true);
@@ -533,7 +534,7 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
if (localStorage != nullptr)
{
std::unique_ptr localfileinfo =
localStorage->getLocalFileInfo();
-userid = localfileinfo->_userid;
+userId = localfileinfo->_userId;
username = localfileinfo->_username;
if (LOOLWSD::IsViewFileExtension(localStorage->getFileExtension()))
@@ -544,14 +545,16 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
}
}
+
#if ENABLE_SUPPORT_KEY
if (!LOOLWSD::OverrideWatermark.empty())
watermarkText = LOOLWSD::OverrideWatermark;
#endif
LOG_DBG("Setting username [" << LOOLWSD::anonymizeUsername(username) << "]
and userId [" <<
-LOOLWSD::anonymizeUsername(userid) << "] for session [" <<
sessionId << "]");
-session->setUserId(userid);
+LOOLWSD::anonymizeUsername(userId) << "] for session [" <<
sessionId << "]");
+
+session->setUserId(userId);
session->setUserName(username);
session->setUserExtraInfo(userExtraInfo);
session->setWatermarkText(watermarkText);
@@ -1047,7 +1050,7 @@ size_t DocumentBroker::addSessionInternal(const
std::shared_ptr&
const auto id = session->getId();
// Request a new session from the child kit.
-const std::string aMessage = "session " + id + ' ' + _docKey + ' ' +
_docId;
+const std::string aMessage = "session " + id + ' ' + _docKey + ' ' +
_docId + ' ' +
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui |4 ++-- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|4 ++-- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui |2 +- sd/uiconfig/simpress/ui/notebookbar.ui|4 ++-- sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |4 ++-- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui|8 sw/uiconfig/swriter/ui/notebookbar.ui |6 +++--- sw/uiconfig/swriter/ui/notebookbar_compact.ui |2 +- sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui |8 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) New commits: commit 2cfe74f35fbe7119cbff309d569da45899f962df Author: andreas kainz Date: Wed Jul 11 18:18:29 2018 +0200 NB Implementation: fix Underline command and add CharmapControl The new CharmapControl action will be used instead of InsertSymbol Change-Id: I9a2e519fb7b8b773763b4c58f8aaa40e6af810b6 Reviewed-on: https://gerrit.libreoffice.org/57283 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 3ffd06f141f86a695deb8672a34b95f31f4d1b16) Reviewed-on: https://gerrit.libreoffice.org/57289 diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index b6c40b6e3ea8..7f4df60cbd3e 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -3101,7 +3101,7 @@ True False -.uno:UnderlineSimple +.uno:Underline False @@ -5367,7 +5367,7 @@ True False -.uno:InsertSymbol +.uno:CharmapControl False diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index a306eed99d21..81ad615d5860 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -4291,7 +4291,7 @@ True False -.uno:UnderlineSimple +.uno:Underline False @@ -8519,7 +8519,7 @@ True False -.uno:UnderlineSimple +.uno:Underline False diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui index 8499083016d0..a7221299bf7f 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui @@ -10492,7 +10492,7 @@ True False -.uno:InsertSymbol +.uno:CharmapControl True diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui index cee0e4868eb0..a1e2f1a0f781 100644 --- a/sd/uiconfig/simpress/ui/notebookbar.ui +++ b/sd/uiconfig/simpress/ui/notebookbar.ui @@ -3757,7 +3757,7 @@ True False -.uno:UnderlineSimple +.uno:Underline False @@ -5691,7 +5691,7 @@ True False -.uno:InsertSymbol +.uno:CharmapControl
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/CppunitTest.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d45a158f2d9114069870469e9004f3f7ed1f3636 Author: Noel Grandin Date: Thu Jul 12 15:47:56 2018 +0200 improve message when running perfcheck without valgrind installed Change-Id: I50e7d3f38dc16feab450e32085e8c031904b216c Reviewed-on: https://gerrit.libreoffice.org/57347 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 45af5c9b25a7..930979308b5b 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -54,7 +54,7 @@ endif endif ifneq (,$(filter perfcheck,$(MAKECMDGOALS))) -$(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with empty $$(ENABLE_VALGRIND) does not make sense)) +$(if $(ENABLE_VALGRIND),,$(call gb_Output_error,Running performance tests with empty $$(ENABLE_VALGRIND) does not make sense. Please install valgrind-dev and re-run autogen.)) gb_CppunitTest_VALGRINDTOOL := valgrind --tool=callgrind --dump-instr=yes --instr-atstart=no --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes ifneq ($(strip $(VALGRIND_GDB)),) gb_CppunitTest_VALGRINDTOOL += --vgdb=yes --vgdb-error=0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 446f9cf176038881af166e46489bb1880b22174d
Author: Eike Rathke
Date: Thu Jul 12 16:36:00 2018 +0200
SvTreeListBox::DoubleClickHdl: SwContentTree more, tdf#115950 related
Change-Id: I86b5275484754b222698fb8c4540ff66bd6c962a
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index c50897b07d2b..8cf3a7991878 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1571,7 +1571,6 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl,
SvTreeListBox*, bool)
if(lcl_IsContentType(pEntry) && !pEntry->HasChildren())
{
RequestingChildren(pEntry);
-return true;// signal more to be done, i.e. expand children
}
else if (!lcl_IsContentType(pEntry) && (State::HIDDEN != m_eState))
{
@@ -1586,7 +1585,9 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl,
SvTreeListBox*, bool)
GotoContent(pCnt);
if(pCnt->GetParent()->GetType() == ContentTypeId::FRAME)
m_pActiveShell->EnterStdMode();
+return false; // treelist processing finished
}
+return true;// signal more to be done, i.e. expand/collapse
children
}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Calc functions and Calc option 'convert text to number'
Hi Eike, I'm working on tdf64132, which is about SUM and text values that are not converted to numbers. SUM uses ScInterpreter::IterateParameters(), which is used by various other Calc functions as well. ScInterpreter::IterateParameters() does not handle the configuration settings for converting text to numbers properly. For stack type svString I have a patch ready (gerrit #57346). The unit test is a problem for me, as the 'convert text to numbers' configuration is not in the test document and therefore unknown. This is illustrated by a test passing on my computer and failing for Jenkins. But the larger challenge lies with stack type svDoubleRef (probably the most used one). Here a sc::ColumnSpanSet is used with sc::ColumnSpanSet::ColumnAction (a.o. FuncSum), which in turn uses NumericCellAccumulator. And that class handles only sc::element_type_numeric and sc::element_type_formula, so text is discarded. I could add sc::element_type_string and the conversion to numbers depending on the configuration settings. As that will have consequences beyond the Calc functions SUM and the like, I would like you opinion on this before I start implementing. And all this leads to the question if all Calc functions expecting numeric arguments handle the 'convert text to numbers' configuration as advertised. It looks like I can keep myself occupied for quite some time with this ;-) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - common/Log.hpp wsd/LOOLWSD.cpp
common/Log.hpp |2 ++
wsd/LOOLWSD.cpp |4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8338a90a7de23d25edd7ff7b60654856987452b4
Author: Ashod Nakashian
Date: Thu Jun 28 00:47:20 2018 -0400
wsd: allow tracing with anonymization
Useful for troubleshooting and other non-prod setups.
To enable, add a subnode under logging/anonymize in
loolwsd.xml called allow_logging_pii with a boolean
value of true:
true
Change-Id: If74acaac0ea442ee5a7860453182180663a5108b
Reviewed-on: https://gerrit.libreoffice.org/56568
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/common/Log.hpp b/common/Log.hpp
index 152fea1b4..e630c5678 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -10,6 +10,8 @@
#ifndef INCLUDED_LOG_HPP
#define INCLUDED_LOG_HPP
+#include "config.h"
+
#include
#include
#include
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index aa21a6c60..6bfaa9305 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -778,7 +778,7 @@ void LOOLWSD::initialize(Application& self)
if (AnonymizeFilenames || AnonymizeUsernames)
{
-if (LogLevel == "trace")
+if (LogLevel == "trace" && !getConfigValue(conf,
"logging.anonymize.allow_logging_pii", false))
{
const char failure[] = "Anonymization and trace-level logging are
incompatible. "
"Please reduce logging level to debug or lower in loolwsd.xml
to prevent leaking sensitive user data.";
@@ -793,7 +793,7 @@ void LOOLWSD::initialize(Application& self)
const auto logToFile = getConfigValue(conf, "logging.file[@enable]",
false);
std::map logProperties;
-for (size_t i = 0; ; ++i)
+for (std::size_t i = 0; ; ++i)
{
const std::string confPath = "logging.file.property[" +
std::to_string(i) + "]";
const auto confName = config().getString(confPath + "[@name]", "");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre
icon-themes/colibre/links.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f900385503f3b0b8d045fd6c2256d2e2c78f0d4 Author: andreas kainz Date: Thu Jul 12 10:22:46 2018 +0200 tdf#117697 add missing section icon in search Change-Id: Iea2b4a7c98a2751048dc2228ac550708bd22c238 Reviewed-on: https://gerrit.libreoffice.org/57318 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit c6dc541a59a22c59d23c43c3dfcf8ef2c96095a6) Reviewed-on: https://gerrit.libreoffice.org/57323 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 6dd97cb7f2b3..85bda3e4c109 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1667,7 +1667,7 @@ sw/res/sr20002.png cmd/sc_inserttable.png sw/res/sr20003.png cmd/sc_insertframe.png sw/res/sr20004.png cmd/sc_showsinglepage.png sw/res/sr20005.png cmd/sc_editdoc.png -sw/res/sr20007.png sw/res/sc_insertsection.png +sw/res/sr20007.png cmd/sc_insertsection.png sw/res/sr20008.png cmd/sc_insertbookmark.png sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png sw/res/sr20010.png cmd/sc_drawchart.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - configure.ac wsd/LOOLWSD.cpp
configure.ac| 12 ++--
wsd/LOOLWSD.cpp |4 ++--
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit b2a5e0c5bf61fa96f1e8f00c92d76e4e3555a5ae
Author: Ashod Nakashian
Date: Sat Jun 23 19:52:27 2018 -0400
configure: support disabling anonymization
And inform the user of the anonymization level.
Change-Id: I95cf832d5c4103744207214ffbf4e85d177ff190
Reviewed-on: https://gerrit.libreoffice.org/56567
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/configure.ac b/configure.ac
index eda74b178..a4acf22b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,7 @@ LOOLWSD_ANONYMIZE_FILENAMES=false
LOOLWSD_ANONYMIZE_USERNAMES=false
LOLEAFLET_LOGGING="false"
debug_msg="secure mode: product build"
+anonym_msg=""
if test "$enable_debug" = "yes"; then
AC_DEFINE([ENABLE_DEBUG],1,[Whether to compile in some extra debugging
support code and disable some security pieces])
ENABLE_DEBUG=true
@@ -161,18 +162,24 @@ if test -n "$with_logfile" ; then
fi
AC_SUBST(LOOLWSD_LOGFILE)
-if test -n "$enable_anonymize_filenames" ; then
+if test "$enable_anonymize_filenames" = "yes" ; then
LOOLWSD_ANONYMIZE_FILENAMES=true
+ anonym_msg="filenames anonymized; "
fi
AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_FILENAMES],[$LOOLWSD_ANONYMIZE_FILENAMES],[Enable
permanent filenames anonymization in logs])
AC_SUBST(LOOLWSD_ANONYMIZE_FILENAMES)
-if test -n "$enable_anonymize_usernames" ; then
+if test "$enable_anonymize_usernames" = "yes" ; then
LOOLWSD_ANONYMIZE_USERNAMES=true
+ anonym_msg="${anonym_msg}usernames anonymized; "
fi
AC_DEFINE_UNQUOTED([LOOLWSD_ANONYMIZE_USERNAMES],[$LOOLWSD_ANONYMIZE_USERNAMES],[Enable
permanent usernames anonymization in logs])
AC_SUBST(LOOLWSD_ANONYMIZE_USERNAMES)
+if "x$anonym_msg" = "x"; then
+ anonym_msg="no anonymization of usernames or filenames"
+fi
+
MAX_CONNECTIONS=20
AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt
"0"],
[MAX_CONNECTIONS="$with_max_connections"])
@@ -451,6 +458,7 @@ Configuration:
LO integration tests${lo_msg}
SSL support $ssl_msg
Debug & low security$debug_msg
+Anonymization $anonym_msg
\$ make # to compile"
if test -n "$with_lo_path"; then
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b22075b0e..aa21a6c60 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -762,14 +762,14 @@ void LOOLWSD::initialize(Application& self)
}
// Get anonymization settings.
-#ifdef LOOLWSD_ANONYMIZE_USERNAMES
+#if LOOLWSD_ANONYMIZE_USERNAMES
AnonymizeUsernames = true;
#else
AnonymizeUsernames = getConfigValue(conf,
"logging.anonymize.usernames", false);
#endif
setenv("LOOL_ANONYMIZE_USERNAMES", AnonymizeUsernames ? "1" : "0", true);
-#ifdef LOOLWSD_ANONYMIZE_FILENAMES
+#if LOOLWSD_ANONYMIZE_FILENAMES
AnonymizeFilenames = true;
#else
AnonymizeFilenames = getConfigValue(conf,
"logging.anonymize.filenames", false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre officecfg/registry
icon-themes/colibre/links.txt| 9 +++ officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 27 ++ 2 files changed, 36 insertions(+) New commits: commit afb2d0f3e32ef7125fabf29302460979af1c33d1 Author: andreas kainz Date: Thu Jul 5 01:12:58 2018 +0200 Menubar Impress: add missing icons to menubar Change-Id: I5116e214ab64923c28dda4d10feab1193b5d9d31 Reviewed-on: https://gerrit.libreoffice.org/56978 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit eada59bd3383b1711f3a68030ad52c69746e810a) Reviewed-on: https://gerrit.libreoffice.org/57281 Reviewed-by: Tomaž Vajngerl diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 5ffb52a7aa43..6dd97cb7f2b3 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1050,6 +1050,15 @@ cmd/sc_lastslide.png cmd/sc_lastrecord.png cmd/sc_previousslide.png cmd/sc_prevrecord.png cmd/sc_nextslide.png cmd/sc_nextrecord.png cmd/sc_slidesetup.png cmd/sc_pagesetup.png +cmd/sc_insertslidenumber.png cmd/sc_insertpagenumberfield.png +cmd/sc_insertslidefield.png cmd/sc_insertpagenumberfield.png +cmd/sc_insertslidesfield.png cmd/sc_insertpagecountfield.png +cmd/sc_insertslidetitlefield.png cmd/sc_inserttitlefield.png +cmd/sc_insertfilefield.png cmd/sc_open.png +cmd/sc_insertdatefielfix.png cmd/sc_datefield.png +cmd/sc_insertdatefielvar.png cmd/sc_datefield.png +cmd/sc_inserttimefieldfix.png cmd/sc_timefield.png +cmd/sc_inserttimefieldvar.png cmd/sc_timefield.png # dbaccess # == diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 91b409db9dba..51faca943f2d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -490,21 +490,33 @@ Dat~e (variable) + + 1 + ~Date (fixed) + + 1 + T~ime (variable) + + 1 + ~Time (fixed) + + 1 + @@ -518,6 +530,9 @@ .uno:InsertPageField + + 1 + @@ -531,6 +546,9 @@ .uno:InsertPageTitleField + + 1 + @@ -544,6 +562,9 @@ .uno:InsertPagesField + + 1 + @@ -554,6 +575,9 @@ ~File Name + + 1 + @@ -1703,6 +1727,9 @@ S~lide Number... + + 1 + .uno:InsertPageNumber ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu | 8 officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 747dadd2f55b9181b2619a9b51cba7b5b849f476 Author: andreas kainz Date: Wed Jul 11 18:48:41 2018 +0200 tdf#116861: better default settings for minimize Presentation Change-Id: I6d05cb5591791afc438bfe38f179aa26d6cee920 Reviewed-on: https://gerrit.libreoffice.org/57285 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 5442670e4c643ef476fe154df9a0d226b7252d3a) Reviewed-on: https://gerrit.libreoffice.org/57290 Reviewed-by: Tomaž Vajngerl diff --git a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu index 317ef71a3505..1a2bbe315267 100644 --- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu +++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu @@ -205,7 +205,7 @@ The current presentation contains no OLE objects. true -50 +75 true @@ -248,7 +248,7 @@ The current presentation contains no OLE objects. true -25 +70 true @@ -289,7 +289,7 @@ The current presentation contains no OLE objects. true -50 +75 true @@ -330,7 +330,7 @@ The current presentation contains no OLE objects. true -75 +80 true diff --git a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs index 179637d7d677..5a9758139b1f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/PresentationMinimizer.xcs @@ -54,7 +54,7 @@ - 45 + 75 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/res/layout/toolbar_bottom.xml | 131
+-
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |5
2 files changed, 80 insertions(+), 56 deletions(-)
New commits:
commit 46855d3a98b515f334c447707c533025cfe98a48
Author: Mert Tumer
Date: Tue Jul 10 14:10:54 2018 -0700
Style tab added to Android Viewer
This is a base change, further implementations may be added
Change-Id: I8aa5b5314f2b1e93821baf3da3e44803904f57fa
Reviewed-on: https://gerrit.libreoffice.org/57249
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/android/source/res/layout/toolbar_bottom.xml
b/android/source/res/layout/toolbar_bottom.xml
index d1476a57fa57..d1820216d2ab 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -169,62 +169,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -389,6 +333,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 4cde5d96f992..e65d6c31e51a 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -239,6 +239,11 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
spec.setIndicator("Insert");
host.addTab(spec);
+spec = host.newTabSpec("Style");
+spec.setContent(R.id.tab_style);
+spec.setIndicator("Style");
+host.addTab(spec);
+
LinearLayout bottomToolbarLayout = findViewById(R.id.toolbar_bottom);
LinearLayout toolbarColorPickerLayout =
findViewById(R.id.toolbar_color_picker);
LinearLayout toolbarBackColorPickerLayout =
findViewById(R.id.toolbar_back_color_picker);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - debian/loolwsd.postinst.in docker/Dockerfile loolwsd.spec.in Makefile.am
Makefile.am|7 +--
debian/loolwsd.postinst.in |1 -
docker/Dockerfile |1 -
loolwsd.spec.in|4
4 files changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 8f522621fbfa215c1dea3d2afcdfe4a98c43bd66
Author: Andras Timar
Date: Wed May 9 12:41:12 2018 +0200
do not distribute unused or internal dev tool binaries: loolmap, loolmount,
loolstress
Change-Id: Ice905d08a695805f594df5731039f747ac88cf28
Reviewed-on: https://gerrit.libreoffice.org/54027
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
(cherry picked from commit 7c3322e7e0462644cc6a91d6f8ecec359485499b)
Reviewed-on: https://gerrit.libreoffice.org/54053
(cherry picked from commit 31b43a23aa5cb662e7015243abea255d2776e826)
Reviewed-on: https://gerrit.libreoffice.org/55084
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/Makefile.am b/Makefile.am
index b1693df7e..93265a079 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . test loleaflet
export ENABLE_DEBUG
-bin_PROGRAMS = loolwsd loolforkit loolmap loolmount looltool loolstress
loolconfig
+bin_PROGRAMS = loolwsd loolforkit looltool loolconfig
dist_bin_SCRIPTS = loolwsd-systemplate-setup
@@ -86,7 +86,10 @@ loolwsd_SOURCES = $(loolwsd_sources) \
noinst_PROGRAMS = clientnb \
connect \
lokitclient \
- loolwsd_fuzzer
+ loolwsd_fuzzer \
+ loolmap \
+ loolstress \
+ loolmount
connect_SOURCES = tools/Connect.cpp \
common/Log.cpp \
diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index d15baafe2..110db43b6 100755
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -5,7 +5,6 @@ set -e
case "$1" in
configure)
setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit ||
true
- setcap cap_sys_admin=ep /usr/bin/loolmount || true
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
diff --git a/docker/Dockerfile b/docker/Dockerfile
index aea6e73c3..2631e3829 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,7 +28,6 @@ COPY /scripts/run-lool.sh /
# set up LibreOffice Online (normally done by postinstall script of package)
RUN setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-RUN setcap cap_sys_admin=ep /usr/bin/loolmount
RUN adduser --quiet --system --group --home /opt/lool lool
RUN mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
RUN rm -rf /var/cache/loolwsd/*
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index c8db853ad..a6df23195 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -137,10 +137,7 @@ echo "accountrequired pam_unix.so" >>
%{buildroot}/etc/pam.d/loolwsd
%defattr(-,root,root,-)
/usr/bin/loolwsd
/usr/bin/loolwsd-systemplate-setup
-/usr/bin/loolmap
/usr/bin/loolforkit
-/usr/bin/loolmount
-/usr/bin/loolstress
/usr/bin/looltool
/usr/bin/loolconfig
/usr/share/loolwsd/discovery.xml
@@ -225,7 +222,6 @@ echo " Done."
%post
setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-setcap cap_sys_admin=ep /usr/bin/loolmount
mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
rm -rf /var/cache/loolwsd/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
| 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
New commits:
commit ec025525eb892b22a1874a295772f9653624c608
Author: Mert Tumer
Date: Sun Jul 8 08:04:54 2018 -0700
tdf#118622 fix unhandled exception when selecting remove server
Change-Id: I5f0f9a1ed4a4e0a62555a33209296128572c4ffb
Reviewed-on: https://gerrit.libreoffice.org/57159
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
index 7ae22a2d7c5f..0852ab617660 100644
---
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
+++
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
@@ -23,6 +23,7 @@ import com.owncloud.android.lib.resources.files.FileUtils;
import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation;
import com.owncloud.android.lib.resources.files.RemoteFile;
+
/**
* Implementation of IDocumentProvider for ownCloud servers.
*/
@@ -79,15 +80,20 @@ public class OwnCloudProvider implements IDocumentProvider,
@Override
public IFile createFromUri(Context context, URI uri) {
-ReadRemoteFileOperation refreshOperation = new ReadRemoteFileOperation(
-uri.getPath());
-this.result = refreshOperation.execute(client);
-if (!result.isSuccess()) {
-throw buildRuntimeExceptionForResultCode(result.getCode());
-}
-if (result.getData().size() > 0) {
-return new OwnCloudFile(this, (RemoteFile)
result.getData().get(0));
+if(serverUrl != "" || userName != "" || password != ""){
+ReadRemoteFileOperation refreshOperation = new
ReadRemoteFileOperation(
+uri.getPath());
+this.result = refreshOperation.execute(client);
+if (!result.isSuccess()) {
+throw buildRuntimeExceptionForResultCode(result.getCode());
+}
+if (result.getData().size() > 0) {
+return new OwnCloudFile(this, (RemoteFile)
result.getData().get(0));
+}
+} else {
+throw
buildRuntimeExceptionForResultCode(ResultCode.WRONG_CONNECTION);
}
+
return null;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/res/layout/activity_document_browser.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7e04333c194eaeb161291a984a777a2fe67da104 Author: Mert Tumer Date: Sat Jul 7 22:26:32 2018 -0700 tdf#118618 fix document browser doesnt list all documents Change-Id: I70aa1eb2bf08d3fa82a5ab86543198a263729ac9 Reviewed-on: https://gerrit.libreoffice.org/57150 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index 63f72346c0c6..8e17a3e1624f 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -47,7 +47,7 @@ app:layout_constraintLeft_toLeftOf="parent"> - @@ -106,7 +106,7 @@ - + https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |1 +
1 file changed, 1 insertion(+)
New commits:
commit f5db384409e85a4e98773265be68adad6fe65866
Author: Mert Tumer
Date: Fri Jul 6 08:58:56 2018 -0700
tdf#118585 Fix exception when closing Android Viewer
Change-Id: I9d87168dce4b5c6e503d41366aa35d5dadf89dae
Reviewed-on: https://gerrit.libreoffice.org/57081
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 0202e0797b63..e8809973777f 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -958,6 +958,7 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
@Override
protected void onDestroy() {
super.onDestroy();
+unregisterReceiver(mUSBReceiver);
Log.d(LOGTAG, "onDestroy");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - AllLangHelp_shared.mk helpers/help_hid.lst helpers/longnames_commands.csv helpers/unocmds.txt helpers/uno-commands.csv helpers/uno_hid.lst so
AllLangHelp_shared.mk |1 helpers/help_hid.lst |1 helpers/longnames_commands.csv |1 helpers/uno-commands.csv |1 helpers/uno_hid.lst|1 helpers/unocmds.txt|1 source/text/scalc/main0103.xhp |3 -- source/text/sdraw/main0103.xhp |1 source/text/shared/00/0403.xhp |2 - source/text/shared/01/0304.xhp | 52 - source/text/simpress/main0103.xhp |1 source/text/smath/main0103.xhp |1 source/text/swriter/main0103.xhp |4 -- 13 files changed, 2 insertions(+), 68 deletions(-) New commits: commit e41b7db0240b8c99741ff699e0fc0d787b443bf4 Author: Adolfo Jayme Barrientos Date: Tue Jul 10 03:41:02 2018 -0500 tdf#118314 Delete help content related to obsolete “Input Method Status” feature Change-Id: Ie80279915e3ee9a123204a729325ca9e119ab6bb Reviewed-on: https://gerrit.libreoffice.org/57224 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl (cherry picked from commit 2af2ba2a19e62ec8463c0f8e6b3d2346e75e5bb2) Reviewed-on: https://gerrit.libreoffice.org/57343 diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 283d094a0..4d525f055 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -142,7 +142,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/0225 \ helpcontent2/source/text/shared/01/0301 \ helpcontent2/source/text/shared/01/0302 \ -helpcontent2/source/text/shared/01/0304 \ helpcontent2/source/text/shared/01/0305 \ helpcontent2/source/text/shared/01/0306 \ helpcontent2/source/text/shared/01/0311 \ diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 6a903d1e0..88a23cc7b 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -4363,7 +4363,6 @@ SID_SET_SUPER_SCRIPT,10294,.uno:SuperScript SID_SHARE_DOC,26311, SID_SHOWPOPUPS,5929,.uno:ShowPopups SID_SHOW_BROWSER,10163,.uno:ShowBrowser -SID_SHOW_IME_STATUS_WINDOW,6680,.uno:ShowImeStatusWindow SID_SHOW_ITEMBROWSER,11001,.uno:ShowItemBrowser SID_SHOW_POSTIT,11098, SID_SHOW_PROPERTYBROWSER,10943,.uno:ShowPropBrowser diff --git a/helpers/longnames_commands.csv b/helpers/longnames_commands.csv index 92266c943..c5bf3c18d 100644 --- a/helpers/longnames_commands.csv +++ b/helpers/longnames_commands.csv @@ -1650,7 +1650,6 @@ SID_SET_SUB_SCRIPT,.uno:SubScript SID_SET_SUPER_SCRIPT,.uno:SuperScript SID_SHOWPOPUPS,.uno:ShowPopups SID_SHOW_BROWSER,.uno:ShowBrowser -SID_SHOW_IME_STATUS_WINDOW,.uno:ShowImeStatusWindow SID_SHOW_ITEMBROWSER,.uno:ShowItemBrowser SID_SHOW_PROPERTYBROWSER,.uno:ShowPropBrowser SID_SIGNATURE,.uno:Signature diff --git a/helpers/uno-commands.csv b/helpers/uno-commands.csv index 11ec6e36c..4f3d72d4e 100644 --- a/helpers/uno-commands.csv +++ b/helpers/uno-commands.csv @@ -1429,7 +1429,6 @@ .uno:ShowErrors .uno:ShowFmExplorer .uno:ShowHiddenParagraphs -.uno:ShowImeStatusWindow .uno:ShowInvalid .uno:ShowItemBrowser .uno:ShowMultiplePages diff --git a/helpers/uno_hid.lst b/helpers/uno_hid.lst index cbfa4a67b..9559f3d5f 100644 --- a/helpers/uno_hid.lst +++ b/helpers/uno_hid.lst @@ -1645,7 +1645,6 @@ SID_SET_SUB_SCRIPT,10295,.uno:SubScript SID_SET_SUPER_SCRIPT,10294,.uno:SuperScript SID_SHOWPOPUPS,5929,.uno:ShowPopups SID_SHOW_BROWSER,10163,.uno:ShowBrowser -SID_SHOW_IME_STATUS_WINDOW,6680,.uno:ShowImeStatusWindow SID_SHOW_ITEMBROWSER,11001,.uno:ShowItemBrowser SID_SHOW_PROPERTYBROWSER,10943,.uno:ShowPropBrowser SID_SIGNATURE,6643,.uno:Signature diff --git a/helpers/unocmds.txt b/helpers/unocmds.txt index 9f46c410c..0552d7f7c 100644 --- a/helpers/unocmds.txt +++ b/helpers/unocmds.txt @@ -914,7 +914,6 @@ .uno:ShowErrors;scalc/01/06030600.xhp .uno:ShowFmExplorer;shared/02/01170600.xhp .uno:ShowHiddenParagraphs;swriter/01/0314.xhp -.uno:ShowImeStatusWindow;shared/01/0304.xhp .uno:ShowInvalid;scalc/01/06030800.xhp .uno:ShowMultiplePages;swriter/02/1007.xhp .uno:ShowPrecedents;scalc/01/06030100.xhp diff --git a/source/text/scalc/main0103.xhp b/source/text/scalc/main0103.xhp index 209d51834..50783fffa 100644 --- a/source/text/scalc/main0103.xhp +++ b/source/text/scalc/main0103.xhp @@ -43,7 +43,6 @@ - Grid Lines for Sheet @@ -71,4 +70,4 @@ - \ No newline at end of file + diff --git a/source/text/sdraw/main0103.xhp b/source/text/sdraw/main0103.xhp index b098cc85f..15a34f68c 100644 --- a/source/text/sdraw/main0103.xhp +++ b/source/text/sdraw/main0103.xhp @@ -42,7 +42,6 @@ - diff --git a/source/text/shared/00/0403.xhp b/source/text/shared/00/0403.xhp index 50f35f501..d9ec318b0 100644 --- a/source/text/shared/00/0403.xhp +++ b/source/text/shared/00/0403.xhp @@ -53,8 +53,6 @@ Choose View - Toolbars - Color Bar -Choose View - Input Method Status - Click Hyperlink icon on Standard bar, click Internet diff --git a/sourc
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1cc4f29920bea4a08f89b63482146d169530f8e Author: Adolfo Jayme Barrientos Date: Tue Jul 10 03:41:02 2018 -0500 Update git submodules * Update helpcontent2 from branch 'libreoffice-6-1' - tdf#118314 Delete help content related to obsolete “Input Method Status” feature Change-Id: Ie80279915e3ee9a123204a729325ca9e119ab6bb Reviewed-on: https://gerrit.libreoffice.org/57224 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl (cherry picked from commit 2af2ba2a19e62ec8463c0f8e6b3d2346e75e5bb2) Reviewed-on: https://gerrit.libreoffice.org/57343 diff --git a/helpcontent2 b/helpcontent2 index bf20b6857767..e41b7db0240b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bf20b6857767222ef45b04b761a07796ca17ca8f +Subproject commit e41b7db0240b8c99741ff699e0fc0d787b443bf4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: README.md
README.md |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f3154b265a8ddf32df336caf50594d1f832b1bb Author: Tor Lillqvist Date: Thu Jul 12 16:46:27 2018 +0300 Say VS2017 here, too Change-Id: Icce460adc702547b12ad8e474507e396424c1eb3 diff --git a/README.md b/README.md index 3bcd70716e00..3336d32ce04b 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ run and compile LibreOffice, also used by the TDF builds: * Windows: * Runtime: Windows 7 -* Build: Cygwin + Visual Studio 2015 Update 3 +* Build: Cygwin + Visual Studio 2017 * macOS: * Runtime: 10.9 * Build: 10.12 + Xcode 8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/SwGrammarMarkUp.hxx |2 +-
sw/source/core/inc/wrong.hxx|2 +-
sw/source/core/text/SwGrammarMarkUp.cxx |4 ++--
sw/source/core/text/wrong.cxx |6 +++---
sw/source/core/txtnode/SwGrammarContact.cxx | 20 +++-
5 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit af8d2b5198964639da1c76aab402b90e22aad005
Author: Tor Lillqvist
Date: Thu Jul 12 15:04:53 2018 +0300
Revert "loplugin:useuniqueptr in SwGrammarContact"
This reverts commit 478d967eeb7ef8247033918da09d022427593f68.
Sadly the change caused a crash in Writer. Stack trace:
> #0 0x7fffc8b124cc in rtl::OUString::isEmpty() const
(this=0x) at /ssd1/lo/fedora/include/rtl/ustring.hxx:646
> #1 0x7fffc95ccaa8 in SwWrongList::GetWrongPos(int) const
(this=0x5bb5f60, nValue=0)
> at /ssd1/lo/fedora/sw/source/core/text/wrong.cxx:199
> #2 0x7fffc95cd0d2 in SwWrongList::Move(int, int) (this=0x5bb5f60,
nPos=0, nDiff=1)
> at /ssd1/lo/fedora/sw/source/core/text/wrong.cxx:274
> #3 0x7fffc94caffd in SwGrammarMarkUp::MoveGrammar(int, int)
(this=0x5bb5f60, nPos=0, nDiff=1)
> at /ssd1/lo/fedora/sw/source/core/text/SwGrammarMarkUp.cxx:41
> #4 0x7fffc95af393 in lcl_SetWrong(SwTextFrame&, SwTextNode const&,
int, int, bool) (rFrame=..., rNode=..., nPos=0, nCnt=1, bMove=true)
> at /ssd1/lo/fedora/sw/source/core/text/txtfrm.cxx:1462
> #5 0x7fffc95ad0ba in SwTextFrame::SwClientNotify(SwModify const&,
SfxHint const&) (this=0x62f3c50, rModify=..., rHint=...)
> at /ssd1/lo/fedora/sw/source/core/text/txtfrm.cxx:1676
> #6 0x7fffc8bd96b8 in SwModify::CallSwClientNotify(SfxHint const&)
const (this=0x4cef450, rHint=...)
> at /ssd1/lo/fedora/sw/inc/calbck.hxx:444
> #7 0x7fffc8bd893e in SwModify::ModifyBroadcast(SfxPoolItem const*,
SfxPoolItem const*) (this=0x4cef450,
> pOldValue=0x0, pNewValue=0x7ffed3a8) at
/ssd1/lo/fedora/sw/inc/calbck.hxx:201
> #8 0x7fffc8bd65d1 in SwModify::NotifyClients(SfxPoolItem const*,
SfxPoolItem const*) (this=0x4cef450, pOldValue=0x0, pNewValue=0x7ffed3a8)
at /ssd1/lo/fedora/sw/source/core/attr/calbck.cxx:199
> #9 0x7fffc965ec9f in SwTextNode::InsertText(rtl::OUString const&,
SwIndex const&, SwInsertFlags) (this=0x4cef450, rStr="s", rIdx=SwIndex (offset
1), nMode=SwInsertFlags::EMPTYEXPAND) at
/ssd1/lo/fedora/sw/source/core/txtnode/ndtxt.cxx:1997
> #10 0x7fffc8ef97be in
sw::DocumentContentOperationsManager::InsertString(SwPaM const&, rtl::OUString
const&, SwInsertFlags) (this=0x4ca2ef0, rRg=SwPaM = {...}, rStr="s",
nInsertMode=SwInsertFlags::EMPTYEXPAND)
> at
/ssd1/lo/fedora/sw/source/core/doc/DocumentContentOperationsManager.cxx:2509
> #11 0x7fffc919bf7b in SwEditShell::Insert2(rtl::OUString const&,
bool) (this=0x4d8eb90, rStr="s", bForceExpandHints=false)
> at /ssd1/lo/fedora/sw/source/core/edit/editsh.cxx:98
> #12 0x7fffca1d0cca in SwWrtShell::Insert(rtl::OUString const&)
(this=0x4d8eb90, rStr="s")
> at /ssd1/lo/fedora/sw/source/uibase/wrtsh/wrtsh1.cxx:224
> #13 0x7fffc9e71220 in SwEditWin::FlushInBuffer() (this=0x4d7a3e0) at
/ssd1/lo/fedora/sw/source/uibase/docvw/edtwin.cxx:989
> #14 0x7fffc9e7accc in SwEditWin::KeyInput(KeyEvent const&)
(this=0x4d7a3e0, rKEvt=...)
> at /ssd1/lo/fedora/sw/source/uibase/docvw/edtwin.cxx:2620
Noel said I should revert and push.
Change-Id: I22d51bb3b5427af261cd4a1af19f9fa378891d27
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx
b/sw/source/core/inc/SwGrammarMarkUp.hxx
index 535776981ac3..f37605556353 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -41,7 +41,7 @@ public:
SwGrammarMarkUp() : SwWrongList( WRONGLIST_GRAMMAR ) {}
virtual ~SwGrammarMarkUp() override;
-virtual std::unique_ptr Clone() override;
+virtual SwWrongList* Clone() override;
virtual void CopyFrom( const SwWrongList& rCopy ) override;
/* SwWrongList::Move() + handling of maSentence */
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 1f3fe2c8e082..0003d54266ba 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -259,7 +259,7 @@ public:
SwWrongList( WrongListType eType );
virtual ~SwWrongList();
-virtual std::unique_ptr Clone();
+virtual SwWrongList* Clone();
virtual void CopyFrom( const SwWrongList& rCopy );
WrongListType GetWrongListType() const { return meType; }
diff --git a/sw/source/core/text/SwGrammarMarkUp.cxx
b/sw/source/core/text/SwGrammarMarkUp.cxx
index bf49a899c917..a752619d8f81 100644
--- a/sw/source/core/text/SwGrammarMarkUp.cxx
+++ b/sw/source/core/text/SwGrammarMarkUp.cxx
@@ -23,9 +23,9 @@ SwGrammarMarkUp::~SwGrammarMarkUp()
{
}
-std::unique_ptr SwGramm
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 12
+-
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 61b981e2682872e9ff45dc3c13d51875b1cd5ae3
Author: Mert Tumer
Date: Fri Jul 6 07:56:33 2018 -0700
Fix endless loop when selecting remote server on Android Viewer
Switching document provider when exception thrown casues
endless loop.
Signed-off-by: Mert Tumer
Change-Id: Ie34080abdf7b8d6a48cd96785700b7bd91910512
Reviewed-on: https://gerrit.libreoffice.org/57070
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index d7b0ab41c015..0202e0797b63 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -432,10 +432,8 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
// these operations may imply network access and must be run in
// a different thread
try {
-documentProvider = provider[0];
-homeDirectory =
documentProvider.getRootDirectory(LibreOfficeUIActivity.this);
-currentDirectory = homeDirectory;
-List paths =
currentDirectory.listFiles(FileUtilities
+homeDirectory =
provider[0].getRootDirectory(LibreOfficeUIActivity.this);
+List paths = homeDirectory.listFiles(FileUtilities
.getFileFilter(filterMode));
filePaths = new ArrayList();
for(IFile file: paths) {
@@ -455,13 +453,15 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
public void run() {
Toast.makeText(activity, e.getMessage(),
Toast.LENGTH_SHORT).show();
-// switch back to the default provider.
-
switchToDocumentProvider(documentProviderFactory.getDefaultProvider());
}
});
startActivity(new Intent(activity,
DocumentProviderSettingsActivity.class));
Log.e(LOGTAG, "failed to switch document provider "+
e.getMessage(), e.getCause());
+return null;
}
+//no exception
+documentProvider = provider[0];
+currentDirectory = homeDirectory;
return null;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
|2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3eeb603c091c9242d8f45417f6273604c5419090
Author: Mert Tumer
Date: Fri Jul 6 08:30:39 2018 -0700
Fix remote server can not be selected on Android Viewer
Change-Id: Ic08253c3732f963eec6f97e6bd0530f95eb2916a
Reviewed-on: https://gerrit.libreoffice.org/57072
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
index 3a4e63b5a798..7ae22a2d7c5f 100644
---
a/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
+++
b/android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java
@@ -181,6 +181,6 @@ public class OwnCloudProvider implements IDocumentProvider,
@Override
public boolean checkProviderAvailability(Context context) {
-return result != null && this.result.isSuccess();
+return client != null;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/chrdlg/swuiccoll.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3d73f76a91260becf171ea77589190714577b267
Author: Eike Rathke
Date: Thu Jul 12 14:51:00 2018 +0200
SvTreeListBox::DoubleClickHdl: SwCondCollPage more, tdf#115950 related
Change-Id: I179c791aac5eb522aefb3ce20931fe44dd7248c6
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 5767642ac6d9..59c00d5622c1 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -228,7 +228,7 @@ IMPL_LINK( SwCondCollPage, AssignRemoveClickHdl, Button*,
pBtn, void)
IMPL_LINK( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn,
bool)
{
AssignRemove(pBtn);
-return false;
+return true;// signal more to be done
}
IMPL_LINK( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - 2 commits - scp2/source solenv/inc translations
scp2/source/ooo/module_langpack.ulf |6 ++ solenv/inc/langlist.mk |1 + translations|2 +- 3 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 377ed0af1dc1aae53723619bddc58194d9de4f30 Author: Christian Lohmaier Date: Thu Jul 12 14:02:14 2018 +0200 tdf#118717 add Kabyle (kab) user interface package Change-Id: I4b36d8700ad369b58205b699e0aff5591d2f1d6a (cherry picked from commit 0b7ab07611ddaafe25e9e1914a49be2afe68ada9) diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index ca1c40b2a7db..7bb58e1fa98c 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -82,6 +82,12 @@ en-US = "Japanese" [STR_DESC_MODULE_LANGPACK_JA] en-US = "Installs the Japanese user interface" +[STR_NAME_MODULE_LANGPACK_KAB] +en-US = "Kabyle" + +[STR_DESC_MODULE_LANGPACK_KAB] +en-US = "Installs the Kabyle user interface" + [STR_NAME_MODULE_LANGPACK_KO] en-US = "Korean" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index d0c5cb5cba78..4492cb295db1 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -65,6 +65,7 @@ is \ it \ ja \ ka \ +kab \ kk \ km \ kmr-Latn \ commit 362c9f1b0f7887de5b748b52374e412bc42fcc18 Author: Christian Lohmaier Date: Thu Jul 12 14:28:21 2018 +0200 Update git submodules * Update translations from branch 'libreoffice-6-1' - update translations for 6-1 and add Kabyle Change-Id: I65d15fddf56d311c0508e60128e21360e7f49dbf diff --git a/translations b/translations index 261c756426ce..5c9bd517831c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 261c756426cede3542656cc9b14234542fcb8ed8 +Subproject commit 5c9bd517831c988b5fac67d80333747ebca7e667 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 60c2f6d7f167cc313b33d29531f8c7320903e78d
Author: Eike Rathke
Date: Thu Jul 12 14:29:38 2018 +0200
SvTreeListBox::DoubleClickHdl: SwContentTree more, tdf#115950 related
Change-Id: Id3d1e070467bdb681919b380c0d2ace78ebd388d
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 0dabe3cf9b4b..c50897b07d2b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1569,7 +1569,10 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl,
SvTreeListBox*, bool)
if(pEntry)
{
if(lcl_IsContentType(pEntry) && !pEntry->HasChildren())
+{
RequestingChildren(pEntry);
+return true;// signal more to be done, i.e. expand children
+}
else if (!lcl_IsContentType(pEntry) && (State::HIDDEN != m_eState))
{
if (State::CONSTANT == m_eState)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source vcl/win vcl/WinResTarget_vcl.mk
dev/null |binary sd/source/filter/html/pubdlg.src |8 +- vcl/WinResTarget_vcl.mk | 10 +-- vcl/win/source/src/oo.ico|binary vcl/win/source/src/salsrc.rc | 119 +++ 5 files changed, 69 insertions(+), 68 deletions(-) New commits: commit 9353191981faed85afa7e40bd3941a8bd9d87102 Author: Matthias Seidel Date: Thu Jul 12 10:46:06 2018 + Replacing sd.ico (StarDesktop?) with OpenOffice icon diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk index e3b29b5b3540..b6c5c5ae3a6c 100755 --- a/vcl/WinResTarget_vcl.mk +++ b/vcl/WinResTarget_vcl.mk @@ -24,8 +24,8 @@ $(eval $(call gb_WinResTarget_WinResTarget,vcl/src)) $(eval $(call gb_WinResTarget_set_include,vcl/src,\ -$$(INCLUDE) \ --I$(SRCDIR)/vcl/inc \ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/inc \ )) ifeq ($(OS),WNT) @@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\ vcl/win/source/src/copyf.cur \ vcl/win/source/src/drect.cur \ vcl/win/source/src/movef.cur \ -vcl/win/source/src/sd.ico \ +vcl/win/source/src/oo.ico \ vcl/win/source/src/ase.cur \ vcl/win/source/src/copyf2.cur \ vcl/win/source/src/dtext.cur \ @@ -127,8 +127,8 @@ $(eval $(call gb_WinResTarget_add_file,vcl/src,\ )) $(eval $(call gb_WinResTarget_set_include,vcl/src,\ -$$(INCLUDE) \ --I$(SRCDIR)/vcl/os2/source/src \ +$$(INCLUDE) \ +-I$(SRCDIR)/vcl/os2/source/src \ )) endif diff --git a/vcl/win/source/src/oo.ico b/vcl/win/source/src/oo.ico new file mode 100644 index ..f9c2b09e67bb Binary files /dev/null and b/vcl/win/source/src/oo.ico differ diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 810f15564c30..5adb26a9cb3f 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -28,67 +28,67 @@ #include #endif -SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR +SAL_RESID_POINTER_NULL CURSOR NULLPTR.CUR #if ( WINVER < 0x0400 ) -SAL_RESID_POINTER_HELP CURSOR HELP.CUR +SAL_RESID_POINTER_HELP CURSOR HELP.CUR #endif #ifndef WNT -SAL_RESID_POINTER_HSIZECURSOR HSIZE.CUR -SAL_RESID_POINTER_VSIZECURSOR VSIZE.CUR -SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR -SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR +SAL_RESID_POINTER_HSIZECURSOR HSIZE.CUR +SAL_RESID_POINTER_VSIZ CURSOR VSIZE.CUR +SAL_RESID_POINTER_NESWSIZE CURSOR NESWSIZE.CUR +SAL_RESID_POINTER_NWSESIZE CURSOR NWSESIZE.CUR #endif -SAL_RESID_POINTER_CROSSCURSOR CROSS.CUR -SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR -SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR -SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR -SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR -SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR -SAL_RESID_POINTER_HAND CURSOR HAND.CUR -SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR -SAL_RESID_POINTER_PEN CURSOR PEN.CUR -SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR -SAL_RESID_POINTER_FILL CURSOR FILL.CUR -SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR -SAL_RESID_POINTER_HSHEAR CURSOR HSHEAR.CUR -SAL_RESID_POINTER_VSHEAR CURSOR VSHEAR.CUR -SAL_RESID_POINTER_MIRROR CURSOR MIRROR.CUR -SAL_RESID_POINTER_CROOKCURSOR CROOK.CUR -SAL_RESID_POINTER_CROP CURSOR CROP.CUR -SAL_RESID_POINTER_MOVEPOINTCURSOR MOVEPT.CUR +SAL_RESID_POINTER_CROSSCURSOR CROSS.CUR +SAL_RESID_POINTER_MOVE CURSOR MOVE.CUR +SAL_RESID_POINTER_HSPLIT CURSOR HSPLIT.CUR +SAL_RESID_POINTER_VSPLIT CURSOR VSPLIT.CUR +SAL_RESID_POINTER_HSIZEBAR CURSOR HSIZEBAR.CUR +SAL_RESID_POINTER_VSIZEBAR CURSOR VSIZEBAR.CUR +SAL_RESID_POINTER_HAND CURSOR HAND.CUR +SAL_RESID_POINTER_REFHAND CURSOR REFHAND.CUR +SAL_RESID_POINTER_PEN CURSOR PEN.CUR +SAL_RESID_POINTER_MAGNIFY CURSOR MAGNIFY.CUR +SAL_RESID_POINTER_FILL CURSOR FILL.CUR +SAL_RESID_POINTER_ROTATE CURSOR ROTATE.CUR +SAL_RESID_
[Libreoffice-commits] core.git: scp2/source solenv/inc
scp2/source/ooo/module_langpack.ulf |6 ++ solenv/inc/langlist.mk |1 + 2 files changed, 7 insertions(+) New commits: commit 0b7ab07611ddaafe25e9e1914a49be2afe68ada9 Author: Christian Lohmaier Date: Thu Jul 12 14:02:14 2018 +0200 tdf#118717 add Kabyle (kab) user interface package Change-Id: I4b36d8700ad369b58205b699e0aff5591d2f1d6a diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index ca1c40b2a7db..7bb58e1fa98c 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -82,6 +82,12 @@ en-US = "Japanese" [STR_DESC_MODULE_LANGPACK_JA] en-US = "Installs the Japanese user interface" +[STR_NAME_MODULE_LANGPACK_KAB] +en-US = "Kabyle" + +[STR_DESC_MODULE_LANGPACK_KAB] +en-US = "Installs the Kabyle user interface" + [STR_NAME_MODULE_LANGPACK_KO] en-US = "Korean" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index d0c5cb5cba78..4492cb295db1 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -65,6 +65,7 @@ is \ it \ ja \ ka \ +kab \ kk \ km \ kmr-Latn \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 8 commits - .gitreview harfbuzz/ExternalProject_harfbuzz.mk include/basebmp include/formula solenv/gbuild vcl/source v
.gitreview |2 +-
harfbuzz/ExternalProject_harfbuzz.mk|1 +
include/basebmp/packedpixeliterator.hxx |8 +---
include/formula/grammar.hxx |2 +-
solenv/gbuild/platform/unxgcc.mk|1 +
vcl/source/glyphs/graphite_layout.cxx | 16 +---
vcl/unx/gtk/app/gtksys.cxx | 23 +--
7 files changed, 35 insertions(+), 18 deletions(-)
New commits:
commit 55cb130917ffbee681e0ba26d711e7e66ae3cafc
Author: Michael Stahl
Date: Wed Jul 11 15:16:48 2018 +0200
basebmp: #ifdef some dead code
libreoffice-4-1-6+backports/include/basebmp/packedpixeliterator.hxx:607:35:
error: expression cannot be used as a function
const int remainder( x(d.x) % num_intraword_positions );
This was removed in:
commit 1b4dff2c371d31c99f34324c3f6f31888bdc34d7 "loplugin:unusedmethods"
Change-Id: I3bfc28da8f977633f0b4d808237235a5316338c4
diff --git a/include/basebmp/packedpixeliterator.hxx
b/include/basebmp/packedpixeliterator.hxx
index 61584272bfbd..8a94baa2c265 100644
--- a/include/basebmp/packedpixeliterator.hxx
+++ b/include/basebmp/packedpixeliterator.hxx
@@ -602,6 +602,7 @@ public:
>> get_shift(remainder));
}
+#if 0
value_type get(difference_type const & d) const
{
const int remainder( x(d.x) % num_intraword_positions );
@@ -610,6 +611,7 @@ public:
get_mask(remainder))
>> get_shift(remainder));
}
+#endif
void set( value_type v ) const
{
commit 7c3db9ca5fd244e8a7faa812f0218216f8c53f2d
Author: Michael Meeks
Date: Fri May 16 21:49:23 2014 +0100
vcl: GTK: fix libstdc++ "irreflexive" assert
/usr/include/c++/6.1.1/bits/stl_algo.h:4737:
Error: comparison doesn't meet irreflexive requirements, assert(!(a < a)).
GdkRectangleCoincident is clearly not a less-than operator as required
for std::sort.
(cherry picked from commit e2b267b1906817cc45f0e4896bed58cff5b6b0f9)
Reviewed-on: https://gerrit.libreoffice.org/26762
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 8851333f8aafe84ca9479faf24d9164035aff520)
squashed dependency:
fdo#78799 - ignore overlayed monitors with co-incident origin.
This happens with certain fglrx drivers etc. where 'cloned' is not
set but instead both monitors are placed over the top of each other
(by XFCE) -> work around that.
(cherry picked from commit 5eeea7c91d87ee8f0b8bc8c0144c04fb84310bbf)
Change-Id: If2e65d420dc8cdf0707081361a40d4eaea28424e
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 1d2d7313b564..bd723eca36b8 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -55,15 +55,25 @@ GtkSalSystem::GetDisplayXScreenCount()
namespace
{
-struct GdkRectangleEqual
+struct GdkRectangleCoincidentLess
{
+// fdo#78799 - detect and elide overlaying monitors of different sizes
+bool operator()(GdkRectangle const& rLeft, GdkRectangle const& rRight)
+{
+return
+rLeft.x < rRight.x
+|| rLeft.y < rRight.y
+;
+}
+};
+struct GdkRectangleCoincident
+{
+// fdo#78799 - detect and elide overlaying monitors of different sizes
bool operator()(GdkRectangle const& rLeft, GdkRectangle const& rRight)
{
return
rLeft.x == rRight.x
&& rLeft.y == rRight.y
-&& rLeft.width == rRight.width
-&& rLeft.height == rRight.height
;
}
};
@@ -95,10 +105,11 @@ GtkSalSystem::countScreenMonitors()
gdk_screen_get_monitor_geometry(pScreen, j, &aGeometry);
aGeometries.push_back(aGeometry);
}
-GdkRectangleEqual aCmp;
-std::sort(aGeometries.begin(), aGeometries.end(), aCmp);
+std::sort(aGeometries.begin(), aGeometries.end(),
+GdkRectangleCoincidentLess());
const std::vector::iterator aUniqueEnd(
-std::unique(aGeometries.begin(), aGeometries.end(), aCmp));
+std::unique(aGeometries.begin(), aGeometries.end(),
+GdkRectangleCoincident()));
nMonitors = std::distance(aGeometries.begin(), aUniqueEnd);
}
maScreenMonitors.push_back(std::make_pair(pScreen, nMonitors));
commit d38e5414ae7d9629e8598e73529992eee7b85e0d
Author: Michael Stahl
Date: Thu Mar 12 15:40:05 2015 +0100
formula: PVS-Studio V610 Undefined behavior shift negative signed int
Change-Id: If6c054abfab6ba421a6924a65dac76782e6eaa0b
(cherry picked from commit f1b5381ed70a21a6f460bcd6a8bedad10b9a5a02)
diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index eaa77c2dbd97..a2b545bb1e62 100644
--- a/include/formula/grammar.hxx
+++ b/incl
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/karasa_jaga
icon-themes/karasa_jaga/cmd/32/fontdialog.png |binary icon-themes/karasa_jaga/cmd/32/subscript.png |binary icon-themes/karasa_jaga/cmd/32/superscript.png |binary icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png |binary icon-themes/karasa_jaga/cmd/lc_charfontname.png|binary icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/lc_exporttopdf.png |binary icon-themes/karasa_jaga/cmd/lc_fontdialog.png |binary icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png |binary icon-themes/karasa_jaga/cmd/lc_protect.png |binary icon-themes/karasa_jaga/cmd/lc_signpdf.png |binary icon-themes/karasa_jaga/cmd/lc_subscript.png |binary icon-themes/karasa_jaga/cmd/lc_superscript.png |binary icon-themes/karasa_jaga/cmd/lc_tablenumberformatdialog.png |binary icon-themes/karasa_jaga/cmd/lc_unsetcellsreadonly.png |binary icon-themes/karasa_jaga/cmd/sc_alignbottom.png |binary icon-themes/karasa_jaga/cmd/sc_aligntop.png|binary icon-themes/karasa_jaga/cmd/sc_alignverticalcenter.png |binary icon-themes/karasa_jaga/cmd/sc_charfontname.png|binary icon-themes/karasa_jaga/cmd/sc_exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/sc_exporttopdf.png |binary icon-themes/karasa_jaga/cmd/sc_fontdialog.png |binary icon-themes/karasa_jaga/cmd/sc_protect.png |binary icon-themes/karasa_jaga/cmd/sc_signpdf.png |binary icon-themes/karasa_jaga/cmd/sc_subscript.png |binary icon-themes/karasa_jaga/cmd/sc_superscript.png |binary icon-themes/karasa_jaga/cmd/sc_wraptext.png|binary icon-themes/karasa_jaga/links.txt | 18 + 28 files changed, 18 insertions(+) New commits: commit dc682d9acc5d834e5efff9d63189b8d95b33a1b0 Author: Rizal Muttaqin Date: Wed Jul 11 23:02:32 2018 +0700 KJ: ^ some table related, font, align icons etc, + PivotTable menu icon Change-Id: Icfa28a165d6697ca105b95fcc846ae05edbbdb11 Reviewed-on: https://gerrit.libreoffice.org/57282 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 0f587b82ea8da631bb4a5a394d0145d91aef486f) Reviewed-on: https://gerrit.libreoffice.org/57320 Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/karasa_jaga/cmd/32/fontdialog.png b/icon-themes/karasa_jaga/cmd/32/fontdialog.png index dc1cfd1df84b..ce394179effc 100755 Binary files a/icon-themes/karasa_jaga/cmd/32/fontdialog.png and b/icon-themes/karasa_jaga/cmd/32/fontdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/subscript.png b/icon-themes/karasa_jaga/cmd/32/subscript.png index fba47feceaa0..38ce59806945 100755 Binary files a/icon-themes/karasa_jaga/cmd/32/subscript.png and b/icon-themes/karasa_jaga/cmd/32/subscript.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/superscript.png b/icon-themes/karasa_jaga/cmd/32/superscript.png index da6ee50201ca..70797ef652ac 100755 Binary files a/icon-themes/karasa_jaga/cmd/32/superscript.png and b/icon-themes/karasa_jaga/cmd/32/superscript.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png b/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png index b6b5d7fcbba6..5917b6611601 100755 Binary files a/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png and b/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_charfontname.png b/icon-themes/karasa_jaga/cmd/lc_charfontname.png index e98b897e4582..0a81c8a7feed 100755 Binary files a/icon-themes/karasa_jaga/cmd/lc_charfontname.png and b/icon-themes/karasa_jaga/cmd/lc_charfontname.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png b/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png index 3637b0827bde..039233f5dbe5 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png and b/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png b/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png index 35e5dccd162d..e21c1eebcb38 100755 Binary files a/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png and b/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_fontdialog.png b/icon-themes/karasa_jaga/cmd/lc_fontdialog.png index b5cb9793a772..e657a1bff025 100755 Binary files a/icon-themes/karasa_jaga/cmd/lc_fontdialog.png and b/icon-themes/karasa_jaga/cmd/lc_fontdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png b/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png index aca6ce8d0021..c83bf759792a 100755 Binary files a/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png and b/icon-themes/kara
[Libreoffice-commits] translations.git: source/bg source/cy source/da source/de source/el source/en-GB source/es source/eu source/fy source/gl source/ja source/kab source/kk source/nl source/nn source
source/bg/cui/messages.po | 14 source/bg/helpcontent2/source/text/scalc/00.po | 16 source/bg/helpcontent2/source/text/scalc/01.po |8 source/bg/helpcontent2/source/text/scalc/guide.po |6 source/bg/helpcontent2/source/text/shared/00.po | 188 source/bg/helpcontent2/source/text/shared/04.po | 150 source/bg/helpcontent2/source/text/shared/07.po | 12 source/bg/helpcontent2/source/text/shared/guide.po |8 source/bg/helpcontent2/source/text/shared/optionen.po |6 source/bg/vcl/messages.po | 154 source/cy/instsetoo_native/inc_openoffice/windows/msi_languages.po | 10 source/da/cui/messages.po | 22 source/da/helpcontent2/source/text/scalc/01.po |8 source/da/helpcontent2/source/text/shared.po | 16 source/da/helpcontent2/source/text/shared/00.po | 184 source/da/helpcontent2/source/text/shared/01.po | 28 source/da/helpcontent2/source/text/shared/02.po | 22 source/da/helpcontent2/source/text/shared/04.po | 28 source/da/instsetoo_native/inc_openoffice/windows/msi_languages.po |8 source/da/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/da/sc/messages.po | 52 source/da/scp2/source/draw.po |6 source/da/sw/messages.po | 12 source/da/vcl/messages.po | 154 source/de/helpcontent2/source/text/schart/04.po |8 source/de/helpcontent2/source/text/shared/00.po | 274 source/de/helpcontent2/source/text/shared/01.po | 186 source/de/helpcontent2/source/text/shared/02.po | 106 source/de/helpcontent2/source/text/shared/guide.po | 14 source/de/officecfg/registry/data/org/openoffice/Office/UI.po | 10 source/de/sc/messages.po |8 source/el/cui/messages.po | 20 source/el/dictionaries/id.po |8 source/el/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/el/sc/messages.po | 76 source/el/sd/messages.po |8 source/el/sfx2/messages.po |8 source/el/svx/messages.po |8 source/el/sw/messages.po | 26 source/el/vcl/messages.po | 40 source/en-GB/cui/messages.po | 20 source/en-GB/helpcontent2/source/text/scalc/01.po | 104 source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/en-GB/sc/messages.po | 76 source/en-GB/sd/messages.po |8 source/en-GB/sfx2/messages.po |8 source/en-GB/svx/messages.po |8 source/en-GB/sw/messages.po | 26 source/en-GB/vcl/messages.po | 160 source/es/helpcontent2/source/text/shared.po | 18 source/es/helpcontent2/source/text/shared/00.po | 94 source/es/helpcontent2/source/text/shared/01.po | 20 source/es/helpcontent2/source/text/shared/04.po | 42 source/es/helpcontent2/source/text/shared/07.po | 12 source/es/helpcontent2/source/text/shared/guide.po |8 source/es/vcl/messages.po
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87e339d3e852d197b86b53eda3ab5e90dbdf6d39 Author: Christian Lohmaier Date: Thu Jul 12 12:27:19 2018 +0200 Update git submodules * Update translations from branch 'master' - update translations for master and add Kabyle Change-Id: Id526786e75a593590b553910a0e152bbfbfb690d diff --git a/translations b/translations index 9590cc3e8616..1ed5e59b7cf6 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 9590cc3e86168450d1c40c4136849bdf36474b84 +Subproject commit 1ed5e59b7cf6a3453cf2ca2fe0eebf45b75b2e1d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svtools/source
svtools/source/contnr/svimpbox.cxx|8 +++-
svtools/source/contnr/treelistbox.cxx |3 +--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 172817aa670ff923780d0159c4416871179fa94c
Author: Eike Rathke
Date: Tue Jul 10 11:13:57 2018 +0200
Resolves: tdf#115950 proper double click return and bail out, tdf#117063
commit b649ce123dea372359ec571135a68eb3de844e5b
CommitDate: Sun Apr 29 08:46:46 2018 +0200
tdf#117063 Modify tree list double click behavior in the navigator
changed the return value in SvTreeListBox::DoubleClickHdl() from
return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
to an unconditional true. Earlier there was
commit 1b9af08481b8f7f4bd15a30508606dff56b8e74f
CommitDate: Tue Mar 13 16:28:40 2018 +0100
tdf#116334: Actually when there is no handler, we have to return
'true'.
-aDoubleClickHdl.Call( this );
-return false;
+return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
and before that
commit 7651e57573952758032ceb88f16e2dbbb6cc4e18
CommitDate: Thu Mar 1 15:41:13 2018 +0100
tdf#115950: Indicate that the dialog was already destroyed.
-return true;
+return false;
Neither a constant false or true are correct return values here,
but only the value the double click handler, if any, returned to
indicate whether processing should continue (true) or not (false).
If handlers don't return a proper value so the intended behaviour
for tdf#117063 or anything else does not work then fix the
handlers instead.
If the handler returned false then don't even attempt to access
anything in SvImpLBox::MouseButtonDown() because an OK handler may
have destroyed everything and all is rotten.
Change-Id: Ia90c21288bedd7e5078dbe4b3dd6d9f5199a2a98
Reviewed-on: https://gerrit.libreoffice.org/57225
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
Reviewed-by: Eike Rathke
(cherry picked from commit c9d1655d455ad783694e6d7f0d2e6cf3d0d0acae)
Reviewed-on: https://gerrit.libreoffice.org/57324
diff --git a/svtools/source/contnr/svimpbox.cxx
b/svtools/source/contnr/svimpbox.cxx
index b53b403c80f1..52d1f9a47f59 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2019,7 +2019,13 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt
)
{
nFlags &= (~LBoxFlags::StartEditTimer);
pView->pHdlEntry = pEntry;
-if( pView->DoubleClickHdl() )
+if( !pView->DoubleClickHdl() )
+{
+// Handler signals nothing to be done anymore, bail out, 'this' may
+// even be dead and destroyed.
+return;
+}
+else
{
// if the entry was deleted within the handler
pEntry = GetClickedEntry( aPos );
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index c236e432e227..8ae4c745e170 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -426,8 +426,7 @@ void SvTreeListBox::DeselectHdl()
bool SvTreeListBox::DoubleClickHdl()
{
-aDoubleClickHdl.Call( this );
-return true;
+return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/navipi/content.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08ac6e6f991cffcb1fed7bd1bb4ec67e94817507 Author: Eike Rathke Date: Thu Jul 12 13:24:57 2018 +0200 SvTreeListBox::DoubleClickHdl: Navigator return more to be done, tdf#117063 Change-Id: I2b232cd9ea791273e8a776bf88fa45ee0ad5edf0 diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index f3f9b3a74064..a0c709966c27 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -438,7 +438,7 @@ IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool) ScNavigatorDlg::ReleaseFocus(); // set focus into document } -return false; +return true; } void ScContentTree::MouseButtonDown( const MouseEvent& rMEvt ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/svimpbox.cxx|8 +++-
svtools/source/contnr/treelistbox.cxx |3 +--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit c9d1655d455ad783694e6d7f0d2e6cf3d0d0acae
Author: Eike Rathke
Date: Tue Jul 10 11:13:57 2018 +0200
Resolves: tdf#115950 proper double click return and bail out, tdf#117063
commit b649ce123dea372359ec571135a68eb3de844e5b
CommitDate: Sun Apr 29 08:46:46 2018 +0200
tdf#117063 Modify tree list double click behavior in the navigator
changed the return value in SvTreeListBox::DoubleClickHdl() from
return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
to an unconditional true. Earlier there was
commit 1b9af08481b8f7f4bd15a30508606dff56b8e74f
CommitDate: Tue Mar 13 16:28:40 2018 +0100
tdf#116334: Actually when there is no handler, we have to return
'true'.
-aDoubleClickHdl.Call( this );
-return false;
+return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
and before that
commit 7651e57573952758032ceb88f16e2dbbb6cc4e18
CommitDate: Thu Mar 1 15:41:13 2018 +0100
tdf#115950: Indicate that the dialog was already destroyed.
-return true;
+return false;
Neither a constant false or true are correct return values here,
but only the value the double click handler, if any, returned to
indicate whether processing should continue (true) or not (false).
If handlers don't return a proper value so the intended behaviour
for tdf#117063 or anything else does not work then fix the
handlers instead.
If the handler returned false then don't even attempt to access
anything in SvImpLBox::MouseButtonDown() because an OK handler may
have destroyed everything and all is rotten.
Change-Id: Ia90c21288bedd7e5078dbe4b3dd6d9f5199a2a98
Reviewed-on: https://gerrit.libreoffice.org/57225
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
Reviewed-by: Eike Rathke
diff --git a/svtools/source/contnr/svimpbox.cxx
b/svtools/source/contnr/svimpbox.cxx
index 6f7d0f23720a..4f6914431dbe 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2019,7 +2019,13 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt
)
{
nFlags &= (~LBoxFlags::StartEditTimer);
pView->pHdlEntry = pEntry;
-if( pView->DoubleClickHdl() )
+if( !pView->DoubleClickHdl() )
+{
+// Handler signals nothing to be done anymore, bail out, 'this' may
+// even be dead and destroyed.
+return;
+}
+else
{
// if the entry was deleted within the handler
pEntry = GetClickedEntry( aPos );
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index 716a1a2cc00b..ea710b2da653 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -426,8 +426,7 @@ void SvTreeListBox::DeselectHdl()
bool SvTreeListBox::DoubleClickHdl()
{
-aDoubleClickHdl.Call( this );
-return true;
+return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/countusersofdefaultparams.py |2 ++
compilerplugins/clang/finalclasses.py |3 +++
compilerplugins/clang/mergeclasses.cxx |2 +-
compilerplugins/clang/mergeclasses.py |3 +++
compilerplugins/clang/singlevalfields.py |2 ++
compilerplugins/clang/virtualdown.py |4 +++-
6 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 85cf4d25a3df3da86840c69bc035d58212a9672c
Author: Noel Grandin
Date: Thu Jul 12 11:14:13 2018 +0200
loplugin:mergeclasses fix ignoring some stuff
Seems that calling getCanonicalDecl here results in us sometimes picking
up forward-decl's, which hides stuff
Also make the python processing code spit out a message if I manage to
mess up the log files
Change-Id: I08bf50eb26cf463c126507b51535b0a0fc9f7ecf
diff --git a/compilerplugins/clang/countusersofdefaultparams.py
b/compilerplugins/clang/countusersofdefaultparams.py
index 06c38b9e4807..d7ac6a62d8f2 100755
--- a/compilerplugins/clang/countusersofdefaultparams.py
+++ b/compilerplugins/clang/countusersofdefaultparams.py
@@ -35,6 +35,8 @@ with
io.open("workdir/loplugin.countusersofdefaultparams.log", "rb", buffering=1
if not funcInfo in callDict:
callDict[funcInfo] = set()
callDict[funcInfo].add(sourceLocationOfCall)
+else:
+print( "unknown line: " + line)
# Invert the definitionToSourceLocationMap.
sourceLocationToDefinitionMap = {}
diff --git a/compilerplugins/clang/finalclasses.py
b/compilerplugins/clang/finalclasses.py
index d2d4f695b8a1..f6c15ca2c87d 100755
--- a/compilerplugins/clang/finalclasses.py
+++ b/compilerplugins/clang/finalclasses.py
@@ -29,6 +29,9 @@ with open("workdir/loplugin.finalclasses.log") as txt:
parent = parent[7:]
inheritFromSet.add(parent);
+else:
+print( "unknown line: " + line)
+
tmpset = set()
for clazz in sorted(definitionSet - inheritFromSet):
file = definitionToFileDict[clazz]
diff --git a/compilerplugins/clang/mergeclasses.cxx
b/compilerplugins/clang/mergeclasses.cxx
index ca6cdeac74be..6035e7c275dc 100644
--- a/compilerplugins/clang/mergeclasses.cxx
+++ b/compilerplugins/clang/mergeclasses.cxx
@@ -148,7 +148,7 @@ bool MergeClasses::VisitCXXRecordDecl(const CXXRecordDecl*
decl)
}
if (decl->isThisDeclarationADefinition())
{
-SourceLocation spellingLocation =
compiler.getSourceManager().getSpellingLoc(decl->getCanonicalDecl()->getLocStart());
+SourceLocation spellingLocation =
compiler.getSourceManager().getSpellingLoc(decl->getLocStart());
std::string filename =
compiler.getSourceManager().getFilename(spellingLocation);
filename = filename.substr(strlen(SRCDIR));
std::string s = decl->getQualifiedNameAsString();
diff --git a/compilerplugins/clang/mergeclasses.py
b/compilerplugins/clang/mergeclasses.py
index e070ee49e81a..902acf8b9aa9 100755
--- a/compilerplugins/clang/mergeclasses.py
+++ b/compilerplugins/clang/mergeclasses.py
@@ -56,6 +56,7 @@ def extractModuleName(clazz):
with open("compilerplugins/clang/mergeclasses.results", "wt") as f:
# loop over defined, but not instantiated classes
for clazz in sorted(definitionSet - instantiatedSet):
+if clazz == "svl::IUndoManager": print parentChildDict[clazz]
# ignore classes without any children, and classes with more than one
child
if (clazz not in parentChildDict) or (len(parentChildDict[clazz]) !=
1):
continue
@@ -68,6 +69,8 @@ with open("compilerplugins/clang/mergeclasses.results", "wt")
as f:
if ("mutex" in clazz) or ("Mutex" in clazz):
continue
otherclazz = next(iter(parentChildDict[clazz]))
+if clazz == "svl::IUndoManager": print extractModuleName(clazz)
+if clazz == "svl::IUndoManager": print extractModuleName(otherclazz)
# exclude combinations that span modules because we often use those to
make cross-module dependencies more manageable.
if extractModuleName(clazz) != extractModuleName(otherclazz):
continue
diff --git a/compilerplugins/clang/singlevalfields.py
b/compilerplugins/clang/singlevalfields.py
index ae1025cb6e3d..b842929011b1 100755
--- a/compilerplugins/clang/singlevalfields.py
+++ b/compilerplugins/clang/singlevalfields.py
@@ -34,6 +34,8 @@ with io.open("workdir/loplugin.singlevalfields.log", "rb",
buffering=1024*1024)
if not fieldInfo in fieldAssignDict:
fieldAssignDict[fieldInfo] = set()
fieldAssignDict[fieldInfo].add(assignValue)
+else:
+print( "unknown line: " + line)
tmp1list = list()
for fieldInfo, assignValues in fieldAssignDict.iteritems():
diff --git a/compilerplugins/clang/virtualdown.py
b/compilerplugins/clang/virtualdown.py
index a1d5c6e80d9f..9c1346ff2831 100755
--- a/compilerplugins
[Libreoffice-commits] core.git: 2 commits - icon-themes/colibre sc/source
icon-themes/colibre/links.txt |2 +-
sc/source/filter/inc/rtfparse.hxx |2 +-
sc/source/filter/rtf/rtfparse.cxx | 14 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 0d7193bd2cd2f1bd24232095d7617f0764c58a9b
Author: Noel Grandin
Date: Wed Jul 11 12:27:05 2018 +0200
loplugin:useuniqueptr in ScRTFParser
Change-Id: I3192704e0dc594f7496978414a8c1d93a4e0e5bb
Reviewed-on: https://gerrit.libreoffice.org/57300
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/inc/rtfparse.hxx
b/sc/source/filter/inc/rtfparse.hxx
index 9817dca66536..dfe0a0a2abc7 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -55,7 +55,7 @@ private:
size_t mnCurPos;
ScRTFColTwips aColTwips;
-ScRTFCellDefault* pInsDefault;
+std::unique_ptr pInsDefault;
ScRTFCellDefault* pActDefault;
ScRTFCellDefault* pDefMerge;
sal_uLong nStartAdjust;
diff --git a/sc/source/filter/rtf/rtfparse.cxx
b/sc/source/filter/rtf/rtfparse.cxx
index e324ca18fe14..7744b485f8f4 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -47,12 +47,12 @@ ScRTFParser::ScRTFParser( EditEngine* pEditP ) :
long nMM = OutputDevice::LogicToLogic( 12, MapUnit::MapPoint,
MapUnit::Map100thMM );
pPool->SetPoolDefaultItem( SvxFontHeightItem( nMM, 100, EE_CHAR_FONTHEIGHT
) );
// Free-flying pInsDefault
-pInsDefault = new ScRTFCellDefault( pPool );
+pInsDefault.reset( new ScRTFCellDefault( pPool ) );
}
ScRTFParser::~ScRTFParser()
{
-delete pInsDefault;
+pInsDefault.reset();
maDefaultList.clear();
}
@@ -271,7 +271,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
nLastWidth = maDefaultList.back()->nTwips;
nColCnt = 0;
-if (pActDefault != pInsDefault)
+if (pActDefault != pInsDefault.get())
pActDefault = nullptr;
maDefaultList.clear();
pDefMerge = nullptr;
@@ -281,7 +281,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
break;
case RTF_CLMGF: // The first cell of cells to be merged
{
-pDefMerge = pInsDefault;
+pDefMerge = pInsDefault.get();
nRtfLastToken = pInfo->nToken;
}
break;
@@ -304,9 +304,9 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
bNewDef = true;
pInsDefault->nCol = nColCnt;
pInsDefault->nTwips = pInfo->nTokenValue; // Right cell border
-maDefaultList.push_back(
std::unique_ptr(pInsDefault) );
+maDefaultList.push_back( std::move(pInsDefault) );
// New free-flying pInsDefault
-pInsDefault = new ScRTFCellDefault( pPool );
+pInsDefault.reset( new ScRTFCellDefault( pPool ) );
if ( ++nColCnt > nColMax )
nColMax = nColCnt;
nRtfLastToken = pInfo->nToken;
@@ -330,7 +330,7 @@ void ScRTFParser::ProcToken( RtfImportInfo* pInfo )
NewCellRow();// before was no \intbl, bad behavior
// Broken RTF? Let's save what we can
if ( !pActDefault )
-pActDefault = pInsDefault;
+pActDefault = pInsDefault.get();
if ( pActDefault->nColOverlap > 0 )
{ // Not merged with preceding
mxActEntry->nCol = pActDefault->nCol;
commit c6dc541a59a22c59d23c43c3dfcf8ef2c96095a6
Author: andreas kainz
Date: Thu Jul 12 10:22:46 2018 +0200
tdf#117697 add missing section icon in search
Change-Id: Iea2b4a7c98a2751048dc2228ac550708bd22c238
Reviewed-on: https://gerrit.libreoffice.org/57318
Tested-by: Jenkins
Reviewed-by: andreas_kainz
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index e2a65d70dedd..590ed8309b0d 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1667,7 +1667,7 @@ sw/res/sr20002.png cmd/sc_inserttable.png
sw/res/sr20003.png cmd/sc_insertframe.png
sw/res/sr20004.png cmd/sc_showsinglepage.png
sw/res/sr20005.png cmd/sc_editdoc.png
-sw/res/sr20007.png sw/res/sc_insertsection.png
+sw/res/sr20007.png cmd/sc_insertsection.png
sw/res/sr20008.png cmd/sc_insertbookmark.png
sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png
sw/res/sr20010.png cmd/sc_drawchart.png
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/hsqldb
external/hsqldb/UnpackedTarball_hsqldb.mk|1 +
external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch | 14 ++
2 files changed, 15 insertions(+)
New commits:
commit 1d3f2ed0606cc971513dab5932ec7d1dd2a15f90
Author: Fridrich Štrba
Date: Thu Jul 12 11:57:07 2018 +0200
call System.runFinalizersOnExit by reflection, since it was removed in jdk11
Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk
b/external/hsqldb/UnpackedTarball_hsqldb.mk
index fc6c18f77c23..cbba770f19a0 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/i104901.patch \
external/hsqldb/patches/fdo36824.patch \
external/hsqldb/patches/limit_as_table_alias.patch \
+ external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
$(if $(HSQLDB_USE_JDBC_4_1),\
external/hsqldb/patches/jdbc-4.1.patch \
external/hsqldb/patches/multipleResultSets.patch \
diff --git a/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
new file mode 100644
index ..214dc2c2b2e1
--- /dev/null
+++ b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
@@ -0,0 +1,14 @@
+--- misc/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java2008-03-16
23:51:35.0 +0100
misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java 2018-07-12
11:46:57.997837180 +0200
+@@ -160,8 +160,9 @@
+ public static void runFinalizers() {
+
+ //#ifdef JAVA2FULL
+-System.runFinalizersOnExit(true);
+-
++try {
++System.class.getMethod("runFinalizersOnExit",
boolean.class).invoke(null, true);
++} catch (Exception e) {}
+ //#endif
+ }
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sd/source
sd/source/ui/view/drtxtob.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5f96055e76c2ec28cecc6abf743f0593a8487e8f
Author: Ilhan Yesil
Date: Fri Jun 8 10:49:41 2018 +0200
tdf#118063 Impress: Deselected spacing remained checked
The state of the attributes for spacing are now read and set
correctly.
Change-Id: I661c00e247b55c64ea39c03db77dab9fa0775852
Reviewed-on: https://gerrit.libreoffice.org/55455
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 5b72382516d94bc27321461297ded92f8af8112d)
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 55c5d34c0087..761ba9bfc1dc 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -578,12 +578,18 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
{
case 100:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, true ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, false ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, false ) );
break;
case 150:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, true ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, false ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, false ) );
break;
case 200:
rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, true ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, false ) );
+rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, false ) );
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf118361_RTLfootnoteSeparator.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|6 +
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |4 +
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
writerfilter/source/dmapper/PropertyMap.cxx | 32
++
6 files changed, 44 insertions(+)
New commits:
commit 37a27823ad181387943a3193236f2cca6d3ec0d6
Author: Justin Luth
Date: Wed Jun 27 16:19:57 2018 +0300
tdf#118361 sw ooxmlimport: set footnote separator alignment
If RTL is defined in the default (Normal) paragraph style,
then the footnote separator should be right-aligned.
In MSWORD, the alignment is not a property that is stored
with the footnote separator definition, and it is not a
page property like it is in LO.
The reverse needs to happen for LTR default paragraph style.
Based on my MSWORD observations, the only place where you can
indirectly set RightToLeft is in the "Normal" paragraph style.
That option is disabled in all of the other styles.
In LibreOffice, this is typically handled by the locale properties.
The default PAGE style's Footnotes - Position is RIGHT for
RTL locales, but LEFT for LTR locales.
It is kinda interesting that no one from a RTL locale complained
about wrongly-right-aligned footnote separator
from imported LTR .docx's.
None of this belongs in export code, since MSO doesn't support
specifying the location - it is just a consequence of the
RTL/LTR settings.
Change-Id: I07d26640116cb12cb9157cd1d902b4c774dbba26
Reviewed-on: https://gerrit.libreoffice.org/56532
Tested-by: Jenkins
Reviewed-by: Justin Luth
(cherry picked from commit 139750d7c295b84f4c42bf9409ccbdfb0c46b9f6)
Reviewed-on: https://gerrit.libreoffice.org/57214
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118361_RTLfootnoteSeparator.docx
b/sw/qa/extras/ooxmlexport/data/tdf118361_RTLfootnoteSeparator.docx
new file mode 100644
index ..8545cbf253d8
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf118361_RTLfootnoteSeparator.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index e086b1998aa7..9882bb943f7b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -84,6 +84,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112694, "tdf112694.docx")
CPPUNIT_ASSERT(!getProperty(aPageStyle, "HeaderIsOn"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf118361_RTLfootnoteSeparator,
"tdf118361_RTLfootnoteSeparator.docx")
+{
+uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footnote separator RTL", sal_Int16(2),
getProperty(aPageStyle, "FootnoteLineAdjust"));
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf115861, "tdf115861.docx")
{
// Second item in the paragraph enumeration was a table, 2nd paragraph was
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 096a711d113b..347a444f1cf7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -660,6 +660,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82173_footnoteStyle,
"tdf82173_footnoteStyle.doc
xPageStyle.set(getStyles("CharacterStyles")->getByName("Footnote anchor"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL( sal_Int32(58), getProperty< sal_Int32
>(xPageStyle, "CharEscapementHeight") );
CPPUNIT_ASSERT_EQUAL( sal_Int32(0x00FF00), getProperty< sal_Int32
>(xPageStyle, "CharColor") );
+
+//tdf#118361 - in RTL locales, the footnote separator should still be left
aligned.
+uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footnote separator LTR", sal_Int16(0),
getProperty(aPageStyle, "FootnoteLineAdjust"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf82173_endnoteStyle,
"tdf82173_endnoteStyle.docx")
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 592063a4d312..f515d5118636 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -172,6 +172,7 @@ OUString getPropertyName( PropertyIds eId )
case PROP_FOOTER_IS_SHARED :sName = "FooterIsShared"; break;
case PROP_FOOTER_IS_ON :sName = "FooterIsOn"; break;
case PROP_FOOTNOTE_COUNTING:sName = "FootnoteCounting"; break;
+case PROP_FOOTNOTE_LINE_ADJUST :sName = "FootnoteLineAdjust";
break;
case PROP_WIDTH:sName = "Width"; break;
case PROP_HEIGHT :sName = "Height"; break;
case PROP
[Libreoffice-commits] core.git: sc/source
sc/source/filter/html/htmlpars.cxx | 49 -
sc/source/filter/inc/htmlpars.hxx |8 +++---
2 files changed, 26 insertions(+), 31 deletions(-)
New commits:
commit 510033783a9921eef507d424fc5adf6e2696bc4a
Author: Noel Grandin
Date: Wed Jul 11 12:46:41 2018 +0200
loplugin:useuniqueptr in ScHTMLLayoutParser
bitfields and make_unique don't play nice together, so bFirstRow
had to become a regular bool field.
Change-Id: I990a0ddcbbef5e826fbe26736e68ebce55cebb4c
Reviewed-on: https://gerrit.libreoffice.org/57303
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 64529b39c9d7..04ba99cdaef0 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -214,12 +214,12 @@ ScHTMLLayoutParser::ScHTMLLayoutParser(
nColOffset(0),
nColOffsetStart(0),
nOffsetTolerance( SC_HTML_OFFSET_TOLERANCE_SMALL ),
-bTabInTabCell( false ),
bFirstRow( true ),
+bTabInTabCell( false ),
bInCell( false ),
bInTitle( false )
{
-MakeColNoRef( pLocalColOffset, 0, 0, 0, 0 );
+MakeColNoRef( pLocalColOffset.get(), 0, 0, 0, 0 );
MakeColNoRef( &maColOffset, 0, 0, 0, 0 );
}
@@ -227,18 +227,17 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
{
while ( !aTableStack.empty() )
{
-ScHTMLTableStackEntry* pS = aTableStack.top();
-aTableStack.pop();
-if ( pS->pLocalColOffset != pLocalColOffset )
+ScHTMLTableStackEntry* pS = aTableStack.top().get();
+if ( pS->pLocalColOffset != pLocalColOffset.get() )
delete pS->pLocalColOffset;
-delete pS;
+aTableStack.pop();
}
-delete pLocalColOffset;
+pLocalColOffset.reset();
if ( pTables )
{
for( OuterMap::const_iterator it = pTables->begin(); it !=
pTables->end(); ++it)
delete it->second;
-delete pTables;
+pTables.reset();
}
}
@@ -646,7 +645,7 @@ void ScHTMLLayoutParser::SetWidths()
pLocalColOffset->clear();
for ( nCol = 0; nCol <= nColsPerRow; ++nCol, nOff = nOff + nWidth )
{
-MakeColNoRef( pLocalColOffset, nOff, 0, 0, 0 );
+MakeColNoRef( pLocalColOffset.get(), nOff, 0, 0, 0 );
}
nTableWidth = static_cast(pLocalColOffset->back() -
pLocalColOffset->front());
for ( size_t i = nFirstTableCell, nListSize = maList.size(); i <
nListSize; ++i )
@@ -736,7 +735,7 @@ void ScHTMLLayoutParser::SetWidths()
pLocalColOffset->clear();
for ( nCol = 0; nCol <= nColsPerRow; nCol++ )
{
-MakeColNoRef( pLocalColOffset, pOffsets[nCol], 0, 0, 0 );
+MakeColNoRef( pLocalColOffset.get(), pOffsets[nCol], 0, 0, 0 );
}
nTableWidth = pOffsets[nColsPerRow] - pOffsets[0];
@@ -800,7 +799,7 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE )
}
pE->nOffset = nColOffset;
sal_uInt16 nWidth = GetWidth( pE );
-MakeCol( pLocalColOffset, pE->nOffset, nWidth, nOffsetTolerance,
nOffsetTolerance );
+MakeCol( pLocalColOffset.get(), pE->nOffset, nWidth, nOffsetTolerance,
nOffsetTolerance );
if ( pE->nWidth )
pE->nWidth = nWidth;
nColOffset = pE->nOffset + nWidth;
@@ -1032,8 +1031,8 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
{ // Table in Table
sal_uInt16 nTmpColOffset = nColOffset; // Will be changed in Colonize()
Colonize(mxActEntry.get());
-aTableStack.push( new ScHTMLTableStackEntry(
-mxActEntry, xLockedList, pLocalColOffset, nFirstTableCell,
+aTableStack.push( o3tl::make_unique(
+mxActEntry, xLockedList, pLocalColOffset.get(), nFirstTableCell,
nRowCnt, nColCntStart, nMaxCol, nTable,
nTableWidth, nColOffset, nColOffsetStart,
bFirstRow ) );
@@ -1088,8 +1087,8 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
CloseEntry( pInfo );
NextRow( pInfo );
}
-aTableStack.push( new ScHTMLTableStackEntry(
-mxActEntry, xLockedList, pLocalColOffset, nFirstTableCell,
+aTableStack.push( o3tl::make_unique(
+mxActEntry, xLockedList, pLocalColOffset.get(), nFirstTableCell,
nRowCnt, nColCntStart, nMaxCol, nTable,
nTableWidth, nColOffset, nColOffsetStart,
bFirstRow ) );
@@ -1122,8 +1121,8 @@ void ScHTMLLayoutParser::TableOn( HtmlImportInfo* pInfo )
bFirstRow = true;
nFirstTableCell = maList.size();
-pLocalColOffset = new ScHTMLColOffset;
-MakeColNoRef( pLocalColOffset, nColOffsetStart, 0, 0, 0 );
+pLocalColOffset.reset( new ScHTMLColOffset );
+MakeColNoRef( pLocalColOffset.get(), nColOffsetStart, 0, 0, 0 );
}
void ScHTMLLayoutParser::TableOff( const HtmlImportI
[Libreoffice-commits] online.git: Makefile.am
Makefile.am |1 - 1 file changed, 1 deletion(-) New commits: commit b152e021b3428b3b1f5a3189c9107a2fc6ac23bc Author: Tor Lillqvist Date: Thu Jul 12 11:46:56 2018 +0300 Drop noise output Make prints the sudo setcap commands it executes, no need to additionally echo "Set required capabilities". Especially as "set" can be misunderstood as being in the imperative mood, telling the developer to do something, instead of being past tense telling what was done on the previous line. Change-Id: I1138fa28a4d08b57d2d0e012dcfd778b423c diff --git a/Makefile.am b/Makefile.am index 1618e78b7..d12a8f24f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -351,7 +351,6 @@ all-local: loolforkit @TILECACHE_PATH@ @JAILS_PATH@ $(SYSTEM_STAMP) if ENABLE_SETCAP sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolforkit sudo @SETCAP@ cap_sys_admin=ep loolmount - echo "Set required capabilities" else echo "Skipping capability setting" endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/sdi
svx/sdi/svx.sdi | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit cdd373e593557984dcd90c94bbb9b053655c1b83 Author: Xisco Fauli Date: Sun Jul 8 15:51:38 2018 +0200 tdf#101778: Disable crop and rotate in read-only mode Change-Id: I26d6e98a768d40e97209e0a646cbb834d2635f9a Reviewed-on: https://gerrit.libreoffice.org/57158 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 5fcf5d7585b4..d9be1425c8f4 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -4261,7 +4261,7 @@ SfxVoidItem RotateLeft SID_ROTATE_GRAPHIC_LEFT [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4277,7 +4277,7 @@ SfxVoidItem Rotate180 SID_ROTATE_GRAPHIC_180 [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4293,7 +4293,7 @@ SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4310,7 +4310,7 @@ SfxVoidItem RotateReset SID_ROTATE_GRAPHIC_RESET [ AutoUpdate = FALSE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, @@ -4327,7 +4327,7 @@ SfxBoolItem Crop SID_OBJECT_CROP [ AutoUpdate = TRUE, FastCall = FALSE, -ReadOnlyDoc = TRUE, +ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: winaccessibility/source writerfilter/source writerperfect/source xmlhelp/source xmloff/source xmlscript/test xmlsecurity/qa xmlsecurity/source xmlsecurity/workben
winaccessibility/source/service/AccTopWindowListener.cxx |2 ++ winaccessibility/source/service/msaaservice_impl.cxx |1 + writerfilter/source/dmapper/CellMarginHandler.cxx |1 + writerfilter/source/dmapper/DomainMapper.cxx |1 + writerfilter/source/dmapper/DomainMapperTableHandler.cxx |1 + writerfilter/source/dmapper/DomainMapperTableManager.cxx |1 + writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 + writerfilter/source/dmapper/FontTable.cxx |1 + writerfilter/source/dmapper/GraphicHelpers.cxx|1 + writerfilter/source/dmapper/GraphicImport.cxx |1 + writerfilter/source/dmapper/NumberingManager.cxx |1 + writerfilter/source/dmapper/OLEHandler.cxx|1 + writerfilter/source/dmapper/PropertyMap.cxx |1 + writerfilter/source/dmapper/SdtHelper.cxx |1 + writerfilter/source/dmapper/SmartTagHandler.cxx |2 ++ writerfilter/source/dmapper/StyleSheetTable.cxx |1 + writerfilter/source/dmapper/TableManager.cxx |2 ++ writerfilter/source/dmapper/WrapPolygonHandler.cxx|2 ++ writerfilter/source/filter/RtfFilter.cxx |1 + writerfilter/source/filter/WriterFilter.cxx |2 ++ writerfilter/source/ooxml/Handler.cxx |2 ++ writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |1 + writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |1 + writerfilter/source/ooxml/OOXMLParserState.cxx|2 ++ writerfilter/source/rtftok/rtfdispatchdestination.cxx |1 + writerfilter/source/rtftok/rtfdispatchflag.cxx|2 ++ writerfilter/source/rtftok/rtfdispatchsymbol.cxx |2 ++ writerfilter/source/rtftok/rtfdispatchvalue.cxx |1 + writerfilter/source/rtftok/rtfdocumentimpl.cxx|1 + writerfilter/source/rtftok/rtfsdrimport.cxx |1 + writerfilter/source/rtftok/rtftokenizer.cxx |1 + writerperfect/source/calc/MSWorksCalcImportFilter.cxx |1 + writerperfect/source/common/WPXSvInputStream.cxx |1 + writerperfect/source/writer/EBookImportFilter.cxx |1 + writerperfect/source/writer/EPUBPackage.cxx |1 + writerperfect/source/writer/MSWorksImportFilter.cxx |1 + writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx |2 ++ writerperfect/source/writer/exp/XMLTextFrameContext.cxx |2 ++ writerperfect/source/writer/exp/txtparai.cxx |2 ++ writerperfect/source/writer/exp/xmlfmt.cxx|2 ++ writerperfect/source/writer/exp/xmltbli.cxx |2 ++ xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx |1 + xmlhelp/source/treeview/tvread.cxx|1 + xmloff/source/chart/SchXMLAxisContext.cxx |1 + xmloff/source/chart/SchXMLChartContext.cxx|1 + xmloff/source/chart/SchXMLExport.cxx |1 + xmloff/source/chart/SchXMLImport.cxx |1 + xmloff/source/chart/SchXMLLegendContext.cxx |2 ++ xmloff/source/chart/SchXMLPlotAreaContext.cxx |1 + xmloff/source/chart/SchXMLSeries2Context.cxx |1 + xmloff/source/chart/SchXMLSeriesHelper.cxx|1 + xmloff/source/chart/SchXMLTableContext.cxx|1 + xmloff/source/chart/SchXMLTools.cxx |1 + xmloff/source/chart/XMLChartStyleContext.cxx |2 ++ xmloff/source/chart/contexts.cxx |2 ++ xmloff/source/core/DocumentSettingsContext.cxx|1 + xmloff/source/core/DomBuilderContext.cxx |1 + xmloff/source/core/DomExport.cxx |1 + xmloff/source/core/RDFaImportHelper.cxx |1 + xmloff/source/core/SettingsExportHelper.cxx |1 + xmloff/source/core/SvXMLAttrCollection.cxx|1 + xmloff/source/core/i18nmap.cxx|1 + xmloff/source/core/nmspmap.cxx|1 + xmloff/source/core/xmlerror.cxx |1 + xmloff/source/core/xmlexp.cxx |1 + xmloff/source/core/xmlimp.cxx
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/XclImpChangeTrack.hxx |4 ++--
sc/source/filter/xcl97/XclImpChangeTrack.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7d710ee08fbaecd376a8b731965e805ad0f4c59a
Author: Noel Grandin
Date: Wed Jul 11 12:29:58 2018 +0200
loplugin:useuniqueptr in XclImpChangeTrack
Change-Id: I360720b5c0402982e58416f9c902388034e5ecee
Reviewed-on: https://gerrit.libreoffice.org/57301
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx
b/sc/source/filter/inc/XclImpChangeTrack.hxx
index 9f374472e76c..1305f2064fee 100644
--- a/sc/source/filter/inc/XclImpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclImpChangeTrack.hxx
@@ -55,8 +55,8 @@ private:
OUStringsOldUsername;
std::unique_ptr pChangeTrack;
-tools::SvRef xInStrm;// input stream
-XclImpStream* pStrm; // stream import class
+tools::SvRef xInStrm;// input stream
+std::unique_ptr pStrm; // stream import class
sal_uInt16 nTabIdCount;
boolbGlobExit; // global exit loop
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 8a943ce5aa79..c7dc9dbb1a8b 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -56,7 +56,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot&
rRoot, const XclImpStrea
if( (xInStrm->GetErrorCode() == ERRCODE_NONE) && (nStreamLen !=
STREAM_SEEK_TO_END) )
{
xInStrm->Seek( STREAM_SEEK_TO_BEGIN );
-pStrm = new XclImpStream( *xInStrm, GetRoot() );
+pStrm.reset( new XclImpStream( *xInStrm, GetRoot() ) );
pStrm->CopyDecrypterFrom( rBookStrm );
pChangeTrack.reset(new ScChangeTrack( &GetDocRef() ));
@@ -71,7 +71,7 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot&
rRoot, const XclImpStrea
XclImpChangeTrack::~XclImpChangeTrack()
{
pChangeTrack.reset();
-delete pStrm;
+pStrm.reset();
}
void XclImpChangeTrack::DoAcceptRejectAction( ScChangeAction* pAction )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/filelists.pm |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ffc08c6819a986086e9015ede3863c039d419490
Author: Michael Stahl
Date: Wed Jul 11 12:09:07 2018 +0200
installer: exit on the other errors in resolve_filelist_flag too
Nobody reads these error messages if the build succeeds.
Change-Id: Ib1e52bf188d0da2bc35a0d2d2f79fff409e15977
Reviewed-on: https://gerrit.libreoffice.org/57270
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/solenv/bin/modules/installer/filelists.pm
b/solenv/bin/modules/installer/filelists.pm
index 2422e7415a6b..1320a89e6ee2 100644
--- a/solenv/bin/modules/installer/filelists.pm
+++ b/solenv/bin/modules/installer/filelists.pm
@@ -53,6 +53,7 @@ sub resolve_filelist_flag
if ((index $path, $outdir) != 0)
{
installer::logger::print_error("file '$path' is not in
'$outdir'");
+$error = 1;
}
if ($path =~ '\/\/')
{
@@ -68,6 +69,7 @@ sub resolve_filelist_flag
if (!-e $path)
{
installer::logger::print_error("file '$path' does
not exist");
+$error = 1;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/XclExpChangeTrack.hxx |4 ++--
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 11 +--
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 592eb9217a52632e4271db3628c5aafb0cefbee8
Author: Noel Grandin
Date: Wed Jul 11 12:24:18 2018 +0200
loplugin:useuniqueptr in XclExpChTrTabId
and write the buffer in one go in SaveCont
Change-Id: Id41bb132ff3b4176b1fcb1798d10191c3d45fffc
Reviewed-on: https://gerrit.libreoffice.org/57298
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 2f5eed82b3da..b20c1e167b21 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -319,10 +319,10 @@ public:
class XclExpChTrTabId : public ExcRecord
{
private:
-sal_uInt16* pBuffer;
+std::unique_ptr pBuffer;
sal_uInt16 nTabCount;
-void Clear() { delete[] pBuffer; pBuffer = nullptr; }
+void Clear() { pBuffer.reset(); }
virtual voidSaveCont( XclExpStream& rStrm ) override;
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index cde364769a7e..3035a774ac36 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -609,8 +609,8 @@ void XclExpChTrTabIdBuffer::Remove()
XclExpChTrTabId::XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer )
: nTabCount( rBuffer.GetBufferCount() )
{
-pBuffer = new sal_uInt16[ nTabCount ];
-rBuffer.GetBufferCopy( pBuffer );
+pBuffer.reset( new sal_uInt16[ nTabCount ] );
+rBuffer.GetBufferCopy( pBuffer.get() );
}
XclExpChTrTabId::~XclExpChTrTabId()
@@ -622,16 +622,15 @@ void XclExpChTrTabId::Copy( const XclExpChTrTabIdBuffer&
rBuffer )
{
Clear();
nTabCount = rBuffer.GetBufferCount();
-pBuffer = new sal_uInt16[ nTabCount ];
-rBuffer.GetBufferCopy( pBuffer );
+pBuffer.reset( new sal_uInt16[ nTabCount ] );
+rBuffer.GetBufferCopy( pBuffer.get() );
}
void XclExpChTrTabId::SaveCont( XclExpStream& rStrm )
{
rStrm.EnableEncryption();
if( pBuffer )
-for( sal_uInt16* pElem = pBuffer; pElem < (pBuffer + nTabCount);
pElem++ )
-rStrm << *pElem;
+rStrm.Write(pBuffer.get(), nTabCount);
else
for( sal_uInt16 nIndex = 1; nIndex <= nTabCount; nIndex++ )
rStrm << nIndex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Hi, On Wed, Jul 11, 2018 at 05:22:01PM +0100, Michael Meeks wrote: > + Windows tinderbox/build-bot owners to parallel install VS2017 This is now required on master, if you admin a tinderbox that builds master, then please make sure that VS2017 is installed. If you have no time to install VS2017 now, please consider not building master till you have the required toolchain. (Jenkins slaves have it installed.) Thanks, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/karasa_jaga
icon-themes/karasa_jaga/cmd/32/fontdialog.png |binary icon-themes/karasa_jaga/cmd/32/subscript.png |binary icon-themes/karasa_jaga/cmd/32/superscript.png |binary icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png |binary icon-themes/karasa_jaga/cmd/lc_charfontname.png|binary icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/lc_exporttopdf.png |binary icon-themes/karasa_jaga/cmd/lc_fontdialog.png |binary icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png |binary icon-themes/karasa_jaga/cmd/lc_protect.png |binary icon-themes/karasa_jaga/cmd/lc_signpdf.png |binary icon-themes/karasa_jaga/cmd/lc_subscript.png |binary icon-themes/karasa_jaga/cmd/lc_superscript.png |binary icon-themes/karasa_jaga/cmd/lc_tablenumberformatdialog.png |binary icon-themes/karasa_jaga/cmd/lc_unsetcellsreadonly.png |binary icon-themes/karasa_jaga/cmd/sc_alignbottom.png |binary icon-themes/karasa_jaga/cmd/sc_aligntop.png|binary icon-themes/karasa_jaga/cmd/sc_alignverticalcenter.png |binary icon-themes/karasa_jaga/cmd/sc_charfontname.png|binary icon-themes/karasa_jaga/cmd/sc_exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/sc_exporttopdf.png |binary icon-themes/karasa_jaga/cmd/sc_fontdialog.png |binary icon-themes/karasa_jaga/cmd/sc_protect.png |binary icon-themes/karasa_jaga/cmd/sc_signpdf.png |binary icon-themes/karasa_jaga/cmd/sc_subscript.png |binary icon-themes/karasa_jaga/cmd/sc_superscript.png |binary icon-themes/karasa_jaga/cmd/sc_wraptext.png|binary icon-themes/karasa_jaga/links.txt | 18 + 28 files changed, 18 insertions(+) New commits: commit 0f587b82ea8da631bb4a5a394d0145d91aef486f Author: Rizal Muttaqin Date: Wed Jul 11 23:02:32 2018 +0700 KJ: ^ some table related, font, align icons etc, + PivotTable menu icon Change-Id: Icfa28a165d6697ca105b95fcc846ae05edbbdb11 Reviewed-on: https://gerrit.libreoffice.org/57282 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/karasa_jaga/cmd/32/fontdialog.png b/icon-themes/karasa_jaga/cmd/32/fontdialog.png index dc1cfd1df84b..ce394179effc 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/fontdialog.png and b/icon-themes/karasa_jaga/cmd/32/fontdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/subscript.png b/icon-themes/karasa_jaga/cmd/32/subscript.png index fba47feceaa0..38ce59806945 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/subscript.png and b/icon-themes/karasa_jaga/cmd/32/subscript.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/superscript.png b/icon-themes/karasa_jaga/cmd/32/superscript.png index da6ee50201ca..70797ef652ac 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/superscript.png and b/icon-themes/karasa_jaga/cmd/32/superscript.png differ diff --git a/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png b/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png index b6b5d7fcbba6..5917b6611601 100644 Binary files a/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png and b/icon-themes/karasa_jaga/cmd/32/tablenumberformatdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_charfontname.png b/icon-themes/karasa_jaga/cmd/lc_charfontname.png index e98b897e4582..0a81c8a7feed 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_charfontname.png and b/icon-themes/karasa_jaga/cmd/lc_charfontname.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png b/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png index 3637b0827bde..039233f5dbe5 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png and b/icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png b/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png index 35e5dccd162d..e21c1eebcb38 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png and b/icon-themes/karasa_jaga/cmd/lc_exporttopdf.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_fontdialog.png b/icon-themes/karasa_jaga/cmd/lc_fontdialog.png index b5cb9793a772..e657a1bff025 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_fontdialog.png and b/icon-themes/karasa_jaga/cmd/lc_fontdialog.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png b/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png index aca6ce8d0021..c83bf759792a 100644 Binary files a/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png and b/icon-themes/karasa_jaga/cmd/lc_numberformatdecimal.png differ diff --git a/icon-themes/karasa_jaga/cmd/lc_protect.png b/icon-themes/karasa_jaga/cmd/lc_protect.png index a95f7e282aad..8
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uno/unotxdoc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0853b05b1fabb231a7d57d811c5a06ee542d3295
Author: Thorsten Behrens
Date: Thu Jul 12 00:11:30 2018 +0200
Make setPagePrintSettings() accept IsLandscape again
Regression from 80c35d97b9b3b60a091aae77de0ffef38cbf531a - invert
the check for boost::optional validity.
Change-Id: If4e041e1fe349c1fcb2c74b2e5780bf57300486f
Reviewed-on: https://gerrit.libreoffice.org/57309
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 31650d253f7f..73e69275a698 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1147,7 +1147,7 @@ void SwXTextDocument::setPagePrintSettings(const
Sequence< beans::PropertyValue
else if(sName == "IsLandscape")
{
auto b = o3tl::tryAccess(rVal);
-bException = bool(b);
+bException = !b;
if (b)
{
aData.SetLandscape(*b);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 130 +++
1 file changed, 26 insertions(+), 104 deletions(-)
New commits:
commit cd6a441a77d1d34a79c928b54ae40a43fb09825b
Author: Tor Lillqvist
Date: Tue Jun 26 13:39:25 2018 +0300
Bin support for Visual Studio 2015, leaving just 2017 for now
Change-Id: I6e604a8a463ff453b82ca60f1bf92b7c73870482
Reviewed-on: https://gerrit.libreoffice.org/56455
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/configure.ac b/configure.ac
index 8c82c17f0ce6..23b3fd4953c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2033,9 +2033,9 @@ libo_FUZZ_ARG_WITH(doxygen,
,with_doxygen=yes)
AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2015/2017>],
+AS_HELP_STRING([--with-visual-studio=<2017>],
[Specify which Visual Studio version to use in case several are
- installed. If not specified, defaults to 2015.]),
+ installed. Currently only 2017 is supported.]),
,)
AC_ARG_WITH(windows-sdk,
@@ -3261,8 +3261,6 @@ map_vs_year_to_version()
unset vsversion
case $1 in
-2015)
-vsversion=14.0;;
2017)
vsversion=15.0;;
*)
@@ -3281,21 +3279,17 @@ vs_versions_to_check()
map_vs_year_to_version "$1"
vsversions=$vsversion
else
-# By default we prefer 2015/2017, in this order
-vsversions="14.0 15.0"
+# We accept only 2017
+vsversions="15.0"
fi
}
win_get_env_from_vsvars32bat()
{
WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
-if test $vcnum = "150"; then
- # Also seems to be located in another directory under the same name:
vsvars32.bat
- #
https://github.com/bazelbuild/bazel/blob/master/src/main/native/build_windows_jni.sh#L56-L57
- printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n'
"$(cygpath -w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH
-else
- printf '@call "%s/../Common7/Tools/vsvars32.bat"\r\n' "$(cygpath -w
$VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH
-fi
+# Also seems to be located in another directory under the same name:
vsvars32.bat
+#
https://github.com/bazelbuild/bazel/blob/master/src/main/native/build_windows_jni.sh#L56-L57
+printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath
-w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH
printf '@setlocal\r\n@echo %%%s%%\r\n@endlocal\r\n' "$1" >>
$WRAPPERBATCHFILEPATH
chmod +x $WRAPPERBATCHFILEPATH
_win_get_env_from_vsvars32bat=$("$WRAPPERBATCHFILEPATH" | tr -d '\r')
@@ -3318,11 +3312,7 @@ find_ucrt()
fi
if test -z "$UCRTSDKDIR"; then
ide_env_dir="$VC_PRODUCT_DIR/../Common7/Tools/"
-if test "$vcnum" = "150"; then
- ide_env_file="${ide_env_dir}VsDevCmd.bat"
-else
- ide_env_file="${ide_env_dir}/vsvars32.bat"
-fi
+ide_env_file="${ide_env_dir}VsDevCmd.bat"
if test -f "$ide_env_file"; then
PathFormat "$(win_get_env_from_vsvars32bat UniversalCRTSdkDir)"
UCRTSDKDIR=$formatted_path
@@ -3342,7 +3332,7 @@ find_ucrt()
find_msvc()
{
-# Find Visual C++ 2015/2017
+# Find Visual C++ 2017
# Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
@@ -3356,7 +3346,6 @@ find_msvc()
vctest=$regvalue
break
fi
-# As always MSVC 15.0 is special here
reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/SxS/VS7/$ver
if test -n "$regvalue"; then
AC_MSG_RESULT([found: $regvalue])
@@ -3368,10 +3357,6 @@ find_msvc()
if test -n "$vctest"; then
vcnumwithdot=$ver
case "$vcnumwithdot" in
-14.0)
-vcyear=2015
-vcnum=140
-;;
15.0)
vcyear=2017
vcnum=150
@@ -3392,7 +3377,7 @@ if test "$_os" = "WINNT"; then
if test -n "$with_visual_studio"; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio installation
found])
else
-AC_MSG_ERROR([No Visual Studio 2015/2017 installation found])
+AC_MSG_ERROR([No Visual Studio 2017 installation found])
fi
fi
@@ -3445,16 +3430,12 @@ if test "$_os" = "WINNT"; then
AC_MSG_RESULT([found: $regvalue])
MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
else
-if test $vcnum = "150"; then
-if test "$BITNESS_OVERRIDE" = ""; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
-else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin/amd64"
-fi
-MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
+if test "$BITNESS_OVERRIDE" = ""; then
+regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
else
-AC_MSG_ERROR([No msbuild found, Visual St
[Libreoffice-commits] core.git: external/pdfium svx/source
external/pdfium/0001-Add-FPDFText_GetMatrix-API.patch.1
| 109 ++
external/pdfium/0001-svx-import-PDF-text-using-PDFium.patch.2
| 177 --
external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
| 101 -
external/pdfium/0004-svx-support-PDF-text-color.patch.2
| 59 +--
external/pdfium/0007-svx-improved-text-importing-from-PDF.patch.2
| 62 ---
external/pdfium/0008-svx-correct-the-positioning-of-PDF-Paths-and-the-str.patch.2
| 76
external/pdfium/0009-svx-support-color-text-for-imported-PDFs.patch.2
| 35 -
external/pdfium/0010-svx-support-importing-forms-from-PDFs.patch.2
|4
external/pdfium/0012-svx-import-processed-PDF-text.patch.2
| 12
external/pdfium/0013-svx-cleanup-pdfium-importer.patch.2
| 130 ---
external/pdfium/0014-svx-update-PDFium-patch-and-code.patch.2
| 17
external/pdfium/0015-svx-set-the-font-name-of-imported-PDF-text.patch.2
| 22 -
external/pdfium/UnpackedTarball_pdfium.mk
|6
svx/source/svdraw/svdpdf.cxx
|2
14 files changed, 167 insertions(+), 645 deletions(-)
New commits:
commit 4ed059490d02afcbe359ab39def6729beeab6196
Author: Miklos Vajna
Date: Wed Jul 11 21:02:29 2018 +0200
pdfium: replace FPDFTextObj_GetMatrix() patch with backport
Also remove unused FPDFTextObj_GetUnicode() and FPDFTextObj_GetText().
Change-Id: I4b1f88f878f2754ff790b67d286a9d5366acc641
Reviewed-on: https://gerrit.libreoffice.org/57292
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/external/pdfium/0001-Add-FPDFText_GetMatrix-API.patch.1
b/external/pdfium/0001-Add-FPDFText_GetMatrix-API.patch.1
new file mode 100644
index ..40b19a235254
--- /dev/null
+++ b/external/pdfium/0001-Add-FPDFText_GetMatrix-API.patch.1
@@ -0,0 +1,109 @@
+From 21ef03b50ef64d25a05d7ac047c0e382237c9b15 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna
+Date: Tue, 19 Jun 2018 15:45:42 +
+Subject: [PATCH] Add FPDFText_GetMatrix() API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is similar to FPDFPath_GetMatrix(), but works on text, not path
+objects.
+
+Change-Id: If268362b7fa4398124b953e0e2225074523f5f65
+Reviewed-on: https://pdfium-review.googlesource.com/35434
+Reviewed-by: dsinclair
+Reviewed-by: Nicolás Peña Moreno
+Commit-Queue: Nicolás Peña Moreno
+---
+ fpdfsdk/fpdf_edit_embeddertest.cpp | 17 +
+ fpdfsdk/fpdf_edittext.cpp | 30 ++
+ public/fpdf_edit.h | 25 +
+ 3 files changed, 72 insertions(+)
+
+diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
+index 2996a505e..c38873faa 100644
+--- a/fpdfsdk/fpdf_edittext.cpp
b/fpdfsdk/fpdf_edittext.cpp
+@@ -398,6 +398,11 @@ CPDF_Font* LoadCompositeFont(CPDF_Document* pDoc,
+ return pDoc->LoadFont(fontDict);
+ }
+
++CPDF_TextObject* CPDFTextObjectFromFPDFPageObject(FPDF_PAGEOBJECT
page_object) {
++ auto* obj = CPDFPageObjectFromFPDFPageObject(page_object);
++ return obj ? obj->AsText() : nullptr;
++}
++
+ } // namespace
+
+ FPDF_EXPORT FPDF_PAGEOBJECT FPDF_CALLCONV
+@@ -475,6 +480,31 @@ FPDFText_SetFillColor(FPDF_PAGEOBJECT text_object,
+ return FPDFPageObj_SetFillColor(text_object, R, G, B, A);
+ }
+
++FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFText_GetMatrix(FPDF_PAGEOBJECT text,
++ double* a,
++ double* b,
++ double* c,
++ double* d,
++ double* e,
++ double* f) {
++ if (!text || !a || !b || !c || !d || !e || !f)
++return false;
++
++ CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
++ if (!pTextObj)
++return false;
++
++ CFX_Matrix text_matrix = pTextObj->GetTextMatrix();
++ *a = text_matrix.a;
++ *b = text_matrix.b;
++ *c = text_matrix.c;
++ *d = text_matrix.d;
++ *e = text_matrix.e;
++ *f = text_matrix.f;
++
++ return true;
++}
++
+ FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font) {
+ CPDF_Font* pFont = CPDFFontFromFPDFFont(font);
+ if (!pFont)
+diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
+index c0766a33b..5a2eeb449 100644
+--- a/public/fpdf_edit.h
b/public/fpdf_edit.h
+@@ -954,6 +954,31 @@ FPDFText_SetFillColor(FPDF_PAGEOBJECT text_object,
+ unsigned int B,
+ unsigned int A);
+
++// Experimental API.
++// Get the transform matrix of a text objec
