summaryrefslogtreecommitdiff
path: root/sc/source/ui/view/tabvwsh3.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/source/ui/view/tabvwsh3.cxx
parent69bb367315288b644439dc46d34743a2575a3527 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 737b6a92adca9a8285370918671b93b56a028537 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:21 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e Author: Jani Monoses <jani.monoses@canonical.com> Date: Thu Jan 27 15:33:06 2011 +0200 Remove unused declaration Signed-off-by: Michael Meeks <michael.meeks@novell.com> sc/source/core/tool/token.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 96bee1507119ca0525845022019d90f0694996aa Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 20 23:44:52 2011 -0500 Fixed incorrect page number in page preview mode. (fdo#33155) When the window is large enough to show several 'Page X' strings, the page number was not properly incremented. This commit fixes it. sc/source/ui/view/gridwin4.cxx | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83 Author: Kohei Yoshida <kyoshida@novell.com> Date: Wed Jan 19 00:24:24 2011 -0500 Fixed incorrect import of cell attributes from Excel documents. When a cell with non-default formatting attribute starts with non-first row in a column, the filter would incorrectly apply the same format to all the cells above it if they didn't have any formats. This commit fixes it. sc/source/filter/excel/xistyle.cxx | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit af63319fcdeea3f9b5018eab83ef5a9e64905446 Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:18:07 2011 -0500 Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c. I created a patch between before and after the merge commit, and reverse-applied it. This is because if you revert a merge commit in git you are denying all future merges from that branch. I wasn't sure if we really wanted that. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/inc/document.hxx | 22 +------ sc/inc/drwlayer.hxx | 2 +- sc/inc/table.hxx | 16 +----- sc/source/core/data/document.cxx | 7 +-- sc/source/core/data/drwlayer.cxx | 6 +- sc/source/core/data/table1.cxx | 38 ++++-------- sc/source/core/data/table2.cxx | 91 ++++++------------------------ sc/source/core/data/table3.cxx | 71 +---------------------- sc/source/filter/xml/xmlrowi.cxx | 17 +---- sc/source/ui/docshell/externalrefmgr.cxx | 7 +- sc/source/ui/view/dbfunc.cxx | 5 +- sc/source/ui/view/tabvwshe.cxx | 4 +- 12 files changed, 52 insertions(+), 234 deletions(-) commit 5ada5635cff38af87830b091b36159cf80e4cf5d Author: Kohei Yoshida <kyoshida@novell.com> Date: Thu Jan 13 11:04:14 2011 -0500 Revert "This is also part of the merge." This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c. Signed-off-by: Petr Mladek <pmladek@suse.cz> sc/source/core/data/table3.cxx | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit c900e3db767518b7a60eaf24bdf298c94315f685 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 15d298ba7c4e89b043b3077e17747ba027a62c43 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.1.1 split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'sc/source/ui/view/tabvwsh3.cxx')
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx164
1 files changed, 82 insertions, 82 deletions
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 7eb78c81d003..d12aa430fbfa 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.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
@@ -119,14 +119,14 @@ USHORT lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocumen
void ScTabViewShell::Execute( SfxRequest& rReq )
{
- SfxViewFrame* pThisFrame = GetViewFrame();
- SfxBindings& rBindings = pThisFrame->GetBindings();
- ScModule* pScMod = SC_MOD();
- const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ SfxViewFrame* pThisFrame = GetViewFrame();
+ SfxBindings& rBindings = pThisFrame->GetBindings();
+ ScModule* pScMod = SC_MOD();
+ const SfxItemSet* pReqArgs = rReq.GetArgs();
+ USHORT nSlot = rReq.GetSlot();
- if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
- HideListBox(); // Autofilter-DropDown-Listbox
+ if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp
+ HideListBox(); // Autofilter-DropDown-Listbox
switch ( nSlot )
{
@@ -146,7 +146,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
else
aInsertPos = GetInsertPos();
- // als Link?
+ // als Link?
BOOL bAsLink = FALSE;
if ( pReqArgs->GetItemState(FN_PARAM_2,TRUE,&pItem) == SFX_ITEM_SET )
@@ -161,7 +161,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_OPENDLG_EDIT_PRINTAREA:
{
- USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId();
+ USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
@@ -170,7 +170,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_CHANGE_PRINTAREA:
{
- if ( pReqArgs ) // OK aus Dialog
+ if ( pReqArgs ) // OK aus Dialog
{
String aPrintStr;
String aRowStr;
@@ -194,7 +194,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case SID_ADD_PRINTAREA:
- case SID_DEFINE_PRINTAREA: // Menue oder Basic
+ case SID_DEFINE_PRINTAREA: // Menue oder Basic
{
BOOL bAdd = ( nSlot == SID_ADD_PRINTAREA );
if ( pReqArgs )
@@ -232,7 +232,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case FID_RESET_PRINTZOOM:
- SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten
+ SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten
rReq.Done();
break;
@@ -255,10 +255,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET )
aAddress = ((const SfxStringItem*)pItem)->GetValue();
- // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
- // isn't set (for recorded macros, because IsAPI is no longer available).
- // ScGridWindow::MouseButtonUp no longer executes the slot for a single
- // cell if there is a multi selection.
+ // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1
+ // isn't set (for recorded macros, because IsAPI is no longer available).
+ // ScGridWindow::MouseButtonUp no longer executes the slot for a single
+ // cell if there is a multi selection.
BOOL bUnmark = ( nSlot == SID_CURRENTCELL );
if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET )
bUnmark = ((const SfxBoolItem*)pItem)->GetValue();
@@ -269,7 +269,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( nSlot == SID_JUMPTOMARK )
{
- // #106586# URL has to be decoded for escaped characters (%20)
+ // #106586# URL has to be decoded for escaped characters (%20)
aAddress = INetURLObject::decode( aAddress, INET_HEX_ESCAPE,
INetURLObject::DECODE_WITH_CHARSET,
RTL_TEXTENCODING_UTF8 );
@@ -277,13 +277,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
BOOL bFound = FALSE;
ScViewData* pViewData = GetViewData();
- ScDocument* pDoc = pViewData->GetDocument();
- ScMarkData& rMark = pViewData->GetMarkData();
- ScRange aScRange;
- ScAddress aScAddress;
+ ScDocument* pDoc = pViewData->GetDocument();
+ ScMarkData& rMark = pViewData->GetMarkData();
+ ScRange aScRange;
+ ScAddress aScAddress;
USHORT nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot);
- SCTAB nTab = pViewData->GetTabNo();
- BOOL bMark = TRUE;
+ SCTAB nTab = pViewData->GetTabNo();
+ BOOL bMark = TRUE;
// Is this a range ?
if( nResult & SCA_VALID )
@@ -317,9 +317,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// Ist es benahmster Bereich (erst Namen dann DBBereiche) ?
else
{
- ScRangeUtil aRangeUtil;
+ ScRangeUtil aRangeUtil;
formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) ||
+ if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) ||
aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) )
{
nResult |= SCA_VALID;
@@ -334,13 +334,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
sal_Int32 nNumeric = aAddress.ToInt32();
if ( nNumeric > 0 && nNumeric <= MAXROW+1 )
{
- // 1-basierte Zeilennummer
+ // 1-basierte Zeilennummer
aScAddress.SetRow( (SCROW)(nNumeric - 1) );
aScAddress.SetCol( pViewData->GetCurX() );
aScAddress.SetTab( nTab );
aScRange = ScRange( aScAddress, aScAddress );
- bMark = FALSE;
+ bMark = FALSE;
nResult = SCA_VALID;
}
}
@@ -359,7 +359,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// markieren
if( bMark )
{
- if (rMark.IsMarked()) // ist derselbe Bereich schon markiert?
+ if (rMark.IsMarked()) // ist derselbe Bereich schon markiert?
{
ScRange aOldMark;
rMark.GetMarkArea( aOldMark );
@@ -372,11 +372,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
bNothing = FALSE;
if (!bNothing)
- MarkRange( aScRange, FALSE ); // Cursor kommt hinterher...
+ MarkRange( aScRange, FALSE ); // Cursor kommt hinterher...
}
else
{
- // remove old selection, unless bUnmark argument is FALSE (from navigator)
+ // remove old selection, unless bUnmark argument is FALSE (from navigator)
if( bUnmark )
{
MoveCursorAbs( nCol, nRow,
@@ -389,14 +389,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
// zusammengefasste Zellen beruecksichtigen:
pDoc->SkipOverlapped(nCol, nRow, nTab);
- // Navigator-Aufrufe sind nicht API!!!
+ // Navigator-Aufrufe sind nicht API!!!
if( bNothing )
{
if (rReq.IsAPI())
- rReq.Ignore(); // wenn Makro, dann gar nix
+ rReq.Ignore(); // wenn Makro, dann gar nix
else
- rReq.Done(); // sonst wenigstens aufzeichnen
+ rReq.Done(); // sonst wenigstens aufzeichnen
}
else
{
@@ -419,9 +419,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) );
}
- if (!bFound) // kein gueltiger Bereich
+ if (!bFound) // kein gueltiger Bereich
{
- // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's)
+ // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's)
SCTAB nNameTab;
if ( pDoc->GetTable( aAddress, nNameTab ) )
@@ -434,7 +434,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( !bFound && nSlot == SID_JUMPTOMARK )
{
- // Grafik-Objekte probieren (nur bei URL's)
+ // Grafik-Objekte probieren (nur bei URL's)
bFound = SelectObject( aAddress );
}
@@ -455,7 +455,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_CURRENTTAB:
if ( pReqArgs )
{
- // Tabelle fuer Basic ist 1-basiert
+ // Tabelle fuer Basic ist 1-basiert
SCTAB nTab = ((const SfxUInt16Item&)pReqArgs->Get(nSlot)).GetValue() - 1;
ScDocument* pDoc = GetViewData()->GetDocument();
if ( nTab < pDoc->GetTableCount() )
@@ -466,7 +466,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if( ! rReq.IsAPI() )
rReq.Done();
}
- //! sonst Fehler ?
+ //! sonst Fehler ?
}
break;
@@ -476,9 +476,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
String aStrDocName( ((const SfxStringItem&)pReqArgs->
Get(nSlot)).GetValue() );
- SfxViewFrame* pViewFrame = NULL;
- ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst();
- BOOL bFound = FALSE;
+ SfxViewFrame* pViewFrame = NULL;
+ ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst();
+ BOOL bFound = FALSE;
// zu aktivierenden ViewFrame suchen
@@ -507,16 +507,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE
{
- // print preview is now always in the same frame as the tab view
- // -> always switch this frame back to normal view
- // (ScPreviewShell ctor reads view data)
+ // print preview is now always in the same frame as the tab view
+ // -> always switch this frame back to normal view
+ // (ScPreviewShell ctor reads view data)
// #102785#; finish input
pScMod->InputEnterHandler();
pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_ASYNCHRON );
}
- // else Fehler (z.B. Ole)
+ // else Fehler (z.B. Ole)
}
break;
@@ -525,8 +525,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.Done();
break;
- // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten
- // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten:
+ // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten
+ // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten:
case SID_TABLE_ACTIVATE:
DBG_ERROR("old slot SID_TABLE_ACTIVATE");
@@ -635,7 +635,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_TOGGLEINPUTLINE:
{
- USHORT nId = ScInputWindowWrapper::GetChildWindowId();
+ USHORT nId = ScInputWindowWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
BOOL bSet = ( pWnd == NULL );
const SfxPoolItem* pItem;
@@ -653,9 +653,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_SCALE:
{
BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom();
- SvxZoomType eOldZoomType = GetZoomType();
- SvxZoomType eNewZoomType = eOldZoomType;
- const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt
+ SvxZoomType eOldZoomType = GetZoomType();
+ SvxZoomType eNewZoomType = eOldZoomType;
+ const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt
USHORT nOldZoom = (USHORT)(( rOldY.GetNumerator() * 100 )
/ rOldY.GetDenominator());
USHORT nZoom = nOldZoom;
@@ -667,15 +667,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
pReqArgs->Get(SID_ATTR_ZOOM);
eNewZoomType = rZoomItem.GetType();
- nZoom = rZoomItem.GetValue();
+ nZoom = rZoomItem.GetValue();
}
else
{
- SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
- SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
+ SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM );
+ SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM );
AbstractSvxZoomDialog* pDlg = NULL;
- ScMarkData& rMark = GetViewData()->GetMarkData();
- USHORT nBtnFlags = SVX_ZOOM_ENABLE_50
+ ScMarkData& rMark = GetViewData()->GetMarkData();
+ USHORT nBtnFlags = SVX_ZOOM_ENABLE_50
| SVX_ZOOM_ENABLE_75
| SVX_ZOOM_ENABLE_100
| SVX_ZOOM_ENABLE_150
@@ -700,12 +700,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
if ( !bCancel )
{
- const SvxZoomItem& rZoomItem = (const SvxZoomItem&)
+ const SvxZoomItem& rZoomItem = (const SvxZoomItem&)
pDlg->GetOutputItemSet()->
Get( SID_ATTR_ZOOM );
eNewZoomType = rZoomItem.GetType();
- nZoom = rZoomItem.GetValue();
+ nZoom = rZoomItem.GetValue();
}
delete pDlg;
@@ -715,8 +715,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
if ( eNewZoomType == SVX_ZOOM_PERCENT )
{
- if ( nZoom < MINZOOM ) nZoom = MINZOOM;
- if ( nZoom > MAXZOOM ) nZoom = MAXZOOM;
+ if ( nZoom < MINZOOM ) nZoom = MINZOOM;
+ if ( nZoom > MAXZOOM ) nZoom = MAXZOOM;
}
else
{
@@ -899,11 +899,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScSplitMode eHSplit = GetViewData()->GetHSplitMode();
ScSplitMode eVSplit = GetViewData()->GetVSplitMode();
- if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben
+ if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben
RemoveSplit();
- else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal
+ else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal
FreezeSplitters( FALSE );
- else // erzeugen
+ else // erzeugen
SplitAtCursor();
rReq.Done();
@@ -915,21 +915,21 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
ScSplitMode eHSplit = GetViewData()->GetHSplitMode();
ScSplitMode eVSplit = GetViewData()->GetVSplitMode();
- if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben
+ if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben
RemoveSplit();
else
- FreezeSplitters( TRUE ); // erzeugen oder fixieren
+ FreezeSplitters( TRUE ); // erzeugen oder fixieren
rReq.Done();
InvalidateSplit();
}
break;
- // ----------------------------------------------------------------
+ // ----------------------------------------------------------------
case FID_CHG_SHOW:
{
- USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId();
+ USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
@@ -943,7 +943,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
rReq.Done ();
/*
- USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId();
+ USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId();
SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId );
pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE );
@@ -957,7 +957,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
ScAddress aCursorPos( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() );
ScDocShell* pDocSh = pData->GetDocShell();
- ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos );
+ ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos );
if ( pAction )
{
const SfxPoolItem* pItem;
@@ -979,8 +979,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
break;
case SID_CREATE_SW_DRAWVIEW:
- // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer
- // angelegt werden muss
+ // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer
+ // angelegt werden muss
if (!GetScDrawView())
{
GetViewData()->GetDocShell()->MakeDrawLayer();
@@ -990,8 +990,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_PROTECT_DOC:
{
- ScDocument* pDoc = GetViewData()->GetDocument();
- SfxPasswordDialog* pDlg;
+ ScDocument* pDoc = GetViewData()->GetDocument();
+ SfxPasswordDialog* pDlg;
if( pReqArgs )
{
@@ -1007,14 +1007,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
ScDocProtection* pProtect = pDoc->GetDocProtection();
if (pProtect && pProtect->isProtected())
{
- BOOL bCancel = FALSE;
- String aPassword;
+ BOOL bCancel = FALSE;
+ String aPassword;
if (pProtect->isProtectedWithPass())
{
- String aText( ScResId(SCSTR_PASSWORD) );
+ String aText( ScResId(SCSTR_PASSWORD) );
- pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
+ pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) );
pDlg->SetMinLen( 0 );
pDlg->SetHelpId( FID_PROTECT_DOC );
@@ -1037,7 +1037,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
String aText( ScResId(SCSTR_PASSWORDOPT) );
- pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
+ pDlg = new SfxPasswordDialog( GetDialogParent(), &aText );
pDlg->SetText( ScResId(SCSTR_PROTECTDOC) );
pDlg->SetMinLen( 0 );
pDlg->SetHelpId( FID_PROTECT_DOC );
@@ -1062,7 +1062,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case FID_PROTECT_TABLE:
{
ScDocument* pDoc = GetViewData()->GetDocument();
- SCTAB nTab = GetViewData()->GetTabNo();
+ SCTAB nTab = GetViewData()->GetTabNo();
bool bOldProtection = pDoc->IsTabProtected(nTab);
#if ENABLE_SHEET_PROTECTION
@@ -1136,8 +1136,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
}
#else
auto_ptr<SfxPasswordDialog> pDlg;
- String aPassword;
- BOOL bCancel = FALSE;
+ String aPassword;
+ BOOL bCancel = FALSE;
bool bNewProtection = ! bOldProtection;
if( pReqArgs )