[ooo-build-commit] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                    |    1 
 patches/dev300/metric-field-limits.diff |   91 --------------------------------
 2 files changed, 92 deletions(-)

New commits:
commit 1be6c28171c72f67a29e2972298b2f7a5f191da8
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Sep 14 15:36:42 2010 +0200

    metric-field-limits.diff: moved to git repos

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 70f0876..0a8375d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3274,7 +3274,6 @@ svtools-wmf-clipperf.diff, n#535304, thorsten
 sw-caption-separator.diff, i#110287, timar
 # Fix name order for Hungarian on the UI
 svx-hu-name-order.diff, i#105342, timar
-metric-field-limits.diff, cbosdo
 
 # In some cases when exporting a PDF from a presentation, we are asked
 # to export an empty "link annotation", which gets turned into a
diff --git a/patches/dev300/metric-field-limits.diff b/patches/dev300/metric-field-limits.diff
deleted file mode 100644
index 0a7f1d1..0000000
--- a/patches/dev300/metric-field-limits.diff
+++ /dev/null
@@ -1,91 +0,0 @@
----
- cui/source/tabpages/numpages.cxx |   23 -----------------------
- vcl/inc/vcl/field.hxx            |    4 +++-
- vcl/source/control/field.cxx     |   15 +++++++++++++++
- 3 files changed, 18 insertions(+), 24 deletions(-)
-
-diff --git cui/source/tabpages/numpages.cxx cui/source/tabpages/numpages.cxx
-index 368859a..e18531f 100644
---- cui/source/tabpages/numpages.cxx
-+++ cui/source/tabpages/numpages.cxx
-@@ -3087,29 +3087,6 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
-     pPreviewWIN->SetPositionMode();
-     eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
- 
--    //HACK("der Wert sollte mal sinnvol gesetzt werden")
--    long nWidth = 10000;
--    nWidth = OutputDevice::LogicToLogic( nWidth,
--                                            (MapUnit)eCoreUnit, MAP_100TH_MM );
--
--    aDistBorderMF.SetMax(aDistBorderMF.Normalize( nWidth ), FUNIT_100TH_MM );
--    aDistNumMF   .SetMax(aDistNumMF   .Normalize( nWidth ), FUNIT_100TH_MM );
--    aIndentMF    .SetMax(aIndentMF    .Normalize( nWidth ), FUNIT_100TH_MM );
--    // --> OD 2008-02-18 #newlistlevelattrs#
--    aListtabMF.SetMax(aListtabMF.Normalize( nWidth ), FUNIT_100TH_MM );
--    aAlignedAtMF.SetMax(aAlignedAtMF.Normalize( nWidth ), FUNIT_100TH_MM );
--    aIndentAtMF.SetMax(aIndentAtMF.Normalize( nWidth ), FUNIT_100TH_MM );
--    // <--
--    long nLast2 = nWidth /2;
--    aDistBorderMF.SetLast( aDistBorderMF.Normalize(   nLast2 ), FUNIT_100TH_MM );
--    aDistNumMF   .SetLast( aDistNumMF     .Normalize( nLast2 ), FUNIT_100TH_MM );
--    aIndentMF    .SetLast( aIndentMF      .Normalize( nLast2 ), FUNIT_100TH_MM );
--    // --> OD 2008-02-18 #newlistlevelattrs#
--    aListtabMF.SetLast(aListtabMF.Normalize( nLast2 ), FUNIT_100TH_MM );
--    aAlignedAtMF.SetLast(aAlignedAtMF.Normalize( nLast2 ), FUNIT_100TH_MM );
--    aIndentAtMF.SetLast(aIndentAtMF.Normalize( nLast2 ), FUNIT_100TH_MM );
--    // <--
--
- #if OSL_DEBUG_LEVEL > 1
-     pDebugFixedText = new FixedText(this, 0);
-     pDebugFixedText->Show();
-diff --git vcl/inc/vcl/field.hxx vcl/inc/vcl/field.hxx
-index 0b2a49d..ceed224 100644
---- vcl/inc/vcl/field.hxx
-+++ vcl/inc/vcl/field.hxx
-@@ -255,7 +255,7 @@ public:
-     virtual void            CustomConvert() = 0;
-     virtual void            Reformat();
- 
--    void                    SetUnit( FieldUnit meUnit );
-+    virtual void            SetUnit( FieldUnit meUnit );
-     FieldUnit               GetUnit() const { return meUnit; }
-     void                    SetCustomUnitText( const XubString& rStr );
-     const XubString&        GetCustomUnitText() const { return maCustomUnitText; }
-@@ -569,6 +569,8 @@ public:
-     virtual void            Last();
-     virtual void            CustomConvert();
- 
-+    virtual void            SetUnit( FieldUnit meUnit );
-+
-     void                    SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit );
-     inline void             SetFirst(sal_Int64 first) { SetFirst(first, FUNIT_NONE); }
-     sal_Int64               GetFirst( FieldUnit eOutUnit ) const;
-diff --git vcl/source/control/field.cxx vcl/source/control/field.cxx
-index 88be56a..dff681f 100644
---- vcl/source/control/field.cxx
-+++ vcl/source/control/field.cxx
-@@ -1747,6 +1747,21 @@ MetricField::~MetricField()
- {
- }
- 
-+void MetricField::SetUnit( FieldUnit nNewUnit )
-+{
-+    sal_Int64 nMax = Denormalize( GetMax( nNewUnit ) );
-+    sal_Int64 nMin = Denormalize( GetMin( nNewUnit ) );
-+    sal_Int64 nFirst = Denormalize( GetFirst( nNewUnit ) );
-+    sal_Int64 nLast = Denormalize( GetLast( nNewUnit ) );
-+
-+    MetricFormatter::SetUnit( nNewUnit );
-+
-+    SetMax( Normalize( nMax ), nNewUnit );
-+    SetMin( Normalize( nMin ), nNewUnit );
-+    SetFirst( Normalize( nFirst ), nNewUnit );
-+    SetLast( Normalize( nLast ), nNewUnit );
-+}
-+
- // -----------------------------------------------------------------------
- 
- void MetricField::SetFirst( sal_Int64 nNewFirst, FieldUnit eInUnit )
--- 
-1.7.0.1
-