[Libreoffice-commits] core.git: padmin/source
padmin/source/adddlg.cxx | 97 ++---
padmin/source/adddlg.hxx |2
padmin/source/cmddlg.cxx | 68 +++
padmin/source/helper.cxx | 12 ++---
padmin/source/helper.hxx |5 --
padmin/source/newppdlg.cxx | 11 ++---
6 files changed, 95 insertions(+), 100 deletions(-)
New commits:
commit a53f5933ea67cdc05695861fc15175c9451ceb3e
Author: elixir
Date: Tue Mar 12 13:27:17 2013 +0530
fdo#38838: Replaced some String with OUString
Change-Id: I1a5f4acb22db42173f4489655f5e702c4cee7c1c
Reviewed-on: https://gerrit.libreoffice.org/2675
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index f1db9e1..7a52fdc 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -36,7 +36,6 @@ using namespace psp;
using namespace padmin;
using namespace std;
-using ::rtl::OUString;
using ::rtl::OUStringBuffer;
using ::rtl::OUStringHash;
using ::rtl::OUStringToOString;
@@ -93,7 +92,7 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo )
rInfo.m_aFeatures = OUString("fax");
}
else
-rInfo.m_aFeatures = OUString();
+rInfo.m_aFeatures = "";
}
//
@@ -127,7 +126,7 @@ bool APChooseDriverPage::check()
void APChooseDriverPage::fill( PrinterInfo& rInfo )
{
sal_uInt16 nPos = m_aDriverBox.GetSelectEntryPos();
-String* pDriver = (String*)m_aDriverBox.GetEntryData( nPos );
+OUString* pDriver = (OUString*)m_aDriverBox.GetEntryData( nPos );
rInfo.m_aDriverName = *pDriver;
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "m_aLastPrinterName = \"%s\", rInfo.m_aPrinterName =
\"%s\"\n",
@@ -136,30 +135,30 @@ void APChooseDriverPage::fill( PrinterInfo& rInfo )
#endif
if( rInfo.m_aPrinterName.equals( m_aLastPrinterName ) )
{
-String aPrinter( AddPrinterDialog::uniquePrinterName(
m_aDriverBox.GetEntry( nPos ) ) );
+OUString aPrinter( AddPrinterDialog::uniquePrinterName(
m_aDriverBox.GetEntry( nPos ) ) );
rInfo.m_aPrinterName = m_aLastPrinterName = aPrinter;
}
}
-void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString&
rSelectDriver )
+void APChooseDriverPage::updateDrivers( bool bRefresh, const OUString&
rSelectDriver )
{
for( int k = 0; k < m_aDriverBox.GetEntryCount(); k++ )
delete (String*)m_aDriverBox.GetEntryData( k );
m_aDriverBox.Clear();
-std::list< rtl::OUString > aDrivers;
+std::list< OUString > aDrivers;
psp::PPDParser::getKnownPPDDrivers( aDrivers, bRefresh );
-rtl::OUString aSelectDriver( psp::PPDParser::getPPDPrinterName(
rSelectDriver ) );
+OUString aSelectDriver( psp::PPDParser::getPPDPrinterName( rSelectDriver )
);
-rtl::OUString aSelectedEntry;
-for( std::list< rtl::OUString >::const_iterator it = aDrivers.begin(); it
!= aDrivers.end(); ++it )
+OUString aSelectedEntry;
+for( std::list< OUString >::const_iterator it = aDrivers.begin(); it !=
aDrivers.end(); ++it )
{
-rtl::OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) );
+OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) );
if( !aDriver.isEmpty() )
{
int nPos = m_aDriverBox.InsertEntry( aDriver );
-m_aDriverBox.SetEntryData( nPos, new String( *it ) );
+m_aDriverBox.SetEntryData( nPos, new OUString( *it ) );
if( aDriver == aSelectDriver )
aSelectedEntry = aDriver;
}
@@ -184,7 +183,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*,
pButton )
PPDImportDialog aDlg( this );
if( aDlg.Execute() )
{
-const std::list< rtl::OUString >& rImported(
aDlg.getImportedFiles() );
+const std::list< OUString >& rImported( aDlg.getImportedFiles() );
if( rImported.empty() )
updateDrivers( true );
else
@@ -199,14 +198,14 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*,
pButton )
for( int i = 0; i < m_aDriverBox.GetSelectEntryCount(); i++ )
{
int nSelect = m_aDriverBox.GetSelectEntryPos(i);
-String aDriver( *(String*)m_aDriverBox.GetEntryData( nSelect ) );
-if( aDriver.Len() )
+OUString aDriver( *(String*)m_aDriverBox.GetEntryData( nSelect ) );
+if( aDriver.isEmpty() )
{
// never delete the default driver
-if( aDriver.EqualsIgnoreCaseAscii( "SGENPRT" ) )
+if( aDriver.equalsIgnoreAsciiCase( "SGENPRT" ) )
{
-String aText( PaResId( RID_ERR_REMOVESGENPRT ) );
-
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/global.hxx|4 +-
sc/inc/stringutil.hxx|6 +--
sc/source/core/data/global.cxx | 12 +++
sc/source/core/tool/stringutil.cxx | 52 -
sc/source/filter/excel/xecontent.cxx |5 +--
sc/source/filter/excel/xicontent.cxx | 12 +++
sc/source/filter/ftools/ftools.cxx | 54 +--
sc/source/filter/inc/ftools.hxx | 18 +--
sc/source/ui/dbgui/validate.cxx | 32 ++--
sc/source/ui/inc/validate.hxx|2 -
10 files changed, 99 insertions(+), 98 deletions(-)
New commits:
commit b0cf3aba085373d84a55ef144b273a8a89d017af
Author: elixir
Date: Thu Mar 14 13:57:57 2013 +0530
fdo#38838: Replaced some (Uni)String to OUString in core/sc
Change-Id: I4fa27b933c5b3cf2645b139bf6349b90f613feab
Reviewed-on: https://gerrit.libreoffice.org/2735
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 978985a..b1dd688 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -635,14 +635,14 @@ public:
@param bEscapeEmbedded If , embedded quote characters are
escaped by doubling them.
*/
-SC_DLLPUBLICstatic void AddQuotes( String& rString,
sal_Unicode cQuote = '\'', bool bEscapeEmbedded = true );
+SC_DLLPUBLICstatic void AddQuotes( OUString& rString,
sal_Unicode cQuote = '\'', bool bEscapeEmbedded = true );
/** Erases the character cQuote from rString, if it exists at beginning
AND end.
@param bUnescapeEmbeddedIf , embedded doubled quote
characters
are unescaped by replacing them with a
single instance.
*/
-SC_DLLPUBLICstatic void EraseQuotes( String& rString,
sal_Unicode cQuote = '\'', bool bUnescapeEmbedded = true );
+SC_DLLPUBLICstatic void EraseQuotes( OUString& rString,
sal_Unicode cQuote = '\'', bool bUnescapeEmbedded = true );
/** Finds an unquoted instance of cChar in rString, starting at
offset nStart. Unquoted instances may occur when concatenating two
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 48c94f5..988dea2 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -106,9 +106,9 @@ public:
static bool parseSimpleNumber(
const ::rtl::OUString& rStr, sal_Unicode dsep, sal_Unicode gsep,
double& rVal);
-static xub_StrLen SC_DLLPUBLIC GetQuotedTokenCount(const UniString &rIn,
const UniString& rQuotedPairs, sal_Unicode cTok = ';' );
-static UniString SC_DLLPUBLIC GetQuotedToken(const UniString &rIn,
xub_StrLen nToken, const UniString& rQuotedPairs,
-sal_Unicode cTok, xub_StrLen& rIndex
);
+static sal_Int32 SC_DLLPUBLIC GetQuotedTokenCount(const OUString &rIn,
const OUString& rQuotedPairs, sal_Unicode cTok = ';' );
+static OUString SC_DLLPUBLIC GetQuotedToken(const OUString &rIn,
sal_Int32 nToken, const OUString& rQuotedPairs,
+sal_Unicode cTok, sal_Int32& rIndex );
};
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 22fc87c..52aeae8 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -814,7 +814,7 @@ bool ScGlobal::IsQuoted( const String& rString, sal_Unicode
cQuote )
return (rString.Len() >= 2) && (rString.GetChar( 0 ) == cQuote) &&
(rString.GetChar( rString.Len() - 1 ) == cQuote);
}
-void ScGlobal::AddQuotes( String& rString, sal_Unicode cQuote, bool
bEscapeEmbedded )
+void ScGlobal::AddQuotes( OUString& rString, sal_Unicode cQuote, bool
bEscapeEmbedded )
{
if (bEscapeEmbedded)
{
@@ -822,23 +822,23 @@ void ScGlobal::AddQuotes( String& rString, sal_Unicode
cQuote, bool bEscapeEmbed
pQ[0] = pQ[1] = cQuote;
pQ[2] = 0;
rtl::OUString aQuotes( pQ );
-rString.SearchAndReplaceAll( rtl::OUString(cQuote), aQuotes);
+rString.replaceAll( OUString(cQuote), aQuotes);
}
-rString.Insert( cQuote, 0 ).Append( cQuote );
+rString = OUString( cQuote ) + OUString( cQuote );
}
-void ScGlobal::EraseQuotes( String& rString, sal_Unicode cQuote, bool
bUnescapeEmbedded )
+void ScGlobal::EraseQuotes( OUString& rString, sal_Unicode cQuote, bool
bUnescapeEmbedded )
{
if ( IsQuoted( rString, cQuote ) )
{
-rString.Erase( rString.Len() - 1 ).Erase( 0, 1 );
+rString = rString.copy( 0, rString.getLength() - 1 ).copy( 1 );
if (bUnescapeEmbedded)
{
sal_Unicode pQ[3];
pQ[0] = pQ[1] = cQuote;
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/tools/InternalDataProvider.cxx | 23 ---
chart2/source/view/charttypes/VSeriesPlotter.cxx |6 --
2 files changed, 12 insertions(+), 17 deletions(-)
New commits:
commit 1ed73984639390759d26a2fc0209083d9f984d52
Author: elixir
Date: Mon Apr 1 20:14:07 2013 +0200
fdo#51656 : Mean value line starts in wrong place in column graph
Change-Id: I2389687e54cec4c0e873bcc120cc21b3c3d11d78
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6e114dd..884df9a 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1011,13 +1011,16 @@ void VSeriesPlotter::createRegressionCurvesShapes(
VDataSeries& rVDataSeries
xRegressionCurveCalculator->getCurveValues(
fMinX, fMaxX, nRegressionPointCount, xScalingX, xScalingY,
bMaySkipPointsInRegressionCalculation ));
nRegressionPointCount = aCalculatedPoints.getLength();
+bool bAverageLine = RegressionCurveHelper::isMeanValueLine(
aCurveList[nN] );
for(sal_Int32 nP=0; nPdoLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
+// fdo#51656: don't scale mean value lines
+if(!bAverageLine)
+m_pPosHelper->doLogicScaling( &fLogicX, &fLogicY, &fLogicZ );
if(!::rtl::math::isNan(fLogicX) && !::rtl::math::isInf(fLogicX)
&& !::rtl::math::isNan(fLogicY) &&
!::rtl::math::isInf(fLogicY)
@@ -1045,7 +1048,6 @@ void VSeriesPlotter::createRegressionCurvesShapes(
VDataSeries& rVDataSeries
aVLineProperties.initFromPropertySet( xCurveModelProp );
//create an extra group shape for each curve for selection handling
-bool bAverageLine = RegressionCurveHelper::isMeanValueLine(
aCurveList[nN] );
uno::Reference< drawing::XShapes > xRegressionGroupShapes =
createGroupShape( xTarget, rVDataSeries.getDataCurveCID( nN,
bAverageLine ) );
uno::Reference< drawing::XShape > xShape =
m_pShapeFactory->createLine2D(
commit afa1e9952eab0310ee3c194ebd03e0b0fe941168
Author: Markus Mohrhard
Date: Mon Apr 1 20:14:27 2013 +0200
some little code clean-up
#
Change-Id: Ifbb754ce7ebe34b69a803f88b02a1e31bd21248f
diff --git a/chart2/source/tools/InternalDataProvider.cxx
b/chart2/source/tools/InternalDataProvider.cxx
index 6479040..3a4303b 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -276,16 +276,14 @@ public:
void operator() ( vector< uno::Any >& rVector )
{
-if( m_nLevel > static_cast< sal_Int32 >(rVector.size()) )
-rVector.resize( m_nLevel );
-
-vector< uno::Any >::iterator aIt( rVector.begin() );
-for( sal_Int32 nN=0; aIt= static_cast< sal_Int32 >(rVector.size()) )
{
-if( nN==m_nLevel )
-break;
+rVector.resize( m_nLevel + 1 );
+}
+else
+{
+rVector.insert( rVector.begin() + m_nLevel, uno::Any() );
}
-rVector.insert( aIt, uno::Any() );
}
private:
@@ -301,14 +299,9 @@ public:
void operator() ( vector< uno::Any >& rVector )
{
-vector< uno::Any >::iterator aIt( rVector.begin() );
-for( sal_Int32 nN=0; aIt(rVector.size()) )
{
-if( nN==m_nLevel )
-{
-rVector.erase( aIt );
-break;
-}
+rVector.erase(rVector.begin() + m_nLevel);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/DataBrowser.cxx | 32 ++---
chart2/source/controller/dialogs/DataBrowser.hxx |4 +-
chart2/source/controller/dialogs/res_ErrorBar.cxx | 16 +-
chart2/source/controller/dialogs/tp_DataSource.cxx | 30 +--
4 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit ff85b2c3d19136ea4d66f6555158e2a52da6e413
Author: elixir
Date: Mon Apr 1 01:58:31 2013 +0530
fdo#38838 : Replacement of String with OUString in core/chart2
Change-Id: I7abf9649a0c5997cebfe3463ce9b633ab59bf3b0
Reviewed-on: https://gerrit.libreoffice.org/3142
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index a291c55..86df2bb 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -160,7 +160,7 @@ public:
void SetWidth( sal_Int32 nWidth );
void SetChartType( const Reference< chart2::XChartType > & xChartType,
bool bSwapXAndYAxis );
-void SetSeriesName( const String & rName );
+void SetSeriesName( const OUString & rName );
void SetRange( sal_Int32 nStartCol, sal_Int32 nEndCol );
void SetPixelPosX( sal_Int32 nPos );
@@ -309,7 +309,7 @@ void SeriesHeader::SetChartType(
m_spSymbol->SetImage( GetChartTypeImage( xChartType, bSwapXAndYAxis ) );
}
-void SeriesHeader::SetSeriesName( const String & rName )
+void SeriesHeader::SetSeriesName( const OUString & rName )
{
m_spSeriesName->SetText( rName );
}
@@ -616,7 +616,7 @@ void DataBrowser::RenewTable()
spHeader->SetColor( Color( nColor ));
spHeader->SetChartType( aIt->m_xChartType, aIt->m_bSwapXAndYAxis );
spHeader->SetSeriesName(
-String( DataSeriesHelper::getDataSeriesLabel(
+OUString( DataSeriesHelper::getDataSeriesLabel(
aIt->m_xDataSeries,
(aIt->m_xChartType.is() ?
aIt->m_xChartType->getRoleOfSequenceForSeriesLabel() :
@@ -635,22 +635,22 @@ void DataBrowser::RenewTable()
Invalidate();
}
-String DataBrowser::GetColString( sal_Int32 nColumnId ) const
+OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
{
OSL_ASSERT( m_apDataBrowserModel.get());
if( nColumnId > 0 )
-return String( m_apDataBrowserModel->getRoleOfColumn( static_cast<
sal_Int32 >( nColumnId ) - 1 ));
-return String();
+return OUString( m_apDataBrowserModel->getRoleOfColumn( static_cast<
sal_Int32 >( nColumnId ) - 1 ));
+return OUString();
}
-String DataBrowser::GetRowString( sal_Int32 nRow ) const
+OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
{
return OUString::valueOf(nRow + 1);
}
String DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const
{
-String aResult;
+OUString aResult;
if( nColumnId == 0 )
{
@@ -800,9 +800,9 @@ bool DataBrowser::IsDataValid()
{
sal_uInt32 nDummy = 0;
double fDummy = 0.0;
-String aText( m_aNumberEditField.GetText());
+OUString aText( m_aNumberEditField.GetText());
-if( aText.Len() > 0 &&
+if( !aText.isEmpty() &&
m_spNumberFormatterWrapper.get() &&
m_spNumberFormatterWrapper->getSvNumberFormatter() &&
!
m_spNumberFormatterWrapper->getSvNumberFormatter()->IsNumberFormat(
@@ -1082,9 +1082,9 @@ void DataBrowser::InitController(
{
if( rController == m_rTextEditController )
{
-String aText( GetCellText( nRow, nCol ) );
+OUString aText( GetCellText( nRow, nCol ) );
m_aTextEditField.SetText( aText );
-m_aTextEditField.SetSelection( Selection( 0, aText.Len() ));
+m_aTextEditField.SetSelection( Selection( 0, aText.getLength() ));
}
else if( rController == m_rNumberEditController )
{
@@ -1094,8 +1094,8 @@ void DataBrowser::InitController(
m_aNumberEditField.SetTextValue( String());
else
m_aNumberEditField.SetValue( GetCellNumber( nRow, nCol ) );
-String aText( m_aNumberEditField.GetText());
-m_aNumberEditField.SetSelection( Selection( 0, aText.Len()));
+OUString aText( m_aNumberEditField.GetText());
+m_aNumberEditField.SetSelection( Selection( 0, aText.getLength()));
}
else
{
@@ -1153,10 +1153,10 @@ sal_Bool DataBrowser::SaveModified()
{
sal_uInt32 nDummy = 0;
double fDummy = 0.0;
-String aText( m_aNumberEditField.GetText());
+OUString aText( m_aNumberEditField.GetText());
// an empty string is valid, if no numberformatter exists, all
// values are treate
[Libreoffice-commits] core.git: sc/inc sd/source vcl/inc vcl/source
sc/inc/styleuno.hxx|2 -
sd/source/core/stlsheet.cxx| 66 +++--
sd/source/ui/func/fuprobjs.cxx | 12 +++
sd/source/ui/func/futempl.cxx |2 -
vcl/inc/svdata.hxx |2 -
vcl/inc/vcl/svapp.hxx |4 +-
vcl/source/app/svapp.cxx |6 +--
7 files changed, 52 insertions(+), 42 deletions(-)
New commits:
commit 9133cc452c9e473164755a2177b7a2285c09cb22
Author: elixir
Date: Thu Feb 21 03:54:57 2013 +0530
fdo#38838,UniString,String_to_OUString
Change-Id: I024a2de18fe3c22be0860b62a862ede992e12c1e
Reviewed-on: https://gerrit.libreoffice.org/2303
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 71d01da..21f3d38 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -215,7 +215,7 @@ private:
const SfxItemPropertySet* pPropSet;
ScDocShell* pDocShell;
SfxStyleFamily eFamily;// Family
-String aStyleName;
+OUStringaStyleName;
SfxStyleSheetBase* GetStyle_Impl();
const SfxItemSet* GetStyleItemSet_Impl( const ::rtl::OUString&
rPropName, const SfxItemPropertySimpleEntry*& rpEntry );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 09c85c3..0854049 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -55,7 +55,7 @@
#include "../ui/inc/DrawViewShell.hxx"
#include "../ui/inc/ViewShellBase.hxx"
-using ::rtl::OUString;
+
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
using ::cppu::OInterfaceContainerHelper;
@@ -124,7 +124,7 @@ void ModifyListenerForewarder::Notify(SfxBroadcaster&
/*rBC*/, const SfxHint& /*
}
SdStyleSheet::SdStyleSheet(const OUString& rDisplayName,
SfxStyleSheetBasePool& _rPool, SfxStyleFamily eFamily, sal_uInt16 _nMask)
-: SdStyleSheetBase( UniString( rDisplayName ), _rPool, eFamily, _nMask)
+: SdStyleSheetBase( OUString( rDisplayName ), _rPool, eFamily, _nMask)
, ::cppu::BaseMutex()
, msApiName( rDisplayName )
, mxPool( const_cast< SfxStyleSheetBasePool* >(&_rPool) )
@@ -386,8 +386,8 @@ bool SdStyleSheet::IsUsed() const
SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
{
-String aRealStyle;
-String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+OUString aRealStyle;
+OUString aSep( SD_LT_SEPARATOR );
SdStyleSheet* pRealStyle = NULL;
SdDrawDocument* pDoc = ((SdStyleSheetPool*)pPool)->GetDoc();
@@ -404,11 +404,14 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
{
aRealStyle = pPage->GetLayoutName();
// cut after seperator string
-aRealStyle.Erase(aRealStyle.Search(aSep) + aSep.Len());
+
+if( aRealStyle.indexOf(aSep) >= 0)
+{
+aRealStyle = aRealStyle.copy(0,(aRealStyle.indexOf(aSep) +
aSep.getLength()));
+}
}
}
-
-if (aRealStyle.Len() == 0)
+if (aRealStyle.isEmpty())
{
SdPage* pPage = pDoc->GetSdPage(0, PK_STANDARD);
@@ -426,7 +429,10 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
aRealStyle = pSheet->GetName();
}
-aRealStyle.Erase(aRealStyle.Search(aSep) + aSep.Len());
+if( aRealStyle.indexOf(aSep) >= 0)
+{
+aRealStyle = aRealStyle.copy(0,(aRealStyle.indexOf(aSep) +
aSep.getLength()));
+}
}
// jetzt vom Namen (landessprachlich angepasst) auf den internen
@@ -490,39 +496,43 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
SdStyleSheet* SdStyleSheet::GetPseudoStyleSheet() const
{
SdStyleSheet* pPseudoStyle = NULL;
-String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
-String aStyleName(aName);
+OUString aSep( SD_LT_SEPARATOR );
+OUString aStyleName(aName);
// ohne Layoutnamen und Separator
-aStyleName.Erase(0, aStyleName.Search(aSep) + aSep.Len());
-if (aStyleName == String(SdResId(STR_LAYOUT_TITLE)))
+if( aStyleName.indexOf(aSep) >=0 )
{
-aStyleName = String(SdResId(STR_PSEUDOSHEET_TITLE));
+aStyleName = aStyleName.copy (aStyleName.indexOf(aSep) +
aSep.getLength());
}
-else if (aStyleName == String(SdResId(STR_LAYOUT_SUBTITLE)))
+
+if (aStyleName == OUString(SdResId(STR_LAYOUT_TITLE)))
+{
+aStyleName = OUString(SdResId(STR_PSEUDOSHEET_TITLE));
+}
+else if (aStyleName == OUString(SdResId(STR_LAYOUT_SUBTITLE)))
{
-aStyleName = String(SdResId(STR_PSEUDOSHEET_SUBTITLE));
+aStyleName = OUString(SdResId(STR_PSEUDOSHEET_SUBTITLE));
}
-else if (aStyleName == String(SdResId(STR_LAYOUT_BACKGROUND)))
+else if (aStyleName == OUString(SdResId(STR_LAYOUT_BACKGROUND)))
{
-aStyleName = String(S
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/2675/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2586/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/86/2586/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/2675/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/2675/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/2675/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/3142/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/3142/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/2330/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/22/3122/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2303/5'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/2330/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/2735/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2303/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/2735/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2303/6'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2303/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2303/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/2735/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/03/2303/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
