diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-21 10:07:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-21 10:07:32 +0000 |
| commit | 7ed11d215072e770cdf9b67eb576abb88d73ac5e (patch) | |
| tree | 3064056d5400bcfd08f93b5c6f4f1145399342a3 | |
| parent | ditch last ENABLE_STRING_STREAM_OPERATORS (diff) | |
| download | binfilter-7ed11d215072e770cdf9b67eb576abb88d73ac5e.tar.gz binfilter-7ed11d215072e770cdf9b67eb576abb88d73ac5e.zip | |
fix build error
| -rw-r--r-- | binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 2 | ||||
| -rw-r--r-- | binfilter/bf_sfx2/source/view/sfx2_printer.cxx | 4 | ||||
| -rw-r--r-- | binfilter/bf_svx/source/items/svx_paperinf.cxx | 2 | ||||
| -rw-r--r-- | binfilter/inc/bf_sfx2/printer.hxx | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx index 74829820c..1f4256a24 100644 --- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx +++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx @@ -1692,7 +1692,7 @@ void ScStyleObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const uno: Printer* pPrinter = pDocShell->GetPrinter(); if (pPrinter) { - String aNameStr = aName; + rtl::OUString aNameStr = aName; USHORT nCount = pPrinter->GetPaperBinCount(); for (USHORT i=0; i<nCount; i++) if ( aNameStr == pPrinter->GetPaperBinName(i) ) diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx index f78891b59..b03061f7a 100644 --- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx +++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx @@ -52,7 +52,7 @@ namespace binfilter { //-------------------------------------------------------------------- -/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const String& aFontName, +/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const rtl::OUString& aFontName, /*N*/ const FontPitch eFontPitch, const CharSet eFontCharSet ): /*N*/ aName( aFontName ), /*N*/ eFamily( eFontFamily ), @@ -130,7 +130,7 @@ namespace binfilter { //-------------------------------------------------------------------- /*N*/ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, -/*N*/ const String& rPrinterName ) : +/*N*/ const rtl::OUString& rPrinterName ) : /*N*/ /*N*/ Printer ( rPrinterName ), /*N*/ pOptions ( pTheOptions ), diff --git a/binfilter/bf_svx/source/items/svx_paperinf.cxx b/binfilter/bf_svx/source/items/svx_paperinf.cxx index ec82c608f..4c9e6315d 100644 --- a/binfilter/bf_svx/source/items/svx_paperinf.cxx +++ b/binfilter/bf_svx/source/items/svx_paperinf.cxx @@ -115,7 +115,7 @@ static const int nTabSize = SAL_N_ELEMENTS(aDinTab); /*?*/ inline BOOL IsValidPrinter( const Printer* pPtr ) /*?*/ { -/*?*/ return pPtr->GetName().Len() ? TRUE : FALSE; +/*?*/ return pPtr->GetName().getLength() ? TRUE : FALSE; /*?*/ } /*------------------------------------------------------------------------ diff --git a/binfilter/inc/bf_sfx2/printer.hxx b/binfilter/inc/bf_sfx2/printer.hxx index 519f1d492..9862249e1 100644 --- a/binfilter/inc/bf_sfx2/printer.hxx +++ b/binfilter/inc/bf_sfx2/printer.hxx @@ -59,7 +59,7 @@ struct SfxPrinter_Impl; class SfxFont { private: - String aName; + rtl::OUString aName; FontFamily eFamily; FontPitch ePitch; CharSet eCharSet; @@ -68,11 +68,11 @@ private: public: SfxFont( const FontFamily eFam, - const String& aName, + const rtl::OUString& aName, const FontPitch eFontPitch = PITCH_DONTKNOW, const CharSet eFontCharSet = RTL_TEXTENCODING_DONTKNOW ); // ZugriffsMethoden: - inline const String& GetName() const { return aName; } + inline const rtl::OUString& GetName() const { return aName; } inline FontFamily GetFamily() const { return eFamily; } inline FontPitch GetPitch() const { return ePitch; } inline CharSet GetCharSet() const { return eCharSet; } @@ -92,11 +92,11 @@ private: public: SfxPrinter( SfxItemSet *pTheOptions ); SfxPrinter( SfxItemSet *pTheOptions, - const String &rPrinterName ); + const rtl::OUString &rPrinterName ); SfxPrinter( SfxItemSet *pTheOptions, const JobSetup &rTheOrigJobSetup ); SfxPrinter( SfxItemSet *pTheOptions, - const String &rPrinterName, + const rtl::OUString &rPrinterName, const JobSetup &rTheOrigJobSetup ); ~SfxPrinter(); |