[ooo-build-commit] Branch 'ooo/master' - 2 commits - starmath/source sw/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Oct 9 13:09:59 PDT 2009
starmath/source/cfgitem.cxx | 13 -------------
starmath/source/cfgitem.hxx | 2 --
sw/source/core/doc/dbgoutsw.cxx | 4 ++--
sw/source/core/doc/docdde.cxx | 31 ++++++++++++++++++++-----------
sw/source/core/txtnode/fmtatr2.cxx | 5 +++--
sw/source/core/unocore/unocoll.cxx | 4 ++++
6 files changed, 29 insertions(+), 30 deletions(-)
New commits:
commit 0c81e79b10cfa6a27ae111501a9b0577bccd4374
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Thu Oct 1 10:29:37 2009 +0000
CWS-TOOLING: integrate CWS sw32bf04
2009-09-22 Michael Stahl galobj.hxx: do not export SgaObject methods (fixes wntmsci12 build)
2009-09-21 Michael Stahl #i105149# #i93308# svx: unofield.cxx: support field services with proper case
2009-09-21 Michael Stahl #i105149# #i102468# sc: servuno.cxx: support field services with proper case
2009-09-21 Michael Stahl #i105149# txtflde.cxx: support docinfo field services with proper case
2009-09-18 Michael Stahl #i105148# fmtatr2.cxx: SwFmtMeta::Clone(): avoid assert on clone pool default
2009-09-18 Michael Stahl #i105148# fmtatr2.cxx: SwFmtMeta::~SwFmtMeta(): check if m_pMeta != 0
2009-09-18 Michael Stahl #i105179# unocoll.cxx: SwXFrames::getByName(): add missing breaks
2009-09-18 Michael Stahl dbgoutsw.cxx: explicitly convert from SwNodeIndex to SwPosition
2009-09-18 Michael Stahl galobj.hxx: export class SgaObject from svxcore, needed by unogalitem.cxx
2009-09-17 Michael Stahl #i105149# txtflde.cxx: compare text field prefix case-insensitively
2009-09-16 Michael Stahl #i105117# docdde.cxx: fix possible NULL dereference (patch by cmc)
2009-09-16 Michael Stahl #i105124# docdde.cxx: fix use-after-free bug: make _FindItem member String
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 507b0ad..fc9effe 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -1084,9 +1084,9 @@ String lcl_dbg_out(const SwNodeRange & rRange)
{
String aStr("[", RTL_TEXTENCODING_ASCII_US);
- aStr += lcl_dbg_out(rRange.aStart);
+ aStr += lcl_dbg_out(SwPosition(rRange.aStart));
aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
- aStr += lcl_dbg_out(rRange.aEnd);
+ aStr += lcl_dbg_out(SwPosition(rRange.aEnd));
aStr += String("]" , RTL_TEXTENCODING_ASCII_US);
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 2454a26..a6c6d2a 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -70,11 +70,16 @@ namespace
ppMark != rMarkAccess.getMarksEnd();
ppMark++)
{
- ::sw::mark::DdeBookmark* const pBkmk = dynamic_cast< ::sw::mark::DdeBookmark*>(ppMark->get());
- if(pBkmk &&
- (bCaseSensitive && (pBkmk->GetName() == sNameLc)) ||
- (!bCaseSensitive && GetAppCharClass().lower(pBkmk->GetName()) == String( sNameLc )))
- return pBkmk;
+ if (::sw::mark::DdeBookmark* const pBkmk = dynamic_cast< ::sw::mark::DdeBookmark*>(ppMark->get()))
+ {
+ if (
+ (bCaseSensitive && (pBkmk->GetName() == sNameLc)) ||
+ (!bCaseSensitive && GetAppCharClass().lower(pBkmk->GetName()) == String(sNameLc))
+ )
+ {
+ return pBkmk;
+ }
+ }
}
return NULL;
}
@@ -82,22 +87,25 @@ namespace
struct _FindItem
{
- const String& rItem;
+ const String m_Item;
SwTableNode* pTblNd;
SwSectionNode* pSectNd;
_FindItem(const String& rS)
- : rItem(rS), pTblNd(0), pSectNd(0)
+ : m_Item(rS), pTblNd(0), pSectNd(0)
{}
};
BOOL lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bCaseSensitive )
{
+ _FindItem * const pItem( static_cast<_FindItem*>(pArgs) );
SwSection* pSect = rpSectFmt->GetSection();
if( pSect )
{
String sNm( bCaseSensitive ? pSect->GetName() : GetAppCharClass().lower( pSect->GetName() ));
- String sCompare( bCaseSensitive ? ((_FindItem*)pArgs)->rItem : GetAppCharClass().lower( ((_FindItem*)pArgs)->rItem ));
+ String sCompare( (bCaseSensitive)
+ ? pItem->m_Item
+ : GetAppCharClass().lower( pItem->m_Item ) );
if( sNm == sCompare )
{
// gefunden, als erfrage die Daten
@@ -106,7 +114,7 @@ BOOL lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bCaseS
&rpSectFmt->GetDoc()->GetNodes() == &pIdx->GetNodes() )
{
// eine Tabelle im normalen NodesArr
- ((_FindItem*)pArgs)->pSectNd = pIdx->GetNode().GetSectionNode();
+ pItem->pSectNd = pIdx->GetNode().GetSectionNode();
return FALSE;
}
//nein!! // sollte der Namen schon passen, der Rest aber nicht, dann haben wir
@@ -128,8 +136,9 @@ BOOL lcl_FindSectionCaseInsensitive( const SwSectionFmtPtr& rpSectFmt, void* pAr
BOOL lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
{
+ _FindItem * const pItem( static_cast<_FindItem*>(pArgs) );
String sNm( GetAppCharClass().lower( rpTableFmt->GetName() ));
- if( sNm.Equals( ((_FindItem*)pArgs)->rItem ))
+ if (sNm.Equals( pItem->m_Item ))
{
SwTable* pTmpTbl;
SwTableBox* pFBox;
@@ -139,7 +148,7 @@ BOOL lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
&rpTableFmt->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
{
// eine Tabelle im normalen NodesArr
- ((_FindItem*)pArgs)->pTblNd = (SwTableNode*)
+ pItem->pTblNd = (SwTableNode*)
pFBox->GetSttNd()->FindTableNode();
return FALSE;
}
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index ce346a8..3d0a043 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -615,7 +615,7 @@ SwFmtMeta::SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
SwFmtMeta::~SwFmtMeta()
{
- if (m_pMeta->GetFmtMeta() == this)
+ if (m_pMeta && (m_pMeta->GetFmtMeta() == this))
{
m_pMeta->SetFmtMeta(0);
}
@@ -631,7 +631,8 @@ int SwFmtMeta::operator==( const SfxPoolItem & i_rOther ) const
SfxPoolItem * SwFmtMeta::Clone( SfxItemPool * /*pPool*/ ) const
{
// if this is indeed a copy, then DoCopy must be called later!
- return new SwFmtMeta( m_pMeta, Which() );
+ return (m_pMeta) // #i105148# pool default may be cloned also!
+ ? new SwFmtMeta( m_pMeta, Which() ) : new SwFmtMeta( Which() );
}
void SwFmtMeta::SetTxtAttr(SwTxtMeta * const i_pTxtAttr)
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index e4f7138..06bbca4 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1027,6 +1027,7 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
throw IndexOutOfBoundsException();
return lcl_UnoWrapFrame(pFmt, eType);
}
+
uno::Any SwXFrames::getByName(const OUString& rName)
throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException )
{
@@ -1038,10 +1039,13 @@ uno::Any SwXFrames::getByName(const OUString& rName)
{
case FLYCNTTYPE_GRF:
pFmt = GetDoc()->FindFlyByName(rName, ND_GRFNODE);
+ break;
case FLYCNTTYPE_OLE:
pFmt = GetDoc()->FindFlyByName(rName, ND_OLENODE);
+ break;
default:
pFmt = GetDoc()->FindFlyByName(rName, ND_TEXTNODE);
+ break;
}
if(!pFmt)
throw NoSuchElementException();
commit f207f7739573b94aff29697773c127747335af25
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Thu Oct 1 09:16:17 2009 +0000
CWS-TOOLING: integrate CWS cmcfixes62
2009-09-22 21:19:24 +0200 cmc r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
2009-09-19 16:10:36 +0200 cmc r276303 : #i100000# revert this for no partically good reason
2009-09-18 14:16:47 +0200 cmc r276279 : remove extra build depend
2009-09-18 08:56:15 +0200 cmc r276265 : #i100000# rerun autoconf
2009-09-17 14:59:38 +0200 cmc r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk at 276192 (milestone: DEV300:m59)
2009-09-10 16:40:49 +0200 pl r276041 : fix warning
2009-09-10 11:34:55 +0200 pl r276026 : disable warning from system header
2009-09-09 19:30:45 +0200 pl r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
2009-09-09 19:25:32 +0200 pl r276012 : add some casting hacks to make compile on solaris cc
2009-09-09 19:10:48 +0200 pl r276009 : add missing Configure option for solaris sparce 32bit
2009-09-09 18:37:05 +0200 pl r276008 : merge fix for #i104525# into moved code
2009-09-07 13:28:08 +0200 cmc r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk at 275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk at 275331 (milestone: DEV300:m56)
2009-08-26 12:56:18 +0200 cmc r275413 : #i104088# use the right headers in the right place
2009-08-25 17:07:50 +0200 cmc r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
2009-08-25 13:08:48 +0200 cmc r275347 : #i89237# pretty picswitch up
2009-08-25 10:58:09 +0200 cmc r275342 : #i104489# remove last unused code in starmath
2009-08-25 10:23:33 +0200 cmc r275338 : #i104088# clean up the define post-move
2009-08-24 13:46:57 +0200 cmc r275310 : #i104088# 64bit odbc api changes
2009-08-24 13:42:52 +0200 cmc r275309 : #i89237# unify linux platform mks under a generic parent
2009-08-24 13:19:52 +0200 cmc r275307 : #i104455# remove unused code
2009-08-24 13:10:56 +0200 cmc r275306 : #i104088# 64bit odbc api changes
2009-08-24 10:07:50 +0200 cmc r275293 : #i104306# move recent-used to vcl
2009-08-24 09:32:08 +0200 cmc r275291 : #i104306# move recent-used to vcl
2009-08-23 22:01:07 +0200 cmc r275286 : #i104306# move recently-used to vcl
2009-08-22 15:25:25 +0200 cmc r275285 : #i104088# 64bit odbc api changes
2009-08-21 17:52:40 +0200 cmc r275268 : #i104306# move recently-used to vcl
2009-08-21 14:38:26 +0200 cmc r275257 : #i104408 make these headers ready for c++0x
2009-08-21 14:20:19 +0200 cmc r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
2009-08-21 14:14:25 +0200 cmc r275250 : #i104385# silence 64bit warnings
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 7df803a..9d34209 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -580,19 +580,6 @@ void SmMathConfig::Save()
SaveFontFormatList();
}
-
-USHORT SmMathConfig::GetSymbolCount() const
-{
- return ((SmMathConfig *) this)->GetSymSetManager().GetSymbolCount();
-}
-
-
-const SmSym * SmMathConfig::GetSymbol( USHORT nIndex ) const
-{
- return ((SmMathConfig *) this)->GetSymSetManager().GetSymbolByPos( nIndex );
-}
-
-
void SmMathConfig::GetSymbols( std::vector< SmSym > &rSymbols ) const
{
Sequence< OUString > aNodes( ((SmMathConfig*) this)->GetNodeNames( A2OU( SYMBOL_LIST ) ) );
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 2578e91..7b5029f 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -188,8 +188,6 @@ public:
SmSymSetManager & GetSymSetManager();
void GetSymbols( std::vector< SmSym > &rSymbols ) const;
void SetSymbols( const std::vector< SmSym > &rNewSymbols );
- USHORT GetSymbolCount() const;
- const SmSym * GetSymbol( USHORT nIndex ) const;
const SmFormat & GetStandardFormat() const;
void SetStandardFormat( const SmFormat &rFormat, BOOL bSaveFontFormatList = FALSE );
More information about the ooo-build-commit
mailing list