[Libreoffice-commits] core.git: 10 commits - i18npool/source i18nutil/source include/svl include/toolkit linguistic/source pyuno/source sal/qa svl/source svtools/source testtools/source toolkit/source unotools/source
Stephan Bergmann
sbergman at redhat.com
Fri Dec 12 03:25:08 PST 2014
i18npool/source/breakiterator/breakiteratorImpl.cxx | 6
i18npool/source/breakiterator/breakiterator_cjk.cxx | 2
i18npool/source/collator/collator_unicode.cxx | 2
i18npool/source/indexentry/indexentrysupplier.cxx | 4
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx | 8
i18npool/source/localedata/LocaleNode.cxx | 12 -
i18npool/source/nativenumber/nativenumbersupplier.cxx | 6
i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 4
i18npool/source/search/textsearch.cxx | 5
i18nutil/source/utility/paper.cxx | 28 +-
include/svl/inettype.hxx | 16 -
include/toolkit/controls/dialogcontrol.hxx | 12 -
include/toolkit/controls/formattedcontrol.hxx | 4
include/toolkit/controls/roadmapcontrol.hxx | 4
include/toolkit/controls/tkscrollbar.hxx | 4
include/toolkit/controls/unocontrolcontainer.hxx | 2
include/toolkit/controls/unocontrolcontainermodel.hxx | 2
include/toolkit/controls/unocontrols.hxx | 62 ++---
include/toolkit/helper/macros.hxx | 2
include/toolkit/helper/servicenames.hxx | 98 ++++-----
linguistic/source/lngsvcmgr.cxx | 32 +--
pyuno/source/module/pyuno_adapter.cxx | 6
sal/qa/osl/condition/osl_Condition_Const.h | 2
sal/qa/osl/file/osl_File_Const.h | 7
svl/source/misc/inettype.cxx | 24 +-
svl/source/numbers/numfmuno.cxx | 42 ++--
svl/source/numbers/zformat.cxx | 6
svl/source/uno/pathservice.cxx | 3
svtools/source/control/vclxaccessibleheaderbar.cxx | 4
svtools/source/graphic/provider.cxx | 15 -
svtools/source/java/javacontext.cxx | 2
svtools/source/svhtml/parhtml.cxx | 4
svtools/source/uno/addrtempuno.cxx | 6
testtools/source/bridgetest/bridgetest.cxx | 2
testtools/source/bridgetest/currentcontextchecker.cxx | 7
toolkit/source/controls/controlmodelcontainerbase.cxx | 104 ++++------
toolkit/source/controls/dialogcontrol.cxx | 14 -
toolkit/source/controls/tree/treecontrol.cxx | 6
toolkit/source/controls/tree/treecontrol.hxx | 2
toolkit/source/controls/unocontrols.cxx | 16 -
toolkit/source/helper/property.cxx | 10
toolkit/source/helper/servicenames.cxx | 55 -----
unotools/source/config/eventcfg.cxx | 2
unotools/source/config/saveopt.cxx | 4
unotools/source/ucbhelper/tempfile.cxx | 2
unotools/source/ucbhelper/ucblockbytes.cxx | 6
46 files changed, 289 insertions(+), 377 deletions(-)
New commits:
commit 6088eb600bf68b65b4fe6eb89224d3cf66361cbf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:24:35 2014 +0100
unotools: Use appropriate OUString functions on string constants
Change-Id: I14d3a3187b8528e3ff9743245b869773c2eb5e98
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index b93dd9e..ef1f984 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -240,7 +240,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, cons
sal_Int32 nPropCount = props.getLength();
for( sal_Int32 index = 0; index < nPropCount; ++index )
{
- if ( props[ index ].Name.equalsAscii( "Script" ) )
+ if ( props[ index ].Name == "Script" )
props[ index ].Value >>= macroURL;
}
m_eventBindingHash[ aName ] = macroURL;
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index f1427cf..fa7e065 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -771,7 +771,7 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl()
, bLoadUserDefinedSettings( false )
{
Sequence< OUString > aNames(1);
- aNames[0] = OUString::createFromAscii(cUserDefinedSettings);
+ aNames[0] = cUserDefinedSettings;
Sequence< Any > aValues = GetProperties( aNames );
EnableNotification( aNames );
const Any* pValues = aValues.getConstArray();
@@ -787,7 +787,7 @@ SvtLoadOptions_Impl::~SvtLoadOptions_Impl()
void SvtLoadOptions_Impl::Commit()
{
Sequence< OUString > aNames(1);
- aNames[0] = OUString::createFromAscii(cUserDefinedSettings);
+ aNames[0] = cUserDefinedSettings;
Sequence< Any > aValues( 1 );
aValues[0].setValue(&bLoadUserDefinedSettings, ::getBooleanCppuType());
PutProperties( aNames, aValues );
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 7665b3d..3ad492e 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -58,7 +58,7 @@ OUString getParentName( const OUString& aFileName )
if( aParent.endsWith(":") && aParent.getLength() == 6 )
aParent += "/";
- if( aParent.equalsAscii( "file://" ) )
+ if( aParent.equalsIgnoreAsciiCase( "file://" ) )
aParent = "file:///";
return aParent;
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 0ec9f47..42bce6a 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -875,8 +875,8 @@ static bool UCBOpenContentSync(
return _UCBOpenContentSync(
xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler);
- if ( !aScheme.equalsAscii( "http" ) &&
- !aScheme.equalsAscii( "https" ) )
+ if ( !aScheme.equalsIgnoreAsciiCase( "http" ) &&
+ !aScheme.equalsIgnoreAsciiCase( "https" ) )
xLockBytes->SetStreamValid_Impl();
Reference< XPropertiesChangeListener > xListener;
@@ -1112,7 +1112,7 @@ static bool _UCBOpenContentSync(
// http protocol must be handled in a special way: during the opening process the input stream may change
// only the last inputstream after notifying the document headers is valid
- if ( !aScheme.equalsAscii("http") )
+ if ( !aScheme.equalsIgnoreAsciiCase("http") )
xLockBytes->SetStreamValid_Impl();
Reference< XPropertiesChangeListener > xListener = new UcbPropertiesChangeListener_Impl( xLockBytes );
commit 55cd108d48f1554d5acef02662d7e93b18b38e34
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:24:15 2014 +0100
testtools: Use appropriate OUString functions on string constants
Change-Id: I5cb34d95e2a59ff6a3f5189beb40b7dbf574dc29
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 25f4aac..61ee77f 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -1150,7 +1150,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
Reference< XInterface > xOriginal;
bool remote;
sal_Int32 i;
- if( rArgs.getLength() > 1 && rArgs[0].equalsAscii( "-u" ) )
+ if( rArgs.getLength() > 1 && rArgs[0] == "-u" )
{
remote = true;
i = 2;
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index 7924f3f..adb0fb3 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -63,9 +63,7 @@ CurrentContext::~CurrentContext() {}
css::uno::Any CurrentContext::getValueByName(OUString const & Name)
throw (css::uno::RuntimeException, std::exception)
{
- return Name == KEY
- ? css::uno::makeAny(OUString::createFromAscii(VALUE))
- : css::uno::Any();
+ return Name == KEY ? css::uno::makeAny(OUString(VALUE)) : css::uno::Any();
}
}
@@ -100,8 +98,7 @@ bool testtools::bridgetest::CurrentContextChecker::performCheck(
if (!context.is()) {
return false;
}
- css::uno::Any a(
- context->getValueByName(OUString::createFromAscii(KEY)));
+ css::uno::Any a(context->getValueByName(KEY));
if (a.getValueType() != ::cppu::UnoType< OUString >::get()) {
return false;
}
commit 45fe77164c90cf15b78cd8b99adc043e2dd26be1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:23:58 2014 +0100
toolkit: Use appropriate OUString functions on string constants
Change-Id: I3bb1e560eb325046f5b170da0c4c46c1139f3225
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index 74b0180..c6f46eb 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -170,7 +170,7 @@ public:
UnoControlModel* Clone() const SAL_OVERRIDE;
- DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, szServiceName_UnoMultiPageModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" )
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -197,7 +197,7 @@ public:
OUString GetComponentServiceName() SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, ControlContainerBase, szServiceName_UnoMultiPageControl )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageControl, ControlContainerBase, "com.sun.star.awt.UnoControlMultiPage" )
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { return ControlContainerBase::queryInterface(rType); }
::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakAggObject::acquire(); }
@@ -245,7 +245,7 @@ public:
UnoControlModel* Clone() const SAL_OVERRIDE;
- DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, szServiceName_UnoPageModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, "com.sun.star.awt.UnoPageModel" )
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -267,7 +267,7 @@ public:
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoPageControl, ControlContainerBase, szServiceName_UnoPageControl )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoPageControl, ControlContainerBase, "com.sun.star.awt.UnoControlPage" )
};
class UnoFrameModel : public ControlModelContainerBase
@@ -279,7 +279,7 @@ public:
UnoControlModel* Clone() const SAL_OVERRIDE;
- DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, szServiceName_UnoFrameModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, "com.sun.star.awt.UnoFrameModel" )
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -299,7 +299,7 @@ public:
OUString GetComponentServiceName() SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
-DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, szServiceName_UnoFrameControl )
+DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, "com.sun.star.awt.UnoControlFrame" )
};
#endif // INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index 35a5177..b91523e 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -77,7 +77,7 @@ namespace toolkit
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlFormattedFieldModel, UnoControlModel, szServiceName2_UnoControlFormattedFieldModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlFormattedFieldModel, UnoControlModel, "com.sun.star.awt.UnoControlFormattedFieldModel" )
protected:
virtual ~UnoControlFormattedFieldModel();
@@ -114,7 +114,7 @@ namespace toolkit
void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, szServiceName2_UnoControlFormattedField )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoFormattedFieldControl, UnoEditControl, "com.sun.star.awt.UnoControlFormattedField" )
};
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index f530faf..e95853d 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -111,7 +111,7 @@ namespace toolkit
OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, szServiceName2_UnoControlRoadmapModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, "com.sun.star.awt.UnoControlRoadmapModel" )
sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@@ -179,7 +179,7 @@ namespace toolkit
DECLARE_XINTERFACE()
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoRoadmapControl, UnoControlBase, szServiceName2_UnoControlRoadmap )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoRoadmapControl, UnoControlBase, "com.sun.star.awt.UnoControlRoadmap" )
};
diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index 7b54c0c..979b098 100644
--- a/include/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.hxx
@@ -54,7 +54,7 @@ namespace toolkit
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlScrollBarModel, UnoControlModel, szServiceName2_UnoControlScrollBarModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlScrollBarModel, UnoControlModel, "com.sun.star.awt.UnoControlScrollBarModel" )
};
@@ -104,7 +104,7 @@ namespace toolkit
sal_Int32 SAL_CALL getOrientation( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoScrollBarControl, UnoControlBase, szServiceName2_UnoControlScrollBar )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoScrollBarControl, UnoControlBase, "com.sun.star.awt.UnoControlScrollBar" )
};
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index f2e2fc9..f9bad95 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -105,7 +105,7 @@ public:
// ::com::sun::star::awt::XWindow
void SAL_CALL setVisible( sal_Bool Visible ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainer, UnoControlBase, szServiceName2_UnoControlContainer )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainer, UnoControlBase, "com.sun.star.awt.UnoControlContainer" )
protected:
virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ) SAL_OVERRIDE;
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index 22416f9..df934f2 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -48,7 +48,7 @@ public:
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainerModel, UnoControlModel, szServiceName2_UnoControlContainerModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlContainerModel, UnoControlModel, "com.sun.star.awt.UnoControlContainerModel" )
};
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 60268c5..5952cd6 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -98,7 +98,7 @@ public:
// XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlEditModel, UnoControlModel, szServiceName2_UnoControlEditModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlEditModel, UnoControlModel, "com.sun.star.awt.UnoControlEditModel" )
};
@@ -201,7 +201,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, szServiceName2_UnoControlFileControlModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlFileControlModel, UnoControlModel, "com.sun.star.awt.UnoControlFileControlModel" )
};
@@ -214,7 +214,7 @@ public:
OUString GetComponentServiceName() SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, szServiceName2_UnoControlFileControl )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoFileControl, UnoEditControl, "com.sun.star.awt.UnoControlFileControl" )
};
@@ -269,7 +269,7 @@ public:
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, "com.sun.star.awt.UnoControlButtonModel" )
};
@@ -319,7 +319,7 @@ public:
::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, "com.sun.star.awt.UnoControlButton" )
};
@@ -347,7 +347,7 @@ public:
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, GraphicControlModel, szServiceName2_UnoControlImageControlModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, GraphicControlModel, "com.sun.star.awt.UnoControlImageControlModel" )
// ::cppu::OPropertySetHelper
void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
@@ -380,7 +380,7 @@ public:
::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, "com.sun.star.awt.UnoControlImageControl" )
};
@@ -406,7 +406,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlRadioButtonModel, GraphicControlModel, szServiceName2_UnoControlRadioButtonModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlRadioButtonModel, GraphicControlModel, "com.sun.star.awt.UnoControlRadioButtonModel" )
};
@@ -459,7 +459,7 @@ public:
::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoRadioButtonControl, UnoControlBase, szServiceName2_UnoControlRadioButton )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoRadioButtonControl, UnoControlBase, "com.sun.star.awt.UnoControlRadioButton" )
};
@@ -485,7 +485,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, "com.sun.star.awt.UnoControlCheckBoxModel" )
};
@@ -540,7 +540,7 @@ public:
::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoCheckBoxControl, UnoControlBase, szServiceName2_UnoControlCheckBox )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoCheckBoxControl, UnoControlBase, "com.sun.star.awt.UnoControlCheckBox" )
};
@@ -566,7 +566,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, szServiceName_UnoControlFixedHyperlinkModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedHyperlinkModel, UnoControlModel, "com.sun.star.awt.UnoControlFixedHyperlinkModel" )
};
@@ -615,7 +615,7 @@ public:
::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, szServiceName_UnoControlFixedHyperlink )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoFixedHyperlinkControl, UnoControlBase, "com.sun.star.awt.UnoControlFixedHyperlink" )
};
@@ -640,7 +640,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedTextModel, UnoControlModel, szServiceName2_UnoControlFixedTextModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedTextModel, UnoControlModel, "com.sun.star.awt.UnoControlFixedTextModel" )
};
@@ -679,7 +679,7 @@ public:
::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoFixedTextControl, UnoControlBase, szServiceName2_UnoControlFixedText )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoFixedTextControl, UnoControlBase, "com.sun.star.awt.UnoControlFixedText" )
};
@@ -705,7 +705,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlGroupBoxModel, UnoControlModel, szServiceName2_UnoControlGroupBoxModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlGroupBoxModel, UnoControlModel, "com.sun.star.awt.UnoControlGroupBoxModel" )
};
@@ -721,7 +721,7 @@ public:
sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoGroupBoxControl, UnoControlBase, szServiceName2_UnoControlGroupBox )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoGroupBoxControl, UnoControlBase, "com.sun.star.awt.UnoControlGroupBox" )
};
@@ -1068,7 +1068,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlDateFieldModel, UnoControlModel, szServiceName2_UnoControlDateFieldModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlDateFieldModel, UnoControlModel, "com.sun.star.awt.UnoControlDateFieldModel" )
};
@@ -1119,7 +1119,7 @@ public:
sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlDateField )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoDateFieldControl, UnoSpinFieldControl, "com.sun.star.awt.UnoControlDateField" )
};
@@ -1144,7 +1144,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlTimeFieldModel, UnoControlModel, szServiceName2_UnoControlTimeFieldModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlTimeFieldModel, UnoControlModel, "com.sun.star.awt.UnoControlTimeFieldModel" )
};
@@ -1193,7 +1193,7 @@ public:
sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoTimeFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlTimeField )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoTimeFieldControl, UnoSpinFieldControl, "com.sun.star.awt.UnoControlTimeField" )
};
@@ -1219,7 +1219,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlNumericFieldModel, UnoControlModel, szServiceName2_UnoControlNumericFieldModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlNumericFieldModel, UnoControlModel, "com.sun.star.awt.UnoControlNumericFieldModel" )
};
@@ -1270,7 +1270,7 @@ public:
sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoNumericFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlNumericField )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoNumericFieldControl, UnoSpinFieldControl, "com.sun.star.awt.UnoControlNumericField" )
};
@@ -1296,7 +1296,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlCurrencyFieldModel, UnoControlModel, szServiceName2_UnoControlCurrencyFieldModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlCurrencyFieldModel, UnoControlModel, "com.sun.star.awt.UnoControlCurrencyFieldModel" )
};
@@ -1347,7 +1347,7 @@ public:
sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlCurrencyField )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoCurrencyFieldControl, UnoSpinFieldControl, "com.sun.star.awt.UnoControlCurrencyField" )
};
@@ -1372,7 +1372,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlPatternFieldModel, UnoControlModel, szServiceName2_UnoControlPatternFieldModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlPatternFieldModel, UnoControlModel, "com.sun.star.awt.UnoControlPatternFieldModel" )
};
@@ -1407,7 +1407,7 @@ public:
sal_Bool SAL_CALL isStrictFormat( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoPatternFieldControl, UnoSpinFieldControl, szServiceName2_UnoControlPatternField )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoPatternFieldControl, UnoSpinFieldControl, "com.sun.star.awt.UnoControlPatternField" )
};
@@ -1433,7 +1433,7 @@ public:
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, szServiceName2_UnoControlProgressBarModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlProgressBarModel, UnoControlModel, "com.sun.star.awt.UnoControlProgressBarModel" )
};
@@ -1463,7 +1463,7 @@ public:
sal_Int32 SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoProgressBarControl, UnoControlBase, szServiceName2_UnoControlProgressBar )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoProgressBarControl, UnoControlBase, "com.sun.star.awt.UnoControlProgressBar" )
};
@@ -1489,7 +1489,7 @@ public:
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedLineModel, UnoControlModel, szServiceName2_UnoControlFixedLineModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoControlFixedLineModel, UnoControlModel, "com.sun.star.awt.UnoControlFixedLineModel" )
};
@@ -1505,7 +1505,7 @@ public:
sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoFixedLineControl, UnoControlBase, szServiceName2_UnoControlFixedLine )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoFixedLineControl, UnoControlBase, "com.sun.star.awt.UnoControlFixedLine" )
};
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index e048e75..43ef27a 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -269,7 +269,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
{ \
::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \
aNames.realloc( aNames.getLength() + 1 ); \
- aNames[ aNames.getLength() - 1 ] = OUString::createFromAscii( ServiceName ); \
+ aNames[ aNames.getLength() - 1 ] = ServiceName; \
return aNames; \
} \
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index cc81567..048eed4 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -27,69 +27,64 @@ extern const sal_Char szServiceName_MVCIntrospection[], szServiceName2_MVCIntros
extern const sal_Char szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
extern const sal_Char szServiceName_MenuBar[], szServiceName2_MenuBar[];
extern const sal_Char szServiceName_Pointer[], szServiceName2_Pointer[];
-extern const sal_Char szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
-extern const sal_Char szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
-extern const sal_Char szServiceName_UnoMultiPageControl[], szServiceName2_UnoMultiPageControl[];
-extern const sal_Char szServiceName_UnoMultiPageModel[], szServiceName2_UnoMultiPageModel[];
-extern const sal_Char szServiceName_UnoPageControl[], szServiceName2_UnoPageControl[];
-extern const sal_Char szServiceName_UnoPageModel[], szServiceName2_UnoPageModel[];
-extern const sal_Char szServiceName_UnoFrameControl[], szServiceName2_UnoFrameControl[];
-extern const sal_Char szServiceName_UnoFrameModel[], szServiceName2_UnoFrameModel[];
+extern const sal_Char szServiceName_UnoControlContainer[];
+extern const sal_Char szServiceName_UnoControlContainerModel[];
+extern const sal_Char szServiceName2_UnoMultiPageControl[];
+extern const sal_Char szServiceName2_UnoMultiPageModel[];
+extern const sal_Char szServiceName2_UnoPageControl[];
+extern const sal_Char szServiceName2_UnoPageModel[];
+extern const sal_Char szServiceName2_UnoFrameControl[];
+extern const sal_Char szServiceName2_UnoFrameModel[];
extern const sal_Char szServiceName_TabController[], szServiceName2_TabController[];
extern const sal_Char szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
extern const sal_Char szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
extern const sal_Char szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[];
extern const sal_Char szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
-extern const sal_Char szServiceName_UnoControlEditModel[], szServiceName2_UnoControlEditModel[];
-extern const sal_Char szServiceName_UnoControlFileControl[], szServiceName2_UnoControlFileControl[];
-extern const sal_Char szServiceName_UnoControlFileControlModel[], szServiceName2_UnoControlFileControlModel[];
-extern const sal_Char szServiceName_UnoControlButton[], szServiceName2_UnoControlButton[];
-extern const sal_Char szServiceName_UnoControlButtonModel[], szServiceName2_UnoControlButtonModel[];
+extern const sal_Char szServiceName_UnoControlEditModel[];
+extern const sal_Char szServiceName_UnoControlFileControl[];
+extern const sal_Char szServiceName_UnoControlFileControlModel[];
+extern const sal_Char szServiceName_UnoControlButton[];
+extern const sal_Char szServiceName_UnoControlButtonModel[];
extern const sal_Char szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[];
extern const sal_Char szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[];
-extern const sal_Char szServiceName_UnoControlImageControl[], szServiceName2_UnoControlImageControl[];
-extern const sal_Char szServiceName_UnoControlImageControlModel[], szServiceName2_UnoControlImageControlModel[];
-extern const sal_Char szServiceName_UnoControlRadioButton[], szServiceName2_UnoControlRadioButton[];
-extern const sal_Char szServiceName_UnoControlRadioButtonModel[], szServiceName2_UnoControlRadioButtonModel[];
-extern const sal_Char szServiceName_UnoControlCheckBox[], szServiceName2_UnoControlCheckBox[];
-extern const sal_Char szServiceName_UnoControlCheckBoxModel[], szServiceName2_UnoControlCheckBoxModel[];
-extern const sal_Char szServiceName_UnoControlListBox[], szServiceName2_UnoControlListBox[];
-extern const sal_Char szServiceName_UnoControlListBoxModel[], szServiceName2_UnoControlListBoxModel[];
-extern const sal_Char szServiceName_UnoControlComboBox[], szServiceName2_UnoControlComboBox[];
-extern const sal_Char szServiceName_UnoControlComboBoxModel[], szServiceName2_UnoControlComboBoxModel[];
-extern const sal_Char szServiceName_UnoControlFixedText[], szServiceName2_UnoControlFixedText[];
-extern const sal_Char szServiceName_UnoControlFixedTextModel[], szServiceName2_UnoControlFixedTextModel[];
-extern const sal_Char szServiceName_UnoControlGroupBox[], szServiceName2_UnoControlGroupBox[];
-extern const sal_Char szServiceName_UnoControlGroupBoxModel[], szServiceName2_UnoControlGroupBoxModel[];
-extern const sal_Char szServiceName_UnoControlDateField[], szServiceName2_UnoControlDateField[];
-extern const sal_Char szServiceName_UnoControlDateFieldModel[], szServiceName2_UnoControlDateFieldModel[];
-extern const sal_Char szServiceName_UnoControlTimeField[], szServiceName2_UnoControlTimeField[];
-extern const sal_Char szServiceName_UnoControlTimeFieldModel[], szServiceName2_UnoControlTimeFieldModel[];
-extern const sal_Char szServiceName_UnoControlNumericField[], szServiceName2_UnoControlNumericField[];
-extern const sal_Char szServiceName_UnoControlNumericFieldModel[], szServiceName2_UnoControlNumericFieldModel[];
-extern const sal_Char szServiceName_UnoControlCurrencyField[], szServiceName2_UnoControlCurrencyField[];
-extern const sal_Char szServiceName_UnoControlCurrencyFieldModel[], szServiceName2_UnoControlCurrencyFieldModel[];
-extern const sal_Char szServiceName_UnoControlPatternField[], szServiceName2_UnoControlPatternField[];
-extern const sal_Char szServiceName_UnoControlPatternFieldModel[], szServiceName2_UnoControlPatternFieldModel[];
-extern const sal_Char szServiceName_UnoControlFormattedField[], szServiceName2_UnoControlFormattedField[];
-extern const sal_Char szServiceName_UnoControlFormattedFieldModel[], szServiceName2_UnoControlFormattedFieldModel[];
-extern const sal_Char szServiceName_UnoControlProgressBar[], szServiceName2_UnoControlProgressBar[];
-extern const sal_Char szServiceName_UnoControlProgressBarModel[], szServiceName2_UnoControlProgressBarModel[];
-extern const sal_Char szServiceName_UnoControlScrollBar[], szServiceName2_UnoControlScrollBar[];
-extern const sal_Char szServiceName_UnoControlScrollBarModel[], szServiceName2_UnoControlScrollBarModel[];
-extern const sal_Char szServiceName_UnoControlFixedLine[], szServiceName2_UnoControlFixedLine[];
-extern const sal_Char szServiceName_UnoControlFixedLineModel[], szServiceName2_UnoControlFixedLineModel[];
+extern const sal_Char szServiceName_UnoControlImageControl[];
+extern const sal_Char szServiceName_UnoControlImageControlModel[];
+extern const sal_Char szServiceName_UnoControlRadioButton[];
+extern const sal_Char szServiceName_UnoControlRadioButtonModel[];
+extern const sal_Char szServiceName_UnoControlCheckBox[];
+extern const sal_Char szServiceName_UnoControlCheckBoxModel[];
+extern const sal_Char szServiceName_UnoControlListBox[];
+extern const sal_Char szServiceName_UnoControlListBoxModel[];
+extern const sal_Char szServiceName_UnoControlComboBox[];
+extern const sal_Char szServiceName_UnoControlComboBoxModel[];
+extern const sal_Char szServiceName_UnoControlFixedText[];
+extern const sal_Char szServiceName_UnoControlGroupBox[];
+extern const sal_Char szServiceName_UnoControlGroupBoxModel[];
+extern const sal_Char szServiceName_UnoControlDateField[];
+extern const sal_Char szServiceName_UnoControlDateFieldModel[];
+extern const sal_Char szServiceName_UnoControlTimeField[];
+extern const sal_Char szServiceName_UnoControlTimeFieldModel[];
+extern const sal_Char szServiceName_UnoControlNumericField[];
+extern const sal_Char szServiceName_UnoControlNumericFieldModel[];
+extern const sal_Char szServiceName_UnoControlCurrencyField[];
+extern const sal_Char szServiceName_UnoControlCurrencyFieldModel[];
+extern const sal_Char szServiceName_UnoControlPatternField[];
+extern const sal_Char szServiceName_UnoControlPatternFieldModel[];
+extern const sal_Char szServiceName_UnoControlFormattedField[];
+extern const sal_Char szServiceName_UnoControlFormattedFieldModel[];
+extern const sal_Char szServiceName_UnoControlProgressBar[];
+extern const sal_Char szServiceName_UnoControlProgressBarModel[];
+extern const sal_Char szServiceName_UnoControlScrollBar[];
+extern const sal_Char szServiceName_UnoControlScrollBarModel[];
+extern const sal_Char szServiceName_UnoControlFixedLine[];
+extern const sal_Char szServiceName_UnoControlFixedLineModel[];
extern const sal_Char szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
-extern const sal_Char szServiceName_UnoControlRoadmap[], szServiceName2_UnoControlRoadmap[];
-extern const sal_Char szServiceName_UnoControlRoadmapModel[], szServiceName2_UnoControlRoadmapModel[];
+extern const sal_Char szServiceName_UnoControlRoadmap[];
+extern const sal_Char szServiceName_UnoControlRoadmapModel[];
extern const sal_Char szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[];
-extern const sal_Char szServiceName_TreeControl[];
-extern const sal_Char szServiceName_TreeControlModel[];
-
extern const sal_Char szServiceName_GridControl[];
-extern const sal_Char szServiceName_GridControlModel[];
extern const sal_Char szServiceName_DefaultGridDataModel[];
extern const sal_Char szServiceName_DefaultGridColumnModel[];
extern const sal_Char szServiceName_GridColumn[];
@@ -98,7 +93,6 @@ extern const sal_Char szServiceName_SortableGridDataModel[];
extern const sal_Char szServiceName_AnimatedImagesControl[];
extern const sal_Char szServiceName_AnimatedImagesControlModel[];
extern const sal_Char szServiceName_SpinningProgressControlModel[];
-extern const sal_Char szServiceName_UnoControlFixedHyperlink[], szServiceName_UnoControlFixedHyperlinkModel[];
extern const sal_Char szServiceName_UnoControlTabPageModel[], szServiceName2_UnoControlTabPageModel[];
extern const sal_Char szServiceName_UnoControlTabPage[];
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index a8bd68f..289b804 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -332,61 +332,61 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const OUStrin
OGeometryControlModel_Base* pNewModel = NULL;
- if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlEditModel ) )
+ if ( aServiceSpecifier == "com.sun.star.awt.UnoControlEditModel" )
pNewModel = new OGeometryControlModel< UnoControlEditModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlFormattedFieldModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlFormattedFieldModel" )
pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >( m_xContext);
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlFileControlModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlFileControlModel" )
pNewModel = new OGeometryControlModel< UnoControlFileControlModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlButtonModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlButtonModel" )
pNewModel = new OGeometryControlModel< UnoControlButtonModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlImageControlModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlImageControlModel" )
pNewModel = new OGeometryControlModel< UnoControlImageControlModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlRadioButtonModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlRadioButtonModel" )
pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlCheckBoxModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlCheckBoxModel" )
pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_UnoControlFixedHyperlinkModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlFixedHyperlinkModel" )
pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_UnoControlFixedTextModel ) )
+ else if ( aServiceSpecifier == "stardiv.vcl.controlmodel.FixedText" )
pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlGroupBoxModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlGroupBoxModel" )
pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlListBoxModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlListBoxModel" )
pNewModel = new OGeometryControlModel< UnoControlListBoxModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlComboBoxModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlComboBoxModel" )
pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlDateFieldModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlDateFieldModel" )
pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlTimeFieldModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlTimeFieldModel" )
pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlNumericFieldModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlNumericFieldModel" )
pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlCurrencyFieldModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlCurrencyFieldModel" )
pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlPatternFieldModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlPatternFieldModel" )
pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlProgressBarModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlProgressBarModel" )
pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlScrollBarModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlScrollBarModel" )
pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlFixedLineModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlFixedLineModel" )
pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName2_UnoControlRoadmapModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoControlRoadmapModel" )
pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_TreeControlModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.tree.TreeControlModel" )
pNewModel = new OGeometryControlModel< UnoTreeModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_GridControlModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.grid.UnoControlGridModel" )
pNewModel = new OGeometryControlModel< UnoGridModel >( m_xContext );
else if ( aServiceSpecifier == "com.sun.star.awt.tab.UnoControlTabPageContainerModel" )
pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_UnoMultiPageModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoMultiPageModel" )
pNewModel = new OGeometryControlModel< UnoMultiPageModel >( m_xContext );
else if ( aServiceSpecifier == "com.sun.star.awt.tab.UnoControlTabPageModel" )
pNewModel = new OGeometryControlModel< UnoControlTabPageModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_UnoPageModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoPageModel" )
pNewModel = new OGeometryControlModel< UnoPageModel >( m_xContext );
- else if ( aServiceSpecifier.equalsAscii( szServiceName_UnoFrameModel ) )
+ else if ( aServiceSpecifier == "com.sun.star.awt.UnoFrameModel" )
pNewModel = new OGeometryControlModel< UnoFrameModel >( m_xContext );
if ( !pNewModel )
@@ -429,32 +429,28 @@ Sequence< OUString > ControlModelContainerBase::getAvailableServiceNames() throw
{
pNamesSeq = new Sequence< OUString >( 26 );
OUString* pNames = pNamesSeq->getArray();
- pNames[0] = OUString::createFromAscii( szServiceName2_UnoControlEditModel );
- pNames[1] = OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel );
- pNames[2] = OUString::createFromAscii( szServiceName2_UnoControlFileControlModel );
- pNames[3] = OUString::createFromAscii( szServiceName2_UnoControlButtonModel );
- pNames[4] = OUString::createFromAscii( szServiceName2_UnoControlImageControlModel );
- pNames[5] = OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel );
- pNames[6] = OUString::createFromAscii( szServiceName2_UnoControlCheckBoxModel );
- pNames[7] = OUString::createFromAscii( szServiceName2_UnoControlFixedTextModel );
- pNames[8] = OUString::createFromAscii( szServiceName2_UnoControlGroupBoxModel );
- pNames[9] = OUString::createFromAscii( szServiceName2_UnoControlListBoxModel );
- pNames[10] = OUString::createFromAscii( szServiceName2_UnoControlComboBoxModel );
- pNames[11] = OUString::createFromAscii( szServiceName2_UnoControlDateFieldModel );
- pNames[12] = OUString::createFromAscii( szServiceName2_UnoControlTimeFieldModel );
- pNames[13] = OUString::createFromAscii( szServiceName2_UnoControlNumericFieldModel );
- pNames[14] = OUString::createFromAscii( szServiceName2_UnoControlCurrencyFieldModel );
- pNames[15] = OUString::createFromAscii( szServiceName2_UnoControlPatternFieldModel );
- pNames[16] = OUString::createFromAscii( szServiceName2_UnoControlProgressBarModel );
- pNames[17] = OUString::createFromAscii( szServiceName2_UnoControlScrollBarModel );
- pNames[18] = OUString::createFromAscii( szServiceName2_UnoControlFixedLineModel );
- pNames[19] = OUString::createFromAscii( szServiceName2_UnoControlRoadmapModel );
- pNames[20] = OUString::createFromAscii( szServiceName_TreeControlModel );
- pNames[21] = OUString::createFromAscii( szServiceName_GridControlModel );
- pNames[22] = OUString( "com.sun.star.awt.tab.UnoControlTabPageContainerModel");
- pNames[23] = OUString( "com.sun.star.awt.tab.UnoControlTabPageModel" );
- pNames[24] = OUString::createFromAscii( szServiceName_UnoMultiPageModel );
- pNames[25] = OUString::createFromAscii( szServiceName_UnoFrameModel );
+ pNames[0] = "com.sun.star.awt.UnoControlEditModel";
+ pNames[1] = "com.sun.star.awt.UnoControlFormattedFieldModel";
+ pNames[2] = "com.sun.star.awt.UnoControlFileControlModel";
+ pNames[3] = "com.sun.star.awt.UnoControlButtonModel";
+ pNames[4] = "com.sun.star.awt.UnoControlImageControlModel";
+ pNames[5] = "com.sun.star.awt.UnoControlRadioButtonModel";
+ pNames[6] = "com.sun.star.awt.UnoControlCheckBoxModel";
+ pNames[7] = "com.sun.star.awt.UnoControlFixedTextModel";
+ pNames[8] = "com.sun.star.awt.UnoControlGroupBoxModel";
+ pNames[9] = "com.sun.star.awt.UnoControlListBoxModel";
+ pNames[10] = "com.sun.star.awt.UnoControlComboBoxModel";
+ pNames[11] = "com.sun.star.awt.UnoControlDateFieldModel";
+ pNames[12] = "com.sun.star.awt.UnoControlTimeFieldModel";
+ pNames[13] = "com.sun.star.awt.UnoControlNumericFieldModel";
+ pNames[14] = "com.sun.star.awt.UnoControlCurrencyFieldModel";
+ pNames[15] = "com.sun.star.awt.UnoControlPatternFieldModel";
+ pNames[16] = "com.sun.star.awt.tree.TreeControlModel";
+ pNames[21] = "com.sun.star.awt.grid.UnoControlGridModel";
+ pNames[22] = "com.sun.star.awt.tab.UnoControlTabPageContainerModel";
+ pNames[23] = "com.sun.star.awt.tab.UnoControlTabPageModel";
+ pNames[24] = "com.sun.star.awt.UnoMultiPageModel";
+ pNames[25] = "com.sun.star.awt.UnoFrameModel";
}
return *pNamesSeq;
}
@@ -966,7 +962,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
{
// we'll need this in every state
xModelSI.set(*pControlModels, css::uno::UNO_QUERY);
- bIsRadioButton = xModelSI.is() && xModelSI->supportsService( OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ) );
+ bIsRadioButton = xModelSI.is() && xModelSI->supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" );
switch ( eState )
{
@@ -1072,7 +1068,7 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve
{
SolarMutexGuard aGuard;
- DBG_ASSERT( _rEvent.PropertyName.equalsAscii( "TabIndex" ),
+ DBG_ASSERT( _rEvent.PropertyName == "TabIndex",
"ControlModelContainerBase::propertyChange: not listening for this property!" );
// the accessor for the changed element
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 9559291..eae95da 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -899,7 +899,7 @@ UnoMultiPageModel::Clone() const
OUString UnoMultiPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- return OUString::createFromAscii( szServiceName_UnoMultiPageModel );
+ return OUString( "com.sun.star.awt.UnoMultiPageModel" );
}
uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -907,7 +907,7 @@ uno::Any UnoMultiPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= OUString::createFromAscii( szServiceName_UnoMultiPageControl );
+ aAny <<= OUString( "com.sun.star.awt.UnoControlMultiPage" );
return aAny;
}
return ControlModelContainerBase::ImplGetDefaultValue( nPropId );
@@ -940,7 +940,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement
throw IllegalArgumentException();
// Only a Page model can be inserted into the multipage
- if ( !xInfo->supportsService( OUString::createFromAscii( szServiceName_UnoPageModel ) ) )
+ if ( !xInfo->supportsService( "com.sun.star.awt.UnoPageModel" ) )
throw IllegalArgumentException();
return ControlModelContainerBase::insertByName( aName, aElement );
@@ -1019,7 +1019,7 @@ UnoPageModel::Clone() const
OUString UnoPageModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- return OUString::createFromAscii( szServiceName_UnoPageModel );
+ return OUString( "com.sun.star.awt.UnoPageModel" );
}
uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1027,7 +1027,7 @@ uno::Any UnoPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= OUString::createFromAscii( szServiceName_UnoPageControl );
+ aAny <<= OUString( "com.sun.star.awt.UnoControlPage" );
return aAny;
}
return ControlModelContainerBase::ImplGetDefaultValue( nPropId );
@@ -1184,7 +1184,7 @@ UnoFrameModel::Clone() const
OUString UnoFrameModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- return OUString::createFromAscii( szServiceName_UnoFrameModel );
+ return OUString( "com.sun.star.awt.UnoFrameModel" );
}
uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1194,7 +1194,7 @@ uno::Any UnoFrameModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
case BASEPROPERTY_DEFAULTCONTROL:
{
- aAny <<= OUString::createFromAscii( szServiceName_UnoFrameControl );
+ aAny <<= OUString( "com.sun.star.awt.UnoControlFrame" );
return aAny;
}
case BASEPROPERTY_SCROLLWIDTH:
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index b5af991..54df3a0 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -80,7 +80,7 @@ UnoControlModel* UnoTreeModel::Clone() const
OUString UnoTreeModel::getServiceName() throw(RuntimeException, std::exception)
{
- return OUString::createFromAscii( szServiceName_TreeControlModel );
+ return OUString( "com.sun.star.awt.tree.TreeControlModel" );
}
Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -101,7 +101,7 @@ Any UnoTreeModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
case BASEPROPERTY_TREE_SHOWSHANDLES:
return Any( sal_True );
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::makeAny( OUString::createFromAscii( szServiceName_TreeControl ) );
+ return uno::makeAny( OUString( "com.sun.star.awt.tree.TreeControl" ) );
default:
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
@@ -180,7 +180,7 @@ public:
virtual void SAL_CALL removeTreeEditListener( const css::uno::Reference< css::awt::tree::XTreeEditListener >& Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// css::lang::XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoTreeControl, UnoControlBase, szServiceName_TreeControl )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoTreeControl, UnoControlBase, "com.sun.star.awt.tree.TreeControl" )
using UnoControl::getPeer;
private:
diff --git a/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index 97eb4cc..f6bed03 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.hxx
@@ -51,7 +51,7 @@ public:
OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- DECLIMPL_SERVICEINFO_DERIVED( UnoTreeModel, UnoControlModel, szServiceName_TreeControlModel )
+ DECLIMPL_SERVICEINFO_DERIVED( UnoTreeModel, UnoControlModel, "com.sun.star.awt.tree.TreeControlModel" )
};
} // toolkit
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 2a7abdf..4d5636e 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -77,7 +77,7 @@ using namespace ::toolkit;
{ \
::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \
aNames.realloc( aNames.getLength() + 1 ); \
- aNames[ aNames.getLength() - 1 ] = OUString::createFromAscii( ServiceName ); \
+ aNames[ aNames.getLength() - 1 ] = ServiceName; \
return aNames; \
} \
@@ -1455,7 +1455,7 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X
OUString UnoControlFixedHyperlinkModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- return OUString::createFromAscii( szServiceName_UnoControlFixedHyperlinkModel );
+ return OUString( "com.sun.star.awt.UnoControlFixedHyperlinkModel" );
}
uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1463,7 +1463,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= OUString::createFromAscii( szServiceName_UnoControlFixedHyperlink );
+ aAny <<= OUString( "com.sun.star.awt.UnoControlFixedHyperlink" );
return aAny;
}
else if ( nPropId == BASEPROPERTY_BORDER )
@@ -1658,7 +1658,7 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC
OUString UnoControlFixedTextModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- return OUString::createFromAscii( szServiceName_UnoControlFixedTextModel );
+ return OUString( "stardiv.vcl.controlmodel.FixedText" );
}
uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -2009,7 +2009,7 @@ UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_
UnoControlListBoxModel::~UnoControlListBoxModel()
{
}
-IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel )
+IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, "com.sun.star.awt.UnoControlListBoxModel" )
OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
@@ -2452,7 +2452,7 @@ OUString UnoListBoxControl::GetComponentServiceName()
{
return OUString("listbox");
}
-IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
+IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, "com.sun.star.awt.UnoControlListBox" )
void UnoListBoxControl::dispose() throw(uno::RuntimeException, std::exception)
{
@@ -2877,7 +2877,7 @@ UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentCon
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox );
}
-IMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, szServiceName2_UnoControlComboBoxModel )
+IMPL_SERVICEINFO_DERIVED( UnoControlComboBoxModel, UnoControlModel, "com.sun.star.awt.UnoControlComboBoxModel" )
uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException, std::exception)
{
@@ -2963,7 +2963,7 @@ UnoComboBoxControl::UnoComboBoxControl()
maComponentInfos.nWidth = 100;
maComponentInfos.nHeight = 12;
}
-IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_UnoControlComboBox )
+IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, "com.sun.star.awt.UnoControlComboBox" )
OUString UnoComboBoxControl::GetComponentServiceName()
{
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index f1d7155..49df534 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -80,16 +80,16 @@ struct ImplPropertyInfo
};
#define DECL_PROP_1( asciiname, id, type, attrib1 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 )
+ ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 )
#define DECL_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 )
+ ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 )
#define DECL_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 )
+ ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3 )
#define DECL_DEP_PROP_2( asciiname, id, type, attrib1, attrib2 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true )
+ ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2, true )
#define DECL_DEP_PROP_3( asciiname, id, type, attrib1, attrib2, attrib3 ) \
- ImplPropertyInfo( OUString::createFromAscii( asciiname ), BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true )
+ ImplPropertyInfo( asciiname, BASEPROPERTY_##id, ::getCppuType( static_cast< const type* >( NULL ) ), ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3, true )
ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
{
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index 30f3afa..94a802e 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@@ -29,11 +29,7 @@ const sal_Char szServiceName2_MenuBar[] = "com.sun.star.awt.MenuBar";
const sal_Char szServiceName_Pointer[] = "stardiv.vcl.Pointer";
const sal_Char szServiceName2_Pointer[] = "com.sun.star.awt.Pointer";
const sal_Char szServiceName_UnoControlContainer[] = "stardiv.vcl.control.ControlContainer";
-const sal_Char szServiceName2_UnoControlContainer[] = "com.sun.star.awt.UnoControlContainer";
-
-
const sal_Char szServiceName_UnoControlContainerModel[] = "stardiv.vcl.controlmodel.ControlContainer";
-const sal_Char szServiceName2_UnoControlContainerModel[] = "com.sun.star.awt.UnoControlContainerModel";
const sal_Char szServiceName_TabController[] = "stardiv.vcl.control.TabController";
const sal_Char szServiceName2_TabController[] = "com.sun.star.awt.TabController";
const sal_Char szServiceName_TabControllerModel[] = "stardiv.vcl.controlmodel.TabController";
@@ -45,105 +41,54 @@ const sal_Char szServiceName2_UnoControlDialogModel[] = "com.sun.star.awt.UnoCon
const sal_Char szServiceName_UnoControlEdit[] = "stardiv.vcl.control.Edit";
const sal_Char szServiceName2_UnoControlEdit[] = "com.sun.star.awt.UnoControlEdit";
const sal_Char szServiceName_UnoControlEditModel[] = "stardiv.vcl.controlmodel.Edit";
-const sal_Char szServiceName2_UnoControlEditModel[] = "com.sun.star.awt.UnoControlEditModel";
const sal_Char szServiceName_UnoControlFileControl[] = "stardiv.vcl.control.FileControl";
-const sal_Char szServiceName2_UnoControlFileControl[] = "com.sun.star.awt.UnoControlFileControl";
const sal_Char szServiceName_UnoControlFileControlModel[] = "stardiv.vcl.controlmodel.FileControl";
-const sal_Char szServiceName2_UnoControlFileControlModel[] = "com.sun.star.awt.UnoControlFileControlModel";
const sal_Char szServiceName_UnoControlButton[] = "stardiv.vcl.control.Button";
-const sal_Char szServiceName2_UnoControlButton[] = "com.sun.star.awt.UnoControlButton";
const sal_Char szServiceName_UnoControlButtonModel[] = "stardiv.vcl.controlmodel.Button";
-const sal_Char szServiceName2_UnoControlButtonModel[] = "com.sun.star.awt.UnoControlButtonModel";
const sal_Char szServiceName_UnoControlImageButton[] = "stardiv.vcl.control.ImageButton";
const sal_Char szServiceName2_UnoControlImageButton[] = "com.sun.star.awt.UnoControlImageButton";
const sal_Char szServiceName_UnoControlImageButtonModel[] = "stardiv.vcl.controlmodel.ImageButton";
const sal_Char szServiceName2_UnoControlImageButtonModel[] = "com.sun.star.awt.UnoControlImageButtonModel";
const sal_Char szServiceName_UnoControlImageControl[] = "stardiv.vcl.control.ImageControl";
-const sal_Char szServiceName2_UnoControlImageControl[] = "com.sun.star.awt.UnoControlImageControl";
const sal_Char szServiceName_UnoControlImageControlModel[] = "stardiv.vcl.controlmodel.ImageControl";
-const sal_Char szServiceName2_UnoControlImageControlModel[] = "com.sun.star.awt.UnoControlImageControlModel";
const sal_Char szServiceName_UnoControlRadioButton[] = "stardiv.vcl.control.RadioButton";
-const sal_Char szServiceName2_UnoControlRadioButton[] = "com.sun.star.awt.UnoControlRadioButton";
const sal_Char szServiceName_UnoControlRadioButtonModel[] = "stardiv.vcl.controlmodel.RadioButton";
-const sal_Char szServiceName2_UnoControlRadioButtonModel[] = "com.sun.star.awt.UnoControlRadioButtonModel";
const sal_Char szServiceName_UnoControlCheckBox[] = "stardiv.vcl.control.CheckBox";
-const sal_Char szServiceName2_UnoControlCheckBox[] = "com.sun.star.awt.UnoControlCheckBox";
const sal_Char szServiceName_UnoControlCheckBoxModel[] = "stardiv.vcl.controlmodel.CheckBox";
-const sal_Char szServiceName2_UnoControlCheckBoxModel[] = "com.sun.star.awt.UnoControlCheckBoxModel";
const sal_Char szServiceName_UnoControlListBox[] = "stardiv.vcl.control.ListBox";
-const sal_Char szServiceName2_UnoControlListBox[] = "com.sun.star.awt.UnoControlListBox";
const sal_Char szServiceName_UnoControlListBoxModel[] = "stardiv.vcl.controlmodel.ListBox";
-const sal_Char szServiceName2_UnoControlListBoxModel[] = "com.sun.star.awt.UnoControlListBoxModel";
const sal_Char szServiceName_UnoControlComboBox[] = "stardiv.vcl.control.ComboBox";
-const sal_Char szServiceName2_UnoControlComboBox[] = "com.sun.star.awt.UnoControlComboBox";
const sal_Char szServiceName_UnoControlComboBoxModel[] = "stardiv.vcl.controlmodel.ComboBox";
-const sal_Char szServiceName2_UnoControlComboBoxModel[] = "com.sun.star.awt.UnoControlComboBoxModel";
const sal_Char szServiceName_UnoControlFixedText[] = "stardiv.vcl.control.FixedText";
-const sal_Char szServiceName2_UnoControlFixedText[] = "com.sun.star.awt.UnoControlFixedText";
-const sal_Char szServiceName_UnoControlFixedTextModel[] = "stardiv.vcl.controlmodel.FixedText";
-const sal_Char szServiceName2_UnoControlFixedTextModel[] = "com.sun.star.awt.UnoControlFixedTextModel";
const sal_Char szServiceName_UnoControlGroupBox[] = "stardiv.vcl.control.GroupBox";
-const sal_Char szServiceName2_UnoControlGroupBox[] = "com.sun.star.awt.UnoControlGroupBox";
const sal_Char szServiceName_UnoControlGroupBoxModel[] = "stardiv.vcl.controlmodel.GroupBox";
-const sal_Char szServiceName2_UnoControlGroupBoxModel[] = "com.sun.star.awt.UnoControlGroupBoxModel";
const sal_Char szServiceName_UnoControlDateField[] = "stardiv.vcl.control.DateField";
-const sal_Char szServiceName2_UnoControlDateField[] = "com.sun.star.awt.UnoControlDateField";
const sal_Char szServiceName_UnoControlDateFieldModel[] = "stardiv.vcl.controlmodel.DateField";
-const sal_Char szServiceName2_UnoControlDateFieldModel[] = "com.sun.star.awt.UnoControlDateFieldModel";
const sal_Char szServiceName_UnoControlTimeField[] = "stardiv.vcl.control.TimeField";
-const sal_Char szServiceName2_UnoControlTimeField[] = "com.sun.star.awt.UnoControlTimeField";
const sal_Char szServiceName_UnoControlTimeFieldModel[] = "stardiv.vcl.controlmodel.TimeField";
-const sal_Char szServiceName2_UnoControlTimeFieldModel[] = "com.sun.star.awt.UnoControlTimeFieldModel";
const sal_Char szServiceName_UnoControlNumericField[] = "stardiv.vcl.control.NumericField";
-const sal_Char szServiceName2_UnoControlNumericField[] = "com.sun.star.awt.UnoControlNumericField";
const sal_Char szServiceName_UnoControlNumericFieldModel[] = "stardiv.vcl.controlmodel.NumericField";
-const sal_Char szServiceName2_UnoControlNumericFieldModel[] = "com.sun.star.awt.UnoControlNumericFieldModel";
const sal_Char szServiceName_UnoControlCurrencyField[] = "stardiv.vcl.control.CurrencyField";
-const sal_Char szServiceName2_UnoControlCurrencyField[] = "com.sun.star.awt.UnoControlCurrencyField";
const sal_Char szServiceName_UnoControlCurrencyFieldModel[] = "stardiv.vcl.controlmodel.CurrencyField";
-const sal_Char szServiceName2_UnoControlCurrencyFieldModel[] = "com.sun.star.awt.UnoControlCurrencyFieldModel";
const sal_Char szServiceName_UnoControlPatternField[] = "stardiv.vcl.control.PatternField";
-const sal_Char szServiceName2_UnoControlPatternField[] = "com.sun.star.awt.UnoControlPatternField";
const sal_Char szServiceName_UnoControlPatternFieldModel[] = "stardiv.vcl.controlmodel.PatternField";
-const sal_Char szServiceName2_UnoControlPatternFieldModel[] = "com.sun.star.awt.UnoControlPatternFieldModel";
const sal_Char szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField";
-const sal_Char szServiceName2_UnoControlFormattedField[] = "com.sun.star.awt.UnoControlFormattedField";
const sal_Char szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField";
-const sal_Char szServiceName2_UnoControlFormattedFieldModel[] = "com.sun.star.awt.UnoControlFormattedFieldModel";
const sal_Char szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection";
const sal_Char szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection";
const sal_Char szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer";
const sal_Char szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer";
const sal_Char szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar";
-const sal_Char szServiceName2_UnoControlProgressBar[] = "com.sun.star.awt.UnoControlProgressBar";
const sal_Char szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar";
-const sal_Char szServiceName2_UnoControlProgressBarModel[] = "com.sun.star.awt.UnoControlProgressBarModel";
const sal_Char szServiceName_UnoControlScrollBar[] = "stardiv.vcl.control.ScrollBar";
-const sal_Char szServiceName2_UnoControlScrollBar[] = "com.sun.star.awt.UnoControlScrollBar";
const sal_Char szServiceName_UnoControlScrollBarModel[] = "stardiv.vcl.controlmodel.ScrollBar";
-const sal_Char szServiceName2_UnoControlScrollBarModel[] = "com.sun.star.awt.UnoControlScrollBarModel";
const sal_Char szServiceName_UnoControlFixedLine[] = "stardiv.vcl.control.FixedLine";
-const sal_Char szServiceName2_UnoControlFixedLine[] = "com.sun.star.awt.UnoControlFixedLine";
const sal_Char szServiceName_UnoControlFixedLineModel[] = "stardiv.vcl.controlmodel.FixedLine";
-const sal_Char szServiceName2_UnoControlFixedLineModel[] = "com.sun.star.awt.UnoControlFixedLineModel";
const sal_Char szServiceName_UnoControlRoadmap[] = "stardiv.vcl.control.Roadmap";
-const sal_Char szServiceName2_UnoControlRoadmap[] = "com.sun.star.awt.UnoControlRoadmap";
const sal_Char szServiceName_UnoControlRoadmapModel[] = "stardiv.vcl.controlmodel.Roadmap";
-const sal_Char szServiceName2_UnoControlRoadmapModel[] = "com.sun.star.awt.UnoControlRoadmapModel";
const sal_Char szServiceName_UnoSpinButtonControl[] = "com.sun.star.awt.UnoControlSpinButton";
const sal_Char szServiceName_UnoSpinButtonModel[] = "com.sun.star.awt.UnoControlSpinButtonModel";
-const sal_Char szServiceName_UnoMultiPageControl[] = "com.sun.star.awt.UnoControlMultiPage";
-const sal_Char szServiceName_UnoMultiPageModel[] = "com.sun.star.awt.UnoMultiPageModel";
-const sal_Char szServiceName_UnoPageControl[] = "com.sun.star.awt.UnoControlPage";
-const sal_Char szServiceName_UnoPageModel[] = "com.sun.star.awt.UnoPageModel";
-const sal_Char szServiceName_UnoFrameControl[] = "com.sun.star.awt.UnoControlFrame";
-const sal_Char szServiceName_UnoFrameModel[] = "com.sun.star.awt.UnoFrameModel";
-const sal_Char szServiceName_TreeControl[] = "com.sun.star.awt.tree.TreeControl";
-const sal_Char szServiceName_TreeControlModel[] = "com.sun.star.awt.tree.TreeControlModel";
-const sal_Char szServiceName_UnoControlFixedHyperlink[] = "com.sun.star.awt.UnoControlFixedHyperlink";
-const sal_Char szServiceName_UnoControlFixedHyperlinkModel[] = "com.sun.star.awt.UnoControlFixedHyperlinkModel";
const sal_Char szServiceName_GridControl[] = "com.sun.star.awt.grid.UnoControlGrid";
-const sal_Char szServiceName_GridControlModel[] = "com.sun.star.awt.grid.UnoControlGridModel";
const sal_Char szServiceName_DefaultGridDataModel[] = "com.sun.star.awt.grid.DefaultGridDataModel";
const sal_Char szServiceName_DefaultGridColumnModel[] = "com.sun.star.awt.grid.DefaultGridColumnModel";
const sal_Char szServiceName_GridColumn[] = "com.sun.star.awt.grid.GridColumn";
commit e965798caf75054d8fc826a4cfa33524cbbcec42
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:23:11 2014 +0100
svtools: Use appropriate OUString functions on string constants
Change-Id: I8799033322d345b2f146c3577d3d264448252816
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 94415b4..19a1e55 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -85,7 +85,7 @@ void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHel
::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() throw (RuntimeException, std::exception)
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleHeaderBar" );
+ return OUString( "com.sun.star.comp.toolkit.AccessibleHeaderBar" );
}
@@ -93,7 +93,7 @@ void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHel
Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.AccessibleHeaderBar" );
+ aNames[0] = "com.sun.star.awt.AccessibleHeaderBar";
return aNames;
}
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 25735e8..f5a4292 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -126,7 +126,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS
uno::Reference< ::graphic::XGraphic > xRet;
sal_Int32 nIndex = 0;
- if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:memorygraphic" ) )
+ if( rResourceURL.getToken( 0, '/', nIndex ) == "private:memorygraphic" )
{
sal_Int64 nGraphicAddress = rResourceURL.getToken( 0, '/', nIndex ).toInt64();
@@ -149,7 +149,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage(
uno::Reference< ::graphic::XGraphic > xRet;
sal_Int32 nIndex = 0;
- if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:graphicrepository" ) )
+ if( rResourceURL.getToken( 0, '/', nIndex ) == "private:graphicrepository" )
{
OUString sPathName( rResourceURL.copy( nIndex ) );
BitmapEx aBitmap;
@@ -170,7 +170,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co
uno::Reference< ::graphic::XGraphic > xRet;
sal_Int32 nIndex = 0;
- if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:standardimage" ) )
+ if( rResourceURL.getToken( 0, '/', nIndex ) == "private:standardimage" )
{
OUString sImageName( rResourceURL.copy( nIndex ) );
if ( sImageName == "info" )
@@ -234,7 +234,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
uno::Reference< ::graphic::XGraphic > xRet;
sal_Int32 nIndex = 0;
- if( rResourceURL.getToken( 0, '/', nIndex ).equalsAscii( "private:resource" ) )
+ if( rResourceURL.getToken( 0, '/', nIndex ) == "private:resource" )
{
OString aResMgrName(OUStringToOString(
rResourceURL.getToken(0, '/', nIndex), RTL_TEXTENCODING_ASCII_US));
@@ -250,8 +250,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
{
BitmapEx aBmpEx;
- if( aResourceType.equalsAscii( "bitmap" ) ||
- aResourceType.equalsAscii( "bitmapex" ) )
+ if( aResourceType == "bitmap" || aResourceType == "bitmapex" )
{
aResId.SetRT( RSC_BITMAP );
@@ -260,7 +259,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
aBmpEx = BitmapEx( aResId );
}
}
- else if( aResourceType.equalsAscii( "image" ) )
+ else if( aResourceType == "image" )
{
aResId.SetRT( RSC_IMAGE );
@@ -270,7 +269,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
aBmpEx = aImage.GetBitmapEx();
}
}
- else if( aResourceType.equalsAscii( "imagelist" ) )
+ else if( aResourceType == "imagelist" )
{
aResId.SetRT( RSC_IMAGELIST );
diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index 66c85d5..759570d 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.cxx
@@ -65,7 +65,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeEx
{
Any retVal;
- if ( Name.equalsAscii( JAVA_INTERACTION_HANDLER_NAME ))
+ if ( Name == JAVA_INTERACTION_HANDLER_NAME )
{
{
osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex());
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 4d4da1d..14d5c74 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1167,9 +1167,7 @@ int HTMLParser::_GetNextToken()
nCLineNr = GetLineNr();
nCLinePos = GetLinePos();
}
- bDone = aToken.getLength() >= 2 &&
- aToken.copy(aToken.getLength()-2,2).
- equalsAscii( "--" );
+ bDone = aToken.endsWith( "--" );
if( !bDone )
aToken += OUString(nNextCh);
}
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 3c97729..f1a0760 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -177,7 +177,7 @@ namespace {
PropertyValue aVal;
if (_rValue >>= aVal)
{
- if (aVal.Name.equalsAscii("DataSource"))
+ if (aVal.Name == "DataSource")
{
#if OSL_DEBUG_LEVEL > 0
bool bSuccess =
@@ -187,7 +187,7 @@ namespace {
return;
}
- if (aVal.Name.equalsAscii("DataSourceName"))
+ if (aVal.Name == "DataSourceName")
{
#if OSL_DEBUG_LEVEL > 0
bool bSuccess =
@@ -197,7 +197,7 @@ namespace {
return;
}
- if (aVal.Name.equalsAscii("Command"))
+ if (aVal.Name == "Command")
{
#if OSL_DEBUG_LEVEL > 0
bool bSuccess =
commit fc45562945127b73d76deb1101ce7a9ba9135054
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:22:32 2014 +0100
svl: Use appropriate OUString functions on string constants
Change-Id: I8d8528c74bae3de67a0a9bdd727cd0d8c8304d3e
diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx
index 8f251ac..59d63d6 100644
--- a/include/svl/inettype.hxx
+++ b/include/svl/inettype.hxx
@@ -123,22 +123,6 @@
#define INETTYPE_URL_PROT_MAILTO "mailto"
#define INETTYPE_URL_PROT_PRIVATE "private"
-#define INETTYPE_URL_SUB_FACTORY "factory"
-#define INETTYPE_URL_SUB_HELPID "helpid"
-
-#define INETTYPE_URL_SSUB_FRAMESET "frameset"
-#define INETTYPE_URL_SSUB_SCALC "scalc"
-#define INETTYPE_URL_SSUB_SCHART "schart"
-#define INETTYPE_URL_SSUB_SDRAW "sdraw"
-#define INETTYPE_URL_SSUB_SIMAGE "simage"
-#define INETTYPE_URL_SSUB_SIMPRESS "simpress"
-#define INETTYPE_URL_SSUB_SMATH "smath"
-#define INETTYPE_URL_SSUB_SWRITER "swriter"
-
-#define INETTYPE_URL_SSSUB_GLOB "GlobalDocument"
-#define INETTYPE_URL_SSSUB_WEB "web"
-
-
enum INetContentType
{
CONTENT_TYPE_UNKNOWN,
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index d332d9a..38a625a 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -713,34 +713,34 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL)
{
OUString aSecondPart = rURL.getToken(1, ':');
aToken = aSecondPart.getToken(0, '/');
- if (aToken.equalsAscii(INETTYPE_URL_SUB_FACTORY))
+ if (aToken == "factory")
{
aToken = aSecondPart.getToken(1, '/');
- if (aToken.equalsAscii(INETTYPE_URL_SSUB_SWRITER))
+ if (aToken == "swriter")
{
aToken = aSecondPart.getToken(2, '/');
- eTypeID = aToken.equalsAscii(INETTYPE_URL_SSSUB_WEB) ?
+ eTypeID = aToken == "web" ?
CONTENT_TYPE_APP_VND_WRITER_WEB :
- aToken.equalsAscii(INETTYPE_URL_SSSUB_GLOB) ?
+ aToken == "GlobalDocument" ?
CONTENT_TYPE_APP_VND_WRITER_GLOBAL :
CONTENT_TYPE_APP_VND_WRITER;
}
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_SCALC))
+ else if (aToken == "scalc")
eTypeID = CONTENT_TYPE_APP_VND_CALC;
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_SDRAW))
+ else if (aToken == "sdraw")
eTypeID = CONTENT_TYPE_APP_VND_DRAW;
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_SIMPRESS))
+ else if (aToken == "simpress")
eTypeID = CONTENT_TYPE_APP_VND_IMPRESS;
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_SCHART))
+ else if (aToken == "schart")
eTypeID = CONTENT_TYPE_APP_VND_CHART;
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_SIMAGE))
+ else if (aToken == "simage")
eTypeID = CONTENT_TYPE_APP_VND_IMAGE;
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_SMATH))
+ else if (aToken == "smath")
eTypeID = CONTENT_TYPE_APP_VND_MATH;
- else if (aToken.equalsAscii(INETTYPE_URL_SSUB_FRAMESET))
+ else if (aToken == "frameset")
eTypeID = CONTENT_TYPE_APP_FRAMESET;
}
- else if (aToken.equalsAscii(INETTYPE_URL_SUB_HELPID))
+ else if (aToken == "helpid")
eTypeID = CONTENT_TYPE_APP_STARHELP;
}
else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_MAILTO))
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 9cfde41..ea1d0fa 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -731,67 +731,67 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading;
- if (aPropertyName.equalsAscii( PROPERTYNAME_FMTSTR ))
+ if (aPropertyName == PROPERTYNAME_FMTSTR)
{
aRet <<= OUString( pFormat->GetFormatstring() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_LOCALE ))
+ else if (aPropertyName == PROPERTYNAME_LOCALE)
{
lang::Locale aLocale( LanguageTag( pFormat->GetLanguage()).getLocale());
aRet <<= aLocale;
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_TYPE ))
+ else if (aPropertyName == PROPERTYNAME_TYPE)
{
aRet <<= (sal_Int16)( pFormat->GetType() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_COMMENT ))
+ else if (aPropertyName == PROPERTYNAME_COMMENT)
{
aRet <<= OUString( pFormat->GetComment() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_STDFORM ))
+ else if (aPropertyName == PROPERTYNAME_STDFORM)
{
//! Pass through SvNumberformat Member bStandard?
sal_Bool bStandard = ( ( nKey % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 );
aRet.setValue( &bStandard, getBooleanCppuType() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_USERDEF ))
+ else if (aPropertyName == PROPERTYNAME_USERDEF)
{
sal_Bool bUserDef = ( ( pFormat->GetType() & NUMBERFORMAT_DEFINED ) != 0 );
aRet.setValue( &bUserDef, getBooleanCppuType() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_DECIMALS ))
+ else if (aPropertyName == PROPERTYNAME_DECIMALS)
{
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
aRet <<= (sal_Int16)( nDecimals );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_LEADING ))
+ else if (aPropertyName == PROPERTYNAME_LEADING)
{
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
aRet <<= (sal_Int16)( nLeading );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_NEGRED ))
+ else if (aPropertyName == PROPERTYNAME_NEGRED)
{
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
aRet.setValue( &bRed, getBooleanCppuType() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_THOUS ))
+ else if (aPropertyName == PROPERTYNAME_THOUS)
{
pFormat->GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
aRet.setValue( &bThousand, getBooleanCppuType() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_CURRSYM ))
+ else if (aPropertyName == PROPERTYNAME_CURRSYM)
{
OUString aSymbol, aExt;
pFormat->GetNewCurrencySymbol( aSymbol, aExt );
aRet <<= aSymbol;
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_CURREXT ))
+ else if (aPropertyName == PROPERTYNAME_CURREXT)
{
OUString aSymbol, aExt;
pFormat->GetNewCurrencySymbol( aSymbol, aExt );
aRet <<= aExt;
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_CURRABB ))
+ else if (aPropertyName == PROPERTYNAME_CURRABB)
{
OUString aSymbol, aExt;
bool bBank = false;
@@ -975,25 +975,25 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp
SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter();
if (pFormatter)
{
- if (aPropertyName.equalsAscii( PROPERTYNAME_NOZERO ))
+ if (aPropertyName == PROPERTYNAME_NOZERO)
{
// operator >>= shouldn't be used for bool (?)
if ( aValue.getValueTypeClass() == uno::TypeClass_BOOLEAN )
pFormatter->SetNoZero( *(sal_Bool*)aValue.getValue() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_NULLDATE ))
+ else if (aPropertyName == PROPERTYNAME_NULLDATE)
{
util::Date aDate;
if ( aValue >>= aDate )
pFormatter->ChangeNullDate( aDate.Day, aDate.Month, aDate.Year );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_STDDEC ))
+ else if (aPropertyName == PROPERTYNAME_STDDEC)
{
sal_Int16 nInt16 = sal_Int16();
if ( aValue >>= nInt16 )
pFormatter->ChangeStandardPrec( nInt16 );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_TWODIGIT ))
+ else if (aPropertyName == PROPERTYNAME_TWODIGIT)
{
sal_Int16 nInt16 = sal_Int16();
if ( aValue >>= nInt16 )
@@ -1018,12 +1018,12 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a
SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter();
if (pFormatter)
{
- if (aPropertyName.equalsAscii( PROPERTYNAME_NOZERO ))
+ if (aPropertyName == PROPERTYNAME_NOZERO)
{
sal_Bool bNoZero = pFormatter->GetNoZero();
aRet.setValue( &bNoZero, getBooleanCppuType() );
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_NULLDATE ))
+ else if (aPropertyName == PROPERTYNAME_NULLDATE)
{
Date* pDate = pFormatter->GetNullDate();
if (pDate)
@@ -1032,9 +1032,9 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a
aRet <<= aUnoDate;
}
}
- else if (aPropertyName.equalsAscii( PROPERTYNAME_STDDEC ))
+ else if (aPropertyName == PROPERTYNAME_STDDEC)
aRet <<= (sal_Int16)( pFormatter->GetStandardPrec() );
- else if (aPropertyName.equalsAscii( PROPERTYNAME_TWODIGIT ))
+ else if (aPropertyName == PROPERTYNAME_TWODIGIT)
aRet <<= (sal_Int16)( pFormatter->GetYear2000() );
else
throw beans::UnknownPropertyException();
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 7efc8e8..cb95094 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -4540,7 +4540,7 @@ bool SvNumberformat::HasPositiveBracketPlaceholder() const
{
sal_uInt16 nAnz = NumFor[0].GetCount();
OUString *tmpStr = NumFor[0].Info().sStrArray;
- return (tmpStr[nAnz-1].equalsAscii( "_)" ));
+ return tmpStr[nAnz-1] == "_)";
}
DateFormat SvNumberformat::GetDateOrder() const
@@ -4837,7 +4837,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
}
break;
case NF_SYMBOLTYPE_CALDEL :
- if ( pStr[j+1].equalsAscii("buddhist") )
+ if ( pStr[j+1] == "buddhist" )
{
aStr.insert( 0, "[$-" );
if ( rNum.IsSet() && rNum.GetNatNum() == 1 &&
@@ -4862,7 +4862,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
}
// The Thai T NatNum modifier during Xcl export.
if (rNum.IsSet() && rNum.GetNatNum() == 1 &&
- rKeywords[NF_KEY_THAI_T].equalsAscii( "T") &&
+ rKeywords[NF_KEY_THAI_T] == "T" &&
MsLangId::getRealLanguage( rNum.GetLang()) ==
LANGUAGE_THAI && !LCIDInserted )
{
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 0a071fc..8ad781f 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -22,6 +22,7 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/frame/XConfigManager.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -45,7 +46,7 @@ public:
const OUString & rName)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
- return rName.equalsAscii("com.sun.star.config.SpecialConfigManager");
+ return cppu::supportsService(this, rName);
}
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
commit ba7605c8c0d5515bb055e46354ee806cb6a31ed4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:22:01 2014 +0100
sal: Use appropriate OUString functions on string constants
Change-Id: I568c2e0c9b5b234d941e17d57bcb53374626909e
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index 614d906..c7158ea 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -37,7 +37,7 @@
#include <cppunit/plugin/TestPlugIn.h>
#define OSLTEST_DECLARE_USTRING( str_name, str_value ) \
- ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value )
+ ::rtl::OUString a##str_name( str_value )
// condition names
diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h
index 97db12b..ae04a07 100644
--- a/sal/qa/osl/file/osl_File_Const.h
+++ b/sal/qa/osl/file/osl_File_Const.h
@@ -103,10 +103,10 @@ const sal_Char pBuffer_Blank[] = "";
// n###Len for its length
#define OSLTEST_DECLARE( str_name, str_value ) \
- ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( ( str_value ) )
+ ::rtl::OUString a##str_name( ( str_value ) )
#define OSLTEST_DECLARE_UTF8(str_name, str_value ) \
- ::rtl::OUString a##str_name = ::rtl::Uri::decode( ::rtl::OUString::createFromAscii( ( str_value ) ), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8)
+ ::rtl::OUString a##str_name = ::rtl::Uri::decode( ::rtl::OUString( str_value ), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8)
// OS independent file definition
@@ -123,7 +123,8 @@ OSLTEST_DECLARE( UserDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" );
// common used URL:temp, canonical, root, relative, link,etc
OSLTEST_DECLARE( CanURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" );
-OSLTEST_DECLARE( CanURL2, "ca@#;+.,$///78no\0ni..name" );
+rtl::OUString aCanURL2(
+ RTL_CONSTASCII_USTRINGPARAM("ca@#;+.,$///78no\0ni..name"));
OSLTEST_DECLARE( CanURL3, "ca@#;+.,$//tmp/678nonical//name" );
OSLTEST_DECLARE( CanURL4, "canonical.name" );
OSLTEST_DECLARE( TmpName1, "tmpdir" );
commit 3dfcc045dd6a7703eaa0e2617d9247e0c90102de
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 12 12:21:47 2014 +0100
pyuno: Use appropriate OUString functions on string constants
Change-Id: Ib507da6fc85d8bc81fd48108a98ef96d188643ac
diff --git a/pyuno/source/module/pyuno_adapter.cxx b/pyuno/source/module/pyuno_adapter.cxx
index 02881dd..83bb271 100644
--- a/pyuno/source/module/pyuno_adapter.cxx
+++ b/pyuno/source/module/pyuno_adapter.cxx
@@ -182,7 +182,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
// special hack for the uno object identity concept. The XUnoTunnel.getSomething() call is
// always handled by the adapter directly.
- if( aParams.getLength() == 1 && aFunctionName.equalsAscii( "getSomething" ) )
+ if( aParams.getLength() == 1 && aFunctionName == "getSomething" )
{
Sequence< sal_Int8 > id;
if( aParams[0] >>= id )
@@ -244,8 +244,8 @@ Any Adapter::invoke( const OUString &aFunctionName,
if( ret.hasValue() &&
ret.getValueTypeClass() == com::sun::star::uno::TypeClass_SEQUENCE &&
- ! aFunctionName.equalsAscii( "getTypes" ) && // needed by introspection itself !
- ! aFunctionName.equalsAscii( "getImplementationId" ) ) // needed by introspection itself !
+ aFunctionName != "getTypes" && // needed by introspection itself !
+ aFunctionName != "getImplementationId" ) // needed by introspection itself !
{
// the sequence can either be
// 1) a simple sequence return value
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list