mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RTL_CONSTASCII_(U)STRING in forms

Browse Source 
Change-Id: I5086a8ba9073e8ef2dfde0ecae55ee6065cb0253
This commit is contained in:
Chr. Rossmanith
2013-04-01 14:29:27 +02:00
parent 1ed7398463
commit 0502d66d88
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/source/inc/FormComponent.hxx
View File

@@ -93,7 +93,7 @@ namespace frm
// old macro for quickly implementing XServiceInfo::getImplementationName // old macro for quickly implementing XServiceInfo::getImplementationName
#define IMPLEMENTATION_NAME(ImplName) \ #define IMPLEMENTATION_NAME(ImplName) \
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \
{ return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); } { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(#ImplName); }
class OControlModel; class OControlModel;

2
forms/source/inc/forms_module.hxx
View File

@@ -228,7 +228,7 @@ namespace FORMS_MODULE_NAMESPACE
} \ } \
\ \
::rtl::OUString SAL_CALL classname::getImplementationName_Static() \ ::rtl::OUString SAL_CALL classname::getImplementationName_Static() \
{ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms."#classname ) ); } \ { return ::rtl::OUString( "com.sun.star.comp.forms."#classname ); } \
\ \
Reference< XInterface > SAL_CALL classname::Create( const Reference< XMultiServiceFactory >& _rxFactory ) \ Reference< XInterface > SAL_CALL classname::Create( const Reference< XMultiServiceFactory >& _rxFactory ) \
{ return static_cast< XServiceInfo* >( new classname( _rxFactory ) ); } \ { return static_cast< XServiceInfo* >( new classname( _rxFactory ) ); } \

4
forms/source/misc/services.cxx
View File

@@ -123,7 +123,7 @@ void registerClassInfo(
//....................................................................................... //.......................................................................................
#define REGISTER_CLASS_CORE(classImplName) \ #define REGISTER_CLASS_CORE(classImplName) \
registerClassInfo( \ registerClassInfo( \
::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \ ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(#classImplName), \
aServices, \ aServices, \
frm::classImplName##_CreateInstance) frm::classImplName##_CreateInstance)
@@ -265,7 +265,7 @@ void ensureClassInfos()
// = XForms core // = XForms core
#define REGISTER_XFORMS_CLASS(name) \ #define REGISTER_XFORMS_CLASS(name) \
aServices.realloc(1); \ aServices.realloc(1); \
aServices.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xforms." #name )); \ aServices.getArray()[0] = rtl::OUString( "com.sun.star.xforms." #name ); \
REGISTER_CLASS_CORE(name) REGISTER_CLASS_CORE(name)
REGISTER_XFORMS_CLASS(Model); REGISTER_XFORMS_CLASS(Model);

2
forms/source/richtext/richtextengine.cxx
View File

@@ -59,7 +59,7 @@ namespace frm
// defaults // defaults
Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont(); Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ) ); aFont.SetName( String( "Times New Roman" ) );
pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
// 12 pt font size // 12 pt font size

2
forms/source/richtext/richtextimplcontrol.cxx
View File

@@ -468,7 +468,7 @@ namespace frm
{ {
m_pViewport->Push( PUSH_FONT ); m_pViewport->Push( PUSH_FONT );
m_pViewport->SetFont( m_pEngine->GetStandardFont(0) ); m_pViewport->SetFont( m_pEngine->GetStandardFont(0) );
nFontWidth = m_pViewport->GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "x" ) ) ); nFontWidth = m_pViewport->GetTextWidth( String( "x" ) );
m_pViewport->Pop(); m_pViewport->Pop();
} }
// ... is the scroll size for the horizontal scrollbar // ... is the scroll size for the horizontal scrollbar