diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
commit | b4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch) | |
tree | 26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/source/ui/view/dbfunc.cxx | |
parent | 69bb367315288b644439dc46d34743a2575a3527 (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/dbfunc.cxx')
-rw-r--r-- | sc/source/ui/view/dbfunc.cxx | 79 |
1 files changed, 38 insertions, 41 deletions
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 6b95b3b4ff8c..f9e854e3467d 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.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 @@ -63,7 +63,7 @@ ScDBFunc::~ScDBFunc() } // -// Hilfsfunktionen +// Hilfsfunktionen // void ScDBFunc::GotoDBArea( const String& rDBName ) @@ -89,7 +89,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) SetTabNo( nTab ); MoveCursorAbs( nStartCol, nStartRow, ScFollowMode( SC_FOLLOW_JUMP ), - FALSE, FALSE ); // bShift,bControl + FALSE, FALSE ); // bShift,bControl DoneBlockMode(); InitBlockMode( nStartCol, nStartRow, nTab ); MarkCursor( nEndCol, nEndRow, nTab ); @@ -98,7 +98,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) } } -// aktuellen Datenbereich fuer Sortieren / Filtern suchen +// aktuellen Datenbereich fuer Sortieren / Filtern suchen ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool /*bShrinkToData*/, bool bExpandRows ) { @@ -111,20 +111,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e bool bShrinkColumnsOnly = false; if (eSel == SC_DBSEL_ROW_DOWN) { - // Don't alter row range, additional rows may have been selected on + // Don't alter row range, additional rows may have been selected on // purpose to append data, or to have a fake header row. bShrinkColumnsOnly = true; - // Select further rows only if only one row or a portion thereof is + // Select further rows only if only one row or a portion thereof is // selected. if (aRange.aStart.Row() != aRange.aEnd.Row()) { - // If an area is selected shrink that to the actual used + // If an area is selected shrink that to the actual used // columns, don't draw filter buttons for empty columns. eSel = SC_DBSEL_SHRINK_TO_USED_DATA; } else if (aRange.aStart.Col() == aRange.aEnd.Col()) { - // One cell only, if it is not marked obtain entire used data + // One cell only, if it is not marked obtain entire used data // area. const ScMarkData& rMarkData = GetViewData()->GetMarkData(); if (!(rMarkData.IsMarked() || rMarkData.IsMultiMarked())) @@ -155,10 +155,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e ScDocument* pDoc = pDocSh->GetDocument(); SCCOL nCol1 = aRange.aStart.Col(), nCol2 = aRange.aEnd.Col(); SCROW nRow1 = aRange.aStart.Row(), nRow2 = aRange.aEnd.Row(); - bool bShrunk; - pDoc->ShrinkToUsedDataArea( bShrunk, aRange.aStart.Tab(), - nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly); - if (bShrunk) + if (pDoc->ShrinkToUsedDataArea( aRange.aStart.Tab(), nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly)) { aRange.aStart.SetCol(nCol1); aRange.aEnd.SetCol(nCol2); @@ -196,7 +193,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e return pData; } -// Datenbankbereiche aendern (Dialog) +// Datenbankbereiche aendern (Dialog) void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ) { @@ -222,18 +219,18 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); - // Targets am SBA abmelden nicht mehr noetig + // Targets am SBA abmelden nicht mehr noetig } } if (bRecord) pUndoColl = new ScDBCollection( *pOldColl ); - // neue Targets am SBA anmelden nicht mehr noetig + // neue Targets am SBA anmelden nicht mehr noetig - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection( rNewColl ) ); - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString pOldColl = NULL; pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID ); aModificator.SetDocumentModified(); @@ -248,7 +245,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& } // -// wirkliche Funktionen +// wirkliche Funktionen // // Sortieren @@ -270,13 +267,13 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord ) pDBData->GetSubTotalParam( aSubTotalParam ); if (aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly) { - // Subtotals wiederholen, mit neuer Sortierung + // Subtotals wiederholen, mit neuer Sortierung DoSubTotals( aSubTotalParam, bRecord, &rSortParam ); } else { - Sort( rSortParam, bRecord ); // nur sortieren + Sort( rSortParam, bRecord ); // nur sortieren } } @@ -288,7 +285,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint ) BOOL bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, FALSE ); if ( bSuccess && !rSortParam.bInplace ) { - // Ziel markieren + // Ziel markieren ScRange aDestRange( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab, rSortParam.nDestCol + rSortParam.nCol2 - rSortParam.nCol1, rSortParam.nDestRow + rSortParam.nRow2 - rSortParam.nRow1, @@ -297,7 +294,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint ) } } -// Filtern +// Filtern void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord ) { @@ -311,7 +308,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource BOOL bCopy = !rQueryParam.bInplace; if (bCopy) { - // Zielbereich markieren (DB-Bereich wurde ggf. angelegt) + // Zielbereich markieren (DB-Bereich wurde ggf. angelegt) ScDocument* pDoc = pDocSh->GetDocument(); ScDBData* pDestData = pDoc->GetDBAtCursor( rQueryParam.nDestCol, rQueryParam.nDestRow, @@ -334,18 +331,18 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource } } -// Autofilter-Knoepfe ein-/ausblenden +// Autofilter-Knoepfe ein-/ausblenden void ScDBFunc::ToggleAutoFilter() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); - ScQueryParam aParam; - ScDocument* pDoc = GetViewData()->GetDocument(); - ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); + ScQueryParam aParam; + ScDocument* pDoc = GetViewData()->GetDocument(); + ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); - pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ?? + pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ?? pDBData->GetQueryParam( aParam ); @@ -353,11 +350,11 @@ void ScDBFunc::ToggleAutoFilter() SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData()->GetTabNo(); INT16 nFlag; - BOOL bHasAuto = TRUE; - BOOL bHeader = pDBData->HasHeader(); - BOOL bPaint = FALSE; + BOOL bHasAuto = TRUE; + BOOL bHeader = pDBData->HasHeader(); + BOOL bPaint = FALSE; - //! stattdessen aus DB-Bereich abfragen? + //! stattdessen aus DB-Bereich abfragen? for (nCol=aParam.nCol1; nCol<=aParam.nCol2 && bHasAuto; nCol++) { @@ -368,9 +365,9 @@ void ScDBFunc::ToggleAutoFilter() bHasAuto = FALSE; } - if (bHasAuto) // aufheben + if (bHasAuto) // aufheben { - // Filterknoepfe ausblenden + // Filterknoepfe ausblenden for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++) { @@ -391,7 +388,7 @@ void ScDBFunc::ToggleAutoFilter() pDBData->SetAutoFilter(FALSE); - // Filter aufheben (incl. Paint / Undo) + // Filter aufheben (incl. Paint / Undo) SCSIZE nEC = aParam.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) @@ -403,7 +400,7 @@ void ScDBFunc::ToggleAutoFilter() bPaint = TRUE; } - else // Filterknoepfe einblenden + else // Filterknoepfe einblenden { if ( !pDoc->IsBlockEmpty( nTab, aParam.nCol1, aParam.nRow1, @@ -412,11 +409,11 @@ void ScDBFunc::ToggleAutoFilter() if (!bHeader) { if ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), - ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc" - ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile? + ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc" + ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile? ).Execute() == RET_YES ) { - pDBData->SetHeader( TRUE ); //! Undo ?? + pDBData->SetHeader( TRUE ); //! Undo ?? bHeader = TRUE; } } @@ -456,7 +453,7 @@ void ScDBFunc::ToggleAutoFilter() } } -// nur ausblenden, keine Daten veraendern +// nur ausblenden, keine Daten veraendern void ScDBFunc::HideAutoFilter() { @@ -495,7 +492,7 @@ void ScDBFunc::HideAutoFilter() rBindings.Invalidate( SID_AUTOFILTER_HIDE ); } -// Re-Import +// Re-Import BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord ) { |