diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-27 23:53:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 13:53:36 +0100 |
| commit | 83f50e3f2118746232f7fe115805ee967c1ffcee (patch) | |
| tree | 86f120413cad004a0acb33d9f6894127e13527bb /starmath/source/document.cxx | |
| parent | 694e2cbf9da8c0bef6a064d3a12e44c20a693784 (diff) | |
ditch slightly suboptimal C2S define
Change-Id: I51abdf8539801f6d93cdc1a21a7e0e1a3d5ef785
Diffstat (limited to 'starmath/source/document.cxx')
| -rw-r--r-- | starmath/source/document.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 5cef94519855..b6510284db6e 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -391,14 +391,14 @@ EditEngine& SmDocShell::GetEditEngine() pEditEngine->EnableUndo( true ); pEditEngine->SetDefTab( sal_uInt16( - Application::GetDefaultDevice()->GetTextWidth( C2S("XXXX") ) ) ); + Application::GetDefaultDevice()->GetTextWidth(rtl::OUString("XXXX"))) ); pEditEngine->SetControlWord( (pEditEngine->GetControlWord() | EE_CNTRL_AUTOINDENTING) & (~EE_CNTRL_UNDOATTRIBS) & (~EE_CNTRL_PASTESPECIAL) ); - pEditEngine->SetWordDelimiters( C2S(" .=+-*/(){}[];\"" ) ); + pEditEngine->SetWordDelimiters( rtl::OUString(" .=+-*/(){}[];\"" ) ); pEditEngine->SetRefMapMode( MAP_PIXEL ); pEditEngine->SetPaperSize( Size( 800, 0 ) ); @@ -777,7 +777,7 @@ sal_Bool SmDocShell::ConvertFrom(SfxMedium &rMedium) if ( SotStorage::IsStorageFile( pStream ) ) { SvStorageRef aStorage = new SotStorage( pStream, false ); - if ( aStorage->IsStream( C2S( "Equation Native" ) ) ) + if ( aStorage->IsStream(rtl::OUString("Equation Native")) ) { // is this a MathType Storage? MathType aEquation( aText ); @@ -824,12 +824,12 @@ sal_Bool SmDocShell::Load( SfxMedium& rMedium ) uno::Reference < container::XNameAccess > xAccess (xStorage, uno::UNO_QUERY); if ( ( - xAccess->hasByName( C2S( "content.xml" ) ) && - xStorage->isStreamElement( C2S( "content.xml" ) ) + xAccess->hasByName( rtl::OUString("content.xml") ) && + xStorage->isStreamElement( rtl::OUString("content.xml") ) ) || ( - xAccess->hasByName( C2S( "Content.xml" ) ) && - xStorage->isStreamElement( C2S( "Content.xml" ) ) + xAccess->hasByName( rtl::OUString("Content.xml") ) && + xStorage->isStreamElement( rtl::OUString("Content.xml") ) ) ) { |