[Libreoffice-commits] .: vcl/source

[Takeshi Abe]

 vcl/source/control/scrbar.cxx   |   11 +----------
 vcl/source/control/slider.cxx   |   11 +----------
 vcl/source/control/thumbpos.hxx |   23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit 189d21f1c5830318f0ebd7a4ce6a0dff1d34f3df
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue May 8 21:58:58 2012 +0900

    Keep ImplMulDiv() DRY
    
    this follows b07d7d348a728fc54991320ff7bc882f341478af
    
    Change-Id: I41001cec7b8024c9c957481b31ab6bf3badf0abe

diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 78e05fd..863b827 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -58,16 +58,7 @@ using ::rtl::OUString;
     only small deviations feasible.
 */
 
-
-// =======================================================================
-
-static long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
-{
-    if (!nDenominator)
-        return 0;
-    double n = ((double)nNumber * (double)nNumerator) / (double)nDenominator;
-    return (long)n;
-}
+#include "thumbpos.hxx"
 
 // =======================================================================
 
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index c49f4cb..64a6d82 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -31,16 +31,7 @@
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/slider.hxx>
-
-
-
-// =======================================================================
-
-static long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
-{
-    double n = ((double)nNumber * (double)nNumerator) / (double)nDenominator;
-    return (long)n;
-}
+#include "thumbpos.hxx"
 
 // =======================================================================
 
diff --git a/vcl/source/control/thumbpos.hxx b/vcl/source/control/thumbpos.hxx
new file mode 100644
index 0000000..1937125
--- /dev/null
+++ b/vcl/source/control/thumbpos.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _VCL_THUMBPOS_HXX
+#define _VCL_THUMBPOS_HXX
+
+inline long ImplMulDiv( long nNumber, long nNumerator, long nDenominator )
+{
+    if (!nDenominator)
+        return 0;
+    double n = ((double)nNumber * (double)nNumerator) / (double)nDenominator;
+    return (long)n;
+}
+
+#endif // _VCL_THUMBPOS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */