summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-06 15:44:12 +0200
committerNoel Grandin <noel@peralex.com>2013-09-11 09:45:31 +0200
commitb0f07a96489f3aa5d65b53322e61f5be747899fd (patch)
tree703f70ec4299f962972e79c4a2e09cd3cdf6e1f7
parent15c9ed6bd3045f281ffdd30f6af638e554bbb07d (diff)
convert include/editeng/paperinf.hxx from String to OUString
Change-Id: I6b358d82c30bdb079c5adb26d8fbcc20684ad5b5
-rw-r--r--editeng/source/items/paperinf.cxx4
-rw-r--r--include/editeng/paperinf.hxx3
2 files changed, 3 insertions, 4 deletions
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 4eb285f5d138..76b29bf559e5 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -117,9 +117,9 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
Description: String representation for the SV-defines of paper size
------------------------------------------------------------------------*/
-String SvxPaperInfo::GetName( Paper ePaper )
+OUString SvxPaperInfo::GetName( Paper ePaper )
{
- return String( Printer::GetPaperName( ePaper ) );
+ return Printer::GetPaperName( ePaper );
}
diff --git a/include/editeng/paperinf.hxx b/include/editeng/paperinf.hxx
index 2c53ca554122..a0fe49262651 100644
--- a/include/editeng/paperinf.hxx
+++ b/include/editeng/paperinf.hxx
@@ -30,7 +30,6 @@
class Printer;
class Size;
-class String;
// class SvxPaperInfo -----------------------------------------------------
@@ -42,7 +41,7 @@ public:
static Size GetPaperSize( const Printer* pPrinter );
static Paper GetSvxPaper( const Size &rSize, MapUnit eUnit = MAP_TWIP, bool bSloppy = sal_False );
static long GetSloppyPaperDimension( long nSize, MapUnit eUnit = MAP_TWIP );
- static String GetName( Paper ePaper );
+ static OUString GetName( Paper ePaper );
};
// INLINE -----------------------------------------------------------------