[Libreoffice-commits] .: sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 2 13:52:28 PDT 2010
sc/source/ui/unoobj/cellsuno.cxx | 54 +++++++++++++++++++-------------------
sc/source/ui/vba/vbaassistant.cxx | 4 +-
sc/source/ui/vba/vbaaxis.cxx | 2 -
sc/source/ui/vba/vbainterior.cxx | 14 ++++-----
4 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 073ab399203318716c9a9121e705b466592347ab
Author: Joost Eekhoorn <joost.eekhoorn at gmail.com>
Date: Tue Nov 2 20:52:20 2010 +0000
RTL_CONSTASCII_USTRINGPARAM macro
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index eadb12a..548f659 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4715,7 +4715,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException)
rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString::createFromAscii( "ScCellRangesObj" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangesObj" ));
}
sal_Bool SAL_CALL ScCellRangesObj::supportsService( const rtl::OUString& rServiceName )
@@ -4733,10 +4733,10 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames(
{
uno::Sequence<rtl::OUString> aRet(4);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii( SCSHEETCELLRANGES_SERVICE );
- pArray[1] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[2] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[3] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGES_SERVICE ));
+ pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
return aRet;
}
@@ -6027,7 +6027,7 @@ const SfxItemPropertyMap* ScCellRangeObj::GetItemPropertyMap()
rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString::createFromAscii( "ScCellRangeObj" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellRangeObj" ));
}
sal_Bool SAL_CALL ScCellRangeObj::supportsService( const rtl::OUString& rServiceName )
@@ -6046,11 +6046,11 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames()
{
uno::Sequence<rtl::OUString> aRet(5);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
- pArray[1] = rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
- pArray[2] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[3] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[4] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+ pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+ pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
return aRet;
}
@@ -6704,7 +6704,7 @@ const SfxItemPropertyMap* ScCellObj::GetItemPropertyMap()
rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString::createFromAscii( "ScCellObj" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScCellObj" ));
}
sal_Bool SAL_CALL ScCellObj::supportsService( const rtl::OUString& rServiceName )
@@ -6729,13 +6729,13 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellObj::getSupportedServiceNames()
{
uno::Sequence<rtl::OUString> aRet(7);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii( SCSHEETCELL_SERVICE );
- pArray[1] = rtl::OUString::createFromAscii( SCCELL_SERVICE );
- pArray[2] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[3] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[4] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
- pArray[5] = rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
- pArray[6] = rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELL_SERVICE ));
+ pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELL_SERVICE ));
+ pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+ pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+ pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
return aRet;
}
@@ -8661,7 +8661,7 @@ const SfxItemPropertyMap* ScTableSheetObj::GetItemPropertyMap()
rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString::createFromAscii( "ScTableSheetObj" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScTableSheetObj" ));
}
sal_Bool SAL_CALL ScTableSheetObj::supportsService( const rtl::OUString& rServiceName )
@@ -8682,13 +8682,13 @@ uno::Sequence<rtl::OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames(
{
uno::Sequence<rtl::OUString> aRet(7);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString::createFromAscii( SCSPREADSHEET_SERVICE );
- pArray[1] = rtl::OUString::createFromAscii( SCSHEETCELLRANGE_SERVICE );
- pArray[2] = rtl::OUString::createFromAscii( SCCELLRANGE_SERVICE );
- pArray[3] = rtl::OUString::createFromAscii( SCCELLPROPERTIES_SERVICE );
- pArray[4] = rtl::OUString::createFromAscii( SCCHARPROPERTIES_SERVICE );
- pArray[5] = rtl::OUString::createFromAscii( SCPARAPROPERTIES_SERVICE );
- pArray[6] = rtl::OUString::createFromAscii( SCLINKTARGET_SERVICE );
+ pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSPREADSHEET_SERVICE ));
+ pArray[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSHEETCELLRANGE_SERVICE ));
+ pArray[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLRANGE_SERVICE ));
+ pArray[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCELLPROPERTIES_SERVICE ));
+ pArray[4] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCCHARPROPERTIES_SERVICE ));
+ pArray[5] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCPARAPROPERTIES_SERVICE ));
+ pArray[6] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCLINKTARGET_SERVICE ));
return aRet;
}
diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx
index 43ab458..b52a165 100644
--- a/sc/source/ui/vba/vbaassistant.cxx
+++ b/sc/source/ui/vba/vbaassistant.cxx
@@ -38,12 +38,12 @@ using namespace ooo::vba;
using namespace ooo::vba::office::MsoAnimationType;
-ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext )
+ScVbaAssistant::ScVbaAssistant( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext ): ScVbaAssistantImpl_BASE( xParent, xContext ),
+m_sName( RTL_CONSTASCII_USTRINGPARAM( "Clippit" ) )
{
m_bIsVisible = sal_False;
m_nPointsLeft = 795;
m_nPointsTop = 248;
- m_sName = rtl::OUString::createFromAscii( "Clippit" );
m_nAnimation = msoAnimationIdle;
}
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index 9e17b30..a1f0dc3 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -47,7 +47,7 @@ ScVbaAxis::getChartPtr() throw( uno::RuntimeException )
{
ScVbaChart* pChart = static_cast< ScVbaChart* >( moChartParent.get() );
if ( !pChart )
- throw uno::RuntimeException( rtl::OUString::createFromAscii("Can't access parent chart impl"), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Can't access parent chart impl")), uno::Reference< uno::XInterface >() );
return pChart;
}
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index f3ea1b0..5b4df99 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -261,7 +261,7 @@ ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 n
uno::Reference< container::XNameContainer >
ScVbaInterior::GetAttributeContainer()
{
- return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString::createFromAscii( "UserDefinedAttributes" ) ), uno::UNO_QUERY_THROW );
+ return uno::Reference < container::XNameContainer > ( m_xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )) ), uno::UNO_QUERY_THROW );
}
sal_Int32
ScVbaInterior::GetAttributeData( uno::Any aValue )
@@ -277,8 +277,8 @@ uno::Any
ScVbaInterior::SetAttributeData( sal_Int32 nValue )
{
xml::AttributeData aAttributeData;
- //aAttributeData.Namespace = rtl::OUString::createFromAscii( "ooo.vba.excel.CellPatten");
- aAttributeData.Type = rtl::OUString::createFromAscii( "sal_Int32" );
+ //aAttributeData.Namespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.CellPatten"));
+ aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" ));
aAttributeData.Value = rtl::OUString::valueOf( nValue );
return uno::makeAny( aAttributeData );
}
@@ -301,7 +301,7 @@ ScVbaInterior::SetUserDefinedAttributes( const rtl::OUString& sName, const uno::
if( xNameContainer->hasByName( sName ) )
xNameContainer->removeByName( sName );
xNameContainer->insertByName( sName, aValue );
- m_xProps->setPropertyValue( rtl::OUString::createFromAscii( "UserDefinedAttributes" ), uno::makeAny( xNameContainer ) );
+ m_xProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserDefinedAttributes" )), uno::makeAny( xNameContainer ) );
}
}
// OOo do not support below API
@@ -323,7 +323,7 @@ ScVbaInterior::setPattern( const uno::Any& _pattern ) throw (uno::RuntimeExcepti
SetMixedColor();
}
else
- throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern index" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern index" )), uno::Reference< uno::XInterface >() );
}
Color
ScVbaInterior::GetBackColor()
@@ -371,7 +371,7 @@ ScVbaInterior::setPatternColor( const uno::Any& _patterncolor ) throw (uno::Runt
SetMixedColor();
}
else
- throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
}
uno::Any SAL_CALL
ScVbaInterior::getPatternColorIndex() throw (uno::RuntimeException)
@@ -394,7 +394,7 @@ ScVbaInterior::setPatternColorIndex( const uno::Any& _patterncolorindex ) throw
setPatternColor( uno::makeAny( OORGBToXLRGB( nPattColor ) ) );
}
else
- throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid Pattern Color" ), uno::Reference< uno::XInterface >() );
+ throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Invalid Pattern Color" )), uno::Reference< uno::XInterface >() );
}
rtl::OUString&
More information about the Libreoffice-commits
mailing list