subject:"\[Libreoffice\-commits\] core.git\: idl\/inc idl\/source"

[Libreoffice-commits] core.git: idl/inc idl/source

2023-10-03 Thread Yli875 (via logerrit)

 idl/inc/object.hxx|2 +-
 idl/source/objects/object.cxx |   38 ++
 2 files changed, 15 insertions(+), 25 deletions(-)

New commits:
commit 67594344631c362d43b9d6a0cfadefbcfa5046d8
Author: Yli875 
AuthorDate: Tue Sep 12 11:58:54 2023 -0700
Commit: Ilmari Lauhakangas 
CommitDate: Tue Oct 3 22:08:54 2023 +0200

tdf#145538 Use range based for loops in idl:object

Change-Id: I7c9935254be5bea050a09859cebbc4112894999b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156858
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index b5c30c9e0247..4254a4e1f318 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -80,7 +80,7 @@ public:
 virtual voidReadContextSvIdl( SvIdlDataBase &,
  SvTokenStream & rInStm ) override;
 
-voidFillClasses( SvMetaClassList & rList );
+voidFillClasses( SvMetaClassList & rClassList );
 
 virtual voidWriteSfx( SvIdlDataBase & rBase, SvStream & 
rOutStm ) override;
 };
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 8f207ca5ac04..4f3a0836791d 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -138,9 +138,8 @@ sal_uInt16 SvMetaClass::WriteSlotParamArray( SvIdlDataBase 
& rBase,
 SvStream & rOutStm )
 {
 sal_uInt16 nCount = 0;
-for ( size_t i = 0, n = rSlotList.size(); i < n; ++i )
+for ( const auto& pAttr : rSlotList )
 {
-SvMetaSlot *pAttr = rSlotList[ i ];
 nCount = nCount + pAttr->WriteSlotParamArray( rBase, rOutStm );
 }
 
@@ -169,18 +168,14 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, 
std::vector
 const OString& rPrefix, SvIdlDataBase& rBase)
 {
 // was this class already written?
-for ( size_t i = 0, n = rClassList.size(); i < n ; ++i )
-if ( rClassList[ i ] == this )
-return;
+if ( std::find( rClassList.begin(), rClassList.end(), this ) != 
rClassList.end() )
+return;
 
 rClassList.push_back( this );
 
 // write all direct attributes
-size_t n;
-for( n = 0; n < aAttrList.size(); n++ )
+for( const auto& pAttr : aAttrList )
 {
-SvMetaAttribute * pAttr = aAttrList[n];
-
 sal_uInt32 nId = pAttr->GetSlotId().GetValue();
 
 std::vector::iterator iter = std::find(rSuperList.begin(),
@@ -204,9 +199,8 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, 
std::vector
 
 // Write all attributes of the imported classes, as long as they have
 // not already been imported by the superclass.
-for( n = 0; n < aClassElementList.size(); n++ )
+for( auto& rElement : aClassElementList )
 {
-SvClassElement& rElement = aClassElementList[n];
 SvMetaClass * pCl = rElement.GetClass();
 OStringBuffer rPre(rPrefix.getLength() + 1 + 
rElement.GetPrefix().getLength());
 rPre.append(rPrefix);
@@ -226,26 +220,24 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, 
std::vector
 }
 }
 
-void SvMetaClass::FillClasses( SvMetaClassList & rList )
+void SvMetaClass::FillClasses( SvMetaClassList & rClassList )
 {
 // Am I not yet in?
-for ( size_t i = 0, n = rList.size(); i < n; ++i )
-if ( rList[ i ] == this )
-return;
+if ( std::find( rClassList.begin(), rClassList.end(), this ) != 
rClassList.end() )
+return;
 
-rList.push_back( this );
+rClassList.push_back( this );
 
 // my imports
-for( size_t n = 0; n < aClassElementList.size(); n++ )
+for( auto& rElement : aClassElementList )
 {
-SvClassElement& rElement = aClassElementList[n];
 SvMetaClass * pCl = rElement.GetClass();
-pCl->FillClasses( rList );
+pCl->FillClasses( rClassList );
 }
 
 // my superclass
 if( aSuperClass.is() )
-aSuperClass->FillClasses( rList );
+aSuperClass->FillClasses( rClassList );
 }
 
 
@@ -255,9 +247,8 @@ void SvMetaClass::WriteSlotStubs( std::string_view 
rShellName,
 SvStream & rOutStm )
 {
 // write all attributes
-for ( size_t i = 0, n = rSlotList.size(); i < n; ++i )
+for ( const auto& pAttr : rSlotList )
 {
-SvMetaSlot *pAttr = rSlotList[ i ];
 pAttr->WriteSlotStubs( rShellName, rList, rOutStm );
 }
 }
@@ -334,9 +325,8 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream 
& rOutStm )
 rOutStm.WriteOString( "};" ) << endl;
 rOutStm.WriteOString( "#endif" ) << endl << endl;
 
-for( size_t i = 0, n = aSlotList.size(); i < n; ++i )
+for( auto& pAttr : aSlotList )
 {
-SvMetaSlot* pAttr = aSlotList[ i ];
 pAttr->ResetSlotPointer();
 }

[Libreoffice-commits] core.git: idl/inc idl/source

2023-02-24 Thread Adoche Onaji (via logerrit)

 idl/inc/hash.hxx  |6 +++---
 idl/inc/object.hxx|2 +-
 idl/inc/slot.hxx  |6 +++---
 idl/source/objects/object.cxx |   10 +-
 idl/source/objects/slot.cxx   |2 +-
 idl/source/prj/svidl.cxx  |4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 8429f5ca376196f1f26c6729cd2559a8a246b9da
Author: Adoche Onaji 
AuthorDate: Fri Feb 17 15:12:15 2023 +0100
Commit: Hossein 
CommitDate: Fri Feb 24 12:29:38 2023 +

tdf#114441 Convert sal_uLong to a better type

In slot.cxx, GetAttrCount() return a size_t type and same type can
be assigned directly to nSCount. In hash.hxx, sal_uLong was declared
in SvStringHashEntry, the only default parameter it the class takes
is aName (type OString) while nValue was directly initialized as 0
in the constructor. The interface to change nValue is through a method
setValue of same type.Also In idl/inc/hash.hxx SetValue() and GetValue 
functionsb are used in idl/source/prj/database.cxx with sal_uInt32 parameter 
and return type and thus, sal_uInt32  is suitable here.The instances of 
sal_uLong in source/objects/object.cxx are replaced with sal_uInt32. In 
object.cxx an iterator was declared using std::find
to find nId in rSuperList (originally declared as std::vector),
therefore if nId is sal_uInt32, the parent vector, rSuperList
should be sal_uInt32. This change is now applicable to the void method
InsertSlot's parameter rSuperList in object.hxx and also variables n,
nId, iter, rSuperList in InsertSlot definition block in the file
object.cxx. Variable aSuperList in obect.cxx is also changed to
sal_uInt32 because its an argument for rSuperList parameter.
nC1 and nC2 in idl/source/prj/svidl.cxx are chnaged from sal_uLong to 
size_t as this is suitable here.

Change-Id: Ie075875229a676ea32dbf9e3049881a479773703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147220
Reviewed-by: Hossein 
Tested-by: Hossein 

diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 6bc904133f61..86b2af448133 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -29,7 +29,7 @@
 class SvStringHashEntry
 {
 OString aName;
-sal_uLong   nValue;
+sal_uInt32   nValue;
 public:
 SvStringHashEntry( OString aName_ )
 : aName(std::move(aName_))
@@ -39,8 +39,8 @@ public:
 
 const OString&  GetName() const { return aName; }
 
-voidSetValue( sal_uLong n ) { nValue = n; }
-sal_uLong   GetValue() const { return nValue; }
+voidSetValue( sal_uInt32 n ) { nValue = n; }
+sal_uInt32   GetValue() const { return nValue; }
 };
 
 class SvStringHashTable
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 8d16ca563c74..b5c30c9e0247 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -71,7 +71,7 @@ private:
 SvIdlDataBase & rBase,
 SvStream & rOutStm );
 
-voidInsertSlots( SvSlotElementList& rList, 
std::vector& rSuperList,
+voidInsertSlots( SvSlotElementList& rList, 
std::vector& rSuperList,
 SvMetaClassList & rClassList,
 const OString& rPrefix, SvIdlDataBase& 
rBase );
 
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index f8ba61d98fa3..fd8e9c0ad5ce 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -48,7 +48,7 @@ public:
 SvBOOL   aContainer;
 OString  aDisableFlags;
 SvMetaSlot*  pNextSlot;
-sal_uLongnListPos;
+sal_uInt32   nListPos;
 SvBOOL   aReadOnlyDoc;
 
 voidWriteSlot( std::string_view rShellName,
@@ -104,9 +104,9 @@ public:
 boolGetContainer() const;
 boolGetReadOnlyDoc() const;
 
-sal_uLong   GetListPos() const
+sal_uInt32   GetListPos() const
 { return nListPos; }
-voidSetListPos(sal_uLong n)
+voidSetListPos(sal_uInt32 n)
 { nListPos = n; }
 voidResetSlotPointer()
 { pNextSlot = nullptr; }
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 510d3a8a791d..8c3cfb7b28ba 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -165,7 +165,7 @@ sal_uInt16 SvMetaClass::WriteSlots( std::string_view 
rShellName,
 return nSCount;
 }
 
-void SvMetaClass::InsertSlots( SvSlotElementList& rList, 
std::vector& rSuperList,
+void SvMetaClass::InsertSlots( SvSlotElementList& rList, 
std::vector& rSuperList,
 SvMetaClassList ,
 const OString& rPrefix, SvIdlDataBase& rBase)
 {
@@ -177,14 +177,14 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, 
std::vector&

[Libreoffice-commits] core.git: idl/inc idl/source include/rtl include/tools l10ntools/source sal/qa tools/source

2021-04-19 Thread Noel Grandin (via logerrit)

 idl/inc/hash.hxx|2 
 idl/source/cmptools/hash.cxx|2 
 include/rtl/string.hxx  |   91 +++-
 include/tools/config.hxx|6 +-
 l10ntools/source/helper.cxx |2 
 l10ntools/source/localize.cxx   |6 +-
 sal/qa/rtl/strings/test_ostring.cxx |4 -
 tools/source/generic/config.cxx |6 +-
 8 files changed, 103 insertions(+), 16 deletions(-)

New commits:
commit c7428c607c021f361973f0b1fd9e0dcaf45fa932
Author: Noel Grandin 
AuthorDate: Sun Apr 18 21:12:13 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Apr 19 12:11:43 2021 +0200

use more string_view in OString API

some parts of the OString seem to have fallen behind
its more popular sibling OUString.

Change-Id: Ie6d64c3005b2df5da49ba79d0c38282dd5057a23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114252
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index fb3ba3227b28..67b18b34badb 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -53,7 +53,7 @@ public:
 SvStringHashEntry * Insert( OString const & rElement, sal_uInt32 * 
pInsertPos );
 bool Test( OString const & rElement, sal_uInt32 * pInsertPos );
 SvStringHashEntry * Get( sal_uInt32 nInsertPos ) const;
-OString GetNearString( const OString& rName ) const;
+OString GetNearString( std::string_view rName ) const;
 };
 
 #endif // INCLUDED_IDL_INC_HASH_HXX
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index ef11b489e5ae..c294a1c14755 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -56,7 +56,7 @@ SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 
nInsertPos ) const
 return it->second.get();
 }
 
-OString SvStringHashTable::GetNearString( const OString& rName ) const
+OString SvStringHashTable::GetNearString( std::string_view rName ) const
 {
 for( auto const & rPair : maInt2EntryMap )
 {
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 98298c7ce8c9..def5d2b8b141 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -122,6 +122,8 @@ public:
 
 constexpr char const * getStr() const SAL_RETURNS_NONNULL { return buffer; 
}
 
+constexpr operator std::string_view() const { return {buffer, 
sal_uInt32(length)}; }
+
 private:
 static constexpr void assertLayout() {
 // These static_asserts verifying the layout compatibility with 
rtl_String cannot be class
@@ -689,6 +691,17 @@ public:
   @return   true if the strings are equal;
 false, otherwise.
 */
+#if defined LIBO_INTERNAL_ONLY
+bool equalsIgnoreAsciiCase( std::string_view str ) const
+{
+if ( sal_uInt32(pData->length) != str.size() )
+return false;
+if ( pData->buffer == str.data() )
+return true;
+return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, 
pData->length,
+  str.data(), 
str.size() ) == 0;
+}
+#else
 bool equalsIgnoreAsciiCase( const OString & str ) const
 {
 if ( pData->length != str.pData->length )
@@ -698,6 +711,7 @@ public:
 return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, 
pData->length,
   str.pData->buffer, 
str.pData->length ) == 0;
 }
+#endif
 
 /**
   Perform an ASCII lowercase comparison of two strings.
@@ -797,11 +811,19 @@ public:
 at the given position;
 false, otherwise.
 */
+#if defined LIBO_INTERNAL_ONLY
+bool match( std::string_view str, sal_Int32 fromIndex = 0 ) const
+{
+return rtl_str_shortenedCompare_WithLength( pData->buffer+fromIndex, 
pData->length-fromIndex,
+str.data(), str.size(), 
str.size() ) == 0;
+}
+#else
 bool match( const OString & str, sal_Int32 fromIndex = 0 ) const
 {
 return rtl_str_shortenedCompare_WithLength( pData->buffer+fromIndex, 
pData->length-fromIndex,
 str.pData->buffer, 
str.pData->length, str.pData->length ) == 0;
 }
+#endif
 
 /**
  @overload
@@ -875,13 +897,21 @@ public:
 at the given position;
 false, otherwise.
 */
+#if defined LIBO_INTERNAL_ONLY
+bool matchIgnoreAsciiCase( std::string_view str, sal_Int32 fromIndex = 0 ) 
const
+{
+return rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( 
pData->buffer+fromIndex, pData->length-fromIndex,
+   str.data(), 
str.size(),
+   str.size() 
) == 0;
+}
+#else
 bool matchIgnoreAsciiCase( const OString & str, sal_Int32 fromIndex = 0 ) 
const
 {
 return

[Libreoffice-commits] core.git: idl/inc idl/source

2020-03-11 Thread Bugra (via logerrit)

 idl/inc/lex.hxx |   18 +-
 idl/source/cmptools/lex.cxx |4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit ad53c996205c290b88fd7acc9fa5c42c3eb5862b
Author: Bugra 
AuthorDate: Sun Mar 8 20:13:52 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Mar 11 17:36:44 2020 +0100

tdf#114441: Convert use of sal_uLong to better integer types

Change-Id: I6b6f59a73aeda6af78fecaf4344826a943072033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90191
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 977cc2b50a36..b7aa9336d82f 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -35,12 +35,12 @@ enum class SVTOKENTYPE { Empty,  Comment,
 class SvToken
 {
 friend class SvTokenStream;
-sal_uLong   nLine, nColumn;
+sal_uInt64  nLine, nColumn;
 SVTOKENTYPE nType;
 OString aString;
 union
 {
-sal_uInt64   nLong;
+sal_uInt64  nLong;
 boolbBool;
 charcChar;
 SvStringHashEntry * pHash;
@@ -53,11 +53,11 @@ public:
 
 OString GetTokenAsString() const;
 
-voidSetLine( sal_uLong nLineP ) { nLine = nLineP;   }
-sal_uLong   GetLine() const { return nLine; }
+voidSetLine( sal_uInt64 nLineP ) { nLine = nLineP;   }
+sal_uInt64  GetLine() const { return nLine; }
 
-voidSetColumn( sal_uLong nColumnP ) { nColumn = nColumnP;   }
-sal_uLong   GetColumn() const   { return nColumn;   }
+voidSetColumn( sal_uInt64 nColumnP ) { nColumn = nColumnP;   }
+sal_uInt64  GetColumn() const   { return nColumn;   }
 
 boolIsComment() const   { return nType == SVTOKENTYPE::Comment; }
 boolIsInteger() const   { return nType == SVTOKENTYPE::Integer; }
@@ -98,13 +98,13 @@ inline SvToken::SvToken()
 
 class SvTokenStream
 {
-sal_uLong   nLine, nColumn;
+sal_uInt64  nLine, nColumn;
 sal_Int32   nBufPos;
 charc;  // next character
 static const sal_uInt16 nTabSize = 4;   // length of tabulator
 OString aStrTrue;
 OString aStrFalse;
-sal_uLong   nMaxPos;
+sal_uInt32  nMaxPos;
 
 std::unique_ptr  pInStream;
 OUString   aFileName;
@@ -129,7 +129,7 @@ class SvTokenStream
 boolIsEof() const { return pInStream->eof(); }
 voidSetMax()
 {
-sal_uLong n = Tell();
+sal_uInt32 n = Tell();
 if( n > nMaxPos )
 nMaxPos = n;
 }
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index f479bea4c4b7..eb9ad11703a2 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -204,8 +204,8 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 }
 while( 0 == c && !IsEof() && ( ERRCODE_NONE == pInStream->GetError() ) );
 
-sal_uLong nLastLine = nLine;
-sal_uLong nLastColumn   = nColumn;
+sal_uInt64 nLastLine = nLine;
+sal_uInt64 nLastColumn   = nColumn;
 // comment
 if( '/' == c )
 {
___
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

2017-03-23 Thread Stephan Bergmann

 idl/inc/lex.hxx |6 +++---
 idl/source/cmptools/lex.cxx |   18 ++
 2 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 0a92c29e4747f2289514cdb1030900b7c1cbb6ba
Author: Stephan Bergmann 
Date:   Thu Mar 23 07:29:17 2017 +0100

This code trades in 'char' entities disguised as 'int'

(with EOF represented as 0), so better actually use 'char'.

Change-Id: Id9c684c833b0d46f8a51a34aa2c4b78a75e2d3a5

diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 20c7b4337bde..8a71349971c5 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -100,7 +100,7 @@ class SvTokenStream
 {
 sal_uLong   nLine, nColumn;
 sal_Int32   nBufPos;
-int c;  // next character
+charc;  // next character
 static const sal_uInt16 nTabSize = 4;   // length of tabulator
 OString aStrTrue;
 OString aStrFalse;
@@ -115,8 +115,8 @@ class SvTokenStream
 
 voidInitCtor();
 
-int GetNextChar();
-int GetFastNextChar()
+charGetNextChar();
+charGetFastNextChar()
 {
 return (nBufPos < aBufStr.getLength())
 ? aBufStr[nBufPos++]
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 58ccf2b3c497..482eaf6293c5 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -125,9 +125,9 @@ void SvTokenStream::FillTokenList()
 pCurToken = aTokList.begin();
 }
 
-int SvTokenStream::GetNextChar()
+char SvTokenStream::GetNextChar()
 {
-int nChar;
+char nChar;
 while (aBufStr.getLength() <= nBufPos)
 {
 if (pInStream->ReadLine(aBufStr))
@@ -171,7 +171,9 @@ sal_uLong SvTokenStream::GetNumber()
 if( isdigit( c ) )
 l = l * nLog + (c - '0');
 else
-l = l * nLog + (rtl::toAsciiUpperCase( c ) - 'A' + 10 );
+l = l * nLog
++ (rtl::toAsciiUpperCase( static_cast(c) )
+   - 'A' + 10 );
 c = GetFastNextChar();
 }
 }
@@ -208,7 +210,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 if( '/' == c )
 {
 // time optimization, no comments
-int c1 = c;
+char c1 = c;
 c = GetFastNextChar();
 if( '/' == c )
 {
@@ -247,7 +249,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 else
 {
 rToken.nType = SVTOKENTYPE::Char;
-rToken.cChar = (char)c1;
+rToken.cChar = c1;
 }
 }
 else if( c == '"' )
@@ -271,7 +273,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 bDone = true;
 }
 else
-aStr.append(static_cast(c));
+aStr.append(c);
 }
 if( IsEof() || ( SVSTREAM_OK != pInStream->GetError() ) )
 return false;
@@ -289,7 +291,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 OStringBuffer aBuf;
 while( isalnum( c ) || c == '_' )
 {
-aBuf.append(static_cast(c));
+aBuf.append(c);
 c = GetFastNextChar();
 }
 OString aStr = aBuf.makeStringAndClear();
@@ -322,7 +324,7 @@ bool SvTokenStream::MakeToken( SvToken & rToken )
 else
 {
 rToken.nType = SVTOKENTYPE::Char;
-rToken.cChar = (char)c;
+rToken.cChar = c;
 c = GetFastNextChar();
 }
 rToken.SetLine( nLastLine );
___
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

2016-12-18 Thread Noel Grandin

 idl/inc/database.hxx |2 
 idl/inc/globals.hxx  |   84 ++---
 idl/inc/hash.hxx |   50 ++---
 idl/source/cmptools/hash.cxx |  165 ++-
 idl/source/prj/command.cxx   |2 
 idl/source/prj/database.cxx  |   16 +---
 6 files changed, 82 insertions(+), 237 deletions(-)

New commits:
commit f9a97a5d5aca8473845bca2e17c5826b772b8f3c
Author: Noel Grandin 
Date:   Thu Dec 15 13:44:21 2016 +0200

drop custom hashtable implementation in idl

Change-Id: I2cdb79022e77cdcc03962d392d0d87626a090ac5
Reviewed-on: https://gerrit.libreoffice.org/32043
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 0ed28a6..25381c3 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -122,7 +122,7 @@ public:
 voidPush( SvMetaObject * pObj );
 sal_uInt32  GetUniqueId() { return ++nUniqueId; }
 boolFindId( const OString& rIdName, sal_uLong * pVal );
-boolInsertId( const OString& rIdName, sal_uLong nVal );
+voidInsertId( const OString& rIdName, sal_uLong nVal );
 boolReadIdFile( const OString& rFileName );
 
 SvMetaType *FindType( const OString& rName );
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ad8aee0..ccd413c 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -22,51 +22,49 @@
 
 #include 
 
-typedef tools::SvRef SvStringHashEntryRef;
-
 class SvClassManager;
 struct SvGlobalHashNames
 {
-SvStringHashEntryRef MM_module;
-SvStringHashEntryRef MM_interface;
-SvStringHashEntryRef MM_shell;
-SvStringHashEntryRef MM_Toggle;
-SvStringHashEntryRef MM_AutoUpdate;
-SvStringHashEntryRef MM_Asynchron;
-SvStringHashEntryRef MM_RecordPerSet;
-SvStringHashEntryRef MM_RecordPerItem;
-SvStringHashEntryRef MM_NoRecord;
-SvStringHashEntryRef MM_RecordAbsolute;
-SvStringHashEntryRef MM_enum;
-SvStringHashEntryRef MM_UINT16;
-SvStringHashEntryRef MM_INT16;
-SvStringHashEntryRef MM_UINT32;
-SvStringHashEntryRef MM_INT32;
-SvStringHashEntryRef MM_BOOL;
-SvStringHashEntryRef MM_BYTE;
-SvStringHashEntryRef MM_float;
-SvStringHashEntryRef MM_double;
-SvStringHashEntryRef MM_item;
-SvStringHashEntryRef MM_PseudoSlots;
-SvStringHashEntryRef MM_import;
-SvStringHashEntryRef MM_SlotIdFile;
-SvStringHashEntryRef MM_include;
-SvStringHashEntryRef MM_ExecMethod;
-SvStringHashEntryRef MM_StateMethod;
-SvStringHashEntryRef MM_GroupId;
-SvStringHashEntryRef MM_Export;
-SvStringHashEntryRef MM_PseudoPrefix;
-SvStringHashEntryRef MM_define;
-SvStringHashEntryRef MM_MenuConfig;
-SvStringHashEntryRef MM_ToolBoxConfig;
-SvStringHashEntryRef MM_AccelConfig;
-SvStringHashEntryRef MM_FastCall;
-SvStringHashEntryRef MM_SbxObject;
-SvStringHashEntryRef MM_Container;
-SvStringHashEntryRef MM_ReadOnlyDoc;
-SvStringHashEntryRef MM_struct;
-SvStringHashEntryRef MM_SlotType;
-SvStringHashEntryRef MM_DisableFlags;
+SvStringHashEntry* MM_module;
+SvStringHashEntry* MM_interface;
+SvStringHashEntry* MM_shell;
+SvStringHashEntry* MM_Toggle;
+SvStringHashEntry* MM_AutoUpdate;
+SvStringHashEntry* MM_Asynchron;
+SvStringHashEntry* MM_RecordPerSet;
+SvStringHashEntry* MM_RecordPerItem;
+SvStringHashEntry* MM_NoRecord;
+SvStringHashEntry* MM_RecordAbsolute;
+SvStringHashEntry* MM_enum;
+SvStringHashEntry* MM_UINT16;
+SvStringHashEntry* MM_INT16;
+SvStringHashEntry* MM_UINT32;
+SvStringHashEntry* MM_INT32;
+SvStringHashEntry* MM_BOOL;
+SvStringHashEntry* MM_BYTE;
+SvStringHashEntry* MM_float;
+SvStringHashEntry* MM_double;
+SvStringHashEntry* MM_item;
+SvStringHashEntry* MM_PseudoSlots;
+SvStringHashEntry* MM_import;
+SvStringHashEntry* MM_SlotIdFile;
+SvStringHashEntry* MM_include;
+SvStringHashEntry* MM_ExecMethod;
+SvStringHashEntry* MM_StateMethod;
+SvStringHashEntry* MM_GroupId;
+SvStringHashEntry* MM_Export;
+SvStringHashEntry* MM_PseudoPrefix;
+SvStringHashEntry* MM_define;
+SvStringHashEntry* MM_MenuConfig;
+SvStringHashEntry* MM_ToolBoxConfig;
+SvStringHashEntry* MM_AccelConfig;
+SvStringHashEntry* MM_FastCall;
+SvStringHashEntry* MM_SbxObject;
+SvStringHashEntry* MM_Container;
+SvStringHashEntry* MM_ReadOnlyDoc;
+SvStringHashEntry* MM_struct;
+SvStringHashEntry* MM_SlotType;
+SvStringHashEntry* MM_DisableFlags;
 
 SvGlobalHashNames();
 };
@@ -88,7 +86,7 @@ inline SvStringHashEntry * SvHash_##Name()   \
 {\
 if(

[Libreoffice-commits] core.git: idl/inc idl/source

2016-10-26 Thread Noel Grandin

 idl/inc/types.hxx|4 +---
 idl/source/objects/types.cxx |9 ++---
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 88ec5de1c950d5b9c32fb98054557436d2aa426d
Author: Noel Grandin 
Date:   Wed Oct 26 11:56:01 2016 +0200

expand SvMetaType::ReadNamesSvIdl

it just forwards to ReadNameSvIdl

Change-Id: I803edb7a5977cf309e2cedaa3b4764bcbd933597

diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 9768f8f..bcffc37 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -34,7 +34,7 @@ public:
 tools::SvRef aType;
 SvIdentifier aSlotId;
 SvMetaAttribute();
-SvMetaAttribute( SvMetaType * );
+SvMetaAttribute( SvMetaType * );
 
 voidSetSlotId( const SvIdentifier & rId )
 { aSlotId = rId; }
@@ -59,8 +59,6 @@ class SvMetaType : public SvMetaReference
 voidWriteSfxItem( const OString& rItemName, SvIdlDataBase 
& rBase,
   SvStream & rOutStm );
 protected:
-boolReadNamesSvIdl( SvTokenStream & rInStm );
-
 boolReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & 
rInStm );
 public:
 SvMetaType();
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 6a38caa..a7b913d 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -167,12 +167,12 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & ,
 if( rTok.Is( SvHash_interface() ) )
 {
 SetType( MetaTypeType::Interface );
-bOk = ReadNamesSvIdl( rInStm );
+bOk = ReadNameSvIdl( rInStm );
 }
 else if( rTok.Is( SvHash_shell() ) )
 {
 SetType( MetaTypeType::Shell );
-bOk = ReadNamesSvIdl( rInStm );
+bOk = ReadNameSvIdl( rInStm );
 }
 if( !bOk )
 rInStm.Seek( nTokPos );
@@ -190,11 +190,6 @@ bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
 return false;
 }
 
-bool SvMetaType::ReadNamesSvIdl( SvTokenStream & rInStm )
-{
-return ReadNameSvIdl( rInStm );
-}
-
 void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase,
   SvTokenStream & rInStm )
 {
___
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 include/sfx2 svx/sdi sw/sdi

2016-09-08 Thread Caolán McNamara

 idl/inc/globals.hxx |4 
 idl/inc/slot.hxx|4 
 idl/source/objects/slot.cxx |   18 --
 idl/source/prj/command.cxx  |2 --
 idl/source/prj/globals.cxx  |2 --
 idl/source/prj/parser.cxx   |2 --
 include/sfx2/msg.hxx|6 ++
 svx/sdi/svx.sdi |   34 --
 sw/sdi/swriter.sdi  |   39 ---
 9 files changed, 2 insertions(+), 109 deletions(-)

New commits:
commit bcf8f878899be13002b2c40f9f2b9363f20fec3a
Author: CaolÃ¡n McNamara 
Date:   Thu Sep 8 13:38:38 2016 +0100

remove IMAGEROTATION and IMAGEREFLECTION SfxSlotMode enums...

unused since...

commit 7affe26a1291eef8c77e890228061f13e987bff1
Author: Maxim Monastirsky 
Date:   Mon Feb 22 18:47:15 2016 +0200

Kill sfx2 menu support

Change-Id: I902957b8379be7c314f5357750aeba5a2fcc0a00
Reviewed-on: https://gerrit.libreoffice.org/28749
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 6092fbb..e49e81e 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -63,8 +63,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_FastCall;
 SvStringHashEntryRef MM_SbxObject;
 SvStringHashEntryRef MM_Container;
-SvStringHashEntryRef MM_ImageRotation;
-SvStringHashEntryRef MM_ImageReflection;
 SvStringHashEntryRef MM_ReadOnlyDoc;
 SvStringHashEntryRef MM_struct;
 SvStringHashEntryRef MM_SlotType;
@@ -129,8 +127,6 @@ HASH_INLINE(AccelConfig)
 HASH_INLINE(FastCall)
 HASH_INLINE(SbxObject)
 HASH_INLINE(Container)
-HASH_INLINE(ImageRotation)
-HASH_INLINE(ImageReflection)
 HASH_INLINE(ReadOnlyDoc)
 HASH_INLINE(struct)
 HASH_INLINE(SlotType)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index bb80784..e3e8c19 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -48,8 +48,6 @@ public:
 SvBOOL   aAccelConfig;
 SvBOOL   aFastCall;
 SvBOOL   aContainer;
-SvBOOL   aImageRotation;
-SvBOOL   aImageReflection;
 SvIdentifier aPseudoPrefix;
 OString  aDisableFlags;
 SvMetaSlot*  pLinkedSlot;
@@ -123,8 +121,6 @@ public:
 boolGetAccelConfig() const;
 boolGetFastCall() const;
 boolGetContainer() const;
-boolGetImageRotation() const;
-boolGetImageReflection() const;
 boolGetReadOnlyDoc() const;
 boolGetExport() const;
 boolGetHidden() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index c17926a..a4df0c8 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -221,18 +221,6 @@ bool SvMetaSlot::GetContainer() const
 return static_cast(GetRef())->GetContainer();
 }
 
-bool SvMetaSlot::GetImageRotation() const
-{
-if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation;
-return static_cast(GetRef())->GetImageRotation();
-}
-
-bool SvMetaSlot::GetImageReflection() const
-{
-if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection;
-return static_cast(GetRef())->GetImageReflection();
-}
-
 void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 SvTokenStream & rInStm )
 {
@@ -292,8 +280,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 
 bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm );
 bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm );
-bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm );
-bOk |= aImageReflection.ReadSvIdl( SvHash_ImageReflection(), rInStm );
 
 if( !bOk )
 {
@@ -774,10 +760,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, 
sal_uInt16 nCount,
 rOutStm.WriteOString( MakeSlotName( SvHash_Container() ) ).WriteChar( 
'|' );
 if ( GetReadOnlyDoc() )
 rOutStm.WriteOString( MakeSlotName( SvHash_ReadOnlyDoc() ) 
).WriteChar( '|' );
-if( GetImageRotation() )
-rOutStm.WriteOString( MakeSlotName( SvHash_ImageRotation() ) 
).WriteChar( '|' );
-if( GetImageReflection() )
-rOutStm.WriteOString( MakeSlotName( SvHash_ImageReflection() ) 
).WriteChar( '|' );
 rOutStm.WriteCharPtr( "SfxSlotMode::NONE" );
 
 rOutStm.WriteChar( ',' ) << endl;
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index a939ee5..54e23ab 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -83,8 +83,6 @@ char const * SyntaxStrings[] = {
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId= Identifier",
-"\t\tImageRotation",
-"\t\tImageReflection",
 "\t\tPseudoPrefix   = Identifier",
 "\t\tPseudoSlots",
 "\t\tReadOnlyDoc*",

[Libreoffice-commits] core.git: idl/inc idl/source include/editeng include/svx sdext/source sd/inc sd/source svx/source vcl/opengl xmloff/source

2016-06-30 Thread Noel Grandin

 idl/inc/hash.hxx  |8 ++--
 idl/source/cmptools/hash.cxx  |2 +-
 include/editeng/numitem.hxx   |   10 --
 include/svx/svdcrtv.hxx   |1 -
 include/svx/svdoashp.hxx  |1 -
 sd/inc/anminfo.hxx|1 -
 sd/source/core/anminfo.cxx|2 --
 sd/source/ui/dlg/TemplateScanner.cxx  |3 +--
 sd/source/ui/inc/TemplateScanner.hxx  |5 ++---
 sdext/source/presenter/PresenterToolBar.cxx   |7 ---
 svx/source/svdraw/svdoashp.cxx|1 -
 vcl/opengl/PackedTextureAtlas.cxx |2 --
 xmloff/source/text/XMLPropertyBackpatcher.cxx |1 -
 xmloff/source/text/XMLPropertyBackpatcher.hxx |3 ---
 14 files changed, 10 insertions(+), 37 deletions(-)

New commits:
commit fbd23182ee1804fd87a13d79a71e231549767408
Author: Noel Grandin 
Date:   Wed Jun 29 09:09:05 2016 +0200

loplugin:unusedfields

Change-Id: If06fffa8db050df0f9c1c7da6163575bf522382e
Reviewed-on: https://gerrit.libreoffice.org/26754
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index a2e923c..6546ca7 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -52,19 +52,16 @@ class SvStringHashEntry : public SvRefBase
 {
 friend class SvStringHashTable;
 OString aName;
-sal_uInt32  nHashId;
 sal_uLong   nValue;
 boolbHasId;
 public:
 SvStringHashEntry()
-: nHashId(0)
-, nValue(0)
+: nValue(0)
 , bHasId(false)
 {
 }
-SvStringHashEntry( const OString& rName, sal_uInt32 nIdx )
+SvStringHashEntry( const OString& rName )
 : aName(rName)
-, nHashId(nIdx)
 , nValue(0)
 , bHasId(true)
 {
@@ -80,7 +77,6 @@ public:
 SvStringHashEntry & operator = ( const SvStringHashEntry & rRef )
 { SvRefBase::operator=( rRef );
   aName   = rRef.aName;
-  nHashId = rRef.nHashId;
   nValue  = rRef.nValue;
   bHasId  = rRef.bHasId;
   return *this;
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index fc63730..a03f4cd 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -167,7 +167,7 @@ bool SvStringHashTable::Insert( const OString& rName, 
sal_uInt32 * pIndex )
 return false;
 
 if( !IsEntry( *pIndex ) )
-pEntries[ *pIndex ] = SvStringHashEntry( rName, *pIndex );
+pEntries[ *pIndex ] = SvStringHashEntry( rName );
 return true;
 }
 
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 2d67dd1..13ffac0 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -315,11 +315,10 @@ public:
 class SvxNodeNum
 {
 sal_uInt16 nLevelVal[ SVX_MAX_NUM ];// Numbers of all levels
-sal_uInt16 nSetValue;   // predetermined number
-sal_uInt8  nMyLevel; // Current Level
+sal_uInt8  nMyLevel;// Current Level
 
 public:
-explicit inline SvxNodeNum( sal_uInt16 nSetVal = USHRT_MAX );
+explicit inline SvxNodeNum();
 inline SvxNodeNum& operator=( const SvxNodeNum& rCpy );
 
 sal_uInt8 GetLevel() const  { return nMyLevel; }
@@ -329,8 +328,8 @@ public:
   sal_uInt16* GetLevelVal() { return nLevelVal; }
 };
 
-SvxNodeNum::SvxNodeNum( sal_uInt16 nSetVal )
-: nSetValue( nSetVal ), nMyLevel( 0 )
+SvxNodeNum::SvxNodeNum()
+: nMyLevel( 0 )
 {
 memset( nLevelVal, 0, sizeof( nLevelVal ) );
 }
@@ -339,7 +338,6 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& 
rCpy )
 {
 if (  != this)
 {
-nSetValue = rCpy.nSetValue;
 nMyLevel = rCpy.nMyLevel;
 
 memcpy( nLevelVal, rCpy.nLevelVal, sizeof( nLevelVal ) );
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 83fc407..33fa675 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -51,7 +51,6 @@ protected:
 sal_uInt32  nAktInvent; // set the current ones
 sal_uInt16  nAktIdent;  // Obj for re-creating
 
-boolbAutoTextEdit : 1; // Textedit after we start 
the creation of a text frame
 boolb1stPointAsCenter : 1;
 boolbUseIncompatiblePathCreateInterface : 1;
 
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index b31d9bf..4ff7100 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -145,7 +145,6 @@ protected:
 // and object sizes
 virtual void AdaptTextMinSize() override;
 
-OUString  aName;
 Size  m_aSuggestedTextFrameSize;
 
 public:
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index db2aeb3..96cb5a0 100644
---

[Libreoffice-commits] core.git: idl/inc idl/source

2016-02-06 Thread Noel Grandin

 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

[Libreoffice-commits] core.git: idl/inc idl/source

2016-02-06 Thread Noel Grandin

 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 *

[Libreoffice-commits] core.git: idl/inc idl/source

2016-02-06 Thread Noel Grandin

 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 = ();
-if( pTok->IsChar() )
-{
-if( pTok->GetChar() == '&' || pTok->GetChar() == '*' )
-{
-nCall0 = (pTok->GetChar() == '&') ? CALL_REFERENCE :
-CALL_POINTER;
-rInStm.GetToken_Next();
-pTok = ();
-if( pTok->GetChar() == '&' || pTok->GetChar() == '*' )
-{
-nCall1 = (pTok->GetChar() == '&') ? CALL_REFERENCE :
-CALL_POINTER;
-

[Libreoffice-commits] core.git: idl/inc idl/source

2016-02-06 Thread Noel Grandin

 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

[Libreoffice-commits] core.git: idl/inc idl/source

2016-02-06 Thread Noel Grandin

 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  )

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

2016-02-04 Thread Noel Grandin

 idl/inc/globals.hxx |2 
 idl/inc/slot.hxx|2 
 idl/source/objects/slot.cxx |8 
 idl/source/prj/command.cxx  |1 
 idl/source/prj/globals.cxx  |1 
 include/sfx2/msg.hxx|3 
 sc/sdi/cellsh.sdi   |1 
 sc/sdi/scalc.sdi|  360 --
 sd/sdi/_drvwsh.sdi  |6 
 sd/sdi/outlnvsh.sdi |6 
 sd/sdi/sdnew.sdi|3 
 sd/sdi/sdraw.sdi|  283 
 sfx2/sdi/sfx.sdi|  302 --
 starmath/sdi/smath.sdi  |   36 --
 svx/sdi/svx.sdi |  599 
 sw/sdi/swriter.sdi  |  419 --
 16 files changed, 7 insertions(+), 2025 deletions(-)

New commits:
commit 228a5704b3ca1addd7aa5de7a04865df4dc5b091
Author: Noel Grandin 
Date:   Wed Feb 3 16:36:01 2016 +0200

remove unused HasDialog from SDI files

Change-Id: I26f2cef48fcc7a6c4a6b93668b836879254f3eb0
Reviewed-on: https://gerrit.libreoffice.org/22098
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 8a82aee..033a044 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -79,7 +79,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_ExecMethod;
 SvStringHashEntryRef MM_StateMethod;
 SvStringHashEntryRef MM_GroupId;
-SvStringHashEntryRef MM_HasDialog;
 SvStringHashEntryRef MM_TypeLibFile;
 SvStringHashEntryRef MM_Export;
 SvStringHashEntryRef MM_Automation;
@@ -179,7 +178,6 @@ HASH_INLINE(StateMethod)
 HASH_INLINE(GroupId)
 HASH_INLINE(float)
 HASH_INLINE(double)
-HASH_INLINE(HasDialog)
 HASH_INLINE(TypeLibFile)
 HASH_INLINE(Export)
 HASH_INLINE(Automation)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 6f12fcf6..25a7415 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -48,7 +48,6 @@ class SvMetaSlot : public SvMetaAttribute
 SvBOOL  aNoRecord;
 SvBOOL  aRecordAbsolute;
 
-SvBOOL  aHasDialog;
 SvBOOL  aMenuConfig;
 SvBOOL  aToolBoxConfig;
 SvBOOL  aStatusBarConfig;
@@ -158,7 +157,6 @@ public:
 boolGetNoRecord() const;
 boolGetRecordAbsolute() const;
 
-boolGetHasDialog() const;
 const OString& GetPseudoPrefix() const;
 const OString& GetUnoName() const;
 boolGetMenuConfig() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index fbb560f..0f03eaf 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -191,11 +191,6 @@ bool SvMetaSlot::GetRecordAbsolute() const
 return aRecordAbsolute;
 return static_cast(GetRef())->GetRecordAbsolute();
 }
-bool SvMetaSlot::GetHasDialog() const
-{
-if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog;
-return static_cast(GetRef())->GetHasDialog();
-}
 const OString& SvMetaSlot::GetPseudoPrefix() const
 {
 if( !aPseudoPrefix.getString().isEmpty() || !GetRef() ) return 
aPseudoPrefix.getString();
@@ -298,7 +293,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) )
 SetNoRecord( aNoRecord ), bOk = true;
 
-bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm );
 bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm );
 bOk |= aMenuConfig.ReadSvIdl( SvHash_MenuConfig(), rInStm );
 bOk |= aToolBoxConfig.ReadSvIdl( SvHash_ToolBoxConfig(), rInStm );
@@ -822,8 +816,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, 
sal_uInt16 nCount,
 rOutStm.WriteCharPtr( MakeSlotName( SvHash_NoRecord() ).getStr() 
).WriteChar( '|' );
 if( GetRecordAbsolute() )
 rOutStm.WriteCharPtr( MakeSlotName( SvHash_RecordAbsolute() ).getStr() 
).WriteChar( '|' );
-if( GetHasDialog() )
-rOutStm.WriteCharPtr( MakeSlotName( SvHash_HasDialog() ).getStr() 
).WriteChar( '|' );
 if( GetMenuConfig() )
 rOutStm.WriteCharPtr( MakeSlotName( SvHash_MenuConfig() ).getStr() 
).WriteChar( '|' );
 if( GetToolBoxConfig() )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 6e6afd3..fa74f42 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -84,7 +84,6 @@ char const * SyntaxStrings[] = {
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId= Identifier",
-"\t\tHasDialog",
 "\t\tIsCollection",
 "\t\tImageRotation",
 "\t\tImageReflection",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index b8357d8..634212f 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -106,7 +106,6 @@ SvGlobalHashNames::SvGlobalHashNames()
 A_ENTRY(ExecMethod)
 A_ENTRY(StateMethod)
 A_ENTRY(GroupId)
-A_ENTRY(HasDialog)
 A_ENTRY(TypeLibFile)

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

2016-02-04 Thread Noel Grandin

 idl/inc/globals.hxx |2 
 idl/inc/slot.hxx|   10 
 idl/source/objects/slot.cxx |   17 -
 idl/source/prj/command.cxx  |2 
 idl/source/prj/globals.cxx  |1 
 include/sfx2/msg.hxx|7 
 sc/sdi/scalc.sdi|  336 ---
 sd/sdi/sdnew.sdi|2 
 sd/sdi/sdraw.sdi|  265 -
 sfx2/sdi/sfx.sdi|  200 
 starmath/sdi/smath.sdi  |   31 --
 svx/sdi/svx.sdi |  547 
 sw/sdi/swriter.sdi  |  326 --
 13 files changed, 6 insertions(+), 1740 deletions(-)

New commits:
commit 5ec98c76986c1fe004fe10b1a003618d74a2c5d3
Author: Noel Grandin 
Date:   Wed Feb 3 16:28:34 2016 +0200

remove unused Synchron from SDI files

Change-Id: I0b8c63a97bfa4a49ac87869e164ab22d2aa99de3
Reviewed-on: https://gerrit.libreoffice.org/22097
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index f3f30cc..8a82aee 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -46,7 +46,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_Volatile;
 SvStringHashEntryRef MM_Toggle;
 SvStringHashEntryRef MM_AutoUpdate;
-SvStringHashEntryRef MM_Synchron;
 SvStringHashEntryRef MM_Asynchron;
 SvStringHashEntryRef MM_RecordPerSet;
 SvStringHashEntryRef MM_RecordPerItem;
@@ -149,7 +148,6 @@ HASH_INLINE(SlotId)
 HASH_INLINE(Volatile)
 HASH_INLINE(Toggle)
 HASH_INLINE(AutoUpdate)
-HASH_INLINE(Synchron)
 HASH_INLINE(Asynchron)
 HASH_INLINE(RecordPerItem)
 HASH_INLINE(RecordPerSet)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index c9c09a2..6f12fcf6 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -40,7 +40,6 @@ class SvMetaSlot : public SvMetaAttribute
 SvBOOL  aToggle;
 SvBOOL  aAutoUpdate;
 
-SvBOOL  aSynchron;  // exclusive
 SvBOOL  aAsynchron;
 
 SvBOOL  aRecordPerItem;// exclusive
@@ -88,17 +87,9 @@ protected:
 aAutoUpdate = bSet;
 }
 
-voidSetSynchron( bool bSet )
-{
-aSynchron = bSet;
-if( bSet )
-aAsynchron = false;
-}
 voidSetAsynchron( bool bSet )
 {
 aAsynchron = bSet;
-if( bSet )
-aSynchron = false;
 }
 
 voidSetRecordPerItem( bool bSet )
@@ -159,7 +150,6 @@ public:
 boolGetToggle() const;
 boolGetAutoUpdate() const;
 
-boolGetSynchron() const;
 boolGetAsynchron() const;
 
 boolGetRecordPerItem() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 4d5782f..fbb560f 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -34,8 +34,7 @@ SvMetaObject *SvMetaSlot::MakeClone() const
 }
 
 SvMetaSlot::SvMetaSlot()
-: aSynchron( true, false )
-, aRecordPerSet( true, false )
+: aRecordPerSet( true, false )
 , aRecordAbsolute( false, false )
 , pLinkedSlot(nullptr)
 , pNextSlot(nullptr)
@@ -46,7 +45,6 @@ SvMetaSlot::SvMetaSlot()
 
 SvMetaSlot::SvMetaSlot( SvMetaType * pType )
 : SvMetaAttribute( pType )
-, aSynchron( true, false )
 , aRecordPerSet( true, false )
 , aRecordAbsolute( false, false )
 , pLinkedSlot(nullptr)
@@ -148,17 +146,10 @@ bool SvMetaSlot::GetAutoUpdate() const
 if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate;
 return static_cast(GetRef())->GetAutoUpdate();
 }
-bool SvMetaSlot::GetSynchron() const
-{
-// Synchron and Asynchron are exclusive
-if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() )
-return aSynchron;
-return static_cast(GetRef())->GetSynchron();
-}
 bool SvMetaSlot::GetAsynchron() const
 {
 // Synchron and Asynchron are exclusive
-if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() )
+if( !GetRef() || aAsynchron.IsSet() )
 return aAsynchron;
 return static_cast(GetRef())->GetAsynchron();
 }
@@ -293,8 +284,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) )
 SetAutoUpdate( aAutoUpdate ), bOk = true;
 
-if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) )
-SetSynchron( aSynchron ), bOk = true;
 if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) )
 SetAsynchron( aAsynchron ), bOk = true;
 
@@ -821,8 +810,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, 
sal_uInt16 nCount,
 rOutStm.WriteCharPtr( MakeSlotName( SvHash_Toggle() ).getStr() 
).WriteChar( '|' );
 if( GetAutoUpdate() )
 rOutStm.WriteCharPtr( MakeSlotName( SvHash_AutoUpdate() ).getStr()

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sd/sdi svx/sdi

2016-02-04 Thread Noel Grandin

 idl/inc/globals.hxx |2 --
 idl/inc/slot.hxx|   14 +++---
 idl/source/objects/slot.cxx |   18 +++---
 idl/source/prj/command.cxx  |2 +-
 idl/source/prj/globals.cxx  |1 -
 include/sfx2/msg.hxx|3 +--
 sd/sdi/sdraw.sdi|   10 --
 svx/sdi/svx.sdi |   23 ---
 8 files changed, 8 insertions(+), 65 deletions(-)

New commits:
commit 44e48e309ab92443f11b290a2153779703bca22f
Author: Noel Grandin 
Date:   Wed Feb 3 16:58:01 2016 +0200

remove unused RecordManual from SDI files

Change-Id: Ia6af0d00b68f5694c9fc9cc453fe36fb923f0a2d
Reviewed-on: https://gerrit.libreoffice.org/22099
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 033a044..09e2a4c 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -49,7 +49,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_Asynchron;
 SvStringHashEntryRef MM_RecordPerSet;
 SvStringHashEntryRef MM_RecordPerItem;
-SvStringHashEntryRef MM_RecordManual;
 SvStringHashEntryRef MM_NoRecord;
 SvStringHashEntryRef MM_RecordAbsolute;
 SvStringHashEntryRef MM_enum;
@@ -150,7 +149,6 @@ HASH_INLINE(AutoUpdate)
 HASH_INLINE(Asynchron)
 HASH_INLINE(RecordPerItem)
 HASH_INLINE(RecordPerSet)
-HASH_INLINE(RecordManual)
 HASH_INLINE(NoRecord)
 HASH_INLINE(RecordAbsolute)
 HASH_INLINE(enum)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 25a7415..7c86e72 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -44,7 +44,6 @@ class SvMetaSlot : public SvMetaAttribute
 
 SvBOOL  aRecordPerItem;// exclusive
 SvBOOL  aRecordPerSet;
-SvBOOL  aRecordManual;
 SvBOOL  aNoRecord;
 SvBOOL  aRecordAbsolute;
 
@@ -95,25 +94,19 @@ protected:
 {
 aRecordPerItem = bSet;
 if( bSet )
-aRecordPerSet = aRecordManual = aNoRecord = false;
+aRecordPerSet = aNoRecord = false;
 }
 voidSetRecordPerSet( bool bSet )
 {
 aRecordPerSet = bSet;
 if( bSet )
-aRecordPerItem = aRecordManual = aNoRecord = false;
-}
-voidSetRecordManual( bool bSet )
-{
-aRecordManual = bSet;
-if( bSet )
-aRecordPerItem = aRecordPerSet = aNoRecord = false;
+aRecordPerItem = aNoRecord = false;
 }
 voidSetNoRecord( bool bSet )
 {
 aNoRecord = bSet;
 if( bSet )
-aRecordPerItem = aRecordPerSet = aRecordManual = false;
+aRecordPerItem = aRecordPerSet = false;
 }
 voidSetRecordAbsolute( bool bSet )
 { aRecordAbsolute = bSet; }
@@ -153,7 +146,6 @@ public:
 
 boolGetRecordPerItem() const;
 boolGetRecordPerSet() const;
-boolGetRecordManual() const;
 boolGetNoRecord() const;
 boolGetRecordAbsolute() const;
 
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 0f03eaf..5ba52db 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -157,7 +157,7 @@ bool SvMetaSlot::GetRecordPerItem() const
 {
 // Record- PerItem, No, PerSet and Manual are exclusive
 if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
-  || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
+  || aRecordPerSet.IsSet() )
 return aRecordPerItem;
 return static_cast(GetRef())->GetRecordPerItem();
 }
@@ -165,23 +165,15 @@ bool SvMetaSlot::GetRecordPerSet() const
 {
 // Record- PerItem, No, PerSet and Manual are exclusive
 if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
-  || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
+  || aRecordPerSet.IsSet() )
 return aRecordPerSet;
 return static_cast(GetRef())->GetRecordPerSet();
 }
-bool SvMetaSlot::GetRecordManual() const
-{
-// Record- PerItem, No, PerSet and Manual are exclusive
-if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
-  || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
-return aRecordManual;
-return static_cast(GetRef())->GetRecordManual();
-}
 bool SvMetaSlot::GetNoRecord() const
 {
 // Record- PerItem, No, PerSet and Manual are exclusive
 if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet()
-  || aRecordPerSet.IsSet() || aRecordManual.IsSet() )
+  || aRecordPerSet.IsSet()  )
 return aNoRecord;
 return static_cast(GetRef())->GetNoRecord();
 }
@@ -288,8 +280,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 SetRecordPerItem( aRecordPerItem ), bOk = true;
 if(

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

2016-02-04 Thread Noel Grandin

 idl/inc/globals.hxx |2 
 idl/inc/slot.hxx|   10 
 idl/source/objects/slot.cxx |   17 -
 idl/source/prj/globals.cxx  |1 
 include/sfx2/msg.hxx|9 
 sc/sdi/cellsh.sdi   |   16 -
 sc/sdi/drawsh.sdi   |3 
 sc/sdi/editsh.sdi   |1 
 sc/sdi/prevwsh.sdi  |   10 
 sc/sdi/scalc.sdi|  361 -
 sc/sdi/tabvwsh.sdi  |2 
 sd/sdi/_docsh.sdi   |3 
 sd/sdi/_drvwsh.sdi  |   25 -
 sd/sdi/app.sdi  |2 
 sd/sdi/drtxtob.sdi  |   20 -
 sd/sdi/drviewsh.sdi |1 
 sd/sdi/grviewsh.sdi |1 
 sd/sdi/outlnvsh.sdi |   20 -
 sd/sdi/sdnew.sdi|3 
 sd/sdi/sdraw.sdi|  283 ---
 sfx2/sdi/sfx.sdi|  302 -
 starmath/sdi/smath.sdi  |   36 --
 svx/sdi/svx.sdi |  626 
 sw/sdi/_basesh.sdi  |2 
 sw/sdi/_viewsh.sdi  |6 
 sw/sdi/swriter.sdi  |  419 -
 sw/sdi/textsh.sdi   |1 
 sw/sdi/wtextsh.sdi  |1 
 28 files changed, 30 insertions(+), 2153 deletions(-)

New commits:
commit 16431492441e742fbbbfc73ba0b715a91ec3ee45
Author: Noel Grandin 
Date:   Wed Feb 3 16:10:14 2016 +0200

remove unused Cachable keyword from SDI files

Change-Id: I60c423b799f34f79f58bc39cf7ea616ec4f5d16a
Reviewed-on: https://gerrit.libreoffice.org/22096
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ab12cb7..f3f30cc 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -43,7 +43,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_Get;
 SvStringHashEntryRef MM_Set;
 SvStringHashEntryRef MM_SlotId;
-SvStringHashEntryRef MM_Cachable;
 SvStringHashEntryRef MM_Volatile;
 SvStringHashEntryRef MM_Toggle;
 SvStringHashEntryRef MM_AutoUpdate;
@@ -147,7 +146,6 @@ HASH_INLINE(shell)
 HASH_INLINE(Get)
 HASH_INLINE(Set)
 HASH_INLINE(SlotId)
-HASH_INLINE(Cachable)
 HASH_INLINE(Volatile)
 HASH_INLINE(Toggle)
 HASH_INLINE(AutoUpdate)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 165388b..c9c09a2 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -36,7 +36,6 @@ class SvMetaSlot : public SvMetaAttribute
 SvBOOL  aGet;
 SvBOOL  aSet;
 
-SvBOOL  aCachable;  // exclusive
 SvBOOL  aVolatile;
 SvBOOL  aToggle;
 SvBOOL  aAutoUpdate;
@@ -76,17 +75,9 @@ class SvMetaSlot : public SvMetaAttribute
 voidSetEnumValue(SvMetaEnumValue *p)
 { pEnumValue = p; }
 protected:
-voidSetCachable( bool bSet )
-{
-aCachable = bSet;
-if( bSet )
-aVolatile = false;
-}
 voidSetVolatile( bool bSet )
 {
 aVolatile = bSet;
-if( bSet )
-aCachable = false;
 }
 voidSetToggle( bool bSet )
 {
@@ -164,7 +155,6 @@ public:
 const OString& GetDefault() const;
 const OString& GetDisableFlags() const;
 boolGetPseudoSlots() const;
-boolGetCachable() const;
 boolGetVolatile() const;
 boolGetToggle() const;
 boolGetAutoUpdate() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 9f0e036..4d5782f 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -34,8 +34,7 @@ SvMetaObject *SvMetaSlot::MakeClone() const
 }
 
 SvMetaSlot::SvMetaSlot()
-: aCachable( true, false )
-, aSynchron( true, false )
+: aSynchron( true, false )
 , aRecordPerSet( true, false )
 , aRecordAbsolute( false, false )
 , pLinkedSlot(nullptr)
@@ -47,7 +46,6 @@ SvMetaSlot::SvMetaSlot()
 
 SvMetaSlot::SvMetaSlot( SvMetaType * pType )
 : SvMetaAttribute( pType )
-, aCachable( true, false )
 , aSynchron( true, false )
 , aRecordPerSet( true, false )
 , aRecordAbsolute( false, false )
@@ -133,17 +131,10 @@ bool SvMetaSlot::GetPseudoSlots() const
 if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
 return static_cast(GetRef())->GetPseudoSlots();
 }
-bool SvMetaSlot::GetCachable() const
-{
-// Cachable and Volatile are exclusive
-if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() )
- return aCachable;
-return static_cast(GetRef())->GetCachable();
-}
 bool SvMetaSlot::GetVolatile() const
 {
 // Cachable and Volatile are exclusive
-if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() )
+if( !GetRef() || aVolatile.IsSet() )
 return aVolatile;
 return static_cast(GetRef())->GetVolatile();
 }
@@ -295,8

[Libreoffice-commits] core.git: idl/inc idl/source

2016-02-04 Thread Noel Grandin

 idl/inc/types.hxx|1 
 idl/source/objects/types.cxx |   63 ---
 2 files changed, 64 deletions(-)

New commits:
commit 7236df4fec03bc8f58f33a7aa43cef7e52e48882
Author: Noel Grandin 
Date:   Thu Feb 4 08:56:53 2016 +0200

remove unused Compare method

Change-Id: I12578410a27f613a064f293022280b5345117a9c
Reviewed-on: https://gerrit.libreoffice.org/22102
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 25bca90..4f34275 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -74,7 +74,6 @@ public:
 sal_uLong   MakeSfx( OStringBuffer& rAtrrArray );
 virtual voidInsert( SvSlotElementList&, const OString& rPrefix,
 SvIdlDataBase& );
-OStringCompare( SvMetaAttribute *pAttr );
 };
 
 typedef tools::SvRef SvMetaAttributeRef;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index f208f26..662e396 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -740,67 +740,4 @@ SvMetaTypevoid::SvMetaTypevoid()
 {
 }
 
-OString SvMetaAttribute::Compare( SvMetaAttribute* pAttr )
-{
-OStringBuffer aStr;
-
-if ( aType.Is() )
-{
-if ( aType->GetType() == TYPE_METHOD )
-{
-// Test only when the attribute is a method not if it has one!
-if ( pAttr->GetType()->GetType() != TYPE_METHOD )
-aStr.append("IsMethod\n");
-else if ( aType->GetReturnType() &&
-aType->GetReturnType()->GetType() != 
pAttr->GetType()->GetReturnType()->GetType() )
-{
-aStr.append("ReturnType\n");
-}
-
-if ( aType->GetAttrCount() )
-{
-sal_uLong nCount = aType->GetAttrCount();
-SvMetaAttributeMemberList& rList = aType->GetAttrList();
-SvMetaAttributeMemberList& rOtherList = 
pAttr->GetType()->GetAttrList();
-if ( pAttr->GetType()->GetAttrCount() != nCount )
-{
-aStr.append("AttributeCount\n");
-}
-else
-{
-for ( sal_uLong n=0; nCompare( pAttr2 );
-}
-}
-}
-}
-
-if ( GetType()->GetType() != pAttr->GetType()->GetType() )
-aStr.append("Type\n");
-
-if ( !GetType()->GetSvName().equals( pAttr->GetType()->GetSvName() ) )
-aStr.append("ItemType\n");
-}
-
-if ( GetExport() != pAttr->GetExport() )
-aStr.append("Export\n");
-
-if ( GetAutomation() != pAttr->GetAutomation() )
-aStr.append("Automation\n");
-
-if ( GetIsCollection() != pAttr->GetIsCollection() )
-aStr.append("IsCollection\n");
-
-if ( GetReadOnlyDoc() != pAttr->GetReadOnlyDoc() )
-aStr.append("ReadOnlyDoc\n");
-
-if ( GetExport() && GetReadonly() != pAttr->GetReadonly() )
-aStr.append("Readonly\n");
-
-return aStr.makeStringAndClear();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: idl/inc idl/source sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

2016-02-03 Thread Noel Grandin

 idl/inc/globals.hxx |2 
 idl/inc/slot.hxx|2 
 idl/source/objects/slot.cxx |8 
 idl/source/prj/command.cxx  |1 
 idl/source/prj/globals.cxx  |1 
 sc/sdi/scalc.sdi|  360 -
 sd/sdi/sdnew.sdi|3 
 sd/sdi/sdraw.sdi|  283 ---
 sfx2/sdi/sfx.sdi|  302 -
 starmath/sdi/smath.sdi  |   36 --
 svx/sdi/svx.sdi |  626 
 sw/sdi/swriter.sdi  |  419 -
 12 files changed, 2043 deletions(-)

New commits:
commit d9e362e4516a5df77f3edd12d57ce224a0a4979d
Author: Noel Grandin 
Date:   Wed Feb 3 13:23:09 2016 +0200

remove unused HasCoreId from SDI files

Change-Id: I4aca4b8a79ce92d64ce004ccdb7e9a0f408dc768

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index b748244..ab12cb7 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -43,7 +43,6 @@ struct SvGlobalHashNames
 SvStringHashEntryRef MM_Get;
 SvStringHashEntryRef MM_Set;
 SvStringHashEntryRef MM_SlotId;
-SvStringHashEntryRef MM_HasCoreId;
 SvStringHashEntryRef MM_Cachable;
 SvStringHashEntryRef MM_Volatile;
 SvStringHashEntryRef MM_Toggle;
@@ -148,7 +147,6 @@ HASH_INLINE(shell)
 HASH_INLINE(Get)
 HASH_INLINE(Set)
 HASH_INLINE(SlotId)
-HASH_INLINE(HasCoreId)
 HASH_INLINE(Cachable)
 HASH_INLINE(Volatile)
 HASH_INLINE(Toggle)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 8ed5d39..165388b 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -28,7 +28,6 @@ class SvMetaSlot : public SvMetaAttribute
 SvMetaTypeRef   aSlotType;
 SvMetaAttributeRef aMethod;
 SvIdentifieraGroupId;
-SvBOOL  aHasCoreId;
 SvIdentifieraConfigId;
 SvIdentifieraExecMethod;
 SvIdentifieraStateMethod;
@@ -158,7 +157,6 @@ public:
 
 SvMetaAttribute *   GetMethod() const;
 SvMetaType *GetSlotType() const;
-boolGetHasCoreId() const;
 const OString& GetGroupId() const;
 const OString& GetConfigId() const;
 const OString& GetExecMethod() const;
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 9876016..9f0e036 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -98,11 +98,6 @@ SvMetaAttribute * SvMetaSlot::GetMethod() const
 if( aMethod.Is() || !GetRef() ) return aMethod;
 return static_cast(GetRef())->GetMethod();
 }
-bool SvMetaSlot::GetHasCoreId() const
-{
-if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId;
-return static_cast(GetRef())->GetHasCoreId();
-}
 const OString& SvMetaSlot::GetGroupId() const
 {
 if( !aGroupId.getString().isEmpty() || !GetRef() ) return 
aGroupId.getString();
@@ -281,7 +276,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 bool bOk = false;
 bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm );
 bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm );
-bOk |= aHasCoreId.ReadSvIdl( SvHash_HasCoreId(), rInStm );
 bOk |= aGroupId.ReadSvIdl( SvHash_GroupId(), rInStm );
 bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm );
 bOk |= aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm );
@@ -832,8 +826,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, 
sal_uInt16 nCount,
 WriteTab( rOutStm, 4 );
 
 // write flags
-if( GetHasCoreId() )
-rOutStm.WriteCharPtr( MakeSlotName( SvHash_HasCoreId() ).getStr() 
).WriteChar( '|' );
 if( GetCachable() )
 rOutStm.WriteCharPtr( MakeSlotName( SvHash_Cachable() ).getStr() 
).WriteChar( '|' );
 if( GetVolatile() )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 1ccade4..b1c8708 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -84,7 +84,6 @@ char const * SyntaxStrings[] = {
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId= Identifier",
-"\t\tHasCoreId",
 "\t\tHasDialog",
 "\t\tIsCollection",
 "\t\tImageRotation",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 68dba1c..6665fcc 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -71,7 +71,6 @@ SvGlobalHashNames::SvGlobalHashNames()
 , MM_Get( INS( "Get" ) )
 , MM_Set( INS( "Set" ) )
 , MM_SlotId( INS( "SlotId" ) )
-, MM_HasCoreId( INS( "HasCoreId" ) )
 , MM_Cachable( INS( "Cachable" ) )
 , MM_Toggle( INS( "Toggle" ) )
 , MM_AutoUpdate( INS( "AutoUpdate" ) )
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index fda341a..0372daf 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -23,7 +23,6 @@ SfxVoidItem AcceptChanges FID_CHG_ACCEPT
 AutoUpdate = FALSE,
 Cachable = Cachable,
 FastCall = FALSE,
-HasCoreId = FALSE,
 HasDialog = FALSE,
 ReadOnlyDoc = TRUE,
 Toggle = FALSE,
@@ -48,7 +47,6 @@ SfxVoidItem ActivateOLE

[Libreoffice-commits] core.git: idl/inc idl/source

2015-08-03 Thread Stephan Bergmann

 idl/inc/module.hxx|4 +---
 idl/source/objects/module.cxx |5 ++---
 idl/source/prj/database.cxx   |2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit b99638665a0f286b29a2cb8827f0ea80bebd4705
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Aug 3 21:16:46 2015 +0200

-Werror,-Wunused-private-field

Change-Id: Ifc3cbc210da3bc342cd17a70284ce88ad22455fd

diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index c8d1c40..4cb3798 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -38,7 +38,6 @@ class SvMetaModule : public SvMetaExtern
 SvMetaTypeMemberListaTypeList;
 SvMetaAttributeMemberList   aAttrList;
 // browser
-OUStringaIdlFileName;
 SvStringaHelpFileName;
 SvStringaSlotIdFile;
 SvStringaTypeLibFile;
@@ -57,8 +56,7 @@ public:
 
 virtual boolSetName( const OString rName, SvIdlDataBase * = NULL  
) SAL_OVERRIDE;
 
-SvMetaModule( const OUString  rIdlFileName,
-  bool bImported );
+SvMetaModule( bool bImported );
 
 boolFillNextName( SvGlobalName * );
 boolIsImported() const { return bImported; }
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 6bd316c..573fc6d 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -29,9 +29,8 @@
 
 TYPEINIT1( SvMetaModule, SvMetaExtern );
 
-SvMetaModule::SvMetaModule( const OUString  rIdlFileName, bool bImp )
-: aIdlFileName( rIdlFileName )
-, bImported( bImp ), bIsModified( false )
+SvMetaModule::SvMetaModule( bool bImp )
+: bImported( bImp ), bIsModified( false )
 {
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 0aba117..6030afd 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -587,7 +587,7 @@ bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream  rInStm, 
bool bImported, const
 // only one import at the very beginning
 if( pTok-Is( SvHash_module() ) )
 {
-SvMetaModuleRef aModule = new SvMetaModule( rInStm.GetFileName(), 
bImported );
+SvMetaModuleRef aModule = new SvMetaModule( bImported );
 if( aModule-ReadSvIdl( *this, rInStm ) )
 GetModuleList().push_back( aModule );
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: idl/inc idl/source include/tools solenv/gbuild tools/source

2014-10-16 Thread Stephan Bergmann

 idl/inc/basobj.hxx |   39 -
 idl/inc/bastype.hxx|9 
 idl/inc/command.hxx|7 
 idl/inc/database.hxx   |   10 
 idl/inc/globals.hxx|1 
 idl/inc/module.hxx |9 
 idl/inc/object.hxx |   17 
 idl/inc/slot.hxx   |   11 
 idl/inc/types.hxx  |   45 --
 idl/source/objects/basobj.cxx  |  229 ---
 idl/source/objects/bastype.cxx |   50 --
 idl/source/objects/module.cxx  |  213 --
 idl/source/objects/object.cxx  |  193 -
 idl/source/objects/slot.cxx|  582 -
 idl/source/objects/types.cxx   |  803 ++---
 idl/source/prj/command.cxx |   81 
 idl/source/prj/database.cxx|  183 -
 idl/source/prj/globals.cxx |   25 -
 idl/source/prj/svidl.cxx   |  142 ---
 include/tools/pstm.hxx |   48 --
 solenv/gbuild/SdiTarget.mk |7 
 tools/source/ref/pstm.cxx  |   79 
 22 files changed, 105 insertions(+), 2678 deletions(-)

New commits:
commit aef6ab2098f065f1cee102538776dd99d9db3b0f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 16 08:12:19 2014 +0200

Strip svidl down to what is still used

...the generated .ilb, .lst, and .sid outputs requested by SdiTarget were
apparently unused.

Change-Id: I1abb2abc7945070451fce4a98a11d955515e3f63

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 34d0b10..5c0ac11 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -38,8 +38,7 @@ typedef SvMetaObject * (*CreateMetaObjectType)();
 
 enum WriteType
 {
-WRITE_IDL, WRITE_ODL, WRITE_SLOTMAP, WRITE_C_HEADER, WRITE_C_SOURCE,
-WRITE_CXX_HEADER, WRITE_CXX_SOURCE, WRITE_DOCU
+WRITE_C_HEADER, WRITE_C_SOURCE
 };
 
 enum
@@ -49,16 +48,10 @@ enum
 };
 typedef int WriteAttribute;
 
-#define SV_DECL_META_FACTORY1( Class, Super1, CLASS_ID )\
-SV_DECL_PERSIST1( Class, Super1, CLASS_ID )
-
-#define SV_IMPL_META_FACTORY1( Class, Super1 )  \
-SV_IMPL_PERSIST1( Class, Super1 )
-
-class SvMetaObject : public SvPersistBase
+class SvMetaObject : public SvRttiBase
 {
 public:
-SV_DECL_META_FACTORY1( SvMetaObject, SvPersistBase, 14 )
+TYPEINFO_OVERRIDE();
 SvMetaObject();
 
 static void WriteTab( SvStream  rOutStm, sal_uInt16 nTab );
@@ -67,14 +60,16 @@ public:
 static void WriteStars( SvStream  );
 
 virtual boolReadSvIdl( SvIdlDataBase , SvTokenStream  rInStm );
-virtual voidWriteSvIdl( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab );
 
 virtual voidWrite( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
 WriteType, WriteAttribute = 0 );
+
+protected:
+virtual ~SvMetaObject() {}
 };
 typedef tools::SvRefSvMetaObject SvMetaObjectRef;
 
-class SvMetaObjectMemberList : public SvDeclPersistListSvMetaObject * {};
+class SvMetaObjectMemberList : public SvRefMemberListSvMetaObject * {};
 
 class SvMetaObjectMemberStack
 {
@@ -111,18 +106,14 @@ protected:
 void DoReadContextSvIdl( SvIdlDataBase , SvTokenStream  rInStm,
  char c = '\0' );
 virtual void ReadContextSvIdl( SvIdlDataBase , SvTokenStream  rInStm );
-virtual void WriteContextSvIdl( SvIdlDataBase  rBase,
-SvStream  rOutStm, sal_uInt16 nTab );
 virtual void ReadAttributesSvIdl( SvIdlDataBase  rBase,
   SvTokenStream  rInStm );
-virtual void WriteAttributesSvIdl( SvIdlDataBase  rBase,
-   SvStream  rOutStm, sal_uInt16 nTab );
 virtual void WriteAttributes( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
 WriteType, WriteAttribute = 0);
 virtual void WriteContext( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
 WriteType, WriteAttribute = 0);
 public:
-SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
+TYPEINFO_OVERRIDE();
 SvMetaName();
 
 virtual boolSetName( const OString rName, SvIdlDataBase * 
= NULL  );
@@ -136,14 +127,13 @@ public:
 
 virtual boolTest( SvIdlDataBase , SvTokenStream  rInStm );
 virtual boolReadSvIdl( SvIdlDataBase , SvTokenStream  rInStm ) 
SAL_OVERRIDE;
-virtual voidWriteSvIdl( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab ) SAL_OVERRIDE;
 virtual voidWrite( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
WriteType, WriteAttribute = 0) 
SAL_OVERRIDE;
 voidWriteDescription( SvStream rOutStm );
 };
 typedef tools::SvRefSvMetaName SvMetaNameRef;
 
-class SvMetaNameMemberList : public SvDeclPersistListSvMetaName *

[Libreoffice-commits] core.git: idl/inc idl/source

2014-10-16 Thread Stephan Bergmann

 idl/inc/basobj.hxx |   26 --
 idl/inc/bastype.hxx|   29 --
 idl/inc/module.hxx |5 
 idl/inc/object.hxx |7 
 idl/inc/slot.hxx   |3 
 idl/inc/types.hxx  |   34 --
 idl/source/objects/basobj.cxx  |  108 
 idl/source/objects/bastype.cxx |   38 ---
 idl/source/objects/module.cxx  |   38 ---
 idl/source/objects/object.cxx  |   18 -
 idl/source/objects/slot.cxx|   24 -
 idl/source/objects/types.cxx   |  506 -
 12 files changed, 836 deletions(-)

New commits:
commit 4aaa4ceee75de7a0fbb552039d39567ab10c6d4b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 16 09:16:44 2014 +0200

Remove more unused idl parts

Change-Id: Id78de487b36a1c939dc3a4a5b38ab0b77999478c

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 5c0ac11..e35cc45 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -36,18 +36,6 @@ typedef SvMetaObject * (*CreateMetaObjectType)();
 
 #define C_PREF  C_
 
-enum WriteType
-{
-WRITE_C_HEADER, WRITE_C_SOURCE
-};
-
-enum
-{
-WA_METHOD = 0x1,WA_VARIABLE = 0x2,  WA_ARGUMENT = 0x4,
-WA_STRUCT = 0x8,WA_READONLY = 0x10
-};
-typedef int WriteAttribute;
-
 class SvMetaObject : public SvRttiBase
 {
 public:
@@ -61,9 +49,6 @@ public:
 
 virtual boolReadSvIdl( SvIdlDataBase , SvTokenStream  rInStm );
 
-virtual voidWrite( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
-WriteType, WriteAttribute = 0 );
-
 protected:
 virtual ~SvMetaObject() {}
 };
@@ -108,10 +93,6 @@ protected:
 virtual void ReadContextSvIdl( SvIdlDataBase , SvTokenStream  rInStm );
 virtual void ReadAttributesSvIdl( SvIdlDataBase  rBase,
   SvTokenStream  rInStm );
-virtual void WriteAttributes( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
-WriteType, WriteAttribute = 0);
-virtual void WriteContext( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
-WriteType, WriteAttribute = 0);
 public:
 TYPEINFO_OVERRIDE();
 SvMetaName();
@@ -127,9 +108,6 @@ public:
 
 virtual boolTest( SvIdlDataBase , SvTokenStream  rInStm );
 virtual boolReadSvIdl( SvIdlDataBase , SvTokenStream  rInStm ) 
SAL_OVERRIDE;
-virtual voidWrite( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
-   WriteType, WriteAttribute = 0) 
SAL_OVERRIDE;
-voidWriteDescription( SvStream rOutStm );
 };
 typedef tools::SvRefSvMetaName SvMetaNameRef;
 
@@ -204,12 +182,8 @@ public:
 voidSetModule( SvIdlDataBase  rBase );
 virtual boolReadSvIdl( SvIdlDataBase , SvTokenStream  rInStm ) 
SAL_OVERRIDE;
 
-virtual voidWrite( SvIdlDataBase  rBase, SvStream  rOutStm, 
sal_uInt16 nTab,
-  WriteType, WriteAttribute = 0) SAL_OVERRIDE;
 protected:
 virtual voidReadAttributesSvIdl( SvIdlDataBase , SvTokenStream  
rInStm ) SAL_OVERRIDE;
-virtual voidWriteAttributes( SvIdlDataBase  rBase, SvStream  
rOutStm, sal_uInt16 nTab,
-  WriteType, WriteAttribute = 0) 
SAL_OVERRIDE;
 };
 typedef tools::SvRefSvMetaExtern SvMetaExternRef;
 
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 1d86284..e8da2c4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -29,26 +29,6 @@ class SvStringHashEntry;
 class SvIdlDataBase;
 class SvTokenStream;
 
-class SvUINT32
-{
-sal_uInt32  nVal;
-public:
-SvUINT32() { nVal = 0; }
-SvUINT32( sal_uInt32 n ) : nVal( n ) {}
-SvUINT32   operator = ( sal_uInt32 n ) { nVal = n; return *this; }
-
-operatorsal_uInt32 () { return nVal; }
-
-static sal_uInt32  Read( SvStream  rStm );
-static voidWrite( SvStream  rStm, sal_uInt32 nVal );
-
-friend SvStream WriteSvUINT32(SvStream  rStm, const SvUINT32  r )
-{ SvUINT32::Write( rStm, r.nVal ); return rStm; }
-friend SvStream operator  (SvStream  rStm, SvUINT32  r )
-{ r.nVal = SvUINT32::Read( rStm ); return rStm; }
-};
-
-
 class Svint
 {
 int nVal;
@@ -61,11 +41,6 @@ public:
 
 operatorint ()const { return nVal; }
 boolIsSet() const { return bSet; }
-
-friend SvStream WriteSvint(SvStream  rStm, const Svint  r )
-{ SvUINT32::Write( rStm, (sal_uInt32)r.nVal ); 
rStm.WriteUInt8( r.bSet ); return rStm; }
-friend SvStream operator  (SvStream  rStm, Svint  r )
-{ r.nVal = (int)SvUINT32::Read( rStm ); rStm.ReadCharAsBool( 
r.bSet ); return rStm; }
 };
 
 
@@ -110,8 +85,6 @@ public:
 {
 return m_aStr;
 }
-friend SvStream WriteSvIdentifier(SvStream , const SvIdentifier );
-

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sd/source sfx2/source svx/source

2014-09-21 Thread Noel Grandin

 idl/inc/slot.hxx |4 +---
 idl/source/objects/object.cxx|2 +-
 idl/source/objects/slot.cxx  |   23 ---
 include/sfx2/msg.hxx |   12 
 sd/source/ui/dlg/PaneShells.cxx  |4 ++--
 sfx2/source/control/shell.cxx|1 -
 sfx2/source/sidebar/Deck.cxx |5 ++---
 svx/source/toolbars/extrusionbar.cxx |2 +-
 svx/source/toolbars/fontworkbar.cxx  |2 +-
 9 files changed, 16 insertions(+), 39 deletions(-)

New commits:
commit 3ddae219e4be882704ffd917e80c1d8b22c5d48b
Author: Noel Grandin n...@peralex.com
Date:   Sun Sep 21 15:46:10 2014 +0200

remove unused fields pName and pMethodName in SfxSlot class

Change-Id: Icca5a0dee296fae1abeb78ea8ffa2f9e934bb111

diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 220c478..65ede6d 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -72,8 +72,7 @@ class SvMetaSlot : public SvMetaAttribute
 sal_uInt16 nCount, const OString rSlotId,
 SvSlotElementList rList,
 size_t nStart,
-const OString rPrefix,
-   SvIdlDataBase  rBase, SvStream  rOutStm );
+SvIdlDataBase  rBase, SvStream  rOutStm );
 virtual voidWrite( SvIdlDataBase  rBase,
 SvStream  rOutStm, sal_uInt16 nTab,
  WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
@@ -244,7 +243,6 @@ public:
 sal_uInt16 nCount,
 SvSlotElementList,
 size_t nStart,
-const OString,
 SvIdlDataBase  rBase,
 SvStream  rOutStm );
 sal_uInt16  WriteSlotParamArray( SvIdlDataBase  rBase,
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index fa3224f..6609031 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -452,7 +452,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const OString 
rShellName,
 SvSlotElement * pEle = rSlotList[ i ];
 SvMetaSlot * pAttr = pEle-xSlot;
 nSCount = nSCount + pAttr-WriteSlotMap( rShellName, nCount + nSCount,
-rSlotList, i, pEle-aPrefix, rBase,
+rSlotList, i, rBase,
 rOutStm );
 }
 
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 6b844011..755bd9a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1145,7 +1145,6 @@ void SvMetaSlot::WriteSlot( const OString rShellName, 
sal_uInt16 nCount,
 const OString rSlotId,
 SvSlotElementList rSlotList,
 size_t nStart,
-const OString rPrefix,
 SvIdlDataBase  rBase, SvStream  rOutStm )
 {
 if ( !GetExport()  !GetHidden() )
@@ -1379,25 +1378,12 @@ void SvMetaSlot::WriteSlot( const OString rShellName, 
sal_uInt16 nCount,
 sal_uLong nSCount = pType-GetAttrCount();
 rOutStm
.WriteCharPtr( OString::number(nSCount).getStr() )
-   .WriteCharPtr( /*Count*/ );
+   .WriteCharPtr( /*Count*/, );
 }
 else
-rOutStm.WriteChar( '0' );
+rOutStm.WriteCharPtr( 0, );
 
-// name for recording
-if ( GetExport() )
-{
-rOutStm.WriteCharPtr( ,\ );
-if (!rPrefix.isEmpty())
-rOutStm.WriteCharPtr( rPrefix.getStr() );
-rOutStm.WriteChar( '.' );
-if ( !IsVariable() || !GetType() ||
- GetType()-GetBaseType()-GetType() != TYPE_STRUCT )
-rOutStm.WriteCharPtr( GetMangleName( false ).getStr() );
-rOutStm.WriteCharPtr( \, );
-}
-else
-rOutStm.WriteCharPtr( , 0,  );
+rOutStm.WriteCharPtr(   );
 
 // Method/Property flags
 if( IsMethod() )
@@ -1463,7 +1449,6 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase 
 rBase, SvStream  rO
 sal_uInt16 SvMetaSlot::WriteSlotMap( const OString rShellName, sal_uInt16 
nCount,
 SvSlotElementList rSlotList,
 size_t nStart,
-const OString rPrefix,
 SvIdlDataBase  rBase,
 SvStream  rOutStm )
 {
@@ -1483,7 +1468,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const OString 
rShellName, sal_uInt16 nCoun
 nSCount = (sal_uInt16)pType-GetAttrCount();
 }
 
-WriteSlot( rShellName, nCount, slotId, rSlotList, nStart, rPrefix, rBase, 
rOutStm );
+WriteSlot(

[Libreoffice-commits] core.git: idl/inc idl/source

2013-03-25 Thread Krisztian Pinter

 idl/inc/command.hxx   |   25 +
 idl/source/objects/module.cxx |   28 ++---
 idl/source/prj/command.cxx|6 -
 idl/source/prj/database.cxx   |   30 +++---
 idl/source/prj/svidl.cxx  |  207 +++---
 5 files changed, 137 insertions(+), 159 deletions(-)

New commits:
commit eec2eb05a22966de319ecf370b0c880d7b83a79a
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Fri Mar 22 21:08:31 2013 +0100

fdo#39445 writing out tools/fsys.hxx (idl)

Removed uses of fsys from database.cxx, command.cxx, module.cxx, svidl.cxx.
Also removed a lot of cruft from svidl.cxx and command.hxx; unused variables
and code relating to them, eg. variables aCxxFile, aHxxFile, aSrcFile, 
aODLFile.
Changed some Strings to OUStrings in svidl.cxx and command.hxx.

Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d
Reviewed-on: https://gerrit.libreoffice.org/2935
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 5ca38db..b77ab2f 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -30,25 +30,18 @@ typedef ::std::vector rtl::OString*  ByteStringList;
 class SvCommand
 {
 public:
-String  aDataBaseFile;
+OUStringaDataBaseFile;
 StringList  aInFileList;
-String  aListFile;
-String  aSlotMapFile;
-String  aSfxItemFile;
-String  aODLFile;
-String  aCallingFile;
-String  aCxxFile;
-String  aHxxFile;
-String  aSrcFile;
+OUStringaListFile;
+OUStringaSlotMapFile;
+OUStringaSfxItemFile;
 String  aPath;
-String  aCHeaderFile;
-String  aCSourceFile;
 String  aTargetFile;
-String  aHelpIdFile;
-String  aCSVFile;
-String  aExportFile;
-String  aDocuFile;
-::rtl::OUString m_DepFile;
+OUStringaHelpIdFile;
+OUStringaCSVFile;
+OUStringaExportFile;
+OUStringaDocuFile;
+OUStringm_DepFile;
 sal_uInt32  nVerbosity;
 sal_uInt32  nFlags;
 
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 4b97510..e83c23b 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -24,8 +24,8 @@
 #include module.hxx
 #include globals.hxx
 #include database.hxx
-#include tools/fsys.hxx
 #include tools/debug.hxx
+#include osl/file.hxx
 
 SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
 
@@ -222,12 +222,16 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase  
rBase,
 SvToken * pTok = rInStm.GetToken_Next();
 if( pTok-IsString() )
 {
-DirEntry aFullName( rtl::OStringToOUString(pTok-GetString(), 
RTL_TEXTENCODING_ASCII_US) );
-rBase.StartNewFile( aFullName.GetFull() );
-if( aFullName.Find( rBase.GetPath() ) )
+OUString aFullName(rtl::OStringToOUString(pTok-GetString(), 
RTL_TEXTENCODING_ASCII_US));
+rBase.StartNewFile( aFullName );
+osl::FileBase::RC searchError = 
osl::File::searchFileURL(aFullName, rBase.GetPath(), aFullName);
+osl::FileBase::getSystemPathFromFileURL( aFullName, aFullName );
+
+if( osl::FileBase::E_None == searchError )
 {
-rBase.AddDepFile(aFullName.GetFull());
-SvTokenStream aTokStm( aFullName.GetFull() );
+rBase.AddDepFile( aFullName );
+SvTokenStream aTokStm( aFullName );
+
 if( SVSTREAM_OK == aTokStm.GetStream().GetError() )
 {
 // rescue error from old file
@@ -252,19 +256,15 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase  
rBase,
 }
 else
 {
-rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
-cannot open file: ));
-aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
-RTL_TEXTENCODING_UTF8));
+rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(cannot 
open file: ));
+aStr.append(rtl::OUStringToOString(aFullName, 
RTL_TEXTENCODING_UTF8));
 rBase.SetError(aStr.makeStringAndClear(), pTok);
 }
 }
 else
 {
-rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
-cannot find file:));
-aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
-RTL_TEXTENCODING_UTF8));
+rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(cannot 
find file:));
+aStr.append(rtl::OUStringToOString(aFullName, 
RTL_TEXTENCODING_UTF8));
 rBase.SetError(aStr.makeStringAndClear(), pTok);
 }
 }
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source include/rtl include/tools l10ntools/source sal/qa tools/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 svx/sdi sw/sdi

[Libreoffice-commits] core.git: idl/inc idl/source include/editeng include/svx sdext/source sd/inc sd/source svx/source vcl/opengl xmloff/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sd/sdi svx/sdi

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source include/tools solenv/gbuild tools/source

[Libreoffice-commits] core.git: idl/inc idl/source

[Libreoffice-commits] core.git: idl/inc idl/source include/sfx2 sd/source sfx2/source svx/source

[Libreoffice-commits] core.git: idl/inc idl/source

25 matches

Site Navigation

Mail list logo

Footer information