[Libreoffice-commits] .: UnoControls/source
Miklos Vajna
vmiklos at kemper.freedesktop.org
Thu Apr 19 00:36:19 PDT 2012
UnoControls/source/base/basecontainercontrol.cxx | 2
UnoControls/source/base/basecontrol.cxx | 4 -
UnoControls/source/controls/framecontrol.cxx | 12 ++--
UnoControls/source/controls/progressbar.cxx | 2
UnoControls/source/controls/progressmonitor.cxx | 62 +++++++++++------------
UnoControls/source/controls/statusindicator.cxx | 16 ++---
6 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit c39d96a8e986c85259d01884762bd135fa0d0f5b
Author: Szabolcs Dezsi <dezsiszabi at hotmail.com>
Date: Thu Apr 19 09:05:43 2012 +0200
Removed RTL_CONSTASCII_USTRINGPARAM from UnoControls
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index 1105941..f219b3f 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -560,7 +560,7 @@ WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Referen
WindowDescriptor * aDescriptor = new WindowDescriptor ;
aDescriptor->Type = WindowClass_CONTAINER ;
- aDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("window")) ;
+ aDescriptor->WindowServiceName = "window" ;
aDescriptor->ParentIndex = -1 ;
aDescriptor->Parent = rParentPeer ;
aDescriptor->Bounds = getPosSize () ;
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 1240bb2..f3f1307 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -368,7 +368,7 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo
if ( xLocalToolkit.is() == sal_False )
{
// but first create wellknown toolkit, if it not exist
- xLocalToolkit = Reference< XToolkit > ( m_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_VCLTOOLKIT )) ), UNO_QUERY );
+ xLocalToolkit = Reference< XToolkit > ( m_xFactory->createInstance( SERVICE_VCLTOOLKIT ), UNO_QUERY );
}
m_xPeer = xLocalToolkit->createWindow( *pDescriptor );
m_xPeerWindow = Reference< XWindow >( m_xPeer, UNO_QUERY );
@@ -934,7 +934,7 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo
WindowDescriptor* pDescriptor = new WindowDescriptor ;
pDescriptor->Type = WindowClass_SIMPLE ;
- pDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("window")) ;
+ pDescriptor->WindowServiceName = "window" ;
pDescriptor->ParentIndex = -1 ;
pDescriptor->Parent = xParentPeer ;
pDescriptor->Bounds = getPosSize () ;
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx
index 6b29190..71911a9 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -310,7 +310,7 @@ const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
{
MutexGuard aGuard( Mutex::getGlobalMutex() );
Sequence< OUString > seqServiceNames( 1 );
- seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_FRAMECONTROL ));
+ seqServiceNames.getArray() [0] = SERVICENAME_FRAMECONTROL;
return seqServiceNames ;
}
@@ -508,7 +508,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee
xOldFrame = m_xFrame ;
}
- xNewFrame = Reference< XFrame > ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY ) ;
+ xNewFrame = Reference< XFrame > ( impl_getMultiServiceFactory()->createInstance ( "com.sun.star.frame.Frame" ), UNO_QUERY ) ;
Reference< XDispatchProvider > xDSP ( xNewFrame, UNO_QUERY ) ;
if (xDSP.is())
@@ -519,7 +519,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee
// option
//xFrame->setName( "WhatYouWant" );
- Reference< XURLTransformer > xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY ) ;
+ Reference< XURLTransformer > xTrans ( impl_getMultiServiceFactory()->createInstance ( "com.sun.star.util.URLTransformer" ), UNO_QUERY ) ;
if(xTrans.is())
{
// load file
@@ -591,9 +591,9 @@ const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor()
// All Properties of this implementation. The array must be sorted!
static const Property pPropertys[PROPERTY_COUNT] =
{
- Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_COMPONENTURL )), PROPERTYHANDLE_COMPONENTURL , ::getCppuType((const OUString*)0) , PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
- Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_FRAME )), PROPERTYHANDLE_FRAME , ::getCppuType((const Reference< XFrame >*)0) , PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT ),
- Property( OUString(RTL_CONSTASCII_USTRINGPARAM( PROPERTYNAME_LOADERARGUMENTS )), PROPERTYHANDLE_LOADERARGUMENTS , ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
+ Property( PROPERTYNAME_COMPONENTURL, PROPERTYHANDLE_COMPONENTURL, ::getCppuType((const OUString*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED ),
+ Property( PROPERTYNAME_FRAME, PROPERTYHANDLE_FRAME, ::getCppuType((const Reference< XFrame >*)0), PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT ),
+ Property( PROPERTYNAME_LOADERARGUMENTS, PROPERTYHANDLE_LOADERARGUMENTS, ::getCppuType((const Sequence< PropertyValue >*)0), PropertyAttribute::BOUND | PropertyAttribute::CONSTRAINED )
};
static const Sequence< Property > seqPropertys( pPropertys, PROPERTY_COUNT );
diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx
index f105408..7de4177 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -364,7 +364,7 @@ const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
{
MutexGuard aGuard( Mutex::getGlobalMutex() );
Sequence< OUString > seqServiceNames( 1 );
- seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR ));
+ seqServiceNames.getArray() [0] = SERVICENAME_PROGRESSBAR;
return seqServiceNames ;
}
diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index b3a5182..105010c 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -77,12 +77,12 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
++m_refCount ;
// Create instances for fixedtext, button and progress ...
- m_xTopic_Top = Reference< XFixedText > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY ) ;
- m_xText_Top = Reference< XFixedText > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY ) ;
- m_xTopic_Bottom = Reference< XFixedText > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY ) ;
- m_xText_Bottom = Reference< XFixedText > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY ) ;
- m_xButton = Reference< XButton > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( BUTTON_SERVICENAME )) ), UNO_QUERY ) ;
- m_xProgressBar = Reference< XProgressBar > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR )) ), UNO_QUERY ) ;
+ m_xTopic_Top = Reference< XFixedText > ( xFactory->createInstance ( FIXEDTEXT_SERVICENAME ), UNO_QUERY ) ;
+ m_xText_Top = Reference< XFixedText > ( xFactory->createInstance ( FIXEDTEXT_SERVICENAME ), UNO_QUERY ) ;
+ m_xTopic_Bottom = Reference< XFixedText > ( xFactory->createInstance ( FIXEDTEXT_SERVICENAME ), UNO_QUERY ) ;
+ m_xText_Bottom = Reference< XFixedText > ( xFactory->createInstance ( FIXEDTEXT_SERVICENAME ), UNO_QUERY ) ;
+ m_xButton = Reference< XButton > ( xFactory->createInstance ( BUTTON_SERVICENAME ), UNO_QUERY ) ;
+ m_xProgressBar = Reference< XProgressBar > ( xFactory->createInstance ( SERVICENAME_PROGRESSBAR ), UNO_QUERY ) ;
// ... cast controls to Reference< XControl > (for "setModel"!) ...
Reference< XControl > xRef_Topic_Top ( m_xTopic_Top , UNO_QUERY ) ;
@@ -93,20 +93,20 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
Reference< XControl > xRef_ProgressBar ( m_xProgressBar , UNO_QUERY ) ;
// ... set models ...
- xRef_Topic_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
- xRef_Text_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
- xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
- xRef_Text_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) ) ;
- xRef_Button->setModel ( Reference< XControlModel > ( xFactory->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM( BUTTON_MODELNAME )) ), UNO_QUERY ) ) ;
+ xRef_Topic_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( FIXEDTEXT_MODELNAME ), UNO_QUERY ) ) ;
+ xRef_Text_Top->setModel ( Reference< XControlModel > ( xFactory->createInstance ( FIXEDTEXT_MODELNAME ), UNO_QUERY ) ) ;
+ xRef_Topic_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( FIXEDTEXT_MODELNAME ), UNO_QUERY ) ) ;
+ xRef_Text_Bottom->setModel ( Reference< XControlModel > ( xFactory->createInstance ( FIXEDTEXT_MODELNAME ), UNO_QUERY ) ) ;
+ xRef_Button->setModel ( Reference< XControlModel > ( xFactory->createInstance ( BUTTON_MODELNAME ), UNO_QUERY ) ) ;
// ProgressBar has no model !!!
// ... and add controls to basecontainercontrol!
- addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT )) , xRef_Topic_Top ) ;
- addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT )) , xRef_Text_Top ) ;
- addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT )) , xRef_Topic_Bottom ) ;
- addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT )) , xRef_Text_Bottom ) ;
- addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_BUTTON )) , xRef_Button ) ;
- addControl ( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_PROGRESSBAR )) , xRef_ProgressBar ) ;
+ addControl ( CONTROLNAME_TEXT, xRef_Topic_Top ) ;
+ addControl ( CONTROLNAME_TEXT, xRef_Text_Top ) ;
+ addControl ( CONTROLNAME_TEXT, xRef_Topic_Bottom ) ;
+ addControl ( CONTROLNAME_TEXT, xRef_Text_Bottom ) ;
+ addControl ( CONTROLNAME_BUTTON, xRef_Button ) ;
+ addControl ( CONTROLNAME_PROGRESSBAR, xRef_ProgressBar ) ;
// FixedText make it automaticly visible by himself ... but not the progressbar !!!
// it must be set explicitly
@@ -115,11 +115,11 @@ ProgressMonitor::ProgressMonitor( const Reference< XMultiServiceFactory >& xFact
// Reset to defaults !!!
// (progressbar take automaticly its own defaults)
- m_xButton->setLabel ( OUString(RTL_CONSTASCII_USTRINGPARAM( DEFAULT_BUTTONLABEL )) ) ;
- m_xTopic_Top->setText ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TOPIC )) ) ;
- m_xText_Top->setText ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TEXT )) ) ;
- m_xTopic_Bottom->setText ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TOPIC )) ) ;
- m_xText_Bottom->setText ( OUString(RTL_CONSTASCII_USTRINGPARAM( PROGRESSMONITOR_DEFAULT_TEXT )) ) ;
+ m_xButton->setLabel ( DEFAULT_BUTTONLABEL ) ;
+ m_xTopic_Top->setText ( PROGRESSMONITOR_DEFAULT_TOPIC ) ;
+ m_xText_Top->setText ( PROGRESSMONITOR_DEFAULT_TEXT ) ;
+ m_xTopic_Bottom->setText ( PROGRESSMONITOR_DEFAULT_TOPIC ) ;
+ m_xText_Bottom->setText ( PROGRESSMONITOR_DEFAULT_TEXT ) ;
--m_refCount ;
}
@@ -674,7 +674,7 @@ const Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames(
{
MutexGuard aGuard( Mutex::getGlobalMutex() );
Sequence< OUString > seqServiceNames( 1 );
- seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSMONITOR ));
+ seqServiceNames.getArray() [0] = SERVICENAME_PROGRESSMONITOR;
return seqServiceNames ;
}
@@ -891,9 +891,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
{
IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
aCollectString += pSearchItem->sTopic ;
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ;
+ aCollectString += "\n";
}
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-)
+ aCollectString += "\0"; // It's better :-)
m_xTopic_Top->setText ( aCollectString ) ;
}
@@ -909,9 +909,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
{
IMPL_TextlistItem* pSearchItem = maTextlist_Top[ n ];
aCollectString += pSearchItem->sText ;
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ;
+ aCollectString += "\n";
}
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-)
+ aCollectString += "\0"; // It's better :-)
m_xText_Top->setText ( aCollectString ) ;
}
@@ -929,9 +929,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
{
IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
aCollectString += pSearchItem->sTopic ;
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ;
+ aCollectString += "\n";
}
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-)
+ aCollectString += "\0"; // It's better :-)
m_xTopic_Bottom->setText ( aCollectString ) ;
}
@@ -947,9 +947,9 @@ void ProgressMonitor::impl_rebuildFixedText ()
{
IMPL_TextlistItem* pSearchItem = maTextlist_Bottom[ n ];
aCollectString += pSearchItem->sText ;
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ;
+ aCollectString += "\n";
}
- aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-)
+ aCollectString += "\0"; // It's better :-)
m_xText_Bottom->setText ( aCollectString ) ;
}
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 75ac84d..64a1cfc 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -70,23 +70,23 @@ StatusIndicator::StatusIndicator( const Reference< XMultiServiceFactory >& xFact
++m_refCount ;
// Create instances for fixedtext and progress ...
- m_xText = Reference< XFixedText > ( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_SERVICENAME )) ), UNO_QUERY );
- m_xProgressBar = Reference< XProgressBar > ( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_PROGRESSBAR )) ), UNO_QUERY );
+ m_xText = Reference< XFixedText > ( xFactory->createInstance( FIXEDTEXT_SERVICENAME ), UNO_QUERY );
+ m_xProgressBar = Reference< XProgressBar > ( xFactory->createInstance( SERVICENAME_PROGRESSBAR ), UNO_QUERY );
// ... cast controls to Reference< XControl > and set model ...
// ( ProgressBar has no model !!! )
Reference< XControl > xTextControl ( m_xText , UNO_QUERY );
Reference< XControl > xProgressControl ( m_xProgressBar, UNO_QUERY );
- xTextControl->setModel( Reference< XControlModel >( xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( FIXEDTEXT_MODELNAME )) ), UNO_QUERY ) );
+ xTextControl->setModel( Reference< XControlModel >( xFactory->createInstance( FIXEDTEXT_MODELNAME ), UNO_QUERY ) );
// ... and add controls to basecontainercontrol!
- addControl( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_TEXT )), xTextControl );
- addControl( OUString(RTL_CONSTASCII_USTRINGPARAM( CONTROLNAME_PROGRESSBAR )), xProgressControl );
+ addControl( CONTROLNAME_TEXT, xTextControl );
+ addControl( CONTROLNAME_PROGRESSBAR, xProgressControl );
// FixedText make it automaticly visible by himself ... but not the progressbar !!!
// it must be set explicitly
Reference< XWindow > xProgressWindow( m_xProgressBar, UNO_QUERY );
xProgressWindow->setVisible( sal_True );
// Reset to defaults !!!
// (progressbar take automaticly its own defaults)
- m_xText->setText( OUString(RTL_CONSTASCII_USTRINGPARAM( STATUSINDICATOR_DEFAULT_TEXT )) );
+ m_xText->setText( STATUSINDICATOR_DEFAULT_TEXT );
--m_refCount ;
}
@@ -432,7 +432,7 @@ const Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames(
{
MutexGuard aGuard( Mutex::getGlobalMutex() );
Sequence< OUString > seqServiceNames( 1 );
- seqServiceNames.getArray() [0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICENAME_STATUSINDICATOR ));
+ seqServiceNames.getArray() [0] = SERVICENAME_STATUSINDICATOR;
return seqServiceNames ;
}
@@ -458,7 +458,7 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XW
WindowDescriptor* pDescriptor = new WindowDescriptor ;
pDescriptor->Type = WindowClass_SIMPLE ;
- pDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("floatingwindow")) ;
+ pDescriptor->WindowServiceName = "floatingwindow" ;
pDescriptor->ParentIndex = -1 ;
pDescriptor->Parent = xParentPeer ;
pDescriptor->Bounds = getPosSize () ;
More information about the Libreoffice-commits
mailing list