diff options
| author | David Tardon <dtardon@redhat.com> | 2011-11-21 09:00:21 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-11-21 09:03:43 +0100 |
| commit | 737f61ba4c202834e70bbaa746b4a9ce0137a891 (patch) | |
| tree | 3ba0de5068dbd7972161af72c893204ecd5d36be /sfx2 | |
| parent | ee3ad385fb3ca476e57e80d7b77c1e184e52e1d8 (diff) | |
Convert Sal to rtl::O(U)String
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/printhelper.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/view/printer.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index abc3b0d38a3b..6326615987a3 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -345,11 +345,10 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > // Name-Property? if ( rProp.Name.compareToAscii( "Name" ) == 0 ) { - ::rtl::OUString sTemp; - if ( ( rProp.Value >>= sTemp ) == sal_False ) + ::rtl::OUString aPrinterName; + if ( ! ( rProp.Value >>= aPrinterName ) ) throw ::com::sun::star::lang::IllegalArgumentException(); - String aPrinterName( sTemp ) ; if ( aPrinterName != pPrinter->GetName() ) { pPrinter = new SfxPrinter( pPrinter->GetOptions().Clone(), aPrinterName ); diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 5f044c94dc0b..818f23523dac 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -146,7 +146,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions, Printer ( rPrinterName ), pOptions ( pTheOptions ), - bKnown ( GetName() == rPrinterName ) + bKnown ( String( GetName() ) == rPrinterName ) { pImpl = new SfxPrinter_Impl; |