Skip to content

C
core
Kaydet (Commit) 10272d32 authored tarafından Ivan Timofeev's avatar Ivan Timofeev
Dosyalara gözat
Seçenekler

String -> OUString 

Change-Id: Ibbd6305e78738403b5140a27125f452b3ec2ec8b
üst b31f9715
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 11 deletions
starmath/source/unomodel.cxx
Dosyayı görüntüle @ 10272d32
...@@ -58,9 +58,6 @@ using namespace ::com::sun::star::formula; ...@@ -58,9 +58,6 @@ using namespace ::com::sun::star::formula;
using namespace ::com::sun::star::view; using namespace ::com::sun::star::view;
using namespace ::com::sun::star::script; using namespace ::com::sun::star::script;
using rtl::OUString;
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
...@@ -91,9 +88,9 @@ SmPrintUIOptions::SmPrintUIOptions() ...@@ -91,9 +88,9 @@ SmPrintUIOptions::SmPrintUIOptions()
// create Section for formula (results in an extra tab page in dialog) // create Section for formula (results in an extra tab page in dialog)
SvtModuleOptions aOpt; SvtModuleOptions aOpt;
String aAppGroupname( aLocalizedStrings.GetString( 0 ) ); OUString aAppGroupname(
aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), aLocalizedStrings.GetString( 0 ).
aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ); replaceFirst( "%s", aOpt.GetModuleName( SvtModuleOptions::E_SMATH ) ) );
m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"); m_aUIProperties[nIdx++].Value = setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage");
// create subgroup for print options // create subgroup for print options
...@@ -473,13 +470,12 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* ...@@ -473,13 +470,12 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
case HANDLE_CUSTOM_FONT_NAME_SANS : case HANDLE_CUSTOM_FONT_NAME_SANS :
case HANDLE_CUSTOM_FONT_NAME_FIXED : case HANDLE_CUSTOM_FONT_NAME_FIXED :
{ {
OUString aText; OUString sFontName;
*pValues >>= aText; *pValues >>= sFontName;
String sFontName = aText; if(sFontName.isEmpty())
if(!sFontName.Len())
throw IllegalArgumentException(); throw IllegalArgumentException();
if(aFormat.GetFont((*ppEntries)->mnMemberId).GetName() != sFontName) if(OUString(aFormat.GetFont((*ppEntries)->mnMemberId).GetName()) != sFontName)
{ {
const SmFace rOld = aFormat.GetFont((*ppEntries)->mnMemberId); const SmFace rOld = aFormat.GetFont((*ppEntries)->mnMemberId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment