[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Caolán McNamara]

 svx/source/items/algitem.cxx |    8 ++++----
 svx/source/xoutdev/xattr.cxx |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a4a938f1ac9eea09e2fc7dd53d5c7e2d7ad1ddc2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 9 15:14:26 2013 +0100

    metric strings loaded from wrong .src
    
    Change-Id: I5261a699a44bc7eb6ecca1842f2390a0778d7b09
    (cherry picked from commit e3cf54875031b8740b3ed76d6f530c44d2d8c44e)
    Reviewed-on: https://gerrit.libreoffice.org/5335
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index e0b0aa0..1451fdb 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -266,19 +266,19 @@ SfxItemPresentation SvxMarginItem::GetPresentation
         {
             rText = SVX_RESSTR(RID_SVXITEMS_MARGIN_LEFT) +
                         GetMetricText( (long)nLeftMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        SVX_RESSTR(GetMetricId(ePresUnit)) +
+                        EE_RESSTR(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SVX_RESSTR(RID_SVXITEMS_MARGIN_TOP) +
                         GetMetricText( (long)nTopMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        SVX_RESSTR(GetMetricId(ePresUnit)) +
+                        EE_RESSTR(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SVX_RESSTR(RID_SVXITEMS_MARGIN_RIGHT) +
                         GetMetricText( (long)nRightMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        SVX_RESSTR(GetMetricId(ePresUnit)) +
+                        EE_RESSTR(GetMetricId(ePresUnit)) +
                         cpDelimTmp +
                         SVX_RESSTR(RID_SVXITEMS_MARGIN_BOTTOM) +
                         GetMetricText( (long)nBottomMargin, eCoreUnit, ePresUnit, pIntl ) +
-                        SVX_RESSTR(GetMetricId(ePresUnit));
+                        EE_RESSTR(GetMetricId(ePresUnit));
             return SFX_ITEM_PRESENTATION_COMPLETE;
         }
         default: ; //prevent warning
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 540941f..b687590 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1317,7 +1317,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetMetricText( (long) GetValue(),
                                     eCoreUnit, ePresUnit, pIntl) +
-                    SVX_RESSTR( GetMetricId( ePresUnit) );
+                    EE_RESSTR( GetMetricId( ePresUnit) );
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;
@@ -2462,7 +2462,7 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetMetricText( (long) GetValue(),
                                     eCoreUnit, ePresUnit, pIntl) +
-                    SVX_RESSTR( GetMetricId( ePresUnit) );
+                    EE_RESSTR( GetMetricId( ePresUnit) );
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;
@@ -2553,7 +2553,7 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
         case SFX_ITEM_PRESENTATION_COMPLETE:
             rText = GetMetricText( (long) GetValue(),
                                     eCoreUnit, ePresUnit, pIntl) +
-                    SVX_RESSTR( GetMetricId( ePresUnit) );
+                    EE_RESSTR( GetMetricId( ePresUnit) );
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;