[ooo-build-commit] .: sc/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 4 07:59:39 PDT 2010
sc/source/ui/Accessibility/AccessibleText.cxx | 49 +-------------------------
sc/source/ui/view/viewdata.cxx | 25 -------------
2 files changed, 4 insertions(+), 70 deletions(-)
New commits:
commit 884b50cd7231a06405ce163f782583fad4120623
Author: David Hobley <davidh at sharpblue.org>
Date: Mon Oct 4 16:55:38 2010 +0200
More or OD style's comments removal
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index 0b8f7d1..1821068 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -159,15 +159,11 @@ void ScViewForwarder::SetInvalid()
class ScEditObjectViewForwarder : public SvxViewForwarder
{
Window* mpWindow;
- // --> OD 2005-12-21 #i49561#
- // - EditView needed for access to its visible area.
+ // #i49561# EditView needed for access to its visible area.
const EditView* mpEditView;
- // <--
public:
- // --> OD 2005-12-21 #i49561#
ScEditObjectViewForwarder( Window* pWindow,
const EditView* _pEditView);
- // <--
virtual ~ScEditObjectViewForwarder();
virtual BOOL IsValid() const;
@@ -178,7 +174,6 @@ public:
void SetInvalid();
};
-// --> OD 2005-12-21 #i49561#
ScEditObjectViewForwarder::ScEditObjectViewForwarder( Window* pWindow,
const EditView* _pEditView )
:
@@ -186,7 +181,6 @@ ScEditObjectViewForwarder::ScEditObjectViewForwarder( Window* pWindow,
mpEditView( _pEditView )
{
}
-// <--
ScEditObjectViewForwarder::~ScEditObjectViewForwarder()
{
@@ -219,7 +213,7 @@ Point ScEditObjectViewForwarder::LogicToPixel( const Point& rPoint, const MapMod
{
if (mpWindow)
{
- // --> OD 2005-12-21 #i49561# - consider offset of the visible area
+ // #i49561# - consider offset of the visible area
// of the EditView before converting point to pixel.
Point aPoint( rPoint );
if ( mpEditView )
@@ -228,7 +222,6 @@ Point ScEditObjectViewForwarder::LogicToPixel( const Point& rPoint, const MapMod
aPoint += aEditViewVisArea.TopLeft();
}
return mpWindow->LogicToPixel( aPoint, rMapMode );
- // <--
}
else
{
@@ -241,7 +234,7 @@ Point ScEditObjectViewForwarder::PixelToLogic( const Point& rPoint, const MapMod
{
if (mpWindow)
{
- // --> OD 2005-12-21 #i49561# - consider offset of the visible area
+ // #i49561# - consider offset of the visible area
// of the EditView after converting point to logic.
Point aPoint( mpWindow->PixelToLogic( rPoint, rMapMode ) );
if ( mpEditView )
@@ -250,7 +243,6 @@ Point ScEditObjectViewForwarder::PixelToLogic( const Point& rPoint, const MapMod
aPoint -= aEditViewVisArea.TopLeft();
}
return aPoint;
- // <--
}
else
{
@@ -264,8 +256,6 @@ void ScEditObjectViewForwarder::SetInvalid()
mpWindow = NULL;
}
-// ============================================================================
-
class ScPreviewViewForwarder : public SvxViewForwarder
{
protected:
@@ -399,8 +389,6 @@ Rectangle ScPreviewViewForwarder::CorrectVisArea(const Rectangle& rVisArea) cons
return aVisArea;
}
-// ============================================================================
-
class ScPreviewHeaderFooterViewForwarder : public ScPreviewViewForwarder
{
sal_Bool mbHeader;
@@ -442,8 +430,6 @@ Rectangle ScPreviewHeaderFooterViewForwarder::GetVisArea() const
return aVisArea;
}
-// ============================================================================
-
class ScPreviewCellViewForwarder : public ScPreviewViewForwarder
{
ScAddress maCellPos;
@@ -484,8 +470,6 @@ Rectangle ScPreviewCellViewForwarder::GetVisArea() const
return aVisArea;
}
-// ============================================================================
-
class ScPreviewHeaderCellViewForwarder : public ScPreviewViewForwarder
{
ScAddress maCellPos;
@@ -532,8 +516,6 @@ Rectangle ScPreviewHeaderCellViewForwarder::GetVisArea() const
return aVisArea;
}
-// ============================================================================
-
class ScPreviewNoteViewForwarder : public ScPreviewViewForwarder
{
ScAddress maCellPos;
@@ -578,8 +560,6 @@ Rectangle ScPreviewNoteViewForwarder::GetVisArea() const
return aVisArea;
}
-// ============================================================================
-
class ScEditViewForwarder : public SvxEditViewForwarder
{
EditView* mpEditView;
@@ -747,8 +727,6 @@ void ScEditViewForwarder::SetInvalid()
mpEditView = NULL;
}
-// ============================================================================
-
// ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object
ScAccessibleCellTextData::ScAccessibleCellTextData(ScTabViewShell* pViewShell,
@@ -1061,8 +1039,6 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell)
}
-// ============================================================================
-
ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin)
:
mpViewForwarder(NULL),
@@ -1167,9 +1143,6 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify*, aNotify)
return 0;
}
-
-// ============================================================================
-
ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, Window* pWin)
:
ScAccessibleEditObjectTextData(pEditView, pWin),
@@ -1339,8 +1312,6 @@ void ScAccessibleEditLineTextData::EndEdit()
}
-// ============================================================================
-
// ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object
ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell,
@@ -1416,8 +1387,6 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh
}
-// ============================================================================
-
// ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object
ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell,
@@ -1530,9 +1499,6 @@ ScDocShell* ScAccessiblePreviewHeaderCellTextData::GetDocShell(ScPreviewShell* p
return pDocSh;
}
-
-// ============================================================================
-
ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShell,
const EditTextObject* pEditObj, sal_Bool bHeader, SvxAdjust eAdjust)
:
@@ -1647,9 +1613,6 @@ SvxViewForwarder* ScAccessibleHeaderTextData::GetViewForwarder()
return mpViewForwarder;
}
-
-// ============================================================================
-
ScAccessibleNoteTextData::ScAccessibleNoteTextData(ScPreviewShell* pViewShell,
const String& sText, const ScAddress& aCellPos, sal_Bool bMarkNote)
:
@@ -1816,8 +1779,6 @@ void ScCsvViewForwarder::SetInvalid()
mpWindow = NULL;
}
-// ----------------------------------------------------------------------------
-
ScAccessibleCsvTextData::ScAccessibleCsvTextData(
Window* pWindow, EditEngine* pEditEngine,
const String& rCellText, const Rectangle& rBoundBox, const Size& rCellSize ) :
@@ -1879,7 +1840,3 @@ SvxEditViewForwarder* ScAccessibleCsvTextData::GetEditViewForwarder( sal_Bool /*
{
return NULL;
}
-
-
-// ============================================================================
-
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index c29b7a4..cc3dab1 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -28,10 +28,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
-// INCLUDE ---------------------------------------------------------------
-
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
@@ -74,8 +70,6 @@
using namespace com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
#define SC_GROWY_SMALL_EXTRA 100
#define SC_GROWY_BIG_EXTRA 200
@@ -84,8 +78,6 @@ using namespace com::sun::star;
static BOOL bMoveArea = FALSE; //! Member?
USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!!
-//==================================================================
-
ScViewDataTable::ScViewDataTable() :
eZoomType( SVX_ZOOM_PERCENT ),
aZoomX( 1,1 ),
@@ -301,8 +293,6 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV
nVSplitPos = bHasVSplitInTwips ? static_cast< long >( nTempPosVTw * rViewData.GetPPTY() ) : nTempPosV;
}
-//==================================================================
-
ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh )
: pDocShell ( pDocSh ),
pDoc ( NULL ),
@@ -1064,17 +1054,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
bMoveArea = bLayoutRTL;
}
aVis.Left() = aVis.Right() - nDiff;
- // --> OD 2005-12-22 #i49561#
- // Important note:
+ // #i49561# Important note:
// The set offset of the visible area of the EditView for centered and
// right alignment in horizontal layout is consider by instances of
// class <ScEditObjectViewForwarder> in its methods <LogicToPixel(..)>
// and <PixelToLogic(..)>. This is needed for the correct visibility
// of paragraphs in edit mode at the accessibility API.
- // <--
pEditView[eWhich]->SetVisArea(aVis);
- //
-
// UpdateMode has been disabled in ScInputHandler::StartTable
// must be enabled before EditGrowY (GetTextHeight)
pNewEngine->SetUpdateMode( TRUE );
@@ -1087,8 +1073,6 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0);
if (aDocPos.Y() < aOutputArea.Top())
pEditView[eWhich]->Scroll( 0, aOutputArea.Top() - aDocPos.Y() );
-
- //! Status (Event) zuruecksetzen
}
// hier muss bEditActive schon gesetzt sein
@@ -1100,7 +1084,6 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor();
ScModule* pScMod = SC_MOD();
- // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE)
if ( aBackCol.GetTransparency() > 0 ||
Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
{
@@ -2176,8 +2159,6 @@ void ScViewData::CalcPPT()
}
}
-//------------------------------------------------------------------
-
#define SC_OLD_TABSEP '/'
#define SC_NEW_TABSEP '+'
@@ -2272,9 +2253,7 @@ void ScViewData::ReadUserData(const String& rData)
String aTabOpt;
xub_StrLen nTagLen = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(TAG_TABBARWIDTH)).Len();
- //-------------------
// nicht pro Tabelle:
- //-------------------
SCTAB nTabStart = 2;
Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?)
@@ -2308,9 +2287,7 @@ void ScViewData::ReadUserData(const String& rData)
nTabStart = 3;
}
- //-------------
// pro Tabelle:
- //-------------
SCTAB nPos = 0;
while ( nCount > nPos+nTabStart )
{
More information about the ooo-build-commit
mailing list