Skip to content

C
core
Kaydet (Commit) e2e99d0b authored tarafından Chr. Rossmanith's avatar Chr. Rossmanith
Dosyalara gözat
Seçenekler

Remove RTL_CONSTASCII_USTRINGPARAM in svx 

replace equals() with ==

Change-Id: Ic1aed52398beb2132d8c6824335b865ceb4255b3
üst 088af317
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 33 deletions
svx/source/customshapes/EnhancedCustomShapeEngine.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -50,7 +50,7 @@
rtl::OUString EnhancedCustomShapeEngine_getImplementationName()
throw( NMSP_UNO::RuntimeException )
{
return B2UCONST( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
}
sal_Bool SAL_CALL EnhancedCustomShapeEngine_supportsService( const rtl::OUString& ServiceName )
throw( NMSP_UNO::RuntimeException )
......@@ -62,7 +62,7 @@ SEQ( rtl::OUString ) SAL_CALL EnhancedCustomShapeEngine_getSupportedServiceNames
{
SEQ( rtl::OUString ) aRet(1);
rtl::OUString* pArray = aRet.getArray();
pArray[0] = B2UCONST( "com.sun.star.drawing.CustomShapeEngine" );
pArray[0] = "com.sun.star.drawing.CustomShapeEngine";
return aRet;
}
......@@ -245,7 +245,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)
pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
sal_Bool bTextPathOn = sal_False;
const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
const rtl::OUString sTextPath( "TextPath" );
com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
if ( pAny )
*pAny >>= bTextPathOn;
......
svx/source/customshapes/EnhancedCustomShapeEngine.hxx
Dosyayı görüntüle @ e2e99d0b
......@@ -44,7 +44,6 @@
#define REF( _def_Obj ) NMSP_UNO::Reference< _def_Obj >
#define SEQ( _def_Obj ) NMSP_UNO::Sequence< _def_Obj >
#define B2UCONST( _def_pChar ) (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(_def_pChar )))
// ---------------------------
// - EnhancedCustomShapeEngine -
......
svx/source/customshapes/tbxcustomshapes.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -37,7 +37,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
m_aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ) )
m_aSubTbxResName( "private:resource/toolbar/" )
{
switch( nSlotId )
{
......@@ -47,40 +47,40 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId
}
case SID_DRAWTBX_CS_BASIC :
{
m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes.diamond" ) );
m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "basicshapes" ) );
m_aCommand = ".uno:BasicShapes.diamond";
m_aSubTbName = "basicshapes";
}
break;
case SID_DRAWTBX_CS_SYMBOL :
{
m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes.smiley" ) );
m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "symbolshapes" ) );
m_aCommand = ".uno:SymbolShapes.smiley";
m_aSubTbName = "symbolshapes";
}
break;
case SID_DRAWTBX_CS_ARROW :
{
m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes.left-right-arrow" ) );
m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "arrowshapes" ) );
m_aCommand = ".uno:ArrowShapes.left-right-arrow";
m_aSubTbName = "arrowshapes";
}
break;
case SID_DRAWTBX_CS_FLOWCHART :
{
m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes.flowchart-internal-storage" ) );
m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "flowchartshapes" ) );
m_aCommand = ".uno:FlowChartShapes.flowchart-internal-storage";
m_aSubTbName = "flowchartshapes";
}
break;
case SID_DRAWTBX_CS_CALLOUT :
{
m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes.round-rectangular-callout" ) );
m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calloutshapes" ) );
m_aCommand = ".uno:CalloutShapes.round-rectangular-callout";
m_aSubTbName = "calloutshapes";
}
break;
case SID_DRAWTBX_CS_STAR :
{
m_aCommand = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes.star5" ) );
m_aSubTbName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "starshapes" ) );
m_aCommand = ".uno:StarShapes.star5";
m_aSubTbName = "starshapes";
}
break;
}
......
svx/source/dialog/_bmpmask.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -1214,19 +1214,19 @@ void SvxBmpMask::SetAccessibleNames (void)
String sSourceColorN;
sSourceColorN = sSourceColor;
sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1"));
sSourceColorN.AppendAscii (" 1");
aCbx1.SetAccessibleName (sSourceColorN);
sSourceColorN = sSourceColor;
sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2"));
sSourceColorN.AppendAscii (" 2");
aCbx2.SetAccessibleName (sSourceColorN);
sSourceColorN = sSourceColor;
sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3"));
sSourceColorN.AppendAscii (" 3");
aCbx3.SetAccessibleName (sSourceColorN);
sSourceColorN = sSourceColor;
sSourceColorN.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 4"));
sSourceColorN.AppendAscii (" 4");
aCbx4.SetAccessibleName (sSourceColorN);
}
......
svx/source/dialog/pfiledlg.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -130,9 +130,9 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
}
// build filterdescription
aStrPlugName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) );
aStrPlugName.AppendAscii( " (" );
aStrPlugName.Append( aStrPlugExtension );
aStrPlugName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ")" ) );
aStrPlugName.AppendAscii( ")" );
// use a own description for the video-formate avi, mov and mpeg
// the descriptions of these MIME-types are not very meaningful
......
svx/source/dialog/sendreportunx.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -201,7 +201,7 @@ namespace svx{
bool ErrorRepSendDialog::SendReport()
{
rtl::OUString sSubEnvVar(RTL_CONSTASCII_USTRINGPARAM("ERRORREPORT_SUBJECT"));
rtl::OUString sSubEnvVar("ERRORREPORT_SUBJECT");
rtl::OUString strSubject(GetDocType());
osl_setEnvironment(sSubEnvVar.pData, strSubject.pData);
......@@ -216,16 +216,14 @@ namespace svx{
OSL_VERIFY(nWritten == static_cast<size_t>(strUTF8.getLength()));
fclose( fp );
rtl::OUString sBodyEnvVar(RTL_CONSTASCII_USTRINGPARAM("ERRORREPORT_BODYFILE"));
rtl::OUString sBodyEnvVar("ERRORREPORT_BODYFILE");
rtl::OUString strBodyFile(rtl::OStringToOUString(rtl::OString(szBodyFile),
osl_getThreadTextEncoding()));
osl_setEnvironment(sBodyEnvVar.pData, strBodyFile.pData);
}
int ret = -1;
rtl::OUString path1(
RTL_CONSTASCII_USTRINGPARAM(
"$BRAND_BASE_DIR/program/crashrep"));
rtl::OUString path1("$BRAND_BASE_DIR/program/crashrep");
rtl::Bootstrap::expandMacros(path1);
rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
......@@ -237,7 +235,7 @@ namespace svx{
{
rtl::OStringBuffer cmd;
tools::appendUnixShellWord(&cmd, path2);
cmd.append(RTL_CONSTASCII_STRINGPARAM(" -debug -load -send -noui"));
cmd.append(" -debug -load -send -noui");
ret = system(cmd.getStr());
}
......
svx/source/dialog/srchdlg.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -2248,7 +2248,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
const SearchAttrItem& rItem = pList->GetObject(i);
if ( rStr.Len() )
rStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
rStr.AppendAscii( ", " );
if ( !IsInvalidItem( rItem.pItem ) )
{
......
svx/source/dialog/svxbmpnumvalueset.cxx
Dosyayı görüntüle @ e2e99d0b
......@@ -304,9 +304,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
}
Sequence< PropertyValue > aProperties(2);
PropertyValue* pProperties = aProperties.getArray();
pProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingType"));
pProperties[0].Name = rtl::OUString("NumberingType");
pProperties[0].Value <<= aNumberingTypes[i];
pProperties[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Value"));
pProperties[1].Name = rtl::OUString("Value");
pProperties[1].Value <<= (sal_Int32)1;
try
{
......@@ -319,7 +319,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
aLeft.Y() -= (pDev->GetTextHeight()/2);
if(!sPrefixes[i].isEmpty() &&
!sPrefixes[i].equalsAsciiL(" ", 1) &&
sPrefixes[i] != " " &&
sPrefixes[i].getStr()[0] != 0)
{
pVDev->SetFont(aFont);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment