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/workben/test.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/workben/test.cxx')
-rw-r--r-- | sc/workben/test.cxx | 420 |
1 files changed, 210 insertions, 210 deletions
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 11886115e2dc..1c6ebf9631de 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.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 @@ -56,14 +56,14 @@ #include <stardiv/one/sheet/scdata.hxx> #include <stardiv/one/sheet/scattr.hxx> -//! das muss als Konstante in irgendeine idl-Datei!!!! -#define TEXTCONTROLCHAR_PARAGRAPH_BREAK 0 +//! das muss als Konstante in irgendeine idl-Datei!!!! +#define TEXTCONTROLCHAR_PARAGRAPH_BREAK 0 class MyFixedText : public FixedText { protected: - void RequestHelp( const HelpEvent& rHEvt ); + void RequestHelp( const HelpEvent& rHEvt ); public: MyFixedText(Window* pParent) : FixedText(pParent) {} }; @@ -71,18 +71,18 @@ public: class MyWindow : public Window { private: - NumericField aCountField; - PushButton aCountButton; - MyFixedText aTimeText; - NumericField aColField; - NumericField aRowField; - NumericField aPosField; - NumericField aLenField; - Edit aTextEdit; - PushButton aTextButton; - PushButton aBlaButton; - PushButton aTabButton; - PushButton aViewButton; + NumericField aCountField; + PushButton aCountButton; + MyFixedText aTimeText; + NumericField aColField; + NumericField aRowField; + NumericField aPosField; + NumericField aLenField; + Edit aTextEdit; + PushButton aTextButton; + PushButton aBlaButton; + PushButton aTabButton; + PushButton aViewButton; public: MyWindow( Window *pParent ); @@ -99,21 +99,21 @@ public: class ScTestListener : public XSelectionChangeListener, public UsrObject { private: - FixedText* pFixedText; + FixedText* pFixedText; public: ScTestListener(FixedText* pF); - virtual ~ScTestListener(); + virtual ~ScTestListener(); SMART_UNO_DECLARATION( ScTestListener, UsrObject ); - virtual XInterface * queryInterface( UsrUik ); - virtual XIdlClassRef getIdlClass(void); + virtual XInterface * queryInterface( UsrUik ); + virtual XIdlClassRef getIdlClass(void); - virtual void disposing(const EventObject& Source); + virtual void disposing(const EventObject& Source); // XSelectionChangeListener - virtual void selectionChanged(const EventObject& aEvent); + virtual void selectionChanged(const EventObject& aEvent); }; //----------------------------------------------------------------------- @@ -185,9 +185,9 @@ extern "C" Window* __LOADONCALLAPI CreateWindow( Window *pParent, const String& void MyFixedText::RequestHelp( const HelpEvent& rHEvt ) { - String aTxtStr=GetText(); - Size aTxtSize=GetTextSize(aTxtStr); - Point aShowPoint= OutputToScreenPixel(Point(0,0)); + String aTxtStr=GetText(); + Size aTxtSize=GetTextSize(aTxtStr); + Point aShowPoint= OutputToScreenPixel(Point(0,0)); if ( ( rHEvt.GetMode() & HELPMODE_QUICK ) == HELPMODE_QUICK && aTxtSize.Width()>GetSizePixel().Width()) Help::ShowQuickHelp( Rectangle(aShowPoint,aTxtSize), aTxtStr, QUICKHELP_TOP|QUICKHELP_LEFT ); @@ -276,8 +276,8 @@ XSpreadsheetDocumentRef lcl_GetDocument() xSSI->newInstance()->queryInterface( XModelCollection::getSmartUik() ); USHORT nCount = aCollRef->getCount(); - XSpreadsheetDocumentRef xModel; // Calc-Model - for (USHORT nMod=0; nMod<nCount && !xModel; nMod++) // Calc-Doc suchen + XSpreadsheetDocumentRef xModel; // Calc-Model + for (USHORT nMod=0; nMod<nCount && !xModel; nMod++) // Calc-Doc suchen { XModelRef aRef = aCollRef->getItemByIndex( nMod ); if ( aRef ) @@ -293,23 +293,23 @@ XSpreadsheetDocumentRef lcl_GetDocument() XInterfaceRef lcl_GetView() { XInterfaceRef xView; - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) - xView = xDoc->getDDELinks(); //! temporaer zum Testen !!!!!!!!! + xView = xDoc->getDDELinks(); //! temporaer zum Testen !!!!!!!!! return xView; } //----------------------------------------------------------------------- -void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess +void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess const XSpreadsheetDocumentRef& xDoc, USHORT nCol, USHORT nRow, USHORT nTab ) { CellAddress aAdr; - aAdr.Sheet = nTab; - aAdr.Column = nCol; - aAdr.Row = nRow; + aAdr.Sheet = nTab; + aAdr.Column = nCol; + aAdr.Row = nRow; XNameAccessRef xNames = (XNameAccess*)xSource->queryInterface(XNameAccess::getSmartUik()); if (!xNames) return; @@ -348,7 +348,7 @@ void lcl_SetText( const XTextRef& xText ) XParagraphCursorRef xPara = (XParagraphCursor*) xCursor->queryInterface(XParagraphCursor::getSmartUik()); - if (!xPos.is() || !xControl.is() || !xPara.is()) return; // PropertySet kann fehlen + if (!xPos.is() || !xControl.is() || !xPara.is()) return; // PropertySet kann fehlen xText->setText(L"bla fasel"); xCursor->gotoEnd(FALSE); @@ -358,7 +358,7 @@ void lcl_SetText( const XTextRef& xText ) xCursor->gotoStart(FALSE); xPara->gotoEndOfParagraph(FALSE); - xCursor->goLeft(5, TRUE); // letzte 5 Zeichen im 1. Absatz + xCursor->goLeft(5, TRUE); // letzte 5 Zeichen im 1. Absatz if (xProp.is()) xProp->setPropertyValue(L"Bold", UsrAny((BOOL)TRUE)); } @@ -367,7 +367,7 @@ void lcl_SetText( const XTextRef& xText ) void lcl_DoCount() { - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { XActionLockableRef xLock = (XActionLockable*) @@ -375,7 +375,7 @@ void lcl_DoCount() XCalculateRef xCalc = (XCalculate*) xDoc->queryInterface(XCalculate::getSmartUik()); if (xLock) - xLock->addActionLock(); // nicht zwischendurch painten + xLock->addActionLock(); // nicht zwischendurch painten if (xCalc) xCalc->setAutomaticCalculation(FALSE); @@ -391,7 +391,7 @@ void lcl_DoCount() XCellRef xCell = xDoc->getCell(aPos); if ( xCell ) { - // Wert der Zelle um 1 hochzaehlen + // Wert der Zelle um 1 hochzaehlen double fVal = xCell->getValue(); fVal += 1.0; @@ -421,7 +421,7 @@ void lcl_GlobalCell() void lcl_Annotations( FixedText& aTimeText ) { - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { CellAddress aPos; @@ -486,7 +486,7 @@ void lcl_Annotations( FixedText& aTimeText ) void lcl_Cursor( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { XActionLockableRef xLock = (XActionLockable*) @@ -520,7 +520,7 @@ void lcl_Cursor( FixedText& aTimeText ) xColl = xCC->getRanges(); if ( xColl ) { - // XText ist drin, wenn's ne einzelne Zelle ist + // XText ist drin, wenn's ne einzelne Zelle ist xText = (XText*)xColl->queryInterface(XText::getSmartUik()); if ( xText ) { @@ -529,11 +529,11 @@ void lcl_Cursor( FixedText& aTimeText ) } CellRangeAddress aSecond; - aSecond.Sheet = 0; - aSecond.StartColumn = 3; - aSecond.StartRow = 4; - aSecond.EndColumn = 3; - aSecond.EndRow = 4; + aSecond.Sheet = 0; + aSecond.StartColumn = 3; + aSecond.StartRow = 4; + aSecond.EndColumn = 3; + aSecond.EndRow = 4; xRC->gotoUnion(aSecond); xColl = xCC->getRanges(); @@ -551,10 +551,10 @@ void lcl_Cursor( FixedText& aTimeText ) { //ShadowFormat* pOld = (ShadowFormat*)aAny.get(); ShadowFormat aNew; - aNew.Location = SHADOWLOCATION_BOTTOMRIGHT; - aNew.ShadowWidth = 100; - aNew.IsTransparent = FALSE; - aNew.Color = 0xff0000L; + aNew.Location = SHADOWLOCATION_BOTTOMRIGHT; + aNew.ShadowWidth = 100; + aNew.IsTransparent = FALSE; + aNew.Color = 0xff0000L; aAny.set( &aNew, aAny.getReflection() ); xProp->setPropertyValue(L"ShadowFormat", aAny); } @@ -581,10 +581,10 @@ void lcl_Cursor( FixedText& aTimeText ) { //CellProtection* pOld = (CellProtection*)aAny.get(); CellProtection aNew; - aNew.Locked = FALSE; - aNew.FormulaHidden = FALSE; - aNew.Hidden = FALSE; - aNew.PrintHidden = FALSE; + aNew.Locked = FALSE; + aNew.FormulaHidden = FALSE; + aNew.Hidden = FALSE; + aNew.PrintHidden = FALSE; aAny.set( &aNew, aAny.getReflection() ); xProp->setPropertyValue(L"CellProtection", aAny); } @@ -613,7 +613,7 @@ void lcl_Cursor( FixedText& aTimeText ) void lcl_Cells( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { long nCount = 0; @@ -621,15 +621,15 @@ void lcl_Cells( FixedText& aTimeText ) XActionLockableRef xLock = (XActionLockable*) xDoc->queryInterface(XActionLockable::getSmartUik()); -// if (xLock) -// xLock->addActionLock(); +// if (xLock) +// xLock->addActionLock(); CellRangeAddress aRngAddr; - aRngAddr.Sheet = 0; + aRngAddr.Sheet = 0; aRngAddr.StartColumn = 0; - aRngAddr.StartRow = 0; - aRngAddr.EndColumn = 9; - aRngAddr.EndRow = 19; + aRngAddr.StartRow = 0; + aRngAddr.EndColumn = 9; + aRngAddr.EndRow = 19; XCellRangeRef xRange = xDoc->getCellRange(aRngAddr); if (xRange) { @@ -660,15 +660,15 @@ void lcl_Cells( FixedText& aTimeText ) aTimeText.SetText(String(nCount)+String(" ")+String(nEnd-nStart)+String(" ms")); -// if (xLock) -// xLock->removeActionLock(); +// if (xLock) +// xLock->removeActionLock(); } } void lcl_Sheet( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); if (!xSheets) return; @@ -700,8 +700,8 @@ void lcl_Sheet( FixedText& aTimeText ) if (!xCol) return; UINT16 nWidth = TypeConversion::toUINT16(xCol->getPropertyValue(L"Width")); -// UINT16 nNewWidth = nWidth + 100; -// xCol->setPropertyValue(L"Width", UsrAny(nNewWidth)); +// UINT16 nNewWidth = nWidth + 100; +// xCol->setPropertyValue(L"Width", UsrAny(nNewWidth)); xCol->setPropertyValue(L"OptimalWidth", UsrAny((BOOL)TRUE)); xCol->setPropertyValue(L"NewPage", UsrAny((BOOL)FALSE)); @@ -712,10 +712,10 @@ void lcl_Sheet( FixedText& aTimeText ) { //ShadowFormat* pOld = (ShadowFormat*)aAny.get(); ShadowFormat aNew; - aNew.Location = SHADOWLOCATION_BOTTOMRIGHT; - aNew.ShadowWidth = 100; - aNew.IsTransparent = FALSE; - aNew.Color = 0xff0000L; + aNew.Location = SHADOWLOCATION_BOTTOMRIGHT; + aNew.ShadowWidth = 100; + aNew.IsTransparent = FALSE; + aNew.Color = 0xff0000L; aAny.set( &aNew, aAny.getReflection() ); xCol->setPropertyValue(L"ShadowFormat", aAny); } @@ -740,7 +740,7 @@ void lcl_Sheet( FixedText& aTimeText ) void lcl_Names( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XNamedRangesRef xNames = xDoc->getNamedRanges(); if (!xNames) return; @@ -764,7 +764,7 @@ void lcl_Names( FixedText& aTimeText ) void lcl_Sheets( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); if (!xSheets) return; @@ -775,17 +775,17 @@ void lcl_Sheets( FixedText& aTimeText ) void lcl_Goal( FixedText& aTimeText ) { - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XGoalSeekRef xGoal = (XGoalSeek*)xDoc->queryInterface(XGoalSeek::getSmartUik()); if (!xGoal) return; double fResult; - CellAddress aFormula; // A1 + CellAddress aFormula; // A1 aFormula.Sheet = 0; aFormula.Column = 0; aFormula.Row = 0; - CellAddress aVar; // A2 + CellAddress aVar; // A2 aVar.Sheet = 0; aVar.Column = 0; aVar.Row = 1; @@ -793,7 +793,7 @@ void lcl_Goal( FixedText& aTimeText ) if (bFound) { - CellAddress aOut; // A3 + CellAddress aOut; // A3 aOut.Sheet = 0; aOut.Column = 0; aOut.Row = 2; @@ -806,8 +806,8 @@ void lcl_Goal( FixedText& aTimeText ) void lcl_TabOp( FixedText& aTimeText ) { - // Mehrfachoperation auf Tabelle2 - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + // Mehrfachoperation auf Tabelle2 + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XCellRangeRef xRange; @@ -818,22 +818,22 @@ void lcl_TabOp( FixedText& aTimeText ) CellAddress aRowCell; TableOperationMode nMode; - aRangeAddr.Sheet = 1; // c9:e11 - aRangeAddr.StartColumn = 2; - aRangeAddr.StartRow = 8; - aRangeAddr.EndColumn = 4; - aRangeAddr.EndRow = 10; - aFormulaRange.Sheet = 1; // c6:c7 - aFormulaRange.StartColumn = 2; - aFormulaRange.StartRow = 5; - aFormulaRange.EndColumn = 2; - aFormulaRange.EndRow = 6; - aColumnCell.Sheet = 0; // nicht benutzt - aColumnCell.Column = 0; - aColumnCell.Row = 0; - aRowCell.Sheet = 1; // c5 - aRowCell.Column = 2; - aRowCell.Row = 4; + aRangeAddr.Sheet = 1; // c9:e11 + aRangeAddr.StartColumn = 2; + aRangeAddr.StartRow = 8; + aRangeAddr.EndColumn = 4; + aRangeAddr.EndRow = 10; + aFormulaRange.Sheet = 1; // c6:c7 + aFormulaRange.StartColumn = 2; + aFormulaRange.StartRow = 5; + aFormulaRange.EndColumn = 2; + aFormulaRange.EndRow = 6; + aColumnCell.Sheet = 0; // nicht benutzt + aColumnCell.Column = 0; + aColumnCell.Row = 0; + aRowCell.Sheet = 1; // c5 + aRowCell.Column = 2; + aRowCell.Row = 4; nMode = TABLEOP_ROW; xRange = xDoc->getCellRange(aRangeAddr); @@ -842,22 +842,22 @@ void lcl_TabOp( FixedText& aTimeText ) if (!xGoal) return; xGoal->setTableOperation( nMode, aFormulaRange, aColumnCell, aRowCell ); - aRangeAddr.Sheet = 1; // b19:d21 - aRangeAddr.StartColumn = 1; - aRangeAddr.StartRow = 18; - aRangeAddr.EndColumn = 3; - aRangeAddr.EndRow = 20; - aFormulaRange.Sheet = 1; // c16:d16 - aFormulaRange.StartColumn = 2; - aFormulaRange.StartRow = 15; - aFormulaRange.EndColumn = 3; - aFormulaRange.EndRow = 15; - aColumnCell.Sheet = 1; // b16 - aColumnCell.Column = 1; - aColumnCell.Row = 15; - aRowCell.Sheet = 0; // nicht benutzt - aRowCell.Column = 0; - aRowCell.Row = 0; + aRangeAddr.Sheet = 1; // b19:d21 + aRangeAddr.StartColumn = 1; + aRangeAddr.StartRow = 18; + aRangeAddr.EndColumn = 3; + aRangeAddr.EndRow = 20; + aFormulaRange.Sheet = 1; // c16:d16 + aFormulaRange.StartColumn = 2; + aFormulaRange.StartRow = 15; + aFormulaRange.EndColumn = 3; + aFormulaRange.EndRow = 15; + aColumnCell.Sheet = 1; // b16 + aColumnCell.Column = 1; + aColumnCell.Row = 15; + aRowCell.Sheet = 0; // nicht benutzt + aRowCell.Column = 0; + aRowCell.Row = 0; nMode = TABLEOP_COLUMN; xRange = xDoc->getCellRange(aRangeAddr); @@ -866,22 +866,22 @@ void lcl_TabOp( FixedText& aTimeText ) if (!xGoal) return; xGoal->setTableOperation( nMode, aFormulaRange, aColumnCell, aRowCell ); - aRangeAddr.Sheet = 1; // b29:e32 - aRangeAddr.StartColumn = 1; - aRangeAddr.StartRow = 28; - aRangeAddr.EndColumn = 4; - aRangeAddr.EndRow = 31; - aFormulaRange.Sheet = 1; // c27:c27 - aFormulaRange.StartColumn = 2; - aFormulaRange.StartRow = 26; - aFormulaRange.EndColumn = 2; - aFormulaRange.EndRow = 26; - aColumnCell.Sheet = 1; // c25 - aColumnCell.Column = 2; - aColumnCell.Row = 24; - aRowCell.Sheet = 1; // c26 - aRowCell.Column = 2; - aRowCell.Row = 25; + aRangeAddr.Sheet = 1; // b29:e32 + aRangeAddr.StartColumn = 1; + aRangeAddr.StartRow = 28; + aRangeAddr.EndColumn = 4; + aRangeAddr.EndRow = 31; + aFormulaRange.Sheet = 1; // c27:c27 + aFormulaRange.StartColumn = 2; + aFormulaRange.StartRow = 26; + aFormulaRange.EndColumn = 2; + aFormulaRange.EndRow = 26; + aColumnCell.Sheet = 1; // c25 + aColumnCell.Column = 2; + aColumnCell.Row = 24; + aRowCell.Sheet = 1; // c26 + aRowCell.Column = 2; + aRowCell.Row = 25; nMode = TABLEOP_BOTH; xRange = xDoc->getCellRange(aRangeAddr); @@ -904,7 +904,7 @@ void lcl_Fill( FixedText& aTimeText ) XCellSeriesRef xFill = (XCellSeries*)xSelInt->queryInterface(XCellSeries::getSmartUik()); if (!xFill) return; -// xFill->fillAuto( FILL_DIRECTION_TO_BOTTOM, 2 ); +// xFill->fillAuto( FILL_DIRECTION_TO_BOTTOM, 2 ); xFill->fillSeries( FILL_DIRECTION_TO_LEFT, FILL_MODE_GROWTH, FILL_DATE_DAY, 2.0, 1000.0 ); @@ -913,7 +913,7 @@ void lcl_Fill( FixedText& aTimeText ) void lcl_Audi( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); if (!xSheets) return; @@ -924,15 +924,15 @@ void lcl_Audi( FixedText& aTimeText ) if (!xAudi) return; CellAddress aPosition; - aPosition.Sheet = 0; - aPosition.Column = 0; - aPosition.Row = 0; + aPosition.Sheet = 0; + aPosition.Column = 0; + aPosition.Row = 0; xAudi->showDependents(aPosition); } void lcl_Consoli( FixedText& aTimeText ) { - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XConsolidationRef xCons = (XConsolidation*)xDoc->queryInterface(XConsolidation::getSmartUik()); if (!xCons) return; @@ -957,19 +957,19 @@ void lcl_Sort( FixedText& aTimeText ) Sequence<SortField> aFields = xDesc->getSortFields(); if (aFields.getLen()) { - // 1.Feld umkehren + // 1.Feld umkehren SortField* pAry = aFields.getArray(); if (!pAry) return; pAry[0].Ascending = !pAry[0].Ascending; } - else // neue Sequence, 1. Spalte aufsteigend + else // neue Sequence, 1. Spalte aufsteigend { aFields = Sequence<SortField>(1); SortField* pAry = aFields.getArray(); if (!pAry) return; - pAry[0].Field = 0; + pAry[0].Field = 0; pAry[0].Ascending = TRUE; - pAry[0].Type = SORT_FIELD_AUTOMATIC; + pAry[0].Type = SORT_FIELD_AUTOMATIC; } xDesc->setSortFields(aFields); @@ -1004,14 +1004,14 @@ void lcl_Filter( FixedText& aTimeText ) XFilterableRef xFilter = (XFilterable*)xSelInt->queryInterface(XFilterable::getSmartUik()); if (!xFilter) return; - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; CellRangeAddress aAddress; - aAddress.Sheet = 3; + aAddress.Sheet = 3; aAddress.StartColumn = 0; - aAddress.StartRow = 0; - aAddress.EndColumn = 1; - aAddress.EndRow = 2; + aAddress.StartRow = 0; + aAddress.EndColumn = 1; + aAddress.EndRow = 2; XCellRangeRef xRange = xDoc->getCellRange(aAddress); if (!xRange) return; XAdvancedFilterSourceRef xSource = (XAdvancedFilterSource*) @@ -1067,7 +1067,7 @@ void lcl_Outline( FixedText& aTimeText ) { static BOOL bOutline = FALSE; - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); if (!xSheets) return; @@ -1099,19 +1099,19 @@ void lcl_Bla( FixedText& aTimeText ) { aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XActionLockableRef xLock = (XActionLockable*)xDoc->queryInterface(XActionLockable::getSmartUik()); if (!xLock) return; xLock->addActionLock(); xLock->addActionLock(); - USHORT nCount = xLock->resetActionLocks(); // sollte 2 sein + USHORT nCount = xLock->resetActionLocks(); // sollte 2 sein String aBla = nCount; xLock->setActionLocks(nCount); xLock->removeActionLock(); xLock->removeActionLock(); - aBla += '/'; aBla += xLock->resetActionLocks(); // sollte 0 sein + aBla += '/'; aBla += xLock->resetActionLocks(); // sollte 0 sein aTimeText.SetText(aBla); } @@ -1143,7 +1143,7 @@ void lcl_CellCursor( FixedText& aTimeText ) if (!xFC) return; CellAddress aPos; - aPos.Sheet = 0; // ignored + aPos.Sheet = 0; // ignored aPos.Row = 3; aPos.Column = 2; @@ -1173,7 +1173,7 @@ void lcl_CellCursor( FixedText& aTimeText ) void lcl_Notes( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); if (!xSheets) return; @@ -1186,9 +1186,9 @@ void lcl_Notes( FixedText& aTimeText ) if (!xNIndex) return; CellAddress aPos; - aPos.Column = 0; - aPos.Row = 0; - aPos.Sheet = 0; + aPos.Column = 0; + aPos.Row = 0; + aPos.Sheet = 0; xNotes->addAnnotation( L"neu", aPos ); ULONG nCount = xNIndex->getCount(); @@ -1208,7 +1208,7 @@ void lcl_Notes( FixedText& aTimeText ) void lcl_Scenario( FixedText& aTimeText ) { aTimeText.SetText( "..." ); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); if (!xSheets) return; @@ -1221,16 +1221,16 @@ void lcl_Scenario( FixedText& aTimeText ) Sequence<CellRangeAddress> aRanges(2); CellRangeAddress* pAry = aRanges.getArray(); if (!pAry) return; - pAry[0].Sheet = 0; - pAry[0].StartColumn = 0; - pAry[0].StartRow = 0; - pAry[0].EndColumn = 1; - pAry[0].EndRow = 1; - pAry[1].Sheet = 0; - pAry[1].StartColumn = 3; - pAry[1].StartRow = 3; - pAry[1].EndColumn = 4; - pAry[1].EndRow = 4; + pAry[0].Sheet = 0; + pAry[0].StartColumn = 0; + pAry[0].StartRow = 0; + pAry[0].EndColumn = 1; + pAry[0].EndRow = 1; + pAry[1].Sheet = 0; + pAry[1].StartColumn = 3; + pAry[1].StartRow = 3; + pAry[1].EndColumn = 4; + pAry[1].EndRow = 4; xColl->addScenario( aRanges, L"bla", L"bla blubb" ); @@ -1245,11 +1245,11 @@ void lcl_Scenario( FixedText& aTimeText ) aRanges = Sequence<CellRangeAddress>(1); pAry = aRanges.getArray(); if (!pAry) return; - pAry[0].Sheet = 0; - pAry[0].StartColumn = 6; - pAry[0].StartRow = 6; - pAry[0].EndColumn = 7; - pAry[0].EndRow = 7; + pAry[0].Sheet = 0; + pAry[0].StartColumn = 6; + pAry[0].StartRow = 6; + pAry[0].EndColumn = 7; + pAry[0].EndRow = 7; xScen->addRanges( aRanges ); @@ -1264,7 +1264,7 @@ void lcl_Formula( FixedText& aTimeText ) { aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; CellAddress aPos; aPos.Sheet = 0; @@ -1273,8 +1273,8 @@ void lcl_Formula( FixedText& aTimeText ) XCellRef xCell = xDoc->getCell(aPos); if (!xCell) return; -// String aStr = OUStringToString( xCell->getFormula(), CHARSET_SYSTEM ); -// aTimeText.SetText(aStr); +// String aStr = OUStringToString( xCell->getFormula(), CHARSET_SYSTEM ); +// aTimeText.SetText(aStr); XTextRef xText = (XText*)xCell->queryInterface(XText::getSmartUik()); if (!xText) return; @@ -1282,21 +1282,21 @@ void lcl_Formula( FixedText& aTimeText ) aTimeText.SetText(aStr); } -void lcl_DBRange( FixedText& aTimeText ) // 23 +void lcl_DBRange( FixedText& aTimeText ) // 23 { aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XDatabaseRangesRef xDBs = xDoc->getDatabaseRanges(); if (!xDBs) return; CellRangeAddress aRange; - aRange.Sheet = 0; - aRange.StartColumn = 1; - aRange.StartRow = 1; - aRange.EndColumn = 3; - aRange.EndRow = 10; + aRange.Sheet = 0; + aRange.StartColumn = 1; + aRange.StartRow = 1; + aRange.EndColumn = 3; + aRange.EndRow = 10; xDBs->addRange( L"blubb", aRange ); @@ -1315,7 +1315,7 @@ void lcl_DBRange( FixedText& aTimeText ) // 23 xDB->setDataArea(aDBRange); } -void lcl_FillTab( FixedText& aTimeText ) // 24 +void lcl_FillTab( FixedText& aTimeText ) // 24 { aTimeText.SetText("..."); @@ -1334,7 +1334,7 @@ void lcl_FillTab( FixedText& aTimeText ) // 24 aTimeText.SetText(nCount); } -void lcl_Listener( FixedText& aTimeText ) // 25 +void lcl_Listener( FixedText& aTimeText ) // 25 { XInterfaceRef xInt = lcl_GetView(); if (!xInt) return; @@ -1343,7 +1343,7 @@ void lcl_Listener( FixedText& aTimeText ) // 25 xView->addSelectionChangeListener( new ScTestListener(&aTimeText) ); } -void lcl_CellAttrib( FixedText& aTimeText ) // 26 +void lcl_CellAttrib( FixedText& aTimeText ) // 26 { XInterfaceRef xInt = lcl_GetView(); if (!xInt) return; @@ -1384,23 +1384,23 @@ void lcl_CellAttrib( FixedText& aTimeText ) // 26 xProp->setPropertyValue(L"Underlined", UsrAny((BOOL)TRUE)); } -void lcl_Styles( FixedText& aTimeText ) // 27 +void lcl_Styles( FixedText& aTimeText ) // 27 { aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XStyleFamiliesRef xFamilies = xDoc->getStyleFamilies(); if (!xFamilies) return; - XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_CELL ); -// XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE ); + XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_CELL ); +// XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE ); if (!xFamily) return; long nCount = xFamily->getCount(); aTimeText.SetText(nCount); XStyleRef xStyle = xFamily->getStyleByName(L"rot"); if (!xStyle) return; -// XPropertySetRef xProp = (XPropertySet*)xStyle->queryInterface(XPropertySet::getSmartUik()); -// if (!xProp) return; +// XPropertySetRef xProp = (XPropertySet*)xStyle->queryInterface(XPropertySet::getSmartUik()); +// if (!xProp) return; XStyleRef xNew = xFamily->addStyle( L"gaga", xStyle ); if (!xNew) return; @@ -1418,15 +1418,15 @@ void lcl_Styles( FixedText& aTimeText ) // 27 xFamily->removeStyle( L"rot" ); } -void lcl_PageStyle( FixedText& aTimeText ) // 28 +void lcl_PageStyle( FixedText& aTimeText ) // 28 { aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XStyleFamiliesRef xFamilies = xDoc->getStyleFamilies(); if (!xFamilies) return; - XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE ); + XStyleFamilyRef xFamily = xFamilies->getStyleFamilyByType( STYLE_FAMILY_PAGE ); if (!xFamily) return; XStyleRef xStyle = xFamily->getStyleByName(L"Standard"); if (!xStyle) return; @@ -1437,8 +1437,8 @@ void lcl_PageStyle( FixedText& aTimeText ) // 28 aAny = xProp->getPropertyValue(L"RightPageHeaderContent"); // geht nicht: -// if ( !XHeaderFooterContent_getReflection()->equals(*aAny.getReflection()) ) -// return; +// if ( !XHeaderFooterContent_getReflection()->equals(*aAny.getReflection()) ) +// return; XHeaderFooterContentRef* pxContent = (XHeaderFooterContentRef*)aAny.get(); if (!pxContent || !pxContent->is()) return; @@ -1455,7 +1455,7 @@ void lcl_PageStyle( FixedText& aTimeText ) // 28 xProp->setPropertyValue(L"RightPageHeaderContent", aAny); } -void lcl_AutoForm( FixedText& aTimeText ) // 29 +void lcl_AutoForm( FixedText& aTimeText ) // 29 { XInterfaceRef xInt = lcl_GetView(); if (!xInt) return; @@ -1489,9 +1489,9 @@ void lcl_AutoForm( FixedText& aTimeText ) // 29 } } -void lcl_Pivot( FixedText& aTimeText ) // 30 +void lcl_Pivot( FixedText& aTimeText ) // 30 { - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (!xDoc) return; XSpreadsheetsRef xSheets = xDoc->getSheets(); @@ -1515,7 +1515,7 @@ void lcl_Pivot( FixedText& aTimeText ) // 30 XDataPilotTableRef xTable = xPivots->getTableByIndex(nP); if (!xTable) return; -// xTable->refreshTable(); +// xTable->refreshTable(); XDataPilotDescriptorRef xDesc = (XDataPilotDescriptor*) xTable->queryInterface(XDataPilotDescriptor::getSmartUik()); @@ -1657,7 +1657,7 @@ IMPL_LINK(MyWindow, TextHdl, PushButton*, EMPTYARG) aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { CellAddress aPos; @@ -1699,7 +1699,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) { aTimeText.SetText("..."); - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { CellAddress aPos; @@ -1723,7 +1723,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) if ( xCursor && xType ) { - // letztes Feld loeschen + // letztes Feld loeschen XIndexAccessRef xIndex = (XIndexAccess*) xType->queryInterface(XIndexAccess::getSmartUik()); if (xIndex) @@ -1745,7 +1745,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) xProp->getPropertyValue(L"URL") ), CHARSET_SYSTEM ); } - if ( i+1 == nCount ) // letztes + if ( i+1 == nCount ) // letztes { XTextFieldRef xField = (XTextField*)xInt-> queryInterface(XTextField::getSmartUik()); @@ -1773,7 +1773,7 @@ IMPL_LINK(MyWindow, TabHdl, PushButton*, EMPTYARG) { String aResult; - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model if (xDoc) { XSpreadsheetsRef xSheets = xDoc->getSheets(); @@ -1864,7 +1864,7 @@ void lcl_FillCells(XCellCollectionRef xColl) IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG) { - XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model + XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model XInterfaceRef xInt = lcl_GetView(); if (!xInt) return 0; XDocumentViewRef xView = (XDocumentView*)xInt->queryInterface(XDocumentView::getSmartUik()); @@ -1876,12 +1876,12 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG) XAutoFormattableRef xAuto = (XAutoFormattable*)xSelInt-> queryInterface(XAutoFormattable::getSmartUik()); if ( xAuto ) - xAuto->applyAutoFormat( L"gaga" ); + xAuto->applyAutoFormat( L"gaga" ); XFormulaArrayRef xArr = (XFormulaArray*)xSelInt->queryInterface(XFormulaArray::getSmartUik()); if ( xArr ) { -// xArr->setFormulaArray( "123" ); +// xArr->setFormulaArray( "123" ); String aFormula = OUStringToString( xArr->getFormulaArray(), CHARSET_SYSTEM ); aTimeText.SetText(aFormula); } @@ -1898,15 +1898,15 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG) XPrintableRef xPrint = (XPrintable*)xInt->queryInterface(XPrintable::getSmartUik()); String aName = OUStringToString( xPrint->getPrinterName(), CHARSET_SYSTEM ); -// aTimeText.SetText(aName); +// aTimeText.SetText(aName); xPrint->setPrinterName(L"HP5_2"); -// xPrint->setPrinterName(L"blubb"); +// xPrint->setPrinterName(L"blubb"); -// XPropertySetRef xOptions; -// xPrint->print(xOptions); +// XPropertySetRef xOptions; +// xPrint->print(xOptions); -/* XViewPaneRef xPane = (XViewPane*)xInt->queryInterface(XViewPane::getSmartUik()); +/* XViewPaneRef xPane = (XViewPane*)xInt->queryInterface(XViewPane::getSmartUik()); if (!xPane) return 0; xPane->setScrollRow( 2 ); */ @@ -1923,12 +1923,12 @@ IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG) XActionLockableRef xLock = (XActionLockable*) xDoc->queryInterface(XActionLockable::getSmartUik()); if (xLock) - xLock->addActionLock(); // nicht zwischendurch painten + xLock->addActionLock(); // nicht zwischendurch painten -// lcl_FillCells(xColl); +// lcl_FillCells(xColl); if (xLock) - xLock->removeActionLock(); // nicht zwischendurch painten + xLock->removeActionLock(); // nicht zwischendurch painten XStarCalcViewRef xCalc = (XStarCalcView*)xInt->queryInterface(XStarCalcView::getSmartUik()); if (!xCalc) return 0; |