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 | 3b40fd41e4a26a01fcee082bcb8143ea9456d4fd (patch) | |
tree | e1e83e4496d8cbfc9bf59dc46f9ac31ed00726ba /sc/source/ui/docshell/arealink.cxx | |
parent | b1ed9193bc94e84d0880b54df3df6442599f44ec (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 'sc/source/ui/docshell/arealink.cxx')
-rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index a9e5f7ce8218..fd3a562ecb42 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -355,12 +355,12 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, } else pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle - pDoc->CopyToDocument( aOldRange, IDF_ALL, FALSE, pUndoDoc ); + pDoc->CopyToDocument( aOldRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc ); } else // ohne Einfuegen { pUndoDoc->InitUndo( pDoc, nDestTab, nDestTab ); // nur Zieltabelle - pDoc->CopyToDocument( aMaxRange, IDF_ALL, FALSE, pUndoDoc ); + pDoc->CopyToDocument( aMaxRange, IDF_ALL & ~IDF_NOTE, FALSE, pUndoDoc ); } } @@ -370,7 +370,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, if (bDoInsert) pDoc->FitBlock( aOldRange, aNewRange ); // incl. loeschen else - pDoc->DeleteAreaTab( aMaxRange, IDF_ALL ); + pDoc->DeleteAreaTab( aMaxRange, IDF_ALL & ~IDF_NOTE ); // Daten kopieren @@ -426,7 +426,7 @@ BOOL ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, { pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); pRedoDoc->InitUndo( pDoc, nDestTab, nDestTab ); - pDoc->CopyToDocument( aNewRange, IDF_ALL, FALSE, pRedoDoc ); + pDoc->CopyToDocument( aNewRange, IDF_ALL & ~IDF_NOTE, FALSE, pRedoDoc ); pImpl->m_pDocSh->GetUndoManager()->AddUndoAction( new ScUndoUpdateAreaLink( pImpl->m_pDocSh, |