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

extensions: remove RTL_CONSTASCII_STRINGPARAM in macros

Browse Source 
Change-Id: I24cc59f4e9410e9a67a87950e7452de55122c0ce
This commit is contained in:
Miklos Vajna
2013-03-18 15:33:52 +01:00
parent 9dba77d1b5
commit 35bc07513c
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/source/update/ui/updatecheckui.cxx
View File

@@ -53,12 +53,12 @@
#define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7) #define MSG_ERR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7)
#define PROPERTY_TITLE RTL_CONSTASCII_STRINGPARAM("BubbleHeading") #define PROPERTY_TITLE "BubbleHeading"
#define PROPERTY_TEXT RTL_CONSTASCII_STRINGPARAM("BubbleText") #define PROPERTY_TEXT "BubbleText"
#define PROPERTY_IMAGE RTL_CONSTASCII_STRINGPARAM("BubbleImageURL") #define PROPERTY_IMAGE "BubbleImageURL"
#define PROPERTY_SHOW_BUBBLE RTL_CONSTASCII_STRINGPARAM("BubbleVisible") #define PROPERTY_SHOW_BUBBLE "BubbleVisible"
#define PROPERTY_CLICK_HDL RTL_CONSTASCII_STRINGPARAM("MenuClickHDL") #define PROPERTY_CLICK_HDL "MenuClickHDL"
#define PROPERTY_SHOW_MENUICON RTL_CONSTASCII_STRINGPARAM("MenuIconVisible") #define PROPERTY_SHOW_MENUICON "MenuIconVisible"
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -422,21 +422,21 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
rtl::OUString aString; rtl::OUString aString;
if( rPropertyName.compareToAscii( PROPERTY_TITLE ) == 0 ) { if( rPropertyName == PROPERTY_TITLE ) {
rValue >>= aString; rValue >>= aString;
if ( aString != maBubbleTitle ) { if ( aString != maBubbleTitle ) {
maBubbleTitle = aString; maBubbleTitle = aString;
mbBubbleChanged = true; mbBubbleChanged = true;
} }
} }
else if( rPropertyName.compareToAscii( PROPERTY_TEXT ) == 0 ) { else if( rPropertyName == PROPERTY_TEXT ) {
rValue >>= aString; rValue >>= aString;
if ( aString != maBubbleText ) { if ( aString != maBubbleText ) {
maBubbleText = aString; maBubbleText = aString;
mbBubbleChanged = true; mbBubbleChanged = true;
} }
} }
else if( rPropertyName.compareToAscii( PROPERTY_IMAGE ) == 0 ) { else if( rPropertyName == PROPERTY_IMAGE ) {
rValue >>= aString; rValue >>= aString;
if ( aString != maBubbleImageURL ) { if ( aString != maBubbleImageURL ) {
maBubbleImageURL = aString; maBubbleImageURL = aString;
@@ -444,14 +444,14 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
mbBubbleChanged = true; mbBubbleChanged = true;
} }
} }
else if( rPropertyName.compareToAscii( PROPERTY_SHOW_BUBBLE ) == 0 ) { else if( rPropertyName == PROPERTY_SHOW_BUBBLE ) {
rValue >>= mbShowBubble; rValue >>= mbShowBubble;
if ( mbShowBubble ) if ( mbShowBubble )
Application::PostUserEvent( LINK( this, UpdateCheckUI, UserEventHdl ) ); Application::PostUserEvent( LINK( this, UpdateCheckUI, UserEventHdl ) );
else if ( mpBubbleWin ) else if ( mpBubbleWin )
mpBubbleWin->Show( sal_False ); mpBubbleWin->Show( sal_False );
} }
else if( rPropertyName.compareToAscii( PROPERTY_CLICK_HDL ) == 0 ) { else if( rPropertyName == PROPERTY_CLICK_HDL ) {
uno::Reference< task::XJob > aJob; uno::Reference< task::XJob > aJob;
rValue >>= aJob; rValue >>= aJob;
if ( aJob.is() ) if ( aJob.is() )
@@ -459,7 +459,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
else else
throw lang::IllegalArgumentException(); throw lang::IllegalArgumentException();
} }
else if (rPropertyName.compareToAscii( PROPERTY_SHOW_MENUICON ) == 0) { else if (rPropertyName == PROPERTY_SHOW_MENUICON ) {
bool bShowMenuIcon = sal_False; bool bShowMenuIcon = sal_False;
rValue >>= bShowMenuIcon; rValue >>= bShowMenuIcon;
if ( bShowMenuIcon != mbShowMenuIcon ) if ( bShowMenuIcon != mbShowMenuIcon )
@@ -486,17 +486,17 @@ uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName)
uno::Any aRet; uno::Any aRet;
if( rPropertyName.compareToAscii( PROPERTY_TITLE ) == 0 ) if( rPropertyName == PROPERTY_TITLE )
aRet = uno::makeAny( maBubbleTitle ); aRet = uno::makeAny( maBubbleTitle );
else if( rPropertyName.compareToAscii( PROPERTY_TEXT ) == 0 ) else if( rPropertyName == PROPERTY_TEXT )
aRet = uno::makeAny( maBubbleText ); aRet = uno::makeAny( maBubbleText );
else if( rPropertyName.compareToAscii( PROPERTY_SHOW_BUBBLE ) == 0 ) else if( rPropertyName == PROPERTY_SHOW_BUBBLE )
aRet = uno::makeAny( mbShowBubble ); aRet = uno::makeAny( mbShowBubble );
else if( rPropertyName.compareToAscii( PROPERTY_IMAGE ) == 0 ) else if( rPropertyName == PROPERTY_IMAGE )
aRet = uno::makeAny( maBubbleImageURL ); aRet = uno::makeAny( maBubbleImageURL );
else if( rPropertyName.compareToAscii( PROPERTY_CLICK_HDL ) == 0 ) else if( rPropertyName == PROPERTY_CLICK_HDL )
aRet = uno::makeAny( mrJob ); aRet = uno::makeAny( mrJob );
else if( rPropertyName.compareToAscii( PROPERTY_SHOW_MENUICON ) == 0 ) else if( rPropertyName == PROPERTY_SHOW_MENUICON )
aRet = uno::makeAny( mbShowMenuIcon ); aRet = uno::makeAny( mbShowMenuIcon );
else else
throw beans::UnknownPropertyException(); throw beans::UnknownPropertyException();