[Libreoffice-commits] .: 16 commits - desktop/source Makefile sc/inc sc/source sd/source sfx2/inc sfx2/source starmath/source svl/source svtools/inc svtools/source svx/inc svx/source sw/Library_msword.mk sw/source tools/inc tools/Library_tl.mk tools/source ucbhelper/inc ucbhelper/source ucb/workben unotools/source unusedcode.easy uui/source vcl/inc vcl/source vcl/unx writerfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Feb 27 01:46:42 PST 2012
Makefile | 8
desktop/source/app/officeipcthread.cxx | 38 +--
sc/inc/cell.hxx | 18 -
sc/source/core/data/autonamecache.cxx | 6
sc/source/core/data/cell.cxx | 18 -
sc/source/core/data/cell2.cxx | 37 +--
sc/source/core/data/column.cxx | 3
sc/source/core/data/column3.cxx | 16 -
sc/source/core/data/conditio.cxx | 10
sc/source/core/data/documen8.cxx | 6
sc/source/core/data/document.cxx | 6
sc/source/core/data/table3.cxx | 4
sc/source/core/data/table4.cxx | 20 -
sc/source/core/data/validat.cxx | 13 -
sc/source/core/tool/cellform.cxx | 15 -
sc/source/core/tool/chgtrack.cxx | 8
sc/source/core/tool/compiler.cxx | 12 -
sc/source/core/tool/interpr4.cxx | 34 +-
sc/source/core/tool/interpr5.cxx | 3
sc/source/filter/dif/difexp.cxx | 4
sc/source/filter/excel/xehelper.cxx | 6
sc/source/filter/excel/xestream.cxx | 6
sc/source/filter/excel/xetable.cxx | 6
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 4
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 10
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/app/inputhdl.cxx | 4
sc/source/ui/app/transobj.cxx | 3
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/externalrefmgr.cxx | 21 -
sc/source/ui/formdlg/formula.cxx | 4
sc/source/ui/unoobj/funcuno.cxx | 5
sc/source/ui/view/tabvwsh5.cxx | 2
sd/source/ui/dlg/copydlg.cxx | 12 -
sfx2/inc/sfx2/mnuitem.hxx | 17 -
sfx2/source/menu/mnuitem.cxx | 97 --------
sfx2/source/menu/thessubmenu.cxx | 66 -----
sfx2/source/menu/thessubmenu.hxx | 19 -
starmath/source/dialog.cxx | 2
svl/source/items/cintitem.cxx | 2
svl/source/items/rngitem_inc.cxx | 4
svtools/inc/svtools/FilterConfigItem.hxx | 3
svtools/source/control/calendar.cxx | 4
svtools/source/filter/FilterConfigItem.cxx | 47 ---
svx/inc/svx/grafctrl.hxx | 2
svx/inc/svx/lboxctrl.hxx | 2
svx/inc/svx/tbcontrl.hxx | 22 -
svx/source/dialog/dlgunit.hxx | 3
svx/source/stbctrls/pszctrl.cxx | 4
svx/source/tbxctrls/grafctrl.cxx | 5
svx/source/tbxctrls/lboxctrl.cxx | 5
svx/source/tbxctrls/tbcontrl.cxx | 59 -----
svx/source/xml/xmleohlp.cxx | 1
sw/Library_msword.mk | 1
sw/source/core/doc/docnum.cxx | 2
sw/source/core/docnode/retrievedinputstreamdata.cxx | 17 -
sw/source/core/fields/cellfml.cxx | 12 -
sw/source/core/inc/retrievedinputstreamdata.hxx | 5
sw/source/filter/rtf/swparrtf.cxx | 61 ++---
sw/source/filter/ww8/tracer.cxx | 118 ----------
sw/source/filter/ww8/tracer.hxx | 84 -------
sw/source/filter/ww8/ww8graf.cxx | 17 -
sw/source/filter/ww8/ww8par.cxx | 17 -
sw/source/filter/ww8/ww8par.hxx | 6
sw/source/filter/ww8/ww8par2.cxx | 4
sw/source/filter/ww8/ww8par2.hxx | 1
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 31 --
tools/Library_tl.mk | 3
tools/inc/impstrg.hxx | 1
tools/inc/tools/fsys.hxx | 5
tools/inc/tools/string.hxx | 177 ---------------
tools/source/inet/inetstrm.cxx | 32 +-
tools/source/string/strcvt.cxx | 74 ------
tools/source/string/strucvt.cxx | 15 -
tools/source/string/tstring.cxx | 172 --------------
tools/source/string/tustring.cxx | 32 +-
ucb/workben/ucb/ucbdemo.cxx | 6
ucbhelper/inc/ucbhelper/contentbroker.hxx | 16 -
ucbhelper/source/client/contentbroker.cxx | 7
unotools/source/ucbhelper/tempfile.cxx | 2
unusedcode.easy | 30 +-
uui/source/iahndl-cookies.cxx | 8
vcl/inc/unx/salbmp.h | 7
vcl/source/glyphs/graphite_layout.cxx | 18 -
vcl/unx/generic/gdi/salbmp.cxx | 39 ---
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 2
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 18 -
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 2
writerfilter/source/resourcemodel/TagLogger.cxx | 4
90 files changed, 326 insertions(+), 1454 deletions(-)
New commits:
commit 906e35f80a17d51c305e0db251e6224f5dd23d52
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 09:45:35 2012 +0000
merge GetString variants
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 387ff69..93fc09f 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -228,26 +228,24 @@ public:
#endif
ScStringCell();
- explicit ScStringCell( const String& rString );
+ explicit ScStringCell(const rtl::OUString& rString);
#if OSL_DEBUG_LEVEL > 0
~ScStringCell();
#endif
- inline void SetString( const String& rString ) { maString = rString; }
- inline void GetString( String& rString ) const { rString = maString; }
- inline void GetString( rtl::OUString& rString ) const { rString = maString; }
- inline const String& GetString() const { return maString; }
+ inline void SetString( const rtl::OUString& rString ) { maString = rString; }
+ inline const rtl::OUString& GetString() const { return maString; }
private:
- String maString;
+ rtl::OUString maString;
};
class SC_DLLPUBLIC ScEditCell : public ScBaseCell
{
private:
EditTextObject* pData;
- String* pString; // for faster access to formulas
+ mutable rtl::OUString* pString; // for faster access to formulas
ScDocument* pDoc; // for EditEngine access with Pool
void SetTextObject( const EditTextObject* pObject,
@@ -273,8 +271,7 @@ public:
void SetData( const EditTextObject* pObject,
const SfxItemPool* pFromPool /* = NULL */ );
void GetData( const EditTextObject*& rpObject ) const;
- void GetString( String& rString ) const;
- void GetString( rtl::OUString& rString ) const;
+ rtl::OUString GetString() const;
const EditTextObject* GetData() const { return pData; }
@@ -464,8 +461,7 @@ public:
bool IsValue(); // also true if formula::svEmptyCell
double GetValue();
double GetValueAlways(); // ignore errors
- void GetString( String& rString );
- void GetString( rtl::OUString& rString );
+ rtl::OUString GetString();
const ScMatrix* GetMatrix();
bool GetMatrixOrigin( ScAddress& rPos ) const;
void GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows );
diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxx
index 2c6caa0..9dcccf2 100644
--- a/sc/source/core/data/autonamecache.cxx
+++ b/sc/source/core/data/autonamecache.cxx
@@ -78,13 +78,13 @@ const ScAutoNameAddresses& ScAutoNameCache::GetNameOccurrences( const String& rN
switch ( eType )
{
case CELLTYPE_STRING:
- ((ScStringCell*)pCell)->GetString( aStr );
+ aStr = ((ScStringCell*)pCell)->GetString();
break;
case CELLTYPE_FORMULA:
- ((ScFormulaCell*)pCell)->GetString( aStr );
+ aStr = ((ScFormulaCell*)pCell)->GetString();
break;
case CELLTYPE_EDIT:
- ((ScEditCell*)pCell)->GetString( aStr );
+ aStr = ((ScEditCell*)pCell)->GetString();
break;
case CELLTYPE_NONE:
case CELLTYPE_VALUE:
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index 48d6391..c8ac64f 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -564,13 +564,13 @@ String ScBaseCell::GetStringData() const
switch ( eCellType )
{
case CELLTYPE_STRING:
- ((const ScStringCell*)this)->GetString( aStr );
+ aStr = ((const ScStringCell*)this)->GetString();
break;
case CELLTYPE_EDIT:
- ((const ScEditCell*)this)->GetString( aStr );
+ aStr = ((const ScEditCell*)this)->GetString();
break;
case CELLTYPE_FORMULA:
- ((ScFormulaCell*)this)->GetString( aStr ); // an der Formelzelle nicht-const
+ aStr = ((ScFormulaCell*)this)->GetString(); // an der Formelzelle nicht-const
break;
}
return aStr;
@@ -610,14 +610,14 @@ bool ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
{
String aText1;
if ( pCell1->GetCellType() == CELLTYPE_STRING )
- ((const ScStringCell*)pCell1)->GetString(aText1);
+ aText1 = ((const ScStringCell*)pCell1)->GetString();
else
- ((const ScEditCell*)pCell1)->GetString(aText1);
+ aText1 = ((const ScEditCell*)pCell1)->GetString();
String aText2;
if ( pCell2->GetCellType() == CELLTYPE_STRING )
- ((const ScStringCell*)pCell2)->GetString(aText2);
+ aText2 = ((const ScStringCell*)pCell2)->GetString();
else
- ((const ScEditCell*)pCell2)->GetString(aText2);
+ aText2 = ((const ScEditCell*)pCell2)->GetString();
return ( aText1 == aText2 );
}
case CELLTYPE_FORMULA:
@@ -704,7 +704,7 @@ ScStringCell::ScStringCell() :
{
}
-ScStringCell::ScStringCell( const String& rString ) :
+ScStringCell::ScStringCell( const rtl::OUString& rString ) :
ScBaseCell( CELLTYPE_STRING ),
maString( rString.intern() )
{
@@ -1980,7 +1980,7 @@ void ScFormulaCell::GetURLResult( String& rURL, String& rCellText )
}
else
{
- GetString( aCellString );
+ aCellString = GetString();
pFormatter->GetOutputString( aCellString, nCellFormat, rCellText, &pColor );
}
ScConstMatrixRef xMat( aResult.GetMatrix());
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 117d31d..5938e15 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -122,29 +122,24 @@ void ScEditCell::GetData( const EditTextObject*& rpObject ) const
rpObject = pData;
}
-void ScEditCell::GetString( String& rString ) const
+rtl::OUString ScEditCell::GetString() const
{
if ( pString )
- rString = *pString;
- else if ( pData )
+ return *pString;
+
+ if ( pData )
{
// auch Text von URL-Feldern, Doc-Engine ist eine ScFieldEditEngine
EditEngine& rEngine = pDoc->GetEditEngine();
rEngine.SetText( *pData );
- rString = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs
+ rtl::OUString sRet = ScEditUtil::GetMultilineString(rEngine); // string with line separators between paragraphs
// cache short strings for formulas
- if ( rString.Len() < 256 )
- ((ScEditCell*)this)->pString = new String( rString ); //! non-const
+ if ( sRet.getLength() < 256 )
+ pString = new rtl::OUString(sRet); //! non-const
+ return sRet;
}
- else
- rString.Erase();
-}
-void ScEditCell::GetString( rtl::OUString& rString ) const
-{
- String aTmp;
- GetString(aTmp);
- rString = aTmp;
+ return rtl::OUString();
}
void ScEditCell::RemoveCharAttribs( const ScPatternAttr& rAttr )
@@ -524,21 +519,13 @@ double ScFormulaCell::GetValueAlways()
return aResult.GetDouble();
}
-void ScFormulaCell::GetString( String& rString )
+rtl::OUString ScFormulaCell::GetString()
{
MaybeInterpret();
if ((!pCode->GetCodeError() || pCode->GetCodeError() == errDoubleRef) &&
!aResult.GetResultError())
- rString = aResult.GetString();
- else
- rString.Erase();
-}
-
-void ScFormulaCell::GetString( rtl::OUString& rString )
-{
- String aTmp;
- GetString(aTmp);
- rString = aTmp;
+ return aResult.GetString();
+ return rtl::OUString();
}
const ScMatrix* ScFormulaCell::GetMatrix()
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 50f0e95..444cc67 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1308,8 +1308,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bM
// empty cell.
if (pNew->GetCellType() == CELLTYPE_STRING)
{
- String aStr;
- static_cast<ScStringCell*>(pNew)->GetString(aStr);
+ String aStr = static_cast<ScStringCell*>(pNew)->GetString();
if (aStr.Len() == 0)
// A string cell with empty string. Delete the cell itself.
rColumn.Delete(maItems[i].nRow);
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index c6d16b5..ab9f666 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -898,8 +898,7 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rD
}
else if (bCloneString)
{
- String aString;
- rForm.GetString( aString );
+ String aString = rForm.GetString();
// do not clone empty string
if (aString.Len() > 0)
{
@@ -1342,7 +1341,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
switch ( pCell->GetCellType() )
{
case CELLTYPE_STRING :
- ((ScStringCell*)pCell)->GetString( aStr );
+ aStr = ((ScStringCell*)pCell)->GetString();
if ( rString == aStr )
bIsText = true;
break;
@@ -1628,9 +1627,9 @@ bool ScColumn::GetDataEntries(SCROW nStartRow, std::set<ScTypedStrData>& rString
if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren
{
if (eType == CELLTYPE_STRING)
- ((ScStringCell*)pCell)->GetString(aString);
+ aString = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString(aString);
+ aString = ((ScEditCell*)pCell)->GetString();
bool bInserted = rStrings.insert(ScTypedStrData(aString)).second;
if (bInserted && bLimit && rStrings.size() >= DATENT_MAX)
@@ -1651,9 +1650,9 @@ bool ScColumn::GetDataEntries(SCROW nStartRow, std::set<ScTypedStrData>& rString
if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren
{
if (eType == CELLTYPE_STRING)
- ((ScStringCell*)pCell)->GetString(aString);
+ aString = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString(aString);
+ aString = ((ScEditCell*)pCell)->GetString();
bool bInserted = rStrings.insert(ScTypedStrData(aString)).second;
if (bInserted && bLimit && rStrings.size() >= DATENT_MAX)
@@ -1702,8 +1701,7 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW nEndRow )
}
else
{
- String aString;
- pFormula->GetString(aString);
+ String aString = pFormula->GetString();
maItems[nIndex].pCell = new ScStringCell( aString );
}
delete pFormula;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 61d71db..ac4fa9e 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -649,7 +649,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
else
{
bIsStr1 = sal_True;
- pEff1->GetString( aStrVal1 );
+ aStrVal1 = pEff1->GetString();
nVal1 = 0.0;
}
}
@@ -678,7 +678,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos )
else
{
bIsStr2 = sal_True;
- pEff2->GetString( aStrVal2 );
+ aStrVal2 = pEff2->GetString();
nVal2 = 0.0;
}
}
@@ -716,16 +716,16 @@ static sal_Bool lcl_GetCellContent( ScBaseCell* pCell, sal_Bool bIsStr1, double&
if (bVal)
rArg = pFCell->GetValue();
else
- pFCell->GetString(rArgStr);
+ rArgStr = pFCell->GetString();
}
break;
case CELLTYPE_STRING:
case CELLTYPE_EDIT:
bVal = false;
if ( eType == CELLTYPE_STRING )
- ((ScStringCell*)pCell)->GetString(rArgStr);
+ rArgStr = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString(rArgStr);
+ rArgStr = ((ScEditCell*)pCell)->GetString();
break;
default:
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 0212745..9e207c7 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -726,8 +726,7 @@ bool ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe
if ( eType == CELLTYPE_STRING )
{
- rtl::OUString aText;
- static_cast<ScStringCell*>(pCell)->GetString(aText);
+ rtl::OUString aText = static_cast<ScStringCell*>(pCell)->GetString();
pEngine->SetText( aText );
}
else
@@ -1595,8 +1594,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp
else if ( eType == CELLTYPE_STRING )
{
- rtl::OUString aOldStr;
- ((const ScStringCell*)pCell)->GetString(aOldStr);
+ rtl::OUString aOldStr = ((const ScStringCell*)pCell)->GetString();
sal_Int32 nOldLen = aOldStr.getLength();
if ( bConsiderLanguage )
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a7e66cd..22e7ac4 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3023,10 +3023,10 @@ sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, rtl::OUString
switch (pCell->GetCellType())
{
case CELLTYPE_STRING:
- static_cast<ScStringCell*>(pCell)->GetString(aStr);
+ aStr = static_cast<ScStringCell*>(pCell)->GetString();
break;
case CELLTYPE_EDIT:
- static_cast<ScEditCell*>(pCell)->GetString(aStr);
+ aStr = static_cast<ScEditCell*>(pCell)->GetString();
break;
case CELLTYPE_FORMULA:
{
@@ -3041,7 +3041,7 @@ sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, rtl::OUString
pFormatter->GetInputLineString(fVal, nIndex, aStr);
}
else
- pFCell->GetString(aStr);
+ aStr = pFCell->GetString();
}
break;
case CELLTYPE_VALUE:
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 36078ad..b15703e 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -411,11 +411,11 @@ short ScTable::CompareCell( sal_uInt16 nSort,
rtl::OUString aStr1;
rtl::OUString aStr2;
if (eType1 == CELLTYPE_STRING)
- ((ScStringCell*)pCell1)->GetString(aStr1);
+ aStr1 = ((ScStringCell*)pCell1)->GetString();
else
GetString(nCell1Col, nCell1Row, aStr1);
if (eType2 == CELLTYPE_STRING)
- ((ScStringCell*)pCell2)->GetString(aStr2);
+ aStr2 = ((ScStringCell*)pCell2)->GetString();
else
GetString(nCell2Col, nCell2Row, aStr2);
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 7990d28..85f3169 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -386,9 +386,9 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if ( eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT )
{
if ( eType == CELLTYPE_STRING )
- ((ScStringCell*)pCell)->GetString( aStr );
+ aStr = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString( aStr );
+ aStr = ((ScEditCell*)pCell)->GetString();
aString = aStr;
nFlag2 = lcl_DecompValueString( aString, nVal2, &rMinDigits );
aStr = aString;
@@ -748,9 +748,9 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
case CELLTYPE_STRING:
case CELLTYPE_EDIT:
if ( eCellType == CELLTYPE_STRING )
- ((ScStringCell*)pSrcCell)->GetString( aValue );
+ aValue = ((ScStringCell*)pSrcCell)->GetString();
else
- ((ScEditCell*)pSrcCell)->GetString( aValue );
+ aValue = ((ScEditCell*)pSrcCell)->GetString();
if ( !(nScFillModeMouseModifier & KEY_MOD1) && !bHasFiltered )
{
nCellDigits = 0; // look at each source cell individually
@@ -1012,9 +1012,9 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
case CELLTYPE_EDIT:
{
if ( eType == CELLTYPE_STRING )
- ((ScStringCell*)pCell)->GetString( aValue );
+ aValue = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString( aValue );
+ aValue = ((ScEditCell*)pCell)->GetString();
if ( !(nScFillModeMouseModifier & KEY_MOD1) && !IsDataFiltered() )
{
sal_Int32 nVal;
@@ -1069,9 +1069,9 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
case CELLTYPE_EDIT:
{
if ( eType == CELLTYPE_STRING )
- ((ScStringCell*)pCell)->GetString( aValue );
+ aValue = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString( aValue );
+ aValue = ((ScEditCell*)pCell)->GetString();
nHeadNoneTail = lcl_DecompValueString( aValue, nVal );
if ( nHeadNoneTail )
nStart = (double)nVal;
@@ -1465,9 +1465,9 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
String aValue;
if (eCellType == CELLTYPE_STRING)
- ((ScStringCell*)pSrcCell)->GetString( aValue );
+ aValue = ((ScStringCell*)pSrcCell)->GetString();
else
- ((ScEditCell*)pSrcCell)->GetString( aValue );
+ aValue = ((ScEditCell*)pSrcCell)->GetString();
sal_Int32 nStringValue;
sal_uInt16 nMinDigits = nArgMinDigits;
short nHeadNoneTail = lcl_DecompValueString( aValue, nStringValue, &nMinDigits );
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 277ab98..a759385 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -212,7 +212,7 @@ sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput
if ( bIsValue )
nValue = pCell->GetValue();
else
- pCell->GetString( aValStr );
+ aValStr = pCell->GetString();
}
if ( bIsValue )
aParams[0] = ::com::sun::star::uno::makeAny( nValue );
@@ -334,7 +334,7 @@ sal_Bool ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
if ( bIsValue )
nValue = pCell->GetValue();
else
- pCell->GetString( aValStr );
+ aValStr = pCell->GetString();
}
if ( bIsValue )
refPar->Get(1)->PutDouble( nValue );
@@ -478,11 +478,11 @@ sal_Bool ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos
nVal = ((ScValueCell*)pCell)->GetValue();
break;
case CELLTYPE_STRING:
- ((ScStringCell*)pCell)->GetString( aString );
+ aString = ((ScStringCell*)pCell)->GetString();
bIsVal = false;
break;
case CELLTYPE_EDIT:
- ((ScEditCell*)pCell)->GetString( aString );
+ aString = ((ScEditCell*)pCell)->GetString();
bIsVal = false;
break;
case CELLTYPE_FORMULA:
@@ -492,7 +492,7 @@ sal_Bool ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos
if ( bIsVal )
nVal = pFCell->GetValue();
else
- pFCell->GetString( aString );
+ aString = pFCell->GetString();
}
break;
default: // Notizen, Broadcaster
@@ -654,8 +654,7 @@ bool ScValidationData::GetSelectionFromFormula(
xMatRef->PutDouble( aValidationSrc.GetValue(), 0);
else
{
- String aStr;
- aValidationSrc.GetString( aStr);
+ String aStr = aValidationSrc.GetString();
xMatRef->PutString( aStr, 0);
}
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 72effcc..066b5c1 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -64,15 +64,13 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
{
case CELLTYPE_STRING:
{
- String aCellString;
- ((ScStringCell*)pCell)->GetString( aCellString );
+ String aCellString = ((ScStringCell*)pCell)->GetString();
rFormatter.GetOutputString( aCellString, nFormat, aString, ppColor );
}
break;
case CELLTYPE_EDIT:
{
- String aCellString;
- ((ScEditCell*)pCell)->GetString( aCellString );
+ String aCellString = ((ScEditCell*)pCell)->GetString();
rFormatter.GetOutputString( aCellString, nFormat, aString, ppColor );
}
break;
@@ -141,8 +139,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OUStrin
}
else
{
- String aCellString;
- pFCell->GetString( aCellString );
+ String aCellString = pFCell->GetString();
rFormatter.GetOutputString( aCellString, nFormat, aString, ppColor );
}
}
@@ -171,12 +168,12 @@ void ScCellFormat::GetInputString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OU
{
case CELLTYPE_STRING:
{
- ((ScStringCell*)pCell)->GetString( aString );
+ aString = ((ScStringCell*)pCell)->GetString();
}
break;
case CELLTYPE_EDIT:
{
- ((ScEditCell*)pCell)->GetString( aString );
+ aString = ((ScEditCell*)pCell)->GetString();
}
break;
case CELLTYPE_VALUE:
@@ -198,7 +195,7 @@ void ScCellFormat::GetInputString( ScBaseCell* pCell, sal_uLong nFormat, rtl::OU
}
else
{
- ((ScFormulaCell*)pCell)->GetString( aString );
+ aString = ((ScFormulaCell*)pCell)->GetString();
}
sal_uInt16 nErrCode = ((ScFormulaCell*)pCell)->GetErrCode();
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 65670be..0a90a22 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1727,10 +1727,10 @@ void ScChangeActionContent::GetStringOfCell( rtl::OUString& rStr,
}
break;
case CELLTYPE_STRING :
- ((ScStringCell*)pCell)->GetString( rStr );
+ rStr = ((ScStringCell*)pCell)->GetString();
break;
case CELLTYPE_EDIT :
- ((ScEditCell*)pCell)->GetString( rStr );
+ rStr = ((ScEditCell*)pCell)->GetString();
break;
case CELLTYPE_FORMULA :
((ScFormulaCell*)pCell)->GetFormula( rStr );
@@ -1863,10 +1863,10 @@ void ScChangeActionContent::GetValueString(
switch ( pCell->GetCellType() )
{
case CELLTYPE_STRING :
- ((ScStringCell*)pCell)->GetString( rStr );
+ rStr = ((ScStringCell*)pCell)->GetString();
break;
case CELLTYPE_EDIT :
- ((ScEditCell*)pCell)->GetString( rStr );
+ rStr = ((ScEditCell*)pCell)->GetString();
break;
case CELLTYPE_VALUE : // ist immer in rValue
rStr = rValue;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 162eaf5..a1c1ecf 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3049,13 +3049,13 @@ bool ScCompiler::IsColRowName( const String& rName )
switch ( eType )
{
case CELLTYPE_STRING:
- ((ScStringCell*)pCell)->GetString( aStr );
+ aStr = ((ScStringCell*)pCell)->GetString();
break;
case CELLTYPE_FORMULA:
- ((ScFormulaCell*)pCell)->GetString( aStr );
+ aStr = ((ScFormulaCell*)pCell)->GetString();
break;
case CELLTYPE_EDIT:
- ((ScEditCell*)pCell)->GetString( aStr );
+ aStr = ((ScEditCell*)pCell)->GetString();
break;
case CELLTYPE_NONE:
case CELLTYPE_VALUE:
@@ -3178,13 +3178,13 @@ bool ScCompiler::IsColRowName( const String& rName )
switch ( eType )
{
case CELLTYPE_STRING:
- ((ScStringCell*)pCell)->GetString( aStr );
+ aStr = ((ScStringCell*)pCell)->GetString();
break;
case CELLTYPE_FORMULA:
- ((ScFormulaCell*)pCell)->GetString( aStr );
+ aStr = ((ScFormulaCell*)pCell)->GetString();
break;
case CELLTYPE_EDIT:
- ((ScEditCell*)pCell)->GetString( aStr );
+ aStr = ((ScEditCell*)pCell)->GetString();
break;
case CELLTYPE_NONE:
case CELLTYPE_VALUE:
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index fac1d34..9e047ac 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -456,8 +456,7 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
}
else
{
- String aStr;
- pFCell->GetString( aStr );
+ String aStr = pFCell->GetString();
fValue = ConvertStringToValue( aStr );
}
}
@@ -484,9 +483,9 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
// it ... #i5658#
String aStr;
if ( eType == CELLTYPE_STRING )
- ((ScStringCell*)pCell)->GetString( aStr );
+ aStr = ((ScStringCell*)pCell)->GetString();
else
- ((ScEditCell*)pCell)->GetString( aStr );
+ aStr = ((ScEditCell*)pCell)->GetString();
fValue = ConvertStringToValue( aStr );
}
break;
@@ -518,10 +517,10 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
switch (pCell->GetCellType())
{
case CELLTYPE_STRING:
- ((ScStringCell*) pCell)->GetString(rStr);
+ rStr = ((ScStringCell*) pCell)->GetString();
break;
case CELLTYPE_EDIT:
- ((ScEditCell*) pCell)->GetString(rStr);
+ rStr = ((ScEditCell*) pCell)->GetString();
break;
case CELLTYPE_FORMULA:
{
@@ -536,7 +535,7 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
pFormatter->GetInputLineString(fVal, nIndex, rStr);
}
else
- pFCell->GetString(rStr);
+ rStr = pFCell->GetString();
}
break;
case CELLTYPE_VALUE:
@@ -687,16 +686,16 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
switch ( pCell->GetCellType() )
{
case CELLTYPE_STRING :
- ((ScStringCell*)pCell)->GetString(aStr);
+ aStr = ((ScStringCell*)pCell)->GetString();
break;
case CELLTYPE_EDIT :
- ((ScEditCell*)pCell)->GetString(aStr);
+ aStr = ((ScEditCell*)pCell)->GetString();
break;
case CELLTYPE_FORMULA :
if (!((ScFormulaCell*)pCell)->IsValue())
{
nErr = ((ScFormulaCell*)pCell)->GetErrCode();
- ((ScFormulaCell*)pCell)->GetString(aStr);
+ aStr = ((ScFormulaCell*)pCell)->GetString();
}
else
bOk = false;
@@ -793,11 +792,11 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
switch ( pCell->GetCellType() )
{
case CELLTYPE_STRING :
- ((ScStringCell*)pCell)->GetString(aStr);
+ aStr = ((ScStringCell*)pCell)->GetString();
nType = 1;
break;
case CELLTYPE_EDIT :
- ((ScEditCell*)pCell)->GetString(aStr);
+ aStr = ((ScEditCell*)pCell)->GetString();
nType = 1;
break;
case CELLTYPE_VALUE :
@@ -808,7 +807,7 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
if (((ScFormulaCell*)pCell)->IsValue())
nVal = ((ScFormulaCell*)pCell)->GetValue();
else
- ((ScFormulaCell*)pCell)->GetString(aStr);
+ aStr = ((ScFormulaCell*)pCell)->GetString();
break;
default :
bOk = false;
@@ -3369,15 +3368,13 @@ bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
break;
case CELLTYPE_STRING :
{
- String aVal;
- ((ScStringCell*)pCell)->GetString( aVal );
+ rtl::OUString aVal = ((ScStringCell*)pCell)->GetString();
pVar->PutString( aVal );
break;
}
case CELLTYPE_EDIT :
{
- String aVal;
- ((ScEditCell*) pCell)->GetString( aVal );
+ rtl::OUString aVal = ((ScEditCell*) pCell)->GetString();
pVar->PutString( aVal );
break;
}
@@ -3392,8 +3389,7 @@ bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
}
else
{
- String aVal;
- ((ScFormulaCell*)pCell)->GetString( aVal );
+ rtl::OUString aVal = ((ScFormulaCell*)pCell)->GetString();
pVar->PutString( aVal );
}
}
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 02d6db2..07dcaf5 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -3273,8 +3273,7 @@ void ScInterpreter::ScMatRef()
PushDouble( pCell->GetValue() );
else
{
- String aVal;
- pCell->GetString( aVal );
+ rtl::OUString aVal = pCell->GetString();
PushString( aVal );
}
pDok->GetNumberFormatInfo( nCurFmtType, nCurFmtIndex, aAdr, pCell );
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index c7b08b8..78d1dd1 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -196,7 +196,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
aOS.appendAscii("\nV\n");
break;
case CELLTYPE_EDIT:
- static_cast<ScEditCell*>(pAkt)->GetString(aString);
+ aString = static_cast<ScEditCell*>(pAkt)->GetString();
bWriteStringData = true;
break;
case CELLTYPE_STRING:
@@ -225,7 +225,7 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc
}
else if( pAkt->HasStringData() )
{
- static_cast<ScFormulaCell*>(pAkt)->GetString(aString);
+ aString = static_cast<ScFormulaCell*>(pAkt)->GetString();
bWriteStringData = true;
}
else
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 3e805fe..9745cda 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -573,8 +573,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
const XclExpRoot& rRoot, const ScStringCell& rStringCell, const ScPatternAttr* pCellAttr,
XclStrFlags nFlags, sal_uInt16 nMaxLen )
{
- String aCellText;
- rStringCell.GetString( aCellText );
+ rtl::OUString aCellText = rStringCell.GetString();
return lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
}
@@ -602,8 +601,7 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
else
{
// unformatted cell
- String aCellText;
- rEditCell.GetString( aCellText );
+ String aCellText = rEditCell.GetString();
xString = lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
}
return xString;
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 1951656..5d064f3 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -717,8 +717,7 @@ void XclXmlUtils::GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& rsT
case NUMBERFORMAT_TEXT:
{
rsType = "str";
- String aResult;
- rCell.GetString( aResult );
+ String aResult = rCell.GetString();
rsValue = ToOUString( aResult );
}
break;
@@ -733,8 +732,7 @@ void XclXmlUtils::GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& rsT
default:
{
rsType = "inlineStr";
- String aResult;
- rCell.GetString( aResult );
+ String aResult = rCell.GetString();
rsValue = ToOUString( aResult );
}
break;
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index ac8c6ca..88b3f83 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -803,8 +803,7 @@ XclExpFormulaCell::XclExpFormulaCell(
bool bForceLineBreak = false;
if( nFormatType == NUMBERFORMAT_TEXT )
{
- String aResult;
- mrScFmlaCell.GetString( aResult );
+ String aResult = mrScFmlaCell.GetString();
bForceLineBreak = mrScFmlaCell.IsMultilineResult();
nScript = XclExpStringHelper::GetLeadingScriptType( rRoot, aResult );
}
@@ -949,8 +948,7 @@ void XclExpFormulaCell::WriteContents( XclExpStream& rStrm )
case NUMBERFORMAT_TEXT:
{
- String aResult;
- mrScFmlaCell.GetString( aResult );
+ String aResult = mrScFmlaCell.GetString();
if( aResult.Len() || (rStrm.GetRoot().GetBiff() <= EXC_BIFF5) )
{
rStrm << EXC_FORMULA_RES_STRING;
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index d009ef7..f18e824 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -859,14 +859,14 @@ void XclExpChTrCellContent::GetCellData(
if( pScCell->GetCellType() == CELLTYPE_STRING )
{
const ScStringCell* pStrCell = static_cast< const ScStringCell* >( pScCell );
- pStrCell->GetString( sCellStr );
+ sCellStr = pStrCell->GetString();
rpData->mpFormattedString = XclExpStringHelper::CreateCellString( rRoot,
*pStrCell, NULL );
}
else
{
const ScEditCell* pEditCell = static_cast< const ScEditCell* >( pScCell );
- pEditCell->GetString( sCellStr );
+ sCellStr = pEditCell->GetString();
XclExpHyperlinkHelper aLinkHelper( rRoot, aPosition );
rpData->mpFormattedString = XclExpStringHelper::CreateCellString( rRoot,
*pEditCell, NULL, aLinkHelper );
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 926a8c0..45f7e91 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -300,9 +300,7 @@ void ScChangeTrackingExportHelper::WriteStringCell(const ScBaseCell* pCell)
const ScStringCell* pStringCell = static_cast<const ScStringCell*>(pCell);
if (pStringCell)
{
- String sString;
- pStringCell->GetString(sString);
- rtl::OUString sOUString(sString);
+ rtl::OUString sOUString = pStringCell->GetString();
rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true);
if (!sOUString.isEmpty())
@@ -319,8 +317,7 @@ void ScChangeTrackingExportHelper::WriteEditCell(const ScBaseCell* pCell)
const ScEditCell* pEditCell = static_cast<const ScEditCell*>(pCell);
if (pEditCell)
{
- String sString;
- pEditCell->GetString(sString);
+ String sString = pEditCell->GetString();
rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true);
if (sString.Len())
@@ -388,8 +385,7 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con
else
{
rExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING);
- String sCellValue;
- pFormulaCell->GetString(sCellValue);
+ String sCellValue = pFormulaCell->GetString();
rtl::OUString sOUValue(sCellValue);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, true, true);
if (!sOUValue.isEmpty())
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 01689d2..4770839 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -205,7 +205,7 @@ OUString lcl_GetRawString( ScDocument* pDoc, const ScAddress& rPos )
{
CellType eType = pCell->GetCellType();
if ( eType == CELLTYPE_STRING )
- static_cast<ScStringCell*>(pCell)->GetString(aVal); // string cell: content
+ aVal = static_cast<ScStringCell*>(pCell)->GetString(); // string cell: content
else if ( eType == CELLTYPE_EDIT )
{
// edit cell: text with line breaks
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2fa6ae3..bc52b65 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1350,9 +1350,7 @@ String lcl_Calculate( const String& rFormula, ScDocument* pDoc, const ScAddress
}
else
{
- String aStr;
-
- pCell->GetString( aStr );
+ String aStr = pCell->GetString();
sal_uLong nFormat = aFormatter.GetStandardFormat(
pCell->GetFormatType(), ScGlobal::eLnge);
aFormatter.GetOutputString( aStr, nFormat,
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index a61e5d3..38afe52 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -825,8 +825,7 @@ void ScTransferObj::StripRefs( ScDocument* pDoc,
}
else
{
- String aStr;
- pFCell->GetString(aStr);
+ String aStr = pFCell->GetString();
if ( pFCell->IsMultilineResult() )
pNew = new ScEditCell( aStr, pDestDoc );
else
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d02d9d4..7a8c06c 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1883,7 +1883,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
ScCellFormat::GetString( pCell, nFormat, aString, &pDummy, rFormatter );
}
else
- ((ScFormulaCell*)pCell)->GetString( aString );
+ aString = ((ScFormulaCell*)pCell)->GetString();
bString = true;
}
}
@@ -1897,7 +1897,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt
ScCellFormat::GetString( pCell, nFormat, aString, &pDummy, rFormatter );
}
else
- ((ScStringCell*)pCell)->GetString( aString );
+ aString = ((ScStringCell*)pCell)->GetString();
bString = true;
break;
case CELLTYPE_EDIT :
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index eaf72bc..3dbc96f 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -194,8 +194,7 @@ public:
else
{
// string cell otherwise.
- String aVal;
- pCell->GetString(aVal);
+ rtl::OUString aVal = pCell->GetString();
mpDoc->PutCell(aPos, new ScStringCell(aVal));
}
}
@@ -1308,14 +1307,12 @@ static FormulaToken* lcl_convertToToken(ScBaseCell* pCell)
{
case CELLTYPE_EDIT:
{
- String aStr;
- static_cast<ScEditCell*>(pCell)->GetString(aStr);
+ rtl::OUString aStr = static_cast<ScEditCell*>(pCell)->GetString();
return new formula::FormulaStringToken(aStr);
}
case CELLTYPE_STRING:
{
- String aStr;
- static_cast<ScStringCell*>(pCell)->GetString(aStr);
+ rtl::OUString aStr = static_cast<ScStringCell*>(pCell)->GetString();
return new formula::FormulaStringToken(aStr);
}
case CELLTYPE_VALUE:
@@ -1336,8 +1333,7 @@ static FormulaToken* lcl_convertToToken(ScBaseCell* pCell)
}
else
{
- String aStr;
- pFCell->GetString(aStr);
+ rtl::OUString aStr = pFCell->GetString();
return new formula::FormulaStringToken(aStr);
}
}
@@ -1410,15 +1406,13 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange&
{
case CELLTYPE_EDIT:
{
- String aStr;
- static_cast<ScEditCell*>(pCell)->GetString(aStr);
+ rtl::OUString aStr = static_cast<ScEditCell*>(pCell)->GetString();
xMat->PutString(aStr, nC, nR);
}
break;
case CELLTYPE_STRING:
{
- String aStr;
- static_cast<ScStringCell*>(pCell)->GetString(aStr);
+ rtl::OUString aStr = static_cast<ScStringCell*>(pCell)->GetString();
xMat->PutString(aStr, nC, nR);
}
break;
@@ -1441,8 +1435,7 @@ static ScTokenArray* lcl_convertToTokenArray(const ScDocument* pSrcDoc, ScRange&
}
else
{
- String aStr;
- pFCell->GetString(aStr);
+ rtl::OUString aStr = pFCell->GetString();
xMat->PutString(aStr, nC, nR);
}
}
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index cb9b6fd..5692594 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -370,9 +370,7 @@ bool ScFormulaDlg::calculateValue( const String& rStrExp, String& rStrResult )
}
else
{
- String aStr;
-
- pFCell->GetString( aStr );
+ String aStr = pFCell->GetString();
sal_uLong nFormat = aFormatter.GetStandardFormat(
pFCell->GetFormatType(), ScGlobal::eLnge);
aFormatter.GetOutputString( aStr, nFormat,
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 6eac293..f162a75 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -708,9 +708,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const rtl::OUString& aName,
else
{
// string result
- String aStrVal;
- pFormula->GetString( aStrVal );
- aRet <<= rtl::OUString( aStrVal );
+ rtl::OUString aStrVal = pFormula->GetString();
+ aRet <<= aStrVal;
}
}
else if ( nErrCode == NOTAVAILABLE )
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 4961730..87bc8c7 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -351,7 +351,7 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc,
case CELLTYPE_STRING:
{
- ((ScStringCell*)pCell)->GetString( aCellString );
+ aCellString = ((ScStringCell*)pCell)->GetString();
eValType = SVX_VALUE_TYPE_STRING;
}
break;
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 1cd1c9a..1077235 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -178,8 +178,6 @@ public:
return rtl::OUString (reinterpret_cast<rtl_uString*>(mpData));
}
- UniString intern() const;
-
static UniString CreateFromAscii( const sal_Char* pAsciiStr );
static UniString CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
diff --git a/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index 6db9302..144d9e4 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.cxx
@@ -132,16 +132,6 @@ UniString& UniString::Assign( const rtl::OUString& rStr )
return *this;
}
-UniString UniString::intern() const
-{
- UniString aStr;
-
- rtl_uString_intern( reinterpret_cast<rtl_uString **>(&aStr.mpData),
- (rtl_uString *)(mpData) );
-
- return aStr;
-}
-
// =======================================================================
#include <tools/rc.hxx>
commit 84fa063b4ce1bd6a8996c20c89e238ee38bcdcfe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 27 09:32:29 2012 +0000
fix msvc2005 build
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 5943978..b2c6566 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -520,7 +520,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
TimeValue aTimeValue;
aTimeValue.Seconds = 0;
aTimeValue.Nanosec = 10000000; // 10ms
- osl::Thread::wait( aTimeValue );
+ salhelper::Thread::wait( aTimeValue );
}
} while ( nPipeMode == PIPEMODE_DONTKNOW );
@@ -897,7 +897,7 @@ void OfficeIPCThread::execute()
TimeValue tval;
tval.Seconds = 1;
tval.Nanosec = 0;
- osl::Thread::wait( tval );
+ salhelper::Thread::wait( tval );
}
} while( schedule() );
}
commit b36d555440b86d8293b188e4d99ec8682a2139a5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 26 20:45:18 2012 +0000
drop UniString::CreateFromInt64
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 63708e8..45ae8d0 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -133,22 +133,22 @@ CopyDlg::~CopyDlg()
{
String& rStr = GetExtraData();
- rStr = UniString::CreateFromInt64( maNumFldCopies.GetValue() );
+ rStr = rtl::OUString::valueOf(static_cast<sal_Int64>(maNumFldCopies.GetValue()));
rStr.Append( TOKEN );
- rStr += UniString::CreateFromInt64( maMtrFldMoveX.GetValue() );
+ rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveX.GetValue()));
rStr.Append( TOKEN );
- rStr += UniString::CreateFromInt64( maMtrFldMoveY.GetValue() );
+ rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveY.GetValue()));
rStr.Append( TOKEN );
- rStr += UniString::CreateFromInt64( maMtrFldAngle.GetValue() );
+ rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldAngle.GetValue()));
rStr.Append( TOKEN );
- rStr += UniString::CreateFromInt64( maMtrFldWidth.GetValue() );
+ rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldWidth.GetValue()));
rStr.Append( TOKEN );
- rStr += UniString::CreateFromInt64( maMtrFldHeight.GetValue() );
+ rStr += rtl::OUString::valueOf(static_cast<sal_Int64>(maMtrFldHeight.GetValue()));
rStr.Append( TOKEN );
rStr += UniString::CreateFromInt32( (long)maLbStartColor.GetSelectEntryColor().GetColor() );
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 33feb52..acf8c5f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1869,7 +1869,7 @@ IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
UpdateButtons();
// display Unicode position as symbol name while iterating over characters
- const String aHex( String::CreateFromInt64( cChar, 16 ).ToUpperAscii() );
+ const String aHex(rtl::OUString::valueOf(static_cast<sal_Int64>(cChar), 16 ).toAsciiUpperCase());
const String aPattern( A2OU( aHex.Len() > 4 ? "Ux000000" : "Ux0000" ) );
String aUnicodePos( aPattern.Copy( 0, aPattern.Len() - aHex.Len() ) );
aUnicodePos += aHex;
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 2ae7c47..4584d99 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -472,7 +472,7 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
const
{
DBG_CHKTHIS(CntUInt32Item, 0);
- rText = XubString::CreateFromInt64(m_nValue);
+ rText = rtl::OUString::valueOf(static_cast<sal_Int64>(m_nValue));
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index b1c21c3..7c87cb7 100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
@@ -80,9 +80,9 @@ SfxItemPresentation SfxXRangeItem::GetPresentation
const IntlWrapper *
) const
{
- rText = UniString::CreateFromInt64(nFrom);
+ rText = rtl::OUString::valueOf(static_cast<sal_Int64>(nFrom));
rText += ':';
- rText += UniString::CreateFromInt64(nTo);
+ rText += rtl::OUString::valueOf(static_cast<sal_Int64>(nTo));
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index f7919dc..2a06db1 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -917,7 +917,7 @@ void Calendar::ImplDraw( sal_Bool bPaint )
String aMonthText( maCalendarWrapper.getDisplayName(
i18n::CalendarDisplayIndex::MONTH, nMonth-1, 1));
aMonthText += ' ';
- aMonthText += String::CreateFromInt64( nYear );
+ aMonthText += rtl::OUString::valueOf(static_cast<sal_Int64>(nYear));
long nMonthTextWidth = GetTextWidth( aMonthText );
long nMonthOffX1 = 0;
long nMonthOffX2 = 0;
@@ -935,7 +935,7 @@ void Calendar::ImplDraw( sal_Bool bPaint )
aMonthText = maCalendarWrapper.getDisplayName(
i18n::CalendarDisplayIndex::MONTH, nMonth-1, 0);
aMonthText += ' ';
- aMonthText += String::CreateFromInt64( nYear );
+ aMonthText += rtl::OUString::valueOf(static_cast<sal_Int64>(nYear));
nMonthTextWidth = GetTextWidth( aMonthText );
}
long nTempOff = (mnMonthWidth-nMonthTextWidth+1)/2;
diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
index 3fcb099..b8ebed5 100644
--- a/svx/source/dialog/dlgunit.hxx
+++ b/svx/source/dialog/dlgunit.hxx
@@ -30,7 +30,8 @@
inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep )
{
- String aVal = UniString::CreateFromInt64( MetricField::ConvertValue( nVal_100, 2, MAP_100TH_MM, eFieldUnit ) );
+ String aVal = rtl::OUString::valueOf(static_cast<sal_Int64>(
+ MetricField::ConvertValue(nVal_100, 2, MAP_100TH_MM, eFieldUnit)));
while( aVal.Len() < 3 )
aVal.Insert( sal_Unicode('0'), 0 );
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 9c8a3e3..1356572 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -84,7 +84,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
if ( nConvVal < 0 && ( nConvVal / 100 == 0 ) )
sMetric += '-';
- sMetric += String::CreateFromInt64( nConvVal / 100 );
+ sMetric += rtl::OUString::valueOf(nConvVal / 100);
if( FUNIT_NONE != eOutUnit )
{
@@ -95,7 +95,7 @@ String SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
nFract *= -1;
if ( nFract < 10 )
sMetric += '0';
- sMetric += String::CreateFromInt64( nFract );
+ sMetric += rtl::OUString::valueOf(nFract);
}
return sMetric;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index baa798d..50aecc0 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2609,7 +2609,7 @@ namespace listfunc
n += Date( Date::SYSTEM ).GetDate();
n += rand();
// #i92478#
- aNewListId += String::CreateFromInt64( n );
+ aNewListId += rtl::OUString::valueOf(n);
return MakeListIdUnique( rDoc, aNewListId );
}
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 99e48df..a3bc8f6 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -423,7 +423,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
if( pLastBox )
{
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) )
- rNewStr += String::CreateFromInt64( (sal_PtrDiff)pRelBox );
+ rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
else
rNewStr += '0';
rNewStr += ':';
@@ -431,7 +431,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
}
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) )
- rNewStr += String::CreateFromInt64( (sal_PtrDiff)pRelBox );
+ rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
else
rNewStr += '0';
@@ -518,13 +518,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
if( pLastBox )
{
pBox = rTbl.GetTblBox( *pLastBox );
- rNewStr += String::CreateFromInt64( (sal_PtrDiff)pBox );
+ rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
rNewStr += ':';
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
pBox = rTbl.GetTblBox( rFirstBox );
- rNewStr += String::CreateFromInt64( (sal_PtrDiff)pBox );
+ rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
// Kennung fuer Box erhalten
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
@@ -1194,8 +1194,8 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
}
if( pLastBox )
- ( rNewStr += String::CreateFromInt64((sal_PtrDiff)pEndBox)) += ':';
- ( rNewStr += String::CreateFromInt64((sal_PtrDiff)pSttBox))
+ ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':';
+ ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) )
+= rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index cfff872..2f6ee4d 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -1175,39 +1175,38 @@ void SwRTFParser::ReadShpRslt()
void SwRTFParser::ReadShpTxt(String& s)
{
- int nToken;
- int level=1;
- s.AppendAscii("{\\rtf");
- while (level>0 && IsParserWorking())
- {
- nToken = GetNextToken();
- switch(nToken)
+ int nToken;
+ int level=1;
+ s.AppendAscii("{\\rtf");
+ while (level>0 && IsParserWorking())
{
- case RTF_SN:
- case RTF_SV:
- SkipGroup();
- break;
- case RTF_TEXTTOKEN:
- s.Append(aToken);
- break;
- case '{':
- level++;
- s.Append(String::CreateFromAscii("{"));
- break;
- case '}':
- level--;
- s.Append(String::CreateFromAscii("}"));
- break;
- default:
- s.Append(aToken);
- if (bTokenHasValue) {
- s.Append(String::CreateFromInt64(nTokenValue));
- }
- s.Append(String::CreateFromAscii(" "));
- break;
- }
+ nToken = GetNextToken();
+ switch(nToken)
+ {
+ case RTF_SN:
+ case RTF_SV:
+ SkipGroup();
+ break;
+ case RTF_TEXTTOKEN:
+ s.Append(aToken);
+ break;
+ case '{':
+ level++;
+ s.Append(String::CreateFromAscii("{"));
+ break;
+ case '}':
+ level--;
+ s.Append(String::CreateFromAscii("}"));
+ break;
+ default:
+ s.Append(aToken);
+ if (bTokenHasValue)
+ s.Append(rtl::OUString::valueOf(static_cast<sal_Int64>(nTokenValue)));
+ s.Append(String::CreateFromAscii(" "));
+ break;
+ }
}
- SkipToken(-1);
+ SkipToken(-1);
}
/*
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index a4b3e46..1cd1c9a 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -184,7 +184,6 @@ public:
static UniString CreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen nLen );
static UniString CreateFromInt32( sal_Int32 n, sal_Int16 nRadix = 10 );
- static UniString CreateFromInt64( sal_Int64 n, sal_Int16 nRadix = 10 );
static const UniString& EmptyString();
sal_Int32 ToInt32() const;
sal_Int64 ToInt64() const;
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 4bb515e..53f5473 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -79,17 +79,6 @@ UniString UniString::CreateFromInt32( sal_Int32 n, sal_Int16 nRadix )
// -----------------------------------------------------------------------
-UniString UniString::CreateFromInt64( sal_Int64 n, sal_Int16 nRadix )
-{
- sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFINT64];
- BOOST_STATIC_ASSERT(RTL_USTR_MAX_VALUEOFINT64 <= STRING_MAXLEN);
- return UniString(
- aBuf,
- static_cast< xub_StrLen >(rtl_ustr_valueOfInt64( aBuf, n, nRadix )) );
-}
-
-// -----------------------------------------------------------------------
-
namespace { struct Empty : public rtl::Static< const UniString, Empty> {}; }
const UniString& UniString::EmptyString()
{
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 0a61f75..4e71592 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -1197,7 +1197,7 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput,
UniString
aText( UniString::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "Operation took " ) ) );
- aText += UniString::CreateFromInt64( nTime );
+ aText += rtl::OUString::valueOf(static_cast<sal_Int64>(nTime));
aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ms." ) );
print( aText );
}
@@ -1225,7 +1225,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort,
for ( sal_uInt32 i = aEntry.m_nLevel; i != 0; --i )
aText += '=';
aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "LEVEL " ) );
- aText += UniString::CreateFromInt64( aEntry.m_nLevel );
+ aText += rtl::OUString::valueOf(static_cast<sal_Int64>(aEntry.m_nLevel));
uno::Reference< ucb::XContentIdentifier > xID;
if ( aEntry.m_bUseIdentifier )
@@ -1279,7 +1279,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort,
UniString
aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
"Operation took " ) ) );
- aText += UniString::CreateFromInt64( nTime );
+ aText += rtl::OUString::valueOf(static_cast<sal_Int64>(nTime));
aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ms." ) );
print( aText );
}
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 4493556..cf16a4b 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -209,7 +209,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru
{
u %= nMax;
String aTmp( aName );
- aTmp += String::CreateFromInt64( static_cast<sal_Int64>(u), nRadix );
+ aTmp += rtl::OUString::valueOf(static_cast<sal_Int64>(u), nRadix);
aTmp += String::CreateFromAscii( ".tmp" );
if ( bDir )
commit d6100ba273e7d73cc4b00a378ce5bad49559943b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 26 15:03:18 2012 +0000
callcatcher: update list
diff --git a/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx
index fe883ef..dc44ebf 100644
--- a/ucbhelper/inc/ucbhelper/contentbroker.hxx
+++ b/ucbhelper/inc/ucbhelper/contentbroker.hxx
@@ -29,6 +29,7 @@
#ifndef _UCBHELPER_CONTENTBROKER_HXX
#define _UCBHELPER_CONTENTBROKER_HXX
+#include <boost/noncopyable.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.h>
@@ -58,16 +59,13 @@ class ContentBroker_Impl;
* be used to initialize and deinitialize the Broker and to access its
* interfaces directly.
*/
-class UCBHELPER_DLLPUBLIC ContentBroker
+class UCBHELPER_DLLPUBLIC ContentBroker : private boost::noncopyable
{
ContentBroker_Impl* m_pImpl;
// The "one and only" Broker.
static ContentBroker* m_pTheBroker;
private:
- UCBHELPER_DLLPRIVATE ContentBroker( const ContentBroker& ); // n.i.
- UCBHELPER_DLLPRIVATE ContentBroker& operator=( const ContentBroker& ); // n.i.
-
/** Constructor.
*
* @param rxSMgr is a Service Manager.
@@ -83,16 +81,6 @@ private:
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& rArguments );
- /** Constructor.
- *
- * @param rxSMgr is a Service Manager.
- * @param rData are the data for the for the content providers for
- * the new UCB.
- */
- UCBHELPER_DLLPRIVATE ContentBroker( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& rSMgr,
- const ContentProviderDataList & rData );
-
protected:
/**
* Destructor.
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 9b5289a..eb18dc7 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -128,13 +128,6 @@ ContentBroker::ContentBroker( const Reference< XMultiServiceFactory >& rSMgr,
}
//=========================================================================
-ContentBroker::ContentBroker( const Reference< XMultiServiceFactory >& rSMgr,
- const ContentProviderDataList & rData )
-{
- m_pImpl = new ContentBroker_Impl( rSMgr, rData );
-}
-
-//=========================================================================
ContentBroker::~ContentBroker()
{
delete m_pImpl;
diff --git a/unusedcode.easy b/unusedcode.easy
index 49ab88d..e183b70 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -6,7 +6,6 @@ CharPosArray::Replace(int const&, unsigned short)
CharPosArray::Replace(int const*, unsigned short, unsigned short)
CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*)
Dialog::Dialog(Window*, ResId const&)
-Export::DumpExportList(rtl::OString const&, ExportList&)
FileStream::FileStream(rtl::OString const&, FileAccessMode)
FmEntryDataArray::DeleteAndDestroy(unsigned short, unsigned short)
FmEntryDataArray::Insert(FmEntryData* const&, unsigned short&)
@@ -569,8 +568,14 @@ _ZSortFlys::Remove(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const&, unsigned short)
_ZSortFlys_SAR::Replace(_ZSortFly const*, unsigned short, unsigned short)
_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(_ZSortFly const&, void*), void*)
-basebmp::BitmapDevice::setDamageTracker(boost::shared_ptr<basebmp::IBitmapDeviceDamageTracker> const&)
basebmp::debugDump(boost::shared_ptr<basebmp::BitmapDevice> const&, std::basic_ostream<char, std::char_traits<char> >&)
+basegfx::tools::clipPolyPolygonOnOrthogonalPlane(basegfx::B3DPolyPolygon const&, basegfx::tools::B3DOrientation, bool, double, bool)
+basegfx::tools::equal(basegfx::B2DPolyPolygon const&, basegfx::B2DPolyPolygon const&, double const&)
+basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&, double const&)
+basegfx::tools::getEdgeLength(basegfx::B3DPolygon const&, unsigned int)
+basegfx::tools::getSignedArea(basegfx::B3DPolygon const&)
+basegfx::tools::rotateAroundPoint(basegfx::B2DPolygon const&, basegfx::B2DPoint const&, double)
+basegfx::tools::setContinuity(basegfx::B2DPolygon const&, basegfx::B2VectorContinuity)
basic::ScriptExtensionIterator::implGetScriptPackageFromPackage(com::sun::star::uno::Reference<com::sun::star::deployment::XPackage>, bool&)
basic::vba::getCurrentDirectory(com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
binfilter::B3dEdgeEntryBucketMemArr::Insert(binfilter::B3dEdgeEntryBucketMemArr const*, unsigned short, unsigned short, unsigned short)
@@ -951,8 +956,10 @@ canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange
canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&)
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
+comphelper::EventLogger::EventLogger(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&)
comphelper::FastPropertySetInfo::FastPropertySetInfo()
comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&)
+comphelper::MimeConfigurationHelper::GetFilterFlags(rtl::OUString const&)
comphelper::OAccessibleSelectionHelper::OAccessibleSelectionHelper()
comphelper::OAccessibleTextHelper::OAccessibleTextHelper()
comphelper::OPropertyContainerHelper::modifyAttributes(int, int, int)
@@ -1041,10 +1048,13 @@ ooo::vba::excel::getViewFrame(com::sun::star::uno::Reference<com::sun::star::fra
ooo::vba::excel::isInPrintPreview(SfxViewFrame*)
ooo::vba::extractBoolFromAny(com::sun::star::uno::Any const&, bool)
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&, int)
+oox::AttributeConversion::decodeHyperHex(rtl::OUString const&)
+oox::AttributeConversion::decodeUnsignedHex(rtl::OUString const&)
oox::BinaryInputStream::readNulCharArray()
oox::ContainerHelper::insertByIndex(com::sun::star::uno::Reference<com::sun::star::container::XIndexContainer> const&, int, com::sun::star::uno::Any const&)
oox::GraphicHelper::convertScreenPixelToHmm(com::sun::star::awt::Point const&) const
oox::ObjectContainer::getObject(rtl::OUString const&) const
+oox::PropertyMap::dump()
oox::PropertySet::getProperties(com::sun::star::uno::Sequence<com::sun::star::uno::Any>&, com::sun::star::uno::Sequence<rtl::OUString> const&) const
oox::core::PowerPointExport::WriteAnimationNodeCommonPropsEnd(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
oox::core::PowerPointExport::WriteTextStyles(boost::shared_ptr<sax_fastparser::FastSerializerHelper>)
@@ -1184,7 +1194,6 @@ sw::util::AuthorInfos::Remove(sw::util::AuthorInfo* const&, unsigned short)
sw::util::AuthorInfos::Remove(unsigned short, unsigned short)
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequence<int> const&)
ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, ucbhelper::Content&)
-ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::__debug::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
utl::TransliterationWrapper::compareSubstring(String const&, int, int, String const&, int, int) const
commit 874966bd304d0ef5e6cb9cf7b60e6240a37d70b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Feb 26 13:39:27 2012 +0000
ditch archaic filter-tracer remnants
diff --git a/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx
index 1ab5be9..ea235a3 100644
--- a/svtools/inc/svtools/FilterConfigItem.hxx
+++ b/svtools/inc/svtools/FilterConfigItem.hxx
@@ -78,14 +78,11 @@ class SVT_DLLPUBLIC FilterConfigItem
sal_Int32 ReadInt32( const ::rtl::OUString& rKey, sal_Int32 nDefault );
::rtl::OUString
ReadString( const ::rtl::OUString& rKey, const ::rtl::OUString& rDefault );
- ::com::sun::star::uno::Any
- ReadAny( const ::rtl::OUString& rKey, const ::com::sun::star::uno::Any& rDefault );
// try to store to configuration
// and always stores into the FilterData sequence
void WriteBool( const ::rtl::OUString& rKey, sal_Bool bValue );
void WriteInt32( const ::rtl::OUString& rKey, sal_Int32 nValue );
- void WriteAny( const rtl::OUString& rKey, const ::com::sun::star::uno::Any& rAny );
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData() const;
diff --git a/svtools/source/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx
index 5368c94..275bceb 100644
--- a/svtools/source/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter/FilterConfigItem.cxx
@@ -356,25 +356,6 @@ OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDe
return aRetValue;
}
-Any FilterConfigItem::ReadAny( const ::rtl::OUString& rKey, const Any& rDefault )
-{
- Any aAny, aRetValue( rDefault );
- PropertyValue* pPropVal = GetPropertyValue( aFilterData, rKey );
- if ( pPropVal )
- {
- aRetValue = pPropVal->Value;
- }
- else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
- {
- aRetValue = aAny;
- }
- PropertyValue aPropValue;
- aPropValue.Name = rKey;
- aPropValue.Value = aRetValue;
- WritePropertyValue( aFilterData, aPropValue );
- return aRetValue;
-}
-
void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue )
{
PropertyValue aBool;
@@ -442,34 +423,6 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue )
}
}
-void FilterConfigItem::WriteAny( const OUString& rKey, const Any& rNewAny )
-{
- PropertyValue aPropValue;
- aPropValue.Name = rKey;
- aPropValue.Value = rNewAny;
- WritePropertyValue( aFilterData, aPropValue );
- if ( xPropSet.is() )
- {
- Any aAny;
- if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
- {
- if ( aAny != rNewAny )
- {
- try
- {
- xPropSet->setPropertyValue( rKey, rNewAny );
- bModified = sal_True;
- }
- catch ( com::sun::star::uno::Exception& )
- {
- OSL_FAIL( "FilterConfigItem::WriteAny - could not set PropertyValue" );
-
- }
- }
- }
- }
-}
-
// ------------------------------------------------------------------------
Sequence< PropertyValue > FilterConfigItem::GetFilterData() const
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 376bab5..c835643 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/ww8/WW8TableInfo \
sw/source/filter/ww8/fields \
sw/source/filter/ww8/styles \
- sw/source/filter/ww8/tracer \
sw/source/filter/ww8/writerhelper \
sw/source/filter/ww8/writerwordglue \
sw/source/filter/ww8/wrtw8esh \
diff --git a/sw/source/filter/ww8/tracer.cxx b/sw/source/filter/ww8/tracer.cxx
deleted file mode 100644
index 0b52a34..0000000
--- a/sw/source/filter/ww8/tracer.cxx
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <tools/urlobj.hxx> //INetURLObject
-#include <sfx2/docfile.hxx> //SfxMedium
-#include "tracer.hxx" //sw::log::Tracer
-
-using rtl::OUString;
-#define CAU(X) RTL_CONSTASCII_USTRINGPARAM(X)
-#define C2O(X) OUString(CAU(X))
-#define COMMENT(X) OUString()
-
-namespace sw
-{
- namespace log
- {
- Tracer::Tracer(const SfxMedium &rMed)
- {
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::beans;
- Sequence<PropertyValue> aConfig(1);
- PropertyValue aPropValue;
- aPropValue.Value <<=
- OUString(rMed.GetURLObject().GetMainURL(
- INetURLObject::NO_DECODE));
- aPropValue.Name = C2O("DocumentURL");
- aConfig[0] = aPropValue;
- OUString aTraceConfigPath(CAU("Office.Tracing/Import/Word"));
- }
-
- Tracer::~Tracer()
- {
- }
-
- void Tracer::Log(Problem eProblem)
- {
- OUString sID(CAU("sw"));
- sID += rtl::OUString::valueOf(static_cast<sal_Int32>(eProblem));
- }
-
- rtl::OUString Tracer::GetContext(Environment eContext) const
- {
- rtl::OUString sContext;
- switch (eContext)
- {
- case eMacros:
- case eDocumentProperties:
- sContext = C2O("Global");
- break;
- case eMainText:
- sContext = C2O("Text");
- break;
- case eSubDoc:
- sContext = C2O("Text");
- break;
- case eTable:
- sContext = C2O("Table");
- break;
- default:
- sContext = C2O("UNKNOWN");
- break;
- }
- return sContext;
- }
-
- rtl::OUString Tracer::GetDetails(Environment eContext) const
- {
- rtl::OUString sDetails;
- switch (eContext)
- {
- case eDocumentProperties:
- sDetails = C2O("Document Properties");
- break;
- case eMacros:
- sDetails = C2O("Macros");
- break;
- case eMainText:
- sDetails = C2O("MainDocument");
- break;
- case eSubDoc:
- sDetails = C2O("Unknown Subdocument");
- break;
- default:
- sDetails = C2O("UNKNOWN");
- break;
- }
- return sDetails;
- }
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/tracer.hxx b/sw/source/filter/ww8/tracer.hxx
deleted file mode 100644
index b51cf06..0000000
--- a/sw/source/filter/ww8/tracer.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef SW_TRACER_HXX
-#define SW_TRACER_HXX
-
-#include <rtl/ustring.hxx> //rtl::OUString
-
-class SfxMedium;
-
-namespace sw
-{
- namespace log
- {
-
- enum Problem
- {
- ePrinterMetrics = 1,
- eExtraLeading,
- eTabStopDistance,
- eDontUseHTMLAutoSpacing,
- eAutoWidthFrame,
- eRowCanSplit,
- eSpacingBetweenCells,
- eTabInNumbering,
- eNegativeVertPlacement,
- eAutoColorBg,
- eTooWideAsChar,
- eAnimatedText,
- eDontAddSpaceForEqualStyles,
- eBorderDistOutside,
- eContainsVisualBasic,
- eContainsWordBasic
- };
-
- enum Environment
- {
- eDocumentProperties,
- eMacros,
- eMainText,
- eSubDoc,
- eTable
- };
-
- class Tracer
- {
- private:
- rtl::OUString GetContext(Environment eContext) const;
- rtl::OUString GetDetails(Environment eContext) const;
- public:
- Tracer(const SfxMedium &rMedium);
- void Log(Problem eProblem);
- ~Tracer();
- };
- }
-}
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 22d773a..0671438 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2340,14 +2340,6 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
rFlySet.Put(SwFmtVertOrient(MakeSafePositioningValue(nYPos),
eVertOri, eVertRel));
-
- if (
- (pFSPA->nYaTop < 0) && (eVertOri == text::VertOrientation::NONE) &&
- ((eAnchor == FLY_AT_PARA) || (eAnchor == FLY_AT_CHAR))
- )
- {
- maTracer.Log(sw::log::eNegativeVertPlacement);
- }
}
return eAnchor;
@@ -2699,15 +2691,6 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
SwFrmFmt *SwWW8ImplReader::AddAutoAnchor(SwFrmFmt *pFmt)
{
- if (pFmt && (pFmt->GetAnchor().GetAnchorId() != FLY_AS_CHAR))
- {
- sal_uInt16 nTextAreaWidth = static_cast< sal_uInt16 >( maSectionManager.GetPageWidth() -
- maSectionManager.GetPageRight() - maSectionManager.GetPageLeft());
-
- if (pFmt->GetFrmSize().GetSize().Width() > nTextAreaWidth)
- maTracer.Log(sw::log::eTooWideAsChar);
- }
-
/*
* anchored to character at the current position will move along the
* paragraph as text is added because we are at the insertion point.
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7b39697..89dd406 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1514,12 +1514,10 @@ void SwWW8ImplReader::ImportDop()
// Abst. des ersten und oberem Abst. des zweiten
rDoc.set(IDocumentSettingAccess::PARA_SPACE_MAX, pWDop->fDontUseHTMLAutoSpacing);
rDoc.set(IDocumentSettingAccess::PARA_SPACE_MAX_AT_PAGES, true );
- maTracer.Log(sw::log::eDontUseHTMLAutoSpacing);
// move tabs on alignment
rDoc.set(IDocumentSettingAccess::TAB_COMPAT, true);
// #i24363# tab stops relative to indent
rDoc.set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, false);
- maTracer.Log(sw::log::eTabStopDistance);
// #i18732# - adjust default of option 'FollowTextFlow'
rDoc.SetDefault( SwFmtFollowTextFlow( sal_False ) );
@@ -1534,12 +1532,6 @@ void SwWW8ImplReader::ImportDop()
rDoc.GetAttrPool().SetPoolDefaultItem( aNewTab );
- if (!pWDop->fUsePrinterMetrics)
- maTracer.Log(sw::log::ePrinterMetrics);
-
- if (!pWDop->fNoLeading)
- maTracer.Log(sw::log::eExtraLeading);
-
rDoc.set(IDocumentSettingAccess::USE_VIRTUAL_DEVICE, !pWDop->fUsePrinterMetrics);
rDoc.set(IDocumentSettingAccess::USE_HIRES_VIRTUAL_DEVICE, true);
rDoc.set(IDocumentSettingAccess::ADD_FLY_OFFSETS, true );
@@ -1577,9 +1569,6 @@ void SwWW8ImplReader::ImportDop()
// COMPATIBILITY FLAGS END
//
- if (!pWDop->fNoLeading)
- maTracer.Log(sw::log::eExtraLeading);
-
//import magic doptypography information, if its there
if (pWwFib->nFib > 105)
ImportDopTypography(pWDop->doptypography);
@@ -3617,7 +3606,6 @@ bool SwWW8ImplReader::ReadText(long nStartCp, long nTextLen, ManTypes nType)
SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
SvStream* pSt, SwDoc& rD, const String& rBaseURL, bool bNewDoc) :
mpDocShell(rD.GetDocShell()),
- maTracer(*(mpDocShell->GetMedium())),
pStg(pStorage),
pStrm(pSt),
pTableStream(0),
@@ -4129,8 +4117,6 @@ void SwWW8ImplReader::StoreMacroCmds()
{
if (pWwFib->lcbCmds)
{
- maTracer.Log(sw::log::eContainsWordBasic);
-
pTableStream->Seek(pWwFib->fcCmds);
uno::Reference < embed::XStorage > xRoot(mpDocShell->GetStorage());
@@ -4634,10 +4620,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
aCustomisations.Import( mpDocShell );
if( bRet )
- {
- maTracer.Log(sw::log::eContainsVisualBasic);
rDoc.SetContainsMSVBasic(true);
- }
StoreMacroCmds();
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index af9e089..a19b50c 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -40,7 +40,6 @@
#include <map>
#include <utility>
-#include "tracer.hxx"
#include "ww8struc.hxx" // WW8_BRC
#include "ww8scan.hxx" // WW8Fib
#include "ww8glsy.hxx"
@@ -969,11 +968,6 @@ friend class SwWW8FltControlStack;
friend class WW8FormulaControl;
friend class wwSectionManager;
-public:
- /*
- To log unimplemented features
- */
- sw::log::Tracer maTracer;
private:
SvStorage* pStg; // Input-Storage
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 17e1d19..b78030c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3059,8 +3059,6 @@ void WW8TabDesc::SetTabShades( SwTableBox* pBox, short nWwIdx )
if (pActBand->pNewSHDs && pActBand->pNewSHDs[nWwIdx] != COL_AUTO)
{
Color aColor(pActBand->pNewSHDs[nWwIdx]);
- if (aColor.GetColor() == 0x00333333)
- pIo->maTracer.Log(sw::log::eAutoColorBg);
pBox->GetFrmFmt()->SetFmtAttr(SvxBrushItem(aColor, RES_BACKGROUND));
bFound = true;
}
@@ -3433,7 +3431,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
{
// <WW8SwFlyPara> constructor has changed - new 4th parameter
// containing WW8 page top margin.
- pTableSFlyPara = new WW8SwFlyPara(*pPaM, *this, *pTableWFlyPara,
+ pTableSFlyPara = new WW8SwFlyPara(*pPaM, *pTableWFlyPara,
maSectionManager.GetWWPageTopMargin(),
maSectionManager.GetPageLeft(), maSectionManager.GetTextAreaWidth(),
nIniFlyDx, nIniFlyDy);
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 1a83764..ab927dc 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -84,7 +84,6 @@ struct WW8SwFlyPara
// add parameter <nWWPgTop> - WW8's page top margin
WW8SwFlyPara( SwPaM& rPaM,
- SwWW8ImplReader& rIo,
WW8FlyPara& rWW,
const sal_uInt32 nWWPgTop,
const sal_uInt32 nPgLeft,
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index ed4cf39..c3df152 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -547,8 +547,6 @@ bool WW8ListManager::ReadLVL(SwNumFmt& rNumFmt, SfxItemSet*& rpItemSet,
sal_uInt8 ixchFollow(0);
rSt >> ixchFollow;
- if (ixchFollow == 0)
- rReader.maTracer.Log(sw::log::eTabInNumbering);
rSt >> aLVL.nV6DxaSpace;
rSt >> aLVL.nV6Indent;
rSt >> aLVL.nLenGrpprlChpx;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index ba7d7ea..2ca9019 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1805,7 +1805,6 @@ bool WW8FlyPara::IsEmpty() const
// #i18732# - changes made on behalf of CMC
WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
- SwWW8ImplReader& rIo,
WW8FlyPara& rWW,
const sal_uInt32 nWWPgTop,
const sal_uInt32 nPgLeft,
@@ -1846,7 +1845,6 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
if( nWidth <= 10 ) // Auto-Breite
{
bAutoWidth = true;
- rIo.maTracer.Log(sw::log::eAutoWidthFrame);
nWidth = nNettoWidth =
msword_cast<sal_Int16>((nPgWidth ? nPgWidth : 2268)); // 4 cm
}
@@ -2362,7 +2360,7 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo,
// <WW8SwFlyPara> constructor has changed - new 4th parameter
// containing WW8 page top margin.
- pSFlyPara = new WW8SwFlyPara( *pPaM, *this, *pWFlyPara,
+ pSFlyPara = new WW8SwFlyPara( *pPaM, *pWFlyPara,
maSectionManager.GetWWPageTopMargin(),
maSectionManager.GetPageLeft(),
maSectionManager.GetTextAreaWidth(),
@@ -4101,13 +4099,10 @@ sal_uInt16 SwWW8ImplReader::GetParagraphAutoSpace(bool fDontUseHTMLAutoSpacing)
return 280; //Seems to be always 14points in this case
}
-void SwWW8ImplReader::Read_DontAddEqual(sal_uInt16, const sal_uInt8 *pData, short nLen)
+void SwWW8ImplReader::Read_DontAddEqual(sal_uInt16, const sal_uInt8 *, short nLen)
{
if (nLen < 0)
return;
-
- if (*pData)
- maTracer.Log(sw::log::eDontAddSpaceForEqualStyles);
}
void SwWW8ImplReader::Read_ParaAutoBefore(sal_uInt16, const sal_uInt8 *pData, short nLen)
@@ -4727,21 +4722,17 @@ void SwWW8ImplReader::Read_Border(sal_uInt16 , const sal_uInt8* , short nLen)
Rectangle aInnerDist;
GetBorderDistance( aBrcs, aInnerDist );
- maTracer.Log(sw::log::eBorderDistOutside);
+ if ((nBorder & WW8_LEFT)==WW8_LEFT)
+ aBox.SetDistance( (sal_uInt16)aInnerDist.Left(), BOX_LINE_LEFT );
- if ((nBorder & WW8_LEFT)==WW8_LEFT) {
- aBox.SetDistance( (sal_uInt16)aInnerDist.Left(), BOX_LINE_LEFT );
- }
- if ((nBorder & WW8_TOP)==WW8_TOP) {
- aBox.SetDistance( (sal_uInt16)aInnerDist.Top(), BOX_LINE_TOP );
- }
- if ((nBorder & WW8_RIGHT)==WW8_RIGHT) {
- aBox.SetDistance( (sal_uInt16)aInnerDist.Right(), BOX_LINE_RIGHT );
- }
+ if ((nBorder & WW8_TOP)==WW8_TOP)
+ aBox.SetDistance( (sal_uInt16)aInnerDist.Top(), BOX_LINE_TOP );
- if ((nBorder & WW8_BOT)==WW8_BOT) {
- aBox.SetDistance( (sal_uInt16)aInnerDist.Bottom(), BOX_LINE_BOTTOM );
- }
+ if ((nBorder & WW8_RIGHT)==WW8_RIGHT)
+ aBox.SetDistance( (sal_uInt16)aInnerDist.Right(), BOX_LINE_RIGHT );
+
+ if ((nBorder & WW8_BOT)==WW8_BOT)
+ aBox.SetDistance( (sal_uInt16)aInnerDist.Bottom(), BOX_LINE_BOTTOM );
NewAttr( aBox );
commit 1ca675157d753371acd35aad4d824fb4f20f3330
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 25 23:29:55 2012 +0000
fix CntHTTPCookieList_impl leak
diff --git a/unusedcode.easy b/unusedcode.easy
index 3881c2e..49ab88d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1163,7 +1163,6 @@ sdr::table::SdrTableObj::getRowCount() const
sfx2::TaskPaneWrapper::GetChildWindowId()
slideshow::internal::DrawShapeSubsetting::reset(slideshow::internal::DocTreeNode const&, boost::shared_ptr<GDIMetaFile> const&)
std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEventListener>, std::less<_xmlNode*>, std::allocator<std::pair<_xmlNode* const, com::sun::star::uno::Reference<com::sun::star::xml::dom::events::XEventListener> > > >::~multimap()
-std::__cxx1998::vector<CntHTTPCookie*, std::allocator<CntHTTPCookie*> >::~vector()
std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector()
std::__cxx1998::vector<ServiceInfo*, std::allocator<ServiceInfo*> >::~vector()
std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
index 4ef37b3..6bfeb8b 100644
--- a/uui/source/iahndl-cookies.cxx
+++ b/uui/source/iahndl-cookies.cxx
@@ -71,7 +71,7 @@ handleCookiesRequest_(
rContinuations)
SAL_THROW((uno::RuntimeException))
{
- CntHTTPCookieList_impl* pCookies = new CntHTTPCookieList_impl();
+ CntHTTPCookieList_impl aCookies;
for (sal_Int32 i = 0; i < rRequest.Cookies.getLength(); ++i)
{
try
@@ -109,7 +109,7 @@ handleCookiesRequest_(
OSL_ASSERT(false);
break;
}
- pCookies->push_back( xCookie.get() );
+ aCookies.push_back( xCookie.get() );
xCookie.release();
}
catch (std::bad_alloc const &)
@@ -123,7 +123,7 @@ handleCookiesRequest_(
CntHTTPCookieRequest
aRequest(rRequest.URL,
- *pCookies,
+ aCookies,
rRequest.Request == ucb::CookieRequest_RECEIVE
? CNTHTTP_COOKIE_REQUEST_RECV
: CNTHTTP_COOKIE_REQUEST_SEND);
@@ -154,7 +154,7 @@ handleCookiesRequest_(
for (sal_Int32 j = 0; j < rRequest.Cookies.getLength(); ++j)
if (rRequest.Cookies[j].Policy
== ucb::CookiePolicy_CONFIRM)
- switch ( (*pCookies)[ j ]->m_nPolicy )
+ switch ( (aCookies)[ j ]->m_nPolicy )
{
case CNTHTTP_COOKIE_POLICY_ACCEPTED:
xCookieHandling->
commit e87810b69331f5d62cbeac0182c5bc2143f8856f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Feb 25 23:22:17 2012 +0000
use a non-leaky singleton
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index ab0e669..5436ed9 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -33,20 +33,19 @@
#i73788#
*/
-SwRetrievedInputStreamDataManager* SwRetrievedInputStreamDataManager::mpManager = 0;
SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::mnNextKeyValue = 1;
-osl::Mutex SwRetrievedInputStreamDataManager::maGetManagerMutex;
-SwRetrievedInputStreamDataManager& SwRetrievedInputStreamDataManager::GetManager()
+namespace
{
- osl::MutexGuard aGuard(maGetManagerMutex);
-
- if ( mpManager == 0 )
+ class theSwRetrievedInputStreamDataManager :
+ public rtl::Static< SwRetrievedInputStreamDataManager, theSwRetrievedInputStreamDataManager>
{
- mpManager = new SwRetrievedInputStreamDataManager();
- }
+ };
+}
- return *mpManager;
+SwRetrievedInputStreamDataManager& SwRetrievedInputStreamDataManager::GetManager()
+{
+ return theSwRetrievedInputStreamDataManager::get();
}
SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::ReserveData(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list