[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kspread/ui
From:       Stefan Nikolaus <nikolaus.kde () googlemail ! com>
Date:       2010-06-18 9:10:19
Message-ID: 20100618091019.63273AC8D7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1139440 by nikolaus:

compile


 M  +1 -1      AbstractSelectionStrategy.cpp  
 M  +2 -2      SelectionStrategy.cpp  


--- trunk/koffice/kspread/ui/AbstractSelectionStrategy.cpp #1139439:1139440
@@ -69,7 +69,7 @@
         return;
     }
     // Test whether mouse is over the Selection.handle
-    if (hitTestSelectionSizeGrip(m_canvas, d->selection, position)) {
+    if (hitTestSelectionSizeGrip(tool()->canvas(), d->selection, position)) {
         // If the cursor is over the handle, than it might be already on the next \
cell.  // Recalculate the cell position!
         col = d->selection->activeSheet()->leftColumn(position.x() - \
                tool()->canvas()->viewConverter()->viewToDocumentX(2.0), xpos);
--- trunk/koffice/kspread/ui/SelectionStrategy.cpp #1139439:1139440
@@ -43,7 +43,7 @@
 {
     d->startCell = Cell();
 
-    const KoShape* shape = \
m_canvas->shapeManager()->selection()->firstSelectedShape(); +    const KoShape* \
                shape = \
                tool()->canvas()->shapeManager()->selection()->firstSelectedShape();
     const QPointF position = documentPos - (shape ? shape->position() : QPointF(0.0, \
0.0));  Sheet *const sheet = this->selection()->activeSheet();
 
@@ -76,7 +76,7 @@
         d->startCell = Cell(sheet, col, row);
         if (selection->referenceSelectionMode()) {
             selection->emitRequestFocusEditor();
-            const bool sizeGripHit = hitTestReferenceSizeGrip(canvas, selection, \
position); +            const bool sizeGripHit = \
hitTestReferenceSizeGrip(tool()->canvas(), selection, position);  const bool \
shiftPressed = modifiers & Qt::ShiftModifier;  if (sizeGripHit || shiftPressed) {
                 selection->update(QPoint(col, row));


[prev in list] [next in list] [prev in thread] [next in thread]