diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 12:31:43 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 12:31:43 +0000 |
| commit | c5390d6e4af3eabf8b825a231ab1ae152bd7db1c (patch) | |
| tree | c378d724cd2e19ad61f60d5d8517bd22cc4d2960 /oox/source | |
| parent | 862ec90cd19d2a078f76bb2858accb30b700b7d8 (diff) | |
CWS-TOOLING: integrate CWS calc32stopper1
2009-09-15 15:43:23 +0200 dr r276180 : newpic
2009-09-15 15:41:13 +0200 dr r276179 : newpic
2009-09-15 14:58:14 +0200 dr r276178 : #i104905# fixed note handling while importing from external data
2009-09-15 13:47:43 +0200 dr r276173 : #i104905# fixed note handling while importing from database
2009-09-15 11:56:00 +0200 dr r276164 : #i104155# prevent crash loading docx
2009-09-15 10:40:43 +0200 dr r276154 : #i104990#
2009-09-15 10:27:31 +0200 dr r276152 : #i104990# enable saving BIFF8 with password/encryption
2009-09-15 10:26:40 +0200 dr r276151 : #i104990# enable saving BIFF8 with password/encryption
2009-09-14 19:13:11 +0200 dr r276145 : #i105007# missing cleanup for deleted headers
2009-09-14 19:06:57 +0200 dr r276144 : #i105007# missing cleanup for deleted headers
2009-09-14 18:53:39 +0200 dr r276143 : #i104915# prevent crashes and misbehaviour when dealing with note cells: enter matrix, enter mult.op
2009-09-14 13:57:00 +0200 dr r276109 : #160184# make drilldown working in exported pivottables, ported to DEV300
2009-09-11 15:16:08 +0200 nn r276068 : #i104987# MoveBlock: pass bCut parameter
2009-09-11 15:15:22 +0200 nn r276067 : #i104986# CopyToClip: correct order of parameters
2009-09-11 09:45:59 +0200 dr r276053 : correct milestone
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/core/filterbase.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index d289255bac98..c5b423380e82 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -89,7 +89,7 @@ public: explicit DocumentOpenedGuard( const OUString& rUrl ); ~DocumentOpenedGuard(); - inline bool isValid() const { return maUrl.getLength() > 0; } + inline bool isValid() const { return mbValid; } private: DocumentOpenedGuard( const DocumentOpenedGuard& ); @@ -100,15 +100,15 @@ private: UrlSet& mrUrls; OUString maUrl; + bool mbValid; }; DocumentOpenedGuard::DocumentOpenedGuard( const OUString& rUrl ) : mrUrls( UrlPool::get() ) { ::osl::MutexGuard aGuard( *this ); - OSL_ENSURE( (rUrl.getLength() == 0) || (mrUrls.count( rUrl ) == 0), - "DocumentOpenedGuard::DocumentOpenedGuard - filter called recursively for this document" ); - if( (rUrl.getLength() > 0) && (mrUrls.count( rUrl ) == 0) ) + mbValid = (rUrl.getLength() == 0) || (mrUrls.count( rUrl ) == 0); + if( mbValid && (rUrl.getLength() > 0) ) { mrUrls.insert( rUrl ); maUrl = rUrl; @@ -118,7 +118,7 @@ DocumentOpenedGuard::DocumentOpenedGuard( const OUString& rUrl ) : DocumentOpenedGuard::~DocumentOpenedGuard() { ::osl::MutexGuard aGuard( *this ); - if( isValid() ) + if( maUrl.getLength() > 0 ) mrUrls.erase( maUrl ); } |