[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgstyleattributes.hxx |5 +++--
svgio/source/svgreader/svgstyleattributes.cxx| 23 ++-
2 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 842313c23ec96aeb99b68f28e7d48cc9e263a0a8
Author: Xisco Fauli
Date: Sat Feb 6 17:04:41 2016 +0100
tdf#97543 SVGIO: Rework getVisibility()
Change-Id: Idb3eaa27e3e8ec177ebd2bad81f53c4d3da9d241
Reviewed-on: https://gerrit.libreoffice.org/22169
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 9d589d1..47bace0 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -170,6 +170,7 @@ namespace svgio
enum Visibility
{
+Visibility_notset,
Visibility_visible,
Visibility_hidden,
Visibility_collapse,
@@ -429,8 +430,8 @@ namespace svgio
void setOpacity(const SvgNumber& rOpacity = SvgNumber()) {
maOpacity = rOpacity; }
/// Visibility
-Visibility getVisibility() const { return maVisibility; }
-void setVisibility(Visibility eVisibility) { maVisibility =
eVisibility; }
+Visibility getVisibility() const;
+void setVisibility(const Visibility aVisibility =
Visibility_notset) { maVisibility = aVisibility; }
// Title content
const OUString& getTitle() const { return maTitle; }
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx
b/svgio/source/svgreader/svgstyleattributes.cxx
index e733396..f3eec06 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -1211,7 +1211,7 @@ namespace svgio
maTextAnchor(TextAnchor_notset),
maColor(),
maOpacity(),
-maVisibility(Visibility_visible),
+maVisibility(Visibility_notset),
maTitle(),
maDesc(),
maClipPathXLink(),
@@ -1237,10 +1237,6 @@ namespace svgio
mbIsClipPathContent = pParentStyle->mbIsClipPathContent;
}
}
-if(pParentStyle)
-{
-maVisibility = pParentStyle->maVisibility;
-}
}
SvgStyleAttributes::~SvgStyleAttributes()
@@ -2185,6 +2181,23 @@ namespace svgio
return SvgNumber(1.0);
}
+Visibility SvgStyleAttributes::getVisibility() const
+{
+if(Visibility_notset == maVisibility || Visibility_inherit ==
maVisibility)
+{
+const SvgStyleAttributes* pSvgStyleAttributes =
getParentStyle();
+
+if(pSvgStyleAttributes)
+{
+return pSvgStyleAttributes->getVisibility();
+}
+//default is Visible
+return Visibility_visible;
+}
+
+return maVisibility;
+}
+
FillRule SvgStyleAttributes::getFillRule() const
{
if(FillRule_notset != maFillRule)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/inc idl/source
idl/inc/basobj.hxx | 13 +---
idl/inc/bastype.hxx| 22
idl/inc/database.hxx |1
idl/inc/module.hxx |2
idl/inc/object.hxx |2
idl/inc/slot.hxx |3 -
idl/inc/types.hxx | 22
idl/source/objects/basobj.cxx | 25 +++--
idl/source/objects/bastype.cxx | 22
idl/source/objects/module.cxx | 12
idl/source/objects/object.cxx |6 --
idl/source/objects/slot.cxx|9 ---
idl/source/objects/types.cxx | 107 -
idl/source/prj/database.cxx| 36 +
14 files changed, 42 insertions(+), 240 deletions(-)
New commits:
commit 0b7337bfa049f4e3a8b87f7628025e40f5b3e825
Author: Noel Grandin
Date: Fri Feb 5 11:52:10 2016 +0200
remove some dead code, found using LCOV
Change-Id: Ibdca0a70722290bbb560726c88e9821c3ae0af14
Reviewed-on: https://gerrit.libreoffice.org/22151
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 1768e0c..5524df0 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -88,9 +88,8 @@ protected:
SvString aName;
SvHelpTextaHelpText;
-bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
- char c = '\0' );
+bool ReadNameSvIdl( SvTokenStream & rInStm );
+void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
@@ -101,9 +100,9 @@ public:
static void Back2Delemitter( SvStream & );
static void WriteStars( SvStream & );
-virtual boolSetName( const OString& rName, SvIdlDataBase *
= nullptr );
-virtual const SvString &GetName() const { return aName; }
-virtual const SvString &GetHelpText() const { return aHelpText; }
+void SetName( const OString& rName );
+virtual const SvString & GetName() const { return aName; }
+virtual const SvString & GetHelpText() const { return aHelpText; }
virtual boolTest( SvIdlDataBase &, SvTokenStream & rInStm );
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -167,8 +166,6 @@ class SvMetaExtern : public SvMetaReference
public:
SvMetaExtern();
-SvMetaModule * GetModule() const;
-
voidSetModule( SvIdlDataBase & rBase );
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
override;
};
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 6891d48..f571a02 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -29,21 +29,6 @@ class SvIdlDataBase;
class SvStream;
class SvTokenStream;
-class Svint
-{
-int bVal;
-boolbSet;
-public:
-Svint() { bVal = 0; bSet = false; }
-Svint( int n ) : bVal( n ), bSet( true ) {}
-Svint( int n, bool bSetP ) : bVal( n ), bSet( bSetP ) {}
-Svint& operator = ( int n ) { bVal = n; bSet = true; return *this; }
-
-operatorint ()const { return bVal; }
-boolIsSet() const { return bSet; }
-};
-
-
class SvBOOL
{
bool bVal:1,
@@ -80,8 +65,6 @@ public:
voidSetValue( sal_uInt32 bVal ) { nValue = bVal; }
voidReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-voidReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName,
- SvTokenStream & rInStm );
};
@@ -99,11 +82,6 @@ public:
{
return m_aStr;
}
-bool IsSet() const
-{
-return !m_aStr.isEmpty();
-}
-
boolReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
};
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index f7c8e7b..7852e80 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -87,7 +87,6 @@ public:
SvRefMemberList& GetTypeList();
SvRefMemberList& GetClassList() { return aClassList; }
SvRefMemberList& GetModuleList() { return aModuleList;
}
-SvMetaModule * GetModule( const OString& rName );
// list of used types while writing
SvRefMemberListaUsedTypes;
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index b09ae4e..3a05264 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -41,8 +41,6 @@ protected:
virtual voidReadContextSvIdl( SvIdlDataBase &, SvTokenStream &
rInStm ) override;
public:
-virtual boolSetName( const OString& rName, SvIdlDataBase * =
nullptr ) override;
-
SvMetaModule( bool bImported );
[Libreoffice-commits] core.git: idl/inc idl/source
idl/inc/types.hxx | 10 +-
idl/source/objects/object.cxx |2 +-
idl/source/objects/slot.cxx |2 +-
idl/source/objects/types.cxx | 41 +++--
4 files changed, 26 insertions(+), 29 deletions(-)
New commits:
commit e90f4e18fd53bd85cc953eb2e796d593ae3f79df
Author: Noel Grandin
Date: Fri Feb 5 11:36:48 2016 +0200
convert TYPE_ enum to scoped
Change-Id: I514cf8591d8e7b3ff26bafba8fdbac2ad26249b8
Reviewed-on: https://gerrit.libreoffice.org/22150
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 1589fe7..54100bc 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -68,15 +68,15 @@ public:
SvIdlDataBase& );
};
-enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
- TYPE_CLASS };
+enum MetaTypeType { Method, Struct, Base, Enum, Class };
+
class SvMetaType : public SvMetaExtern
{
SvIdentifieraCName;
SvIdentifieraBasicPostfix;
SvIdentifieraBasicName;
SvRefMemberList* pAttrList;
-int nType;
+MetaTypeTypenType;
boolbIsItem;
boolbIsShell;
charcParserChar;
@@ -106,8 +106,8 @@ public:
return pAttrList ? pAttrList->size() : 0L;
}
-voidSetType( int nT );
-int GetType() const { return nType; }
+voidSetType( MetaTypeType nT );
+MetaTypeTypeGetType() const { return nType; }
SvMetaType *GetBaseType() const;
SvMetaType *GetReturnType() const;
boolIsItem() const { return bIsItem; }
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index d4d8002..d27b5ac 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -115,7 +115,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
sal_uLong nTokPos = rInStm.Tell();
-if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() ==
TYPE_CLASS )
+if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() ==
MetaTypeType::Class )
{
bool bOk = true;
if( rInStm.Read( ':' ) )
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index ad1..16a1d79 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -316,7 +316,7 @@ bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream
& rInStm )
if( bOk )
{
SvMetaType * pType = GetType();
-if( pType->GetType() == TYPE_METHOD )
+if( pType->GetType() == MetaTypeType::Method )
pType = pType->GetReturnType();
if( !pType->IsItem() )
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 51be69d..fd8d1d7 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -83,13 +83,13 @@ bool SvMetaAttribute::IsMethod() const
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
-return pType->GetType() == TYPE_METHOD;
+return pType->GetType() == MetaTypeType::Method;
}
bool SvMetaAttribute::IsVariable() const
{
SvMetaType * pType = GetType();
-return pType->GetType() != TYPE_METHOD;
+return pType->GetType() != MetaTypeType::Method;
}
OString SvMetaAttribute::GetMangleName( bool ) const
@@ -163,7 +163,7 @@ sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer&
rAttrArray )
DBG_ASSERT( pType, "no type for attribute" );
SvMetaType * pBaseType = pType->GetBaseType();
DBG_ASSERT( pBaseType, "no base type for attribute" );
-if( pBaseType->GetType() == TYPE_STRUCT )
+if( pBaseType->GetType() == MetaTypeType::Struct )
return pBaseType->MakeSfx( rAttrArray );
else
{
@@ -181,8 +181,8 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const
OString&, SvIdlDataBase&
}
#define CTOR\
-: pAttrList( nullptr ) \
-, nType( TYPE_BASE )\
+: pAttrList( nullptr ) \
+, nType( MetaTypeType::Base ) \
, bIsItem( false ) \
, bIsShell( false ) \
, cParserChar( 'h' )
@@ -226,13 +226,10 @@ SvRefMemberList&
SvMetaType::GetAttrList() const
return *pAttrList;
}
-void SvMetaType::SetType( int nT )
+void SvMetaType::SetType( MetaTypeType nT )
{
nType = nT;
-if( nType == TYPE_ENUM )
-{
-}
-else if( nType == TYPE_CLASS )
+if( nType == MetaTypeType::Class )
{
OStringBuffer aTmp(C_PREF);
aTmp.append("Object *");
@@ -242,14 +239,14 @@ void SvMetaType::SetType( int nT )
SvMetaType * SvMetaT
[Libreoffice-commits] core.git: idl/inc
idl/inc/types.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 128c4c4e15e68d0884f5636ddd1c9d5ed3b8fed5
Author: Noel Grandin
Date: Fri Feb 5 11:31:36 2016 +0200
TYPE_POINTER is unused
Change-Id: Iae50b8a1bfb6772e8362a6e61062b37bb50c701b
Reviewed-on: https://gerrit.libreoffice.org/22149
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 9e4a74c..1589fe7 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -69,7 +69,7 @@ public:
};
enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
- TYPE_CLASS, TYPE_POINTER };
+ TYPE_CLASS };
class SvMetaType : public SvMetaExtern
{
SvIdentifieraCName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/inc idl/source
idl/inc/types.hxx|8 --
idl/source/objects/types.cxx | 52 ---
idl/source/prj/database.cxx | 37 +-
3 files changed, 3 insertions(+), 94 deletions(-)
New commits:
commit 5d410b57bee6fe6e4ffcf9365874708f1b2a2662
Author: Noel Grandin
Date: Fri Feb 5 11:29:32 2016 +0200
remove CALL enum and associated code paths
not used
Change-Id: Ia14d48ac6da92b396c4aa7b736c8a6f27149
Reviewed-on: https://gerrit.libreoffice.org/22148
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 789ef46..9e4a74c 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -68,12 +68,10 @@ public:
SvIdlDataBase& );
};
-enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE };
enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
TYPE_CLASS, TYPE_POINTER };
class SvMetaType : public SvMetaExtern
{
-Svint aCall0, aCall1;
SvIdentifieraCName;
SvIdentifieraBasicPostfix;
SvIdentifieraBasicName;
@@ -115,12 +113,6 @@ public:
boolIsItem() const { return bIsItem; }
boolIsShell() const { return bIsShell; }
-voidSetCall0( int e );
-int GetCall0() const;
-
-voidSetCall1( int e);
-int GetCall1() const;
-
voidSetBasicName(const OString& rName)
{ aBasicName.setString(rName); }
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 4ebfcc3..51be69d 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -181,9 +181,7 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const
OString&, SvIdlDataBase&
}
#define CTOR\
-: aCall0( CALL_VALUE, false ) \
-, aCall1( CALL_VALUE, false ) \
-, pAttrList( nullptr ) \
+: pAttrList( nullptr ) \
, nType( TYPE_BASE )\
, bIsItem( false ) \
, bIsShell( false ) \
@@ -264,54 +262,6 @@ const OString& SvMetaType::GetBasicName() const
return static_cast(GetRef())->GetBasicName();
}
-void SvMetaType::SetCall0( int e )
-{
-aCall0 = (int)e;
-if( aCall0 == CALL_VALUE && aCall1 == CALL_VALUE )
-{
- if( GetType() == TYPE_POINTER )
-SetType( TYPE_BASE );
-}
-else
-{
-DBG_ASSERT( nType == TYPE_POINTER || nType == TYPE_BASE,
-"set no base type to pointer" );
-SetType( TYPE_POINTER );
-}
-}
-
-int SvMetaType::GetCall0() const
-{
-if( aCall0.IsSet() || !GetRef() )
-return aCall0;
-else
-return static_cast(GetRef())->GetCall0();
-}
-
-void SvMetaType::SetCall1( int e )
-{
-aCall1 = (int)e;
-if( aCall0 == CALL_VALUE && aCall1 == CALL_VALUE )
-{
- if( GetType() == TYPE_POINTER )
-SetType( TYPE_BASE );
-}
-else
-{
-DBG_ASSERT( nType == TYPE_POINTER || nType == TYPE_BASE,
-"set no base type to pointer" );
-SetType( TYPE_POINTER );
-}
-}
-
-int SvMetaType::GetCall1() const
-{
-if( aCall1.IsSet() || !GetRef() )
-return aCall1;
-else
-return static_cast(GetRef())->GetCall1();
-}
-
const OString& SvMetaType::GetCName() const
{
if( aCName.IsSet() || !GetRef() )
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 67c6c0a..3e69e54 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -283,10 +283,6 @@ SvMetaType * SvIdlDataBase::FindType( const OString& rName
)
SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
{
-int nCall0 = CALL_VALUE;
-int nCall1 = CALL_VALUE;
-bool bSet = false; // any attribute set
-
sal_uInt32 nTokPos = rInStm.Tell();
SvToken * pTok = rInStm.GetToken_Next();
@@ -316,37 +312,8 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream &
rInStm )
}
if( pType )
{
-pTok = &rInStm.GetToken();
-if( pTok->IsChar() )
-{
-if( pTok->GetChar() == '&' || pTok->GetChar() == '*' )
-{
-nCall0 = (pTok->GetChar() == '&') ? CALL_REFERENCE :
-CALL_POINTER;
-rInStm.GetToken_Next();
-pTok = &rInStm.GetToken();
-if( pTok->GetChar() == '&' || pTok->GetChar() == '*' )
-{
-nCall1 = (pTok->GetChar() == '&') ? CALL_REFERENCE :
-CALL_POINTER;
-rInStm.GetToken_Next();
-
[Libreoffice-commits] core.git: idl/inc idl/source
idl/inc/lex.hxx | 60 ++--
idl/source/cmptools/lex.cxx | 40 ++---
2 files changed, 40 insertions(+), 60 deletions(-)
New commits:
commit 375cc8d2bed2689571b41a8d5d80dcf58440e6e6
Author: Noel Grandin
Date: Fri Feb 5 11:17:17 2016 +0200
convert SVTOKEN_ENUM to scoped enum
Change-Id: Ibff607f988007728acbae96d51cbb30fd49848f6
Reviewed-on: https://gerrit.libreoffice.org/22147
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index d9a0918..a8138c8 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -26,18 +26,18 @@
#include
#include
-enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT,
-SVTOKEN_INTEGER,SVTOKEN_STRING,
-SVTOKEN_BOOL, SVTOKEN_IDENTIFIER,
-SVTOKEN_CHAR, SVTOKEN_RTTIBASE,
-SVTOKEN_EOF,SVTOKEN_HASHID };
+enum class SVTOKENTYPE { Empty, Comment,
+ Integer,String,
+ Bool, Identifier,
+ Char, RttiBase,
+ EndOfFile, HashId };
class SvToken
{
friend class SvTokenStream;
sal_uLong nLine, nColumn;
-SVTOKEN_ENUMnType;
-OStringaString;
+SVTOKENTYPE nType;
+OString aString;
union
{
sal_uLong nLong;
@@ -48,11 +48,6 @@ friend class SvTokenStream;
public:
SvToken();
SvToken( const SvToken & rObj );
-SvToken( sal_uLong n );
-SvToken( SVTOKEN_ENUM nTypeP, bool b );
-SvToken( char c );
-SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr );
-SvToken( SVTOKEN_ENUM nTypeP );
SvToken & operator = ( const SvToken & rObj );
@@ -64,20 +59,20 @@ public:
voidSetColumn( sal_uLong nColumnP ) { nColumn = nColumnP; }
sal_uLong GetColumn() const { return nColumn; }
-boolIsEmpty() const { return nType == SVTOKEN_EMPTY; }
-boolIsComment() const { return nType == SVTOKEN_COMMENT; }
-boolIsInteger() const { return nType == SVTOKEN_INTEGER; }
-boolIsString() const{ return nType == SVTOKEN_STRING; }
-boolIsBool() const { return nType == SVTOKEN_BOOL; }
+boolIsEmpty() const { return nType == SVTOKENTYPE::Empty; }
+boolIsComment() const { return nType == SVTOKENTYPE::Comment; }
+boolIsInteger() const { return nType == SVTOKENTYPE::Integer; }
+boolIsString() const{ return nType == SVTOKENTYPE::String; }
+boolIsBool() const { return nType == SVTOKENTYPE::Bool; }
boolIsIdentifierHash() const
-{ return nType == SVTOKEN_HASHID; }
+{ return nType == SVTOKENTYPE::HashId; }
boolIsIdentifier() const
{
-return nType == SVTOKEN_IDENTIFIER
-|| nType == SVTOKEN_HASHID;
+return nType == SVTOKENTYPE::Identifier
+|| nType == SVTOKENTYPE::HashId;
}
-boolIsChar() const { return nType == SVTOKEN_CHAR; }
-boolIsEof() const { return nType == SVTOKEN_EOF; }
+boolIsChar() const { return nType == SVTOKENTYPE::Char; }
+boolIsEof() const { return nType == SVTOKENTYPE::EndOfFile; }
const OString& GetString() const
{
@@ -90,9 +85,9 @@ public:
charGetChar() const { return cChar; }
voidSetHash( SvStringHashEntry * pHashP )
-{ pHash = pHashP; nType = SVTOKEN_HASHID; }
+{ pHash = pHashP; nType = SVTOKENTYPE::HashId; }
boolHasHash() const
-{ return nType == SVTOKEN_HASHID; }
+{ return nType == SVTOKENTYPE::HashId; }
boolIs( SvStringHashEntry * pEntry ) const
{ return IsIdentifierHash() && pHash == pEntry; }
};
@@ -100,25 +95,10 @@ public:
inline SvToken::SvToken()
: nLine(0)
, nColumn(0)
-, nType( SVTOKEN_EMPTY )
+, nType( SVTOKENTYPE::Empty )
{
}
-inline SvToken::SvToken( sal_uLong n )
-: nType( SVTOKEN_INTEGER ), nLong( n ) {}
-
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, bool b )
-: nType( nTypeP ), bBool( b ) {}
-
-inline SvToken::SvToken( char c )
-: nType( SVTOKEN_CHAR ), cChar( c ) {}
-
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const OString& rStr )
-: nType( nTypeP ), aString( rStr ) {}
-
-inline SvToken::SvToken( SVTOKEN_ENUM nTypeP )
-: nType( nTypeP ) {}
-
class SvTokenStream
{
sal_uLong nLine, nColumn;
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 8557
[Libreoffice-commits] core.git: idl/inc idl/source
idl/inc/basobj.hxx| 12 ++--
idl/inc/database.hxx | 24
idl/inc/globals.hxx |1 +
idl/inc/hash.hxx |3 ---
idl/inc/module.hxx|9 +++--
idl/inc/object.hxx| 21 +++--
idl/inc/slot.hxx |7 ++-
idl/inc/types.hxx | 32 +---
idl/source/objects/module.cxx |8
idl/source/objects/object.cxx |2 +-
idl/source/objects/slot.cxx |4 ++--
idl/source/objects/types.cxx |8
idl/source/prj/database.cxx | 14 +++---
13 files changed, 54 insertions(+), 91 deletions(-)
New commits:
commit 8beb3e713febf588de8dff00890b223e41f4654a
Author: Noel Grandin
Date: Fri Feb 5 11:05:24 2016 +0200
.SDI compiler: expand out some typedefs
Change-Id: I898bc1d95b1d3394cae74776c0e7dcbaafa934e4
Reviewed-on: https://gerrit.libreoffice.org/22146
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 9639b87..1768e0c 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -82,8 +82,6 @@ public:
}
};
-class SvMetaObjectMemberList : public SvRefMemberList {};
-
class SvMetaObject : public SvRttiBase
{
protected:
@@ -117,7 +115,7 @@ template bool checkSvMetaObject(const
SvMetaObject* pObject)
class SvMetaObjectMemberStack
{
-SvMetaObjectMemberList aList;
+SvRefMemberList aList;
public:
SvMetaObjectMemberStack() {;}
@@ -126,15 +124,13 @@ public:
voidPop() { aList.pop_back(); }
SvMetaObject * Get( std::function
isSvMetaObject )
{
-for( SvMetaObjectMemberList::reverse_iterator it =
aList.rbegin(); it != aList.rend(); ++it )
+for( SvRefMemberList::reverse_iterator
it = aList.rbegin(); it != aList.rend(); ++it )
if( isSvMetaObject(*it) )
return *it;
return nullptr;
}
};
-class SvMetaNameMemberList : public SvRefMemberList {};
-
class SvMetaReference : public SvMetaObject
{
protected:
@@ -163,9 +159,6 @@ public:
{ aRef = pRef; }
};
-class SvMetaReferenceMemberList : public SvRefMemberList {};
-
-
class SvMetaModule;
class SvMetaExtern : public SvMetaReference
{
@@ -180,7 +173,6 @@ public:
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
override;
};
-class SvMetaExternMemberList : public SvRefMemberList {};
#endif // INCLUDED_IDL_INC_BASOBJ_HXX
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index f7658b2..f7c8e7b 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -61,11 +61,11 @@ class SvIdlDataBase
StringList aIdFileList;
SvStringHashTable * pIdTable;
-SvMetaTypeMemberListaTypeList;
-SvMetaClassMemberList aClassList;
-SvMetaModuleMemberList aModuleList;
-SvMetaAttributeMemberList aAttrList;
-SvMetaTypeMemberListaTmpTypeList; // not persistent
+SvRefMemberList aTypeList;
+SvRefMemberList aClassList;
+SvRefMemberListaModuleList;
+SvRefMemberList aAttrList;
+SvRefMemberList aTmpTypeList; // not persistent
protected:
::std::set< OUString > m_DepFiles;
@@ -83,15 +83,15 @@ public:
explicit SvIdlDataBase( const SvCommand& rCmd );
~SvIdlDataBase();
-SvMetaAttributeMemberList& GetAttrList() { return aAttrList; }
-SvMetaTypeMemberList & GetTypeList();
-SvMetaClassMemberList & GetClassList() { return aClassList; }
-SvMetaModuleMemberList &GetModuleList() { return aModuleList; }
+SvRefMemberList& GetAttrList() { return aAttrList; }
+SvRefMemberList& GetTypeList();
+SvRefMemberList& GetClassList() { return aClassList; }
+SvRefMemberList& GetModuleList() { return aModuleList;
}
SvMetaModule * GetModule( const OString& rName );
// list of used types while writing
-SvMetaTypeMemberListaUsedTypes;
-OString aIFaceName;
+SvRefMemberListaUsedTypes;
+OString aIFaceName;
voidStartNewFile( const OUString& rName );
voidSetExportFile( const OUString& rName )
@@ -118,7 +118,7 @@ public:
boolReadIdFile( const OUString & rFileName );
SvMetaType *FindType( const OString& rName );
-static SvMetaType * FindType( const SvMetaType *, SvMetaTypeMemberList
& );
+static SvMetaType * FindType( const SvMetaType *,
SvRefMemberList& );
SvMetaType *ReadKnownType( SvTokenStream & rInStm );
SvMetaAttribute * ReadKnownAttr( SvTokenStream & rInStm,
diff --git a/idl/inc/gl
LibreOffice Gerrit News for core on 2016-02-07
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + tdf#97542: SVGIO: First check the current fill attribute in https://gerrit.libreoffice.org/22131 from Xisco Faulí Tarazona about module svgio + cppcheck: unreadVariable 'bTextWrap' in https://gerrit.libreoffice.org/22013 from Jochen Nitschke about module sc + tdf#97543 SVGIO: Rework getVisibility() in https://gerrit.libreoffice.org/22169 from Xisco Faulí Tarazona about module svgio + tdf#97429: Fix crash on print selected area in https://gerrit.libreoffice.org/22129 from Xisco Faulí Tarazona about module sw + Remove duplicated code in sw in https://gerrit.libreoffice.org/22125 from Xisco Faulí Tarazona about module sw + Refactor ScMarkData for tdf#50916 in https://gerrit.libreoffice.org/22163 from Dennis Francis about module sc End of freshness + coverity#1326918 NP: Null pointer dereference in https://gerrit.libreoffice.org/22173 from Caolán McNamara about module javaunohelper + tdf#97587: Treat plain NaNs as zero in the software interpreter for SUM in https://gerrit.libreoffice.org/22152 from Tor Lillqvist about module sc + boost::shared_ptr->std::shared_ptr in slideshow in https://gerrit.libreoffice.org/22166 from Noel Grandin about module slideshow * Merged changes on master for project core changed in the last 25 hours: None * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + prototype visual vertical page adjustment in https://gerrit.libreoffice.org/18482 from Justin Luth + KDE4: switch default image color to transparent... in https://gerrit.libreoffice.org/21037 from Jan-Marek Glogowski + tdf#95844: Refactor CommandInfoProvider in https://gerrit.libreoffice.org/21462 from Sheikha AL-Hinai + tdf#93124: Fix incorrect text fit in imported PPT in https://gerrit.libreoffice.org/18895 from Mike Kaganski + added namespace in https://gerrit.libreoffice.org/21521 from chaithanya + tdf#96091 Correct ascend and descend values for OTC font. in https://gerrit.libreoffice.org/21444 from Mark Hung + lokdocview: Export an error domain for general failures in https://gerrit.libreoffice.org/21262 from Debarshi Ray + lokdocview: New API: lok_doc_view_destroy_document() in https://gerrit.libreoffice.org/20776 from Pranav Kant + calc mapmode: Refactor DrawPagePreview to use logic units in https://gerrit.libreoffice.org/16349 from Krisztian Pinter + Check formula cells to improve performances in https://gerrit.libreoffice.org/18569 from William Bonnet + User-Agent: disable reporting of langs; enable OS & HW details by default in https://gerrit.libreoffice.org/20125 from Michael Meeks + WIP tdf#95768: filter hyperlink tokens from index levels in https://gerrit.libreoffice.org/21083 from Oliver Specht + WIP: instset dependency check (Linux) in https://gerrit.libreoffice.org/19909 from Stephan Bergmann + add more libs to mergelib in https://gerrit.libreoffice.org/19621 from Oliver Specht Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for submodules on 2016-02-07
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + Calc gridlines are now set by dropdown, not by checkbox in https://gerrit.libreoffice.org/22172 from Stanislav Horáček + dialogs are expanded by "Options" label instead of "More" button in https://gerrit.libreoffice.org/22171 from Stanislav Horáček + pen properties can be changed when running slide show in https://gerrit.libreoffice.org/22170 from Stanislav Horáček + fix checkbox label in the Insert Section dialog in https://gerrit.libreoffice.org/22168 from Stanislav Horáček + fix spin button label in the Fields dialog in https://gerrit.libreoffice.org/22167 from Stanislav Horáček * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Improve description of the function CLEAN in https://gerrit.libreoffice.org/21745 from dennisroczek Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2016-07-02_02:16:19 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: scripts/qawrangler-stats.py
scripts/qawrangler-stats.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 496f22b0c6b9b774ae678f1d69a2cb422267a2a1
Author: Thorsten Behrens
Date: Sun Feb 7 01:20:14 2016 +0100
Make decode actually work on email archive
diff --git a/scripts/qawrangler-stats.py b/scripts/qawrangler-stats.py
index 8b1c52f..87b123a 100755
--- a/scripts/qawrangler-stats.py
+++ b/scripts/qawrangler-stats.py
@@ -66,7 +66,7 @@ def get_data(url):
sys.exit(1)
else:
with gzip.GzipFile(fileobj=BytesIO(resp.read())) as f:
-return f.read().decode('us-ascii')
+return f.read().decode('utf-8')
def get_entity_values(data, pattern, num):
"""Returns the first @num matches of a @pattern in the @data string. If
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 90855] DIALOG: Improve the 'Insert Bookmark' dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=90855 Akshay Deep changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |akshaydeepi...@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests swext/mediawiki
qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java | 13 ++
swext/mediawiki/src/com/sun/star/wiki/Helper.java |2 -
2 files changed, 4 insertions(+), 11 deletions(-)
New commits:
commit d385fd6c96b3401df07b66743ce68a2f47b0d13f
Author: Caolán McNamara
Date: Sat Feb 6 21:11:56 2016 +
coverity#1326247 Explicit null dereferenced
Change-Id: I88a88f3705365854506a946039df44fb87134844
diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
index 3f08e3e..42324fd 100644
--- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
@@ -162,15 +162,8 @@ public class _XTolerantMultiPropertySet extends
MultiMethodTest {
public void _setPropertyValuesTolerant() {
requiredMethod("getPropertyValuesTolerant()");
-SetPropertyTolerantFailed[] SPTF = null;
-
-try {
-SPTF = oObj.setPropertyValuesTolerant(namesOfProperties,
- getNewValues(
- valuesOfProperties));
-} catch (com.sun.star.lang.IllegalArgumentException e) {
-e.printStackTrace(log);
-}
+SetPropertyTolerantFailed[] SPTF =
oObj.setPropertyValuesTolerant(namesOfProperties,
+
getNewValues(valuesOfProperties));
//read only properties will throw a PropertyVetoExeption if they are
set
int failures = 0;
@@ -334,4 +327,4 @@ public class _XTolerantMultiPropertySet extends
MultiMethodTest {
return newValues;
}
-}
\ No newline at end of file
+}
commit f0b3d214338b677cfd6a100a2aa9d92570930d3c
Author: Caolán McNamara
Date: Sat Feb 6 21:09:13 2016 +
coverity#1326198 Dereference after null check
Change-Id: I3db353d04094ba47fe915ea5dc4d96fc4612cc68
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 8b781cc..bde53b3 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -191,7 +191,7 @@ public class Helper
}
}
-return m_bShowInBrowser.booleanValue();
+return m_bShowInBrowser != null ? m_bShowInBrowser.booleanValue() :
false;
}
synchronized protected static void SetShowInBrowserByDefault(
XComponentContext xContext, boolean bValue )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/osl
sal/osl/unx/pipe.c | 22 +-
sal/osl/unx/sockimpl.h |2 +-
2 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit e18ecd4f644cfbe5d6b871c7ff6c76bd5c220504
Author: Damjan Jovanovic
Date: Sat Feb 6 19:07:51 2016 +
Platforms that need CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT for sockets usually
need it for pipes too, and even if it isn't necessary it can't hurt.
In particular, on FreeBSD 11-CURRENT it seems pipes no longer wake up
from accept when closed in other threads, so let's deal with that before
FreeBSD 11 is released.
Reported by: Matthias Apitz
Patch by: me
Tested by: Matthias Apitz
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index eb2e5fc..43a21a0 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -115,7 +115,7 @@ oslPipe __osl_createPipeImpl()
pPipeImpl = (oslPipe)calloc(1, sizeof(struct oslPipeImpl));
pPipeImpl->m_nRefCount =1;
pPipeImpl->m_bClosed = sal_False;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipeImpl->m_bIsInShutdown = sal_False;
pPipeImpl->m_bIsAccepting = sal_False;
#endif
@@ -321,7 +321,7 @@ void SAL_CALL osl_releasePipe( oslPipe pPipe )
void SAL_CALL osl_closePipe( oslPipe pPipe )
{
int nRet;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
size_t len;
struct sockaddr_un addr;
int fd;
@@ -341,10 +341,10 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
ConnFD = pPipe->m_Socket;
/*
- Thread does not return from accept on linux, so
+ Thread does not return from accept on some operating systems, so
connect to the accepting pipe
*/
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsAccepting )
{
pPipe->m_bIsInShutdown = sal_True;
@@ -356,7 +356,11 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path));
+#if defined(FREEBSD)
+len = SUN_LEN(&addr);
+#else
len = sizeof(addr);
+#endif
nRet = connect( fd, (struct sockaddr *)&addr, len);
#if OSL_DEBUG_LEVEL > 1
@@ -367,7 +371,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
#endif /* OSL_DEBUG_LEVEL */
close(fd);
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
nRet = shutdown(ConnFD, 2);
@@ -408,13 +412,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
OSL_ASSERT(strlen(pPipe->m_Name) > 0);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_True;
#endif
s = accept(pPipe->m_Socket, NULL, NULL);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_False;
#endif
@@ -424,13 +428,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
return NULL;
}
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsInShutdown )
{
close(s);
return NULL;
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
else
{
/* alloc memory */
diff --git a/sal/osl/unx/sockimpl.h b/sal/osl/unx/sockimpl.h
index 904190f..2e80c9f 100644
--- a/sal/osl/unx/sockimpl.h
+++ b/sal/osl/unx/sockimpl.h
@@ -63,7 +63,7 @@ struct oslPipeImpl {
sal_Char m_Name[PATH_MAX + 1];
oslInterlockedCount m_nRefCount;
sal_Bool m_bClosed;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
sal_Bool m_bIsAccepting;
sal_Bool m_bIsInShutdown;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6d/d7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc
6d/d7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc |1 + 1 file changed, 1 insertion(+) New commits: commit f8972114639f834826a53c9c25ab99f467d50506 Author: Caolán McNamara Date: Sat Feb 6 20:59:14 2016 + Notes added by 'git notes add' diff --git a/6d/d7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc b/6d/d7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/6d/d7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - swext/mediawiki wizards/com xmerge/source
swext/mediawiki/src/com/sun/star/wiki/Helper.java |
18 --
wizards/com/sun/star/wizards/text/TextDocument.java |
1
xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java |
9 +++--
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java|
15 +++-
4 files changed, 35 insertions(+), 8 deletions(-)
New commits:
commit 77c3b539e1fa50ebd8c6ebfd53888e6f7dd609ac
Author: Caolán McNamara
Date: Sat Feb 6 20:51:08 2016 +
coverity#1326633 DE: Dropped or ignored exception
this is probably good enough
Change-Id: I37304004f78d245ee0f400f07d07c731351d79eb
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java
b/wizards/com/sun/star/wizards/text/TextDocument.java
index c6dace7..74a24eb 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -124,6 +124,7 @@ public class TextDocument
{
// TODO: it seems the whole project does not really have an error
handling. Other methods
// seem to generally silence errors, so we can't do anything else
here...
+e.printStackTrace();
}
if (bShowStatusIndicator)
commit f5d2efb75720741f76997600662354d432faa6d1
Author: Caolán McNamara
Date: Sat Feb 6 20:49:16 2016 +
coverity#1326525 Resource leak on an exceptional path
Change-Id: I391367ec055372cc82ddb21d19e53041da91b4f6
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
index 6868675..3c9caf1 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/ConverterInfoList.java
@@ -59,8 +59,11 @@ public class ConverterInfoList {
InputStream is = c.getResourceAsStream(propsFile);
BufferedInputStream bis = new BufferedInputStream(is);
Propertiesprops = new Properties();
-props.load(bis);
-bis.close();
+try {
+props.load(bis);
+} finally {
+bis.close();
+}
int i = 1;
String jarFileName = "";
@@ -85,4 +88,4 @@ public class ConverterInfoList {
return jars.iterator();
}
-}
\ No newline at end of file
+}
commit d9442b1398117ee1710a608a7c30d5e1a073a945
Author: Caolán McNamara
Date: Sat Feb 6 20:46:09 2016 +
coverity#1326516 Resource leak on an exceptional path
Change-Id: Ia46ec73bd3dcaef1ec0c9a977f3fc472d94ed390
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
index 7e97033..9d3ae7c 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
@@ -100,6 +100,15 @@ public final class Driver {
}
}
+private static void close(FileOutputStream c) {
+if (c == null) return;
+try {
+c.close();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+
/**
* Gets a {@code Convert} object using the {@code ConverterFactory} and
does
* the conversion using this object.
@@ -153,15 +162,17 @@ public final class Driver {
while (docEnum.hasNext()) {
Document docOut = (Document)docEnum.next();
String fileName = docOut.getFileName();
+FileOutputStream fos = null;
try {
-FileOutputStream fos = new FileOutputStream(fileName);
+fos = new FileOutputStream(fileName);
docOut.write(fos);
fos.flush();
-fos.close();
} catch (Exception writeExcept) {
System.out.println("\nThere was an writing out file <"
+
fileName + ">");
writeExcept.printStackTrace();
+} finally {
+close(fos);
}
}
} else {
commit 2b198c3380ccf07aa981a055eff698e1482028c8
Author: Caolán McNamara
Date: Sat Feb 6 20:39:44 2016 +
coverity#1326498 Resource leak on an exceptional path
Change-Id: I28b848ef94039e4c79242599b2031b8789857a46
diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 0208899..8b781cc 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -348,15 +348,25 @@ public class Helper
return sURL;
}
+private static void close(BufferedRea
[Libreoffice-commits] core.git: comphelper/source include/comphelper sax/Library_expwrap.mk sax/source
comphelper/source/xml/attributelist.cxx | 14 +-
include/comphelper/attributelist.hxx|9 -
sax/Library_expwrap.mk |2
sax/source/expatwrap/attrlistimpl.cxx | 162
sax/source/expatwrap/attrlistimpl.hxx | 76 ---
sax/source/expatwrap/sax_expat.cxx | 10 -
6 files changed, 18 insertions(+), 255 deletions(-)
New commits:
commit 8998768a34751d35403678a81464a26835b2230e
Author: Matúš Kukan
Date: Sat Feb 6 18:38:32 2016 +0100
sax: Use comphelper's AttributeList
Change-Id: I6eb0115dba8797025a513cf1e6cfbfbe0b6f7e50
diff --git a/comphelper/source/xml/attributelist.cxx
b/comphelper/source/xml/attributelist.cxx
index 3342ef2..f196b48 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -106,18 +106,20 @@ AttributeList::AttributeList()
m_pImpl = new AttributeList_Impl;
}
-
-
AttributeList::~AttributeList()
{
delete m_pImpl;
}
-void AttributeList::AddAttribute( const OUString &sName ,
-const OUString &sType ,
-const OUString &sValue )
+void AttributeList::AddAttribute(const OUString &sName,
+const OUString &sType, const OUString &sValue)
+{
+m_pImpl->vecAttribute.push_back( TagAttribute_Impl(sName, sType, sValue) );
+}
+
+void AttributeList::Clear()
{
-m_pImpl->vecAttribute.push_back( TagAttribute_Impl( sName , sType , sValue
) );
+m_pImpl->vecAttribute.clear();
}
} // namespace comphelper
diff --git a/include/comphelper/attributelist.hxx
b/include/comphelper/attributelist.hxx
index 1337a3a..18aaa50 100644
--- a/include/comphelper/attributelist.hxx
+++ b/include/comphelper/attributelist.hxx
@@ -30,10 +30,8 @@ namespace comphelper
struct AttributeList_Impl;
-class COMPHELPER_DLLPUBLIC AttributeList : public ::cppu::WeakImplHelper
-<
-css::xml::sax::XAttributeList
->
+class COMPHELPER_DLLPUBLIC AttributeList :
+public ::cppu::WeakImplHelper
{
AttributeList_Impl *m_pImpl;
public:
@@ -41,7 +39,8 @@ public:
virtual ~AttributeList();
// methods that are not contained in any interface
-void AddAttribute( const OUString &sName , const OUString &sType , const
OUString &sValue );
+void AddAttribute(const OUString &sName , const OUString &sType , const
OUString &sValue);
+void Clear();
// css::xml::sax::XAttributeList
virtual sal_Int16 SAL_CALL getLength()
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 0c44d30..e8e049a 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_externals,expwrap,\
))
$(eval $(call gb_Library_use_libraries,expwrap,\
+ comphelper \
cppu \
cppuhelper \
sal \
@@ -39,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,expwrap,\
))
$(eval $(call gb_Library_add_exception_objects,expwrap,\
- sax/source/expatwrap/attrlistimpl \
sax/source/expatwrap/sax_expat \
sax/source/expatwrap/saxwriter \
sax/source/expatwrap/xml2utf \
diff --git a/sax/source/expatwrap/attrlistimpl.cxx
b/sax/source/expatwrap/attrlistimpl.cxx
deleted file mode 100644
index 61bfe2b..000
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "attrlistimpl.hxx"
-
-#include
-
-#include
-
-using namespace ::std;
-using namespace ::cppu;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::com::sun::star::xml::sax;
-
-
-namespace sax_expatwrap {
-struct TagAttribute
-{
-TagAttribute( const OUString &aName, const OUString &aType , const
OUString &aValue )
-{
-this->sName = aName;
-this->sType = aType;
-this->sValue= aValue;
-}
-
-OUString sName;
-OUString sType;
-OUString sValue;
-};
-
-struct AttributeList_impl
-{
-AttributeList_impl()
-{
-// performance improvement during adding
-vecAttribute.reserv
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loleaflet/Makefile
loleaflet/Makefile |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 30b5fda407380e05c64ef5be375f8c6800e52809
Author: Marco Cecchetti
Date: Sat Feb 6 18:26:28 2016 +0100
loleaflet: bump version after tarball
Change-Id: I83eb18ebcd4bfd4966f46be3f8f19b271a052972
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 5fd6245..4846b4d 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.4.48
+VERSION=1.4.49
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
commit f12f15bcf6d144f1177dd557889a8dac79de729c
Author: Marco Cecchetti
Date: Sat Feb 6 18:25:24 2016 +0100
loleaflet: bump version before tarball
Change-Id: I96844e73aca63fc937b2cba467d9daaa6b9e4a34
diff --git a/loleaflet/Makefile b/loleaflet/Makefile
index 133e948..5fd6245 100644
--- a/loleaflet/Makefile
+++ b/loleaflet/Makefile
@@ -3,7 +3,7 @@
# ("micro") part: Between releases odd, even for releases (no other
# changes inbetween).
-VERSION=1.4.47
+VERSION=1.4.48
# Version number of the bundled 'draw' thing
DRAW_VERSION=0.2.4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/reference.html loleaflet/src
loleaflet/reference.html |2 +-
loleaflet/src/map/Map.js |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 686a53128757c8a9f419c01ac4927a08bfac6bbe
Author: Marco Cecchetti
Date: Sat Feb 6 18:22:05 2016 +0100
loleaflet - L.Cursor.imagePath can be a relative path
Change-Id: Ib4e2c88f580ebc6322427d6f950231b603c58186
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 6982cae..3d9a2fa 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -1530,7 +1530,7 @@ unexpected behaviour.
cursorURL
String
- 'cursors'
+ undefined
The path (local to the server) where custom cursor files
are stored.
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index c001e1f..1d29bb9 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -46,8 +46,7 @@ L.Map = L.Evented.extend({
this.setView(L.latLng(options.center), options.zoom,
{reset: true});
}
- options.cursorURL = options.cursorURL || 'cursors';
- L.Cursor.imagePath = L.Cursor.getCursorURL(options.cursorURL);
+ L.Cursor.imagePath = options.cursorURL ||
L.Cursor.getCursorURL('cursors');
if (options.webserver === undefined) {
var protocol = window.location.protocol === 'file:' ?
'http:' : window.location.protocol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - loleaflet/reference.html loleaflet/src
loleaflet/reference.html |2 +-
loleaflet/src/map/Map.js |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 88ca9dc89fef34b1930bdf6907207547553b575e
Author: Marco Cecchetti
Date: Sat Feb 6 18:22:05 2016 +0100
loleaflet - L.Cursor.imagePath can be a relative path
Change-Id: Ib4e2c88f580ebc6322427d6f950231b603c58186
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 6982cae..3d9a2fa 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -1530,7 +1530,7 @@ unexpected behaviour.
cursorURL
String
- 'cursors'
+ undefined
The path (local to the server) where custom cursor files
are stored.
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index f0d5798..99dc6a6 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -46,8 +46,7 @@ L.Map = L.Evented.extend({
this.setView(L.latLng(options.center), options.zoom,
{reset: true});
}
- options.cursorURL = options.cursorURL || 'cursors';
- L.Cursor.imagePath = L.Cursor.getCursorURL(options.cursorURL);
+ L.Cursor.imagePath = options.cursorURL ||
L.Cursor.getCursorURL('cursors');
if (options.webserver === undefined) {
var protocol = window.location.protocol === 'file:' ?
'http:' : window.location.protocol;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 64119] FILESAVE: Buggy CSS stylesheet in exported XHTML
https://bugs.documentfoundation.org/show_bug.cgi?id=64119 David Tardon changed: What|Removed |Added Keywords|skillCpp| -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1 solenv/bin
bootstrap.1 |4
solenv/bin/download_external_dependencies.pl |7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 6dd7f9fe60b7dab8dfcd421f0d3af39a4f1ab1cc
Author: Damjan Jovanovic
Date: Sat Feb 6 11:51:01 2016 +
Exit the "./bootstrap" step with an error if some dependencies could not be
downloaded. If dependencies fail to download, the build usually fails later.
This is apparent on our buildbots. Rather catch it early.
Patch by: me
diff --git a/bootstrap.1 b/bootstrap.1
index 2b2ce73..572a2e8 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -40,6 +40,10 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
# fetch or update external tarballs
if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
"$PERL" "$SOLARENV/bin/download_external_dependencies.pl"
$SRC_ROOT/external_deps.lst
+if [ "$?" != "0" ]; then
+echo "*** Error downloading external dependencies, please fix the
previous problems and try again ***"
+exit 1
+fi
fi
#
--
diff --git a/solenv/bin/download_external_dependencies.pl
b/solenv/bin/download_external_dependencies.pl
index 278e0937..5cc5a25 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -471,20 +471,25 @@ sub Download ()
}
# Download the missing files.
+my $all_downloaded = 1;
for my $item (@Missing)
{
my ($name, $checksum, $urls) = @$item;
+my $downloaded = 0;
foreach my $url (@$urls)
{
-last if DownloadFile(
+$downloaded = DownloadFile(
defined $checksum
? $checksum->{'value'}."-".$name
: $name,
$url,
$checksum);
+last if $downloaded
}
+$all_downloaded &&= $downloaded;
}
+die "some needed files could not be downloaded!" if !$all_downloaded;
}
___
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/core/tool/grouparealistener.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 225e2a3cec2546d5d41fec21a4219c9a2f5ddf76
Author: Stephan Bergmann
Date: Sat Feb 6 13:00:16 2016 +0100
mpColumn can already be dead in ~FormulaGroupAreaListener
...when the loop in ScColumnContainer::Clear deletes the referenced column
before deleting another column triggers a call to
~FormulaGroupAreaListener, as
reported by ASan during CppunitTest_sc_ucalc.
Change-Id: Ib3daaf842b2793957cacc6318a27cbc6ab0d1d69
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index ac8dd42..e4e62aa 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -94,10 +94,7 @@ FormulaGroupAreaListener::FormulaGroupAreaListener( const
ScRange& rRange, const
FormulaGroupAreaListener::~FormulaGroupAreaListener()
{
SAL_INFO( "sc.core.grouparealistener",
-"FormulaGroupAreaListener dtor this " << this <<
-" range " << (maRange == BCA_LISTEN_ALWAYS ? "LISTEN-ALWAYS" :
maRange.Format(SCA_VALID)) <<
-" mnTopCellRow " << mnTopCellRow << " length " << mnGroupLen <<
-", col/tab " << mpColumn->GetCol() << "/" << mpColumn->GetTab());
+"FormulaGroupAreaListener dtor this " << this);
}
ScRange FormulaGroupAreaListener::getListeningRange() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libo-marketing-priv] Program Committee for LibOCon
I can help out too On Thursday, 4 February 2016, Thorsten Behrens wrote: > Sophie Gautier wrote: > > As each year, it's time to form the Program Committee. We need at least > > 3 or 4 persons available to review the talks proposed by the community, > > sort and organize them and then manage the conference program. > > > > *Important note*: you need to be available during July and August as > > these are the months during which we set the program. > > > I can help, as in the past. :) > > Cheers, > > -- Thorsten > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/LibreOfficeKit sc/source sd/source sw/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |1 +
sc/source/ui/view/viewfun2.cxx |1 +
sd/source/ui/view/Outliner.cxx |2 ++
sw/source/uibase/uiview/viewsrch.cxx |7 ---
4 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 0d65937eefd8fbd8f8d08571266f1dcd5c10c6c4
Author: Jan Holesovsky
Date: Fri Feb 5 16:54:31 2016 +0100
lok: Search result should contain info if it is a 'search all' result.
Change-Id: Ia3ee81ced4f74c0d029a478bd59eff44d72ef327
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 5ce8610..901bf6b 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -197,6 +197,7 @@ typedef enum
*
* {
* "searchString": "...",
+ * "highlightAll": true|false, // this is a result of 'search all'
* "searchResultSelection": [
* {
* "part": "...",
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 8037a54..b264886 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1860,6 +1860,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem*
pSearchItem,
boost::property_tree::ptree aTree;
aTree.put("searchString",
pSearchItem->GetSearchString().toUtf8().getStr());
+aTree.put("highlightAll", nCommand == SvxSearchCmd::FIND_ALL);
boost::property_tree::ptree aSelections;
for (const Rectangle& rLogicRect : aLogicRects)
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index c413cf9..0ad60d1 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -655,6 +655,7 @@ bool Outliner::SearchAndReplaceAll()
{
boost::property_tree::ptree aTree;
aTree.put("searchString",
mpSearchItem->GetSearchString().toUtf8().getStr());
+aTree.put("highlightAll", true);
boost::property_tree::ptree aChildren;
for (const SearchSelection& rSelection : aSelections)
@@ -803,6 +804,7 @@ bool
Outliner::SearchAndReplaceOnce(std::vector* pSelections)
// also about search result selections
boost::property_tree::ptree aTree;
aTree.put("searchString",
mpSearchItem->GetSearchString().toUtf8().getStr());
+aTree.put("highlightAll", false);
boost::property_tree::ptree aChildren;
boost::property_tree::ptree aChild;
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index 8918ff1..f3f216f 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -107,7 +107,7 @@ static void
lcl_addContainerToJson(boost::property_tree::ptree& rTree, const OSt
}
/// Emits LOK callbacks (count, selection) for search results.
-static void lcl_emitSearchResultCallbacks(SvxSearchItem* pSearchItem,
SwWrtShell* pWrtShell)
+static void lcl_emitSearchResultCallbacks(SvxSearchItem* pSearchItem,
SwWrtShell* pWrtShell, bool bHighlightAll)
{
// Emit a callback also about the selection rectangles, grouped by matches.
if (SwPaM* pPaM = pWrtShell->GetCursor())
@@ -133,6 +133,7 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem*
pSearchItem, SwWrtShell
}
boost::property_tree::ptree aTree;
aTree.put("searchString",
pSearchItem->GetSearchString().toUtf8().getStr());
+aTree.put("highlightAll", bHighlightAll);
lcl_addContainerToJson(aTree, "searchResultSelection", aMatches);
std::stringstream aStream;
@@ -252,7 +253,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
{
Scroll(m_pWrtShell->GetCharRect().SVRect());
if (comphelper::LibreOfficeKit::isActive())
-lcl_emitSearchResultCallbacks(m_pSrchItem,
m_pWrtShell);
+lcl_emitSearchResultCallbacks(m_pSrchItem,
m_pWrtShell, /* bHighlightAll = */ false);
}
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
#if HAVE_FEATURE_DESKTOP
@@ -290,7 +291,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage)
m_bFound = false;
}
else if (comphelper::LibreOfficeKit::isActive())
-lcl_emitSearchResultCallbacks(m_pSrchItem, m_pWrtShell);
+lcl_emitSearchResultCallbacks(m_pSrchItem, m_pWrtShell, /*
bHighlightAll = */ true);
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
#if HAVE_FEATURE_DESKTOP
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Apple Numbers application and format.
Hi, On Fri, 5 Feb 2016 12:05:01 +1100, Chris Sherlock wrote: > libetonyek… > > Is that like Eton Yek? Or ET on yek? > > What does etonyek actually stand for? Been driving me batty for some time now > every time I do a build! :-) $ echo etonyek | rev keynote Cheers, -- Takeshi Abe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source canvas/source chart2/source cppcanvas/qa cui/source drawinglayer/source filter/source forms/source include/vcl lotuswordpro/source reportdesign/source sc
avmedia/source/gstreamer/gstframegrabber.cxx|2 avmedia/source/opengl/oglframegrabber.cxx |2 avmedia/source/vlc/vlcframegrabber.cxx |2 canvas/source/cairo/cairo_canvasbitmap.cxx |2 canvas/source/cairo/cairo_canvashelper.cxx |2 canvas/source/directx/dx_vcltools.cxx |2 canvas/source/vcl/bitmapbackbuffer.cxx |2 canvas/source/vcl/canvasbitmap.cxx |2 canvas/source/vcl/canvasbitmaphelper.cxx|2 canvas/source/vcl/canvashelper.cxx |2 canvas/source/vcl/canvashelper_texturefill.cxx |2 canvas/source/vcl/impltools.cxx |2 chart2/source/view/main/3DChartObjects.cxx |2 cppcanvas/qa/extras/emfplus/emfplus.cxx |2 cui/source/dialogs/colorpicker.cxx |2 cui/source/tabpages/tpbitmap.cxx|2 drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx |2 drawinglayer/source/processor3d/zbufferprocessor3d.cxx |2 drawinglayer/source/texture/texture3d.cxx |2 filter/source/flash/swfwriter1.cxx |2 filter/source/graphicfilter/egif/giflzwc.hxx|2 filter/source/graphicfilter/eps/eps.cxx |2 filter/source/graphicfilter/etiff/etiff.cxx |2 filter/source/graphicfilter/icgm/bitmap.hxx |2 filter/source/graphicfilter/ieps/ieps.cxx |2 filter/source/graphicfilter/ipbm/ipbm.cxx |2 filter/source/graphicfilter/ipcd/ipcd.cxx |2 filter/source/graphicfilter/ipcx/ipcx.cxx |2 filter/source/graphicfilter/ipict/ipict.cxx |2 filter/source/graphicfilter/ipsd/ipsd.cxx |2 filter/source/graphicfilter/iras/iras.cxx |2 filter/source/graphicfilter/itga/itga.cxx |2 filter/source/graphicfilter/itiff/itiff.cxx |2 filter/source/msfilter/msdffimp.cxx |2 filter/source/msfilter/svdfppt.cxx |2 filter/source/pdf/pdfexport.cxx |2 forms/source/component/imgprod.cxx |2 include/vcl/bitmapaccess.hxx| 430 include/vcl/bmpacc.hxx | 430 lotuswordpro/source/filter/lwpbackgroundstuff.cxx |2 reportdesign/source/ui/dlg/Condition.cxx|2 sc/source/filter/excel/excimp8.cxx |2 sc/source/filter/excel/xeescher.cxx |2 sc/source/ui/sidebar/CellBorderUpdater.cxx |2 sd/inc/pch/precompiled_sd.hxx |2 sd/source/filter/eppt/eppt.cxx |2 sd/source/filter/eppt/epptso.cxx|2 sd/source/filter/eppt/pptx-epptbase.cxx |2 sd/source/filter/html/htmlex.cxx|2 sd/source/filter/ppt/pptin.cxx |2 sd/source/ui/dlg/vectdlg.cxx|2 sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx |2 sd/source/ui/slidesorter/view/SlsFramePainter.cxx |2 sd/source/ui/table/TableDesignPane.cxx |2 svtools/source/graphic/grfmgr2.cxx |2 svtools/source/graphic/transformer.cxx |2 svx/inc/pch/precompiled_svxcore.hxx |2 svx/source/dialog/dlgctrl.cxx |2 svx/source/sdr/primitive2d/sdrprimitivetools.cxx|2 svx/source/svdraw/svdetc.cxx|2 svx/source/svdraw/svdfmtf.cxx |2 svx/source/svdraw/svdhdl.cxx|2 svx/source/svdraw/svdoashp.cxx |2 svx/source/tbxctrls/tbcontrl.cxx|2 svx/source/tbxctrls/tbxcolorupdate.cxx |2 svx/source/xoutdev/_xoutbmp.cxx |2 svx/source/xoutdev/xattrbmp.cxx |2 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|2 sw/source/core/view/viewsh.cxx |2 vcl/inc/BitmapSymmetryCheck.hxx |2 vcl/inc/canvasbitmap.hxx|2 vcl/inc/pch/precompiled_vcl.hxx |2 vcl/qa
[Libreoffice-commits] libmspub.git: README
README | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 3e8bd20df94896cb4503188a218423340384fb40 Author: David Tardon Date: Sat Feb 6 10:24:00 2016 +0100 update README Change-Id: I5b7c8f3902e67547fcab4adbc68c3ff3cf8bc8a9 diff --git a/README b/README index 53b0fd8..f44ea3d 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ libmspub is a library and a set of tools for reading and converting MS Publisher files. -libmspub requires boost, icu, libwpd, libwpg and zlib to build. Most up -to date code is available from Git repository at libreoffice.org +libmspub requires boost, icu, librevenge and zlib to build. Most up to +date code is available from Git repository at libreoffice.org (https://gerrit.libreoffice.org/gitweb?p=libmspub.git) or the mirror at freedesktop.org (http://cgit.freedesktop.org/libreoffice/libmspub/). See -http://www.freedesktop.org/wiki/Software/libmspub for more information. +http://wiki.documentfoundation.org/DLP/Libraries/libmspub for more +information. -For convenience of use in third-party projects the library is available under -three licenses: GNU GPL 2.1+, GNU Lesser GPL 2.1+ and MPL 1.1+. +The library is available under MPL 2.0 license. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: 5 commits - src/lib
src/lib/MSPUBMetaData.cpp | 155 +-
src/lib/MSPUBMetaData.h |4 -
src/lib/MSPUBParser.cpp | 28 +---
src/lib/MSPUBParser.h |2
4 files changed, 147 insertions(+), 42 deletions(-)
New commits:
commit e625c6e60185100438edcb06566a5f8a2a137deb
Author: David Tardon
Date: Sat Jul 25 09:12:40 2015 +0200
add missing include
Change-Id: Ibd003515271ad6211189e12b85eeddd980319770
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index 52fdac4..c298bd1 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include
commit 39a9a9ecea325c66fb9d5f503848553ac0e14dcf
Author: David Tardon
Date: Tue Aug 25 16:12:25 2015 +0200
afl: avoid out of bounds access to vector
Change-Id: I51fdad6cca395bb5aadc916ef452ee020f07
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index 9d0446b..52fdac4 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -237,6 +237,9 @@ librevenge::RVNGString
libmspub::MSPUBMetaData::readCodePageString(librevenge::R
{
uint32_t size = readU32(input);
+ if (size == 0)
+return librevenge::RVNGString();
+
std::vector characters;
for (uint32_t i = 0; i < size; ++i)
characters.push_back(readU8(input));
commit 0a83689e2f13d0bb584fb004c9065463271ac9e4
Author: Miklos Vajna
Date: Tue Jul 21 09:32:10 2015 +0200
need space for the terminating null-character
Change-Id: Ie9cab1687dd3187819ec8e3e89b3e9355da9b255
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index ca8b756..9d0446b 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -109,7 +109,8 @@ void
libmspub::MSPUBMetaData::readPropertySetStream(librevenge::RVNGInputStream
{
data4[i] = readU8(input);
}
- char FMTID0[36];
+ // Pretty-printed GUID is 36 bytes + the terminating null-character.
+ char FMTID0[37];
sprintf(FMTID0, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", data1,
data2, data3,
data4[0], data4[1], data4[2], data4[3], data4[4], data4[5],
data4[6], data4[7]);
commit 8eaa9d24d235b1390402c232bed49e81ab2d40f4
Author: David Tardon
Date: Sat Jul 25 09:18:10 2015 +0200
C++11 syntax is not allowed
Change-Id: Ia705f789b3f9d600b03d25db90972a315e782302
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index 96e58a0..ca8b756 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -215,15 +215,15 @@ void
libmspub::MSPUBMetaData::readTypedPropertyValue(librevenge::RVNGInputStream
{
switch (m_idsAndOffsets[index].first)
{
-case PIDDSI::PIDDSI_CATEGORY:
+case PIDDSI_CATEGORY:
m_metaData.insert("librevenge:category", string);
break;
-case PIDDSI::PIDDSI_LINECOUNT:
- // this should actually be PIDDSI::PIDDSI_COMPANY but this
+case PIDDSI_LINECOUNT:
+ // this should actually be PIDDSI_COMPANY but this
// is what company is mapped to
m_metaData.insert("librevenge:company", string);
break;
-case PIDDSI::PIDDSI_LANGUAGE:
+case PIDDSI_LANGUAGE:
m_metaData.insert("dc:language", string);
break;
}
commit 207e6da1240c4255d2b4c5c28d405ace84ed042f
Author: David Tardon
Date: Sat Feb 6 07:45:22 2016 +0100
extract more metadata
Template, language, company and category metadata are extracted from
MSPUB files. Company and category are set as custom properties.
Change-Id: Ic14bfa11a2a8253c79dd4c4466afc7f6b2ce4ea9
diff --git a/src/lib/MSPUBMetaData.cpp b/src/lib/MSPUBMetaData.cpp
index 1234fe2..96e58a0 100644
--- a/src/lib/MSPUBMetaData.cpp
+++ b/src/lib/MSPUBMetaData.cpp
@@ -8,6 +8,7 @@
*/
#include
+#include
#include
#include "libmspub_utils.h"
@@ -22,6 +23,60 @@ libmspub::MSPUBMetaData::~MSPUBMetaData()
{
}
+enum PIDDSI
+{
+ PIDDSI_CODEPAGE = 0x0001,
+ PIDDSI_CATEGORY = 0x0002,
+ PIDDSI_PRESFORMAT= 0x0003,
+ PIDDSI_BYTECOUNT = 0x0004,
+ PIDDSI_LINECOUNT = 0x0005,
+ PIDDSI_PARACOUNT = 0x0006,
+ PIDDSI_SLIDECOUNT= 0x0007,
+ PIDDSI_NOTECOUNT = 0x0008,
+ PIDDSI_HIDDENCOUNT = 0x0009,
+ PIDDSI_MMCLIPCOUNT = 0x000A,
+ PIDDSI_SCALE = 0x000B,
+ PIDDSI_HEADINGPAIR = 0x000C,
+ PIDDSI_DOCPARTS = 0x000D,
+ PIDDSI_MANAGER = 0x000E,
+ PIDDSI_COMPANY = 0x000F,
+ PIDDSI_LINKSDIRTY= 0x0010,
+ PIDDSI_CCHWITHSPACES = 0x0011,
+ PIDDSI_SHAREDDOC = 0x0013,
+ PIDDSI_LINKBASE = 0x0014,
+ PIDDSI_HLINKS= 0x0015,
+ PIDDSI_HYPERLINKSCHANGED = 0x0016,
+ PIDDSI_VERSION = 0x0017,
+ PIDDSI_DIGSIG= 0x
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/956d48b5a5970980894c02d85e72ed1a3e40078f/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc vbahelper/inc
sw/inc/pch/precompiled_vbaswobj.hxx |1 - vbahelper/inc/pch/precompiled_msforms.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit f21568419dff3fc2875031ea84c677844cd18535 Author: Stephan Bergmann Date: Sat Feb 6 08:54:58 2016 +0100 vcl/apptypes.hxx is gone Change-Id: I6c3f7ffa8d7c1cac360ae28c1a52ef3b55da3a3d diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 32efe98..5a14512 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -112,7 +112,6 @@ #include #include #include -#include #include #include #include diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index 8094283..2c23ef5 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -98,7 +98,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
