[Libreoffice-commits] core.git: codemaker/source cppuhelper/source cppu/source dbaccess/source desktop/source
codemaker/source/javamaker/javatype.cxx| 60 ++---
cppu/source/uno/lbmap.cxx |5 -
cppuhelper/source/propertysetmixin.cxx |8 +-
dbaccess/source/core/dataaccess/datasource.cxx |5 -
dbaccess/source/ui/browser/genericcontroller.cxx |2
dbaccess/source/ui/dlg/ConnectionHelper.cxx|2
dbaccess/source/ui/dlg/DbAdminImpl.cxx |4 -
dbaccess/source/ui/dlg/DbAdminImpl.hxx |1
dbaccess/source/ui/dlg/adminpages.cxx |2
dbaccess/source/ui/dlg/dsselect.cxx|6 +-
dbaccess/source/ui/dlg/dsselect.hxx|4 -
dbaccess/source/ui/dlg/odbcconfig.cxx |2
dbaccess/source/ui/dlg/odbcconfig.hxx |3 -
dbaccess/source/ui/inc/commontypes.hxx |4 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx |9 +--
desktop/source/deployment/registry/dp_registry.cxx |3 -
16 files changed, 54 insertions(+), 66 deletions(-)
New commits:
commit 5437eb15ad3975b11c6eefe77dfd6687e0e73f81
Author: Arkadiy Illarionov
Date: Thu Jun 28 23:32:05 2018 +0300
tdf#96099 Remove trivial std::map typedefs in [cd]*
Change-Id: I043d265d3d73a3e16f05d5ca7e29a09341651d82
Reviewed-on: https://gerrit.libreoffice.org/56639
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/codemaker/source/javamaker/javatype.cxx
b/codemaker/source/javamaker/javatype.cxx
index 71f4faa16117..5530392b278b 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -94,8 +94,6 @@ OUString createUnoName(
return buf.makeStringAndClear();
}
-typedef std::set< OUString > Dependencies;
-
enum SpecialType {
SPECIAL_TYPE_NONE,
SPECIAL_TYPE_ANY,
@@ -128,7 +126,7 @@ struct PolymorphicUnoType {
SpecialType translateUnoTypeToDescriptor(
rtl::Reference< TypeManager > const & manager, OUString const & type,
-bool array, bool classType, Dependencies * dependencies,
+bool array, bool classType, std::set * dependencies,
OStringBuffer * descriptor, OStringBuffer * signature,
bool * needsSignature, PolymorphicUnoType * polymorphicUnoType);
@@ -136,7 +134,7 @@ SpecialType translateUnoTypeToDescriptor(
rtl::Reference< TypeManager > const & manager,
codemaker::UnoType::Sort sort, OUString const & nucleus, sal_Int32 rank,
std::vector< OUString > const & arguments, bool array, bool classType,
-Dependencies * dependencies, OStringBuffer * descriptor,
+std::set * dependencies, OStringBuffer * descriptor,
OStringBuffer * signature, bool * needsSignature,
PolymorphicUnoType * polymorphicUnoType)
{
@@ -274,7 +272,7 @@ SpecialType translateUnoTypeToDescriptor(
SpecialType translateUnoTypeToDescriptor(
rtl::Reference< TypeManager > const & manager, OUString const & type,
-bool array, bool classType, Dependencies * dependencies,
+bool array, bool classType, std::set * dependencies,
OStringBuffer * descriptor, OStringBuffer * signature,
bool * needsSignature, PolymorphicUnoType * polymorphicUnoType)
{
@@ -290,7 +288,7 @@ SpecialType translateUnoTypeToDescriptor(
}
SpecialType getFieldDescriptor(
-rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+rtl::Reference< TypeManager > const & manager, std::set *
dependencies,
OUString const & type, OString * descriptor, OString * signature,
PolymorphicUnoType * polymorphicUnoType)
{
@@ -316,7 +314,7 @@ class MethodDescriptor {
public:
MethodDescriptor(
rtl::Reference< TypeManager > const & manager,
-Dependencies * dependencies, OUString const & returnType,
+std::set * dependencies, OUString const & returnType,
SpecialType * specialReturnType,
PolymorphicUnoType * polymorphicUnoType);
@@ -332,7 +330,7 @@ public:
private:
rtl::Reference< TypeManager > m_manager;
-Dependencies * m_dependencies;
+std::set * m_dependencies;
OStringBuffer m_descriptorStart;
OString m_descriptorEnd;
OStringBuffer m_signatureStart;
@@ -341,7 +339,7 @@ private:
};
MethodDescriptor::MethodDescriptor(
-rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
+rtl::Reference< TypeManager > const & manager, std::set *
dependencies,
OUString const & returnType, SpecialType * specialReturnType,
PolymorphicUnoType * polymorphicUnoType):
m_manager(manager), m_dependencies(dependencies), m_needsSignature(false)
@@ -412,11 +410,11 @@ public:
bool inParameter, bool outParameter, OString const & methodName,
sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType);
-sal_uInt16 generateCode(ClassFile::Code & code, Dependencies *
dependencies)
+sal_uInt16 generateCode(ClassFile::Code & code, std::set *
dependencies)
const;
void generatePolymorphicUnoTypeCode(
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/ndole.hxx |2 +-
sw/source/core/ole/ndole.cxx |8 +++-
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit ff597693035d0f60dc53f884e3c456b1048d92ab
Author: Noel Grandin
Date: Thu Jun 28 14:07:14 2018 +0200
loplugin:useuniqueptr in SwOLEObj
Change-Id: I36b14c31bfdf66b158dd2cf8f6a7a125d52cddb5
Reviewed-on: https://gerrit.libreoffice.org/56627
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index cc72ff6279a3..f77f70905a32 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwOLEObj
// eventually buffered data if it is a chart OLE
drawinglayer::primitive2d::Primitive2DContainer m_aPrimitive2DSequence;
basegfx::B2DRange m_aRange;
-DeflateData* m_pDeflateData;
+std::unique_ptrm_pDeflateData;
SwOLEObj( const SwOLEObj& rObj ) = delete;
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 755410d33bc9..6101302bf40b 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -1019,8 +1019,7 @@ drawinglayer::primitive2d::Primitive2DContainer const &
SwOLEObj::tryToGetChartC
// copy the result data and cleanup
m_aPrimitive2DSequence = m_pDeflateData->getSequence();
m_aRange = m_pDeflateData->getRange();
-delete m_pDeflateData;
-m_pDeflateData = nullptr;
+m_pDeflateData.reset();
}
}
@@ -1048,7 +1047,7 @@ drawinglayer::primitive2d::Primitive2DContainer const &
SwOLEObj::tryToGetChartC
// is okay (preview will be reused)
if(!m_pDeflateData)
{
-m_pDeflateData = new DeflateData(aXModel);
+m_pDeflateData.reset( new DeflateData(aXModel) );
DeflateThread* pNew = new DeflateThread(*m_pDeflateData);
comphelper::ThreadPool::getSharedOptimalPool().pushTask(pNew);
}
@@ -1074,8 +1073,7 @@ void SwOLEObj::resetBufferedData()
{
// load is in progress, wait until finished and cleanup without using
it
m_pDeflateData->waitFinished();
-delete m_pDeflateData;
-m_pDeflateData = nullptr;
+m_pDeflateData.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/inc sw/source
sw/inc/ndgrf.hxx |2 +-
sw/source/core/graphic/ndgrf.cxx | 15 ++-
sw/source/core/inc/dbg_lay.hxx| 20
sw/source/core/layout/dbg_lay.cxx | 25 +++--
4 files changed, 22 insertions(+), 40 deletions(-)
New commits:
commit 99147c8303016498f4bfcef3d5c1fe126ad43076
Author: Noel Grandin
Date: Thu Jun 28 14:01:29 2018 +0200
loplugin:useuniqueptr in SwGrfNode
Change-Id: I9f0993f7fbbdaf7552fe0b0c19d3fca691471fa8
Reviewed-on: https://gerrit.libreoffice.org/56626
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index e44c72e69309..a5e4e0cc2969 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
friend class SwNodes;
GraphicObject maGrfObj;
-GraphicObject *mpReplacementGraphic;
+std::unique_ptr mpReplacementGraphic;
tools::SvRef refLink; ///< If graphics only as
link then pointer is set.
Size nGrfSize;
bool bInSwapIn :1;
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 00e63f64a918..63a0c43d946c 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -138,8 +138,7 @@ bool SwGrfNode::ReRead(
{
bool bReadGrf = false;
bool bSetTwipSize = true;
-delete mpReplacementGraphic;
-mpReplacementGraphic = nullptr;
+mpReplacementGraphic.reset();
OSL_ENSURE( pGraphic || !rGrfName.isEmpty(),
"GraphicNode without a name, Graphic or GraphicObject" );
@@ -281,8 +280,7 @@ bool SwGrfNode::ReRead(
SwGrfNode::~SwGrfNode()
{
-delete mpReplacementGraphic;
-mpReplacementGraphic = nullptr;
+mpReplacementGraphic.reset();
// #i73788#
mpThreadConsumer.reset();
@@ -390,17 +388,17 @@ const GraphicObject* SwGrfNode::GetReplacementGrfObj()
const
if(rVectorGraphicDataPtr.get())
{
-const_cast< SwGrfNode* >(this)->mpReplacementGraphic = new
GraphicObject(rVectorGraphicDataPtr->getReplacement());
+const_cast< SwGrfNode* >(this)->mpReplacementGraphic.reset( new
GraphicObject(rVectorGraphicDataPtr->getReplacement()) );
}
else if (GetGrfObj().GetGraphic().hasPdfData() ||
GetGrfObj().GetGraphic().GetType() ==
GraphicType::GdiMetafile)
{
// Replacement graphic for PDF and metafiles is just the bitmap.
-const_cast(this)->mpReplacementGraphic = new
GraphicObject(GetGrfObj().GetGraphic().GetBitmapEx());
+const_cast(this)->mpReplacementGraphic.reset( new
GraphicObject(GetGrfObj().GetGraphic().GetBitmapEx()) );
}
}
-return mpReplacementGraphic;
+return mpReplacementGraphic.get();
}
SwContentNode *SwGrfNode::SplitContentNode( const SwPosition & )
@@ -470,8 +468,7 @@ bool SwGrfNode::SwapIn(bool bWaitForData)
else if( GraphicType::Default == maGrfObj.GetType() )
{
// no default bitmap anymore, thus re-paint
-delete mpReplacementGraphic;
-mpReplacementGraphic = nullptr;
+mpReplacementGraphic.reset();
maGrfObj.SetGraphic( Graphic() );
onGraphicChanged();
commit 95486bac7090d163d19fe8d35521ac0ef4473a93
Author: Noel Grandin
Date: Thu Jun 28 13:57:43 2018 +0200
loplugin:useuniqueptr in SwEnterLeave
Change-Id: I948c146f675675c1902c158be4d97b6d19679a51
Reviewed-on: https://gerrit.libreoffice.org/56625
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index 95e491782ff6..5c46809f88ae 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SW_SOURCE_CORE_INC_DBG_LAY_HXX
#include
+#include
enum class PROT {
FileInit = 0x,
@@ -84,23 +85,10 @@ public:
class SwEnterLeave
{
-SwImplEnterLeave* pImpl;
-void Ctor( const SwFrame* pFrame, PROT nFunc, DbgAction nAct, void* pPar );
-void Dtor();
-
+std::unique_ptr pImpl;
public:
-SwEnterLeave( const SwFrame* pFrame, PROT nFunc, DbgAction nAct, void*
pPar )
-{
-if( SwProtocol::Record( nFunc ) )
-Ctor( pFrame, nFunc, nAct, pPar );
-else
-pImpl = nullptr;
-}
-~SwEnterLeave()
-{
-if( pImpl )
-Dtor();
-}
+SwEnterLeave( const SwFrame* pFrame, PROT nFunc, DbgAction nAct, void*
pPar );
+~SwEnterLeave();
};
#define PROTOCOL( pFrame, nFunc, nAct, pPar ) { if( SwProtocol::Record(
nFunc ) )\
diff --git a/sw/source/core/layout/dbg_lay.cxx
b/sw/source/core/layout/dbg_lay.cxx
index 203f07893296..8db7a0d79a22 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -860,37 +860,34 @@ void SwImplProtocol::DeleteFrame
[Libreoffice-commits] core.git: compilerplugins/clang sw/source
compilerplugins/clang/useuniqueptr.cxx |6 ++
sw/source/core/fields/docufld.cxx |2 +-
sw/source/core/fields/textapi.cxx |2 +-
sw/source/core/inc/textapi.hxx |2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 35c165e46a1bc22bc4c5b51ec7b03216fa43ec64
Author: Noel Grandin
Date: Thu Jun 28 13:48:17 2018 +0200
loplugin:useuniqueptr in SwTextAPIObject
Change-Id: Ied235aefe2cc2ce5e88487503c17e1a54d25ac52
Reviewed-on: https://gerrit.libreoffice.org/56624
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/useuniqueptr.cxx
b/compilerplugins/clang/useuniqueptr.cxx
index df6343f61578..d4262c1a33ee 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -62,6 +62,12 @@ public:
// sometimes it owns, sometimes it doesn't
if (fn == SRCDIR "/editeng/source/misc/svxacorr.cxx")
return;
+// SwDoc::m_PageDescs has weird handling
+if (fn == SRCDIR "/sw/source/core/doc/docnew.cxx")
+return;
+// SwRedlineData::pNext and pExtraData have complex handling
+if (fn == SRCDIR "/sw/source/core/doc/docredln.cxx")
+return;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
}
diff --git a/sw/source/core/fields/docufld.cxx
b/sw/source/core/fields/docufld.cxx
index efc433cce0c7..c89f26f4b2e0 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1826,7 +1826,7 @@ void SwPostItField::SetTextObject( OutlinerParaObject*
pText )
sal_Int32 SwPostItField::GetNumberOfParagraphs() const
{
-return (mpText) ? mpText->Count() : 1;
+return mpText ? mpText->Count() : 1;
}
bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
diff --git a/sw/source/core/fields/textapi.cxx
b/sw/source/core/fields/textapi.cxx
index 05372f70faff..89c248eb06cb 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -61,7 +61,7 @@ SwTextAPIObject::SwTextAPIObject( SwTextAPIEditSource* p )
SwTextAPIObject::~SwTextAPIObject() throw()
{
pSource->Dispose();
-delete pSource;
+pSource.reset();
}
struct SwTextAPIEditSource_Impl
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index 4b3fa15628f4..02a138fc764f 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -53,7 +53,7 @@ public:
class SwTextAPIObject : public SvxUnoText
{
-SwTextAPIEditSource* pSource;
+std::unique_ptr pSource;
public:
SwTextAPIObject( SwTextAPIEditSource* p);
virtual ~SwTextAPIObject() throw() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/node.hxx |4 ++--
sw/source/core/doc/tblrwcl.cxx|2 +-
sw/source/core/docnode/ndcopy.cxx |4 ++--
sw/source/core/docnode/ndtbl.cxx |9 -
sw/source/core/edit/edtab.cxx |4 ++--
sw/source/core/fields/ddetbl.cxx |4 ++--
sw/source/core/undo/untbl.cxx |8
sw/source/filter/xml/xmltbli.cxx |6 +++---
8 files changed, 20 insertions(+), 21 deletions(-)
New commits:
commit b75d084f673d0a7e4845a59b5446a4bfafb37fd6
Author: Noel Grandin
Date: Thu Jun 28 13:04:15 2018 +0200
loplugin:useuniqueptr in SwTableNode
Change-Id: I28bca27b6841ba9b263392b2e30f8684a8e2c4e5
Reviewed-on: https://gerrit.libreoffice.org/56622
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9198ec2c73b7..3e50db779aaa 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -492,7 +492,7 @@ private:
class SW_DLLPUBLIC SwTableNode : public SwStartNode, public SwModify
{
friend class SwNodes;
-SwTable* m_pTable;
+std::unique_ptr m_pTable;
protected:
virtual ~SwTableNode() override;
@@ -515,7 +515,7 @@ public:
void MakeFrames( const SwNodeIndex & rIdx );
SwTableNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
-void SetNewTable( SwTable* , bool bNewFrames=true );
+void SetNewTable( std::unique_ptr , bool bNewFrames=true );
// Removes redline objects that relate to this table from the 'Extra
Redlines' table
void RemoveRedlines();
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index c33b005e9a89..e9551ded7a87 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2087,7 +2087,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition&
rPos,
// Change the Table Pointer at the Node
pNewTable = new SwDDETable( *pNewTable,
static_cast(pFieldType) );
-pTableNd->SetNewTable( pNewTable, false );
+pTableNd->SetNewTable( std::unique_ptr(pNewTable), false );
}
pNewTable->GetFrameFormat()->CopyAttrs( *GetFrameFormat() );
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 0463edeaef2a..431a91e35055 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -283,8 +283,8 @@ SwTableNode* SwTableNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex& rIdx ) const
OSL_ENSURE( pDDEType, "unknown FieldType" );
// Swap the table pointers in the node
-SwDDETable* pNewTable = new SwDDETable( pTableNd->GetTable(), pDDEType
);
-pTableNd->SetNewTable( pNewTable, false );
+std::unique_ptr pNewTable(new SwDDETable(
pTableNd->GetTable(), pDDEType ));
+pTableNd->SetNewTable( std::move(pNewTable), false );
}
// First copy the content of the tables, we will later assign the
// boxes/lines and create the frames
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 0ee58e56b96e..d0e177b48548 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2337,7 +2337,7 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
SwTableNode::SwTableNode( const SwNodeIndex& rIdx )
: SwStartNode( rIdx, SwNodeType::Table )
{
-m_pTable = new SwTable;
+m_pTable.reset(new SwTable);
}
SwTableNode::~SwTableNode()
@@ -2349,7 +2349,7 @@ SwTableNode::~SwTableNode()
pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint );
DelFrames();
m_pTable->SetTableNode(this); // set this so that ~SwDDETable can read it!
-delete m_pTable;
+m_pTable.reset();
}
SwTabFrame *SwTableNode::MakeFrame( SwFrame* pSib )
@@ -2465,12 +2465,11 @@ void SwTableNode::DelFrames()
}
}
-void SwTableNode::SetNewTable( SwTable* pNewTable, bool bNewFrames )
+void SwTableNode::SetNewTable( std::unique_ptr pNewTable, bool
bNewFrames )
{
DelFrames();
m_pTable->SetTableNode(this);
-delete m_pTable;
-m_pTable = pNewTable;
+m_pTable = std::move(pNewTable);
if( bNewFrames )
{
SwNodeIndex aIdx( *EndOfSectionNode());
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 4859b5efdcbb..28a5c05be494 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -232,8 +232,8 @@ void SwEditShell::InsertDDETable( const
SwInsertTableOptions& rInsTableOpts,
SwTableNode* pTableNode =
const_cast(pTable->GetTabSortBoxes()[ 0 ]->
GetSttNd()->FindTableNode());
-SwDDETable* pDDETable = new SwDDETable( *pTable, pDDEType );
-pTableNode->SetNewTable( pDDETable ); // set the DDE table
+std::unique_ptr pDDETable(new SwDDETable( *pTable, pDDEType ));
+pTableNode->SetNewTable( std::move(pDDETable) ); // set the DDE table
if( bEndUndo )
EndUndo( SwUndoId::END );
diff --git a/sw/source/co
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/editsrc.hxx |4 ++--
sc/source/ui/unoobj/editsrc.cxx | 18 +-
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit c0241bad4ee36cac66eab4ab1435aa4874f5bddb
Author: Noel Grandin
Date: Thu Jun 28 10:48:27 2018 +0200
loplugin:useuniqueptr in ScAnnotationEditSource
Change-Id: Ia1ba66e511fc5ad9b0871d04df859cd79d7521a5
Reviewed-on: https://gerrit.libreoffice.org/56621
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index 71c5f90c488d..a719230bb379 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -97,8 +97,8 @@ class ScAnnotationEditSource : public SvxEditSource, public
SfxListener
private:
ScDocShell* pDocShell;
ScAddress aCellPos;
-ScEditEngineDefaulter* pEditEngine;
-SvxEditEngineForwarder* pForwarder;
+std::unique_ptr pEditEngine;
+std::unique_ptr pForwarder;
boolbDataValid;
SdrObject* GetCaptionObj();
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index 2989c6aed34a..1b604a517949 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -125,8 +125,8 @@ ScAnnotationEditSource::~ScAnnotationEditSource()
if (pDocShell)
pDocShell->GetDocument().RemoveUnoObject(*this);
-delete pForwarder;
-delete pEditEngine;
+pForwarder.reset();
+pEditEngine.reset();
}
std::unique_ptr ScAnnotationEditSource::Clone() const
@@ -147,19 +147,19 @@ SvxTextForwarder*
ScAnnotationEditSource::GetTextForwarder()
// notes don't have fields
if ( pDocShell )
{
-pEditEngine = new ScNoteEditEngine(
pDocShell->GetDocument().GetNoteEngine() );
+pEditEngine.reset( new ScNoteEditEngine(
pDocShell->GetDocument().GetNoteEngine() ) );
}
else
{
SfxItemPool* pEnginePool = EditEngine::CreatePool();
pEnginePool->FreezeIdRanges();
-pEditEngine = new ScEditEngineDefaulter( pEnginePool, true );
+pEditEngine.reset( new ScEditEngineDefaulter( pEnginePool, true )
);
}
-pForwarder = new SvxEditEngineForwarder(*pEditEngine);
+pForwarder.reset( new SvxEditEngineForwarder(*pEditEngine) );
}
if (bDataValid)
-return pForwarder;
+return pForwarder.get();
if ( pDocShell )
if ( ScPostIt* pNote = pDocShell->GetDocument().GetNote(aCellPos) )
@@ -167,7 +167,7 @@ SvxTextForwarder* ScAnnotationEditSource::GetTextForwarder()
pEditEngine->SetText( *pEditObj ); // incl. breaks (line,
etc.)
bDataValid = true;
-return pForwarder;
+return pForwarder.get();
}
void ScAnnotationEditSource::UpdateData()
@@ -207,8 +207,8 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const
SfxHint& rHint )
{
pDocShell = nullptr;
-DELETEZ( pForwarder );
-DELETEZ( pEditEngine ); // EditEngine uses document's pool
+pForwarder.reset();
+pEditEngine.reset(); // EditEngine uses document's pool
}
else if ( nId == SfxHintId::DataChanged )
bDataValid = false; // text must be retrieved
again
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/fielduno.hxx |2 +-
sc/source/ui/unoobj/fielduno.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f7355a9e7c91098052e22b45ab80caa64edf7871
Author: Noel Grandin
Date: Thu Jun 28 10:44:34 2018 +0200
loplugin:useuniqueptr in ScCellFieldsObj
Change-Id: I894abfcfd9b2710a1aa81cca94158dbe4a7d9eeb
Reviewed-on: https://gerrit.libreoffice.org/56620
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index e176ac862de9..8664e2b673a8 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -61,7 +61,7 @@ private:
css::uno::Reference mxContent;
ScDocShell* pDocShell;
ScAddress aCellPos;
-ScEditSource* mpEditSource;
+std::unique_ptr mpEditSource;
/// List of refresh listeners.
comphelper::OInterfaceContainerHelper2* mpRefreshListeners;
/// mutex to lock the InterfaceContainerHelper
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 4b33ea74f000..0316b832cc75 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -278,7 +278,7 @@ ScCellFieldsObj::ScCellFieldsObj(
{
pDocShell->GetDocument().AddUnoObject(*this);
-mpEditSource = new ScCellEditSource( pDocShell, aCellPos );
+mpEditSource.reset( new ScCellEditSource( pDocShell, aCellPos ) );
}
ScCellFieldsObj::~ScCellFieldsObj()
@@ -288,7 +288,7 @@ ScCellFieldsObj::~ScCellFieldsObj()
if (pDocShell)
pDocShell->GetDocument().RemoveUnoObject(*this);
-delete mpEditSource;
+mpEditSource.reset();
// increment refcount to prevent double call off dtor
osl_atomic_increment( &m_refCount );
___
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/undobase.hxx | 12 -
sc/source/ui/inc/undoblk.hxx | 28 +++---
sc/source/ui/inc/undocell.hxx | 10
sc/source/ui/inc/undodat.hxx |2 -
sc/source/ui/inc/undotab.hxx | 14 +--
sc/source/ui/undo/undobase.cxx | 26 ++---
sc/source/ui/undo/undoblk.cxx | 30
sc/source/ui/undo/undoblk2.cxx |9 +++
sc/source/ui/undo/undoblk3.cxx | 50 -
sc/source/ui/undo/undocell.cxx | 18 +++---
sc/source/ui/undo/undodat.cxx |8 +++---
sc/source/ui/undo/undotab.cxx | 48 +++
12 files changed, 127 insertions(+), 128 deletions(-)
New commits:
commit f5772b154d0c806ef029f1feee1ee92537eec463
Author: Noel Grandin
Date: Thu Jun 28 10:37:20 2018 +0200
loplugin:useuniqueptr in various ScUndo*
Change-Id: I604d7b900836e87fc768e1b00dc62a570ff477b5
Reviewed-on: https://gerrit.libreoffice.org/56619
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 6fa0fbd7a9e2..a531caf1cac2 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -88,7 +88,7 @@ public:
protected:
ScRange aBlockRange;
-SdrUndoAction* pDrawUndo;
+std::unique_ptr pDrawUndo;
ScBlockUndoMode eMode;
voidBeginUndo();
@@ -108,7 +108,7 @@ public:
protected:
ScRangeList maBlockRanges;
-SdrUndoAction* mpDrawUndo;
+std::unique_ptr mpDrawUndo;
void BeginUndo();
void EndUndo();
@@ -123,7 +123,7 @@ protected:
class ScDBFuncUndo: public ScSimpleUndo
{
protected:
-ScDBData* pAutoDBRange;
+std::unique_ptr pAutoDBRange;
ScRange aOriginalRange;
public:
@@ -147,9 +147,9 @@ public:
virtual ~ScMoveUndo() override;
protected:
-SdrUndoAction* pDrawUndo;
-ScDocument* pRefUndoDoc;
-ScRefUndoData* pRefUndoData;
+std::unique_ptr pDrawUndo;
+std::unique_ptr pRefUndoDoc;
+std::unique_ptr pRefUndoData;
ScMoveUndoMode eMode;
voidBeginUndo();
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 7fd2ad69d6ad..90100c3ac292 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -201,11 +201,11 @@ public:
private:
ScMarkData aMarkData;
-ScDocument* pUndoDoc;
-ScDocument* pRedoDoc;
+std::unique_ptr pUndoDoc;
+std::unique_ptr pRedoDoc;
InsertDeleteFlags nFlags;
-ScRefUndoData* pRefUndoData;
-ScRefUndoData* pRefRedoData;
+std::unique_ptr pRefUndoData;
+std::unique_ptr pRefRedoData;
sal_uLong nStartChangeAction;
sal_uLong nEndChangeAction;
boolbRedoFilled;
@@ -273,7 +273,7 @@ private:
ScRange aRange;
ScMarkData aMarkData;
ScDocumentUniquePtr pUndoDoc; // Block mark and deleted data
-SdrUndoAction* pDrawUndo; // Deleted objects
+std::unique_ptr pDrawUndo; // Deleted objects
sal_uLong nStartChangeAction;
sal_uLong nEndChangeAction;
InsertDeleteFlags nFlags;
@@ -346,7 +346,7 @@ private:
ScRange aRange;
ScRange aRangeCover;
std::unique_ptr mpDataArray;
-ScDocument* pUndoDoc;
+std::unique_ptr pUndoDoc;
boolbMulti;
ScPatternAttr* pApplyPattern;
SvxBoxItem* pLineOuter;
@@ -389,7 +389,7 @@ private:
sal_uInt16 nNewSize;
boolbWidth;
ScSizeMode eMode;
-SdrUndoAction* pDrawUndo;
+std::unique_ptr pDrawUndo;
};
class ScUndoAutoFill: public ScBlockUndo
@@ -445,7 +445,7 @@ private:
ScCellMergeOption maOption;
boolmbMergeContents;// Merge contents in Redo().
ScDocumentUniquePtr mxUndoDoc; // when data is merged
-SdrUndoAction* mpDrawUndo;
+std::unique_ptr mpDrawUndo;
voidDoChange( bool bUndo ) const;
};
@@ -495,8 +495,8 @@ private:
ScAddress aCursorPos;
ScMarkData aMarkData;
OUStringaUndoStr; // Data at single selection
-ScDocument* pUndoDoc; // Block mark and deleted data
-SvxSearchItem* pSearchItem;
+std::unique_ptr pUndoDoc; // Block mark and deleted
data
+std::unique_ptr pSearchItem;
sal_uLong nStartChangeAction;
sal_uLong nEndChangeAction;
@@ -555,9 +555,9 @@ public:
private:
ScMarkData aMarkData;
ScAddress aCursorPos;
-ScDocument* pUndoDoc; // Block mark and deleted data
+std::unique_ptr pUndoDoc; // Block mark and deleted
data
ScAddress aNewCursorPos;
-ScDocument* pRedoDoc; // Block mark and new data
+std::unique_ptr pRedoDoc; // Block mark and new data
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/formatpaintbrush.png |binary icon-themes/colibre/cmd/32/resetattributes.png|binary icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png |binary icon-themes/colibre/cmd/32/subscript.png |binary icon-themes/colibre/cmd/32/superscript.png|binary icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg |1 + icon-themes/colibre_svg/cmd/32/resetattributes.svg|1 + icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg |1 + icon-themes/colibre_svg/cmd/32/subscript.svg |1 + icon-themes/colibre_svg/cmd/32/superscript.svg|1 + 10 files changed, 5 insertions(+) New commits: commit e150a0385c7bb206dd04b5ab283fd72b0c6223c2 Author: andreas kainz Date: Thu Jun 28 22:48:16 2018 +0200 Colibre icons: add 32px icons Change-Id: I696d3f643166f4a581e666c3a1b1340a3ab69499 Reviewed-on: https://gerrit.libreoffice.org/56640 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit e7d3976cb80f7e7401be071f905a764dd6cb4d6e) Reviewed-on: https://gerrit.libreoffice.org/56647 diff --git a/icon-themes/colibre/cmd/32/formatpaintbrush.png b/icon-themes/colibre/cmd/32/formatpaintbrush.png new file mode 100644 index ..c87b4942bc3d Binary files /dev/null and b/icon-themes/colibre/cmd/32/formatpaintbrush.png differ diff --git a/icon-themes/colibre/cmd/32/resetattributes.png b/icon-themes/colibre/cmd/32/resetattributes.png new file mode 100644 index ..d9c541c4b051 Binary files /dev/null and b/icon-themes/colibre/cmd/32/resetattributes.png differ diff --git a/icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png b/icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png new file mode 100644 index ..1012fa4a9178 Binary files /dev/null and b/icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png differ diff --git a/icon-themes/colibre/cmd/32/subscript.png b/icon-themes/colibre/cmd/32/subscript.png new file mode 100644 index ..2ba2128749ea Binary files /dev/null and b/icon-themes/colibre/cmd/32/subscript.png differ diff --git a/icon-themes/colibre/cmd/32/superscript.png b/icon-themes/colibre/cmd/32/superscript.png new file mode 100644 index ..f6fe517d9adb Binary files /dev/null and b/icon-themes/colibre/cmd/32/superscript.png differ diff --git a/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg new file mode 100644 index ..1751da06a474 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/resetattributes.svg b/icon-themes/colibre_svg/cmd/32/resetattributes.svg new file mode 100644 index ..fc159a4669be --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/resetattributes.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg b/icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg new file mode 100644 index ..e454c751cf36 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/subscript.svg b/icon-themes/colibre_svg/cmd/32/subscript.svg new file mode 100644 index ..474e6525eed2 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/subscript.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/superscript.svg b/icon-themes/colibre_svg/cmd/32/superscript.svg new file mode 100644 index ..b0442c91fe01 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/superscript.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre icon-themes/colibre_svg officecfg/registry
icon-themes/colibre/cmd/sc_addressbooksource.png |binary icon-themes/colibre/links.txt| 37 -- icon-themes/colibre_svg/cmd/sc_addressbooksource.svg |2 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 36 + officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 21 - 5 files changed, 88 insertions(+), 8 deletions(-) New commits: commit c2e0a17a8831acbc92da4e51b05aa75ee83b57d3 Author: andreas kainz Date: Thu Jun 28 16:52:12 2018 +0200 writer: add icons for menubar actions Change-Id: Ib222936295c4815f9d87a0da4c2c7a93c929391c Reviewed-on: https://gerrit.libreoffice.org/56604 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 2d863d5a55072955e55a71f4667cc2f7b828d16e) Reviewed-on: https://gerrit.libreoffice.org/56637 diff --git a/icon-themes/colibre/cmd/sc_addressbooksource.png b/icon-themes/colibre/cmd/sc_addressbooksource.png new file mode 100644 index ..20056e55e422 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_addressbooksource.png differ diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 9b4ceea85423..0edb2380dc95 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -97,7 +97,9 @@ cmd/sc_insertformradio.png cmd/sc_radiobutton.png cmd/sc_insertformspin.png cmd/sc_spinbutton.png cmd/sc_insertformula.png cmd/sc_dbviewfunctions.png cmd/sc_insertformvscroll.png cmd/sc_scrollbar.png +cmd/sc_scrollbarmenu.png cmd/sc_scrollbar.png cmd/sc_insertframeinteract.png cmd/sc_insertframe.png +cmd/sc_insertframemenu.png cmd/sc_insertframe.png cmd/sc_insertframeinteractnocolumns.png cmd/sc_insertframe.png cmd/sc_insertimagecontrol.png cmd/sc_drawchart.png cmd/sc_insertobjectchart.png cmd/sc_drawchart.png @@ -213,6 +215,7 @@ cmd/sc_commentchange.png cmd/sc_commentchangetracking.png cmd/lc_commentchange.png cmd/lc_commentchangetracking.png cmd/sc_deleteallnotes.png cmd/sc_deleteallannotation.png cmd/lc_deleteallnotes.png cmd/lc_deleteallannotation.png +cmd/sc_formatallnotes.png cmd/sc_editannotation.png # Template Menu cmd/sc_templatemenu.png cmd/sc_adddirect.png @@ -279,6 +282,8 @@ cmd/lc_basicshapes.circle-pie.png cmd/lc_pie.png cmd/lc_flowchartshapes.flowchart-merge.png cmd/lc_fontworkshapetype.fontwork-triangle-down.png cmd/lc_fontworkshapetype.fontwork-fade-down.png cmd/lc_basicshapes.trapezoid.png cmd/lc_flowchartshapes.flowchart-magnetic-disk.png cmd/lc_basicshapes.can.png +cmd/sc_flowchartshapes.png cmd/lc_flowchartshapes.flowchart-document.png + cmd/lc_emojicontrol.png cmd/lc_symbolshapes.png cmd/sc_emojicontrol.png cmd/sc_symbolshapes.png @@ -406,6 +411,7 @@ cmd/sc_defaultparastyle.png cmd/sc_controlcodes.png cmd/lc_leaveallgroups.png cmd/lc_leavegroup.png cmd/sc_leaveallgroups.png cmd/sc_leavegroup.png cmd/sc_formatungroup.png cmd/sc_ungroup.png +cmd/sc_groupmenu.png cmd/sc_group.png # Undo cmd/lc_recundo.png cmd/lc_undo.png @@ -494,6 +500,7 @@ cmd/lc_xlinestyle.png cmd/lc_linestyle.png cmd/lc_hfixedline.png cmd/lc_line.png cmd/sc_xlinestyle.png cmd/sc_linestyle.png cmd/sc_hfixedline.png cmd/sc_line.png +cmd/sc_shapeslinemenu.png cmd/sc_line.png # Mail merge cmd/lc_mailmergefirstentry.png cmd/lc_firstrecord.png @@ -633,12 +640,14 @@ cmd/sc_fillcolor.png cmd/sc_formatarea.png # Notebookbar cmd/lc_headerandfooter.png cmd/lc_editheaderandfooter.png cmd/sc_headerandfooter.png cmd/sc_editheaderandfooter.png +cmd/sc_insertheaderfootermenu.png cmd/sc_editheaderandfooter.png cmd/lc_recalcpivottable.png cmd/lc_calculate.png cmd/sc_recalcpivottable.png cmd/sc_calculate.png cmd/lc_dataproviderrefresh.png cmd/lc_calculate.png cmd/sc_dataproviderrefresh.png cmd/sc_calculate.png cmd/lc_datafilterhideautofilter.png cmd/lc_removefiltersort.png cmd/sc_datafilterhideautofilter.png cmd/sc_removefiltersort.png +cmd/sc_insertsignatureline.png cmd/sc_signaturelinedialog.png # Ok cmd/lc_yes.png cmd/lc_ok.png @@ -718,6 +727,8 @@ cmd/sc_fontworkshapetype.png cmd/sc_fontwork.png # Ruler cmd/lc_showruler.png cmd/lc_ruler.png cmd/sc_showruler.png cmd/sc_ruler.png +cmd/lc_rulermenu.png cmd/lc_ruler.png +cmd/sc_rulermenu.png cmd/sc_ruler.png # Graphic Quality Color cmd/lc_outputqualitycolor.png cmd/lc_insertgraphic.png @@ -734,6 +745,7 @@ cmd/sc_toggleaxisdescr.png cmd/sc_helplinesvisible.png # Grid cmd/lc_gridvisible.png cmd/lc_grid.png cmd/sc_gridvisible.png cmd/sc_grid.png +cmd/sc_gridmenu.png cmd/sc_grid.png # Crop cmd/lc_grafattrcrop.png cmd/lc_crop.png @@ -784,6 +796,8 @@ cmd/lc_editstyled.png cmd/lc_editstyle.png cmd/sc_editstyled.png cmd/sc_editstyle.png cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png +cmd/lc_loadstyles.png cmd/lc_open.png +cmd/sc_loadstyles.png cmd/sc_open.png # Outline cmd/lc_outlineright.png cmd/l
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/undoolk.hxx |1 -
sc/source/ui/undo/undobase.cxx |7 +++
sc/source/ui/undo/undoblk2.cxx |2 +-
sc/source/ui/undo/undoblk3.cxx |4 ++--
sc/source/ui/undo/undocell.cxx |4 ++--
sc/source/ui/undo/undodat.cxx |2 +-
sc/source/ui/undo/undoolk.cxx |5 -
sc/source/ui/undo/undotab.cxx | 10 +-
8 files changed, 14 insertions(+), 21 deletions(-)
New commits:
commit 286461d872057ab8110d9713c5cbe859448dda70
Author: Noel Grandin
Date: Thu Jun 28 09:38:04 2018 +0200
inline DeleteSdrUndoAction
so that loplugin:useuniqueptr can trigger on it
Change-Id: I04d68278f870ec137b3a78491e83e8adc7374fa4
Reviewed-on: https://gerrit.libreoffice.org/56618
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/inc/undoolk.hxx b/sc/source/ui/inc/undoolk.hxx
index c9c80b23fa7e..a8e03577c86e 100644
--- a/sc/source/ui/inc/undoolk.hxx
+++ b/sc/source/ui/inc/undoolk.hxx
@@ -26,7 +26,6 @@ class ScDocument;
std::unique_ptr GetSdrUndoAction( ScDocument* pDoc );
voidDoSdrUndoAction ( SdrUndoAction* pUndoAction, ScDocument*
pDoc );
voidRedoSdrUndoAction ( SdrUndoAction* pUndoAction );
-voidDeleteSdrUndoAction ( SdrUndoAction* pUndoAction );
voidEnableDrawAdjust( ScDocument* pDoc, bool bEnable );
#endif
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 4a7dbc28a54d..42c8f993040e 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -250,7 +250,7 @@ ScBlockUndo::ScBlockUndo( ScDocShell* pDocSh, const
ScRange& rRange,
ScBlockUndo::~ScBlockUndo()
{
-DeleteSdrUndoAction( pDrawUndo );
+delete pDrawUndo;
}
void ScBlockUndo::BeginUndo()
@@ -351,7 +351,7 @@ ScMultiBlockUndo::ScMultiBlockUndo(
ScMultiBlockUndo::~ScMultiBlockUndo()
{
-DeleteSdrUndoAction( mpDrawUndo );
+delete mpDrawUndo;
}
void ScMultiBlockUndo::BeginUndo()
@@ -423,7 +423,7 @@ ScMoveUndo::~ScMoveUndo()
{
delete pRefUndoData;
delete pRefUndoDoc;
-DeleteSdrUndoAction( pDrawUndo );
+delete pDrawUndo;
}
void ScMoveUndo::UndoRef()
@@ -469,7 +469,6 @@ ScDBFuncUndo::ScDBFuncUndo( ScDocShell* pDocSh, const
ScRange& rOriginal ) :
ScDBFuncUndo::~ScDBFuncUndo()
{
-DeleteSdrUndoAction( nullptr );
delete pAutoDBRange;
}
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index a6fcc01b6881..c2a81e7b4b8c 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -62,7 +62,7 @@ ScUndoWidthOrHeight::~ScUndoWidthOrHeight()
{
pUndoDoc.reset();
pUndoTab.reset();
-DeleteSdrUndoAction( pDrawUndo );
+delete pDrawUndo;
}
OUString ScUndoWidthOrHeight::GetComment() const
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 89db1e2fa38c..1ace788eb96a 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -88,7 +88,7 @@ ScUndoDeleteContents::ScUndoDeleteContents(
ScUndoDeleteContents::~ScUndoDeleteContents()
{
pUndoDoc.reset();
-DeleteSdrUndoAction( pDrawUndo );
+delete pDrawUndo;
}
OUString ScUndoDeleteContents::GetComment() const
@@ -648,7 +648,7 @@ ScUndoMerge::ScUndoMerge(ScDocShell* pNewDocShell, const
ScCellMergeOption& rOpt
ScUndoMerge::~ScUndoMerge()
{
-DeleteSdrUndoAction( mpDrawUndo );
+delete mpDrawUndo;
}
OUString ScUndoMerge::GetComment() const
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 04048d8ef96e..51f5b105f040 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -915,7 +915,7 @@ ScUndoReplaceNote::ScUndoReplaceNote( ScDocShell&
rDocShell, const ScAddress& rP
ScUndoReplaceNote::~ScUndoReplaceNote()
{
-DeleteSdrUndoAction( mpDrawUndo );
+delete mpDrawUndo;
}
void ScUndoReplaceNote::Undo()
@@ -1048,7 +1048,7 @@ ScUndoDetective::ScUndoDetective( ScDocShell*
pNewDocShell,
ScUndoDetective::~ScUndoDetective()
{
-DeleteSdrUndoAction( pDrawUndo );
+delete pDrawUndo;
delete pOldList;
}
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index ea4cacef499c..11ad1c6daef2 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -727,7 +727,7 @@ ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB
nNewTab, const ScQuery
ScUndoQuery::~ScUndoQuery()
{
-DeleteSdrUndoAction( pDrawUndo );
+delete pDrawUndo;
}
OUString ScUndoQuery::GetComment() const
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 6a8632fad499..ac812fdabc34 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -65,11 +65,6 @@ void RedoSdrUndoAction( SdrUndoAction* pUndoAction )
pUndoAction->Redo();
}
-void DeleteSdrUndoAction( SdrUndoAction* pUndoAction )
-{
-delete pUndoAction;
-}
-
void EnableDrawAdjust( ScDocum
[Libreoffice-commits] core.git: 2 commits - sc/source ucbhelper/source
sc/source/ui/inc/tphfedit.hxx|6 +-
sc/source/ui/pagedlg/tphfedit.cxx| 12 ++---
ucbhelper/source/client/proxydecider.cxx | 63 +--
3 files changed, 60 insertions(+), 21 deletions(-)
New commits:
commit a440837ee2be3759559325e3e31d90d358587727
Author: Noel Grandin
Date: Thu Jun 28 09:30:24 2018 +0200
loplugin:useuniqueptr in ScEditWindow
Change-Id: I0398045030b8c2dcc8cd8e47112271c80d194616
Reviewed-on: https://gerrit.libreoffice.org/56617
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 741f432d95bc..606053ef4920 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -68,7 +68,7 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessible() override;
-ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; }
+ScHeaderEditEngine* GetEditEngine() const { return pEdEngine.get(); }
void SetObjectSelectHdl( const Link& aLink) {
aObjectSelectLink = aLink; }
void SetGetFocusHdl(const std::function& rLink) {
m_GetFocusLink = rLink; }
@@ -85,8 +85,8 @@ protected:
virtual voidResize() override;
private:
-ScHeaderEditEngine* pEdEngine;
-EditView* pEdView;
+std::unique_ptr pEdEngine;
+std::unique_ptr pEdView;
ScEditWindowLocation eLocation;
bool mbRTL;
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx
b/sc/source/ui/pagedlg/tphfedit.cxx
index 7ddb851ff18f..ba8582e5db87 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -80,7 +80,7 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits
nBits, ScEditWindowLoc
Size aSize( GetOutputSize() );
aSize.setHeight( aSize.Height() * 4 );
-pEdEngine = new ScHeaderEditEngine( EditEngine::CreatePool() );
+pEdEngine.reset( new ScHeaderEditEngine( EditEngine::CreatePool() ) );
pEdEngine->SetPaperSize( aSize );
pEdEngine->SetRefDevice( this );
@@ -94,11 +94,11 @@ ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits
nBits, ScEditWindowLoc
if (mbRTL)
pEdEngine->SetDefaultHorizontalTextDirection(EEHorizontalTextDirection::R2L);
-pEdView = new EditView( pEdEngine, this );
+pEdView.reset( new EditView( pEdEngine.get(), this ) );
pEdView->SetOutputArea( tools::Rectangle( Point(0,0), GetOutputSize() ) );
pEdView->SetBackgroundColor( aBgColor );
-pEdEngine->InsertView( pEdView );
+pEdEngine->InsertView( pEdView.get() );
}
void ScEditWindow::Resize()
@@ -125,8 +125,8 @@ void ScEditWindow::dispose()
if (xTemp.is())
pAcc->dispose();
}
-delete pEdEngine;
-delete pEdView;
+pEdEngine.reset();
+pEdView.reset();
Control::dispose();
}
@@ -326,7 +326,7 @@ css::uno::Reference< css::accessibility::XAccessible >
ScEditWindow::CreateAcces
}
break;
}
-pAcc = new
ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(), pEdView,
this,
+pAcc = new
ScAccessibleEditObject(GetAccessibleParentWindow()->GetAccessible(),
pEdView.get(), this,
sName, sDescription, ScAccessibleEditObject::EditControl);
css::uno::Reference< css::accessibility::XAccessible > xAccessible = pAcc;
xAcc = xAccessible;
commit 0e375686e2f2c6c626f50c06c5323c0982d7f602
Author: Noel Grandin
Date: Thu Jun 28 16:19:51 2018 +0200
tdf#114227 Add support for OS proxy to ucbhelper::InternetProxyDecider on
Unix
Also make m_nProxyType a scoped enum so the code is a little easier to
follow.
Change-Id: Ic2862a1de8fe1005c4fb25147b3effc49b95140c
Reviewed-on: https://gerrit.libreoffice.org/56599
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/ucbhelper/source/client/proxydecider.cxx
b/ucbhelper/source/client/proxydecider.cxx
index fdf4506add26..080e176863ab 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -118,12 +118,14 @@ public:
class InternetProxyDecider_Impl :
public cppu::WeakImplHelper< util::XChangesListener >
{
+// see officecfg/registry/schema/org/openoffice/Inet.xcs for the
definition of these values
+enum class ProxyType { NoProxy, Automatic, Manual };
mutable osl::Mutex m_aMutex;
InternetProxyServer m_aHttpProxy;
InternetProxyServer m_aHttpsProxy;
InternetProxyServer m_aFtpProxy;
const InternetProxyServerm_aEmptyProxy;
-sal_Int32m_nProxyType;
+ProxyTypem_nProxyType;
uno::Reference< util::XChangesNotifier > m_xNotifier;
std::vector< NoProxyListEntry > m_aNoProxyList;
mutable HostnameCachem_aHostnames;
@@ -284,7 +286,7 @@ bool
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/sdraw/menubar/menubar.xml |6 ++ 1 file changed, 6 insertions(+) New commits: commit ffa431d2bfe9058571ad6bb6db43c3b857754ced Author: andreas kainz Date: Thu Jun 28 12:14:56 2018 +0200 menubar draw update zoom subgroup in view in every app there is in view as last subgroup zoom ordinary you have fullscreen and zoom with the submenu as in draw there fuulscreen isn't available panning was shown and the submenu was updated to show also the draw specific zoom items Change-Id: I390ac40815aa28c7df883cf63dcd214b181785ed Reviewed-on: https://gerrit.libreoffice.org/56586 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index f72ab87a2aca..c6f347807c58 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -139,6 +139,7 @@ + @@ -150,6 +151,11 @@ + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/sglobal/menubar/menubar.xml |2 +- sw/uiconfig/sweb/menubar/menubar.xml |2 +- sw/uiconfig/swform/menubar/menubar.xml |3 +-- sw/uiconfig/swreport/menubar/menubar.xml |3 +-- sw/uiconfig/swriter/menubar/menubar.xml |2 +- sw/uiconfig/swxform/menubar/menubar.xml |2 +- 6 files changed, 6 insertions(+), 8 deletions(-) New commits: commit 6651e055e1bc847f9732269bfff12412c2cbef0d Author: andreas kainz Date: Thu Jun 28 11:32:41 2018 +0200 Menubar: move InsertDoc in ObjectMenu Subsection like in calc Insert section in writer is very long and when move InsertDoc into the Object Subgroup it will be on the same level than in calc Change-Id: Ie34b5853dd462ed17df02f645a1e6953beaf3f13 Reviewed-on: https://gerrit.libreoffice.org/56584 Tested-by: Jenkins Reviewed-by: Heiko Tietze Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index ceb0a7350d2c..b745aeaa7989 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -258,6 +258,7 @@ + @@ -284,7 +285,6 @@ - diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml index eedb4a8d00ba..a7d80cfe3b1d 100644 --- a/sw/uiconfig/sweb/menubar/menubar.xml +++ b/sw/uiconfig/sweb/menubar/menubar.xml @@ -181,11 +181,11 @@ + - diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index d1e20349e2f4..6e43ecf9876a 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -231,14 +231,13 @@ + - - diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 5c48aac64b36..abfc3c126997 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -232,14 +232,13 @@ + - - diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index ceb0a7350d2c..b745aeaa7989 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -258,6 +258,7 @@ + @@ -284,7 +285,6 @@ - diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 771395ac0774..4e5d822dcd08 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -258,6 +258,7 @@ + @@ -284,7 +285,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/basic_coverage/test_types_conversion.vb | 63 +++
basic/source/sbx/sbxscan.cxx |6 +-
2 files changed, 67 insertions(+), 2 deletions(-)
New commits:
commit b24b0b9856b42eb6598c053703a11f86b6a6346c
Author: Mike Kaganski
Date: Fri Jun 29 02:54:52 2018 +1000
tdf#118442: Fix incorrect index calculation
If a number string has leading spaces and/or minus, then calculating
index into the aBuf as the difference between p and pStart gives
wrong (too big) number. This asserts in debug builds, when e.g. an
assignment is made in a BASIC macro:
Dim f As Double
f = " -12.20"
"include/rtl/ustrbuf.hxx:490:
sal_Unicode &rtl::OUStringBuffer::operator[](sal_Int32):
Assertion `index >= 0 && index < pData->length' failed."
This affects, e.g., https://gerrit.libreoffice.org/56610 (see
https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/9527/consoleFull#1820989527d893063f-7f3d-4b7e-b56f-4e0f225817cd)
Change-Id: I14654166be721907e2a26ea6f4091f203a9437d7
Reviewed-on: https://gerrit.libreoffice.org/56611
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/basic/qa/basic_coverage/test_types_conversion.vb
b/basic/qa/basic_coverage/test_types_conversion.vb
new file mode 100644
index ..0de109bc984f
--- /dev/null
+++ b/basic/qa/basic_coverage/test_types_conversion.vb
@@ -0,0 +1,63 @@
+'
+' This file is part of the LibreOffice project.
+'
+' This Source Code Form is subject to the terms of the Mozilla Public
+' License, v. 2.0. If a copy of the MPL was not distributed with this
+' file, You can obtain one at http://mozilla.org/MPL/2.0/.
+'
+Option Explicit
+
+Dim nTotalCount As Integer
+Dim nPassCount As Integer
+Dim nFailCount As Integer
+
+Function doUnitTest() As Integer
+nTotalCount = 0
+nPassCount = 0
+nFailCount = 0
+
+' Test implicit conversions from string to number
+Dim nVal As Double
+' Simple integer
+StartTest()
+nVal = "123"
+AssertTest(nVal = 123)
+
+' Negative integer
+StartTest()
+nVal = "-123"
+AssertTest(nVal = -123)
+
+' Negative floating-point
+StartTest()
+nVal = "-123.45"
+AssertTest(nVal = -123.45)
+
+' Negative floating-point with leading and trailing spaces
+StartTest()
+nVal = " -123.45 "
+AssertTest(nVal = -123.45)
+
+' Wrong decimal separator
+StartTest()
+nVal = " -123,45 "
+AssertTest(nVal = -123)
+
+If ((nFailCount > 0) Or (nPassCount <> nTotalCount)) Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End Function
+
+Sub StartTest()
+nTotalCount = nTotalCount + 1
+End Sub
+
+Sub AssertTest(testResult As Boolean)
+If (testResult) Then
+nPassCount = nPassCount + 1
+Else
+nFailCount = nFailCount + 1
+End If
+End Sub
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 3003906678d1..7f9b4931ea48 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -120,6 +120,8 @@ ErrCode ImpScan( const OUString& rWSrc, double& nVal,
SbxDataType& rType,
(cIntntlDecSep && *p == cIntntlGrpSep) ||
(cIntntlDecSepAlt && *p == cIntntlDecSepAlt)) &&
rtl::isAsciiDigit( *(p+1) )))
{
+// tdf#118442: Whitespace and minus are skipped; store the position to
calculate index
+const sal_Unicode* const pDigitsStart = p;
short exp = 0;
short decsep = 0;
short ndig = 0;
@@ -145,7 +147,7 @@ ErrCode ImpScan( const OUString& rWSrc, double& nVal,
SbxDataType& rType,
if( *p == cNonIntntlDecSep || *p == cIntntlDecSep ||
(cIntntlDecSepAlt && *p == cIntntlDecSepAlt) )
{
// Use the separator that is passed to stringToDouble()
-aBuf[ p - pStart ] = cIntntlDecSep;
+aBuf[p - pDigitsStart] = cIntntlDecSep;
p++;
if( ++decsep > 1 )
continue;
@@ -159,7 +161,7 @@ ErrCode ImpScan( const OUString& rWSrc, double& nVal,
SbxDataType& rType,
}
if( *p == 'D' || *p == 'd' )
eScanType = SbxDOUBLE;
-aBuf[ p - pStart ] = 'E';
+aBuf[p - pDigitsStart] = 'E';
p++;
if (*p == '+')
++p;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt |binary
sw/qa/extras/ww8export/ww8export2.cxx | 12
sw/source/filter/ww8/wrtw8esh.cxx |3 ++-
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 1cedd88d40a26a55ce433f8b742215aea83a5382
Author: Justin Luth
Date: Thu Jun 28 15:48:40 2018 +0300
tdf#118421 ww8export: rotate vertically: not Lines or groups
Lines and Groups often are exceptions.
Normally, the import code swaps vertical rotations also. In the case
of lines (from the tests that I observed) lines don't have a rotation
value at that point during import, so no correction is made.
Grouping always messes things up.
Change-Id: I344c5a29f887294b751ffc87c01b30e472cfb4c2
Reviewed-on: https://gerrit.libreoffice.org/56595
Reviewed-by: Justin Luth
Tested-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt
b/sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt
new file mode 100644
index ..556f2564c7a2
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx
b/sw/qa/extras/ww8export/ww8export2.cxx
index e4e61cb6a084..83eaac7b9de5 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -315,6 +315,18 @@ DECLARE_WW8EXPORT_TEST(testTdf70838, "tdf70838.odt")
CPPUNIT_ASSERT(aRect.GetHeight() > aRect.GetWidth());
}
+DECLARE_WW8EXPORT_TEST(testTdf70838b_verticalRotation,
"tdf70838b_verticalRotation.odt")
+{
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SdrPage* pPage =
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+tools::Rectangle aGroupShape = pPage->GetObj(0)->GetSnapRect();
+tools::Rectangle aLine = pPage->GetObj(2)->GetSnapRect();
+
+CPPUNIT_ASSERT_MESSAGE("Smiley faces are round", aGroupShape.GetHeight() >
aGroupShape.GetWidth());
+CPPUNIT_ASSERT_MESSAGE("Line is taller, not wider", aLine.GetHeight() >
aLine.GetWidth());
+}
+
DECLARE_WW8EXPORT_TEST( testActiveXCheckbox, "checkbox_control.odt" )
{
// First check box anchored as a floating object
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 2949accdce54..34d3a650ecc6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -692,7 +692,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
// rotating to vertical means swapping height and width as
seen in SvxMSDffManager::ImportShape
const long nAngle = NormAngle360( pObj->GetRotateAngle() );
-if ( ( nAngle > 4500 && nAngle <= 13500 ) || ( nAngle >
22500 && nAngle <= 31500 ) )
+const bool bAllowSwap = pObj->GetObjIdentifier() !=
OBJ_LINE && pObj->GetObjIdentifier() != OBJ_GRUP;
+if ( bAllowSwap && (( nAngle > 4500 && nAngle <= 13500 )
|| ( nAngle > 22500 && nAngle <= 31500 )) )
{
const long nWidth = aRect.getWidth();
const long nHeight = aRect.getHeight();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/CppunitTest_sc_tablesheetsobj.mk
sc/CppunitTest_sc_tablesheetsobj.mk | 45 ++-- 1 file changed, 8 insertions(+), 37 deletions(-) New commits: commit e20b14e1e9f22a4ac55a7c9e6160f0b7665ff24d Author: Jens Carl Date: Fri Jun 29 03:08:42 2018 + Remove obsolete (cargo-cult copied) dependencies Change-Id: I0229c3221a2b4d1bc0b8fa3a0347c9e97136f333 Reviewed-on: https://gerrit.libreoffice.org/56646 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index b45b0dab97cb..60f72c548dee 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -11,51 +11,22 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_tablesheetsobj)) +$(eval $(call gb_CppunitTest_use_external,sc_tablesheetsobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetsobj, \ -sc/qa/extras/sctablesheetsobj \ + sc/qa/extras/sctablesheetsobj \ )) -$(eval $(call gb_CppunitTest_use_external,sc_tablesheetsobj,boost_headers)) - $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \ -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_tablesheetsobj,\ --I$(SRCDIR)/sc/source/ui/inc \ --I$(SRCDIR)/sc/inc \ -$$(INCLUDE) \ + $$(INCLUDE) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,sc_tablesheetsobj)) @@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_tablesheetsobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_tablesheetsobj)) $(eval $(call gb_CppunitTest_use_components,sc_tablesheetsobj,\ -$(sc_unoapi_common_components) \ + $(sc_unoapi_common_components) \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_tablesheetsobj)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/Module_sw.mk sw/qa sw/UITest_writer_tests2.mk
sw/Module_sw.mk|1
sw/UITest_writer_tests2.mk | 16 +++
sw/qa/uitest/writer_tests/data/LibreOffice.jpg |binary
sw/qa/uitest/writer_tests2/tdf116474.py| 55 +
4 files changed, 72 insertions(+)
New commits:
commit 616917f4e15d30307062f3c1a73656c8c9fbf3a9
Author: Zdeněk Crhonek
Date: Thu Jun 28 21:26:57 2018 +0200
uitest for bug tdf#116474
Change-Id: I6b19626bf872c2eff61c57342579ec682a1c37d0
Reviewed-on: https://gerrit.libreoffice.org/56632
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 1e56264ac8de..a05c310abdb9 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Module_add_screenshot_targets,sw,\
$(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_writer_tests \
+ UITest_writer_tests2 \
))
endif
diff --git a/sw/UITest_writer_tests2.mk b/sw/UITest_writer_tests2.mk
new file mode 100644
index ..11fcfcb0e992
--- /dev/null
+++ b/sw/UITest_writer_tests2.mk
@@ -0,0 +1,16 @@
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UITest_UITest,writer_tests2))
+
+$(eval $(call gb_UITest_add_modules,writer_tests2,$(SRCDIR)/sw/qa/uitest,\
+ writer_tests2/ \
+))
+
+$(eval $(call gb_UITest_set_defs,writer_tests2, \
+TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+))
diff --git a/sw/qa/uitest/writer_tests/data/LibreOffice.jpg
b/sw/qa/uitest/writer_tests/data/LibreOffice.jpg
new file mode 100644
index ..23812dcfdd7e
Binary files /dev/null and b/sw/qa/uitest/writer_tests/data/LibreOffice.jpg
differ
diff --git a/sw/qa/uitest/writer_tests2/tdf116474.py
b/sw/qa/uitest/writer_tests2/tdf116474.py
new file mode 100644
index ..1354efa7b899
--- /dev/null
+++ b/sw/qa/uitest/writer_tests2/tdf116474.py
@@ -0,0 +1,55 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+import time
+from uitest.path import get_srcdir_url
+from uitest.debug import sleep
+from uitest.uihelper.common import select_pos
+
+#Bug 116474 - Undo/redo: The redo of adding caption to an image isn't working:
no image
+
+def get_url_for_data_file(file_name):
+return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+
+class tdf116474(UITestCase):
+
+ def test_tdf116474_insert_caption_undo(self):
+writer_doc = self.ui_test.create_doc_in_start_center("writer")
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+document = self.ui_test.get_component()
+text = document.getText()
+cursor = text.createTextCursor()
+textGraphic =
document.createInstance('com.sun.star.text.TextGraphicObject')
+provider =
self.xContext.ServiceManager.createInstance('com.sun.star.graphic.GraphicProvider')
+graphic = provider.queryGraphic( mkPropertyValues({"URL":
get_url_for_data_file("LibreOffice.jpg")}))
+textGraphic.Graphic = graphic
+text.insertTextContent(cursor, textGraphic, False)
+#select image
+
document.getCurrentController().select(document.getDrawPage().getByIndex(0))
+
+
self.ui_test.execute_dialog_through_command(".uno:InsertCaptionDialog") #
caption
+xDialogCaption = self.xUITest.getTopFocusWindow()
+
+xCapt = xDialogCaption.getChild("caption_edit")
+xCapt.executeAction("TYPE", mkPropertyValues({"TEXT":"Caption"}))
+
+xOkBtn=xDialogCaption.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+xFrame = document.TextFrames.getByIndex(0)
+self.assertEqual(document.TextFrames.getByIndex(0).Text.String,
"\nFigure 1: Caption")
+self.assertEqual(document.GraphicObjects.getCount(), 1) #nr. of images
+#Undo, redo
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Redo")
+#Verify
+self.assertEqual(document.TextFrames.getByIndex(0).Text.String,
"\nFigure 1: Caption")
+self.assertEqual(document.GraphicObjects.getCount(), 1) #nr. of images
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/lc_shadowed.png |binary icon-themes/colibre/cmd/sc_shadowed.png |binary icon-themes/colibre_svg/cmd/lc_shadowed.svg |2 +- icon-themes/colibre_svg/cmd/sc_shadowed.svg |2 +- 4 files changed, 2 insertions(+), 2 deletions(-) New commits: commit c1a30df9828ace907194eb868a7633a37c067a78 Author: andreas kainz Date: Thu Jun 28 22:09:21 2018 +0200 Colibre icons: update shadowed icons Change-Id: Id6fadce6125a61d50f6211bf5c214974c923a8ad Reviewed-on: https://gerrit.libreoffice.org/56638 Reviewed-by: andreas_kainz Tested-by: andreas_kainz (cherry picked from commit 46fb1ca2163a72400b6dc981a3dd32613f1965bd) Reviewed-on: https://gerrit.libreoffice.org/56642 Tested-by: Jenkins diff --git a/icon-themes/colibre/cmd/lc_shadowed.png b/icon-themes/colibre/cmd/lc_shadowed.png index b8c713cfdefb..debda240ca33 100644 Binary files a/icon-themes/colibre/cmd/lc_shadowed.png and b/icon-themes/colibre/cmd/lc_shadowed.png differ diff --git a/icon-themes/colibre/cmd/sc_shadowed.png b/icon-themes/colibre/cmd/sc_shadowed.png index f0e598689a98..b4e3daa67d52 100644 Binary files a/icon-themes/colibre/cmd/sc_shadowed.png and b/icon-themes/colibre/cmd/sc_shadowed.png differ diff --git a/icon-themes/colibre_svg/cmd/lc_shadowed.svg b/icon-themes/colibre_svg/cmd/lc_shadowed.svg index 34a59efe4ccd..f5f036a7661f 100644 --- a/icon-themes/colibre_svg/cmd/lc_shadowed.svg +++ b/icon-themes/colibre_svg/cmd/lc_shadowed.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";>A \ No newline at end of file +http://www.w3.org/2000/svg";>A \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_shadowed.svg b/icon-themes/colibre_svg/cmd/sc_shadowed.svg index 3d57d159d907..64e0d5bbd2a8 100644 --- a/icon-themes/colibre_svg/cmd/sc_shadowed.svg +++ b/icon-themes/colibre_svg/cmd/sc_shadowed.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/cone.png |binary icon-themes/colibre/cmd/32/cube.png |binary icon-themes/colibre/cmd/32/cylinder.png |binary icon-themes/colibre/cmd/32/cyramid.png|binary icon-themes/colibre/cmd/32/halfsphere.png |binary icon-themes/colibre/cmd/32/shell3d.png|binary icon-themes/colibre/cmd/32/sphere.png |binary icon-themes/colibre/cmd/32/torus.png |binary icon-themes/colibre/cmd/lc_cone.png |binary icon-themes/colibre/cmd/lc_cube.png |binary icon-themes/colibre/cmd/lc_cylinder.png |binary icon-themes/colibre/cmd/lc_cyramid.png|binary icon-themes/colibre/cmd/lc_halfsphere.png |binary icon-themes/colibre/cmd/lc_shell3d.png|binary icon-themes/colibre/cmd/lc_sphere.png |binary icon-themes/colibre/cmd/lc_torus.png |binary icon-themes/colibre/cmd/sc_cone.png |binary icon-themes/colibre/cmd/sc_cube.png |binary icon-themes/colibre/cmd/sc_cylinder.png |binary icon-themes/colibre/cmd/sc_cyramid.png|binary icon-themes/colibre/cmd/sc_halfsphere.png |binary icon-themes/colibre/cmd/sc_shell3d.png|binary icon-themes/colibre/cmd/sc_sphere.png |binary icon-themes/colibre/cmd/sc_torus.png |binary icon-themes/colibre_svg/cmd/32/cone.svg |1 + icon-themes/colibre_svg/cmd/32/cube.svg |1 + icon-themes/colibre_svg/cmd/32/cylinder.svg |1 + icon-themes/colibre_svg/cmd/32/cyramid.svg|1 + icon-themes/colibre_svg/cmd/32/halfsphere.svg |1 + icon-themes/colibre_svg/cmd/32/shell3d.svg|1 + icon-themes/colibre_svg/cmd/32/sphere.svg |1 + icon-themes/colibre_svg/cmd/32/torus.svg |1 + icon-themes/colibre_svg/cmd/lc_cone.svg |2 +- icon-themes/colibre_svg/cmd/lc_cube.svg |2 +- icon-themes/colibre_svg/cmd/lc_cylinder.svg |2 +- icon-themes/colibre_svg/cmd/lc_cyramid.svg|2 +- icon-themes/colibre_svg/cmd/lc_halfsphere.svg |2 +- icon-themes/colibre_svg/cmd/lc_shell3d.svg|2 +- icon-themes/colibre_svg/cmd/lc_sphere.svg |2 +- icon-themes/colibre_svg/cmd/lc_torus.svg |2 +- icon-themes/colibre_svg/cmd/sc_cone.svg |2 +- icon-themes/colibre_svg/cmd/sc_cube.svg |2 +- icon-themes/colibre_svg/cmd/sc_cylinder.svg |2 +- icon-themes/colibre_svg/cmd/sc_cyramid.svg|2 +- icon-themes/colibre_svg/cmd/sc_halfsphere.svg |2 +- icon-themes/colibre_svg/cmd/sc_shell3d.svg|2 +- icon-themes/colibre_svg/cmd/sc_sphere.svg |2 +- icon-themes/colibre_svg/cmd/sc_torus.svg |2 +- 48 files changed, 24 insertions(+), 16 deletions(-) New commits: commit 945cca96e110262d2e33554716692f230215b189 Author: andreas kainz Date: Thu Jun 28 21:56:43 2018 +0200 Colibre icons: update 3d icons Change-Id: I248a0c7f32c2cfb1891fd618025f89f53e216267 Reviewed-on: https://gerrit.libreoffice.org/56636 Reviewed-by: andreas_kainz Tested-by: andreas_kainz (cherry picked from commit 6af8aa411189993942d4a8a13199b0a5e026c003) Reviewed-on: https://gerrit.libreoffice.org/56643 Tested-by: Jenkins diff --git a/icon-themes/colibre/cmd/32/cone.png b/icon-themes/colibre/cmd/32/cone.png new file mode 100644 index ..d90406c98657 Binary files /dev/null and b/icon-themes/colibre/cmd/32/cone.png differ diff --git a/icon-themes/colibre/cmd/32/cube.png b/icon-themes/colibre/cmd/32/cube.png new file mode 100644 index ..18699652fe6a Binary files /dev/null and b/icon-themes/colibre/cmd/32/cube.png differ diff --git a/icon-themes/colibre/cmd/32/cylinder.png b/icon-themes/colibre/cmd/32/cylinder.png new file mode 100644 index ..51292c2ed5f0 Binary files /dev/null and b/icon-themes/colibre/cmd/32/cylinder.png differ diff --git a/icon-themes/colibre/cmd/32/cyramid.png b/icon-themes/colibre/cmd/32/cyramid.png new file mode 100644 index ..1ad924a0d169 Binary files /dev/null and b/icon-themes/colibre/cmd/32/cyramid.png differ diff --git a/icon-themes/colibre/cmd/32/halfsphere.png b/icon-themes/colibre/cmd/32/halfsphere.png new file mode 100644 index ..522ed22a18ba Binary files /dev/null and b/icon-themes/colibre/cmd/32/halfsphere.png differ diff --git a/icon-themes/colibre/cmd/32/shell3d.png b/icon-themes/colibre/cmd/32/shell3d.png new file mode 100644 index ..31817bbc3e22 Binary files /dev/null and b/icon-themes/colibre/cmd/32/shell3d.png differ diff --git a/icon-themes/colibre/cmd/32/sphere.png b/icon-themes/colibre/cmd/32/sphere.png new file mode 100644 index ..3a888e019bda Binary files /dev/null and b/icon-themes/colibre/cmd/32/sphere.png differ diff --git a/icon-themes/colibre/cmd/32/torus.png b/icon-themes/colibre/cmd/32/torus.png new file mode 100644 index ..21ad1db0ba1f Binary files /dev/null and b/icon-themes/colibre/cmd/32/torus.png differ diff --g
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/formatpaintbrush.png |binary icon-themes/colibre/cmd/32/resetattributes.png|binary icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png |binary icon-themes/colibre/cmd/32/subscript.png |binary icon-themes/colibre/cmd/32/superscript.png|binary icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg |1 + icon-themes/colibre_svg/cmd/32/resetattributes.svg|1 + icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg |1 + icon-themes/colibre_svg/cmd/32/subscript.svg |1 + icon-themes/colibre_svg/cmd/32/superscript.svg|1 + 10 files changed, 5 insertions(+) New commits: commit e7d3976cb80f7e7401be071f905a764dd6cb4d6e Author: andreas kainz Date: Thu Jun 28 22:48:16 2018 +0200 Colibre icons: add 32px icons Change-Id: I696d3f643166f4a581e666c3a1b1340a3ab69499 Reviewed-on: https://gerrit.libreoffice.org/56640 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/32/formatpaintbrush.png b/icon-themes/colibre/cmd/32/formatpaintbrush.png new file mode 100644 index ..c87b4942bc3d Binary files /dev/null and b/icon-themes/colibre/cmd/32/formatpaintbrush.png differ diff --git a/icon-themes/colibre/cmd/32/resetattributes.png b/icon-themes/colibre/cmd/32/resetattributes.png new file mode 100644 index ..d9c541c4b051 Binary files /dev/null and b/icon-themes/colibre/cmd/32/resetattributes.png differ diff --git a/icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png b/icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png new file mode 100644 index ..1012fa4a9178 Binary files /dev/null and b/icon-themes/colibre/cmd/32/starshapes.vertical-scroll.png differ diff --git a/icon-themes/colibre/cmd/32/subscript.png b/icon-themes/colibre/cmd/32/subscript.png new file mode 100644 index ..2ba2128749ea Binary files /dev/null and b/icon-themes/colibre/cmd/32/subscript.png differ diff --git a/icon-themes/colibre/cmd/32/superscript.png b/icon-themes/colibre/cmd/32/superscript.png new file mode 100644 index ..f6fe517d9adb Binary files /dev/null and b/icon-themes/colibre/cmd/32/superscript.png differ diff --git a/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg new file mode 100644 index ..1751da06a474 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/formatpaintbrush.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/resetattributes.svg b/icon-themes/colibre_svg/cmd/32/resetattributes.svg new file mode 100644 index ..fc159a4669be --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/resetattributes.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg b/icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg new file mode 100644 index ..e454c751cf36 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/starshapes.vertical-scroll.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/subscript.svg b/icon-themes/colibre_svg/cmd/32/subscript.svg new file mode 100644 index ..474e6525eed2 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/subscript.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/superscript.svg b/icon-themes/colibre_svg/cmd/32/superscript.svg new file mode 100644 index ..b0442c91fe01 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/superscript.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/CppunitTest_sc_modelobj.mk sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xdocumentauditing.hxx | 47 ++
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv |1
qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java | 219 -
sc/CppunitTest_sc_modelobj.mk | 47 --
sc/qa/extras/scmodelobj.cxx| 12
test/Library_subsequenttest.mk |1
test/source/sheet/xdocumentauditing.cxx| 141
8 files changed, 211 insertions(+), 258 deletions(-)
New commits:
commit 81260b12666853bb9c21da487657e169cac6d4d9
Author: Jens Carl
Date: Fri Jun 29 02:47:08 2018 +
tdf#45904 Move _XDocumentAuditing Java test to C++
Change-Id: Ic03e42c9c2ff27579b442dc8d1408deaea839ec4
Reviewed-on: https://gerrit.libreoffice.org/56644
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/sheet/xdocumentauditing.hxx
b/include/test/sheet/xdocumentauditing.hxx
new file mode 100644
index ..6453c06c8e7b
--- /dev/null
+++ b/include/test/sheet/xdocumentauditing.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_XDOCUMENTAUDITING_HXX
+#define INCLUDED_TEST_SHEET_XDOCUMENTAUDITING_HXX
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XDocumentAuditing
+{
+public:
+virtual css::uno::Reference init() = 0;
+virtual css::uno::Reference getXMSF() = 0;
+
+void testRefreshArrows();
+
+protected:
+~XDocumentAuditing() {}
+
+private:
+bool hasRightAmountOfShapes(const
css::uno::Reference& xDrawPage,
+const sal_Int32& nElementCount, const
sal_Int32& nShapes);
+void dispatch(const css::uno::Reference& xFrame,
+ const css::uno::Sequence&
rArguments);
+css::awt::Point m_Position;
+};
+} // namespace apitest
+
+#endif // INCLUDED_TEST_SHEET_XDOCUMENTAUDITING_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index a7bc5b37b02d..a3188143c9f3 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -566,7 +566,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
qadevOOo/tests/java/ifc/sheet/_XCellRangeData \
qadevOOo/tests/java/ifc/sheet/_XCellRangesQuery \
-qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing \
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster \
qadevOOo/tests/java/ifc/sheet/_XRangeSelection \
qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
index 7509197e7665..6c6fe08e39c7 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScModelObj.csv
@@ -40,7 +40,6 @@
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"removePropertyChangeListener()"
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"addVetoableChangeListener()"
"ScModelObj";"com::sun::star::beans::XPropertySet#optional";"removeVetoableChangeListener()"
-"ScModelObj";"com::sun::star::sheet::XDocumentAuditing";"refreshArrows()"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"NamedRanges"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"DatabaseRanges"
"ScModelObj";"com::sun::star::sheet::SpreadsheetDocument";"ColumnLabelRanges"
diff --git a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
b/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
deleted file mode 100644
index 2d35679df840..
--- a/qadevOOo/tests/java/ifc/sheet/_XDocumentAuditing.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License");
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source
cui/source/dialogs/SignatureLineDialog.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4b0f8418089296fc8734b3fef34322eaed0e0fb2
Author: Samuel Mehrbrodt
Date: Thu Jun 28 09:33:53 2018 +0200
tdf#118429 Provide unsigned signature image
when creating signature line.
OOXML Export expects this.
Change-Id: Ib6ab1f879c5ef27e8347002576ba95104117cadd
Reviewed-on: https://gerrit.libreoffice.org/56576
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit b80207f5ac67ff585ce10f741803df12d3a308a7)
Reviewed-on: https://gerrit.libreoffice.org/56587
Reviewed-by: Thorsten Behrens
diff --git a/cui/source/dialogs/SignatureLineDialog.cxx
b/cui/source/dialogs/SignatureLineDialog.cxx
index a1716fe282b6..bd3d2a75003a 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -132,6 +132,7 @@ void SignatureLineDialog::Apply()
UNO_QUERY);
xShapeProps->setPropertyValue("Graphic", Any(xGraphic));
+xShapeProps->setPropertyValue("SignatureLineUnsignedImage", Any(xGraphic));
// Set signature line properties
xShapeProps->setPropertyValue("IsSignatureLine", Any(true));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/cone.png |binary icon-themes/colibre/cmd/32/cube.png |binary icon-themes/colibre/cmd/32/cylinder.png |binary icon-themes/colibre/cmd/32/cyramid.png|binary icon-themes/colibre/cmd/32/halfsphere.png |binary icon-themes/colibre/cmd/32/shell3d.png|binary icon-themes/colibre/cmd/32/sphere.png |binary icon-themes/colibre/cmd/32/torus.png |binary icon-themes/colibre/cmd/lc_cone.png |binary icon-themes/colibre/cmd/lc_cube.png |binary icon-themes/colibre/cmd/lc_cylinder.png |binary icon-themes/colibre/cmd/lc_cyramid.png|binary icon-themes/colibre/cmd/lc_halfsphere.png |binary icon-themes/colibre/cmd/lc_shell3d.png|binary icon-themes/colibre/cmd/lc_sphere.png |binary icon-themes/colibre/cmd/lc_torus.png |binary icon-themes/colibre/cmd/sc_cone.png |binary icon-themes/colibre/cmd/sc_cube.png |binary icon-themes/colibre/cmd/sc_cylinder.png |binary icon-themes/colibre/cmd/sc_cyramid.png|binary icon-themes/colibre/cmd/sc_halfsphere.png |binary icon-themes/colibre/cmd/sc_shell3d.png|binary icon-themes/colibre/cmd/sc_sphere.png |binary icon-themes/colibre/cmd/sc_torus.png |binary icon-themes/colibre_svg/cmd/32/cone.svg |1 + icon-themes/colibre_svg/cmd/32/cube.svg |1 + icon-themes/colibre_svg/cmd/32/cylinder.svg |1 + icon-themes/colibre_svg/cmd/32/cyramid.svg|1 + icon-themes/colibre_svg/cmd/32/halfsphere.svg |1 + icon-themes/colibre_svg/cmd/32/shell3d.svg|1 + icon-themes/colibre_svg/cmd/32/sphere.svg |1 + icon-themes/colibre_svg/cmd/32/torus.svg |1 + icon-themes/colibre_svg/cmd/lc_cone.svg |2 +- icon-themes/colibre_svg/cmd/lc_cube.svg |2 +- icon-themes/colibre_svg/cmd/lc_cylinder.svg |2 +- icon-themes/colibre_svg/cmd/lc_cyramid.svg|2 +- icon-themes/colibre_svg/cmd/lc_halfsphere.svg |2 +- icon-themes/colibre_svg/cmd/lc_shell3d.svg|2 +- icon-themes/colibre_svg/cmd/lc_sphere.svg |2 +- icon-themes/colibre_svg/cmd/lc_torus.svg |2 +- icon-themes/colibre_svg/cmd/sc_cone.svg |2 +- icon-themes/colibre_svg/cmd/sc_cube.svg |2 +- icon-themes/colibre_svg/cmd/sc_cylinder.svg |2 +- icon-themes/colibre_svg/cmd/sc_cyramid.svg|2 +- icon-themes/colibre_svg/cmd/sc_halfsphere.svg |2 +- icon-themes/colibre_svg/cmd/sc_shell3d.svg|2 +- icon-themes/colibre_svg/cmd/sc_sphere.svg |2 +- icon-themes/colibre_svg/cmd/sc_torus.svg |2 +- 48 files changed, 24 insertions(+), 16 deletions(-) New commits: commit 6af8aa411189993942d4a8a13199b0a5e026c003 Author: andreas kainz Date: Thu Jun 28 21:56:43 2018 +0200 Colibre icons: update 3d icons Change-Id: I248a0c7f32c2cfb1891fd618025f89f53e216267 Reviewed-on: https://gerrit.libreoffice.org/56636 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/32/cone.png b/icon-themes/colibre/cmd/32/cone.png new file mode 100644 index ..d90406c98657 Binary files /dev/null and b/icon-themes/colibre/cmd/32/cone.png differ diff --git a/icon-themes/colibre/cmd/32/cube.png b/icon-themes/colibre/cmd/32/cube.png new file mode 100644 index ..18699652fe6a Binary files /dev/null and b/icon-themes/colibre/cmd/32/cube.png differ diff --git a/icon-themes/colibre/cmd/32/cylinder.png b/icon-themes/colibre/cmd/32/cylinder.png new file mode 100644 index ..51292c2ed5f0 Binary files /dev/null and b/icon-themes/colibre/cmd/32/cylinder.png differ diff --git a/icon-themes/colibre/cmd/32/cyramid.png b/icon-themes/colibre/cmd/32/cyramid.png new file mode 100644 index ..1ad924a0d169 Binary files /dev/null and b/icon-themes/colibre/cmd/32/cyramid.png differ diff --git a/icon-themes/colibre/cmd/32/halfsphere.png b/icon-themes/colibre/cmd/32/halfsphere.png new file mode 100644 index ..522ed22a18ba Binary files /dev/null and b/icon-themes/colibre/cmd/32/halfsphere.png differ diff --git a/icon-themes/colibre/cmd/32/shell3d.png b/icon-themes/colibre/cmd/32/shell3d.png new file mode 100644 index ..31817bbc3e22 Binary files /dev/null and b/icon-themes/colibre/cmd/32/shell3d.png differ diff --git a/icon-themes/colibre/cmd/32/sphere.png b/icon-themes/colibre/cmd/32/sphere.png new file mode 100644 index ..3a888e019bda Binary files /dev/null and b/icon-themes/colibre/cmd/32/sphere.png differ diff --git a/icon-themes/colibre/cmd/32/torus.png b/icon-themes/colibre/cmd/32/torus.png new file mode 100644 index ..21ad1db0ba1f Binary files /dev/null and b/icon-themes/colibre/cmd/32/torus.png differ diff --git a/icon-themes/colibre/cmd/lc_cone.png b/icon-themes/colibre/cmd/lc_cone.png index add2b0de5629..ca449b576231 100644 Binary files a/icon-themes/col
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/lc_shadowed.png |binary icon-themes/colibre/cmd/sc_shadowed.png |binary icon-themes/colibre_svg/cmd/lc_shadowed.svg |2 +- icon-themes/colibre_svg/cmd/sc_shadowed.svg |2 +- 4 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 46fb1ca2163a72400b6dc981a3dd32613f1965bd Author: andreas kainz Date: Thu Jun 28 22:09:21 2018 +0200 Colibre icons: update shadowed icons Change-Id: Id6fadce6125a61d50f6211bf5c214974c923a8ad Reviewed-on: https://gerrit.libreoffice.org/56638 Reviewed-by: andreas_kainz Tested-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/lc_shadowed.png b/icon-themes/colibre/cmd/lc_shadowed.png index b8c713cfdefb..debda240ca33 100644 Binary files a/icon-themes/colibre/cmd/lc_shadowed.png and b/icon-themes/colibre/cmd/lc_shadowed.png differ diff --git a/icon-themes/colibre/cmd/sc_shadowed.png b/icon-themes/colibre/cmd/sc_shadowed.png index f0e598689a98..b4e3daa67d52 100644 Binary files a/icon-themes/colibre/cmd/sc_shadowed.png and b/icon-themes/colibre/cmd/sc_shadowed.png differ diff --git a/icon-themes/colibre_svg/cmd/lc_shadowed.svg b/icon-themes/colibre_svg/cmd/lc_shadowed.svg index 34a59efe4ccd..f5f036a7661f 100644 --- a/icon-themes/colibre_svg/cmd/lc_shadowed.svg +++ b/icon-themes/colibre_svg/cmd/lc_shadowed.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";>A \ No newline at end of file +http://www.w3.org/2000/svg";>A \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/sc_shadowed.svg b/icon-themes/colibre_svg/cmd/sc_shadowed.svg index 3d57d159d907..64e0d5bbd2a8 100644 --- a/icon-themes/colibre_svg/cmd/sc_shadowed.svg +++ b/icon-themes/colibre_svg/cmd/sc_shadowed.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg";> \ No newline at end of file +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-6.0' - pt_BR/Lightproof.py
pt_BR/Lightproof.py |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b676547a27e0dcb91f12576aaee845dc700c498f
Author: Tor Lillqvist
Date: Thu Jun 28 20:27:01 2018 +0300
tdf#118423: Fix problems introduced by my recent pt_BR speedup
Change-Id: I25b1d11e13c01678195210d42597281896543ff2
Reviewed-on: https://gerrit.libreoffice.org/56612
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/56615
Reviewed-by: Julien Nabet
diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py
index 0868693..61099ff 100644
--- a/pt_BR/Lightproof.py
+++ b/pt_BR/Lightproof.py
@@ -143,13 +143,16 @@ class Lightproof( unohelper.Base, XProofreader,
XServiceInfo, XServiceName, XSer
return aRes
def ignoreRule(self, rid, aLocale):
+import lightproof_impl_pt_BR
lightproof_impl_pt_BR.ignore[rid] = 1
def resetIgnoreRules(self):
+import lightproof_impl_pt_BR
lightproof_impl_pt_BR.ignore = {}
# XServiceDisplayName
def getServiceDisplayName(self, aLocale):
+import lightproof_impl_pt_BR
return lightproof_impl_pt_BR.name
g_ImplementationHelper = unohelper.ImplementationHelper()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b0f530c9215db725923a5d689808afd687c878f6 Author: Tor Lillqvist Date: Thu Jun 28 20:27:01 2018 +0300 Updated core Project: dictionaries b676547a27e0dcb91f12576aaee845dc700c498f tdf#118423: Fix problems introduced by my recent pt_BR speedup Change-Id: I25b1d11e13c01678195210d42597281896543ff2 Reviewed-on: https://gerrit.libreoffice.org/56612 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/56615 Reviewed-by: Julien Nabet diff --git a/dictionaries b/dictionaries index 72eac941c272..b676547a27e0 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 72eac941c272e56287dba1d8b6dd2c5e398d78c2 +Subproject commit b676547a27e0dcb91f12576aaee845dc700c498f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-1' - pt_BR/Lightproof.py
pt_BR/Lightproof.py |3 +++
1 file changed, 3 insertions(+)
New commits:
commit d401ecde39ee763e1d28c8850c3eb6fb628d29c3
Author: Tor Lillqvist
Date: Thu Jun 28 20:27:01 2018 +0300
tdf#118423: Fix problems introduced by my recent pt_BR speedup
Change-Id: I25b1d11e13c01678195210d42597281896543ff2
Reviewed-on: https://gerrit.libreoffice.org/56612
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/56613
Reviewed-by: Julien Nabet
Reviewed-by: Jean-Baptiste Faure
diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py
index 0868693..61099ff 100644
--- a/pt_BR/Lightproof.py
+++ b/pt_BR/Lightproof.py
@@ -143,13 +143,16 @@ class Lightproof( unohelper.Base, XProofreader,
XServiceInfo, XServiceName, XSer
return aRes
def ignoreRule(self, rid, aLocale):
+import lightproof_impl_pt_BR
lightproof_impl_pt_BR.ignore[rid] = 1
def resetIgnoreRules(self):
+import lightproof_impl_pt_BR
lightproof_impl_pt_BR.ignore = {}
# XServiceDisplayName
def getServiceDisplayName(self, aLocale):
+import lightproof_impl_pt_BR
return lightproof_impl_pt_BR.name
g_ImplementationHelper = unohelper.ImplementationHelper()
___
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' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efa4090b9a5c8b147d256812951e14fb8aa149b6 Author: Tor Lillqvist Date: Thu Jun 28 20:27:01 2018 +0300 Updated core Project: dictionaries d401ecde39ee763e1d28c8850c3eb6fb628d29c3 tdf#118423: Fix problems introduced by my recent pt_BR speedup Change-Id: I25b1d11e13c01678195210d42597281896543ff2 Reviewed-on: https://gerrit.libreoffice.org/56612 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/56613 Reviewed-by: Julien Nabet Reviewed-by: Jean-Baptiste Faure diff --git a/dictionaries b/dictionaries index 3b6db3f22845..d401ecde39ee 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 3b6db3f228458fa2b2f9911716b95ed0d632c9ce +Subproject commit d401ecde39ee763e1d28c8850c3eb6fb628d29c3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Self-signed certificate doubt
Hi all, I'm following the step of README file (WSD/README) to generate the new self-signed certificate. Could anyone explain me what's the 3 last commands of this list means? > openssl genrsa -out key.pem 2048 > openssl req -sha256 -new -key key.pem -out csr.pem > openssl ca -keyfile private/ca.key.pem -cert ca.cert.pem -extensions usr_cert > -notext -md sha256 -in csr.pem -out cert.pem I understand that it's generated a private key then the CSR certificate is created and next it's created CA certificate but it's already created in the previous steps. Why do this again? Thanks in advance. Besta Regards ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - offapi/com
offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f3dcdfcdda9acfdb8e65429015ab0390a4ecc5b7 Author: Eike Rathke Date: Thu Jun 28 15:06:49 2018 +0200 Document correct @param name NativeNumberParameters Jenkins for 'NativeNumberParams' unfortunately only on 6-1 bailed out with /home/tdf/lode/jenkins/workspace/gerrit_windows@2/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl:57: warning: The following parameters of com::sun::star::i18n::XNativeNumberSupplier2::getNativeNumberStringParams([in] string NumberString, [in] ::com::sun::star::lang::Locale Locale, [in] short NativeNumberMode, [in] string NativeNumberParameters) are not documented: parameter 'NativeNumberParameters' Change-Id: I3379e1bba5b79196c86410e0115d04eba49dc2a2 (cherry picked from commit 9c368751f6fbc50209e621182c3415ef4c4db29d) Reviewed-on: https://gerrit.libreoffice.org/56596 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl b/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl index 17a1df082c9f..bd125d096618 100644 --- a/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl +++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl @@ -51,7 +51,7 @@ interface XNativeNumberSupplier2 : ::com::sun::star::i18n::XNativeNumberSupplier @param Locale The locale. -@param NativeNumberParams +@param NativeNumberParameters The NatNum params (like "ordinal-digits" in [NatNum12 ordinal-digits]). */ string getNativeNumberStringParams( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg officecfg/registry
icon-themes/colibre/cmd/sc_addressbooksource.png |binary icon-themes/colibre/links.txt| 37 -- icon-themes/colibre_svg/cmd/sc_addressbooksource.svg |2 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 36 + officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 21 - 5 files changed, 88 insertions(+), 8 deletions(-) New commits: commit 2d863d5a55072955e55a71f4667cc2f7b828d16e Author: andreas kainz Date: Thu Jun 28 16:52:12 2018 +0200 writer: add icons for menubar actions Change-Id: Ib222936295c4815f9d87a0da4c2c7a93c929391c Reviewed-on: https://gerrit.libreoffice.org/56604 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/sc_addressbooksource.png b/icon-themes/colibre/cmd/sc_addressbooksource.png new file mode 100644 index ..20056e55e422 Binary files /dev/null and b/icon-themes/colibre/cmd/sc_addressbooksource.png differ diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 9b4ceea85423..0edb2380dc95 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -97,7 +97,9 @@ cmd/sc_insertformradio.png cmd/sc_radiobutton.png cmd/sc_insertformspin.png cmd/sc_spinbutton.png cmd/sc_insertformula.png cmd/sc_dbviewfunctions.png cmd/sc_insertformvscroll.png cmd/sc_scrollbar.png +cmd/sc_scrollbarmenu.png cmd/sc_scrollbar.png cmd/sc_insertframeinteract.png cmd/sc_insertframe.png +cmd/sc_insertframemenu.png cmd/sc_insertframe.png cmd/sc_insertframeinteractnocolumns.png cmd/sc_insertframe.png cmd/sc_insertimagecontrol.png cmd/sc_drawchart.png cmd/sc_insertobjectchart.png cmd/sc_drawchart.png @@ -213,6 +215,7 @@ cmd/sc_commentchange.png cmd/sc_commentchangetracking.png cmd/lc_commentchange.png cmd/lc_commentchangetracking.png cmd/sc_deleteallnotes.png cmd/sc_deleteallannotation.png cmd/lc_deleteallnotes.png cmd/lc_deleteallannotation.png +cmd/sc_formatallnotes.png cmd/sc_editannotation.png # Template Menu cmd/sc_templatemenu.png cmd/sc_adddirect.png @@ -279,6 +282,8 @@ cmd/lc_basicshapes.circle-pie.png cmd/lc_pie.png cmd/lc_flowchartshapes.flowchart-merge.png cmd/lc_fontworkshapetype.fontwork-triangle-down.png cmd/lc_fontworkshapetype.fontwork-fade-down.png cmd/lc_basicshapes.trapezoid.png cmd/lc_flowchartshapes.flowchart-magnetic-disk.png cmd/lc_basicshapes.can.png +cmd/sc_flowchartshapes.png cmd/lc_flowchartshapes.flowchart-document.png + cmd/lc_emojicontrol.png cmd/lc_symbolshapes.png cmd/sc_emojicontrol.png cmd/sc_symbolshapes.png @@ -406,6 +411,7 @@ cmd/sc_defaultparastyle.png cmd/sc_controlcodes.png cmd/lc_leaveallgroups.png cmd/lc_leavegroup.png cmd/sc_leaveallgroups.png cmd/sc_leavegroup.png cmd/sc_formatungroup.png cmd/sc_ungroup.png +cmd/sc_groupmenu.png cmd/sc_group.png # Undo cmd/lc_recundo.png cmd/lc_undo.png @@ -494,6 +500,7 @@ cmd/lc_xlinestyle.png cmd/lc_linestyle.png cmd/lc_hfixedline.png cmd/lc_line.png cmd/sc_xlinestyle.png cmd/sc_linestyle.png cmd/sc_hfixedline.png cmd/sc_line.png +cmd/sc_shapeslinemenu.png cmd/sc_line.png # Mail merge cmd/lc_mailmergefirstentry.png cmd/lc_firstrecord.png @@ -633,12 +640,14 @@ cmd/sc_fillcolor.png cmd/sc_formatarea.png # Notebookbar cmd/lc_headerandfooter.png cmd/lc_editheaderandfooter.png cmd/sc_headerandfooter.png cmd/sc_editheaderandfooter.png +cmd/sc_insertheaderfootermenu.png cmd/sc_editheaderandfooter.png cmd/lc_recalcpivottable.png cmd/lc_calculate.png cmd/sc_recalcpivottable.png cmd/sc_calculate.png cmd/lc_dataproviderrefresh.png cmd/lc_calculate.png cmd/sc_dataproviderrefresh.png cmd/sc_calculate.png cmd/lc_datafilterhideautofilter.png cmd/lc_removefiltersort.png cmd/sc_datafilterhideautofilter.png cmd/sc_removefiltersort.png +cmd/sc_insertsignatureline.png cmd/sc_signaturelinedialog.png # Ok cmd/lc_yes.png cmd/lc_ok.png @@ -718,6 +727,8 @@ cmd/sc_fontworkshapetype.png cmd/sc_fontwork.png # Ruler cmd/lc_showruler.png cmd/lc_ruler.png cmd/sc_showruler.png cmd/sc_ruler.png +cmd/lc_rulermenu.png cmd/lc_ruler.png +cmd/sc_rulermenu.png cmd/sc_ruler.png # Graphic Quality Color cmd/lc_outputqualitycolor.png cmd/lc_insertgraphic.png @@ -734,6 +745,7 @@ cmd/sc_toggleaxisdescr.png cmd/sc_helplinesvisible.png # Grid cmd/lc_gridvisible.png cmd/lc_grid.png cmd/sc_gridvisible.png cmd/sc_grid.png +cmd/sc_gridmenu.png cmd/sc_grid.png # Crop cmd/lc_grafattrcrop.png cmd/lc_crop.png @@ -784,6 +796,8 @@ cmd/lc_editstyled.png cmd/lc_editstyle.png cmd/sc_editstyled.png cmd/sc_editstyle.png cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png +cmd/lc_loadstyles.png cmd/lc_open.png +cmd/sc_loadstyles.png cmd/sc_open.png # Outline cmd/lc_outlineright.png cmd/lc_decrementlevel.png @@ -793,6 +807,10 @@ cmd/sc_outlineright.png cmd/sc_decrementlevel.png cmd/sc_outlineleft.png cmd/sc_decr
[Libreoffice-commits] online.git: loleaflet/css loleaflet/js
loleaflet/css/toolbar.css |2 ++
loleaflet/js/toolbar.js |5 -
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 46b4c62139fd031d0504447c82c0e640e0552e29
Author: Jan Holesovsky
Date: Thu Jun 28 21:33:34 2018 +0200
Cell borders: Implement the 'More...' button.
Change-Id: I3551cec69cf1e4dca02c0fcdbee23a4e06b1e36a
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 788dc4e10..d733fe095 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -410,6 +410,8 @@ button.leaflet-control-search-next
.w2ui-icon.frame10 { background: url('images/fr010.svg') no-repeat center
!important; }
.w2ui-icon.frame11 { background: url('images/fr011.svg') no-repeat center
!important; }
.w2ui-icon.frame12 { background: url('images/fr012.svg') no-repeat center
!important; }
+.w2ui-icon.frame13 { width: 108px !important; }
+#div-frame13 { width: 102px; height: 18px; text-align: center; display:
table-cell; vertical-align: middle; cursor: default; }
.w2ui-icon.accepttrackedchanges{ background:
url('images/lc_accepttrackedchanges.svg') no-repeat center !important; }
.w2ui-icon.alignblock{ background: url('images/lc_alignblock.svg') no-repeat
center !important; }
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index b336171b3..34382ea36 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -278,6 +278,8 @@ function setBorders(left, right, bottom, top, horiz, vert) {
function setBorderStyle(num) {
switch (num) {
+ case 0: map.sendUnoCommand('.uno:FormatCellBorders'); break;
+
case 1: setBorders(0, 0, 0, 0, 0, 0); break;
case 2: setBorders(1, 0, 0, 0, 0, 0); break;
case 3: setBorders(0, 1, 0, 0, 0, 0); break;
@@ -642,7 +644,8 @@ function createToolbar() {
'' +
'' +
'' +
- ''
+ '' +
+ '' +
_('More...') + ''
},
{type: 'drop', id: 'insertshapes', img:
'basicshapes_ellipse', hint: _('Insert shapes'), overlay: {onShow:
insertShapes},
html: ''},
___
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_svg
icon-themes/colibre/cmd/32/datafilterstandardfilter.png |binary icon-themes/colibre/cmd/32/deleteallannotation.png |binary icon-themes/colibre/cmd/32/deleteannotation.png |binary icon-themes/colibre/cmd/32/nextannotation.png |binary icon-themes/colibre/cmd/32/previousannotation.png |binary icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg |1 + icon-themes/colibre_svg/cmd/32/deleteallannotation.svg |1 + icon-themes/colibre_svg/cmd/32/deleteannotation.svg |1 + icon-themes/colibre_svg/cmd/32/nextannotation.svg |1 + icon-themes/colibre_svg/cmd/32/previousannotation.svg |1 + 10 files changed, 5 insertions(+) New commits: commit dc1276c8ddc7efd8f492a68e115f98cd68f4 Author: andreas kainz Date: Thu Jun 28 11:19:51 2018 +0200 Colibre icons add some 32px icons Change-Id: I480178687b3403b60d3466ce44524a4ce8753d48 Reviewed-on: https://gerrit.libreoffice.org/56583 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 71741c51e2e846fd474aaa62c79e7c92e608f866) Reviewed-on: https://gerrit.libreoffice.org/56608 diff --git a/icon-themes/colibre/cmd/32/datafilterstandardfilter.png b/icon-themes/colibre/cmd/32/datafilterstandardfilter.png new file mode 100644 index ..11e751168936 Binary files /dev/null and b/icon-themes/colibre/cmd/32/datafilterstandardfilter.png differ diff --git a/icon-themes/colibre/cmd/32/deleteallannotation.png b/icon-themes/colibre/cmd/32/deleteallannotation.png new file mode 100644 index ..5be575f80638 Binary files /dev/null and b/icon-themes/colibre/cmd/32/deleteallannotation.png differ diff --git a/icon-themes/colibre/cmd/32/deleteannotation.png b/icon-themes/colibre/cmd/32/deleteannotation.png new file mode 100644 index ..31ae58bb06b7 Binary files /dev/null and b/icon-themes/colibre/cmd/32/deleteannotation.png differ diff --git a/icon-themes/colibre/cmd/32/nextannotation.png b/icon-themes/colibre/cmd/32/nextannotation.png new file mode 100644 index ..bd0664385557 Binary files /dev/null and b/icon-themes/colibre/cmd/32/nextannotation.png differ diff --git a/icon-themes/colibre/cmd/32/previousannotation.png b/icon-themes/colibre/cmd/32/previousannotation.png new file mode 100644 index ..1846a9c3845d Binary files /dev/null and b/icon-themes/colibre/cmd/32/previousannotation.png differ diff --git a/icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg b/icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg new file mode 100644 index ..2040352b89aa --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/deleteallannotation.svg b/icon-themes/colibre_svg/cmd/32/deleteallannotation.svg new file mode 100644 index ..ad9028af470d --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/deleteallannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/deleteannotation.svg b/icon-themes/colibre_svg/cmd/32/deleteannotation.svg new file mode 100644 index ..dbd5563fd573 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/deleteannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/nextannotation.svg b/icon-themes/colibre_svg/cmd/32/nextannotation.svg new file mode 100644 index ..0a7bed2527c9 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/nextannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/previousannotation.svg b/icon-themes/colibre_svg/cmd/32/previousannotation.svg new file mode 100644 index ..7b9a5778c037 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/previousannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: pt_BR/Lightproof.py
pt_BR/Lightproof.py |3 +++
1 file changed, 3 insertions(+)
New commits:
commit fe72d24920c8a4dcbee18925cb19e6b6625f6553
Author: Tor Lillqvist
Date: Thu Jun 28 20:27:01 2018 +0300
tdf#118423: Fix problems introduced by my recent pt_BR speedup
Change-Id: I25b1d11e13c01678195210d42597281896543ff2
Reviewed-on: https://gerrit.libreoffice.org/56612
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py
index 0868693..61099ff 100644
--- a/pt_BR/Lightproof.py
+++ b/pt_BR/Lightproof.py
@@ -143,13 +143,16 @@ class Lightproof( unohelper.Base, XProofreader,
XServiceInfo, XServiceName, XSer
return aRes
def ignoreRule(self, rid, aLocale):
+import lightproof_impl_pt_BR
lightproof_impl_pt_BR.ignore[rid] = 1
def resetIgnoreRules(self):
+import lightproof_impl_pt_BR
lightproof_impl_pt_BR.ignore = {}
# XServiceDisplayName
def getServiceDisplayName(self, aLocale):
+import lightproof_impl_pt_BR
return lightproof_impl_pt_BR.name
g_ImplementationHelper = unohelper.ImplementationHelper()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4b1564efd72a718a510d45dcb4ad16dd6965dd73 Author: Tor Lillqvist Date: Thu Jun 28 20:27:01 2018 +0300 Updated core Project: dictionaries fe72d24920c8a4dcbee18925cb19e6b6625f6553 tdf#118423: Fix problems introduced by my recent pt_BR speedup Change-Id: I25b1d11e13c01678195210d42597281896543ff2 Reviewed-on: https://gerrit.libreoffice.org/56612 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/dictionaries b/dictionaries index 846e5da4b28b..fe72d24920c8 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 846e5da4b28bb40158cfb992f3a371614e25a349 +Subproject commit fe72d24920c8a4dcbee18925cb19e6b6625f6553 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - slideshow/source
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 108 -
slideshow/source/engine/shapes/drawshapesubsetting.hxx |8 -
slideshow/source/inc/doctreenode.hxx |1
3 files changed, 54 insertions(+), 63 deletions(-)
New commits:
commit e6f945ad12245496f09d01f05ca75d673b3d58d2
Author: Mike Kaganski
Date: Thu Jun 28 14:51:31 2018 +1000
tdf#102195: don't exclude everything between first and last subset
When subsets are non-contiguous, we need to include the parts between
subsets.
Change-Id: I28214dccc75e6a6af5c65397b2126049a65bf79f
Reviewed-on: https://gerrit.libreoffice.org/56575
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index d8a1ad127f55..fdb6bdc66f4a 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -164,54 +164,67 @@ namespace slideshow
mbNodeTreeInitialized = true;
}
-void DrawShapeSubsetting::updateSubsetBounds( const SubsetEntry&
rSubsetEntry )
+void DrawShapeSubsetting::excludeSubset(sal_Int32 nExcludedStart,
sal_Int32 nExcludedEnd)
{
-// TODO(F1): This removes too much from non-contiguous subsets
-mnMinSubsetActionIndex = ::std::min(
-mnMinSubsetActionIndex,
-rSubsetEntry.mnStartActionIndex );
-mnMaxSubsetActionIndex = ::std::max(
-mnMaxSubsetActionIndex,
-rSubsetEntry.mnEndActionIndex );
-}
-
-void DrawShapeSubsetting::updateSubsets()
-{
-maCurrentSubsets.clear();
+// If current subsets are empty, fill it with initial range
+initCurrentSubsets();
+if (maCurrentSubsets.empty())
+{
+// Non-subsetting mode (not a subset of anything; child
subsets subtract content)
+maCurrentSubsets.push_back(DocTreeNode(0,
maActionClassVector.size(),
+
DocTreeNode::NODETYPE_INVALID));
+}
-if( !maSubsetShapes.empty() )
+slideshow::internal::VectorOfDocTreeNodes aNodesToAppend;
+for (auto i = maCurrentSubsets.begin(); i !=
maCurrentSubsets.end();)
{
-if( maSubset.isEmpty() )
+if (i->getStartIndex() < nExcludedStart)
{
-// non-subsetted node, with some child subsets
-// that subtract from it
-maCurrentSubsets.push_back( DocTreeNode( 0,
-
mnMinSubsetActionIndex,
-
DocTreeNode::NODETYPE_INVALID ) );
-maCurrentSubsets.push_back( DocTreeNode(
mnMaxSubsetActionIndex,
-
maActionClassVector.size(),
-
DocTreeNode::NODETYPE_INVALID ) );
+if (i->getEndIndex() > nExcludedStart)
+{
+// Some overlap -> append new node (if required), and
correct this node's end
+if (i->getEndIndex() > nExcludedEnd)
+{
+aNodesToAppend.push_back(DocTreeNode(nExcludedEnd,
i->getEndIndex(),
+
DocTreeNode::NODETYPE_INVALID));
+}
+i->setEndIndex(nExcludedStart);
+}
+++i;
+}
+else if (i->getStartIndex() < nExcludedEnd)
+{
+if (i->getEndIndex() > nExcludedEnd)
+{
+// Partial overlap; change the node's start
+i->setStartIndex(nExcludedEnd);
+++i;
+}
+else
+{
+// Node is fully inside the removed range: erase it
+i = maCurrentSubsets.erase(i);
+}
}
else
{
-// subsetted node, from which some further child
-// subsets subtract content
-maCurrentSubsets.push_back( DocTreeNode(
maSubset.getStartIndex(),
-
mnMinSubsetActionIndex,
-
DocTreeNode::NODETYPE_INVALID ) );
-maCurrentSubsets.push_back( DocTreeNode(
mnMaxSubsetActionIndex,
-
maSubse
[Libreoffice-commits] online.git: loleaflet/src wsd/LOOLWSD.cpp
loleaflet/src/layer/tile/TileLayer.js |4 +++-
wsd/LOOLWSD.cpp | 16
2 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 8156c2a8f13a61a65f7f9cc017c3a66d33ac7457
Author: Pranav Kant
Date: Wed Jun 27 19:53:25 2018 +0530
wsd: in case of multiple query param, handle &attachment= correctly
In case of integration with OC/NC, we have WOPISrc= as query param used
for load balancing. So, the earlier approach failed with integration.
Change-Id: Ib73f4f18eaec870dd53b67886b1b6016416a2e78
Reviewed-on: https://gerrit.libreoffice.org/56531
Reviewed-by: pranavk
Tested-by: pranavk
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 1f0d283ec..1a7cb886f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -578,7 +578,9 @@ L.TileLayer = L.GridLayer.extend({
// due to a pdf.js issue -
https://github.com/mozilla/pdf.js/issues/5397
// open the pdf file in a new tab so that that
user can print it directly in the browser's
// pdf viewer
- window.open(url + '?attachment=0', '_blank');
+ var param = wopiSrc !== '' ? '&' : '?';
+ param += 'attachment=0';
+ window.open(url + param, '_blank');
}
else {
this._map.fire('filedownloadready', {url: url});
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 25ec59258..b7a954869 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2210,15 +2210,23 @@ private:
LOG_INF("HTTP request for: " << filePath.toString());
if (filePath.isAbsolute() && File(filePath).exists())
{
-int serveAsAttachment = 1;
-if (tokens.count() >= 7)
-getTokenInteger(tokens[6], "attachment",
serveAsAttachment);
+const Poco::URI postRequestUri(request.getURI());
+const Poco::URI::QueryParameters postRequestQueryParams =
postRequestUri.getQueryParameters();
+
+bool serveAsAttachment = true;
+const auto attachmentIt =
std::find_if(postRequestQueryParams.begin(),
+
postRequestQueryParams.end(),
+ [](const
std::pair& element) {
+ return
element.first == "attachment";
+ });
+if (attachmentIt != postRequestQueryParams.end())
+serveAsAttachment = attachmentIt->second != "0";
// Instruct browsers to download the file, not display it
// with the exception of SVG where we need the browser to
// actually show it.
std::string contentType = getContentType(fileName);
-if (serveAsAttachment != 0 && contentType != "image/svg+xml")
+if (serveAsAttachment && contentType != "image/svg+xml")
response.set("Content-Disposition", "attachment;
filename=\"" + fileName + "\"");
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - drawinglayer/source
drawinglayer/source/tools/emfphelperdata.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 8e5441469e07e85c5bd278ac5777eb2b550f900a
Author: Caolán McNamara
Date: Tue Jun 26 11:58:30 2018 +0100
forcepoint#47 bail when we detect the emf is broken
Change-Id: I065635393763af774b45cbba6bd85c4334383b93
Reviewed-on: https://gerrit.libreoffice.org/56458
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 2c49949870f4..509ce5339a55 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -837,12 +837,21 @@ namespace emfplushelper
next = rMS.Tell() + (size - 12);
if (size < 12)
+{
SAL_WARN("drawinglayer", "Size field is less than 12 bytes");
+break;
+}
else if (size > length)
+{
SAL_WARN("drawinglayer", "Size field is greater than bytes
left");
+break;
+}
if (dataSize > (size - 12))
+{
SAL_WARN("drawinglayer", "DataSize field is greater than
Size-12");
+break;
+}
SAL_INFO("drawinglayer", "EMF+ record size: " << size << " type: "
<< emfTypeToName(type) << " flags: " << flags << " data size: " << dataSize);
___
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/misc/swruler.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 37cf47dabf742ab8ca4852d3aa298a36d169302c
Author: Jan Holesovsky
Date: Thu Jun 28 16:12:30 2018 +0200
lok: Don't even try to paint the ruler via LibreOfficeKit.
But we need to have it behind the scenes, otherwise the Online's ruler
does not get notifications.
Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
Reviewed-on: https://gerrit.libreoffice.org/56598
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit ee6e6bd5b853aa68c9721f53b5892384e7403eec)
Reviewed-on: https://gerrit.libreoffice.org/56601
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index c208c9eeb353..1784ac20dbcd 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect)
{
+if (comphelper::LibreOfficeKit::isActive())
+return; // no need to waste time on startup
+
SvxRuler::Paint(rRenderContext, rRect);
// Don't draw if there is not any note
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/solver/solver.py |1 - 1 file changed, 1 deletion(-) New commits: commit 164b1927050086824d7bfd38e006ec9f7225f745 Author: Stephan Bergmann Date: Thu Jun 28 13:04:04 2018 +0200 Remove leftover import ...from 1b4c09401053ff6df8de9e839299ac26efa28b37 "uitest Calc/Goal seek; tdf#37341 ; tdf#43693" Change-Id: I7c346311c975709e71ca332a8894e6df7a745ab6 Reviewed-on: https://gerrit.libreoffice.org/56588 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sc/qa/uitest/solver/solver.py b/sc/qa/uitest/solver/solver.py index 2ac209b3d96b..1a409dca1b97 100644 --- a/sc/qa/uitest/solver/solver.py +++ b/sc/qa/uitest/solver/solver.py @@ -10,7 +10,6 @@ from uitest.uihelper.common import select_pos from uitest.uihelper.calc import enter_text_to_cell from libreoffice.calc.document import get_cell_by_position from libreoffice.uno.propertyvalue import mkPropertyValues -from uitest.debug import sleep import org.libreoffice.unotest import pathlib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/editeng
include/editeng/pmdlitem.hxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit 3017995579af5c8a74f8d04bc92dc24eac1ded9f
Author: Stephan Bergmann
Date: Thu Jun 28 13:57:49 2018 +0200
Curious inconsistency of SvxPageModelItem copy functions
...where the implicitly-defined copy ctor will copy the bAuto member while
the
user-provided copy assignment op does not. The code is like that ever
since at
least c779feb1dfa340d61902dcd9d0b754046ffd8e5b "INTEGRATION: CWS
hedaburemove01".
The bAuto member is only used in Put/QueryValue with MID_AUTO, but MID_AUTO
appears to be effectively unused? So lets assume that the user-provided
copy
assignment op is like that due to a (presumably harmless?) accident, and
make it
implicit, too. (Avoids -Wdeprecated-copy with GCC trunk towards GCC 9.)
Change-Id: I4e3156305e2b9862d337074105edc4317538af1f
Reviewed-on: https://gerrit.libreoffice.org/56592
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx
index a1c895fe98cb..f6343e8342e5 100644
--- a/include/editeng/pmdlitem.hxx
+++ b/include/editeng/pmdlitem.hxx
@@ -40,7 +40,6 @@ public:
explicit inline SvxPageModelItem( sal_uInt16 nWh );
inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/,
sal_uInt16 nWh );
-inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel );
virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const
override;
@@ -66,12 +65,6 @@ inline SvxPageModelItem::SvxPageModelItem( const OUString&
rModel, bool bA,
bAuto( bA )
{}
-inline SvxPageModelItem& SvxPageModelItem::operator=( const SvxPageModelItem&
rModel )
-{
-SetValue( rModel.GetValue() );
-return *this;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js | 83 --
loleaflet/src/control/Parts.js|2
2 files changed, 79 insertions(+), 6 deletions(-)
New commits:
commit 1580639831c064cb4de418f31c21cbe1efd2d848
Author: Marco Cecchetti
Date: Fri Jun 22 10:30:20 2018 +0200
On-demand loading of the page previews in the Online Draw/Impress
Change-Id: I56b1febd7f57324e878f06d417d2f58754e850fc
Reviewed-on: https://gerrit.libreoffice.org/56275
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 055f1053d..467bf6fc8 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,6 +12,7 @@ L.Control.PartsPreview = L.Control.extend({
this._previewInitialized = false;
this._previewTiles = [];
this._partsPreviewCont = L.DomUtil.get('slide-sorter');
+ this._scrollY = 0;
map.on('updateparts', this._updateDisabled, this);
map.on('updatepart', this._updatePart, this);
@@ -38,8 +39,11 @@ L.Control.PartsPreview = L.Control.extend({
this._map.invalidateSize();
$('.scroll-container').mCustomScrollbar('update');
}, this), 500);
+ var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
+ this._previewContTop = previewContBB.top;
+ var bottomBound = previewContBB.bottom +
previewContBB.height / 2;
for (var i = 0; i < parts; i++) {
-
this._previewTiles.push(this._createPreview(i, e.partNames[i]));
+
this._previewTiles.push(this._createPreview(i, e.partNames[i], bottomBound));
}
L.DomUtil.addClass(this._previewTiles[selectedPart], 'preview-img-selected');
this._previewInitialized = true;
@@ -59,19 +63,54 @@ L.Control.PartsPreview = L.Control.extend({
}
},
- _createPreview: function (i, hashCode) {
+ _createPreview: function (i, hashCode, bottomBound) {
var frame = L.DomUtil.create('div', 'preview-frame',
this._partsPreviewCont);
L.DomUtil.create('span', 'preview-helper', frame);
+
var imgClassName = 'preview-img';
var img = L.DomUtil.create('img', imgClassName, frame);
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
+ img.fetched = false;
L.DomEvent
.on(img, 'click', L.DomEvent.stopPropagation)
.on(img, 'click', L.DomEvent.stop)
.on(img, 'click', this._setPart, this)
.on(img, 'click', this._refocusOnMap, this);
- this._map.getPreview(i, i, 180, 180, {autoUpdate:
this.options.autoUpdate});
+
+ var topBound = this._previewContTop;
+ var previewFrameTop = 0;
+ var previewFrameBottom = 0;
+ if (i > 0) {
+ if (!bottomBound) {
+ var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
+ bottomBound = this._previewContTop +
previewContBB.height + previewContBB.height / 2;
+ }
+ previewFrameTop = this._previewContTop +
this._previewFrameMargin + i * (this._previewFrameHeight +
this._previewFrameMargin);
+ previewFrameTop -= this._scrollY;
+ previewFrameBottom = previewFrameTop +
this._previewFrameHeight;
+ L.DomUtil.setStyle(img, 'height',
this._previewImgHeight + 'px');
+ }
+
+ var imgSize;
+ if (i === 0 || (previewFrameTop >= topBound && previewFrameTop
<= bottomBound)
+ || (previewFrameBottom >= topBound &&
previewFrameBottom <= bottomBound)) {
+ imgSize = this._map.getPreview(i, i, 180, 180,
{autoUpdate: this.options.autoUpdate});
+ img.fetched = true;
+ L.DomUtil.setStyle(img, 'height', '');
+ }
+
+ if (i === 0) {
+ var previewImgBorder =
Math.round(parseFloat(L.DomUtil.getStyle(img, 'border-top-width')));
+ var previewImgMinWidth =
Math.round(parseFloat(L.DomUtil.getStyle(img, 'min-width')));
+ var imgHeight = imgSize.height;
+ if (imgSize.width < previewImgMinWidth)
+
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/datafilterstandardfilter.png |binary icon-themes/colibre/cmd/32/deleteallannotation.png |binary icon-themes/colibre/cmd/32/deleteannotation.png |binary icon-themes/colibre/cmd/32/nextannotation.png |binary icon-themes/colibre/cmd/32/previousannotation.png |binary icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg |1 + icon-themes/colibre_svg/cmd/32/deleteallannotation.svg |1 + icon-themes/colibre_svg/cmd/32/deleteannotation.svg |1 + icon-themes/colibre_svg/cmd/32/nextannotation.svg |1 + icon-themes/colibre_svg/cmd/32/previousannotation.svg |1 + 10 files changed, 5 insertions(+) New commits: commit 71741c51e2e846fd474aaa62c79e7c92e608f866 Author: andreas kainz Date: Thu Jun 28 11:19:51 2018 +0200 Colibre icons add some 32px icons Change-Id: I480178687b3403b60d3466ce44524a4ce8753d48 Reviewed-on: https://gerrit.libreoffice.org/56583 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/icon-themes/colibre/cmd/32/datafilterstandardfilter.png b/icon-themes/colibre/cmd/32/datafilterstandardfilter.png new file mode 100644 index ..11e751168936 Binary files /dev/null and b/icon-themes/colibre/cmd/32/datafilterstandardfilter.png differ diff --git a/icon-themes/colibre/cmd/32/deleteallannotation.png b/icon-themes/colibre/cmd/32/deleteallannotation.png new file mode 100644 index ..5be575f80638 Binary files /dev/null and b/icon-themes/colibre/cmd/32/deleteallannotation.png differ diff --git a/icon-themes/colibre/cmd/32/deleteannotation.png b/icon-themes/colibre/cmd/32/deleteannotation.png new file mode 100644 index ..31ae58bb06b7 Binary files /dev/null and b/icon-themes/colibre/cmd/32/deleteannotation.png differ diff --git a/icon-themes/colibre/cmd/32/nextannotation.png b/icon-themes/colibre/cmd/32/nextannotation.png new file mode 100644 index ..bd0664385557 Binary files /dev/null and b/icon-themes/colibre/cmd/32/nextannotation.png differ diff --git a/icon-themes/colibre/cmd/32/previousannotation.png b/icon-themes/colibre/cmd/32/previousannotation.png new file mode 100644 index ..1846a9c3845d Binary files /dev/null and b/icon-themes/colibre/cmd/32/previousannotation.png differ diff --git a/icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg b/icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg new file mode 100644 index ..2040352b89aa --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/datafilterstandardfilter.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/deleteallannotation.svg b/icon-themes/colibre_svg/cmd/32/deleteallannotation.svg new file mode 100644 index ..ad9028af470d --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/deleteallannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/deleteannotation.svg b/icon-themes/colibre_svg/cmd/32/deleteannotation.svg new file mode 100644 index ..dbd5563fd573 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/deleteannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/nextannotation.svg b/icon-themes/colibre_svg/cmd/32/nextannotation.svg new file mode 100644 index ..0a7bed2527c9 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/nextannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colibre_svg/cmd/32/previousannotation.svg b/icon-themes/colibre_svg/cmd/32/previousannotation.svg new file mode 100644 index ..7b9a5778c037 --- /dev/null +++ b/icon-themes/colibre_svg/cmd/32/previousannotation.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg";> \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: schema/libreoffice schema/odf1.3
schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng | 12 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng | 442 -- schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng | 12 schema/odf1.3/OpenDocument-schema-v1.3.rng | 442 -- 4 files changed, 444 insertions(+), 464 deletions(-) New commits: commit 85b25ae7710ea24e73100a32aa42933d33d449e7 Author: Michael Stahl Date: Thu Jun 21 18:05:17 2018 +0200 schema: fix some obvious issues in ODF 1.3 schemas editorial changes: * maintain alphabetical sorting (by moving some of the new named patterns) * consistent indentation substantive changes: * manifest schema: for no apparent reason, the QName pattern lost its + * OFFICE-2118: Fatal: reference to the undefined pattern "table-data-pilot-groups" * OFFICE-3857: Fatal: more than one attribute accepts the same name "scale-to" * OFFICE-3933: the removal part of the diff was not applied * OFFICE-3883: applied one line off, with missing rng: namespace prefix * OFFICE-3928: - removed combine=interleave attribute (was in 1.1 but no longer used in 1.2 schema) - added missing rng: prefix to Change-Id: I80871dec69b1dbc7b1438366d895c443a44fb72c Reviewed-on: https://gerrit.libreoffice.org/56398 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng index 814b5f121be9..48c11a0f7010 100644 --- a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng @@ -177,11 +177,11 @@ - + PGP - + PBKDF2 @@ -194,7 +194,7 @@ - + @@ -205,9 +205,9 @@ - + - + @@ -221,7 +221,7 @@ - [^:]:[^:] + [^:]+:[^:]+ diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng index 889cc2e161ab..384b88162e1c 100644 --- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng @@ -492,7 +492,7 @@ - + @@ -536,6 +536,17 @@ + + + + + + + + + + + @@ -751,8 +762,8 @@ - + @@ -782,8 +793,8 @@ - - + + @@ -841,16 +852,6 @@ - - - - - - - - - - @@ -1525,8 +1526,9 @@ - + + @@ -1700,6 +1702,14 @@ + + + + + + + + @@ -4976,28 +4986,11 @@ - -simple - - - - - - - embed - - - - - onLoad - - - - - + + @@ -5328,19 +5321,12 @@ + - - - - - - - - @@ -5693,7 +5679,7 @@ - + @@ -7190,6 +7176,12 @@ + + + + + + @@ -7374,8 +7366,9 @@ - + + @@ -7401,23 +7394,6 @@ - - - - - - - - - - - - - - - - - @@ -7450,6 +7426,18 @@ + + + + + + + + + + + + @@ -7521,9 +7509,9 @@ - - - + + + @@ -8289,27 +8277,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -8582,6 +8549,27 @@ + + + + + + + + + + +
[Libreoffice-commits] core.git: schema/libreoffice schema/odf1.3
schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng |2 schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng | 69 + schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng | 365 +++--- schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng |2 schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng | 69 + schema/odf1.3/OpenDocument-schema-v1.3.rng | 365 +++--- 6 files changed, 680 insertions(+), 192 deletions(-) New commits: commit 72225e1a70feee56bf0d013cd198e8b7f850f7a5 Author: Michael Stahl Date: Tue Jun 19 17:27:18 2018 +0200 schema: update to latest available ODF 1.3 draft schemas OpenDocument-schema-v1.3-wd06.rng OpenDocument-manifest-schema-v1.3-wd01.rng OpenDocument-dsig-schema-v1.3-wd01.rng (same for libreoffice dir, those are unchanged currently) Change-Id: I8f5c3069d436a501ce87223c4fdaa7c657fe7218 Reviewed-on: https://gerrit.libreoffice.org/56397 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng index 2694b58dda83..7fd47cf2352e 100644 --- a/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-dsig-schema-v1.3+libreoffice.rng @@ -43,7 +43,7 @@ - + diff --git a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng index f485ffbd019c..814b5f121be9 100644 --- a/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-manifest-schema-v1.3+libreoffice.rng @@ -81,6 +81,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,29 +177,38 @@ - + - - PBKDF2 - - - - - - - - + PGP - - + + + +PBKDF2 + + + + + + + - - + + + + + + + + + + + @@ -184,7 +221,7 @@ - [^:]+:[^:]+ + [^:]:[^:] diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng index 76e6184886c7..889cc2e161ab 100644 --- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng +++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng @@ -491,6 +491,10 @@ + + + + @@ -749,6 +753,7 @@ + @@ -775,6 +780,10 @@ + + + + @@ -832,6 +841,16 @@ + + + + + + + + + + @@ -1504,6 +1523,11 @@ + + + + + @@ -2206,9 +2230,10 @@ - + auto + @@ -2955,7 +2980,8 @@ - + + @@ -4967,6 +4993,14 @@ + + + + + + + + @@ -5293,11 +5327,20 @@ + + + + + + + + + @@ -5650,16 +5693,13 @@ - - - - - + + @@ -6975,8 +7015,9 @@ - + + @@ -7011,8 +7052,9 @@ - + + @@ -7071,13 +7113,15 @@ - + + - + + @@ -7264,14 +7308,16 @@ - + + - + + @@ -7284,8 +7330,9 @@ - + + @@ -7325,6 +7372,11
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - loleaflet/src
loleaflet/src/control/Control.PartsPreview.js | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 1990c9d15a19f29466294c17c98dba00a89118dc
Author: Marco Cecchetti
Date: Sun Jun 24 22:05:29 2018 +0200
On-demand loading of previews in the Online Draw/Impress - follow up
setting extra bounds for fetching some further previews even if not
visible.
Change-Id: I83b403cbb131e898a5064e017502edd7251bd242
Reviewed-on: https://gerrit.libreoffice.org/56407
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 2b0a70f1b..cd549b32c 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -89,6 +89,7 @@ L.Control.PartsPreview = L.Control.extend({
previewFrameTop = this._previewContTop +
this._previewFrameMargin + i * (this._previewFrameHeight +
this._previewFrameMargin);
previewFrameTop -= this._scrollY;
previewFrameBottom = previewFrameTop +
this._previewFrameHeight;
+ L.DomUtil.setStyle(img, 'height',
this._previewImgHeight + 'px');
}
var imgSize;
@@ -96,6 +97,7 @@ L.Control.PartsPreview = L.Control.extend({
|| (previewFrameBottom >= topBound &&
previewFrameBottom <= bottomBound)) {
imgSize = this._map.getPreview(i, i, 180, 180,
{autoUpdate: this.options.autoUpdate});
img.fetched = true;
+ L.DomUtil.setStyle(img, 'height', '');
}
if (i === 0) {
@@ -106,6 +108,7 @@ L.Control.PartsPreview = L.Control.extend({
imgHeight = Math.round(imgHeight *
previewImgMinWidth / imgSize.width);
var previewFrameBB = frame.getBoundingClientRect();
this._previewFrameMargin = previewFrameBB.top -
this._previewContTop;
+ this._previewImgHeight = imgHeight;
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
@@ -235,11 +238,17 @@ L.Control.PartsPreview = L.Control.extend({
},
_onScroll: function (e) {
- this._scrollY = -e.mcs.top;
+ var scrollOffset = 0;
+ if (e) {
+ var prevScrollY = this._scrollY;
+ this._scrollY = -e.mcs.top;
+ scrollOffset = this._scrollY - prevScrollY;
+ }
var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
- var topBound = this._previewContTop - previewContBB.height / 2;
- var bottomBound = topBound + previewContBB.height +
previewContBB.height / 2;
+ var extra = previewContBB.height;
+ var topBound = this._previewContTop - (scrollOffset < 0 ? extra
: previewContBB.height / 2);
+ var bottomBound = this._previewContTop + previewContBB.height +
(scrollOffset > 0 ? extra : previewContBB.height / 2);
for (var i = 0; i < this._previewTiles.length; ++i) {
var img = this._previewTiles[i];
if (img && img.parentNode && !img.fetched) {
___
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' - cui/source
cui/source/options/personalization.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit ea08ffc92d84e944a143902f9cd280370986a781
Author: Miklos Vajna
Date: Thu Jun 28 11:43:35 2018 +0200
tdf#117866 cui personalization: fix a possible race
The case when the thread is re-scheduled exactly after checking for
m_bExecute but before taking the solar mutex.
(cherry picked from commit f4c73f90da2a2c31f0d29572180aa97e10c3dbad)
Change-Id: I494c123a6225da60407391771622208c055ae49b
Reviewed-on: https://gerrit.libreoffice.org/56593
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 7b4cf6807170..216bc6e8e935 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -99,7 +99,13 @@ SelectPersonaDialog::~SelectPersonaDialog()
void SelectPersonaDialog::dispose()
{
if (m_pSearchThread.is())
+{
+// Release the solar mutex, so the thread is not affected by the race
+// when it's after the m_bExecute check but before taking the solar
+// mutex.
+SolarMutexReleaser aReleaser;
m_pSearchThread->join();
+}
m_pEdit.clear();
m_pSearchButton.clear();
___
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/src wsd/LOOLWSD.cpp
loleaflet/src/layer/tile/TileLayer.js |4 +++-
wsd/LOOLWSD.cpp | 16
2 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 2faf8f590b2e1d394188d035ab713ac021473da6
Author: Pranav Kant
Date: Wed Jun 27 19:53:25 2018 +0530
wsd: in case of multiple query param, handle &attachment= correctly
In case of integration with OC/NC, we have WOPISrc= as query param used
for load balancing. So, the earlier approach failed with integration.
Change-Id: Ib73f4f18eaec870dd53b67886b1b6016416a2e78
Reviewed-on: https://gerrit.libreoffice.org/56533
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 711eb2ef9..35d33fd1d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -566,7 +566,9 @@ L.TileLayer = L.GridLayer.extend({
// due to a pdf.js issue -
https://github.com/mozilla/pdf.js/issues/5397
// open the pdf file in a new tab so that that
user can print it directly in the browser's
// pdf viewer
- window.open(url + '?attachment=0', '_blank');
+ var param = wopiSrc !== '' ? '&' : '?';
+ param += 'attachment=0';
+ window.open(url + param, '_blank');
}
else {
this._map.fire('filedownloadready', {url: url});
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 48e915ab8..ee4f83b2a 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2163,15 +2163,23 @@ private:
LOG_INF("HTTP request for: " << filePath.toString());
if (filePath.isAbsolute() && File(filePath).exists())
{
-int serveAsAttachment = 1;
-if (tokens.count() >= 7)
-getTokenInteger(tokens[6], "attachment",
serveAsAttachment);
+const Poco::URI postRequestUri(request.getURI());
+const Poco::URI::QueryParameters postRequestQueryParams =
postRequestUri.getQueryParameters();
+
+bool serveAsAttachment = true;
+const auto attachmentIt =
std::find_if(postRequestQueryParams.begin(),
+
postRequestQueryParams.end(),
+ [](const
std::pair& element) {
+ return
element.first == "attachment";
+ });
+if (attachmentIt != postRequestQueryParams.end())
+serveAsAttachment = attachmentIt->second != "0";
// Instruct browsers to download the file, not display it
// with the exception of SVG where we need the browser to
// actually show it.
std::string contentType = getContentType(fileName);
-if (serveAsAttachment != 0 && contentType != "image/svg+xml")
+if (serveAsAttachment && contentType != "image/svg+xml")
response.set("Content-Disposition", "attachment;
filename=\"" + fileName + "\"");
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/motionpathtag.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit ab9ab9d381fe871a56f346a6223a7f572c2a4d90
Author: Mark Hung
Date: Sun Jun 24 21:00:37 2018 +0800
tdf#53993 broadcast the change when dragging ends.
Eventually MotionPathTag::Notify() and CustomAnimationPane::
updatePathFromMotionPathTag will be called to update the
motion path of the effect.
Change-Id: I1cd0756ea24d9b56ad3c44c99ef015c584c74dc7
Reviewed-on: https://gerrit.libreoffice.org/56353
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/source/ui/animations/motionpathtag.cxx
b/sd/source/ui/animations/motionpathtag.cxx
index ab24218ce38e..2e5bb8cb52de 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -231,9 +231,11 @@ bool PathDragObjOwn::EndSdrDrag(bool /*bCopy*/)
SdrObject* pObj = GetDragObj();
-if(pObj)
+if(pObj && pObj->applySpecialDrag(DragStat()))
{
-return pObj->applySpecialDrag(DragStat());
+pObj->SetChanged();
+pObj->BroadcastObjectChange();
+return true;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa sd/qa sw/qa
sc/qa/unit/data/xlsx/open-as-read-only.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx| 12
sd/qa/unit/data/pptx/open-as-read-only.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 12
sw/qa/extras/ooxmlexport/data/open-as-read-only.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |7 +++
6 files changed, 31 insertions(+)
New commits:
commit bbdb6cb8ed0d77eeb2e413b38f29d2084bd8257b
Author: László Németh
Date: Tue Jun 26 15:01:05 2018 +0200
tdf#107690 DOCX, XLSX and PPTX unit tests for "Open as read-only"
ie. OOXML export/import of "_MarkAsFinal" MSO document property.
Change-Id: I01f0702d5467e78eb93ce8dce8ba25874839c3e3
Reviewed-on: https://gerrit.libreoffice.org/56475
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sc/qa/unit/data/xlsx/open-as-read-only.xlsx
b/sc/qa/unit/data/xlsx/open-as-read-only.xlsx
new file mode 100644
index ..e871a95d3997
Binary files /dev/null and b/sc/qa/unit/data/xlsx/open-as-read-only.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 046ce15783d8..105852550b6c 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -207,6 +207,7 @@ public:
void testHiddenRepeatedRowsODS();
void testHyperlinkTargetFrameODS();
+void testOpenDocumentAsReadOnly();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -313,6 +314,7 @@ public:
CPPUNIT_TEST(testHiddenRepeatedRowsODS);
CPPUNIT_TEST(testHyperlinkTargetFrameODS);
+CPPUNIT_TEST(testOpenDocumentAsReadOnly);
CPPUNIT_TEST_SUITE_END();
@@ -4023,6 +4025,16 @@ void ScExportTest::testHyperlinkTargetFrameODS()
CPPUNIT_ASSERT_EQUAL(OUString("_blank"), aTargetFrameExport);
}
+void ScExportTest::testOpenDocumentAsReadOnly()
+{
+ScDocShellRef xDocSh = loadDoc("open-as-read-only.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh->IsSecurityOptOpenReadOnly());
+ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh2->IsSecurityOptOpenReadOnly());
+xDocSh->DoClose();
+xDocSh2->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/qa/unit/data/pptx/open-as-read-only.pptx
b/sd/qa/unit/data/pptx/open-as-read-only.pptx
new file mode 100644
index ..57a4d32de7f4
Binary files /dev/null and b/sd/qa/unit/data/pptx/open-as-read-only.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 01ca434b33b3..6ca55d72a4e3 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -145,6 +145,7 @@ public:
void testTdf90627();
void testTdf104786();
void testTdf104789();
+void testOpenDocumentAsReadOnly();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -211,6 +212,7 @@ public:
CPPUNIT_TEST(testTdf90627);
CPPUNIT_TEST(testTdf104786);
CPPUNIT_TEST(testTdf104789);
+CPPUNIT_TEST(testOpenDocumentAsReadOnly);
CPPUNIT_TEST_SUITE_END();
@@ -1682,6 +1684,16 @@ void SdOOXMLExportTest2::testTdf104789()
xDocShRef->DoClose();
}
+void SdOOXMLExportTest2::testOpenDocumentAsReadOnly()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/open-as-read-only.pptx"),
PPTX);
+CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly());
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly());
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlexport/data/open-as-read-only.docx
b/sw/qa/extras/ooxmlexport/data/open-as-read-only.docx
new file mode 100644
index ..057c67ff6dfe
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/open-as-read-only.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 730765a8c9ff..3e1c80d23ace 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -408,6 +408,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107969, "tdf107969.docx")
// SAXParseException: '[word/document.xml line 2]: Extra content at the
end of the document', Stream 'word/document.xml'.
}
+DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly, "open-as-read-only.docx")
+{
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+CPPUNIT_ASSERT(pTextDoc->GetDocShell()->IsSecurityOptOpenReadOnly());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesk
[Libreoffice-commits] core.git: include/oox oox/source sc/source sd/source sfx2/source sw/source
include/oox/core/xmlfilterbase.hxx |2 -
oox/source/core/xmlfilterbase.cxx| 50 +--
sc/source/filter/excel/excdoc.cxx|2 -
sd/source/filter/eppt/pptx-epptooxml.cxx | 14
sfx2/source/doc/objstor.cxx | 27
sw/source/filter/ww8/docxexport.cxx |4 +-
6 files changed, 80 insertions(+), 19 deletions(-)
New commits:
commit 9a5c56a9c4e04589b0a6bb710573922e459d9685
Author: László Németh
Date: Wed Jun 20 16:28:13 2018 +0200
tdf#107690 OOXML import/export of setting "Open as read-only"
Import custom document property _MarkAsFinal as LoadReadonly
setting, export LoadReadonly as _MarkAsFinal in DOCX, XLSX
and PPTX documents.
Before this fix, LibreOffice opened read-only OOXML documents
as editable, also saved and exported _MarkAsFinal=true silently,
resulting unintented read-only warning info bar in MSO.
This commit improves interoperability a lot, because this is a
basic document protection of MSO, recommended on its UI.
Note: LoadReadonly (on File->Properties...->Security, property
"Open file read-only") doesn't show "Edit read-only" info bar
from commit 630186ff4e0eba7317e542f8c3eca39ebd068721,
but it's still possible to switch on editing by Edit->Edit Mode.
MSO shows info bar for _MarkAsFinal. (There is an advantage to
hide the info bar in LibreOffice in a mixed environment,
to avoid overwriting of press-ready MSO files by LibreOffice.)
Note 2: Other differences of LoadReadonly in LO and _MarkAsFinal
in MSO: (1) Switching on editing doesn't remove the LoadReadonly
property automatically in LO. (2) Saving with LoadReadonly doesn't
switch off editing of the actual (still opened) document in LO.
Change-Id: Ie279c0670090d075103384cfa44ff1c2a2898216
Reviewed-on: https://gerrit.libreoffice.org/56180
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/include/oox/core/xmlfilterbase.hxx
b/include/oox/core/xmlfilterbase.hxx
index ffe0c5bc45e3..e2be8d14f9c8 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -224,7 +224,7 @@ public:
@param xProperties The document properties to export.
*/
-void exportDocumentProperties( const css::uno::Reference<
css::document::XDocumentProperties >& xProperties );
+void exportDocumentProperties( const css::uno::Reference<
css::document::XDocumentProperties >& xProperties, bool
bSecurityOptOpenReadOnly );
/** Write the customXml entries we are preserving (xlsx and pptx only). */
void exportCustomFragments();
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 57a752489960..5168d81fb7fb 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -750,13 +750,31 @@ writeAppProperties( XmlFilterBase& rSelf, const
Reference< XDocumentProperties >
}
static void
-writeCustomProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >& xProperties )
+writeCustomProperties( XmlFilterBase& rSelf, const Reference<
XDocumentProperties >& xProperties, bool bSecurityOptOpenReadOnly )
{
uno::Reference xUserDefinedProperties(
xProperties->getUserDefinedProperties(), uno::UNO_QUERY );
Sequence< PropertyValue > aprop(
xUserDefinedProperties->getPropertyValues() );
sal_Int32 nbCustomProperties = aprop.getLength();
// tdf#89791 : if no custom properties, no need to add docProps/custom.x
-if (!nbCustomProperties)
+// tdf#107690: except the case of read-only documents, because that
+// is handled by the _MarkAsFinal custom property in MSO.
+if (!nbCustomProperties && !bSecurityOptOpenReadOnly)
+return;
+
+std::vector aprop2;
+for ( sal_Int32 n = 0; n < nbCustomProperties; ++n )
+aprop2.push_back(aprop[n]);
+
+if (bSecurityOptOpenReadOnly)
+{
+PropertyValue aPropertyValue;
+// MSO custom property for read-only documents
+aPropertyValue.Name = "_MarkAsFinal";
+aPropertyValue.Value <<= true;
+aprop2.push_back(aPropertyValue);
+}
+
+if (!aprop2.size())
return;
rSelf.addRelation(
@@ -770,11 +788,12 @@ writeCustomProperties( XmlFilterBase& rSelf, const
Reference< XDocumentPropertie
FSNS( XML_xmlns, XML_vt ),
OUStringToOString(rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)),
RTL_TEXTENCODING_UTF8).getStr(),
FSEND );
-for ( sal_Int32 n = 0; n < nbCustomProperties; ++n )
+auto aIt = aprop2.begin();
+for ( size_t n = 0; n < aprop2.size(); ++n )
{
-if ( !aprop[n].Name.isEmpty() )
+if ( !aIt->Name.isEmpty() )
{
-OString aName = OUStringToOString( aprop[n].Name,
RTL_TEXTENCODING_ASCII_US );
+OString aName = OUStringToOString( aIt->Name,
RTL_TEXTENCODING_ASCII_US );
//
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-5.3-51'
Tag 'cp-5.3-51' created by Andras Timar at 2018-06-28 14:16 + cp-5.3-51 Changes since libreoffice-5-3-branch-point-28: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-5.3-51'
Tag 'cp-5.3-51' created by Andras Timar at 2018-06-28 14:16 + cp-5.3-51 Changes since cp-5.3-10: Olivier R (1): tdf#107558 French spelling dictionary (6.0.3) and thesaurus --- fr_FR/README_fr.txt |4 fr_FR/description.xml |2 fr_FR/fr.aff |17751 ++-- fr_FR/fr.dic |155369 +- fr_FR/package-description.txt |2 fr_FR/thes_fr.dat | 206 6 files changed, 88495 insertions(+), 84839 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-5.3-51'
Tag 'cp-5.3-51' created by Andras Timar at 2018-06-28 14:20 + cp-5.3-51 Changes since cp-5.3-50-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-5.3-51'
Tag 'cp-5.3-51' created by Andras Timar at 2018-06-28 14:16 + cp-5.3-51 Changes since cp-5.3-46: Andras Timar (1): remove extra ~ characters from German translation --- source/de/officecfg/registry/data/org/openoffice/Office/UI.po |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source
sw/source/uibase/misc/swruler.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ee6e6bd5b853aa68c9721f53b5892384e7403eec
Author: Jan Holesovsky
Date: Thu Jun 28 16:12:30 2018 +0200
lok: Don't even try to paint the ruler via LibreOfficeKit.
But we need to have it behind the scenes, otherwise the Online's ruler
does not get notifications.
Change-Id: I72bef28cb15c462572b511449d538b067f7cb141
Reviewed-on: https://gerrit.libreoffice.org/56598
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/source/uibase/misc/swruler.cxx
b/sw/source/uibase/misc/swruler.cxx
index 7eabce4b9109..74ddc6a14724 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -96,6 +96,9 @@ void SwCommentRuler::dispose()
void SwCommentRuler::Paint(vcl::RenderContext& rRenderContext, const
Rectangle& rRect)
{
+if (comphelper::LibreOfficeKit::isActive())
+return; // no need to waste time on startup
+
SvxRuler::Paint(rRenderContext, rRect);
// Don't draw if there is not any note
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/tags/cp-5.3-51' - 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] core.git: Changes to 'refs/tags/cp-5.3-51'
Tag 'cp-5.3-51' created by Andras Timar at 2018-06-28 14:16 + cp-5.3-51 Changes since cp-5.3-50-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2c67d94f1ecf1d3258adc816f0eb6601206fd1cc Author: Andras Timar Date: Thu Jun 28 16:15:08 2018 +0200 Bump version to 5.3-51 Change-Id: I3aed883c5d77d12cd026ef25a9257d54e23c8ce7 diff --git a/configure.ac b/configure.ac index 9523e31ae505..ed7a553683ed 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.50],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.51],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source
sw/source/core/doc/DocumentTimerManager.cxx | 26 +++---
sw/source/core/inc/DocumentTimerManager.hxx |6 ++
2 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 1056640a6e1fd044cb61f5bf5ee85dfec3cbeb7c
Author: Ashod Nakashian
Date: Thu Jun 28 01:02:49 2018 -0400
sw lok: delay processing idle jobs to let LOK finish initialization
When loading document, LOK needs to setup the client view, register
callbacks, get document size and type, etc. All of these need
to take SolarMutex, which is taken by the idle jobs immediately
after loading, blocking LOK from finishing initialization
and rendering the first tiles for the user. This gives the
user the impression that the document is loading for far
longer than it actually is, due to lack of interactivity
(or indeed any activity on the screen besides the spinning wheel).
By delaying the idle jobs, we allow time for LOK to finish
initialization and render the first tiles before the idle
jobs kick in and hog SolarMutex.
Change-Id: Ic6f437bfd6f43dfed2aaa1a9d3510d43f5ec30ae
Reviewed-on: https://gerrit.libreoffice.org/56572
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx
b/sw/source/core/doc/DocumentTimerManager.cxx
index 4a0176b2811d..ce4af8b3353c 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
namespace sw
{
@@ -45,6 +46,10 @@ DocumentTimerManager::DocumentTimerManager( SwDoc& i_rSwdoc
) : m_rDoc( i_rSwdoc
maIdle.SetPriority( SchedulerPriority::LOWEST );
maIdle.SetIdleHdl( LINK( this, DocumentTimerManager, DoIdleJobs) );
maIdle.SetDebugName( "sw::DocumentTimerManager maIdle" );
+
+maFireIdleJobsTimer.SetTimeoutHdl(LINK(this, DocumentTimerManager,
FireIdleJobsTimeout));
+maFireIdleJobsTimer.SetTimeout(1000); // Enough time for LOK to render the
first tiles.
+maFireIdleJobsTimer.SetDebugName("sw::DocumentTimerManager
maFireIdleJobsTimer");
}
void DocumentTimerManager::StartIdling()
@@ -75,9 +80,24 @@ void DocumentTimerManager::UnblockIdling()
void DocumentTimerManager::StartBackgroundJobs()
{
-// Trigger DoIdleJobs(), asynchronously.
-if (!maIdle.IsActive()) //fdo#73165 if the timer is already running don't
restart from 0
-maIdle.Start();
+if (comphelper::LibreOfficeKit::isActive())
+{
+/// Reset the timer to fire after the last StartBackgroundJobs.
+maFireIdleJobsTimer.Start();
+StopIdling();
+}
+else
+{
+// Trigger DoIdleJobs(), asynchronously.
+if (!maIdle.IsActive()) //fdo#73165 if the timer is already running
don't restart from 0
+maIdle.Start();
+}
+}
+
+IMPL_LINK( DocumentTimerManager, FireIdleJobsTimeout, Timer *, pTimer, void )
+{
+(void)pTimer;
+StartIdling();
}
IMPL_LINK( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
diff --git a/sw/source/core/inc/DocumentTimerManager.hxx
b/sw/source/core/inc/DocumentTimerManager.hxx
index b8575192eba3..d744392b79f2 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
@@ -50,6 +51,10 @@ public:
// Our own 'IdleTimer' calls the following method
DECL_LINK( DoIdleJobs, Idle *, void );
+/// Delay starting idle jobs to allow for post-load activity.
+/// Used by LOK only.
+DECL_LINK( FireIdleJobsTimeout, Timer *, void );
+
virtual ~DocumentTimerManager() override;
private:
@@ -62,6 +67,7 @@ private:
bool mbStartIdleTimer; //< idle timer mode start/stop
sal_Int32 mIdleBlockCount;
Idle maIdle;
+Timer maFireIdleJobsTimer;
};
}
___
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' - external/poppler
external/poppler/msvc2013.patch.1 | 55 ++
1 file changed, 55 insertions(+)
New commits:
commit aa5f2f582521ac57b8b72a0a6e7b2a15a2d21257
Author: Michael Stahl
Date: Thu Jun 28 14:51:25 2018 +0200
poppler: try even harder to appease MSVC 2013
It doesn't like "noexcept" keyword but you can't -Dnoexcept= because
then the library headers complain that macroizing keywords is forbidden.
Also, initialising std::atomic_int needs quite some hand-holding.
Change-Id: Icf03df9dcfe4dd86f8cafda0feb1ebab81d4c1b4
Reviewed-on: https://gerrit.libreoffice.org/56594
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/external/poppler/msvc2013.patch.1
b/external/poppler/msvc2013.patch.1
index b087589c4072..1d83a615b65b 100644
--- a/external/poppler/msvc2013.patch.1
+++ b/external/poppler/msvc2013.patch.1
@@ -21,3 +21,58 @@
};
class Dict {
+--- poppler/poppler/UnicodeMap.h.orig 2018-06-27 08:38:04.587184300 -0700
poppler/poppler/UnicodeMap.h 2018-06-27 08:38:13.055134400 -0700
+@@ -73,10 +73,10 @@
+ UnicodeMap(const char *encodingNameA, GBool unicodeOutA,
+UnicodeMapFunc funcA);
+
+- UnicodeMap(UnicodeMap &&other) noexcept;
+- UnicodeMap& operator=(UnicodeMap &&other) noexcept;
++ UnicodeMap(UnicodeMap &&other) ;
++ UnicodeMap& operator=(UnicodeMap &&other) ;
+
+- void swap(UnicodeMap& other) noexcept;
++ void swap(UnicodeMap& other) ;
+
+ ~UnicodeMap();
+
+--- poppler/poppler/UnicodeMap.cc.orig 2018-06-27 08:43:49.625045400 -0700
poppler/poppler/UnicodeMap.cc 2018-06-27 08:42:50.299038500 -0700
+@@ -175,14 +175,18 @@
+ }
+ }
+
+-UnicodeMap::UnicodeMap(UnicodeMap &&other) noexcept
++UnicodeMap::UnicodeMap(UnicodeMap &&other)
+ : encodingName{other.encodingName}
+ , kind{other.kind}
+ , unicodeOut{other.unicodeOut}
+ , len{other.len}
+ , eMaps{other.eMaps}
+ , eMapsLen{other.eMapsLen}
++#if defined _MSC_VER && _MSC_VER < 1900
++ , refCnt(std::atomic(1))
++#else
+ , refCnt{1}
++#endif
+ {
+ switch (kind) {
+ case unicodeMapUser:
+@@ -198,14 +198,14 @@
+ other.eMaps = nullptr;
+ }
+
+-UnicodeMap& UnicodeMap::operator=(UnicodeMap &&other) noexcept
++UnicodeMap& UnicodeMap::operator=(UnicodeMap &&other)
+ {
+ if (this != &other)
+ swap(other);
+ return *this;
+ }
+
+-void UnicodeMap::swap(UnicodeMap &other) noexcept
++void UnicodeMap::swap(UnicodeMap &other)
+ {
+ using std::swap;
+ swap(encodingName, other.encodingName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source
desktop/source/lib/init.cxx | 26 ++
1 file changed, 26 insertions(+)
New commits:
commit e7f65920b12517b31f0c5cbfd0dcb8df96d20ba4
Author: Ashod Nakashian
Date: Thu Jun 28 01:07:32 2018 -0400
desktop: initialize fonts in pre-init
Change-Id: I5a3acc41196c7e0672514fa2dae00e5fc0f76a1f
Reviewed-on: https://gerrit.libreoffice.org/56573
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c8593b96859b..687e37e7f29d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -62,6 +62,7 @@
#include
#include
+#include
#include
#include
@@ -104,6 +105,7 @@
#include
#include
#include
+#include
#include
#include
@@ -3833,6 +3835,30 @@ static int lo_initialize(LibreOfficeKit* pThis, const
char* pAppPath, const char
// 3) InitVCL()
aService->initialize({css::uno::makeAny("preload")});
+// 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::OnlyOne);
+}
+
preloadData();
// Release Solar Mutex, lo_startmain thread should acquire it.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9c368751f6fbc50209e621182c3415ef4c4db29d Author: Eike Rathke Date: Thu Jun 28 15:06:49 2018 +0200 Document correct @param name NativeNumberParameters Jenkins for 'NativeNumberParams' unfortunately only on 6-1 bailed out with /home/tdf/lode/jenkins/workspace/gerrit_windows@2/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl:57: warning: The following parameters of com::sun::star::i18n::XNativeNumberSupplier2::getNativeNumberStringParams([in] string NumberString, [in] ::com::sun::star::lang::Locale Locale, [in] short NativeNumberMode, [in] string NativeNumberParameters) are not documented: parameter 'NativeNumberParameters' Change-Id: I3379e1bba5b79196c86410e0115d04eba49dc2a2 diff --git a/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl b/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl index 17a1df082c9f..bd125d096618 100644 --- a/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl +++ b/offapi/com/sun/star/i18n/XNativeNumberSupplier2.idl @@ -51,7 +51,7 @@ interface XNativeNumberSupplier2 : ::com::sun::star::i18n::XNativeNumberSupplier @param Locale The locale. -@param NativeNumberParams +@param NativeNumberParameters The NatNum params (like "ordinal-digits" in [NatNum12 ordinal-digits]). */ string getNativeNumberStringParams( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: embeddedobj/source libreofficekit/qa libreofficekit/source unotools/source
embeddedobj/source/commonembedding/visobj.cxx|2 +-
libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx |2 +-
libreofficekit/source/gtk/lokdocview.cxx |2 +-
unotools/source/i18n/resmgr.cxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c44668a6c12d35552dde8c6ebcc14feb2ffdd37d
Author: Andrea Gelmini
Date: Thu Jun 28 13:27:16 2018 +0200
Fix typos
Change-Id: I1b966b636f67a549718ca19c00c2820e8d168c7a
Reviewed-on: https://gerrit.libreoffice.org/56589
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/embeddedobj/source/commonembedding/visobj.cxx
b/embeddedobj/source/commonembedding/visobj.cxx
index 28df7ed0f583..968d3a584808 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -166,7 +166,7 @@ embed::VisualRepresentation SAL_CALL
OCommonEmbeddedObject::getPreferredVisualRe
awt::Size aOrigSize = getVisualAreaSize(nAspect);
changeState(embed::EmbedStates::RUNNING);
const bool bIsChart = GetDocumentServiceName() ==
"com.sun.star.chart2.ChartDocument";
-// tdf#108643 unless its a chart, cause those are weird (#i103460#)
+// tdf#108643 unless it's a chart, cause those are weird (#i103460#)
if (!bIsChart && aOrigSize != getVisualAreaSize(nAspect))
setVisualAreaSize(nAspect, aOrigSize);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
index d2fcb979e3d3..d810170dc675 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@@ -101,7 +101,7 @@ GtkWidget* GtvHelpers::createCommentBox(const
boost::property_tree::ptree& aComm
gchar *id = g_strndup(aComment.get("id").c_str(), 20);
g_object_set_data_full(G_OBJECT(pCommentVBox), "id", id, g_free);
-// Set background if its a reply comment
+// Set background if it's a reply comment
if (aComment.get("parent", -1) > 0)
{
GtkStyleContext* pStyleContext =
gtk_widget_get_style_context(pCommentVBox);
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index e55592e9c1da..4589a46ffa6b 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -3227,7 +3227,7 @@ static void lok_doc_view_class_init (LOKDocViewClass*
pClass)
* 'action' can be 'Add', 'Remove' or 'Modify' depending on whether
* comment has been added, removed or modified.
* 'parent' is a non-zero comment id if this comment is a reply comment,
- * otherwise its a root comment.
+ * otherwise it's a root comment.
*/
doc_view_signals[COMMENT] =
g_signal_new("comment",
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index f756575bc5bb..f93aaa00b226 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -208,7 +208,7 @@ namespace Translate
++pId;
}
-//if its a key id locale, generate it here
+//if it's a key id locale, generate it here
if (std::use_facet(loc).language() == "qtz")
{
OString sKeyId(genKeyId(OString(pContextAndId).replace('\004',
'|')));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3-desktop' - sw/CppunitTest_sw_ww8export2.mk sw/qa sw/source
sw/CppunitTest_sw_ww8export2.mk |1 +
sw/qa/extras/ww8export/data/tdf70838.odt |binary
sw/qa/extras/ww8export/ww8export2.cxx| 11 +++
sw/source/filter/ww8/wrtw8esh.cxx| 10 ++
4 files changed, 22 insertions(+)
New commits:
commit c5463b865f4096246833d2cee9cbfbae336151e5
Author: Victor Mireyev
Date: Sat Jun 2 16:08:59 2018 +0300
tdf#70838 ww8export: rotate shape vertically = swap width/height
During import, rotation past 45 degrees swaps height and width
in SvxMSDffManager::ImportShape, so exporting needs to do the same.
restored from abandonment and corrected by Justin
Import also adjusts TopLeft position, but position seems to
generally be set by other factors on export. Prefer to have
an example proof document and not just guess since it seems
that position is affected by many factors. Therefore, not
doing anything about the position in this commit.
Change-Id: I4d67ab0e0da296956190aed3468e0c98f29795b9
Reviewed-on: https://gerrit.libreoffice.org/53902
Reviewed-by: Mike Kaganski
Reviewed-by: Justin Luth
Tested-by: Jenkins
(cherry picked from commit c14911a80e3b6e66439b1d569e7cd558c6010864)
Reviewed-on: https://gerrit.libreoffice.org/55902
Tested-by: Justin Luth
Reviewed-by: Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/56438
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/CppunitTest_sw_ww8export2.mk b/sw/CppunitTest_sw_ww8export2.mk
index 840d586c3679..8ca4ba478cb6 100644
--- a/sw/CppunitTest_sw_ww8export2.mk
+++ b/sw/CppunitTest_sw_ww8export2.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export2, \
test \
unotest \
utl \
+svxcore \
sw \
tl \
$(gb_UWINAPI) \
diff --git a/sw/qa/extras/ww8export/data/tdf70838.odt
b/sw/qa/extras/ww8export/data/tdf70838.odt
new file mode 100644
index ..65d20ecb65f5
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf70838.odt differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx
b/sw/qa/extras/ww8export/ww8export2.cxx
index f86982239640..ec8b89e8ff56 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -21,6 +21,8 @@
#include
#include
+#include
+#include
#include
class Test : public SwModelTestBase
@@ -133,6 +135,15 @@ DECLARE_WW8EXPORT_TEST(testTdf111480, "tdf111480.doc")
CPPUNIT_ASSERT(xText->getSize().Width > 11000);
}
+DECLARE_WW8EXPORT_TEST(testTdf70838, "tdf70838.odt")
+{
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SdrPage* pPage =
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+tools::Rectangle aRect = pPage->GetObj(0)->GetSnapRect();
+CPPUNIT_ASSERT( aRect.GetHeight() > aRect.GetWidth() );
+}
+
DECLARE_WW8EXPORT_TEST( testActiveXCheckbox, "checkbox_control.odt" )
{
// First check box anchored as a floating object
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 1789bd42d02a..091f5300faae 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -691,6 +691,16 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
if (pObj)
{
aRect = pObj->GetLogicRect();
+
+// rotating to vertical means swapping height and width as
seen in SvxMSDffManager::ImportShape
+const long nAngle = NormAngle360( pObj->GetRotateAngle() );
+if ( ( nAngle > 4500 && nAngle <= 13500 ) || ( nAngle >
22500 && nAngle <= 31500 ) )
+{
+const long nWidth = aRect.getWidth();
+const long nHeight = aRect.getHeight();
+aRect.setWidth( nHeight );
+aRect.setHeight( nWidth );
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - qadevOOo/tests sd/source xmloff/source
qadevOOo/tests/java/ifc/container/_XIndexAccess.java |2
sd/source/core/CustomAnimationEffect.cxx | 58 +--
sd/source/core/TransitionPreset.cxx |2
sd/source/filter/eppt/pptexanimations.cxx|2
sd/source/ui/animations/CustomAnimationPane.cxx |4 -
xmloff/source/draw/animationexport.cxx |2
xmloff/source/draw/sdxmlexp.cxx |2
xmloff/source/draw/ximppage.cxx |4 -
xmloff/source/table/XMLTableExport.cxx |2
9 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 6e3f2607a58910c060588193c46e0f27905838ee
Author: Matthias Seidel
Date: Thu Jun 28 11:58:01 2018 +
Fixed typo (cought -> caught)
diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
index cbcd5119e462..f131b7a88c00 100644
--- a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
+++ b/qadevOOo/tests/java/ifc/container/_XIndexAccess.java
@@ -111,7 +111,7 @@ public class _XIndexAccess extends MultiMethodTest {
log.println("no exception thrown - FAILED");
result = false;
} catch (IndexOutOfBoundsException e) {
-log.println("Expected exception cought! " + e + " OK");
+log.println("Expected exception caught! " + e + " OK");
} catch (WrappedTargetException e) {
log.println("Wrong exception! " + e + " FAILED");
result = false;
diff --git a/sd/source/core/CustomAnimationEffect.cxx
b/sd/source/core/CustomAnimationEffect.cxx
index d463ae0dc43b..4219f01c6fd5 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -378,7 +378,7 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const
Any& aTarget, sal_In
{
(void)e;
nSubItems = 0;
-DBG_ERROR( "sd::CustomAnimationEffect::getNumberOfSubitems(),
exception cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::getNumberOfSubitems(),
exception caught!" );
}
return nSubItems;
@@ -706,7 +706,7 @@ void CustomAnimationEffect::setTarget( const
::com::sun::star::uno::Any& rTarget
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setTarget(), exception cought!"
);
+DBG_ERROR( "sd::CustomAnimationEffect::setTarget(), exception caught!"
);
}
}
@@ -743,7 +743,7 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16
nSubItem )
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setTargetSubItem(), exception
cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::setTargetSubItem(), exception
caught!" );
}
}
@@ -793,7 +793,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setDuration(), exception
cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::setDuration(), exception
caught!" );
}
}
@@ -808,7 +808,7 @@ void CustomAnimationEffect::setBegin( double fBegin )
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setBegin(), exception cought!"
);
+DBG_ERROR( "sd::CustomAnimationEffect::setBegin(), exception caught!"
);
}
}
@@ -823,7 +823,7 @@ void CustomAnimationEffect::setAcceleration( double
fAcceleration )
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setAcceleration(), exception
cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::setAcceleration(), exception
caught!" );
}
}
//
@@ -837,7 +837,7 @@ void CustomAnimationEffect::setDecelerate( double
fDecelerate )
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setDecelerate(), exception
cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::setDecelerate(), exception
caught!" );
}
}
@@ -852,7 +852,7 @@ void CustomAnimationEffect::setAutoReverse( sal_Bool
bAutoReverse )
}
catch( Exception& )
{
-DBG_ERROR( "sd::CustomAnimationEffect::setAutoReverse(), exception
cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::setAutoReverse(), exception
caught!" );
}
}
@@ -1114,7 +1114,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16
nIterateType )
catch( Exception& e )
{
(void)e;
-DBG_ERROR( "sd::CustomAnimationEffect::setIterateType(), Exception
cought!" );
+DBG_ERROR( "sd::CustomAnimationEffect::setIterateType(), Exception
caught!" );
}
}
@@ -1160,7 +1160,7 @@ void CustomAnimationEffect::setIterateInterval( double
fIterateInterval )
catch( Exception& e )
{
(void)e;
-DBG_ERROR("sd::CustomAnimationEffect::get
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svx/source xmloff/source
svx/source/svdraw/svdograf.cxx |5 -
xmloff/source/draw/SignatureLineContext.cxx |7 +++
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 0f530cb9fb086e058ba2946e8f956b33924e82f4
Author: Samuel Mehrbrodt
Date: Mon Jun 18 11:46:10 2018 +0200
tdf#117904 Don't allow copying signed shapes
Instead just copy the "unsigned" graphic
Change-Id: I5183b0b33be0469dceaace142d73aa403cc32ef2
Reviewed-on: https://gerrit.libreoffice.org/56472
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 79e434948d65dd9eba150bc986e968bcb3754631)
Reviewed-on: https://gerrit.libreoffice.org/56510
Reviewed-by: Thorsten Behrens
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 1f623faeffe9..d336c9634d42 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -885,7 +885,6 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj )
return *this;
SdrRectObj::operator=( rObj );
-mpGraphicObject->SetGraphic( rObj.GetGraphic(), &rObj.GetGraphicObject() );
aFileName = rObj.aFileName;
aFilterName = rObj.aFilterName;
bMirrored = rObj.bMirrored;
@@ -899,6 +898,10 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj )
mbIsSignatureLineShowSignDate = rObj.mbIsSignatureLineShowSignDate;
mbIsSignatureLineCanAddComment = rObj.mbIsSignatureLineCanAddComment;
mpSignatureLineUnsignedGraphic = rObj.mpSignatureLineUnsignedGraphic;
+if (mbIsSignatureLine && rObj.mpSignatureLineUnsignedGraphic)
+mpGraphicObject->SetGraphic(rObj.mpSignatureLineUnsignedGraphic);
+else
+mpGraphicObject->SetGraphic( rObj.GetGraphic(),
&rObj.GetGraphicObject() );
if( rObj.IsLinkedGraphic() )
{
diff --git a/xmloff/source/draw/SignatureLineContext.cxx
b/xmloff/source/draw/SignatureLineContext.cxx
index 3adc70dd779c..445d9c73c2bc 100644
--- a/xmloff/source/draw/SignatureLineContext.cxx
+++ b/xmloff/source/draw/SignatureLineContext.cxx
@@ -100,6 +100,13 @@ SignatureLineContext::SignatureLineContext(SvXMLImport&
rImport, sal_uInt16 nPrf
"No InvalidSignatureLineImage!");
xGraphic = xSignatureInfo[i].InvalidSignatureLineImage;
}
+
+// Save unsigned graphic
+Reference xUnsignedGraphic;
+xPropSet->getPropertyValue("Graphic") >>= xUnsignedGraphic;
+if (xUnsignedGraphic.is())
+xPropSet->setPropertyValue("SignatureLineUnsignedImage",
Any(xUnsignedGraphic));
+
xPropSet->setPropertyValue("Graphic", Any(xGraphic));
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' - sfx2/source
sfx2/source/doc/objserv.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 521d8ff0e64d59c88fc44ad376c96c1d019a29f1 Author: Samuel Mehrbrodt Date: Tue Jun 26 15:57:42 2018 +0200 tdf#117900 Reload document after signing signature line So that the graphic reflects the new "signed" state Change-Id: Ic943581c4dfff53fbf9fbd5f1398c98842497a25 Reviewed-on: https://gerrit.libreoffice.org/56477 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit 22ccb4cb8b99cc6766282256939d3f79a0c56109) Reviewed-on: https://gerrit.libreoffice.org/56511 Reviewed-by: Thorsten Behrens diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index ea9103c3804e..0be2858aad5b 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1579,6 +1579,12 @@ void SfxObjectShell::SignSignatureLine(weld::Window* pDialogParent, false, HasValidSignatures(), aSignatureLineId, xCert, xValidGraphic, xInvalidGraphic, aComment); AfterSigning(bSignSuccess, false); + +// Reload the document to get the updated graphic +// FIXME: Update just the signature line graphic instead of reloading the document +SfxViewFrame *pFrame = GetFrame(); +if (pFrame) +pFrame->GetDispatcher()->Execute(SID_RELOAD); } SignatureState SfxObjectShell::GetScriptingSignatureState() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/dtd framework/inc framework/source include/vcl offapi/com officecfg/registry sc/uiconfig sd/uiconfig vcl/source
framework/dtd/statusbar.dtd|1 framework/inc/xml/statusbardocumenthandler.hxx |1 framework/source/fwe/classes/addonsoptions.cxx | 14 ++- framework/source/fwe/xml/statusbardocumenthandler.cxx | 29 +- framework/source/uielement/statusbarmanager.cxx|3 framework/source/uielement/statusbarmerger.cxx |5 + include/vcl/status.hxx |3 offapi/com/sun/star/ui/ItemStyle.idl |7 + offapi/com/sun/star/ui/XStatusbarItem.idl |1 officecfg/registry/schema/org/openoffice/Office/Addons.xcs |6 + sc/uiconfig/scalc/statusbar/statusbar.xml |6 - sd/uiconfig/sdraw/statusbar/statusbar.xml |6 - vcl/source/window/status.cxx | 60 ++--- 13 files changed, 117 insertions(+), 25 deletions(-) New commits: commit d77f8eef165a7c6fd97cc06dcbc4ead55e7b633c Author: Vasily Melenchuk Date: Tue Jun 26 11:24:43 2018 +0300 tdf#86612: statusbar: hide some elements if width is not sufficient new statusbar element property mandatory=true/false to determine if this element can be hidden if total statusbar width is not enough to fit all elements. marked some calc and draw statusbar elements as not mandatory. Change-Id: I20e26d3c4bd865e94ea48632a1e97d55f3fa712f Reviewed-on: https://gerrit.libreoffice.org/56443 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/framework/dtd/statusbar.dtd b/framework/dtd/statusbar.dtd index 22513df9250e..9f4e9e2a35c3 100644 --- a/framework/dtd/statusbar.dtd +++ b/framework/dtd/statusbar.dtd @@ -33,6 +33,7 @@ statusbar:align %alignment; "center" statusbar:style %style; "in" statusbar:autosize %boolean; "false" + statusbar:mandatory %boolean; "true" statusbar:ownerdraw %boolean; "false" statusbar:width %numeric; "0" statusbar:offset %numeric; "5" diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index bc12c5a724a1..759699aa61ce 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -53,6 +53,7 @@ class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : public OReadStatusBarDocumen SB_ATTRIBUTE_WIDTH, SB_ATTRIBUTE_OFFSET, SB_ATTRIBUTE_HELPURL, +SB_ATTRIBUTE_MANDATORY, SB_XML_ENTRY_COUNT }; diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 0ed4c5b45833..8c45c86157ea 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -71,7 +71,8 @@ using namespace ::com::sun::star; #define INDEX_ALIGN 8 #define INDEX_AUTOSIZE 9 #define INDEX_OWNERDRAW 10 -#define PROPERTYCOUNT_INDEX 11 +#define INDEX_MANDATORY 11 +#define PROPERTYCOUNT_INDEX 12 // The following order is mandatory. Please add properties at the end! #define PROPERTYCOUNT_MENUITEM 6 @@ -100,14 +101,15 @@ using namespace ::com::sun::star; #define OFFSET_TOOLBARITEM_WIDTH6 // The following order is mandatory. Please add properties at the end! -#define PROPERTYCOUNT_STATUSBARITEM 7 +#define PROPERTYCOUNT_STATUSBARITEM 8 #define OFFSET_STATUSBARITEM_URL0 #define OFFSET_STATUSBARITEM_TITLE 1 #define OFFSET_STATUSBARITEM_CONTEXT2 #define OFFSET_STATUSBARITEM_ALIGN 3 #define OFFSET_STATUSBARITEM_AUTOSIZE 4 #define OFFSET_STATUSBARITEM_OWNERDRAW 5 -#define OFFSET_STATUSBARITEM_WIDTH 6 +#define OFFSET_STATUSBARITEM_MANDATORY 6 +#define OFFSET_STATUSBARITEM_WIDTH 7 // The following order is mandatory. Please add properties at the end! #define PROPERTYCOUNT_IMAGES8 @@ -331,6 +333,7 @@ AddonsOptions_Impl::AddonsOptions_Impl() m_aPropNames[ INDEX_ALIGN ] = "Alignment"; m_aPropNames[ INDEX_AUTOSIZE] = "AutoSize"; m_aPropNames[ INDEX_OWNERDRAW ] = "OwnerDraw"; +m_aPropNames[ INDEX_MANDATORY ] = "Mandatory"; // initialize array with fixed images property names m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] = "ImageSmall"; @@ -1001,6 +1004,7 @@ bool AddonsOptions_Impl::ReadMergeStatusbarData( aStatusbarItem[ OFFSET_STATUSBARITEM_ALIGN ].Name = m_aPropNames[ INDEX_ALIGN ]; aStatusbarItem[ OFFSET_STATUSBARITEM_AUTOSIZE ].Name = m_aPropNames[ INDEX_AUTOSIZE ]; aStatusbarItem[ OFFSET_STATUSBARITEM_OWNERDRAW ].Name = m_aPropName
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/opengl
vcl/opengl/gdiimpl.cxx | 36 +++-
1 file changed, 35 insertions(+), 1 deletion(-)
New commits:
commit b879a01a5ef568065f113fb7da19be0720a1a478
Author: Miklos Vajna
Date: Wed Jun 27 16:50:38 2018 +0200
tdf#102960 vcl opengl: fix missing support for polygon track frames
Which is used in e.g. the Calc cell border dialog. The approach is
similar to commit 60790935cc143de49b732e93b6fb923b7669530b (tdf#96657 -
vcl opengl: implement invert: Track Frame., 2016-01-09) but that one was
for rectangles, this one is for polygons.
(cherry picked from commit 1e533f69f0c3a9a2136ea5d46b884145703ad637)
Change-Id: Ib1feebab2d14f4450fee0afe96afcea906965fdb
Reviewed-on: https://gerrit.libreoffice.org/56580
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 6858a2adbae7..0fd1d0788eb6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1786,7 +1786,41 @@ void OpenGLSalGraphicsImpl::invert( sal_uInt32 nPoints,
const SalPoint* pPtAry,
PreDraw();
if( UseInvert( nFlags ) )
-DrawPolygon( nPoints, pPtAry );
+{
+if (nFlags & SalInvert::TrackFrame)
+{
+// Track frame means the invert50FragmentShader must remain active
+// (to draw what looks like a dashed line), so DrawLineSegment()
+// can't be used. Draw the edge of the polygon as polygons instead.
+for (size_t nPoint = 0; nPoint < nPoints; ++nPoint)
+{
+const SalPoint& rFrom = pPtAry[nPoint];
+const SalPoint& rTo = pPtAry[(nPoint + 1) % nPoints];
+if (rFrom.mnX == rTo.mnX)
+{
+// Extend to the right, comments assuming "to" is above
+// "from":
+const SalPoint aPoints[] = { { rFrom.mnX + 1, rFrom.mnY },
// bottom right
+ { rFrom.mnX, rFrom.mnY }, //
bottom left
+ { rTo.mnX, rTo.mnY }, // top
left
+ { rTo.mnX + 1, rTo.mnY } };
// top right
+DrawConvexPolygon(4, aPoints, true);
+}
+else
+{
+// Otherwise can extend downwards, comments assuming "to"
+// is above and on the right of "from":
+const SalPoint aPoints[] = { { rFrom.mnX, rFrom.mnY + 1 },
// bottom left
+ { rFrom.mnX, rFrom.mnY }, //
top left
+ { rTo.mnX, rTo.mnY }, // top
right
+ { rTo.mnX, rTo.mnY + 1 } };
// bottom right
+DrawConvexPolygon(4, aPoints, true);
+}
+}
+}
+else
+DrawPolygon(nPoints, pPtAry);
+}
PostDraw();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/headless vcl/inc vcl/unx
vcl/headless/svpgdi.cxx | 29 +++--
vcl/inc/headless/svpgdi.hxx |6 +-
vcl/unx/kde5/KDE5SalGraphics.cxx |2 +-
3 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit 96f6aaa4e80a27edfc5fe3c141eb984effc9f1a7
Author: Katarina Behrens
Date: Thu Jun 28 13:42:00 2018 +0200
Use cairo's OVER operator to preserve transparency
Change-Id: I1afae266a5308fa0dbf2488777ddb963e99199c7
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 9163d8cf8133..de1145a6cc7c 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -35,8 +35,6 @@
#include
#include
-#include
-
#if ENABLE_CAIRO_CANVAS
# if defined CAIRO_VERSION && CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 10, 0)
# define CAIRO_OPERATOR_DIFFERENCE (static_cast(23))
@@ -1134,8 +1132,8 @@ void SvpSalGraphics::copyArea( long nDestX,
copyBits(aTR, this);
}
-static basegfx::B2DRange renderSource(cairo_t* cr, const SalTwoRect& rTR,
- cairo_surface_t* source)
+static basegfx::B2DRange renderWithOperator(cairo_t* cr, const SalTwoRect& rTR,
+ cairo_surface_t* source,
cairo_operator_t eOperator = CAIRO_OPERATOR_SOURCE)
{
cairo_rectangle(cr, rTR.mnDestX, rTR.mnDestY, rTR.mnDestWidth,
rTR.mnDestHeight);
@@ -1160,24 +1158,35 @@ static basegfx::B2DRange renderSource(cairo_t* cr,
const SalTwoRect& rTR,
cairo_pattern_set_extend(sourcepattern, CAIRO_EXTEND_REPEAT);
cairo_pattern_set_filter(sourcepattern, CAIRO_FILTER_NEAREST);
}
-cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+cairo_set_operator(cr, eOperator);
cairo_paint(cr);
cairo_restore(cr);
return extents;
}
-void SvpSalGraphics::copySource( const SalTwoRect& rTR,
- cairo_surface_t* source )
+static basegfx::B2DRange renderSource(cairo_t* cr, const SalTwoRect& rTR,
+ cairo_surface_t* source)
+{
+return renderWithOperator(cr, rTR, source, CAIRO_OPERATOR_SOURCE);
+}
+
+void SvpSalGraphics::copyWithOperator( const SalTwoRect& rTR, cairo_surface_t*
source,
+ cairo_operator_t eOp )
{
cairo_t* cr = getCairoContext(false);
clipRegion(cr);
-basegfx::B2DRange extents = renderSource(cr, rTR, source);
+basegfx::B2DRange extents = renderWithOperator(cr, rTR, source, eOp);
releaseCairoContext(cr, false, extents);
}
+void SvpSalGraphics::copySource( const SalTwoRect& rTR, cairo_surface_t*
source )
+{
+ copyWithOperator(rTR, source, CAIRO_OPERATOR_SOURCE);
+}
+
void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
SalGraphics* pSrcGraphics )
{
@@ -1224,10 +1233,10 @@ void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR,
const SalBitmap& rSourceB
copySource(rTR, source);
}
-void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, BitmapBuffer* pBuffer)
+void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, BitmapBuffer* pBuffer,
cairo_operator_t eOp)
{
cairo_surface_t* source = createCairoSurface( pBuffer );
-copySource(rTR, source);
+copyWithOperator(rTR, source, eOp);
}
void SvpSalGraphics::drawBitmap( const SalTwoRect& rTR,
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 860eacec7cbf..6571d21cf89d 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
@@ -111,6 +112,8 @@ public:
private:
void invert(const basegfx::B2DPolygon &rPoly, SalInvert nFlags);
void copySource(const SalTwoRect& rTR, cairo_surface_t* source);
+void copyWithOperator(const SalTwoRect& rTR, cairo_surface_t* source,
+ cairo_operator_t eOp = CAIRO_OPERATOR_SOURCE);
void setupPolyPolygon(cairo_t* cr, const basegfx::B2DPolyPolygon&
rPolyPoly);
void applyColor(cairo_t *cr, Color rColor);
void drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly);
@@ -225,7 +228,8 @@ public:
virtual voiddrawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap ) override;
voiddrawBitmap( const SalTwoRect& rPosAry,
-BitmapBuffer* pBuffer );
+BitmapBuffer* pBuffer,
+cairo_operator_t eOp );
virtual voiddrawBitmap( const SalTwoRect& rPosAry,
const SalBitmap& rSalBitmap,
const SalBitmap& rTransparentBitmap )
override;
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 6ec1e6e385ea..75e7c8664ab4 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -6
Re: [Libreoffice-qa] Minutes of ESC call
Stephan Bergmann wrote: > * Jean-Sebastien: > + Linagora branch for French ministry (mimo branch) > + Tell us name of desired branch, will be added (Thorsten) > + Sub-branches even? Probably not needed > Done - also added Jean-Sebastien as committer, otherwise the whole branch exercise would be moot. Jean-Sebastien, please use the normal gerrit code review process for master still for the moment. Cheers, -- Thorsten signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/options/personalization.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit f4c73f90da2a2c31f0d29572180aa97e10c3dbad
Author: Miklos Vajna
Date: Thu Jun 28 11:43:35 2018 +0200
tdf#117866 cui personalization: fix a possible race
The case when the thread is re-scheduled exactly after checking for
m_bExecute but before taking the solar mutex.
Change-Id: I494c123a6225da60407391771622208c055ae49b
Reviewed-on: https://gerrit.libreoffice.org/56585
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index f67c5644f6c5..cf7005b10ee7 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -99,7 +99,13 @@ SelectPersonaDialog::~SelectPersonaDialog()
void SelectPersonaDialog::dispose()
{
if (m_pSearchThread.is())
+{
+// Release the solar mutex, so the thread is not affected by the race
+// when it's after the m_bExecute check but before taking the solar
+// mutex.
+SolarMutexReleaser aReleaser;
m_pSearchThread->join();
+}
m_pEdit.clear();
m_pSearchButton.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx | 31 ++-
1 file changed, 22 insertions(+), 9 deletions(-)
New commits:
commit 0e0ceebc0d6facf803ad089ef38d559355407c54
Author: Nickson Thanda
Date: Thu Jun 14 17:13:26 2018 +0100
tdf#36867 - Undo autocapitalization when inserting a cell in Calc
Change-Id: Ia70144d6c86b1b08e14425bf537e9c39d585a614
Reviewed-on: https://gerrit.libreoffice.org/55820
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 58b416fbb47c..d8ab78fe524e 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2628,6 +2628,7 @@ void ScInputHandler::EnterHandler( ScEnterMode nBlockMode
)
boolbForget = false; // Remove due to validity?
OUString aString = GetEditText(mpEditEngine.get());
+OUString aPreAutoCorrectString(aString);
EditView* pActiveView = pTopView ? pTopView : pTableView;
if (bModified && pActiveView && !aString.isEmpty() &&
!lcl_IsNumber(aString))
{
@@ -2648,6 +2649,7 @@ void ScInputHandler::EnterHandler( ScEnterMode nBlockMode
)
aString = GetEditText(mpEditEngine.get());
}
lcl_RemoveTabs(aString);
+lcl_RemoveTabs(aPreAutoCorrectString);
// Test if valid (always with simple string)
if ( bModified && nValidation && pActiveViewSh )
@@ -2881,12 +2883,14 @@ void ScInputHandler::EnterHandler( ScEnterMode
nBlockMode )
if (bOldMod && !bProtected && !bForget)
{
+bool bInsertPreCorrectedString = true;
// No typographic quotes in formulas
if (aString.startsWith("="))
{
SvxAutoCorrect* pAuto = SvxAutoCorrCfg::Get().GetAutoCorrect();
if ( pAuto )
{
+bInsertPreCorrectedString = false;
OUString aReplace(pAuto->GetStartDoubleQuote());
if( aReplace.isEmpty() )
aReplace =
ScGlobal::pLocaleData->getDoubleQuotationMarkStart();
@@ -2925,17 +2929,26 @@ void ScInputHandler::EnterHandler( ScEnterMode
nBlockMode )
else if ( nBlockMode == ScEnterMode::MATRIX )
nId = FID_INPUTLINE_MATRIX;
-ScInputStatusItem aItem( FID_INPUTLINE_STATUS,
- aCursorPos, aCursorPos, aCursorPos,
- aString, pObject.get() );
-
-if (!aMisspellRanges.empty())
-aItem.SetMisspellRanges(&aMisspellRanges);
-
const SfxPoolItem* aArgs[2];
-aArgs[0] = &aItem;
aArgs[1] = nullptr;
-rBindings.Execute( nId, aArgs );
+
+if ( bInsertPreCorrectedString && aString != aPreAutoCorrectString
)
+{
+ ScInputStatusItem aItem(FID_INPUTLINE_STATUS,
+ aCursorPos, aCursorPos, aCursorPos,
+ aPreAutoCorrectString, pObject.get());
+aArgs[0] = &aItem;
+rBindings.Execute(nId, aArgs);
+}
+
+ScInputStatusItem aItemCorrected(FID_INPUTLINE_STATUS,
+ aCursorPos, aCursorPos,
aCursorPos,
+ aString, pObject.get());
+if ( !aMisspellRanges.empty() )
+aItemCorrected.SetMisspellRanges(&aMisspellRanges);
+
+aArgs[0] = &aItemCorrected;
+rBindings.Execute(nId, aArgs);
}
pLastState.reset(); // pLastState still contains the old text
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] Faster linking (-gsplit-dwarf, gold)
On Wednesday 27 of June 2018, Thorsten Behrens wrote: > Tangential question: anybody aware of something to prevent gdb from > trying to load _all_ symbols? The VS debugger is much more frugal > there initially. Actually it turns out that gold can help even here, with the --gdb-index option. I remember I tried that 4(?) years ago and back then it just moved the time from gdb to linking, which was pointless for the normal development cycle, but nowadays the small link time increase is probably worth it: before | gdb-index gdb symbols load time 51s | 16s libsclo link time6.159s | 7.758s libcslo.so size 207951K | 135315K That's all with gold and split debug enabled, and https://gerrit.libreoffice.org/#/c/56566/ . It seems to require binutils-2.25, which is from 2015. Just to add to the list, other things I've tried: * --threads doesn't seem to really do anything in practice. Even if I enable --preread-archive-symbols (which according to the source is the only thing it affects, besides compressed debuginfo), I can't see a difference. * --incremental reduces link time to about 4-5s, but appears to be unstable -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/SignatureLineDialog.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b80207f5ac67ff585ce10f741803df12d3a308a7
Author: Samuel Mehrbrodt
Date: Thu Jun 28 09:33:53 2018 +0200
tdf#118429 Provide unsigned signature image
when creating signature line.
OOXML Export expects this.
Change-Id: Ib6ab1f879c5ef27e8347002576ba95104117cadd
Reviewed-on: https://gerrit.libreoffice.org/56576
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/cui/source/dialogs/SignatureLineDialog.cxx
b/cui/source/dialogs/SignatureLineDialog.cxx
index a1716fe282b6..bd3d2a75003a 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -132,6 +132,7 @@ void SignatureLineDialog::Apply()
UNO_QUERY);
xShapeProps->setPropertyValue("Graphic", Any(xGraphic));
+xShapeProps->setPropertyValue("SignatureLineUnsignedImage", Any(xGraphic));
// Set signature line properties
xShapeProps->setPropertyValue("IsSignatureLine", Any(true));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Firebird build from master fails on macOS
On 2018/06/28 11:07 AM, Alexander Thurgood wrote: Well, the build seems to be working fine again now, so whatever... Firebird's makefile is extremely fragile, simply cleaning that folder and trying again normally sorts it out. In extreme cases I either disable it, or force a single-threaded compile with PARALLELISM=1 make externals ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-5-4-7-2' - 5 commits - configure.ac ReleaseNote.LINAGORA.txt sc/inc sc/source writerfilter/source
ReleaseNote.LINAGORA.txt |9 +
configure.ac |2 -
sc/inc/dpobject.hxx |2 -
sc/inc/dpoutput.hxx |6 +--
sc/source/core/data/dpobject.cxx | 20 ++-
sc/source/core/data/dpoutput.cxx | 41 +++
sc/source/ui/docshell/dbdocfun.cxx |2 -
writerfilter/source/rtftok/rtfdispatchsymbol.cxx |1
writerfilter/source/rtftok/rtfdispatchvalue.cxx |5 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
11 files changed, 57 insertions(+), 35 deletions(-)
New commits:
commit 84cdc5b975a208eecf96cb73014f465650380623
Author: Bevilacqua Jean-Sebastien
Date: Wed May 23 11:34:13 2018 +0200
bump product version to 5.4.7.2.M6
diff --git a/ReleaseNote.LINAGORA.txt b/ReleaseNote.LINAGORA.txt
index 199253ebd3a5..7f63505f33a4 100644
--- a/ReleaseNote.LINAGORA.txt
+++ b/ReleaseNote.LINAGORA.txt
@@ -1,3 +1,9 @@
+libreoffice-5-4-7-2.M6
+* acim#1133: tdf#117043 pivot table refresh fix
+
+libreoffice-5-4-7-2.M5
+* RTF fixes: Port LO 4.3.7.2 Linagora patch
+
libreoffice-5-4-7-2.M4
* Initialization of the 5-4-1-1 MIMO version
* Apply RTF patch
diff --git a/configure.ac b/configure.ac
index 3459f2bd2a3f..99253014d044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[5.4.7.2.M5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.7.2.M6],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 6b3a95b016d20a96a6f53c670e1b5053befc786e
Author: rking
Date: Tue May 15 08:10:21 2018 -0700
acim#1133: tdf#117043 pivot table refresh fix
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index aaed76a7e141..5c464f6f4b1a 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -124,7 +124,7 @@ public:
void ClearTableData();
void ReloadGroupTableData();
-voidOutput( const ScAddress& rPos );
+voidOutput( const ScAddress& rPos ,bool aFlag=false);
ScRange GetNewOutputRange( bool& rOverflow );
ScRange GetOutputRangeByType( sal_Int32 nType );
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 3e99e0e40d93..2209d2775003 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -85,9 +85,9 @@ private:
const css::sheet::DataResult& rData );
voidHeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
const css::sheet::MemberResult& rData,
-bool bColHeader, long nLevel );
+bool bColHeader, long nLevel ,bool
aFlag=false);
-void FieldCell(SCCOL nCol, SCROW nRow, SCTAB nTab, const ScDPOutLevelData&
rData, bool bInTable);
+void FieldCell(SCCOL nCol, SCROW nRow, SCTAB nTab, const ScDPOutLevelData&
rData, bool bInTable,bool aFlag=false);
voidCalcSizes();
@@ -104,7 +104,7 @@ public:
voidSetPosition( const ScAddress& rPos );
-voidOutput(); //! Refresh?
+voidOutput(bool aFlag=false); //! Refresh?
ScRange GetOutputRange( sal_Int32 nRegionType =
css::sheet::DataPilotOutputRangeType::WHOLE );
longGetHeaderRows();
boolHasError(); // range overflow or exception from
source
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index b29289f93fbc..2fc5e361550b 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -901,21 +901,23 @@ ScRange ScDPObject::GetNewOutputRange( bool& rOverflow )
}
}
-void ScDPObject::Output( const ScAddress& rPos )
+void ScDPObject::Output( const ScAddress& rPos ,bool aFlag)
{
// clear old output area
-pDoc->DeleteAreaTab( aOutRange.aStart.Col(), aOutRange.aStart.Row(),
- aOutRange.aEnd.Col(), aOutRange.aEnd.Row(),
- aOutRange.aStart.Tab(), InsertDeleteFlags::ALL );
-pDoc->RemoveFlagsTab( aOutRange.aStart.Col(), aOutRange.aStart.Row(),
- aOutRange.aEnd.Col(), aOutRange.aEnd.Row(),
- aOutRange.aStart.Tab(), ScMF::Auto );
-
+if (!aFlag)
+{
+pDoc->DeleteAreaTab(aOutRange.aStart.Col(), aOutRange.aStart.Row(),
+aOutRange.aEnd.Col(), aOutRange.aEnd.Row(),
+aOutRange.aStart.Tab(), InsertDeleteFlags::ALL);
+pDoc->RemoveFlagsTab(aOutRange.aStart.Col(), aOutRange.aStart.Row(),
+aOutRange.aEnd.Col(), aOutRange.aEnd.Row(),
+aOu
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/saldisp.hxx | 24 +++-
vcl/unx/generic/app/saldisp.cxx | 22 +++---
2 files changed, 34 insertions(+), 12 deletions(-)
New commits:
commit a1f5b1f30a5a80d7eeed2efe2564763bf1d12086
Author: Stephan Bergmann
Date: Thu Jun 28 09:47:29 2018 +0200
Clean up ownership tracking of SalVisual's visual (in X11 Visual base class)
GCC trunk towards GCC 9 emits -Wdeprecated-copy because SalVisual has
implicit
copy functions but a user-declared dtor. The implicitly-defined copy
functions
are actually used (so cannot be deleted), but in fragile interaction with
the
semantics of the user-provided dtor in the SalColormap(sal_uInt16) ctor.
Changing SalVisual into a move-only class (moving the "this instance must
delete
its visual member" information) doesn't work well, as
SalDisplay::ScreenData is
used as a supply of SalVisual instances (but which will never be of the
"this
instance must delete its visual member" variety) that are then copied into
SalColormap::m_aVisual.
As only SalColormap creates SalVisual instances of the "this instance must
delete its visual member" variety, what actually works is to track that
information in SalColormap instead of directly in SalVisual, and make
SalColormap a move-only class.
Change-Id: Ib968a38c40b660ce91981b3c7b281f4add6ece6b
Reviewed-on: https://gerrit.libreoffice.org/56579
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index a53be3692d8b..0bef7afb6c52 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -38,6 +38,7 @@ class SalXLib;
#include
#include
#include
+#include
#include
#include
#include
@@ -89,7 +90,6 @@ class SalVisual : public XVisualInfo
int nBlueBits_;
public:
SalVisual();
-~SalVisual();
SalVisual( const XVisualInfo* pXVI );
VisualIDGetVisualId() const { return visualid; }
@@ -101,12 +101,29 @@ public:
Color GetTCColor( Pixel nPixel ) const;
};
+// A move-only flag, used by SalColormap to track ownership of its
m_aVisual.visual:
+struct OwnershipFlag {
+bool owner = false;
+
+OwnershipFlag() = default;
+
+OwnershipFlag(OwnershipFlag && other) noexcept: owner(other.owner) {
other.owner = false; }
+
+OwnershipFlag & operator =(OwnershipFlag && other) noexcept {
+assert(&other != this);
+owner = other.owner;
+other.owner = false;
+return *this;
+}
+};
+
class SalColormap
{
const SalDisplay* m_pDisplay;
Colormapm_hColormap;
std::vector m_aPalette; // Pseudocolor
SalVisual m_aVisual;
+OwnershipFlag m_aVisualOwnership;
std::vector m_aLookupTable; // Pseudocolor: 12bit
reduction
Pixel m_nWhitePixel;
Pixel m_nBlackPixel;
@@ -122,6 +139,11 @@ public:
SalColormap( sal_uInt16 nDepth );
SalColormap();
+~SalColormap();
+
+SalColormap(SalColormap &&) = default;
+SalColormap & operator =(SalColormap &&) = default;
+
ColormapGetXColormap() const { return m_hColormap; }
const SalDisplay* GetDisplay() const { return m_pDisplay; }
inline Display*GetXDisplay() const;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5d266828196a..dff49c8e8b7c 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2435,11 +2435,6 @@ SalVisual::SalVisual( const XVisualInfo* pXVI )
}
}
-SalVisual::~SalVisual()
-{
-if( -1 == screen && VisualID(-1) == visualid ) delete visual;
-}
-
// Converts the order of bytes of a Pixel into bytes of a Color
// This is not reversible for the 6 XXXA
@@ -2608,8 +2603,8 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
&aVI ) )
{
aVI.visual = new Visual;
-aVI.visualid= VisualID(0); // beware of temporary
destructor below
-aVI.screen = 0;
+aVI.visualid= VisualID(-1);
+aVI.screen = -1;
aVI.depth = nDepth;
aVI.c_class = TrueColor;
if( 24 == nDepth ) // 888
@@ -2661,16 +2656,21 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
aVI.visual->map_entries = aVI.colormap_size;
m_aVisual = SalVisual( &aVI );
-// give ownership of constructed Visual() to m_aVisual
-// see SalVisual destructor
-m_aVisual.visualid= VisualID(-1);
-m_aVisual.screen = -1;
+m_aVisualOwnership.owner = true;
}
else
m_aVisual = Sal
[Libreoffice-commits] core.git: Changes to 'distro/mimo/mimo-5-4-7-2'
New branch 'distro/mimo/mimo-5-4-7-2' available with the following commits: ___ 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' - i18npool/source
i18npool/source/nativenumber/nativenumbersupplier.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e87b6121c5c26bf9d6fd0e29ac7d8480b24d1870
Author: Eike Rathke
Date: Wed Jun 27 17:26:23 2018 +0200
Check string length before copying, tdf#115007 follow-up
Change-Id: I50b842afc505ce603225fb2d25281cc8e9240200
Reviewed-on: https://gerrit.libreoffice.org/56537
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit d9388ab070ff99055650bf54b0e683a4be9bcdc9)
Reviewed-on: https://gerrit.libreoffice.org/56540
Tested-by: Jenkins
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 8c3698216b81..459d4bc97637 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -674,7 +674,8 @@ OUString
NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
switch (Casings[nCasing].eCasing)
{
case CAPITALIZE:
-return xCharClass->toTitle(aStr, 0, 1, aLocale) +
aStr.copy(1);
+return xCharClass->toTitle(aStr, 0, 1, aLocale) +
+(aStr.getLength() > 1 ? aStr.copy(1) : OUString());
case UPPER:
return xCharClass->toUpper(aStr, 0, aStr.getLength(),
aLocale);
case TITLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Firebird build from master fails on macOS
Le 27/06/2018 à 17:34, Alexander Thurgood a écrit : Well, the build seems to be working fine again now, so whatever... > Hey all, > > Heads up to the curator of the built-in Firebird package. The build from > master is failing for me currently on macOS 10.13.5 with the following > error message : > > can't format message 17:3 -- message file > /Users/Shared/LO/core/workdir/UnpackedTarball/firebird/gen/Release/firebird/firebird.msg > not found > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/inc sw/source
sw/inc/swmodule.hxx | 10 --
sw/source/core/text/guess.cxx |6 --
sw/source/core/txtnode/txtedt.cxx |6 --
sw/source/uibase/app/swmodule.cxx |8 ++--
4 files changed, 2 insertions(+), 28 deletions(-)
New commits:
commit 9f55673859400ba30b51e168142c3acb4dcea6f4
Author: Tor Lillqvist
Date: Tue Jun 19 12:31:41 2018 +0300
Initialise the spelling and grammar thing when Writer starts
We want to avoid the phenomenon where right after typing the first
character into a Writer documnent in a LibreOffice instance, spell and
grammar checking stuff is initialised which can take a quite long
time, especially the LightProof one.
Even after my recent change that made the Lightproof initialisation
clearly faster (by avoiding the import of the large
lightproof_impl_pt_BR.py module before actually doing Brazilian
Portuguese proofreading), there still was a 0.3 second delay on my
relatively fast machine.
This change moves that delay into Writer start instead, before any
document window is ready to accept input. At least then the user is
not entering text and wondering why it doesn't show up right away.
Change-Id: Ie578c310dc9cb9bfc964e2986eec177fb1d4e666
Reviewed-on: https://gerrit.libreoffice.org/56465
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 3e468498a974..422782944a91 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -237,10 +237,6 @@ public:
static void CheckSpellChanges( bool bOnlineSpelling,
bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool
bSmartTags );
-inline const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >&
-GetLngSvcEvtListener();
-voidCreateLngSvcEvtListener();
-
css::uno::Reference< css::scanner::XScannerManager2 > const &
GetScannerManager();
@@ -251,12 +247,6 @@ public:
void CallAutomationApplicationEventSinks(const OUString& Method,
css::uno::Sequence< css::uno::Any >& Arguments);
};
-inline const css::uno::Reference< css::linguistic2::XLinguServiceEventListener
>&
-SwModule::GetLngSvcEvtListener()
-{
-return m_xLinguServiceEventListener;
-}
-
//Access to SwModule, the View and the shell.
#define SW_MOD() (
static_cast(SfxApplication::GetModule(SfxToolsModule::Writer)))
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index bcbdf0650a33..8951720a7e3d 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -380,12 +380,6 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
aForbidden.beginLine, aForbidden.endLine,
rInf.HasForbiddenChars(), bAllowHanging, false );
-//! register listener to LinguServiceEvents now in order to get
-//! notified about relevant changes in the future
-SwModule *pModule = SW_MOD();
-if (!pModule->GetLngSvcEvtListener().is())
-pModule->CreateLngSvcEvtListener();
-
// !!! We must have a local copy of the locale, because inside
// getLineBreak the LinguEventListener can trigger a new formatting,
// which can corrupt the locale pointer inside pBreakIt.
diff --git a/sw/source/core/txtnode/txtedt.cxx
b/sw/source/core/txtnode/txtedt.cxx
index 8ab99e5e8edf..79632fbe9f44 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1323,12 +1323,6 @@ SwRect SwTextFrame::AutoSpell_( const SwContentNode*
pActNode, sal_Int32 nActPos
if( bFresh )
{
-//! register listener to LinguServiceEvents now in order to get
-//! notified about relevant changes in the future
-SwModule *pModule = SW_MOD();
-if (!pModule->GetLngSvcEvtListener().is())
-pModule->CreateLngSvcEvtListener();
-
uno::Reference< XSpellChecker1 > xSpell( ::GetSpellChecker() );
SwDoc* pDoc = pNode->GetDoc();
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index 0fb7e491bcb4..99347905394c 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -193,6 +193,8 @@ SwModule::SwModule( SfxObjectFactory* pWebFact,
// at the view options.
GetColorConfig();
}
+
+m_xLinguServiceEventListener = new SwLinguServiceEventListener;
}
OUString SwResId(const char* pId)
@@ -227,12 +229,6 @@ SwModule::~SwModule()
EndListening( *SfxGetpApp() );
}
-void SwModule::CreateLngSvcEvtListener()
-{
-if (!m_xLinguServiceEventListener.is())
-m_xLinguServiceEventListener = new SwLinguServiceEventListener;
-}
-
void SwDLL::RegisterFactories()
{
// These Id's must not be changed. Through these Id's the View (resume
Documentview)
___
Libreoffice-commits mailing
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source
vcl/source/window/paint.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 063f11bc96658a70d92c8bfc410f902fdd2e8453
Author: Tamás Zolnai
Date: Fri May 18 13:31:34 2018 +0200
lok: Use GetSizePixel() here which calculates also with border
Fixes the bug that one pixel is not invalidated of a preview window
on the dialogs.
For example: Character properties dialog -> Highlighting preview or
Character properties dialog -> Font preview
Reviewed-on: https://gerrit.libreoffice.org/54494
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
(cherry picked from commit 7a77d927c88a04ee51ceb765c77e725a67a1d1a7)
Change-Id: I6f96abdd4d85c8dfed8bf83e1b2a30192a54bd2d
Reviewed-on: https://gerrit.libreoffice.org/54536
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index b9ac88de33c5..dd3323fa2b60 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1224,7 +1224,7 @@ void Window::LogicInvalidate(const tools::Rectangle*
pRectangle)
// Added for dialog items. Pass invalidation to the parent window.
else if (VclPtr pParent = GetParentWithLOKNotifier())
{
-const tools::Rectangle aRect(Point(GetOutOffXPixel(),
GetOutOffYPixel()), Size(GetOutputWidthPixel(), GetOutputHeightPixel()));
+const tools::Rectangle aRect(Point(GetOutOffXPixel(),
GetOutOffYPixel()), GetSizePixel());
pParent->LogicInvalidate(&aRect);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 102 -
slideshow/source/engine/shapes/drawshapesubsetting.hxx |8 -
slideshow/source/inc/doctreenode.hxx |1
3 files changed, 52 insertions(+), 59 deletions(-)
New commits:
commit 4600b07c1d787f959618d9ecf54161e4ea4ffa61
Author: Mike Kaganski
Date: Thu Jun 28 14:51:31 2018 +1000
tdf#102195: don't exclude everything between first and last subset
When subsets are non-contiguous, we need to include the parts between
subsets.
Change-Id: I28214dccc75e6a6af5c65397b2126049a65bf79f
Reviewed-on: https://gerrit.libreoffice.org/56571
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 1de7934719d9..849df8d9897c 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -164,50 +164,65 @@ namespace slideshow
mbNodeTreeInitialized = true;
}
-void DrawShapeSubsetting::updateSubsetBounds( const SubsetEntry&
rSubsetEntry )
+void DrawShapeSubsetting::excludeSubset(sal_Int32 nExcludedStart,
sal_Int32 nExcludedEnd)
{
-// TODO(F1): This removes too much from non-contiguous subsets
-mnMinSubsetActionIndex = ::std::min(
-mnMinSubsetActionIndex,
-rSubsetEntry.mnStartActionIndex );
-mnMaxSubsetActionIndex = ::std::max(
-mnMaxSubsetActionIndex,
-rSubsetEntry.mnEndActionIndex );
-}
-
-void DrawShapeSubsetting::updateSubsets()
-{
-maCurrentSubsets.clear();
+// If current subsets are empty, fill it with initial range
+initCurrentSubsets();
+if (maCurrentSubsets.empty())
+{
+// Non-subsetting mode (not a subset of anything; child
subsets subtract content)
+maCurrentSubsets.emplace_back(0, maActionClassVector.size());
+}
-if( !maSubsetShapes.empty() )
+slideshow::internal::VectorOfDocTreeNodes aNodesToAppend;
+for (auto i = maCurrentSubsets.begin(); i !=
maCurrentSubsets.end();)
{
-if( maSubset.isEmpty() )
+if (i->getStartIndex() < nExcludedStart)
{
-// non-subsetted node, with some child subsets
-// that subtract from it
-maCurrentSubsets.emplace_back( 0,
-
mnMinSubsetActionIndex );
-maCurrentSubsets.emplace_back( mnMaxSubsetActionIndex,
-
maActionClassVector.size() );
+if (i->getEndIndex() > nExcludedStart)
+{
+// Some overlap -> append new node (if required), and
correct this node's end
+if (i->getEndIndex() > nExcludedEnd)
+{
+aNodesToAppend.emplace_back(nExcludedEnd,
i->getEndIndex());
+}
+i->setEndIndex(nExcludedStart);
+}
+++i;
+}
+else if (i->getStartIndex() < nExcludedEnd)
+{
+if (i->getEndIndex() > nExcludedEnd)
+{
+// Partial overlap; change the node's start
+i->setStartIndex(nExcludedEnd);
+++i;
+}
+else
+{
+// Node is fully inside the removed range: erase it
+i = maCurrentSubsets.erase(i);
+}
}
else
{
-// subsetted node, from which some further child
-// subsets subtract content
-maCurrentSubsets.emplace_back( maSubset.getStartIndex(),
-
mnMinSubsetActionIndex );
-maCurrentSubsets.emplace_back( mnMaxSubsetActionIndex,
-
maSubset.getEndIndex() );
+// Node is fully outside (after) excluded range
+++i;
}
}
-else
+
+maCurrentSubsets.insert(maCurrentSubsets.end(),
aNodesToAppend.begin(),
+aNodesToAppend.end());
+}
+
+void DrawShapeSubsetting::updateSubsets()
+{
+maCurrentSubsets.clear();
+initCurrentSubsets();
+
+for (const auto& rSubsetShape : maSubsetShapes)
[Libreoffice-commits] core.git: sc/source
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx |7 +++
sc/source/ui/inc/AccessiblePreviewTable.hxx |2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 1113f93db393fab7d38fd1e98ee52fa8f564e545
Author: Noel Grandin
Date: Wed Jun 27 10:21:19 2018 +0200
loplugin:useuniqueptr in ScAccessiblePreviewTable
Change-Id: I75b37dab51f3510f6e7155c191a85af99b0d350f
Reviewed-on: https://gerrit.libreoffice.org/56547
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 5431a1bc0a3a..2d211c748dfb 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -76,8 +76,7 @@ void SAL_CALL ScAccessiblePreviewTable::disposing()
mpViewShell = nullptr;
}
-if (mpTableInfo)
-DELETEZ (mpTableInfo);
+mpTableInfo.reset();
ScAccessibleContextBase::disposing();
}
@@ -91,7 +90,7 @@ void ScAccessiblePreviewTable::Notify( SfxBroadcaster& rBC,
const SfxHint& rHint
{
// column / row layout may change with any document change,
// so it must be invalidated
-DELETEZ( mpTableInfo );
+mpTableInfo.reset();
}
else if (nId == SfxHintId::ScAccVisAreaChanged)
{
@@ -637,7 +636,7 @@ void ScAccessiblePreviewTable::FillTableInfo() const
aOutputSize = pWindow->GetOutputSizePixel();
tools::Rectangle aVisRect( Point(), aOutputSize );
-mpTableInfo = new ScPreviewTableInfo;
+mpTableInfo.reset( new ScPreviewTableInfo );
mpViewShell->GetLocationData().GetTableInfo( aVisRect, *mpTableInfo );
}
}
diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx
b/sc/source/ui/inc/AccessiblePreviewTable.hxx
index fc73b744e4c0..54d7b92f8190 100644
--- a/sc/source/ui/inc/AccessiblePreviewTable.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx
@@ -124,7 +124,7 @@ protected:
private:
ScPreviewShell* mpViewShell;
sal_Int32 mnIndex;
-mutable ScPreviewTableInfo* mpTableInfo;
+mutable std::unique_ptr mpTableInfo;
bool IsDefunc(
const css::uno::Reference&
rxParentStates);
___
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' - external/hunspell
external/hunspell/0001-Hunspell-patches-for-missing-OCONV-conversion.patch
| 175 +
external/hunspell/0001-recent-Hunspell-fixes-for-suggestion-spelling-and-an.patch
| 1165 ++
external/hunspell/UnpackedTarball_hunspell.mk
|4
3 files changed, 1343 insertions(+), 1 deletion(-)
New commits:
commit ec0715eaaf2655e2eaa9e228e26583b63038ba02
Author: László Németh
Date: Sun Jun 17 13:44:24 2018 +0200
tdf#118162 spell checking: fix freezing and add missing OCONV...
also commit "fix hunspell build break for non-cxx11 case"
by Christian Lohmaier.
(cherry-picked from commit b691e5824a6346d2fe7f702b5280b56532a2f89e
and commit 79c0327bf8f472faed0dd950d42c060e8766d1c4)
... conversion, also other smaller fixes of spelling, suggestion
and morphological analysis using recent Hunspell commits.
Several second or more freezing was occured with Hunspell
dictionaries with compound word handling, because of (1)
combinatorical explosion of overlapping word parts, or
(2) unlimited suggestion algorithms (for example MAP) and
(3) multiple suggestion search for a capitalized,
mixed case or abbreviated long word.
Reviewed-on: https://gerrit.libreoffice.org/55965
Tested-by: Jenkins
Reviewed-by: László Németh
Change-Id: I73e196f907e9b73dcd981d275cedb33878a554f6
Reviewed-on: https://gerrit.libreoffice.org/56393
Tested-by: Jenkins
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/56349
Reviewed-by: Miklos Vajna
diff --git
a/external/hunspell/0001-Hunspell-patches-for-missing-OCONV-conversion.patch
b/external/hunspell/0001-Hunspell-patches-for-missing-OCONV-conversion.patch
new file mode 100644
index ..83d429f50979
--- /dev/null
+++ b/external/hunspell/0001-Hunspell-patches-for-missing-OCONV-conversion.patch
@@ -0,0 +1,175 @@
+From e13ff056fd65990b88d29fb9eae304b411e58234 Mon Sep 17 00:00:00 2001
+From: Changwoo Ryu
+Date: Wed, 8 Mar 2017 14:04:26 +0900
+Subject: [PATCH] Hunspell patches for missing OCONV conversion
+
+4e2abfd Clean up PR #479
+cc2d71e Add oconv2 test to Makefile
+ca14fdb Avoid gotos across variable initialization
+7e5cb62 Use goto to reduce repetitive code
+f528192 Add missing OCONV conversion of root and morphemes output
+---
+ src/hunspell/hunspell.cxx | 59 +++
+ tests/test.sh | 23 +++---
+ 2 files changed, 70 insertions(+), 12 deletions(-)
+
+diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx
+index 1100a6f..87d1b4a 100644
+--- a/src/hunspell/hunspell.cxx
b/src/hunspell/hunspell.cxx
+@@ -98,10 +98,13 @@ public:
+ std::vector stem(const std::string& word);
+ std::vector stem(const std::vector& morph);
+ std::vector analyze(const std::string& word);
++ std::vector analyze_internal(const std::string& word);
+ int get_langnum() const;
+ bool input_conv(const std::string& word, std::string& dest);
+ bool spell(const std::string& word, int* info = NULL, std::string* root =
NULL);
++ bool spell_internal(const std::string& word, int* info = NULL, std::string*
root = NULL);
+ std::vector suggest(const std::string& word);
++ std::vector suggest_internal(const std::string& word);
+ const std::string& get_wordchars() const;
+ const std::vector& get_wordchars_utf16() const;
+ const std::string& get_dict_encoding() const;
+@@ -415,6 +418,21 @@ bool Hunspell::spell(const std::string& word, int* info,
std::string* root) {
+ }
+
+ bool HunspellImpl::spell(const std::string& word, int* info, std::string*
root) {
++ bool r = spell_internal(word, info, root);
++ if (r && root) {
++// output conversion
++RepList* rl = (pAMgr) ? pAMgr->get_oconvtable() : NULL;
++if (rl) {
++ std::string wspace;
++ if (rl->conv(*root, wspace)) {
++*root = wspace;
++ }
++}
++ }
++ return r;
++}
++
++bool HunspellImpl::spell_internal(const std::string& word, int* info,
std::string* root) {
+ struct hentry* rv = NULL;
+
+ int info2 = 0;
+@@ -834,6 +852,22 @@ std::vector Hunspell::suggest(const
std::string& word) {
+
+ std::vector HunspellImpl::suggest(const std::string& word) {
+ std::vector slst;
++ slst = suggest_internal(word);
++ // output conversion
++ RepList* rl = (pAMgr) ? pAMgr->get_oconvtable() : NULL;
++ if (rl) {
++for (size_t i = 0; rl && i < slst.size(); ++i) {
++ std::string wspace;
++ if (rl->conv(slst[i], wspace)) {
++slst[i] = wspace;
++ }
++}
++ }
++ return slst;
++}
++
++std::vector HunspellImpl::suggest_internal(const std::string&
word) {
++ std::vector slst;
+
+ int onlycmpdsug = 0;
+ if (!pSMgr || m_HMgrs.empty())
+@@ -1150,15 +1184,6 @@ std::vector HunspellImpl::suggest(const
std::string& word) {
+ }
+ slst.resize(l);
+
+- // output conversion
+- rl = (pAMgr) ? pAMgr->get_oconvtable() : NULL;
+- f
[Libreoffice-commits] core.git: include/IwyuFilter_include.yaml include/osl sal/osl sal/rtl sc/source sd/source sw/source
include/IwyuFilter_include.yaml | 12
include/osl/diagnose.h |1 -
include/osl/module.h |1 -
include/osl/process.h|3 ---
include/osl/socket.h |3 ---
sal/osl/unx/process_impl.cxx |1 +
sal/osl/unx/socket.cxx |1 +
sal/rtl/cmdargs.cxx |1 +
sc/source/core/data/column3.cxx |1 +
sc/source/ui/docshell/docsh.cxx |1 +
sc/source/ui/docshell/docsh8.cxx |1 +
sd/source/filter/html/htmlex.cxx |1 +
sw/source/filter/ww8/docxattributeoutput.cxx |1 +
sw/source/filter/ww8/rtfexport.cxx |1 +
sw/source/ui/dbui/mmresultdialogs.cxx|1 +
sw/source/uibase/dbui/dbmgr.cxx |1 +
sw/source/uibase/uiview/srcview.cxx |1 +
17 files changed, 24 insertions(+), 8 deletions(-)
New commits:
commit f4dafe050abe42a36ed56576c23539eb808db5ba
Author: Gabor Kelemen
Date: Tue Jun 26 07:09:39 2018 +0200
tdf#42949 Fix IWYU warnings in include/osl/*h
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ib2301526d7aa6982af6c8c79ed7e9a4c34b7bbf7
Reviewed-on: https://gerrit.libreoffice.org/56491
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 184c9680648c..f679943627c1 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -10,3 +10,15 @@ blacklist:
include/sal/mathconf.h:
# Platform dependent
- cmath
+include/osl/endian.h:
+# needed for base types used in macros
+- sal/types.h
+include/osl/conditn.h:
+# ODK API test would fail with fw decl here
+- osl/time.h
+include/osl/socket.h:
+# ODK API test would fail with fw decl here
+- osl/time.h
+include/osl/thread.h:
+# ODK API test would fail with fw decl here
+- osl/time.h
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index 9f0d90468d76..18c08ef84eb8 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -24,7 +24,6 @@
#include "sal/config.h"
#include "sal/detail/log.h"
-#include "sal/saldllapi.h"
#include "sal/types.h"
/** @file
diff --git a/include/osl/module.h b/include/osl/module.h
index 76099a94ca6c..563f3492c987 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -22,7 +22,6 @@
#include "sal/config.h"
-#include "rtl/tencinfo.h"
#include "rtl/ustring.h"
#include "sal/saldllapi.h"
diff --git a/include/osl/process.h b/include/osl/process.h
index 772db9abc7c5..120d87e64ab8 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -24,12 +24,9 @@
#include "sal/config.h"
#include "osl/file.h"
-#include "osl/pipe.h"
#include "osl/security.h"
-#include "osl/socket.h"
#include "osl/time.h"
#include "rtl/locale.h"
-#include "rtl/textenc.h"
#include "rtl/ustring.h"
#include "sal/saldllapi.h"
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 97b0cdf429cf..a7eda5e9c69f 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -21,10 +21,7 @@
#define INCLUDED_OSL_SOCKET_H
#include "rtl/ustring.h"
-#include "rtl/byteseq.h"
-
#include "osl/time.h"
-#include "rtl/tencinfo.h"
#ifdef __cplusplus
extern "C" {
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 9982a84306c8..f7397d48f242 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index dcd7b5509aba..c941f25658eb 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
diff --git a/sal/rtl/cmdargs.cxx b/sal/rtl/cmdargs.cxx
index bb70e4a65120..8e10b0bca04d 100644
--- a/sal/rtl/cmdargs.cxx
+++ b/sal/rtl/cmdargs.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5ef13e7a951a..7abfce080af0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -53,6 +53,7 @@
#include
+#include
#include
#include
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 5ac53c1e4e10..ab0759367d59 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 3c5c7b4566d3..aae269593844 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -29,6 +29,7 @@
#include
#include
#incl
[Libreoffice-commits] core.git: external/pdfium
external/pdfium/0006-Add-FPDFPath_GetDrawMode-API.patch.1| 94
++
external/pdfium/0006-svx-improve-path-importing-from-PDF.patch.2 | 46
external/pdfium/UnpackedTarball_pdfium.mk|2
3 files changed, 100 insertions(+), 42 deletions(-)
New commits:
commit 64acf709a616c45d20c9cb5b1bcce0da34593661
Author: Miklos Vajna
Date: Wed Jun 27 21:38:21 2018 +0200
pdfium: replace FPDFPath_GetDrawMode() patch with backport
Change-Id: I86c7c0f73a21f670676716d7c22f519ed82da145
Reviewed-on: https://gerrit.libreoffice.org/56544
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/external/pdfium/0006-Add-FPDFPath_GetDrawMode-API.patch.1
b/external/pdfium/0006-Add-FPDFPath_GetDrawMode-API.patch.1
new file mode 100644
index ..b9c9326c5f07
--- /dev/null
+++ b/external/pdfium/0006-Add-FPDFPath_GetDrawMode-API.patch.1
@@ -0,0 +1,94 @@
+From 3285732ee73e97feb3fed4da6abc41b1c705ed30 Mon Sep 17 00:00:00 2001
+Date: Wed, 30 May 2018 13:30:10 +
+Subject: [PATCH] Add FPDFPath_GetDrawMode() API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It was already possible to set the draw mode of a path object, this is
+the other direction.
+
+Change-Id: Id0ee98dd8dfe433edd0e4715fc009ad4d1625981
+Reviewed-on: https://pdfium-review.googlesource.com/33010
+Reviewed-by: dsinclair
+Reviewed-by: Nicolás Peña Moreno
+Commit-Queue: dsinclair
+---
+ fpdfsdk/fpdf_edit_embeddertest.cpp | 7 +++
+ fpdfsdk/fpdf_editpath.cpp | 18 ++
+ public/fpdf_edit.h | 16 ++--
+ 3 files changed, 39 insertions(+), 2 deletions(-)
+
+diff --git a/fpdfsdk/fpdf_editpath.cpp b/fpdfsdk/fpdf_editpath.cpp
+index aca2bebf8..558a8e3de 100644
+--- a/fpdfsdk/fpdf_editpath.cpp
b/fpdfsdk/fpdf_editpath.cpp
+@@ -235,6 +235,24 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
FPDFPath_SetDrawMode(FPDF_PAGEOBJECT path,
+ return true;
+ }
+
++FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_GetDrawMode(FPDF_PAGEOBJECT path,
++ int* fillmode,
++ FPDF_BOOL* stroke) {
++ auto* pPathObj = CPDFPathObjectFromFPDFPageObject(path);
++ if (!pPathObj || !fillmode || !stroke)
++return false;
++
++ if (pPathObj->m_FillType == FXFILL_ALTERNATE)
++*fillmode = FPDF_FILLMODE_ALTERNATE;
++ else if (pPathObj->m_FillType == FXFILL_WINDING)
++*fillmode = FPDF_FILLMODE_WINDING;
++ else
++*fillmode = FPDF_FILLMODE_NONE;
++
++ *stroke = pPathObj->m_bStroke;
++ return true;
++}
++
+ FPDF_EXPORT void FPDF_CALLCONV FPDFPath_SetLineJoin(FPDF_PAGEOBJECT path,
+ int line_join) {
+ if (!path)
+diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
+index 49018df05..2faa9ecba 100644
+--- a/public/fpdf_edit.h
b/public/fpdf_edit.h
+@@ -48,6 +48,7 @@
+ #define FPDF_SEGMENT_BEZIERTO 1
+ #define FPDF_SEGMENT_MOVETO 2
+
++#define FPDF_FILLMODE_NONE 0
+ #define FPDF_FILLMODE_ALTERNATE 1
+ #define FPDF_FILLMODE_WINDING 2
+
+@@ -899,8 +900,7 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
FPDFPath_Close(FPDF_PAGEOBJECT path);
+ // Set the drawing mode of a path.
+ //
+ // path - the handle to the path object.
+-// fillmode - the filling mode to be set: 0 for no fill, 1 for alternate, 2
for
+-// winding.
++// fillmode - the filling mode to be set: one of the FPDF_FILLMODE_* flags.
+ // stroke - a boolean specifying if the path should be stroked or not.
+ //
+ // Returns TRUE on success
+@@ -908,6 +908,18 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
FPDFPath_SetDrawMode(FPDF_PAGEOBJECT path,
+ int fillmode,
+ FPDF_BOOL stroke);
+
++// Experimental API.
++// Get the drawing mode of a path.
++//
++// path - the handle to the path object.
++// fillmode - the filling mode of the path: one of the FPDF_FILLMODE_* flags.
++// stroke - a boolean specifying if the path is stroked or not.
++//
++// Returns TRUE on success
++FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPath_GetDrawMode(FPDF_PAGEOBJECT path,
++ int* fillmode,
++ FPDF_BOOL* stroke);
++
+ // Create a new text object using one of the standard PDF fonts.
+ //
+ // document - handle to the document.
+--
+2.16.4
+
diff --git a/external/pdfium/0006-svx-improve-path-importing-from-PDF.patch.2
b/external/pdfium/0006-svx-improve-path-importing-from-PDF.patch.2
index bab68ec594ca..3dba5e2c2caf 100644
--- a/external/pdfium/0006-svx-improve-path-importing-from-PDF.patch.2
+++ b/external/pdfium/0006-svx-improve-path-importing-from-PDF.patch.2
@@ -12,33 +12,7 @@ diff --git a/pdfium/fpdfsdk/fpdf_editpath.cpp
b/pdfium/fpdfsdk/fpdf_editpath.cpp
index 55f9fce..f41db64 10064
