[Libreoffice-commits] core.git: 3 commits - android/experimental sw/source
Tor Lillqvist
tml at iki.fi
Mon Mar 4 02:47:17 PST 2013
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java | 3 ++-
sw/source/core/inc/rootfrm.hxx | 2 --
sw/source/core/layout/calcmove.cxx | 2 --
sw/source/core/layout/newfrm.cxx | 1 -
sw/source/core/layout/pagechg.cxx | 9 +++------
sw/source/core/layout/trvlfrm.cxx | 1 -
sw/source/core/layout/wsfrm.cxx | 1 -
sw/source/ui/uiview/view2.cxx | 4 ----
sw/source/ui/uiview/viewport.cxx | 10 +++++++++-
sw/source/ui/uiview/viewtab.cxx | 3 ---
10 files changed, 14 insertions(+), 22 deletions(-)
New commits:
commit 21fbbee5418e898a9cf0c1787c28b8a9c433af87
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Mar 4 12:44:10 2013 +0200
Bin pointless PAGES01 comments
Change-Id: I08b9bafa91c5bc7b7b6ca601ab91607b3143d590
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index ad31308..320dc57 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -62,7 +62,6 @@ class SwRootFrm: public SwLayoutFrm
friend void _FrmInit(); //erzeugt pVout
friend void _FrmFinit(); //loescht pVout
- // PAGES01
std::vector<SwRect> maPageRects;// returns the current rectangle for each page frame
// the rectangle is extended to the top/bottom/left/right
// for pages located at the outer borders
@@ -349,7 +348,6 @@ public:
*/
SwPageFrm* GetPageByPageNum( sal_uInt16 _nPageNum ) const;
- // --> PAGES01
void CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVisArea );
bool IsLeftToRightViewLayout() const;
const SwRect& GetPagesArea() const { return maPagesArea; }
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index b9ddf6c..4405961 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -690,7 +690,6 @@ void SwPageFrm::MakeAll()
{
if ( !mbValidPos )
{
- // PAGES01
mbValidPos = sal_True; // positioning of the pages is taken care of by the root frame
}
@@ -814,7 +813,6 @@ void SwPageFrm::MakeAll()
} //while ( !mbValidPos || !mbValidSize || !mbValidPrtArea )
delete pAccess;
- // PAGES01
if ( Frm() != aOldRect && GetUpper() )
static_cast<SwRootFrm*>(GetUpper())->CheckViewLayout( 0, 0 );
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 5e41e2d..6c982fc 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -466,7 +466,6 @@ void InitCurrShells( SwRootFrm *pRoot )
SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) :
SwLayoutFrm( pFmt->GetDoc()->MakeFrmFmt(
rtl::OUString("Root"), pFmt ), 0 ),
- // --> PAGES01
maPagesArea(),
mnViewWidth( -1 ),
mnColumns( 0 ),
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 949d13f..fb81f2d 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -663,7 +663,6 @@ void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
Frm().Height( Max( rSz.GetHeight(), long(MINLAY) ) );
Frm().Width ( Max( rSz.GetWidth(), long(MINLAY) ) );
- // PAGES01
if ( GetUpper() )
static_cast<SwRootFrm*>(GetUpper())->CheckViewLayout( 0, 0 );
}
@@ -885,7 +884,6 @@ inline void SetLastPage( SwPageFrm *pPage )
|*************************************************************************/
void SwPageFrm::Cut()
{
- // PAGES01
//AdjustRootSize( CHG_CUTPAGE, 0 );
ViewShell *pSh = getRootFrm()->GetCurrShell();
@@ -943,7 +941,6 @@ void SwPageFrm::Cut()
// Alle Verbindungen kappen.
Remove();
- // PAGES01
if ( pRootFrm )
static_cast<SwRootFrm*>(pRootFrm)->CheckViewLayout( 0, 0 );
}
@@ -993,7 +990,7 @@ void SwPageFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
ViewShell *pSh = getRootFrm()->GetCurrShell();
if ( pSh )
pSh->SetFirstVisPageInvalid();
- // PAGES01
+
getRootFrm()->CheckViewLayout( 0, 0 );
}
@@ -1963,7 +1960,7 @@ void SwRootFrm::UnoRestoreAllActions()
} while ( pSh != GetCurrShell() );
}
-// PAGES01: Helper functions for SwRootFrm::CheckViewLayout
+// Helper functions for SwRootFrm::CheckViewLayout
static void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset );
static void lcl_MoveAllLowerObjs( SwFrm* pFrm, const Point& rOffset )
@@ -2083,7 +2080,7 @@ static void lcl_MoveAllLowers( SwFrm* pFrm, const Point& rOffset )
}
}
-// PAGES01: Calculate how the pages have to be positioned
+// Calculate how the pages have to be positioned
void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVisArea )
{
// #i91432#
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 484acfb..7728a98 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -401,7 +401,6 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point &rPoint,
((SwCrsrMoveState*)pCMS)->bFillRet = sal_False;
Point aOldPoint = rPoint;
- // PAGES01
// search for page containing rPoint. The borders around the pages are considerd
const SwPageFrm* pPage = GetPageAtPos( rPoint, 0, true );
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 71e2d03..8c65279 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1477,7 +1477,6 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst )
if ( IsBodyFrm() )
Prt().SSize().Height() = nOldFrmHeight;
- // PAGES01
if ( pUp->GetUpper() )
static_cast<SwRootFrm*>(pUp->GetUpper())->CheckViewLayout( 0, 0 );
//((SwPageFrm*)pUp)->AdjustRootSize( CHG_CHGPAGE, &aOldRect );
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 6a5e19b..851c65c 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1606,7 +1606,6 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
}
aCoreSet.Put( aZoom );
- // PAGES01
if ( !bBrowseMode )
{
const SvxViewLayoutItem aViewLayout( rViewOptions.GetViewLayoutColumns(), rViewOptions.IsViewLayoutBookMode() );
@@ -1627,7 +1626,6 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
}
}
- // PAGES01
const SfxPoolItem* pViewLayoutItem = 0;
if ( pSet && SFX_ITEM_SET == pSet->GetItemState(SID_ATTR_VIEWLAYOUT, sal_True, &pViewLayoutItem))
{
@@ -1656,7 +1654,6 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
if ( pArgs && !rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) &&
( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) )
{
- // PAGES01
if ( SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_VIEWLAYOUT, sal_True, &pItem ))
{
const sal_uInt16 nColumns = ((const SvxViewLayoutItem *)pItem)->GetValue();
@@ -1679,7 +1676,6 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
{
if ( pArgs && ( ( GetDocShell()->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) || !GetDocShell()->IsInPlaceActive() ) )
{
- // PAGES01
if ( SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem ))
{
const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue();
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 91fe6f3..c3a71c3 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -953,7 +953,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if( aRect.Width() )
{
- // PAGES01
// make relative to page position:
aLongLR.SetLeft ((long)( aRect.Left() - rPageRect.Left() ));
aLongLR.SetRight((long)( rPageRect.Right() - aRect.Right()));
@@ -1357,7 +1356,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
{
aRect.Pos() += aTmpRect.Pos();
- // PAGES01
// make relative to page position:
aColItem.SetLeft ((sal_uInt16)( aRect.Left() - rPageRect.Left() ));
aColItem.SetRight((sal_uInt16)( rPageRect.Right() - aRect.Right()));
@@ -1533,7 +1531,6 @@ void SwView::StateTabWin(SfxItemSet& rSet)
break;
case SID_RULER_PAGE_POS:
{
- // PAGES01
SvxPagePosSizeItem aPagePosSize(
Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight);
commit b162bf7e521e561c3c8eb3cd6a83b944dcd27da3
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Mar 4 12:41:57 2013 +0200
First attempt to get rid of scrollbars on tablets
Change-Id: Id861eab66c04cb5547e75959cab8102d5c18f647
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index 905f450..bd3444a 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1056,6 +1056,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
return;
bInOuterResizePixel = sal_True;
+#if !defined(ANDROID) && !defined(IOS)
// feststellen, ob Scrollbars angezeigt werden duerfen
sal_Bool bShowH = sal_True,
bShowV = sal_True,
@@ -1090,7 +1091,10 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
if(pVScrollbar->IsVisible(sal_False) != bShowV && !bAuto)
ShowVScrollbar(bShowV);
pVScrollbar->SetAuto(bAuto);
-
+#else
+ const sal_Bool bAuto = sal_False;
+ const sal_Bool bHAuto = sal_False;
+#endif
SET_CURR_SHELL( pWrtShell );
sal_Bool bRepeat = sal_False;
long nCnt = 0;
@@ -1199,6 +1203,9 @@ void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
sal_Bool SwView::UpdateScrollbars()
{
+#if defined(ANDROID) || defined(IOS)
+ return sal_True;
+#else
sal_Bool bRet = sal_False;
if ( !aVisArea.IsEmpty() )
{
@@ -1243,6 +1250,7 @@ sal_Bool SwView::UpdateScrollbars()
}
}
return bRet;
+#endif
}
void SwView::Move()
commit 5f63a1ab95d64d25f241779a6a361fef01f2502a
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Mar 4 12:41:05 2013 +0200
Field can be moved into the inner class
Change-Id: I053f7d4a17aec9c8b24b92a40de635c71492a3dc
diff --git a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index 8b46be7..b30f74d 100644
--- a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++ b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -134,7 +134,6 @@ public class Desktop
boolean scalingInProgress;
GestureDetector gestureDetector;
ScaleGestureDetector scaleDetector;
- long lastGestureEventTime;
public BitmapView()
{
@@ -167,6 +166,8 @@ public class Desktop
scaleDetector =
new ScaleGestureDetector(Desktop.this,
new ScaleGestureDetector.SimpleOnScaleGestureListener() {
+ long lastGestureEventTime;
+
@Override public boolean onScaleBegin(ScaleGestureDetector detector)
{
scalingInProgress = true;
More information about the Libreoffice-commits
mailing list