[Libreoffice-commits] .: svx/source

[Takeshi Abe]

 svx/source/dialog/_contdlg.cxx |   21 ------------------
 svx/source/dialog/dlgunit.hxx  |   47 +++++++++++++++++++++++++++++++++++++++++
 svx/source/dialog/imapdlg.cxx  |   17 --------------
 3 files changed, 49 insertions(+), 36 deletions(-)

New commits:
commit ff9da5a017a56c06a644cf5da8d4a34f4b275df8
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Oct 12 12:16:24 2011 +0900

    extract a common inline function into header

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 8245faa..a100128 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -62,26 +62,7 @@
 #include <svx/svdopath.hxx>
 #include "svx/dlgutil.hxx"
 #include <vcl/svapp.hxx>
-
-/******************************************************************************/
-
-inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
-{
-    String aVal = UniString::CreateFromInt64( MetricField::ConvertValue( nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
-
-    while( aVal.Len() < 3 )
-        aVal.Insert( sal_Unicode('0'), 0 );
-
-    aVal.Insert( cSep, aVal.Len() - 2 );
-    aVal += sal_Unicode(' ');
-    aVal += SdrFormatter::GetUnitStr( eFieldUnit );
-
-    return aVal;
-}
-
-
-/******************************************************************************/
-
+#include "dlgunit.hxx"
 
 SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
 
diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
new file mode 100644
index 0000000..3fcb099
--- /dev/null
+++ b/svx/source/dialog/dlgunit.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SVX_DLG_DLGUNIT_HXX
+#define _SVX_DLG_DLGUNIT_HXX
+
+inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
+{
+    String aVal = UniString::CreateFromInt64( MetricField::ConvertValue( nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
+
+    while( aVal.Len() < 3 )
+        aVal.Insert( sal_Unicode('0'), 0 );
+
+    aVal.Insert( cSep, aVal.Len() - 2 );
+    aVal += sal_Unicode(' ');
+    aVal += SdrFormatter::GetUnitStr( eFieldUnit );
+
+    return aVal;
+}
+
+#endif // _SVX_DLG_DLGUNIT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 633c8a2..da9b35f 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -75,6 +75,7 @@
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
+#include "dlgunit.hxx"
 
 #define SELF_TARGET         "_self"
 #define IMAP_ALL_FILTER     "<Alle>"
@@ -93,22 +94,6 @@
 
 SFX_IMPL_MODELESSDIALOG( SvxIMapDlgChildWindow, SID_IMAP );
 
-/******************************************************************************/
-
-inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
-{
-    String aVal = UniString::CreateFromInt64( MetricField::ConvertValue( nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
-
-    while( aVal.Len() < 3 )
-        aVal.Insert( sal_Unicode('0'), 0 );
-
-    aVal.Insert( cSep, aVal.Len() - 2 );
-    aVal += sal_Unicode(' ');
-    aVal += SdrFormatter::GetUnitStr( eFieldUnit );
-
-    return aVal;
-}
-
 // ControllerItem
 
 SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :