[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source vcl/android

[Tor Lillqvist]

 sw/inc/swtypes.hxx               |    8 +-------
 sw/source/ui/uiview/viewport.cxx |    4 ++--
 vcl/android/androidinst.cxx      |    1 +
 3 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 6cd8e92402746a193e4a19a5f31e9ac16318352e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Mar 5 00:00:32 2013 +0200

    Add a SAL_INFO
    
    Change-Id: I57702d2d848181f2df4af3fc0d1ce8cbed1455f9

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index fdac1ec..dd49738 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -979,6 +979,7 @@ Java_org_libreoffice_experimental_desktop_Desktop_zoom(JNIEnv * /* env */,
 {
     SalFrame *pFocus = AndroidSalInstance::getInstance()->getFocusFrame();
     if (pFocus) {
+        SAL_INFO( "vcl.androidinst", "zoom: " << scale << "@(" << x << "," << y << ")" );
         ZoomEvent aEvent( Point( x, y ), scale);
         Application::PostZoomEvent(VCLEVENT_WINDOW_ZOOM, pFocus->GetWindow(), &aEvent);
     }
commit 016206156d412b7df6445e81753f49a36f29b29a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Mar 4 23:59:04 2013 +0200

    Fix float scale factor -> integer percentage conversion bug in my new code
    
    Change-Id: I1b843ee1921bad3607e62f7e61b085a33cd84aed

diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index bd3444a..9fd7d63 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1277,8 +1277,8 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent& rCEvt )
     }
     else if( pWData && COMMAND_WHEEL_ZOOM_SCALE == pWData->GetMode() )
     {
-        long newZoom = 100 * (long) ((pWrtShell->GetViewOptions()->GetZoom() / 100.0) * (pWData->GetDelta() / 100.0));
-        SetZoom( SVX_ZOOM_PERCENT, Max( 20L, Min( 600L, newZoom ) ) );
+        int newZoom = 100 * (pWrtShell->GetViewOptions()->GetZoom() / 100.0) * (pWData->GetDelta() / 100.0);
+        SetZoom( SVX_ZOOM_PERCENT, Max( 20, Min( 600, newZoom ) ) );
         bOk = sal_True;
     }
     else
commit 68eea32a6e1b38013c06e91fc2d88fb67b4b300e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Mar 4 16:19:24 2013 +0200

    Remove unused variables
    
    Change-Id: I81c62dd3f6319d6ca9c0da518ca07391a80179da

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 1ea929e..9c3c18b 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -95,16 +95,10 @@ enum SwLabelType
 };
 
 
-const sal_uInt8 OLD_MAXLEVEL = 5;
-const sal_uInt8 MAXLEVEL = 10;      // Was: numrule.hxx.
-const sal_uInt8 NO_NUM      = 200;  // Was:  numrule.hxx.
+const sal_uInt8 MAXLEVEL = 10;
 
-
-// For paragraphs with NO_NUM but on different levels.
-// This makes the NO_NUM inapplicable.
 const sal_uInt8 NO_NUMLEVEL  = 0x20;    // "or" with the levels.
 
-
 // Some helper functions as macros or inlines.
 
 // One kilobyte is 1024 bytes: