summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/drawvie4.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
commit912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch)
tree9786710241c767f0f6917200c9318978b0d787dd /sc/source/ui/view/drawvie4.cxx
parentbc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:03 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 3152922a95e18814e32bcf8bc29c872077d05a65 Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Wed May 4 09:06:08 2011 -0400 lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/core/tool/interpr1.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3 Author: Kohei Yoshida <kyoshida@novell.com> Date: Mon Mar 21 16:01:47 2011 -0400 Fix seg faults on sheet deletion. Sometimes a simple sheet removal causes segfault in certain types of documents. Not always reproducible, but this fix is certainly safer. (n#680272) Signed-off-by: Noel Power <nopower@novell.com> sc/source/ui/docshell/docfunc.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54c3699db11dc1bcc7bd7fa069c9c4124715839 Author: Tibby Lickle <tibbylickle@googlemail.com> Date: Thu Mar 10 19:08:18 2011 +0000 Disabled auto-complete in Calc filter dialog - fix for bug 34898. A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/ui/dbgui/filtdlg.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Notes
Notes: split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'sc/source/ui/view/drawvie4.cxx')
-rw-r--r--sc/source/ui/view/drawvie4.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 128ca94be950..8a848fbc341c 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,7 @@
#include "document.hxx"
#include "docsh.hxx"
#include "drwtrans.hxx"
-#include "transobj.hxx" // SetDrawClipDoc
+#include "transobj.hxx" // SetDrawClipDoc
#include "drawutil.hxx"
#include "scmod.hxx"
#include "globstr.hrc"
@@ -64,7 +64,7 @@ Point aDragStartDiff;
// -----------------------------------------------------------------------
-//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein?
+//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein?
#ifdef _MSC_VER
#pragma optimize ( "", off )
@@ -125,17 +125,17 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
ScDocShellRef aDragShellRef;
if (bAnyOle)
{
- aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
+ aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately
aDragShellRef->DoInitNew(NULL);
}
ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
SdrModel* pModel = GetAllMarkedModel();
ScDrawLayer::SetGlobalDrawPersist(NULL);
- // Charts now always copy their data in addition to the source reference, so
- // there's no need to call SchDLL::Update for the charts in the clipboard doc.
- // Update with the data (including NumberFormatter) from the live document would
- // also store the NumberFormatter in the clipboard chart (#88749#)
+ // Charts now always copy their data in addition to the source reference, so
+ // there's no need to call SchDLL::Update for the charts in the clipboard doc.
+ // Update with the data (including NumberFormatter) from the live document would
+ // also store the NumberFormatter in the clipboard chart (#88749#)
// lcl_RefreshChartData( pModel, pViewData->GetDocument() );
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -149,9 +149,9 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
pTransferObj->SetDrawPersist( &aDragShellRef ); // keep persist for ole objects alive
- pTransferObj->SetDragSource( this ); // copies selection
+ pTransferObj->SetDragSource( this ); // copies selection
- SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D
+ SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D
pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK );
}
@@ -169,10 +169,10 @@ void ScDrawView::DoCopy()
SdrModel* pModel = GetAllMarkedModel();
ScDrawLayer::SetGlobalDrawPersist(NULL);
- // Charts now always copy their data in addition to the source reference, so
- // there's no need to call SchDLL::Update for the charts in the clipboard doc.
- // Update with the data (including NumberFormatter) from the live document would
- // also store the NumberFormatter in the clipboard chart (#88749#)
+ // Charts now always copy their data in addition to the source reference, so
+ // there's no need to call SchDLL::Update for the charts in the clipboard doc.
+ // Update with the data (including NumberFormatter) from the live document would
+ // also store the NumberFormatter in the clipboard chart (#88749#)
// lcl_RefreshChartData( pModel, pViewData->GetDocument() );
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -190,8 +190,8 @@ void ScDrawView::DoCopy()
pTransferObj->SetDrawPersist( &(*ScGlobal::pDrawClipDocShellRef) ); // keep persist for ole objects alive
}
- pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard
- SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard
+ pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard
+ SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard
}
uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
@@ -205,10 +205,10 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
SdrModel* pModel = GetAllMarkedModel();
ScDrawLayer::SetGlobalDrawPersist(NULL);
- // Charts now always copy their data in addition to the source reference, so
- // there's no need to call SchDLL::Update for the charts in the clipboard doc.
- // Update with the data (including NumberFormatter) from the live document would
- // also store the NumberFormatter in the clipboard chart (#88749#)
+ // Charts now always copy their data in addition to the source reference, so
+ // there's no need to call SchDLL::Update for the charts in the clipboard doc.
+ // Update with the data (including NumberFormatter) from the live document would
+ // also store the NumberFormatter in the clipboard chart (#88749#)
// lcl_RefreshChartData( pModel, pViewData->GetDocument() );
ScDocShell* pDocSh = pViewData->GetDocShell();
@@ -229,7 +229,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
return xTransferable;
}
-// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen
+// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen
void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const
{
@@ -306,7 +306,7 @@ void ScDrawView::SetMarkedOriginalSize()
MapMode aDestMap( MAP_100TH_MM );
if (aSourceMap.GetMapUnit() == MAP_PIXEL)
{
- // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
+ // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt
Fraction aNormScaleX, aNormScaleY;
CalcNormScale( aNormScaleX, aNormScaleY );