include/vbahelper/vbaaccesshelper.hxx | 2
include/vbahelper/vbacollectionimpl.hxx | 10 -
include/vbahelper/vbahelperinterface.hxx | 2
include/vbahelper/vbapropvalue.hxx | 2
include/vbahelper/vbareturntypes.hxx | 2
vbahelper/source/msforms/vbabutton.cxx | 8 -
vbahelper/source/msforms/vbacheckbox.cxx | 14 +-
vbahelper/source/msforms/vbacheckbox.hxx | 2
vbahelper/source/msforms/vbacombobox.cxx | 12 +-
vbahelper/source/msforms/vbacombobox.hxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 112 +++++++++----------
vbahelper/source/msforms/vbacontrols.cxx | 50 ++++----
vbahelper/source/msforms/vbaframe.cxx | 6 -
vbahelper/source/msforms/vbaimage.cxx | 4
vbahelper/source/msforms/vbalabel.cxx | 8 -
vbahelper/source/msforms/vbalabel.hxx | 2
vbahelper/source/msforms/vbalistbox.cxx | 40 +++---
vbahelper/source/msforms/vbalistbox.hxx | 2
vbahelper/source/msforms/vbalistcontrolhelper.cxx | 24 ++--
vbahelper/source/msforms/vbamultipage.cxx | 4
vbahelper/source/msforms/vbanewfont.cxx | 30 ++---
vbahelper/source/msforms/vbapages.cxx | 4
vbahelper/source/msforms/vbaprogressbar.cxx | 4
vbahelper/source/msforms/vbaprogressbar.hxx | 2
vbahelper/source/msforms/vbaradiobutton.cxx | 14 +-
vbahelper/source/msforms/vbaradiobutton.hxx | 2
vbahelper/source/msforms/vbascrollbar.cxx | 24 ++--
vbahelper/source/msforms/vbaspinbutton.cxx | 16 +-
vbahelper/source/msforms/vbasystemaxcontrol.cxx | 4
vbahelper/source/msforms/vbatextbox.cxx | 16 +-
vbahelper/source/msforms/vbatextbox.hxx | 2
vbahelper/source/msforms/vbatogglebutton.cxx | 14 +-
vbahelper/source/msforms/vbatogglebutton.hxx | 2
vbahelper/source/msforms/vbauserform.cxx | 10 -
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 24 ++--
vbahelper/source/vbahelper/vbacolorformat.cxx | 16 +-
vbahelper/source/vbahelper/vbacommandbar.cxx | 16 +-
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 20 +--
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 18 +--
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 30 ++---
vbahelper/source/vbahelper/vbacommandbars.cxx | 12 +-
vbahelper/source/vbahelper/vbadialogbase.cxx | 2
vbahelper/source/vbahelper/vbadocumentbase.cxx | 16 +-
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 12 +-
vbahelper/source/vbahelper/vbaeventshelperbase.cxx | 8 -
vbahelper/source/vbahelper/vbafillformat.cxx | 20 +--
vbahelper/source/vbahelper/vbafontbase.cxx | 16 +-
vbahelper/source/vbahelper/vbaglobalbase.cxx | 12 +-
vbahelper/source/vbahelper/vbahelper.cxx | 32 ++---
vbahelper/source/vbahelper/vbalineformat.cxx | 64 +++++-----
vbahelper/source/vbahelper/vbapagesetupbase.cxx | 54 ++++-----
vbahelper/source/vbahelper/vbapictureformat.cxx | 16 +-
vbahelper/source/vbahelper/vbashape.cxx | 66 +++++------
vbahelper/source/vbahelper/vbashaperange.cxx | 4
vbahelper/source/vbahelper/vbashapes.cxx | 44 +++----
vbahelper/source/vbahelper/vbatextframe.cxx | 30 ++---
vbahelper/source/vbahelper/vbawindowbase.cxx | 4
57 files changed, 494 insertions(+), 494 deletions(-)
New commits:
commit fcaf6cee081b8e3282ee85672ba376a9bd0aeeb9
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 14 09:10:37 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 14 15:14:51 2024 +0200
loplugin:ostr in vbahelper
Change-Id: I7763dd628ba3d4288e52b51e08a5af301f916c1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167621
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vbahelper/vbaaccesshelper.hxx
b/include/vbahelper/vbaaccesshelper.hxx
index 36f24d3a4f71..cf163e90ac45 100644
--- a/include/vbahelper/vbaaccesshelper.hxx
+++ b/include/vbahelper/vbaaccesshelper.hxx
@@ -41,7 +41,7 @@ namespace ooo::vba
inline css::uno::Reference< css::lang::XMultiServiceFactory >
getVBAServiceFactory( SfxObjectShell const * pShell )
{
css::uno::Any aUnoVar;
- if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant(
"VBAGlobals", aUnoVar ) )
+ if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant(
u"VBAGlobals"_ustr, aUnoVar ) )
throw css::lang::IllegalArgumentException();
css::uno::Reference< css::lang::XMultiServiceFactory >
xVBAFactory( aUnoVar, css::uno::UNO_QUERY_THROW );
return xVBAFactory;
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index 9afcf08a3aa5..d70f531e113f 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -245,7 +245,7 @@ protected:
virtual css::uno::Any getItemByStringIndex( const OUString& sIndex )
{
if ( !m_xNameAccess.is() )
- throw css::uno::RuntimeException("ScVbaCollectionBase string index
access not supported by this object" );
+ throw css::uno::RuntimeException(u"ScVbaCollectionBase string
index access not supported by this object"_ustr );
if( mbIgnoreCase )
{
@@ -266,11 +266,11 @@ protected:
virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex )
{
if ( !m_xIndexAccess.is() )
- throw css::uno::RuntimeException("ScVbaCollectionBase numeric
index access not supported by this object" );
+ throw css::uno::RuntimeException(u"ScVbaCollectionBase numeric
index access not supported by this object"_ustr );
if ( nIndex <= 0 )
{
throw css::lang::IndexOutOfBoundsException(
- "index is 0 or negative" );
+ u"index is 0 or negative"_ustr );
}
// need to adjust for vba index ( for which first element is 1 )
return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1
) );
@@ -307,7 +307,7 @@ public:
sal_Int32 nIndex = 0;
if ( !( Index1 >>= nIndex ) )
{
- throw css::lang::IndexOutOfBoundsException( "Couldn't convert
index to Int32" );
+ throw css::lang::IndexOutOfBoundsException( u"Couldn't
convert index to Int32"_ustr );
}
return getItemByIntIndex( nIndex );
@@ -321,7 +321,7 @@ public:
// XDefaultMethod
OUString SAL_CALL getDefaultMethodName( ) override
{
- return "Item";
+ return u"Item"_ustr;
}
// XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration() override = 0;
diff --git a/include/vbahelper/vbahelperinterface.hxx
b/include/vbahelper/vbahelperinterface.hxx
index c0aa106329c7..6d4b78979a2c 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -82,7 +82,7 @@ public:
// The application could certainly be passed around in the context
- seems
// to make sense
css::uno::Reference< css::container::XNameAccess > xNameAccess(
mxContext, css::uno::UNO_QUERY_THROW );
- return xNameAccess->getByName( "Application" );
+ return xNameAccess->getByName( u"Application"_ustr );
}
// XServiceInfo Methods
diff --git a/include/vbahelper/vbapropvalue.hxx
b/include/vbahelper/vbapropvalue.hxx
index ee6443f08a34..fe7cbf1bd12b 100644
--- a/include/vbahelper/vbapropvalue.hxx
+++ b/include/vbahelper/vbapropvalue.hxx
@@ -51,7 +51,7 @@ public:
virtual css::uno::Any SAL_CALL getValue() override;
virtual void SAL_CALL setValue( const css::uno::Any& _value ) override;
- OUString SAL_CALL getDefaultPropertyName() override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName() override { return
u"Value"_ustr; }
};
#endif //SC_VBA_PROPVALULE_HXX
diff --git a/include/vbahelper/vbareturntypes.hxx
b/include/vbahelper/vbareturntypes.hxx
index 96bb168abc01..2d066d797cb4 100644
--- a/include/vbahelper/vbareturntypes.hxx
+++ b/include/vbahelper/vbareturntypes.hxx
@@ -37,7 +37,7 @@ namespace ooo::vba
DefaultReturnHelper( const T1& nValue ) : mnValue( nValue ) {}
virtual void SAL_CALL setValue( T1 nValue ) override { mnValue =
nValue; }
virtual T1 SAL_CALL getValue() override { return mnValue; }
- OUString SAL_CALL getDefaultPropertyName( ) override { return
"Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
};
typedef DefaultReturnHelper< sal_Int32, ov::msforms::XReturnInteger >
ReturnInteger_BASE;
diff --git a/vbahelper/source/msforms/vbabutton.cxx
b/vbahelper/source/msforms/vbabutton.cxx
index 38d5c94028be..2dd2efbae9eb 100644
--- a/vbahelper/source/msforms/vbabutton.cxx
+++ b/vbahelper/source/msforms/vbabutton.cxx
@@ -33,14 +33,14 @@ OUString SAL_CALL
VbaButton::getCaption()
{
OUString Label;
- m_xProps->getPropertyValue( "Label" ) >>= Label;
+ m_xProps->getPropertyValue( u"Label"_ustr ) >>= Label;
return Label;
}
void SAL_CALL
VbaButton::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Label"_ustr, uno::Any( _caption ) );
}
sal_Bool SAL_CALL VbaButton::getAutoSize()
@@ -112,7 +112,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
VbaButton::getFont()
OUString
VbaButton::getServiceImplName()
{
- return "VbaButton";
+ return u"VbaButton"_ustr;
}
uno::Sequence< OUString >
@@ -120,7 +120,7 @@ VbaButton::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Button"
+ u"ooo.vba.msforms.Button"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbacheckbox.cxx
b/vbahelper/source/msforms/vbacheckbox.cxx
index 13922a6de7a4..9069fdfe8802 100644
--- a/vbahelper/source/msforms/vbacheckbox.cxx
+++ b/vbahelper/source/msforms/vbacheckbox.cxx
@@ -33,21 +33,21 @@ OUString SAL_CALL
ScVbaCheckbox::getCaption()
{
OUString Label;
- m_xProps->getPropertyValue( "Label" ) >>= Label;
+ m_xProps->getPropertyValue( u"Label"_ustr ) >>= Label;
return Label;
}
void SAL_CALL
ScVbaCheckbox::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Label"_ustr, uno::Any( _caption ) );
}
uno::Any SAL_CALL
ScVbaCheckbox::getValue()
{
sal_Int16 nValue = -1;
- m_xProps->getPropertyValue( "State" ) >>= nValue;
+ m_xProps->getPropertyValue( u"State"_ustr ) >>= nValue;
if( nValue != 0 )
nValue = -1;
// return uno::makeAny( nValue );
@@ -61,7 +61,7 @@ ScVbaCheckbox::setValue( const uno::Any& _value )
{
sal_Int16 nValue = 0;
sal_Int16 nOldValue = 0;
- m_xProps->getPropertyValue( "State" ) >>= nOldValue;
+ m_xProps->getPropertyValue( u"State"_ustr ) >>= nOldValue;
if( !( _value >>= nValue ) )
{
bool bValue = false;
@@ -72,7 +72,7 @@ ScVbaCheckbox::setValue( const uno::Any& _value )
if( nValue == -1)
nValue = 1;
- m_xProps->setPropertyValue( "State", uno::Any( nValue ) );
+ m_xProps->setPropertyValue( u"State"_ustr, uno::Any( nValue ) );
if ( nValue != nOldValue )
fireClickEvent();
}
@@ -85,7 +85,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaCheckbox::getFont()
OUString
ScVbaCheckbox::getServiceImplName()
{
- return "ScVbaCheckbox";
+ return u"ScVbaCheckbox"_ustr;
}
uno::Sequence< OUString >
@@ -93,7 +93,7 @@ ScVbaCheckbox::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.CheckBox"
+ u"ooo.vba.msforms.CheckBox"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbacheckbox.hxx
b/vbahelper/source/msforms/vbacheckbox.hxx
index 91de78eb5c00..26e74a753d9d 100644
--- a/vbahelper/source/msforms/vbacheckbox.hxx
+++ b/vbahelper/source/msforms/vbacheckbox.hxx
@@ -44,7 +44,7 @@ public:
virtual sal_Bool SAL_CALL getLocked() override;
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
//XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacombobox.cxx
b/vbahelper/source/msforms/vbacombobox.cxx
index 9f1d8dc81309..288adc27a92d 100644
--- a/vbahelper/source/msforms/vbacombobox.cxx
+++ b/vbahelper/source/msforms/vbacombobox.cxx
@@ -42,7 +42,7 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference<
XHelperInterface >& xParent,
try
{
// grab the default value property name
- m_xProps->getPropertyValue( "DataFieldProperty" ) >>= sSourceName;
+ m_xProps->getPropertyValue( u"DataFieldProperty"_ustr ) >>= sSourceName;
}
catch( uno::Exception& )
{
@@ -72,11 +72,11 @@ ScVbaComboBox::setListIndex( const uno::Any& _value )
sal_Int32 nOldIndex = -1;
getListIndex() >>= nOldIndex;
uno::Sequence< OUString > sItems;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sItems;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sItems;
if( ( nIndex >= 0 ) && ( sItems.getLength() > nIndex ) )
{
OUString sText = sItems[ nIndex ];
- m_xProps->setPropertyValue( "Text", uno::Any( sText ) );
+ m_xProps->setPropertyValue( u"Text"_ustr, uno::Any( sText ) );
// fire the _Change event
if( nOldIndex != nIndex )
@@ -88,7 +88,7 @@ uno::Any SAL_CALL
ScVbaComboBox::getListIndex()
{
uno::Sequence< OUString > sItems;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sItems;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sItems;
// should really return the item that has focus regardless of
// it been selected
if ( sItems.hasElements() )
@@ -250,7 +250,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaComboBox::getFont()
OUString
ScVbaComboBox::getServiceImplName()
{
- return "ScVbaComboBox";
+ return u"ScVbaComboBox"_ustr;
}
sal_Int32 SAL_CALL ScVbaComboBox::getBackColor()
@@ -298,7 +298,7 @@ ScVbaComboBox::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.ComboBox"
+ u"ooo.vba.msforms.ComboBox"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbacombobox.hxx
b/vbahelper/source/msforms/vbacombobox.hxx
index 4f682fc31648..a53d0f9b4e24 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -80,7 +80,7 @@ public:
virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return
"Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
//XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbacontrol.cxx
b/vbahelper/source/msforms/vbacontrol.cxx
index cb21c75a8be4..3b7976cf574c 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -91,7 +91,7 @@ ScVbaControl::getWindowPeer()
}
catch(const uno::Exception&)
{
- throw uno::RuntimeException( "The Control does not exist" );
+ throw uno::RuntimeException( u"The Control does not exist"_ustr );
}
}
uno::Reference< css::awt::XVclWindowPeer > xVclWinPeer(xWinPeer,
uno::UNO_QUERY);
@@ -146,7 +146,7 @@ ScVbaControl::ScVbaControl( const uno::Reference<
XHelperInterface >& xParent, c
{
m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
OUString sDefaultControl;
- m_xProps->getPropertyValue( "DefaultControl" ) >>= sDefaultControl;
+ m_xProps->getPropertyValue( u"DefaultControl"_ustr ) >>=
sDefaultControl;
uno::Reference< lang::XMultiComponentFactory > xMFac(
mxContext->getServiceManager(), uno::UNO_SET_THROW );
m_xEmptyFormControl.set( xMFac->createInstanceWithContext(
sDefaultControl, mxContext ), uno::UNO_QUERY_THROW );
}
@@ -182,7 +182,7 @@ void ScVbaControl::removeResource()
//In design model has different behavior
sal_Bool SAL_CALL ScVbaControl::getEnabled()
{
- uno::Any aValue = m_xProps->getPropertyValue ( "Enabled" );
+ uno::Any aValue = m_xProps->getPropertyValue ( u"Enabled"_ustr );
bool bRet = false;
aValue >>= bRet;
return bRet;
@@ -191,36 +191,36 @@ sal_Bool SAL_CALL ScVbaControl::getEnabled()
void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible )
{
uno::Any aValue( bVisible );
- m_xProps->setPropertyValue( "Enabled" , aValue);
+ m_xProps->setPropertyValue( u"Enabled"_ustr , aValue);
}
sal_Bool SAL_CALL ScVbaControl::getVisible()
{
bool bVisible( true );
- m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible;
+ m_xProps->getPropertyValue ( u"EnableVisible"_ustr ) >>= bVisible;
uno::Reference< drawing::XControlShape > xControlShape( m_xControl,
uno::UNO_QUERY );
if ( xControlShape.is() )
{
bool bEnableVisible = bVisible;
uno::Reference< beans::XPropertySet > xProps( m_xControl,
uno::UNO_QUERY_THROW );
- xProps->getPropertyValue ( "Visible" ) >>= bVisible;
+ xProps->getPropertyValue ( u"Visible"_ustr ) >>= bVisible;
bVisible = bVisible && bEnableVisible;
}
else
- m_xProps->getPropertyValue ( "EnableVisible" ) >>= bVisible;
+ m_xProps->getPropertyValue ( u"EnableVisible"_ustr ) >>= bVisible;
return bVisible;
}
void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible )
{
uno::Any aValue( bVisible );
- m_xProps->setPropertyValue( "EnableVisible" , aValue);
+ m_xProps->setPropertyValue( u"EnableVisible"_ustr , aValue);
uno::Reference< drawing::XControlShape > xControlShape( m_xControl,
uno::UNO_QUERY );
if ( xControlShape.is() )
{
uno::Reference< beans::XPropertySet > xProps( m_xControl,
uno::UNO_QUERY_THROW );
- xProps->setPropertyValue ( "Visible", aValue );
+ xProps->setPropertyValue ( u"Visible"_ustr, aValue );
}
}
double SAL_CALL ScVbaControl::getHeight()
@@ -306,12 +306,12 @@ ScVbaControl::getControlSource()
try
{
uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel,
uno::UNO_QUERY_THROW );
- uno::Reference< beans::XPropertySet > xConvertor(
xFac->createInstance( "com.sun.star.table.CellAddressConversion" ),
uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xConvertor(
xFac->createInstance( u"com.sun.star.table.CellAddressConversion"_ustr ),
uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xProps(
xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
table::CellAddress aAddress;
- xProps->getPropertyValue( "BoundCell" ) >>= aAddress;
- xConvertor->setPropertyValue( "Address" , uno::Any( aAddress ) );
- xConvertor->getPropertyValue( "XLA1Representation" ) >>=
sControlSource;
+ xProps->getPropertyValue( u"BoundCell"_ustr ) >>= aAddress;
+ xConvertor->setPropertyValue( u"Address"_ustr , uno::Any( aAddress
) );
+ xConvertor->getPropertyValue( u"XLA1Representation"_ustr ) >>=
sControlSource;
}
catch(const uno::Exception&)
{
@@ -356,7 +356,7 @@ ScVbaControl::setControlSource( const OUString&
_controlsource )
break;
}
- svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, _controlsource, "", sal_uInt16( nRefTab ) );
+ svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, _controlsource, u""_ustr, sal_uInt16( nRefTab ) );
}
OUString SAL_CALL
@@ -369,13 +369,13 @@ ScVbaControl::getRowSource()
try
{
uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel,
uno::UNO_QUERY_THROW );
- uno::Reference< beans::XPropertySet > xConvertor(
xFac->createInstance( "com.sun.star.table.CellRangeAddressConversion" ),
uno::UNO_QUERY );
+ uno::Reference< beans::XPropertySet > xConvertor(
xFac->createInstance( u"com.sun.star.table.CellRangeAddressConversion"_ustr ),
uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xProps(
xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
table::CellRangeAddress aAddress;
- xProps->getPropertyValue( "CellRange" ) >>= aAddress;
- xConvertor->setPropertyValue( "Address" , uno::Any( aAddress ) );
- xConvertor->getPropertyValue( "XLA1Representation" ) >>=
sRowSource;
+ xProps->getPropertyValue( u"CellRange"_ustr ) >>= aAddress;
+ xConvertor->setPropertyValue( u"Address"_ustr , uno::Any( aAddress
) );
+ xConvertor->getPropertyValue( u"XLA1Representation"_ustr ) >>=
sRowSource;
}
catch(const uno::Exception&)
{
@@ -387,14 +387,14 @@ ScVbaControl::getRowSource()
void SAL_CALL
ScVbaControl::setRowSource( const OUString& _rowsource )
{
- svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, "", _rowsource );
+ svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel,
m_xProps, u""_ustr, _rowsource );
}
OUString SAL_CALL
ScVbaControl::getName()
{
OUString sName;
- m_xProps->getPropertyValue( "Name" ) >>= sName;
+ m_xProps->getPropertyValue( u"Name"_ustr ) >>= sName;
return sName;
}
@@ -402,21 +402,21 @@ ScVbaControl::getName()
void SAL_CALL
ScVbaControl::setName( const OUString& _name )
{
- m_xProps->setPropertyValue( "Name" , uno::Any( _name ) );
+ m_xProps->setPropertyValue( u"Name"_ustr , uno::Any( _name ) );
}
OUString SAL_CALL
ScVbaControl::getControlTipText()
{
OUString sName;
- m_xProps->getPropertyValue( "HelpText" ) >>= sName;
+ m_xProps->getPropertyValue( u"HelpText"_ustr ) >>= sName;
return sName;
}
void SAL_CALL
ScVbaControl::setControlTipText( const OUString& rsToolTip )
{
- m_xProps->setPropertyValue( "HelpText" , uno::Any( rsToolTip ) );
+ m_xProps->setPropertyValue( u"HelpText"_ustr , uno::Any( rsToolTip ) );
}
OUString SAL_CALL ScVbaControl::getTag()
@@ -432,7 +432,7 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag )
::sal_Int32 SAL_CALL ScVbaControl::getForeColor()
{
Color nForeColor;
- m_xProps->getPropertyValue( "TextColor" ) >>= nForeColor;
+ m_xProps->getPropertyValue( u"TextColor"_ustr ) >>= nForeColor;
return OORGBToXLRGB( nForeColor );
}
@@ -511,10 +511,10 @@ void SAL_CALL ScVbaControl::fireEvent( const
script::ScriptEvent& rEvt )
{
script::ScriptEvent evt( rEvt );
uno::Reference<lang::XMultiComponentFactory > xServiceManager(
mxContext->getServiceManager(), uno::UNO_SET_THROW );
- uno::Reference< script::XScriptListener > xScriptListener(
xServiceManager->createInstanceWithContext( "ooo.vba.EventListener" , mxContext
), uno::UNO_QUERY_THROW );
+ uno::Reference< script::XScriptListener > xScriptListener(
xServiceManager->createInstanceWithContext( u"ooo.vba.EventListener"_ustr ,
mxContext ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xScriptListener,
uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( "Model" , uno::Any( m_xModel ) );
+ xProps->setPropertyValue( u"Model"_ustr , uno::Any( m_xModel ) );
// handling for sheet control
uno::Reference< msforms::XControl > xThisControl( this );
@@ -532,7 +532,7 @@ void SAL_CALL ScVbaControl::fireEvent( const
script::ScriptEvent& rEvt )
aEvt.Source = m_xEmptyFormControl;
// Set up proper scriptcode
uno::Reference< lang::XMultiServiceFactory > xDocFac( m_xModel,
uno::UNO_QUERY_THROW );
- uno::Reference< document::XCodeNameQuery > xNameQuery(
xDocFac->createInstance( "ooo.vba.VBACodeNameProvider" ), uno::UNO_QUERY_THROW
);
+ uno::Reference< document::XCodeNameQuery > xNameQuery(
xDocFac->createInstance( u"ooo.vba.VBACodeNameProvider"_ustr ),
uno::UNO_QUERY_THROW );
uno::Reference< uno::XInterface > xIf(
xControlShape->getControl(), uno::UNO_QUERY_THROW );
evt.ScriptCode = xNameQuery->getCodeNameForObject( xIf );
// handle if we passed in our own arguments
@@ -596,7 +596,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32
/*nTabIndex*/ )
{
uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(),
uno::UNO_QUERY_THROW );
sal_Int32 nClassId = -1;
- xProps->getPropertyValue( "ClassId" ) >>= nClassId;
+ xProps->getPropertyValue( u"ClassId"_ustr ) >>= nClassId;
uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be
worksheet I guess
uno::Reference< drawing::XShape > xShape( xControlShape,
uno::UNO_QUERY_THROW );
::std::unique_ptr< ConcreteXShapeGeometryAttributes > xGeoHelper( new
ConcreteXShapeGeometryAttributes( xShape ) );
@@ -607,7 +607,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32
/*nTabIndex*/ )
case form::FormComponentType::COMMANDBUTTON:
{
bool bToggle = false;
- xProps->getPropertyValue( "Toggle" ) >>= bToggle;
+ xProps->getPropertyValue( u"Toggle"_ustr ) >>= bToggle;
if ( bToggle )
return new ScVbaToggleButton( xVbaParent, xContext,
xControlShape, xModel, std::move(xGeoHelper) );
else
@@ -630,7 +630,7 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32
/*nTabIndex*/ )
case form::FormComponentType::SCROLLBAR:
return new ScVbaScrollBar( xVbaParent, xContext, xControlShape,
xModel, std::move(xGeoHelper) );
}
- throw uno::RuntimeException( "Unsupported control." );
+ throw uno::RuntimeException( u"Unsupported control."_ustr );
}
/*static*/ uno::Reference< msforms::XControl >
ScVbaControlFactory::createUserformControl(
@@ -646,61 +646,61 @@ void SAL_CALL ScVbaControl::setTabIndex( sal_Int32
/*nTabIndex*/ )
uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be
worksheet I guess
::std::unique_ptr< UserFormGeometryHelper > xGeoHelper( new
UserFormGeometryHelper( xControl, fOffsetX, fOffsetY ) );
- if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlCheckBoxModel" ) )
+ if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ) )
xVBAControl.set( new ScVbaCheckbox( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlRadioButtonModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ) )
xVBAControl.set( new ScVbaRadioButton( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlEditModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlEditModel"_ustr ) )
xVBAControl.set( new ScVbaTextBox( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper), true ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlButtonModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlButtonModel"_ustr ) )
{
bool bToggle = false;
- xProps->getPropertyValue( "Toggle" ) >>= bToggle;
+ xProps->getPropertyValue( u"Toggle"_ustr ) >>= bToggle;
if ( bToggle )
xVBAControl.set( new ScVbaToggleButton( xVbaParent, xContext,
xControl, xModel, std::move(xGeoHelper) ) );
else
xVBAControl.set( new VbaButton( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
}
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlComboBoxModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlComboBoxModel"_ustr ) )
xVBAControl.set( new ScVbaComboBox( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlListBoxModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlListBoxModel"_ustr ) )
xVBAControl.set( new ScVbaListBox( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlFixedTextModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ) )
xVBAControl.set( new ScVbaLabel( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlImageControlModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlImageControlModel"_ustr ) )
xVBAControl.set( new ScVbaImage( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlProgressBarModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlProgressBarModel"_ustr ) )
xVBAControl.set( new ScVbaProgressBar( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlGroupBoxModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ) )
xVBAControl.set( new ScVbaFrame( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper), xDialog ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlScrollBarModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlScrollBarModel"_ustr ) )
xVBAControl.set( new ScVbaScrollBar( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoMultiPageModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoMultiPageModel"_ustr ) )
xVBAControl.set( new ScVbaMultiPage( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.awt.UnoControlSpinButtonModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoControlSpinButtonModel"_ustr ) )
xVBAControl.set( new ScVbaSpinButton( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService(
"com.sun.star.custom.awt.UnoControlSystemAXContainerModel" ) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.custom.awt.UnoControlSystemAXContainerModel"_ustr ) )
xVBAControl.set( new VbaSystemAXControl( xVbaParent, xContext,
xControl, xModel, std::move(xGeoHelper) ) );
// #FIXME implement a page control
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoPageModel" )
)
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoPageModel"_ustr ) )
xVBAControl.set( new ScVbaControl( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper) ) );
- else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoFrameModel"
) )
+ else if ( xServiceInfo->supportsService(
u"com.sun.star.awt.UnoFrameModel"_ustr ) )
xVBAControl.set( new ScVbaFrame( xVbaParent, xContext, xControl,
xModel, std::move(xGeoHelper), xDialog ) );
if( xVBAControl.is() )
return xVBAControl;
- throw uno::RuntimeException( "Unsupported control." );
+ throw uno::RuntimeException( u"Unsupported control."_ustr );
}
OUString
ScVbaControl::getServiceImplName()
{
- return "ScVbaControl";
+ return u"ScVbaControl"_ustr;
}
uno::Sequence< OUString >
ScVbaControl::getServiceNames()
{
- return { "ooo.vba.excel.Control" };
+ return { u"ooo.vba.excel.Control"_ustr };
}
sal_Int32 const nSysCols[] = { 0xC8D0D4, 0x0, 0x6A240A, 0x808080, 0xE4E4E4,
0xFFFFFF, 0x0, 0x0, 0x0, 0xFFFFFF, 0xE4E4E4, 0xE4E4E4, 0x808080, 0x6A240A,
0xFFFFFF, 0xE4E4E4, 0x808080, 0x808080, 0x0, 0xC8D0D4, 0xFFFFFF, 0x404040,
0xE4E4E4, 0x0, 0xE1FFFF };
@@ -708,7 +708,7 @@ sal_Int32 const nSysCols[] = { 0xC8D0D4, 0x0, 0x6A240A,
0x808080, 0xE4E4E4, 0xFF
sal_Int32 ScVbaControl::getBackColor()
{
sal_Int32 nBackColor = 0;
- m_xProps->getPropertyValue( "BackgroundColor" ) >>= nBackColor;
+ m_xProps->getPropertyValue( u"BackgroundColor"_ustr ) >>= nBackColor;
return nBackColor;
}
@@ -720,7 +720,7 @@ void ScVbaControl::setBackColor( sal_Int32 nBackColor )
{
nBackColor = nSysCols[ col & 0x0FF];
}
- m_xProps->setPropertyValue( "BackgroundColor" , uno::Any( XLRGBToOORGB(
nBackColor ) ) );
+ m_xProps->setPropertyValue( u"BackgroundColor"_ustr , uno::Any(
XLRGBToOORGB( nBackColor ) ) );
}
bool ScVbaControl::getAutoSize() const
@@ -745,13 +745,13 @@ void ScVbaControl::setAutoSize( bool bAutoSize )
bool ScVbaControl::getLocked()
{
bool bRes( false );
- m_xProps->getPropertyValue( "ReadOnly" ) >>= bRes;
+ m_xProps->getPropertyValue( u"ReadOnly"_ustr ) >>= bRes;
return bRes;
}
void ScVbaControl::setLocked( bool bLocked )
{
- m_xProps->setPropertyValue( "ReadOnly" , uno::Any( bLocked ) );
+ m_xProps->setPropertyValue( u"ReadOnly"_ustr , uno::Any( bLocked ) );
}
namespace {
@@ -778,11 +778,11 @@ sal_Bool ControlProviderImpl::supportsService(const
OUString& sServiceName)
}
OUString ControlProviderImpl::getImplementationName()
{
- return "ControlProviderImpl";
+ return u"ControlProviderImpl"_ustr;
}
css::uno::Sequence< OUString > ControlProviderImpl::getSupportedServiceNames()
{
- return { "ooo.vba.ControlProvider" };
+ return { u"ooo.vba.ControlProvider"_ustr };
}
uno::Reference< msforms::XControl > SAL_CALL
diff --git a/vbahelper/source/msforms/vbacontrols.cxx
b/vbahelper/source/msforms/vbacontrols.cxx
index 0af1df0963ae..6c6f3c0ca96c 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -94,7 +94,7 @@ public:
uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(),
uno::UNO_QUERY_THROW );
OUString sName;
- xProp->getPropertyValue( "Name" ) >>= sName;
+ xProp->getPropertyValue( u"Name"_ustr ) >>= sName;
return sName;
}
@@ -286,80 +286,80 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any&
Object, const uno::Any& St
bool bNativeAX = false;
if( aComServiceName.equalsIgnoreAsciiCase( "Forms.CommandButton.1"
) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlButtonModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlButtonModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 72.0; fDefHeight = 24.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.Label.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlFixedTextModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlFixedTextModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 72.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.Image.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlImageControlModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlImageControlModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 72.0; fDefHeight = 72.0;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.CheckBox.1"
) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlCheckBoxModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlCheckBoxModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 108.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase(
"Forms.OptionButton.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlRadioButtonModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlRadioButtonModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 108.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.TextBox.1"
) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlEditModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlEditModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 72.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.ListBox.1"
) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlListBoxModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlListBoxModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 72.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.ComboBox.1"
) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlComboBoxModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlComboBoxModel"_ustr ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xNewModel,
uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( "Dropdown" , uno::Any( true ) );
+ xProps->setPropertyValue( u"Dropdown"_ustr , uno::Any( true )
);
fDefWidth = 72.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase(
"Forms.ToggleButton.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlButtonModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlButtonModel"_ustr ), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps( xNewModel,
uno::UNO_QUERY_THROW );
- xProps->setPropertyValue( "Toggle" , uno::Any( true ) );
+ xProps->setPropertyValue( u"Toggle"_ustr , uno::Any( true ) );
fDefWidth = 72.0; fDefHeight = 18.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase( "Forms.Frame.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlGroupBoxModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlGroupBoxModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 216.0; fDefHeight = 144.0;
bFontSupport = true;
}
else if( aComServiceName.equalsIgnoreAsciiCase(
"Forms.SpinButton.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlSpinButtonModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlSpinButtonModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 12.75; fDefHeight = 25.5;
}
else if( aComServiceName.equalsIgnoreAsciiCase(
"Forms.ScrollBar.1" ) )
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.awt.UnoControlScrollBarModel" ), uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.awt.UnoControlScrollBarModel"_ustr ), uno::UNO_QUERY_THROW );
fDefWidth = 12.75; fDefHeight = 63.8;
}
else
{
- xNewModel.set( xModelFactory->createInstance(
"com.sun.star.custom.awt.UnoControlSystemAXContainerModel" ),
uno::UNO_QUERY_THROW );
+ xNewModel.set( xModelFactory->createInstance(
u"com.sun.star.custom.awt.UnoControlSystemAXContainerModel"_ustr ),
uno::UNO_QUERY_THROW );
fDefWidth = 72.0; fDefHeight = 18.0;
bNativeAX = true;
}
@@ -368,12 +368,12 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any&
Object, const uno::Any& St
if( bFontSupport )
{
uno::Reference< beans::XPropertySet > xModelProps( xNewModel,
uno::UNO_QUERY_THROW );
- xModelProps->setPropertyValue( "FontName" , uno::Any(
OUString("Tahoma" ) ) );
- xModelProps->setPropertyValue( "FontHeight" , uno::Any( float(
8.0 ) ) );
- xModelProps->setPropertyValue( "FontWeight" , uno::Any(
awt::FontWeight::NORMAL ) );
- xModelProps->setPropertyValue( "FontSlant" , uno::Any(
awt::FontSlant_NONE ) );
- xModelProps->setPropertyValue( "FontUnderline" , uno::Any(
awt::FontUnderline::NONE ) );
- xModelProps->setPropertyValue( "FontStrikeout" , uno::Any(
awt::FontStrikeout::NONE ) );
+ xModelProps->setPropertyValue( u"FontName"_ustr , uno::Any(
u"Tahoma"_ustr ) );
+ xModelProps->setPropertyValue( u"FontHeight"_ustr , uno::Any(
float( 8.0 ) ) );
+ xModelProps->setPropertyValue( u"FontWeight"_ustr , uno::Any(
awt::FontWeight::NORMAL ) );
+ xModelProps->setPropertyValue( u"FontSlant"_ustr , uno::Any(
awt::FontSlant_NONE ) );
+ xModelProps->setPropertyValue( u"FontUnderline"_ustr ,
uno::Any( awt::FontUnderline::NONE ) );
+ xModelProps->setPropertyValue( u"FontStrikeout"_ustr ,
uno::Any( awt::FontStrikeout::NONE ) );
}
xDialogContainer->insertByName( aNewName, uno::Any( xNewModel ) );
@@ -387,7 +387,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any&
Object, const uno::Any& St
uno::Sequence< uno::Any > aArgs{ uno::Any(aComServiceName) };
uno::Sequence< sal_Int16 > aOutIDDummy;
uno::Sequence< uno::Any > aOutDummy;
- xControlInvoke->invoke( "SOAddAXControl" , aArgs, aOutIDDummy,
aOutDummy );
+ xControlInvoke->invoke( u"SOAddAXControl"_ustr , aArgs,
aOutIDDummy, aOutDummy );
}
catch (const uno::Exception&)
{
@@ -415,7 +415,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any&
Object, const uno::Any& St
catch (const uno::Exception&)
{
css::uno::Any anyEx = cppu::getCaughtException();
- throw lang::WrappedTargetRuntimeException( "Can not create AXControl!",
+ throw lang::WrappedTargetRuntimeException( u"Can not create
AXControl!"_ustr,
uno::Reference< uno::XInterface >(),
anyEx );
}
@@ -490,5 +490,5 @@ ScVbaControls::getElementType()
return cppu::UnoType<ooo::vba::msforms::XControl>::get();
}
-VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaControls, "ooo.vba.msforms.Controls" )
+VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaControls,
u"ooo.vba.msforms.Controls"_ustr )
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/msforms/vbaframe.cxx
b/vbahelper/source/msforms/vbaframe.cxx
index 12a005bb3bd0..8f8eb92ae748 100644
--- a/vbahelper/source/msforms/vbaframe.cxx
+++ b/vbahelper/source/msforms/vbaframe.cxx
@@ -44,13 +44,13 @@ ScVbaFrame::ScVbaFrame(
OUString SAL_CALL ScVbaFrame::getCaption()
{
OUString Label;
- m_xProps->getPropertyValue( "Label" ) >>= Label;
+ m_xProps->getPropertyValue( u"Label"_ustr ) >>= Label;
return Label;
}
void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Label"_ustr, uno::Any( _caption ) );
}
sal_Int32 SAL_CALL ScVbaFrame::getSpecialEffect()
@@ -96,5 +96,5 @@ uno::Any SAL_CALL ScVbaFrame::Controls( const uno::Any&
rIndex )
// XHelperInterface
-VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaFrame, "ooo.vba.msforms.Frame" )
+VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaFrame, u"ooo.vba.msforms.Frame"_ustr )
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/msforms/vbaimage.cxx
b/vbahelper/source/msforms/vbaimage.cxx
index 827544168676..7ae6dc68813d 100644
--- a/vbahelper/source/msforms/vbaimage.cxx
+++ b/vbahelper/source/msforms/vbaimage.cxx
@@ -30,7 +30,7 @@ ScVbaImage::ScVbaImage( const uno::Reference<
XHelperInterface >& xParent, const
OUString
ScVbaImage::getServiceImplName()
{
- return "ScVbaImage";
+ return u"ScVbaImage"_ustr;
}
uno::Sequence< OUString >
@@ -38,7 +38,7 @@ ScVbaImage::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Image"
+ u"ooo.vba.msforms.Image"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbalabel.cxx
b/vbahelper/source/msforms/vbalabel.cxx
index 5b7164b45c34..cb02f2afaf3a 100644
--- a/vbahelper/source/msforms/vbalabel.cxx
+++ b/vbahelper/source/msforms/vbalabel.cxx
@@ -33,14 +33,14 @@ OUString SAL_CALL
ScVbaLabel::getCaption()
{
OUString Label;
- m_xProps->getPropertyValue( "Label" ) >>= Label;
+ m_xProps->getPropertyValue( u"Label"_ustr ) >>= Label;
return Label;
}
void SAL_CALL
ScVbaLabel::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Label"_ustr, uno::Any( _caption ) );
}
uno::Any SAL_CALL
ScVbaLabel::getValue()
@@ -76,7 +76,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaLabel::getFont()
OUString ScVbaLabel::getServiceImplName()
{
- return "ScVbaLabel";
+ return u"ScVbaLabel"_ustr;
}
sal_Int32 SAL_CALL ScVbaLabel::getBackColor()
@@ -104,7 +104,7 @@ ScVbaLabel::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Label"
+ u"ooo.vba.msforms.Label"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbalabel.hxx
b/vbahelper/source/msforms/vbalabel.hxx
index f7fc98416704..eb81c476440e 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -47,7 +47,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX
diff --git a/vbahelper/source/msforms/vbalistbox.cxx
b/vbahelper/source/msforms/vbalistbox.cxx
index b7c1fc0097db..ba16007786a5 100644
--- a/vbahelper/source/msforms/vbalistbox.cxx
+++ b/vbahelper/source/msforms/vbalistbox.cxx
@@ -46,7 +46,7 @@ uno::Any SAL_CALL
ScVbaListBox::getListIndex()
{
uno::Sequence< sal_Int16 > sSelection;
- m_xProps->getPropertyValue( "SelectedItems" ) >>= sSelection;
+ m_xProps->getPropertyValue( u"SelectedItems"_ustr ) >>= sSelection;
if ( !sSelection.hasElements() )
return uno::Any( sal_Int32( -1 ) );
return uno::Any( sSelection[ 0 ] );
@@ -57,10 +57,10 @@ ScVbaListBox::getValue()
{
uno::Sequence< sal_Int16 > sSelection;
uno::Sequence< OUString > sItems;
- m_xProps->getPropertyValue( "SelectedItems" ) >>= sSelection;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sItems;
+ m_xProps->getPropertyValue( u"SelectedItems"_ustr ) >>= sSelection;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sItems;
if( getMultiSelect() )
- throw uno::RuntimeException( "Attribute use invalid." );
+ throw uno::RuntimeException( u"Attribute use invalid."_ustr );
uno::Any aRet;
if ( sSelection.hasElements() )
aRet <<= sItems[ sSelection[ 0 ] ];
@@ -72,19 +72,19 @@ ScVbaListBox::setValue( const uno::Any& _value )
{
if( getMultiSelect() )
{
- throw uno::RuntimeException( "Attribute use invalid." );
+ throw uno::RuntimeException( u"Attribute use invalid."_ustr );
}
OUString sValue = getAnyAsString( _value );
uno::Sequence< OUString > sList;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sList;
sal_Int16 nValue = static_cast<sal_Int16>(comphelper::findValue(sList,
sValue));
if( nValue == -1 )
- throw uno::RuntimeException( "Attribute use invalid." );
+ throw uno::RuntimeException( u"Attribute use invalid."_ustr );
uno::Sequence< sal_Int16 > nSelectedIndices { nValue };
uno::Sequence< sal_Int16 > nOldSelectedIndices;
- m_xProps->getPropertyValue( "SelectedItems" ) >>= nOldSelectedIndices;
- m_xProps->setPropertyValue( "SelectedItems", uno::Any( nSelectedIndices )
);
+ m_xProps->getPropertyValue( u"SelectedItems"_ustr ) >>=
nOldSelectedIndices;
+ m_xProps->setPropertyValue( u"SelectedItems"_ustr, uno::Any(
nSelectedIndices ) );
if ( nSelectedIndices != nOldSelectedIndices )
fireClickEvent();
}
@@ -107,7 +107,7 @@ sal_Int32 SAL_CALL
ScVbaListBox::getMultiSelect()
{
bool bMultiSelect = false;
- m_xProps->getPropertyValue( "MultiSelection" ) >>= bMultiSelect;
+ m_xProps->getPropertyValue( u"MultiSelection"_ustr ) >>= bMultiSelect;
return bMultiSelect ? msforms::fmMultiSelect::fmMultiSelectMulti :
msforms::fmMultiSelect::fmMultiSelectSingle;
}
@@ -129,7 +129,7 @@ ScVbaListBox::setMultiSelect( sal_Int32 _multiselect )
throw lang::IllegalArgumentException();
break;
}
- m_xProps->setPropertyValue( "MultiSelection" , uno::Any( bBoolVal ) );
+ m_xProps->setPropertyValue( u"MultiSelection"_ustr , uno::Any( bBoolVal )
);
}
@@ -137,13 +137,13 @@ css::uno::Any SAL_CALL
ScVbaListBox::Selected( sal_Int32 index )
{
uno::Sequence< OUString > sList;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sList;
sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
// no choice but to do a horror cast as internally
// the indices are but sal_Int16
sal_Int16 nIndex = static_cast< sal_Int16 >( index );
if( nIndex < 0 || nIndex >= nLength )
- throw uno::RuntimeException( "Error Number." );
+ throw uno::RuntimeException( u"Error Number."_ustr );
m_nIndex = nIndex;
return uno::Any( uno::Reference< XPropValue > ( new ScVbaPropValue( this )
) );
}
@@ -176,9 +176,9 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
{
bool bValue = false;
if( !(value >>= bValue) )
- throw uno::RuntimeException( "Invalid type. need boolean." );
+ throw uno::RuntimeException( u"Invalid type. need boolean."_ustr );
uno::Sequence< sal_Int16 > nList;
- m_xProps->getPropertyValue( "SelectedItems" ) >>= nList;
+ m_xProps->getPropertyValue( u"SelectedItems"_ustr ) >>= nList;
sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
sal_Int16 nIndex = m_nIndex;
for( sal_Int16 i = 0; i < nLength; i++ )
@@ -195,7 +195,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
nList.realloc( nLength - 1 );
//m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList
) );
fireClickEvent();
- m_xProps->setPropertyValue( "SelectedItems", uno::Any( nList )
);
+ m_xProps->setPropertyValue( u"SelectedItems"_ustr, uno::Any(
nList ) );
}
return;
}
@@ -214,7 +214,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value )
}
//m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
fireClickEvent();
- m_xProps->setPropertyValue( "SelectedItems", uno::Any( nList ) );
+ m_xProps->setPropertyValue( u"SelectedItems"_ustr, uno::Any( nList ) );
}
// this is called when something like the following vba code is used
@@ -225,7 +225,7 @@ css::uno::Any
ScVbaListBox::getValueEvent()
{
uno::Sequence< sal_Int16 > nList;
- m_xProps->getPropertyValue( "SelectedItems" ) >>= nList;
+ m_xProps->getPropertyValue( u"SelectedItems"_ustr ) >>= nList;
sal_Int32 nIndex = m_nIndex;
bool bRet = std::find(std::cbegin(nList), std::cend(nList), nIndex) !=
std::cend(nList);
@@ -259,7 +259,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaListBox::getFont()
OUString
ScVbaListBox::getServiceImplName()
{
- return "ScVbaListBox";
+ return u"ScVbaListBox"_ustr;
}
uno::Sequence< OUString >
@@ -267,7 +267,7 @@ ScVbaListBox::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.ScVbaListBox"
+ u"ooo.vba.msforms.ScVbaListBox"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbalistbox.hxx
b/vbahelper/source/msforms/vbalistbox.hxx
index b5dde46ebad3..885d42372a6a 100644
--- a/vbahelper/source/msforms/vbalistbox.hxx
+++ b/vbahelper/source/msforms/vbalistbox.hxx
@@ -64,7 +64,7 @@ public:
virtual void SAL_CALL setRowSource( const OUString& _rowsource ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
//XHelperInterface
virtual OUString getServiceImplName() override;
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
index c5dc325c8258..5744be3edb81 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx
@@ -52,15 +52,15 @@ ListPropListener::ListPropListener( uno::Reference<
beans::XPropertySet > xProps
void ListPropListener::setValueEvent( const uno::Any& value )
{
if( m_pvargIndex.hasValue() || m_pvarColumn.hasValue() )
- throw uno::RuntimeException( "Bad argument" );
+ throw uno::RuntimeException( u"Bad argument"_ustr );
- m_xProps->setPropertyValue( "StringItemList", value );
+ m_xProps->setPropertyValue( u"StringItemList"_ustr, value );
}
uno::Any ListPropListener::getValueEvent()
{
uno::Sequence< OUString > sList;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sList;
sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
uno::Any aRet;
if ( m_pvargIndex.hasValue() )
@@ -68,11 +68,11 @@ uno::Any ListPropListener::getValueEvent()
sal_Int16 nIndex = -1;
m_pvargIndex >>= nIndex;
if( nIndex < 0 || nIndex >= nLength )
- throw uno::RuntimeException( "Bad row Index" );
+ throw uno::RuntimeException( u"Bad row Index"_ustr );
aRet <<= sList[ nIndex ];
}
else if ( m_pvarColumn.hasValue() ) // pvarColumn on its own would be bad
- throw uno::RuntimeException( "Bad column Index" );
+ throw uno::RuntimeException( u"Bad column Index"_ustr );
else // List() ( e.g. no args )
{
uno::Sequence< uno::Sequence< OUString > > sReturnArray( nLength );
@@ -94,7 +94,7 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const
uno::Any& pvargInde
return;
uno::Sequence< OUString > sList;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sList;
sal_Int32 nIndex = sList.getLength();
@@ -130,7 +130,7 @@ ListControlHelper::AddItem( const uno::Any& pvargItem,
const uno::Any& pvargInde
std::copy(sVec.begin(), sVec.end(), std::next(sList.getArray(),
nIndex));
}
- m_xProps->setPropertyValue( "StringItemList", uno::Any( sList ) );
+ m_xProps->setPropertyValue( u"StringItemList"_ustr, uno::Any( sList ) );
}
void
@@ -142,9 +142,9 @@ ListControlHelper::removeItem( const uno::Any& index )
return;
uno::Sequence< OUString > sList;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sList;
if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
- throw uno::RuntimeException( "Invalid index" , uno::Reference<
uno::XInterface > () );
+ throw uno::RuntimeException( u"Invalid index"_ustr , uno::Reference<
uno::XInterface > () );
if( sList.hasElements() )
{
if( sList.getLength() == 1 )
@@ -156,7 +156,7 @@ ListControlHelper::removeItem( const uno::Any& index )
comphelper::removeElementAt(sList, nIndex);
}
- m_xProps->setPropertyValue( "StringItemList", uno::Any( sList ) );
+ m_xProps->setPropertyValue( u"StringItemList"_ustr, uno::Any( sList ) );
}
void
@@ -164,7 +164,7 @@ ListControlHelper::Clear( )
{
// urk, setValue doesn't seem to work !!
//setValue( uno::makeAny( sal_Int16() ) );
- m_xProps->setPropertyValue( "StringItemList", uno::Any( uno::Sequence<
OUString >() ) );
+ m_xProps->setPropertyValue( u"StringItemList"_ustr, uno::Any(
uno::Sequence< OUString >() ) );
}
void
@@ -178,7 +178,7 @@ sal_Int32
ListControlHelper::getListCount()
{
uno::Sequence< OUString > sList;
- m_xProps->getPropertyValue( "StringItemList" ) >>= sList;
+ m_xProps->getPropertyValue( u"StringItemList"_ustr ) >>= sList;
return sList.getLength();
}
diff --git a/vbahelper/source/msforms/vbamultipage.cxx
b/vbahelper/source/msforms/vbamultipage.cxx
index 72f62b665248..055701f84184 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -90,7 +90,7 @@ ScVbaMultiPage::setValue( const sal_Int32 _value )
OUString
ScVbaMultiPage::getServiceImplName()
{
- return "ScVbaMultiPage";
+ return u"ScVbaMultiPage"_ustr;
}
uno::Any SAL_CALL
@@ -109,7 +109,7 @@ ScVbaMultiPage::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.MultiPage"
+ u"ooo.vba.msforms.MultiPage"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbanewfont.cxx
b/vbahelper/source/msforms/vbanewfont.cxx
index b966d8454a81..63a1515692bf 100644
--- a/vbahelper/source/msforms/vbanewfont.cxx
+++ b/vbahelper/source/msforms/vbanewfont.cxx
@@ -39,29 +39,29 @@ VbaNewFont::VbaNewFont(
OUString SAL_CALL VbaNewFont::getName()
{
- uno::Any aAny = mxProps->getPropertyValue( "FontName" );
+ uno::Any aAny = mxProps->getPropertyValue( u"FontName"_ustr );
return aAny.get< OUString >();
}
void SAL_CALL VbaNewFont::setName( const OUString& rName )
{
- mxProps->setPropertyValue( "FontName" , uno::Any( rName ) );
+ mxProps->setPropertyValue( u"FontName"_ustr , uno::Any( rName ) );
}
double SAL_CALL VbaNewFont::getSize()
{
- uno::Any aAny = mxProps->getPropertyValue( "FontHeight" );
+ uno::Any aAny = mxProps->getPropertyValue( u"FontHeight"_ustr );
return aAny.get< float >();
}
void SAL_CALL VbaNewFont::setSize( double fSize )
{
- mxProps->setPropertyValue( "FontHeight" , uno::Any( static_cast< float >(
fSize ) ) );
+ mxProps->setPropertyValue( u"FontHeight"_ustr , uno::Any( static_cast<
float >( fSize ) ) );
}
sal_Int16 SAL_CALL VbaNewFont::getCharset()
{
- uno::Any aAny = mxProps->getPropertyValue( "FontCharset" );
+ uno::Any aAny = mxProps->getPropertyValue( u"FontCharset"_ustr );
return rtl_getBestWindowsCharsetFromTextEncoding( static_cast<
rtl_TextEncoding >( aAny.get< sal_Int16 >() ) );
}
@@ -71,8 +71,8 @@ void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset )
if( (0 <= nCharset) && (nCharset <= SAL_MAX_UINT8) )
eFontEnc = rtl_getTextEncodingFromWindowsCharset( static_cast<
sal_uInt8 >( nCharset ) );
if( eFontEnc == RTL_TEXTENCODING_DONTKNOW )
- throw uno::RuntimeException("an unknown or missing encoding");
- mxProps->setPropertyValue( "FontCharset" , uno::Any( static_cast<
sal_Int16 >( eFontEnc ) ) );
+ throw uno::RuntimeException(u"an unknown or missing encoding"_ustr);
+ mxProps->setPropertyValue( u"FontCharset"_ustr , uno::Any( static_cast<
sal_Int16 >( eFontEnc ) ) );
}
sal_Int16 SAL_CALL VbaNewFont::getWeight()
@@ -87,46 +87,46 @@ void SAL_CALL VbaNewFont::setWeight( sal_Int16 nWeight )
sal_Bool SAL_CALL VbaNewFont::getBold()
{
- uno::Any aAny = mxProps->getPropertyValue( "FontWeight" );
+ uno::Any aAny = mxProps->getPropertyValue( u"FontWeight"_ustr );
return aAny.get< float >() > awt::FontWeight::NORMAL;
}
void SAL_CALL VbaNewFont::setBold( sal_Bool bBold )
{
- mxProps->setPropertyValue( "FontWeight" , uno::Any( bBold ?
awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) );
+ mxProps->setPropertyValue( u"FontWeight"_ustr , uno::Any( bBold ?
awt::FontWeight::BOLD : awt::FontWeight::NORMAL ) );
}
sal_Bool SAL_CALL VbaNewFont::getItalic()
{
- uno::Any aAny = mxProps->getPropertyValue( "FontSlant" );
+ uno::Any aAny = mxProps->getPropertyValue( u"FontSlant"_ustr );
return aAny.get< awt::FontSlant >() != awt::FontSlant_NONE;
}
void SAL_CALL VbaNewFont::setItalic( sal_Bool bItalic )
{
- mxProps->setPropertyValue( "FontSlant" , uno::Any( bItalic ?
awt::FontSlant_ITALIC : awt::FontSlant_NONE ) );
+ mxProps->setPropertyValue( u"FontSlant"_ustr , uno::Any( bItalic ?
awt::FontSlant_ITALIC : awt::FontSlant_NONE ) );
}
sal_Bool SAL_CALL VbaNewFont::getUnderline()
{
- uno::Any aAny = mxProps->getPropertyValue("FontUnderline" );
+ uno::Any aAny = mxProps->getPropertyValue(u"FontUnderline"_ustr );
return aAny.get< sal_Int16 >() != awt::FontUnderline::NONE;
}
void SAL_CALL VbaNewFont::setUnderline( sal_Bool bUnderline )
{
- mxProps->setPropertyValue("FontUnderline" , uno::Any( bUnderline ?
awt::FontUnderline::SINGLE : awt::FontUnderline::NONE ) );
+ mxProps->setPropertyValue(u"FontUnderline"_ustr , uno::Any( bUnderline ?
awt::FontUnderline::SINGLE : awt::FontUnderline::NONE ) );
}
sal_Bool SAL_CALL VbaNewFont::getStrikethrough()
{
- uno::Any aAny = mxProps->getPropertyValue( "FontStrikeout" );
+ uno::Any aAny = mxProps->getPropertyValue( u"FontStrikeout"_ustr );
return aAny.get< sal_Int16 >() != awt::FontStrikeout::NONE;
}
void SAL_CALL VbaNewFont::setStrikethrough( sal_Bool bStrikethrough )
{
- mxProps->setPropertyValue( "FontStrikeout" ,uno::Any( bStrikethrough ?
awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) );
+ mxProps->setPropertyValue( u"FontStrikeout"_ustr ,uno::Any( bStrikethrough
? awt::FontStrikeout::SINGLE : awt::FontStrikeout::NONE ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/msforms/vbapages.cxx
b/vbahelper/source/msforms/vbapages.cxx
index 05e0f25c110d..e9ae33effd7f 100644
--- a/vbahelper/source/msforms/vbapages.cxx
+++ b/vbahelper/source/msforms/vbapages.cxx
@@ -41,7 +41,7 @@ ScVbaPages::createCollectionObject( const css::uno::Any&
aSource )
OUString
ScVbaPages::getServiceImplName()
{
- return "ScVbaPages";
+ return u"ScVbaPages"_ustr;
}
uno::Reference< container::XEnumeration > SAL_CALL
@@ -56,7 +56,7 @@ ScVbaPages::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msform.Pages"
+ u"ooo.vba.msform.Pages"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx
b/vbahelper/source/msforms/vbaprogressbar.cxx
index 2e6462e4d72b..182aa987e33f 100644
--- a/vbahelper/source/msforms/vbaprogressbar.cxx
+++ b/vbahelper/source/msforms/vbaprogressbar.cxx
@@ -45,7 +45,7 @@ ScVbaProgressBar::setValue( const uno::Any& _value )
OUString
ScVbaProgressBar::getServiceImplName()
{
- return "ScVbaProgressBar";
+ return u"ScVbaProgressBar"_ustr;
}
uno::Sequence< OUString >
@@ -53,7 +53,7 @@ ScVbaProgressBar::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Label"
+ u"ooo.vba.msforms.Label"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx
b/vbahelper/source/msforms/vbaprogressbar.hxx
index 8385ce4579b3..c1ee952a4a48 100644
--- a/vbahelper/source/msforms/vbaprogressbar.hxx
+++ b/vbahelper/source/msforms/vbaprogressbar.hxx
@@ -40,7 +40,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX
diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx
b/vbahelper/source/msforms/vbaradiobutton.cxx
index 7a3e624bf041..86dde012961c 100644
--- a/vbahelper/source/msforms/vbaradiobutton.cxx
+++ b/vbahelper/source/msforms/vbaradiobutton.cxx
@@ -33,21 +33,21 @@ OUString SAL_CALL
ScVbaRadioButton::getCaption()
{
OUString Label;
- m_xProps->getPropertyValue( "Label" ) >>= Label;
+ m_xProps->getPropertyValue( u"Label"_ustr ) >>= Label;
return Label;
}
void SAL_CALL
ScVbaRadioButton::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Label"_ustr, uno::Any( _caption ) );
}
uno::Any SAL_CALL
ScVbaRadioButton::getValue()
{
sal_Int16 nValue = -1;
- m_xProps->getPropertyValue( "State" ) >>= nValue;
+ m_xProps->getPropertyValue( u"State"_ustr ) >>= nValue;
if( nValue != 0 )
nValue = -1;
// return uno::makeAny( nValue );
@@ -62,7 +62,7 @@ ScVbaRadioButton::setValue( const uno::Any& _value )
{
sal_Int16 nValue = 0;
sal_Int16 nOldValue = 0;
- m_xProps->getPropertyValue( "State" ) >>= nOldValue;
+ m_xProps->getPropertyValue( u"State"_ustr ) >>= nOldValue;
if( !( _value >>= nValue ) )
{
@@ -74,7 +74,7 @@ ScVbaRadioButton::setValue( const uno::Any& _value )
if( nValue == -1)
nValue = 1;
- m_xProps->setPropertyValue( "State", uno::Any( nValue ) );
+ m_xProps->setPropertyValue( u"State"_ustr, uno::Any( nValue ) );
if ( nValue != nOldValue )
{
fireChangeEvent();
@@ -94,7 +94,7 @@ uno::Reference< msforms::XNewFont > SAL_CALL
ScVbaRadioButton::getFont()
OUString
ScVbaRadioButton::getServiceImplName()
{
- return "ScVbaRadioButton";
+ return u"ScVbaRadioButton"_ustr;
}
uno::Sequence< OUString >
@@ -102,7 +102,7 @@ ScVbaRadioButton::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.RadioButton"
+ u"ooo.vba.msforms.RadioButton"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx
b/vbahelper/source/msforms/vbaradiobutton.hxx
index a6f12ae90f2b..93ac1d817b32 100644
--- a/vbahelper/source/msforms/vbaradiobutton.hxx
+++ b/vbahelper/source/msforms/vbaradiobutton.hxx
@@ -40,7 +40,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBARADIOBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbascrollbar.cxx
b/vbahelper/source/msforms/vbascrollbar.cxx
index 229bfad51bce..065338113fd4 100644
--- a/vbahelper/source/msforms/vbascrollbar.cxx
+++ b/vbahelper/source/msforms/vbascrollbar.cxx
@@ -31,54 +31,54 @@ ScVbaScrollBar::ScVbaScrollBar( const css::uno::Reference<
ov::XHelperInterface
uno::Any SAL_CALL
ScVbaScrollBar::getValue()
{
- return m_xProps->getPropertyValue( "ScrollValue" );
+ return m_xProps->getPropertyValue( u"ScrollValue"_ustr );
}
void SAL_CALL
ScVbaScrollBar::setValue( const uno::Any& _value )
{
- m_xProps->setPropertyValue( "ScrollValue", _value );
+ m_xProps->setPropertyValue( u"ScrollValue"_ustr, _value );
}
::sal_Int32 SAL_CALL
ScVbaScrollBar::getMax()
{
sal_Int32 nMax = 0;
- m_xProps->getPropertyValue( "ScrollValueMax" ) >>= nMax;
+ m_xProps->getPropertyValue( u"ScrollValueMax"_ustr ) >>= nMax;
return nMax;
}
void SAL_CALL
ScVbaScrollBar::setMax( sal_Int32 nVal )
{
- m_xProps->setPropertyValue( "ScrollValueMax", uno::Any( nVal ) );
+ m_xProps->setPropertyValue( u"ScrollValueMax"_ustr, uno::Any( nVal ) );
}
::sal_Int32 SAL_CALL
ScVbaScrollBar::getMin()
{
sal_Int32 nVal = 0;
- m_xProps->getPropertyValue( "ScrollValueMin" ) >>= nVal;
+ m_xProps->getPropertyValue( u"ScrollValueMin"_ustr ) >>= nVal;
return nVal;
}
void SAL_CALL
ScVbaScrollBar::setMin( sal_Int32 nVal )
{
- m_xProps->setPropertyValue( "ScrollValueMin", uno::Any( nVal ) );
+ m_xProps->setPropertyValue( u"ScrollValueMin"_ustr, uno::Any( nVal ) );
}
void SAL_CALL
ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange )
{
- m_xProps->setPropertyValue( "BlockIncrement", uno::Any( _largechange ) );
+ m_xProps->setPropertyValue( u"BlockIncrement"_ustr, uno::Any( _largechange
) );
}
::sal_Int32 SAL_CALL
ScVbaScrollBar::getLargeChange()
{
sal_Int32 nVal = 0;
- m_xProps->getPropertyValue( "BlockIncrement" ) >>= nVal;
+ m_xProps->getPropertyValue( u"BlockIncrement"_ustr ) >>= nVal;
return nVal;
}
@@ -86,20 +86,20 @@ ScVbaScrollBar::getLargeChange()
ScVbaScrollBar::getSmallChange()
{
sal_Int32 nSmallChange = 0;
- m_xProps->getPropertyValue( "LineIncrement" ) >>= nSmallChange;
+ m_xProps->getPropertyValue( u"LineIncrement"_ustr ) >>= nSmallChange;
return nSmallChange;
}
void SAL_CALL
ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange )
{
- m_xProps->setPropertyValue( "LineIncrement", uno::Any( _smallchange ) );
+ m_xProps->setPropertyValue( u"LineIncrement"_ustr, uno::Any( _smallchange
) );
}
OUString
ScVbaScrollBar::getServiceImplName()
{
- return "ScVbaScrollBar";
+ return u"ScVbaScrollBar"_ustr;
}
uno::Sequence< OUString >
@@ -107,7 +107,7 @@ ScVbaScrollBar::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Frame"
+ u"ooo.vba.msforms.Frame"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx
b/vbahelper/source/msforms/vbaspinbutton.cxx
index 07514a46afb1..866d9e62b812 100644
--- a/vbahelper/source/msforms/vbaspinbutton.cxx
+++ b/vbahelper/source/msforms/vbaspinbutton.cxx
@@ -31,47 +31,47 @@ ScVbaSpinButton::ScVbaSpinButton( const
css::uno::Reference< ov::XHelperInterfa
uno::Any SAL_CALL
ScVbaSpinButton::getValue()
{
- return m_xProps->getPropertyValue( "SpinValue" );
+ return m_xProps->getPropertyValue( u"SpinValue"_ustr );
}
void SAL_CALL
ScVbaSpinButton::setValue( const uno::Any& _value )
{
- m_xProps->setPropertyValue( "SpinValue", _value );
+ m_xProps->setPropertyValue( u"SpinValue"_ustr, _value );
}
::sal_Int32 SAL_CALL
ScVbaSpinButton::getMax()
{
sal_Int32 nMax = 0;
- m_xProps->getPropertyValue( "SpinValueMax" ) >>= nMax;
+ m_xProps->getPropertyValue( u"SpinValueMax"_ustr ) >>= nMax;
return nMax;
}
void SAL_CALL
ScVbaSpinButton::setMax( sal_Int32 nVal )
{
- m_xProps->setPropertyValue( "SpinValueMax", uno::Any( nVal ) );
+ m_xProps->setPropertyValue( u"SpinValueMax"_ustr, uno::Any( nVal ) );
}
::sal_Int32 SAL_CALL
ScVbaSpinButton::getMin()
{
sal_Int32 nVal = 0;
- m_xProps->getPropertyValue( "SpinValueMin" ) >>= nVal;
+ m_xProps->getPropertyValue( u"SpinValueMin"_ustr ) >>= nVal;
return nVal;
}
void SAL_CALL
ScVbaSpinButton::setMin( sal_Int32 nVal )
{
- m_xProps->setPropertyValue( "SpinValueMin", uno::Any( nVal ) );
+ m_xProps->setPropertyValue( u"SpinValueMin"_ustr, uno::Any( nVal ) );
}
OUString
ScVbaSpinButton::getServiceImplName()
{
- return "ScVbaSpinButton";
+ return u"ScVbaSpinButton"_ustr;
}
uno::Sequence< OUString >
@@ -79,7 +79,7 @@ ScVbaSpinButton::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Frame"
+ u"ooo.vba.msforms.Frame"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
index ea135e270b00..5cf5c2396672 100644
--- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
@@ -68,7 +68,7 @@ sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const
OUString& aName )
OUString
VbaSystemAXControl::getServiceImplName()
{
- return "VbaSystemAXControl";
+ return u"VbaSystemAXControl"_ustr;
}
@@ -77,7 +77,7 @@ VbaSystemAXControl::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.Frame"
+ u"ooo.vba.msforms.Frame"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbatextbox.cxx
b/vbahelper/source/msforms/vbatextbox.cxx
index f01e9dc1def4..e3f8634e8d9f 100644
--- a/vbahelper/source/msforms/vbatextbox.cxx
+++ b/vbahelper/source/msforms/vbatextbox.cxx
@@ -50,7 +50,7 @@ ScVbaTextBox::setValue( const uno::Any& _value )
OUString SAL_CALL
ScVbaTextBox::getText()
{
- uno::Any aValue = m_xProps->getPropertyValue( "Text" );
+ uno::Any aValue = m_xProps->getPropertyValue( u"Text"_ustr );
OUString sString;
aValue >>= sString;
return sString;
@@ -66,7 +66,7 @@ ScVbaTextBox::setText( const OUString& _text )
xTextRange->setString( _text );
}
else
- m_xProps->setPropertyValue( "Text" , uno::Any( _text ) );
+ m_xProps->setPropertyValue( u"Text"_ustr , uno::Any( _text ) );
if ( oldText != _text )
fireChangeEvent();
}
@@ -74,7 +74,7 @@ ScVbaTextBox::setText( const OUString& _text )
sal_Int32 SAL_CALL
ScVbaTextBox::getMaxLength()
{
- uno::Any aValue = m_xProps->getPropertyValue( "MaxTextLen" );
+ uno::Any aValue = m_xProps->getPropertyValue( u"MaxTextLen"_ustr );
sal_Int16 nMaxLength = 0;
aValue >>= nMaxLength;
return static_cast<sal_Int32>(nMaxLength);
@@ -85,13 +85,13 @@ ScVbaTextBox::setMaxLength( sal_Int32 _maxlength )
{
sal_Int16 nTmp( _maxlength );
uno::Any aValue( nTmp );
- m_xProps->setPropertyValue( "MaxTextLen" , aValue);
+ m_xProps->setPropertyValue( u"MaxTextLen"_ustr , aValue);
}
sal_Bool SAL_CALL
ScVbaTextBox::getMultiline()
{
- uno::Any aValue = m_xProps->getPropertyValue( "MultiLine" );
+ uno::Any aValue = m_xProps->getPropertyValue( u"MultiLine"_ustr );
bool bRet = false;
aValue >>= bRet;
return bRet;
@@ -101,7 +101,7 @@ void SAL_CALL
ScVbaTextBox::setMultiline( sal_Bool _multiline )
{
uno::Any aValue( _multiline );
- m_xProps->setPropertyValue( "MultiLine" , aValue);
+ m_xProps->setPropertyValue( u"MultiLine"_ustr , aValue);
}
sal_Int32 SAL_CALL ScVbaTextBox::getSpecialEffect()
@@ -167,7 +167,7 @@ void SAL_CALL ScVbaTextBox::setLocked( sal_Bool bLocked )
OUString
ScVbaTextBox::getServiceImplName()
{
- return "ScVbaTextBox";
+ return u"ScVbaTextBox"_ustr;
}
uno::Sequence< OUString >
@@ -175,7 +175,7 @@ ScVbaTextBox::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.TextBox"
+ u"ooo.vba.msforms.TextBox"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbatextbox.hxx
b/vbahelper/source/msforms/vbatextbox.hxx
index 9a2b969423d2..16cc75f01538 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -56,7 +56,7 @@ public:
virtual void SAL_CALL setLocked( sal_Bool bAutoSize ) override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
//XHelperInterface
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx
b/vbahelper/source/msforms/vbatogglebutton.cxx
index 07008541fa3a..ca82e805e2a2 100644
--- a/vbahelper/source/msforms/vbatogglebutton.cxx
+++ b/vbahelper/source/msforms/vbatogglebutton.cxx
@@ -28,7 +28,7 @@ ScVbaToggleButton::ScVbaToggleButton( const
css::uno::Reference< ov::XHelperInte
: ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel,
std::move(pGeomHelper) )
{
SAL_INFO("vbahelper", "ScVbaToggleButton(ctor)");
- m_xProps->setPropertyValue( "Toggle", uno::Any( true ) );
+ m_xProps->setPropertyValue( u"Toggle"_ustr, uno::Any( true ) );
}
ScVbaToggleButton::~ScVbaToggleButton()
@@ -41,21 +41,21 @@ OUString SAL_CALL
ScVbaToggleButton::getCaption()
{
OUString Label;
- m_xProps->getPropertyValue( "Label" ) >>= Label;
+ m_xProps->getPropertyValue( u"Label"_ustr ) >>= Label;
return Label;
}
void SAL_CALL
ScVbaToggleButton::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Label", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Label"_ustr, uno::Any( _caption ) );
}
uno::Any SAL_CALL
ScVbaToggleButton::getValue()
{
sal_Int16 nState = 0;
- m_xProps->getPropertyValue( "State" ) >>= nState;
+ m_xProps->getPropertyValue( u"State"_ustr ) >>= nState;
return uno::Any( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
}
@@ -74,7 +74,7 @@ ScVbaToggleButton::setValue( const uno::Any& _value )
SAL_INFO("vbahelper", "nState - " << nState );
nState = ( nState == -1 ) ? 1 : 0;
SAL_INFO("vbahelper", "nState - " << nState );
- m_xProps->setPropertyValue( "State", uno::Any( nState ) );
+ m_xProps->setPropertyValue( u"State"_ustr, uno::Any( nState ) );
}
sal_Bool SAL_CALL ScVbaToggleButton::getAutoSize()
@@ -148,7 +148,7 @@ void SAL_CALL ScVbaToggleButton::setLocked( sal_Bool
bLocked )
OUString
ScVbaToggleButton::getServiceImplName()
{
- return "ScVbaToggleButton";
+ return u"ScVbaToggleButton"_ustr;
}
uno::Sequence< OUString >
@@ -156,7 +156,7 @@ ScVbaToggleButton::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.ToggleButton"
+ u"ooo.vba.msforms.ToggleButton"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx
b/vbahelper/source/msforms/vbatogglebutton.hxx
index 61be1a672c07..2e7e857d1538 100644
--- a/vbahelper/source/msforms/vbatogglebutton.hxx
+++ b/vbahelper/source/msforms/vbatogglebutton.hxx
@@ -54,7 +54,7 @@ public:
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
// XDefaultProperty
- OUString SAL_CALL getDefaultPropertyName( ) override { return "Value"; }
+ OUString SAL_CALL getDefaultPropertyName( ) override { return
u"Value"_ustr; }
};
#endif // INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX
diff --git a/vbahelper/source/msforms/vbauserform.cxx
b/vbahelper/source/msforms/vbauserform.cxx
index 66aa6eff7198..663a51d7cf8f 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -104,13 +104,13 @@ OUString SAL_CALL
ScVbaUserForm::getCaption()
{
OUString sCaption;
- m_xProps->getPropertyValue( "Title" ) >>= sCaption;
+ m_xProps->getPropertyValue( u"Title"_ustr ) >>= sCaption;
return sCaption;
}
void
ScVbaUserForm::setCaption( const OUString& _caption )
{
- m_xProps->setPropertyValue( "Title", uno::Any( _caption ) );
+ m_xProps->setPropertyValue( u"Title"_ustr, uno::Any( _caption ) );
}
sal_Bool SAL_CALL
@@ -176,13 +176,13 @@ ScVbaUserForm::UnloadObject( )
OUString
ScVbaUserForm::getServiceImplName()
{
- return "ScVbaUserForm";
+ return u"ScVbaUserForm"_ustr;
}
uno::Sequence< OUString >
ScVbaUserForm::getServiceNames()
{
- return { "ooo.vba.excel.UserForm" };
+ return { u"ooo.vba.excel.UserForm"_ustr };
}
uno::Reference< beans::XIntrospectionAccess > SAL_CALL
@@ -292,7 +292,7 @@ ScVbaUserForm::hasProperty( const OUString& aName )
uno::Reference< beans::XPropertySet > xDlgProps( xControl->getModel(),
uno::UNO_QUERY );
if ( xDlgProps.is() )
{
- uno::Reference< container::XNameContainer > xAllChildren(
xDlgProps->getPropertyValue( "AllDialogChildren" ), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameContainer > xAllChildren(
xDlgProps->getPropertyValue( u"AllDialogChildren"_ustr ), uno::UNO_QUERY_THROW
);
bool bRes = xAllChildren->hasByName( aName );
SAL_INFO("vbahelper", "ScVbaUserForm::hasProperty(" << aName << ")
" << xAllChildren.is() << " ---> " << bRes );
return bRes;
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 1acf3fcb809a..e10443c865e3 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -96,7 +96,7 @@ public:
void Start( const ::rtl::Reference< VbaApplicationBase >& xBase, const
OUString& aFunction, double nFrom, double nTo )
{
if ( !xBase.is() || aFunction.isEmpty() )
- throw uno::RuntimeException( "Unexpected arguments!" );
+ throw uno::RuntimeException( u"Unexpected arguments!"_ustr );
m_xBase = xBase;
m_aTimerInfo = VbaTimerInfo( aFunction, ::std::pair< double, double >(
nFrom, nTo ) );
@@ -192,8 +192,8 @@ VbaApplicationBase::getDisplayStatusBar()
uno::Reference< frame::XFrame > xFrame(
xModel->getCurrentController()->getFrame(), uno::UNO_SET_THROW );
uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW
);
- uno::Reference< frame::XLayoutManager > xLayoutManager(
xProps->getPropertyValue( "LayoutManager"), uno::UNO_QUERY_THROW );
- if( xLayoutManager->isElementVisible(
"private:resource/statusbar/statusbar" ) ){
+ uno::Reference< frame::XLayoutManager > xLayoutManager(
xProps->getPropertyValue( u"LayoutManager"_ustr), uno::UNO_QUERY_THROW );
+ if( xLayoutManager->isElementVisible(
u"private:resource/statusbar/statusbar"_ustr ) ){
return true;
}
return false;
@@ -206,8 +206,8 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool
bDisplayStatusBar)
uno::Reference< frame::XFrame > xFrame(
xModel->getCurrentController()->getFrame(), uno::UNO_SET_THROW );
uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW
);
- uno::Reference< frame::XLayoutManager > xLayoutManager(
xProps->getPropertyValue( "LayoutManager" ), uno::UNO_QUERY_THROW );
- OUString url( "private:resource/statusbar/statusbar" );
+ uno::Reference< frame::XLayoutManager > xLayoutManager(
xProps->getPropertyValue( u"LayoutManager"_ustr ), uno::UNO_QUERY_THROW );
+ OUString url( u"private:resource/statusbar/statusbar"_ustr );
if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
if( !xLayoutManager->showElement( url ) )
xLayoutManager->createElement( url );
@@ -349,7 +349,7 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const OUString&
MacroName, const uno:
MacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( xModel ),
aMacroName );
if( !aMacroInfo.mbFound )
{
- throw uno::RuntimeException( "The macro doesn't exist" );
+ throw uno::RuntimeException( u"The macro doesn't exist"_ustr );
}
// handle the arguments
@@ -380,13 +380,13 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const
OUString& MacroName, const uno:
void SAL_CALL VbaApplicationBase::OnTime( const uno::Any& aEarliestTime, const
OUString& aFunction, const uno::Any& aLatestTime, const uno::Any& aSchedule )
{
if ( aFunction.isEmpty() )
- throw uno::RuntimeException( "Unexpected function name!" );
+ throw uno::RuntimeException( u"Unexpected function name!"_ustr );
double nEarliestTime = 0;
double nLatestTime = 0;
if ( !( aEarliestTime >>= nEarliestTime )
|| ( aLatestTime.hasValue() && !( aLatestTime >>= nLatestTime ) ) )
- throw uno::RuntimeException( "Only double is supported as time for
now!" );
+ throw uno::RuntimeException( u"Only double is supported as time for
now!"_ustr );
bool bSetTimer = true;
aSchedule >>= bSetTimer;
@@ -415,7 +415,7 @@ uno::Any SAL_CALL VbaApplicationBase::getVBE()
uno::Sequence< uno::Any > aArgs{ uno::Any(getCurrentDocument()) };
uno::Reference< lang::XMultiComponentFactory > xServiceManager(
mxContext->getServiceManager(), uno::UNO_SET_THROW );
uno::Reference< uno::XInterface > xVBE =
xServiceManager->createInstanceWithArgumentsAndContext(
- "ooo.vba.vbide.VBE" , aArgs, mxContext );
+ u"ooo.vba.vbide.VBE"_ustr , aArgs, mxContext );
return uno::Any( xVBE );
}
catch( const uno::Exception& )
@@ -427,7 +427,7 @@ uno::Any SAL_CALL VbaApplicationBase::getVBE()
OUString
VbaApplicationBase::getServiceImplName()
{
- return "VbaApplicationBase";
+ return u"VbaApplicationBase"_ustr;
}
uno::Sequence<OUString>
@@ -435,7 +435,7 @@ VbaApplicationBase::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.VbaApplicationBase"
+ u"ooo.vba.VbaApplicationBase"_ustr
};
return aServiceNames;
}
@@ -443,7 +443,7 @@ VbaApplicationBase::getServiceNames()
void SAL_CALL VbaApplicationBase::Undo()
{
uno::Reference< frame::XModel > xModel( getCurrentDocument(),
uno::UNO_SET_THROW );
- dispatchRequests( xModel, ".uno:Undo" );
+ dispatchRequests( xModel, u".uno:Undo"_ustr );
}
void VbaApplicationBase::Quit()
diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx
b/vbahelper/source/vbahelper/vbacolorformat.cxx
index 56180a98fb6a..1157db152248 100644
--- a/vbahelper/source/vbahelper/vbacolorformat.cxx
+++ b/vbahelper/source/vbahelper/vbacolorformat.cxx
@@ -61,20 +61,20 @@ ScVbaColorFormat::getRGB()
switch( m_nColorFormatType )
{
case ColorFormatType::LINEFORMAT_FORECOLOR:
- m_xPropertySet->getPropertyValue( "LineColor" ) >>= nRGB;
+ m_xPropertySet->getPropertyValue( u"LineColor"_ustr ) >>= nRGB;
break;
case ColorFormatType::LINEFORMAT_BACKCOLOR:
//TODO BackColor not supported
// m_xPropertySet->setPropertyValue("Color", uno::makeAny( nRGB ) );
break;
case ColorFormatType::FILLFORMAT_FORECOLOR:
- m_xPropertySet->getPropertyValue( "FillColor" ) >>= nRGB;
+ m_xPropertySet->getPropertyValue( u"FillColor"_ustr ) >>= nRGB;
break;
case ColorFormatType::FILLFORMAT_BACKCOLOR:
nRGB = m_nFillFormatBackColor;
break;
default:
- throw uno::RuntimeException( "Second parameter of ColorFormat is
wrong." );
+ throw uno::RuntimeException( u"Second parameter of ColorFormat is
wrong."_ustr );
}
nRGB = OORGBToXLRGB( Color(ColorTransparency, nRGB) );
return nRGB;
@@ -87,13 +87,13 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb )
switch( m_nColorFormatType )
{
case ColorFormatType::LINEFORMAT_FORECOLOR:
- m_xPropertySet->setPropertyValue( "LineColor" , uno::Any( nRGB ) );
+ m_xPropertySet->setPropertyValue( u"LineColor"_ustr , uno::Any( nRGB )
);
break;
case ColorFormatType::LINEFORMAT_BACKCOLOR:
// TODO BackColor not supported
break;
case ColorFormatType::FILLFORMAT_FORECOLOR:
- m_xPropertySet->setPropertyValue( "FillColor" , uno::Any( nRGB ) );
+ m_xPropertySet->setPropertyValue( u"FillColor"_ustr , uno::Any( nRGB )
);
if( m_pFillFormat )
{
m_pFillFormat->setForeColorAndInternalStyle(nRGB);
@@ -107,7 +107,7 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb )
}
break;
default:
- throw uno::RuntimeException( "Second parameter of ColorFormat is
wrong." );
+ throw uno::RuntimeException( u"Second parameter of ColorFormat is
wrong."_ustr );
}
}
@@ -153,7 +153,7 @@ ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor )
OUString
ScVbaColorFormat::getServiceImplName()
{
- return "ScVbaColorFormat";
+ return u"ScVbaColorFormat"_ustr;
}
uno::Sequence< OUString >
@@ -161,7 +161,7 @@ ScVbaColorFormat::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.msforms.ColorFormat"
+ u"ooo.vba.msforms.ColorFormat"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx
b/vbahelper/source/vbahelper/vbacommandbar.cxx
index 9df3dd9b0f2b..b7d522d59300 100644
--- a/vbahelper/source/vbahelper/vbacommandbar.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbar.cxx
@@ -42,7 +42,7 @@ ScVbaCommandBar::getName()
{
// This will get a "NULL length string" when Name is not set.
uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings,
uno::UNO_QUERY_THROW );
- uno::Any aName = xPropertySet->getPropertyValue( "UIName" );
+ uno::Any aName = xPropertySet->getPropertyValue( u"UIName"_ustr );
OUString sName;
aName >>= sName;
if( sName.isEmpty() )
@@ -64,7 +64,7 @@ ScVbaCommandBar::getName()
{
uno::Sequence< beans::PropertyValue > aToolBar;
xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar;
- getPropertyValue( aToolBar, "UIName" ) >>= sName;
+ getPropertyValue( aToolBar, u"UIName"_ustr ) >>= sName;
}
}
return sName;
@@ -73,7 +73,7 @@ void SAL_CALL
ScVbaCommandBar::setName( const OUString& _name )
{
uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings,
uno::UNO_QUERY_THROW );
- xPropertySet->setPropertyValue( "UIName" , uno::Any( _name ) );
+ xPropertySet->setPropertyValue( u"UIName"_ustr , uno::Any( _name ) );
pCBarHelper->ApplyTempChange( m_sResourceUrl, m_xBarSettings );
}
@@ -92,7 +92,7 @@ ScVbaCommandBar::getVisible()
{
uno::Sequence< beans::PropertyValue > aToolBar;
xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar;
- getPropertyValue( aToolBar, "Visible" ) >>= bVisible;
+ getPropertyValue( aToolBar, u"Visible"_ustr ) >>= bVisible;
}
}
catch (const uno::Exception&)
@@ -177,7 +177,7 @@ ScVbaCommandBar::FindControl( const uno::Any& /*aType*/,
const uno::Any& /*aId*/
OUString
ScVbaCommandBar::getServiceImplName()
{
- return "ScVbaCommandBar";
+ return u"ScVbaCommandBar"_ustr;
}
uno::Sequence<OUString>
@@ -185,7 +185,7 @@ ScVbaCommandBar::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBar"
+ u"ooo.vba.CommandBar"_ustr
};
return aServiceNames;
}
@@ -259,14 +259,14 @@ uno::Any SAL_CALL VbaDummyCommandBar::FindControl( const
uno::Any& /*aType*/, co
OUString VbaDummyCommandBar::getServiceImplName()
{
- return "VbaDummyCommandBar";
+ return u"VbaDummyCommandBar"_ustr;
}
uno::Sequence< OUString > VbaDummyCommandBar::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBar"
+ u"ooo.vba.CommandBar"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
index 35c2925e4127..52e4f5026e96 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
@@ -42,7 +42,7 @@ ScVbaCommandBarControl::getCaption()
{
// "Label" always empty
OUString sCaption;
- getPropertyValue( m_aPropertyValues, "Label" ) >>= sCaption;
+ getPropertyValue( m_aPropertyValues, u"Label"_ustr ) >>= sCaption;
return sCaption;
}
@@ -50,7 +50,7 @@ void SAL_CALL
ScVbaCommandBarControl::setCaption( const OUString& _caption )
{
OUString sCaption = _caption.replace('&','~');
- setPropertyValue( m_aPropertyValues, "Label" , uno::Any( sCaption ) );
+ setPropertyValue( m_aPropertyValues, u"Label"_ustr , uno::Any( sCaption )
);
ApplyChange();
}
@@ -58,7 +58,7 @@ OUString SAL_CALL
ScVbaCommandBarControl::getOnAction()
{
OUString sCommandURL;
- getPropertyValue( m_aPropertyValues, "CommandURL" ) >>= sCommandURL;
+ getPropertyValue( m_aPropertyValues, u"CommandURL"_ustr ) >>= sCommandURL;
return sCommandURL;
}
@@ -72,7 +72,7 @@ ScVbaCommandBarControl::setOnAction( const OUString&
_onaction )
{
OUString aCommandURL = ooo::vba::makeMacroURL(
aResolvedMacro.msResolvedMacro );
SAL_INFO("vbahelper", "ScVbaCommandBarControl::setOnAction: " <<
aCommandURL);
- setPropertyValue( m_aPropertyValues, "CommandURL" , uno::Any(
aCommandURL ) );
+ setPropertyValue( m_aPropertyValues, u"CommandURL"_ustr , uno::Any(
aCommandURL ) );
ApplyChange();
}
}
@@ -180,7 +180,7 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex )
OUString
ScVbaCommandBarControl::getServiceImplName()
{
- return "ScVbaCommandBarControl";
+ return u"ScVbaCommandBarControl"_ustr;
}
uno::Sequence<OUString>
@@ -188,7 +188,7 @@ ScVbaCommandBarControl::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBarControl"
+ u"ooo.vba.CommandBarControl"_ustr
};
return aServiceNames;
}
@@ -210,7 +210,7 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const
css::uno::Reference< ov::XHelp
OUString
ScVbaCommandBarPopup::getServiceImplName()
{
- return "ScVbaCommandBarPopup";
+ return u"ScVbaCommandBarPopup"_ustr;
}
uno::Sequence<OUString>
@@ -218,7 +218,7 @@ ScVbaCommandBarPopup::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBarPopup"
+ u"ooo.vba.CommandBarPopup"_ustr
};
return aServiceNames;
}
@@ -240,7 +240,7 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const
css::uno::Reference< ov::XHe
OUString
ScVbaCommandBarButton::getServiceImplName()
{
- return "ScVbaCommandBarButton";
+ return u"ScVbaCommandBarButton"_ustr;
}
uno::Sequence<OUString>
@@ -248,7 +248,7 @@ ScVbaCommandBarButton::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBarButton"
+ u"ooo.vba.CommandBarButton"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index e88f811fbafd..118c5b041480 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -160,7 +160,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const
uno::Any& Id, const un
{
// Parameter is not supported
// the following name needs to be individually created;
- OUString sLabel("Custom");
+ OUString sLabel(u"Custom"_ustr);
OUString sCommandUrl( CUSTOM_MENU_STR + sLabel);
sal_Int32 nType = office::MsoControlType::msoControlButton;
sal_Int32 nPosition = 0;
@@ -172,11 +172,11 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const
uno::Any& Id, const un
if( nType != office::MsoControlType::msoControlButton &&
nType != office::MsoControlType::msoControlPopup )
- throw uno::RuntimeException( "Not implemented" );
+ throw uno::RuntimeException( u"Not implemented"_ustr );
if( Id.hasValue() || Parameter.hasValue( ) )
{
- throw uno::RuntimeException( "Not implemented" );
+ throw uno::RuntimeException( u"Not implemented"_ustr );
}
if( Before.hasValue() )
@@ -197,11 +197,11 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const
uno::Any& Id, const un
sal_uInt16 nItemType = 0;
if( m_bIsMenu )
{
- aProps = CreateMenuItemData( sCommandUrl, "", sLabel, nItemType,
aSubMenu, true, true );
+ aProps = CreateMenuItemData( sCommandUrl, u""_ustr, sLabel, nItemType,
aSubMenu, true, true );
}
else
{
- aProps = CreateToolbarItemData( sCommandUrl, "", sLabel, nItemType,
aSubMenu, true/*isVisible*/, 0/*nStyle*/ );
+ aProps = CreateToolbarItemData( sCommandUrl, u""_ustr, sLabel,
nItemType, aSubMenu, true/*isVisible*/, 0/*nStyle*/ );
}
@@ -223,7 +223,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const
uno::Any& Id, const un
OUString
ScVbaCommandBarControls::getServiceImplName()
{
- return "ScVbaCommandBarControls";
+ return u"ScVbaCommandBarControls"_ustr;
}
uno::Sequence<OUString>
@@ -231,7 +231,7 @@ ScVbaCommandBarControls::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBarControls"
+ u"ooo.vba.CommandBarControls"_ustr
};
return aServiceNames;
}
@@ -294,14 +294,14 @@ uno::Reference< XCommandBarControl > SAL_CALL
VbaDummyCommandBarControls::Add(
// XHelperInterface
OUString VbaDummyCommandBarControls::getServiceImplName()
{
- return "VbaDummyCommandBarControls";
+ return u"VbaDummyCommandBarControls"_ustr;
}
uno::Sequence<OUString> VbaDummyCommandBarControls::getServiceNames()
{
static uno::Sequence< OUString > const aServiceNames
{
- "ooo.vba.CommandBarControls"
+ u"ooo.vba.CommandBarControls"_ustr
};
return aServiceNames;
}
diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 8191afde74bd..f248989b33fc 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -47,17 +47,17 @@ private:
MSO2OOCommandbarHelper()
{
// Buildin toolbars
- maBuildinToolbarMap.insert( std::make_pair( OUString("Standard") ,
OUString("private:resource/toolbar/standardbar" ) ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Formatting"),
OUString("private:resource/toolbar/formatobjectbar") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Drawing"),
OUString("private:resource/toolbar/drawbar") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Toolbar List"),
OUString("private:resource/toolbar/toolbar") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Forms"),
OUString("private:resource/toolbar/formcontrols") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Form
Controls"),OUString("private:resource/toolbar/formcontrols") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Full Screen"),
OUString("private:resource/toolbar/fullscreenbar") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Chart"),
OUString("private:resource/toolbar/flowchartshapes") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("Picture"),
OUString("private:resource/toolbar/graphicobjectbar") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("WordArt"),
OUString("private:resource/toolbar/fontworkobjectbar") ) );
- maBuildinToolbarMap.insert( std::make_pair( OUString("3-D Settings"),
OUString("private:resource/toolbar/extrusionobjectbar") ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Standard"_ustr ,
u"private:resource/toolbar/standardbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Formatting"_ustr,
u"private:resource/toolbar/formatobjectbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Drawing"_ustr,
u"private:resource/toolbar/drawbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Toolbar List"_ustr,
u"private:resource/toolbar/toolbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Forms"_ustr,
u"private:resource/toolbar/formcontrols"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Form
Controls"_ustr,u"private:resource/toolbar/formcontrols"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Full Screen"_ustr,
u"private:resource/toolbar/fullscreenbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Chart"_ustr,
u"private:resource/toolbar/flowchartshapes"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"Picture"_ustr,
u"private:resource/toolbar/graphicobjectbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"WordArt"_ustr,
u"private:resource/toolbar/fontworkobjectbar"_ustr ) );
+ maBuildinToolbarMap.insert( std::make_pair( u"3-D Settings"_ustr,
u"private:resource/toolbar/extrusionobjectbar"_ustr ) );
}
public:
@@ -96,18 +96,18 @@ void VbaCommandBarHelper::Init( )
m_xDocCfgMgr = xUICfgSupplier->getUIConfigurationManager();
uno::Reference< lang::XServiceInfo > xServiceInfo( mxModel,
uno::UNO_QUERY_THROW );
- if( xServiceInfo->supportsService(
"com.sun.star.sheet.SpreadsheetDocument" ) )
+ if( xServiceInfo->supportsService(
u"com.sun.star.sheet.SpreadsheetDocument"_ustr ) )
{
maModuleId = "com.sun.star.sheet.SpreadsheetDocument";
}
- else if( xServiceInfo->supportsService( "com.sun.star.text.TextDocument" )
)
-e
... etc. - the rest is truncated
