[Libreoffice-commits] .: 10 commits - connectivity/inc connectivity/source editeng/inc editeng/source oox/inc oox/source sc/source sdext/source sfx2/source svl/inc svl/source svtools/inc svtools/source svx/inc svx/source sw/source tools/source unusedcode.easy
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Apr 16 07:22:23 PDT 2012
connectivity/inc/connectivity/dbtools.hxx | 23 -
connectivity/inc/connectivity/statementcomposer.hxx | 1
connectivity/source/commontools/dbtools.cxx | 40 --
connectivity/source/commontools/statementcomposer.cxx | 6
editeng/inc/editeng/adjitem.hxx | 8
editeng/inc/editeng/brkitem.hxx | 6
editeng/inc/editeng/charreliefitem.hxx | 6
editeng/inc/editeng/cmapitem.hxx | 4
editeng/inc/editeng/crsditem.hxx | 2
editeng/inc/editeng/eerdll.hxx | 2
editeng/inc/editeng/escpitem.hxx | 6
editeng/inc/editeng/lspcitem.hxx | 6
editeng/inc/editeng/postitem.hxx | 6
editeng/inc/editeng/shaditem.hxx | 6
editeng/inc/editeng/udlnitem.hxx | 10
editeng/inc/editeng/wghtitem.hxx | 6
editeng/source/editeng/editeng.cxx | 20 -
editeng/source/items/frmitems.cxx | 9
editeng/source/items/paraitem.cxx | 28 +
editeng/source/items/textitem.cxx | 37 --
editeng/source/outliner/outleeng.cxx | 10
oox/inc/oox/dump/dumperbase.hxx | 8
oox/source/dump/dumperbase.cxx | 35 --
oox/source/ole/vbamodule.cxx | 8
sc/source/filter/inc/addressconverter.hxx | 7
sc/source/filter/inc/biffcodec.hxx | 9
sc/source/filter/inc/connectionsbuffer.hxx | 7
sc/source/filter/inc/drawingbase.hxx | 2
sc/source/filter/inc/drawingmanager.hxx | 158 ---------
sc/source/filter/inc/excelhandlers.hxx | 12
sc/source/filter/inc/externallinkbuffer.hxx | 2
sc/source/filter/inc/pivotcachebuffer.hxx | 2
sc/source/filter/inc/pivottablebuffer.hxx | 5
sc/source/filter/inc/richstring.hxx | 11
sc/source/filter/inc/stylesbuffer.hxx | 8
sc/source/filter/inc/worksheetbuffer.hxx | 3
sc/source/filter/oox/addressconverter.cxx | 8
sc/source/filter/oox/biffcodec.cxx | 14
sc/source/filter/oox/connectionsbuffer.cxx | 144 --------
sc/source/filter/oox/drawingbase.cxx | 7
sc/source/filter/oox/drawingmanager.cxx | 309 ------------------
sc/source/filter/oox/excelhandlers.cxx | 7
sc/source/filter/oox/externallinkbuffer.cxx | 43 --
sc/source/filter/oox/pivotcachebuffer.cxx | 23 -
sc/source/filter/oox/pivottablebuffer.cxx | 25 -
sc/source/filter/oox/richstring.cxx | 92 -----
sc/source/filter/oox/stylesbuffer.cxx | 24 -
sc/source/filter/oox/worksheetbuffer.cxx | 8
sdext/source/presenter/PresenterTimer.cxx | 9
sdext/source/presenter/PresenterTimer.hxx | 4
sfx2/source/doc/docvor.cxx | 9
sfx2/source/doc/objmisc.cxx | 8
svl/inc/svl/aeitem.hxx | 12
svl/inc/svl/cenumitm.hxx | 2
svl/source/items/aeitem.cxx | 8
svl/source/items/cenumitm.cxx | 4
svtools/inc/svtools/scrwin.hxx | 3
svtools/source/control/scrwin.cxx | 16
svx/inc/svx/sdgmoitm.hxx | 2
svx/inc/svx/sdtaditm.hxx | 2
svx/inc/svx/sdtaitm.hxx | 4
svx/inc/svx/sdtakitm.hxx | 2
svx/inc/svx/sdtfsitm.hxx | 2
svx/inc/svx/sxcecitm.hxx | 2
svx/inc/svx/sxcikitm.hxx | 2
svx/inc/svx/sxctitm.hxx | 2
svx/inc/svx/sxekitm.hxx | 2
svx/inc/svx/sxmkitm.hxx | 2
svx/inc/svx/sxmtpitm.hxx | 4
svx/inc/svx/sxmuitm.hxx | 2
svx/source/svdraw/svdattr.cxx | 40 +-
sw/source/filter/ww8/ww8glsy.cxx | 4
sw/source/filter/ww8/ww8graf.cxx | 14
sw/source/filter/ww8/ww8par.cxx | 5
sw/source/filter/ww8/ww8par.hxx | 18 -
sw/source/filter/ww8/ww8scan.cxx | 32 -
sw/source/filter/ww8/ww8scan.hxx | 4
tools/source/fsys/tempfile.cxx | 18 -
unusedcode.easy | 18 -
79 files changed, 218 insertions(+), 1261 deletions(-)
New commits:
commit 119b0a666d49c54f6be00ff12d3bc9e129f8f339
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 16 14:13:04 2012 +0100
callcatcher: update list
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index dcc6aff..f13a62b 100644
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
@@ -77,7 +77,6 @@ namespace dbtools
instance is destroyed.
*/
void setDisposeComposer( bool _bDoDispose );
- bool getDisposeComposer() const;
void setFilter( const ::rtl::OUString& _rFilter );
void setOrder( const ::rtl::OUString& _rOrder );
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index 7b4ab77..fc7e2a9 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -272,12 +272,6 @@ namespace dbtools
}
//--------------------------------------------------------------------
- bool StatementComposer::getDisposeComposer() const
- {
- return m_pData->bDisposeComposer;
- }
-
- //--------------------------------------------------------------------
void StatementComposer::setFilter( const ::rtl::OUString& _rFilter )
{
m_pData->sFilter = _rFilter;
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 83aa0a9..d630c97 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -373,11 +373,6 @@ public:
template< typename Type >
static void appendValue( ::rtl::OUStringBuffer& rStr, Type nData, FormatType eFmtType );
- // append columns, rows, addresses ----------------------------------------
-
- static void appendAddrCol( ::rtl::OUStringBuffer& rStr, sal_Int32 nCol, bool bRel );
- static void appendAddrRow( ::rtl::OUStringBuffer& rStr, sal_Int32 nRow, bool bRel );
-
// encoded text output ----------------------------------------------------
static void appendCChar( ::rtl::OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix = true );
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index dea3445..78acc50 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -469,22 +469,6 @@ void StringHelper::appendBool( OUStringBuffer& rStr, bool bData )
rStr.appendAscii( bData ? "true" : "false" );
}
-// append columns, rows, addresses --------------------------------------------
-
-void StringHelper::appendAddrCol( OUStringBuffer& rStr, sal_Int32 nCol, bool bRel )
-{
- if( !bRel ) rStr.append( OOX_DUMP_ADDRABS );
- sal_Int32 nPos = rStr.getLength();
- for( sal_Int32 nTemp = nCol; nTemp >= 0; (nTemp /= 26) -= 1 )
- rStr.insert( nPos, static_cast< sal_Unicode >( 'A' + (nTemp % 26) ) );
-}
-
-void StringHelper::appendAddrRow( OUStringBuffer& rStr, sal_Int32 nRow, bool bRel )
-{
- if( !bRel ) rStr.append( OOX_DUMP_ADDRABS );
- appendDec( rStr, nRow + 1 );
-}
-
// encoded text output --------------------------------------------------------
void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix )
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index e0a80ce..7021b38 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -72,9 +72,6 @@ struct BiffObjFillModel
bool mbAuto; /// True = automatic fill format.
explicit BiffObjFillModel();
-
- /** Returns true, if the fill formatting is visible (automatic or explicit). */
- bool isFilled() const;
};
// ============================================================================
@@ -161,8 +158,6 @@ protected:
void convertLineProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows = 0 ) const;
/** Converts the passed fill formatting to the passed property map. */
void convertFillProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjFillModel& rFillModel ) const;
- /** Converts the passed frame flags to the passed property map. */
- void convertFrameProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, sal_uInt16 nFrameFlags ) const;
/** Derived classes read the contents of the a BIFF3 OBJ record from the passed stream. */
virtual void implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
@@ -230,38 +225,6 @@ protected:
sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group.
};
-/** A simple rectangle object (used as base class for oval objects). */
-class BiffRectObject : public BiffDrawingObjectBase
-{
-public:
- explicit BiffRectObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Reads the fill model, the line model, and frame flags. */
- void readFrameData( BiffInputStream& rStrm );
-
- /** Converts fill formatting, line formatting, and frame style. */
- void convertRectProperties( ::oox::drawingml::ShapePropertyMap& rPropMap ) const;
-
- /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
- virtual void implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
- virtual void implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
- virtual void implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
-protected:
- BiffObjFillModel maFillModel; /// Fill formatting.
- BiffObjLineModel maLineModel; /// Line formatting.
- sal_uInt16 mnFrameFlags; /// Additional flags.
-};
-
// ============================================================================
// BIFF drawing page
// ============================================================================
diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx
index 3f71256..82e1501 100644
--- a/sc/source/filter/inc/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -389,8 +389,6 @@ private:
static void importField( IndexVector& orFields, const AttributeList& rAttribs );
/** Reads an array of field indexes for the row or column dimension. */
static void importFields( IndexVector& orFields, SequenceInputStream& rStrm );
- /** Reads an array of field indexes for the row or column dimension. */
- static void importFields( IndexVector& orFields, BiffInputStream& rStrm, sal_Int32 nCount );
private:
PivotTableFieldVector maFields; /// All pivot table fields.
diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index 9731e23..7871af8 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -133,10 +133,6 @@ public:
void appendPortion( const FontPortionModel& rPortion );
/** Reads count and font identifiers from the passed stream. */
void importPortions( SequenceInputStream& rStrm );
- /** Reads nCount font identifiers from the passed stream. */
- void importPortions( BiffInputStream& rStrm, sal_uInt16 nCount, BiffFontPortionMode eMode );
- /** Reads count and font identifiers from the passed stream. */
- void importPortions( BiffInputStream& rStrm, bool b16Bit );
};
// ============================================================================
@@ -210,7 +206,6 @@ struct PhoneticPortionModel
mnPos( nPos ), mnBasePos( nBasePos ), mnBaseLen( nBaseLen ) {}
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm );
};
// ----------------------------------------------------------------------------
@@ -225,8 +220,6 @@ public:
void appendPortion( const PhoneticPortionModel& rPortion );
/** Reads all phonetic portions from the passed stream. */
void importPortions( SequenceInputStream& rStrm );
- /** Reads phonetic portion data from the passed stream. */
- ::rtl::OUString importPortions( BiffInputStream& rStrm, sal_Int32 nPhoneticSize );
};
// ============================================================================
diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index 02bfe3c..fb6c7ea 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -281,9 +281,6 @@ public:
/** Returns the font model structure. This function can be called before
finalizeImport() has been called. */
inline const FontModel& getModel() const { return maModel; }
- /** Returns the text encoding for strings used with this font. This
- function can be called before finalizeImport() has been called. */
- rtl_TextEncoding getFontEncoding() const;
/** Final processing after import of all style settings. */
void finalizeImport();
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index 32217bf..5fa8f0d 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -104,66 +104,6 @@ const sal_uInt16 BIFF_QTSETTINGS_XL2000REFRESHED = 0x0020;
const sal_uInt16 BIFF_QTSETTINGS_TEXTQUERY = 0x0001;
const sal_uInt16 BIFF_QTSETTINGS_TABLENAMES = 0x0002;
-// ----------------------------------------------------------------------------
-
-OUString lclReadQueryString( BiffInputStream& rStrm, sal_uInt16 nCount )
-{
- bool bValidRec = true;
- OUStringBuffer aBuffer;
- for( sal_uInt16 nIndex = 0; bValidRec && (nIndex < nCount); ++nIndex )
- {
- bValidRec = (rStrm.getNextRecId() == BIFF_ID_PCITEM_STRING) && rStrm.startNextRecord();
- if( bValidRec )
- aBuffer.append( rStrm.readUniString() );
- }
- OSL_ENSURE( bValidRec, "lclReadQueryString - missing PCITEM_STRING records" );
- return aBuffer.makeStringAndClear();
-}
-
-void lclParseTables( WebPrModel::TablesVector& rTables, const OUString& rTableNames )
-{
- rTables.clear();
- OUString aTableNames = rTableNames.trim();
- while( !aTableNames.isEmpty() )
- {
- sal_Int32 nSep = -1;
- // table names are enclosed in double quotes
- if( aTableNames[ 0 ] == '"' )
- {
- // search closing quote character
- sal_Int32 nEndQuote = aTableNames.indexOf( '"', 1 );
- OSL_ENSURE( nEndQuote >= 1, "lclParseTables - invalid syntax" );
- if( nEndQuote < 0 )
- nEndQuote = aTableNames.getLength();
- else
- nSep = aTableNames.indexOf( ',', nEndQuote + 1 );
- // extract text between quote characters
- OUString aTableName = aTableNames.copy( 1, nEndQuote - 1 ).trim();
- if( !aTableName.isEmpty() )
- rTables.push_back( Any( aTableName ) );
- else
- rTables.push_back( Any() );
- }
- else
- {
- nSep = aTableNames.indexOf( ',' );
- if( nSep < 0 )
- nSep = aTableNames.getLength();
- OUString aTableIndex = aTableNames.copy( 0, nSep ).trim();
- if( !aTableIndex.isEmpty() && (aTableIndex[ 0 ] >= '1') && (aTableIndex[ 0 ] <= '9') )
- rTables.push_back( Any( aTableIndex.toInt32() ) );
- else
- rTables.push_back( Any() );
- }
-
- // remove processed item from aTableNames
- if( (nSep < 0) || (nSep >= aTableNames.getLength()) )
- aTableNames = OUString();
- else
- aTableNames = aTableNames.copy( nSep + 1 ).trim();
- }
-}
-
} // namespace
// ============================================================================
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index eeeef0c..2d081ac 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -203,11 +203,6 @@ BiffObjFillModel::BiffObjFillModel() :
{
}
-bool BiffObjFillModel::isFilled() const
-{
- return mbAuto || (mnPattern != BIFF_OBJ_PATT_NONE);
-}
-
BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjFillModel& rModel )
{
sal_uInt8 nFlags;
@@ -524,10 +519,6 @@ void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, c
aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() );
}
-void BiffDrawingObjectBase::convertFrameProperties( ShapePropertyMap& /*rPropMap*/, sal_uInt16 /*nFrameFlags*/ ) const
-{
-}
-
void BiffDrawingObjectBase::implReadObjBiff3( BiffInputStream& /*rStrm*/, sal_uInt16 /*nMacroSize*/ )
{
}
@@ -609,57 +600,6 @@ Reference< XShape > BiffGroupObject::implConvertAndInsert( BiffDrawingBase& rDra
}
// ============================================================================
-
-BiffRectObject::BiffRectObject( const WorksheetHelper& rHelper ) :
- BiffDrawingObjectBase( rHelper ),
- mnFrameFlags( 0 )
-{
- setAreaObj( true );
-}
-
-void BiffRectObject::readFrameData( BiffInputStream& rStrm )
-{
- rStrm >> maFillModel >> maLineModel >> mnFrameFlags;
-}
-
-void BiffRectObject::convertRectProperties( ShapePropertyMap& rPropMap ) const
-{
- convertLineProperties( rPropMap, maLineModel );
- convertFillProperties( rPropMap, maFillModel );
- convertFrameProperties( rPropMap, mnFrameFlags );
-}
-
-void BiffRectObject::implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- readFrameData( rStrm );
- readMacroBiff3( rStrm, nMacroSize );
-}
-
-void BiffRectObject::implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- readFrameData( rStrm );
- readMacroBiff4( rStrm, nMacroSize );
-}
-
-void BiffRectObject::implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize )
-{
- readFrameData( rStrm );
- readNameBiff5( rStrm, nNameLen );
- readMacroBiff5( rStrm, nMacroSize );
-}
-
-Reference< XShape > BiffRectObject::implConvertAndInsert( BiffDrawingBase& rDrawing,
- const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
-{
- ShapePropertyMap aPropMap( getBaseFilter().getModelObjectHelper() );
- convertRectProperties( aPropMap );
-
- Reference< XShape > xShape = rDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.RectangleShape" ), rxShapes, rShapeRect );
- PropertySet( xShape ).setProperties( aPropMap );
- return xShape;
-}
-
-// ============================================================================
// BIFF drawing page
// ============================================================================
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index fe5f94f..61d2894 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -278,18 +278,6 @@ bool ExternalName::getDdeLinkData( OUString& orDdeServer, OUString& orDdeTopic,
// private --------------------------------------------------------------------
-namespace {
-
-void lclSetSheetCacheIndex( SingleReference& orApiRef, sal_Int32 nCacheIdx )
-{
- using namespace ::com::sun::star::sheet::ReferenceFlags;
- setFlag( orApiRef.Flags, SHEET_RELATIVE, false );
- setFlag( orApiRef.Flags, SHEET_3D, true );
- orApiRef.Sheet = nCacheIdx;
-}
-
-} // namespace
-
void ExternalName::setResultSize( sal_Int32 nColumns, sal_Int32 nRows )
{
OSL_ENSURE( (mrParentLink.getLinkType() == LINKTYPE_DDE) || (mrParentLink.getLinkType() == LINKTYPE_OLE) ||
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index f434a14..8496510 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -1371,16 +1371,6 @@ void PivotTable::importFields( IndexVector& orFields, SequenceInputStream& rStrm
orFields.push_back( rStrm.readInt32() );
}
-void PivotTable::importFields( IndexVector& orFields, BiffInputStream& rStrm, sal_Int32 nCount )
-{
- OSL_ENSURE( orFields.empty(), "PivotTable::importFields - multiple record instances" );
- orFields.clear();
- OSL_ENSURE( 2 * nCount == rStrm.getRemaining(), "PivotTable::importFields - invalid field count" );
- nCount = static_cast< sal_Int32 >( rStrm.getRemaining() / 2 );
- for( sal_Int32 nIdx = 0; nIdx < nCount; ++nIdx )
- orFields.push_back( rStrm.readInt16() );
-}
-
// ============================================================================
PivotTableBuffer::PivotTableBuffer( const WorkbookHelper& rHelper ) :
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index f3b682e..51f3f6b 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -190,26 +190,6 @@ void FontPortionModelList::importPortions( SequenceInputStream& rStrm )
}
}
-void FontPortionModelList::importPortions( BiffInputStream& rStrm, sal_uInt16 nCount, BiffFontPortionMode eMode )
-{
- clear();
- reserve( nCount );
- /* #i33341# real life -- same character index may occur several times
- -> use appendPortion() to validate string position. */
- FontPortionModel aPortion;
- for( sal_uInt16 nIndex = 0; !rStrm.isEof() && (nIndex < nCount); ++nIndex )
- {
- aPortion.read( rStrm, eMode );
- appendPortion( aPortion );
- }
-}
-
-void FontPortionModelList::importPortions( BiffInputStream& rStrm, bool b16Bit )
-{
- sal_uInt16 nCount = b16Bit ? rStrm.readuInt16() : rStrm.readuInt8();
- importPortions( rStrm, nCount, b16Bit ? BIFF_FONTPORTION_16BIT : BIFF_FONTPORTION_8BIT );
-}
-
// ============================================================================
PhoneticDataModel::PhoneticDataModel() :
@@ -294,13 +274,6 @@ void PhoneticPortionModel::read( SequenceInputStream& rStrm )
mnBaseLen = rStrm.readuInt16();
}
-void PhoneticPortionModel::read( BiffInputStream& rStrm )
-{
- mnPos = rStrm.readuInt16();
- mnBasePos = rStrm.readuInt16();
- mnBaseLen = rStrm.readuInt16();
-}
-
// ----------------------------------------------------------------------------
void PhoneticPortionModelList::appendPortion( const PhoneticPortionModel& rPortion )
@@ -336,32 +309,6 @@ void PhoneticPortionModelList::importPortions( SequenceInputStream& rStrm )
}
}
-OUString PhoneticPortionModelList::importPortions( BiffInputStream& rStrm, sal_Int32 nPhoneticSize )
-{
- OUString aPhoneticText;
- sal_uInt16 nPortionCount, nTextLen1, nTextLen2;
- rStrm >> nPortionCount >> nTextLen1 >> nTextLen2;
- OSL_ENSURE( nTextLen1 == nTextLen2, "PhoneticPortionModelList::importPortions - wrong phonetic text length" );
- if( (nTextLen1 == nTextLen2) && (nTextLen1 > 0) )
- {
- sal_Int32 nMinSize = 2 * nTextLen1 + 6 * nPortionCount + 14;
- OSL_ENSURE( nMinSize <= nPhoneticSize, "PhoneticPortionModelList::importPortions - wrong size of phonetic data" );
- if( nMinSize <= nPhoneticSize )
- {
- aPhoneticText = rStrm.readUnicodeArray( nTextLen1 );
- clear();
- reserve( nPortionCount );
- PhoneticPortionModel aPortion;
- for( sal_uInt16 nPortion = 0; nPortion < nPortionCount; ++nPortion )
- {
- aPortion.read( rStrm );
- appendPortion( aPortion );
- }
- }
- }
- return aPhoneticText;
-}
-
// ============================================================================
RichString::RichString( const WorkbookHelper& rHelper ) :
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index 2d3777f..c5f5559 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -924,17 +924,6 @@ void Font::importCfRule( BiffInputStream& rStrm )
maModel.mbShadow = getFlag( nStyle, BIFF_CFRULE_FONT_SHADOW );
}
-rtl_TextEncoding Font::getFontEncoding() const
-{
- // #i63105# cells use text encoding from FONT record character set
- // #i67768# BIFF2-BIFF4 FONT records do not contain character set
- // #i71033# do not use maApiData, this function is used before finalizeImport()
- rtl_TextEncoding eFontEnc = RTL_TEXTENCODING_DONTKNOW;
- if( (0 <= maModel.mnCharSet) && (maModel.mnCharSet <= SAL_MAX_UINT8) )
- eFontEnc = rtl_getTextEncodingFromWindowsCharset( static_cast< sal_uInt8 >( maModel.mnCharSet ) );
- return (eFontEnc == RTL_TEXTENCODING_DONTKNOW) ? getTextEncoding() : eFontEnc;
-}
-
void Font::finalizeImport()
{
namespace cssawt = ::com::sun::star::awt;
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index dca44fd..501f603 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -125,15 +125,6 @@ private:
//===== PresenterTimer ========================================================
-sal_Int32 PresenterTimer::ScheduleSingleTaskAbsolute (
- const Task& rTask,
- const TimeValue& rDueTime)
-{
- SharedTimerTask pTask (TimerScheduler::CreateTimerTask(rTask, rDueTime, 0));
- TimerScheduler::Instance()->ScheduleTask(pTask);
- return pTask->mnTaskId;
-}
-
sal_Int32 PresenterTimer::ScheduleRepeatedTask (
const Task& rTask,
const sal_Int64 nDelay,
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index eca3dc3..f56fe51 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -59,10 +59,6 @@ public:
static const sal_Int32 NotAValidTaskId = 0;
- static sal_Int32 ScheduleSingleTaskAbsolute (
- const Task& rTask,
- const TimeValue& rDueTime);
-
/** Schedule a task to be executed repeatedly. The task is executed the
first time after nFirst nano-seconds (1000000000 corresponds to one
second). After that task is executed in intervalls that are
diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx
index fca0eaa..61f4f00 100644
--- a/svtools/inc/svtools/scrwin.hxx
+++ b/svtools/inc/svtools/scrwin.hxx
@@ -95,7 +95,6 @@ public:
private:
SVT_DLLPRIVATE Size GetOutputSizePixel() const;
- SVT_DLLPRIVATE Size GetOutputSize() const;
};
#endif
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 26d7999..10c6bf4 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -115,13 +115,6 @@ Size ScrollableWindow::GetOutputSizePixel() const
//-------------------------------------------------------------------
-Size ScrollableWindow::GetOutputSize() const
-{
- return PixelToLogic( GetOutputSizePixel() );
-}
-
-//-------------------------------------------------------------------
-
IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
{
// notify the start of scrolling, if not already scrolling
diff --git a/unusedcode.easy b/unusedcode.easy
index 8e819c0..946e677 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -734,8 +734,6 @@ dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&)
dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent const&)
dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&)
dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdbc::SQLWarning const&)
-dbtools::StatementComposer::getDisposeComposer() const
-dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, unsigned char)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
dp_misc::TRACE(rtl::OString const&)
dp_misc::writeConsoleError(rtl::OString const&)
@@ -765,9 +763,6 @@ oox::xls::CondFormatRule::importCfRule(oox::xls::BiffInputStream&, int)
oox::xls::DefinedNameBase::extractReference(com::sun::star::uno::Sequence<com::sun::star::sheet::FormulaToken> const&)
oox::xls::ExternalLink::getCalcSheetIndex(int) const
oox::xls::ExternalLink::parseBiffTargetUrl(rtl::OUString const&)
-oox::xls::FontPortionModelList::importPortions(oox::xls::BiffInputStream&, bool)
-oox::xls::PhoneticPortionModelList::importPortions(oox::xls::BiffInputStream&, int)
-oox::xls::PivotTable::importFields(std::__debug::vector<int, std::allocator<int> >&, oox::xls::BiffInputStream&, int)
oox::xls::RefSheetsModel::readBiff8Data(oox::xls::BiffInputStream&)
psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
commit 3f7048446185b59cd5ddf04a4f08ab10481e3ac7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 16 08:48:53 2012 +0100
catch by const reference
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index d5c1db3..dab7109 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -277,7 +277,7 @@ OUString VbaModule::readSourceCode( StorageBase& rVbaStrg, const Reference< XNam
KeyEvent aKeyEvent = ooo::vba::parseKeyEvent( sApiKey );
ooo::vba::applyShortCutKeyBinding( mxDocModel, aKeyEvent, sProc );
}
- catch( Exception& )
+ catch (const Exception&)
{
}
}
@@ -393,7 +393,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
{
aModuleInfo.ModuleObject.set( rxDocObjectNA->getByName( maName ), UNO_QUERY );
}
- catch(const Exception& )
+ catch (const Exception&)
{
}
break;
@@ -427,7 +427,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
Reference< XVBAModuleInfo > xVBAModuleInfo( rxBasicLib, UNO_QUERY_THROW );
xVBAModuleInfo->insertModuleInfo( maName, aModuleInfo );
}
- catch(const Exception& )
+ catch (const Exception&)
{
}
@@ -436,7 +436,7 @@ void VbaModule::createModule( const OUString& rVBASourceCode,
{
rxBasicLib->insertByName( maName, Any( aSourceCode.makeStringAndClear() ) );
}
- catch(const Exception& )
+ catch (const Exception&)
{
OSL_FAIL( "VbaModule::createModule - cannot insert module into library" );
}
commit 30cdbe09943f2ca6ee5025315596daab6b28998f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 16 07:58:54 2012 +0100
hard to tell what side-effects dbtools::StatementComposer::getQuery might have
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index ed99818..91baa42 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1332,6 +1332,8 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere
if ( bApplyFilter )
aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) );
+ aComposer.getQuery();
+
xComposer = aComposer.getComposer();
aComposer.setDisposeComposer( false );
}
commit 437c4984dbffbc531e1eeddf9c3b8f415f404c59
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 16 07:50:35 2012 +0100
upgrade GetValueTextByPos family to rtl::OUString
diff --git a/editeng/inc/editeng/adjitem.hxx b/editeng/inc/editeng/adjitem.hxx
index b643387..b4a73ec 100644
--- a/editeng/inc/editeng/adjitem.hxx
+++ b/editeng/inc/editeng/adjitem.hxx
@@ -78,14 +78,14 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_uInt16 GetValueCount() const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetEnumValue() const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
inline void SetOneWord( const SvxAdjust eType )
{
diff --git a/editeng/inc/editeng/brkitem.hxx b/editeng/inc/editeng/brkitem.hxx
index 0111185..4e8f6ef 100644
--- a/editeng/inc/editeng/brkitem.hxx
+++ b/editeng/inc/editeng/brkitem.hxx
@@ -67,13 +67,13 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const;
// MS VC4.0 messes things up
void SetValue( sal_uInt16 nNewVal )
diff --git a/editeng/inc/editeng/charreliefitem.hxx b/editeng/inc/editeng/charreliefitem.hxx
index 93813e8..4a276b2 100644
--- a/editeng/inc/editeng/charreliefitem.hxx
+++ b/editeng/inc/editeng/charreliefitem.hxx
@@ -53,10 +53,10 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const;
- virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/cmapitem.hxx b/editeng/inc/editeng/cmapitem.hxx
index da4803e..51d52e9 100644
--- a/editeng/inc/editeng/cmapitem.hxx
+++ b/editeng/inc/editeng/cmapitem.hxx
@@ -64,8 +64,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
// MS VC4.0 kommt durcheinander
void SetValue( sal_uInt16 nNewVal )
diff --git a/editeng/inc/editeng/crsditem.hxx b/editeng/inc/editeng/crsditem.hxx
index af13f41..ca8bf58 100644
--- a/editeng/inc/editeng/crsditem.hxx
+++ b/editeng/inc/editeng/crsditem.hxx
@@ -63,7 +63,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
diff --git a/editeng/inc/editeng/eerdll.hxx b/editeng/inc/editeng/eerdll.hxx
index 00094cf..de50d7b 100644
--- a/editeng/inc/editeng/eerdll.hxx
+++ b/editeng/inc/editeng/eerdll.hxx
@@ -57,7 +57,7 @@ public:
#define EE_DLL() EditDLL::Get()
-#define EE_RESSTR(x) String( EditResId(x) )
+#define EE_RESSTR(x) ResId::toString(EditResId(x))
#endif //_EERDLL_HXX
diff --git a/editeng/inc/editeng/escpitem.hxx b/editeng/inc/editeng/escpitem.hxx
index 070eb83..f14f15c 100644
--- a/editeng/inc/editeng/escpitem.hxx
+++ b/editeng/inc/editeng/escpitem.hxx
@@ -105,9 +105,9 @@ public:
return *this;
}
- virtual sal_uInt16 GetValueCount() const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetEnumValue() const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal );
};
diff --git a/editeng/inc/editeng/lspcitem.hxx b/editeng/inc/editeng/lspcitem.hxx
index ff57b83..056415a 100644
--- a/editeng/inc/editeng/lspcitem.hxx
+++ b/editeng/inc/editeng/lspcitem.hxx
@@ -111,9 +111,9 @@ public:
inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; }
inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; }
- virtual sal_uInt16 GetValueCount() const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetEnumValue() const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal );
};
diff --git a/editeng/inc/editeng/postitem.hxx b/editeng/inc/editeng/postitem.hxx
index bdf6846..fbea62b 100644
--- a/editeng/inc/editeng/postitem.hxx
+++ b/editeng/inc/editeng/postitem.hxx
@@ -64,14 +64,14 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual int HasBoolValue() const;
- virtual sal_Bool GetBoolValue() const;
+ virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
inline SvxPostureItem& operator=(const SvxPostureItem& rPost) {
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 99c9aba..c4cf639 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -94,9 +94,9 @@ public:
// Calculate width of the shadow on the page.
sal_uInt16 CalcShadowSpace( sal_uInt16 nShadow ) const;
- virtual sal_uInt16 GetValueCount() const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetEnumValue() const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetEnumValue() const;
virtual void SetEnumValue( sal_uInt16 nNewVal );
};
diff --git a/editeng/inc/editeng/udlnitem.hxx b/editeng/inc/editeng/udlnitem.hxx
index 29a7370..cd81d73 100644
--- a/editeng/inc/editeng/udlnitem.hxx
+++ b/editeng/inc/editeng/udlnitem.hxx
@@ -63,8 +63,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
@@ -73,7 +73,7 @@ public:
void SetValue( sal_uInt16 nNewVal )
{SfxEnumItem::SetValue(nNewVal); }
virtual int HasBoolValue() const;
- virtual sal_Bool GetBoolValue() const;
+ virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
virtual int operator==( const SfxPoolItem& ) const;
@@ -109,7 +109,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
};
// class SvxOverlineItem ------------------------------------------------
@@ -126,7 +126,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
};
#endif // #ifndef _SVX_UDLNITEM_HXX
diff --git a/editeng/inc/editeng/wghtitem.hxx b/editeng/inc/editeng/wghtitem.hxx
index 8b9fdda..f3978f8 100644
--- a/editeng/inc/editeng/wghtitem.hxx
+++ b/editeng/inc/editeng/wghtitem.hxx
@@ -64,14 +64,14 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const;
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
- virtual sal_uInt16 GetValueCount() const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual int HasBoolValue() const;
- virtual sal_Bool GetBoolValue() const;
+ virtual sal_Bool GetBoolValue() const;
virtual void SetBoolValue( sal_Bool bVal );
inline SvxWeightItem& operator=(const SvxWeightItem& rWeight) {
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3410fba..3868601 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2472,7 +2472,7 @@ void EditEngine::ParagraphHeightChanged( sal_uInt16 nPara )
XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
{
DBG_CHKTHIS( EditEngine, 0 );
- XubString aComment;
+ rtl::OUString aComment;
switch ( nId )
{
case EDITUNDO_REMOVECHARS:
@@ -2481,12 +2481,12 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
case EDITUNDO_DELCONTENT:
case EDITUNDO_DELETE:
case EDITUNDO_CUT:
- aComment = XubString( EditResId( RID_EDITUNDO_DEL ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_DEL);
break;
case EDITUNDO_MOVEPARAGRAPHS:
case EDITUNDO_MOVEPARAS:
case EDITUNDO_DRAGANDDROP:
- aComment = XubString( EditResId( RID_EDITUNDO_MOVE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_MOVE);
break;
case EDITUNDO_INSERTFEATURE:
case EDITUNDO_SPLITPARA:
@@ -2494,29 +2494,29 @@ XubString EditEngine::GetUndoComment( sal_uInt16 nId ) const
case EDITUNDO_PASTE:
case EDITUNDO_INSERT:
case EDITUNDO_READ:
- aComment = XubString( EditResId( RID_EDITUNDO_INSERT ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_INSERT);
break;
case EDITUNDO_SRCHANDREPL:
case EDITUNDO_REPLACEALL:
- aComment = XubString( EditResId( RID_EDITUNDO_REPLACE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_REPLACE);
break;
case EDITUNDO_ATTRIBS:
case EDITUNDO_PARAATTRIBS:
case EDITUNDO_STRETCH:
- aComment = XubString( EditResId( RID_EDITUNDO_SETATTRIBS ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_SETATTRIBS);
break;
case EDITUNDO_RESETATTRIBS:
- aComment = XubString( EditResId( RID_EDITUNDO_RESETATTRIBS ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_RESETATTRIBS);
break;
case EDITUNDO_STYLESHEET:
- aComment = XubString( EditResId( RID_EDITUNDO_SETSTYLE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_SETSTYLE);
break;
case EDITUNDO_TRANSLITERATE:
- aComment = XubString( EditResId( RID_EDITUNDO_TRANSLITERATE ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_TRANSLITERATE);
break;
case EDITUNDO_INDENTBLOCK:
case EDITUNDO_UNINDENTBLOCK:
- aComment = XubString( EditResId( RID_EDITUNDO_INDENT ) );
+ aComment = EE_RESSTR(RID_EDITUNDO_INDENT);
break;
}
return aComment;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3cca643..efdcadb 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1527,10 +1527,10 @@ sal_uInt16 SvxShadowItem::GetValueCount() const
// -----------------------------------------------------------------------
-XubString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_SHADOW_END, "enum overflow!" );
- return XubString( EditResId( RID_SVXITEMS_SHADOW_BEGIN + nPos ) );
+ return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos );
}
// -----------------------------------------------------------------------
@@ -2926,11 +2926,10 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
- XubString aStr( EditResId( RID_SVXITEMS_BREAK_BEGIN + nPos ) );
- return aStr;
+ return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
}
// -----------------------------------------------------------------------
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index b1ab1fd..b03ce0d 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -316,16 +316,24 @@ sal_uInt16 SvxLineSpacingItem::GetValueCount() const
// -----------------------------------------------------------------------
-XubString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
//! load strings from resource
- XubString aText;
+ rtl::OUString aText;
switch ( nPos )
{
- case SVX_LINESPACE_USER : aText.AppendAscii( "User" ); break;
- case SVX_LINESPACE_ONE_LINE : aText.AppendAscii( "One line" ); break;
- case SVX_LINESPACE_ONE_POINT_FIVE_LINES : aText.AppendAscii( "1.5 line" ); break;
- case SVX_LINESPACE_TWO_LINES : aText.AppendAscii( "Two lines" ); break;
+ case SVX_LINESPACE_USER:
+ aText = "User";
+ break;
+ case SVX_LINESPACE_ONE_LINE:
+ aText = "One line";
+ break;
+ case SVX_LINESPACE_ONE_POINT_FIVE_LINES:
+ aText = "1.5 line";
+ break;
+ case SVX_LINESPACE_TWO_LINES:
+ aText = "Two lines";
+ break;
}
return aText;
}
@@ -472,7 +480,7 @@ sal_uInt16 SvxAdjustItem::GetValueCount() const
// -----------------------------------------------------------------------
-XubString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)SVX_ADJUST_BLOCKLINE, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
@@ -889,17 +897,17 @@ XubString SvxTabStop::GetValueString() const
aStr += sal_Unicode( '(' );
aStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nTabPos));
aStr += cpDelim;
- aStr += XubString( EditResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment ) );
+ aStr += EE_RESSTR(RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment);
aStr += cpDelim;
aStr += sal_Unicode('[');
- aStr += XubString( EditResId( RID_SVXITEMS_TAB_DECIMAL_CHAR ) );
+ aStr += EE_RESSTR(RID_SVXITEMS_TAB_DECIMAL_CHAR);
aStr += GetDecimal();
aStr += sal_Unicode(']');
aStr += cpDelim;
aStr += cpDelim;
aStr += sal_Unicode('[');
- aStr += XubString( EditResId( RID_SVXITEMS_TAB_FILL_CHAR ) );
+ aStr += EE_RESSTR(RID_SVXITEMS_TAB_FILL_CHAR);
aStr += cFill;
aStr += sal_Unicode(']');
aStr += sal_Unicode(')');
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index fcc8275..8aeacae 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -547,11 +547,10 @@ SfxItemPresentation SvxPostureItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
- XubString sTxt;
FontItalic eItalic = (FontItalic)nPos;
sal_uInt16 nId = 0;
@@ -563,9 +562,7 @@ XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
default: ;//prevent warning
}
- if ( nId )
- sTxt = EditResId( nId );
- return sTxt;
+ return nId ? EE_RESSTR(nId) : rtl::OUString();
}
bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -715,10 +712,10 @@ SfxItemPresentation SvxWeightItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
- return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
+ return EE_RESSTR(RID_SVXITEMS_WEIGHT_BEGIN + nPos);
}
bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1376,10 +1373,10 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
+rtl::OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
{
OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
- return XubString();
+ return rtl::OUString();
}
bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1478,10 +1475,10 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
// -----------------------------------------------------------------------
-XubString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
- return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
+ return EE_RESSTR(RID_SVXITEMS_UL_BEGIN + nPos);
}
// class SvxOverlineItem ------------------------------------------------
@@ -1511,10 +1508,10 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
// -----------------------------------------------------------------------
-XubString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
- return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
+ return EE_RESSTR(RID_SVXITEMS_OL_BEGIN + nPos);
}
// class SvxCrossedOutItem -----------------------------------------------
@@ -1602,10 +1599,10 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
- return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
+ return EE_RESSTR(RID_SVXITEMS_STRIKEOUT_BEGIN + nPos);
}
bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -2298,10 +2295,10 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
- return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
+ return EE_RESSTR(RID_SVXITEMS_CASEMAP_BEGIN + nPos);
}
bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
@@ -2456,7 +2453,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
@@ -3407,11 +3404,11 @@ sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
-String SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
"enum overflow" );
- return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
+ return EE_RESSTR(RID_SVXITEMS_RELIEF_BEGIN + nPos);
}
sal_uInt16 SvxCharReliefItem::GetValueCount() const
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index b42802b..5d2f5f6 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -137,19 +137,19 @@ XubString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
switch( nUndoId )
{
case OLUNDO_DEPTH:
- return XubString( EditResId( RID_OUTLUNDO_DEPTH ));
+ return EE_RESSTR(RID_OUTLUNDO_DEPTH);
case OLUNDO_EXPAND:
- return XubString( EditResId( RID_OUTLUNDO_EXPAND ));
+ return EE_RESSTR(RID_OUTLUNDO_EXPAND);
case OLUNDO_COLLAPSE:
- return XubString( EditResId( RID_OUTLUNDO_COLLAPSE ));
+ return EE_RESSTR(RID_OUTLUNDO_COLLAPSE);
case OLUNDO_ATTR:
- return XubString( EditResId( RID_OUTLUNDO_ATTR ));
+ return EE_RESSTR(RID_OUTLUNDO_ATTR);
case OLUNDO_INSERT:
- return XubString( EditResId( RID_OUTLUNDO_INSERT ));
+ return EE_RESSTR(RID_OUTLUNDO_INSERT);
default:
return EditEngine::GetUndoComment( nUndoId );
diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 7878112..d0f8b9f 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/svl/inc/svl/aeitem.hxx
@@ -53,17 +53,17 @@ public:
~SfxAllEnumItem();
void InsertValue( sal_uInt16 nValue );
- void InsertValue( sal_uInt16 nValue, const XubString &rText );
+ void InsertValue( sal_uInt16 nValue, const rtl::OUString &rText );
void RemoveValue( sal_uInt16 nValue );
- sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const;
+ sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const;
- virtual sal_uInt16 GetValueCount() const;
- virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const;
- virtual XubString GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const;
- virtual sal_Bool IsEnabled( sal_uInt16 ) const;
+ virtual sal_Bool IsEnabled( sal_uInt16 ) const;
void DisableValue( sal_uInt16 );
};
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 0b710b9..e2ff0e2 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -61,7 +61,7 @@ public:
virtual sal_uInt16 GetValueCount() const = 0;
- virtual XubString GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual sal_uInt16 GetValueByPos(sal_uInt16 nPos) const;
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 6688654..5f66cbf 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -43,7 +43,7 @@ TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
struct SfxAllEnumValue_Impl
{
sal_uInt16 nValue;
- XubString aText;
+ rtl::OUString aText;
};
SV_DECL_PTRARR_DEL(SfxAllEnumValueArr, SfxAllEnumValue_Impl*, 0)
@@ -139,7 +139,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const
// -----------------------------------------------------------------------
-XubString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
+rtl::OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_CHKTHIS(SfxAllEnumItem, 0);
DBG_ASSERT( pValues && nPos < pValues->Count(), "enum overflow" );
@@ -219,7 +219,7 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
// -----------------------------------------------------------------------
-void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const XubString &rValue )
+void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const rtl::OUString &rValue )
{
DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
@@ -242,7 +242,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
pVal->nValue = nValue;
- pVal->aText = XubString::CreateFromInt32( nValue );
+ pVal->aText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue));
const SfxAllEnumValue_Impl *pTemp = pVal;
if ( !pValues )
pValues = new SfxAllEnumValueArr;
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 9d91e03..802f81d 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -91,10 +91,10 @@ bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
}
//============================================================================
-XubString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const
+rtl::OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const
{
DBG_WARNING("SfxEnumItemInterface::GetValueTextByPos(): Pure virtual");
- return XubString();
+ return rtl::OUString();
}
//============================================================================
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index eeb2834..62a1228 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -52,7 +52,7 @@ public:
virtual sal_uInt16 GetValueCount() const;
GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); }
- virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
+ virtual rtl::OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 1fa7e5b..da7c0ac 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -54,7 +54,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index a0b9dc3..32dde14 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -55,7 +55,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
@@ -82,7 +82,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index a2b42df..99fef77 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -97,7 +97,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index 9af3cf6..6ab9ce9 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -64,7 +64,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
virtual int HasBoolValue() const;
virtual sal_Bool GetBoolValue() const;
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index 870b700..3cdce60 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -49,7 +49,7 @@ public:
virtual sal_uInt16 GetValueCount() const; // { return 3; }
SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); }
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index 1d7ab20..989fa20 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -49,7 +49,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index ae59c32..fa154c2 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -46,7 +46,7 @@ public:
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); }
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index c570f62..0503bf1 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -52,7 +52,7 @@ public:
SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index b26fde1..2d8564d 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -49,7 +49,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index 83b145d..0482f88 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -51,7 +51,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
@@ -71,7 +71,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index 5988d6e..6451744 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -48,7 +48,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(sal_uInt16 nPos) const;
+ virtual rtl::OUString GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index d2728f5..200b60d 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -995,7 +995,7 @@ SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; }
-XubString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
}
@@ -1022,7 +1022,7 @@ SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co
sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; }
-XubString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
}
@@ -1054,7 +1054,7 @@ SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/
sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
-XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
}
@@ -1112,7 +1112,7 @@ SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; }
-XubString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
}
@@ -1162,7 +1162,7 @@ SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c
sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
-XubString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
}
@@ -1212,7 +1212,7 @@ SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; }
-XubString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
}
@@ -1261,7 +1261,7 @@ SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; }
-XubString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
}
@@ -1617,7 +1617,7 @@ SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; }
-XubString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
}
@@ -1807,7 +1807,7 @@ SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; }
-XubString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
}
@@ -1856,7 +1856,7 @@ SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
-XubString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
}
@@ -1905,7 +1905,7 @@ SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
-XubString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
}
@@ -1954,12 +1954,12 @@ SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; }
-XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
{
XubString aRetval;
if((FieldUnit)nPos == FUNIT_NONE)
- aRetval += UniString(RTL_CONSTASCII_USTRINGPARAM("default"));
+ aRetval = rtl::OUString("default");
else
SdrFormatter::TakeUnitStr((FieldUnit)nPos, aRetval);
@@ -2008,7 +2008,7 @@ SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const {
sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; }
-XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
}
@@ -2250,30 +2250,30 @@ sal_uInt16 SdrGrafModeItem::GetValueCount() const
return 4;
}
-XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
+rtl::OUString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
- XubString aStr;
+ rtl::OUString aStr;
switch(nPos)
{
case 1:
{
- aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Greys"));
+ aStr = "Greys";
break;
}
case 2:
{
- aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Black/White"));
+ aStr = "Black/White";
break;
}
case 3:
{
- aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Watermark"));
+ aStr = "Watermark";
break;
}
default:
{
- aStr += UniString(RTL_CONSTASCII_USTRINGPARAM("Standard"));
+ aStr = "Standard";
break;
}
}
commit 2c676c03f3e09c12b8524f2a803374b9f68b2c83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 15 23:46:14 2012 +0100
String->rtl::OUString
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index e9ee57d..6ab4cb4 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -1766,14 +1766,13 @@ long SfxOrganizeDlg_Impl::Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu )
{
if(0 == pFocusBox->GetModel()->GetDepth(pEntry))
{
- const String aNoName( SfxResId(STR_NONAME) );
+ const rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME)));
SvLBoxEntry* pParent = pFocusBox->GetParent(pEntry);
- String aName(aNoName);
- sal_uInt16 n = 1;
+ rtl::OUString aName(aNoName);
+ sal_Int32 n = 1;
while(!pFocusBox->IsUniqName_Impl(aName, pParent))
{
- aName = aNoName;
- aName += String::CreateFromInt32( n++ );
+ aName = aNoName + rtl::OUString::valueOf(n++);
}
aMgr.InsertDir( pFocusBox, aName,
(sal_uInt16)pFocusBox->GetModel()->GetRelPos(pEntry)+1);
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 8c64f35..b7c8c51 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -869,10 +869,12 @@ String SfxObjectShell::GetTitle
return X(pImp->aTitle);
// must it be numbered?
- String aNoName( SfxResId( STR_NONAME ) );
- if ( pImp->bIsNamedVisible )
+ rtl::OUString aNoName(ResId::toString(SfxResId(STR_NONAME)));
+ if (pImp->bIsNamedVisible)
+ {
// Append number
- aNoName += String::CreateFromInt32( pImp->nVisualDocumentNumber );
+ aNoName += rtl::OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber));
+ }
// Document called "noname" for the time being
return X(aNoName);
commit b046b108c3b50027846eed32f17b0d74cf9fa135
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 15 23:33:05 2012 +0100
unused inlines
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index af4f8e4..3f77269 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -173,12 +173,6 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList
return rStrm;
}
-inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRangeList& orRanges )
-{
- orRanges.read( rStrm );
- return rStrm;
-}
-
// ============================================================================
/** Different target types that can be encoded in a BIFF URL. */
commit 919a50e3bce9695c0e0a40af674372e05afdade1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 15 23:25:46 2012 +0100
_bUseRowSetFilter and _bUseRowSetOrder are always true
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index ab8f9c8..ed99818 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1302,8 +1302,7 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
}
//------------------------------------------------------------------------------
-Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory,
- sal_Bool _bUseRowSetFilter, sal_Bool _bUseRowSetOrder )
+Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory )
SAL_THROW( ( SQLException ) )
{
Reference< XSingleSelectQueryComposer > xComposer;
@@ -1325,17 +1324,13 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere
StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing );
// append sort
- if ( _bUseRowSetOrder )
- aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) );
+ aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Order" )) ) ) );
// append filter
- if ( _bUseRowSetFilter )
- {
- sal_Bool bApplyFilter = sal_True;
- _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter;
- if ( bApplyFilter )
- aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) );
- }
+ sal_Bool bApplyFilter = sal_True;
+ _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" )) ) >>= bApplyFilter;
+ if ( bApplyFilter )
+ aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) );
xComposer = aComposer.getComposer();
aComposer.setDisposeComposer( false );
@@ -1361,7 +1356,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
Reference< XSingleSelectQueryComposer > xReturn;
try
{
- xReturn = getComposedRowSetStatement( _rxRowSetProps, _rxFactory, sal_True, sal_True );
+ xReturn = getComposedRowSetStatement( _rxRowSetProps, _rxFactory );
}
catch( const SQLException& )
{
commit b50405ef3435902451cfe09e5bf7c149d17a84ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 15 23:23:48 2012 +0100
simplify getComposedRowSetStatement
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 6b5c891..ab8f9c8 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1302,11 +1302,11 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
}
//------------------------------------------------------------------------------
-::rtl::OUString getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory,
- sal_Bool _bUseRowSetFilter, sal_Bool _bUseRowSetOrder, Reference< XSingleSelectQueryComposer >* _pxComposer )
+Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory,
+ sal_Bool _bUseRowSetFilter, sal_Bool _bUseRowSetOrder )
SAL_THROW( ( SQLException ) )
{
- ::rtl::OUString sStatement;
+ Reference< XSingleSelectQueryComposer > xComposer;
try
{
Reference< XConnection> xConn = connectRowset( Reference< XRowSet >( _rxRowSet, UNO_QUERY ), _rxFactory, sal_True );
@@ -1337,13 +1337,8 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Filter" )) ) ) );
}
- sStatement = aComposer.getQuery();
-
- if ( _pxComposer )
- {
- *_pxComposer = aComposer.getComposer();
- aComposer.setDisposeComposer( false );
- }
+ xComposer = aComposer.getComposer();
+ aComposer.setDisposeComposer( false );
}
}
catch( const SQLException& )
@@ -1355,7 +1350,7 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
DBG_UNHANDLED_EXCEPTION();
}
- return sStatement;
+ return xComposer;
}
//------------------------------------------------------------------------------
@@ -1366,7 +1361,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
Reference< XSingleSelectQueryComposer > xReturn;
try
{
- getComposedRowSetStatement( _rxRowSetProps, _rxFactory, sal_True, sal_True, &xReturn );
+ xReturn = getComposedRowSetStatement( _rxRowSetProps, _rxFactory, sal_True, sal_True );
}
catch( const SQLException& )
{
commit b5dbfd61f05359b9342fad9f5c623a4f0b771493
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 15 23:20:14 2012 +0100
callcatcher: update unused code
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 24f39cb..ff11b00 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -426,29 +426,6 @@ namespace dbtools
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>()
);
- /** returns the statement which is composed from the current settings of a row set
-
- If the row set is currently not connected, it is attempted to do so with it's current settings.
- (TODO: isn't this a resource leak? Do we really need this behaviour?).
-
- @param _rxRowSet
- the row set whose settings should be examined. Must not be <NULL/>
- @param _rxFactory
- a service factory which may be needed to connect the row set
- @param _bUseRowSetFilter
- If <TRUE/>, the <b>Filter</b> property of the row set will also be examined. In case it is
- not empty, and <b>ApplyFilter</b> is <TRUE/>, it will also be added to the composed statement.
- @param _bUseRowSetOrder
- If <TRUE/>, the <b>Order</b> property of the row set will also be examined. In case it is
- not empty, it will also be added to the composed statement.
- */
- OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getComposedRowSetStatement(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRowSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
- sal_Bool _bUseRowSetFilter = sal_True,
- sal_Bool _bUseRowSetOrder = sal_True
- ) SAL_THROW( ( ::com::sun::star::sdbc::SQLException ) );
-
/** create an <type scope="com::sun::star::sdb">XSingleSelectQueryComposer</type> which represents
the current settings (Command/CommandType/Filter/Order) of the given rowset.
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index a4aeb56..6b5c891 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1359,14 +1359,6 @@ Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
}
//------------------------------------------------------------------------------
-::rtl::OUString getComposedRowSetStatement(
- const Reference< XPropertySet >& _rxRowSet, const Reference< XMultiServiceFactory>& _rxFactory,
- sal_Bool _bUseRowSetFilter, sal_Bool _bUseRowSetOrder )
-{
- return getComposedRowSetStatement( _rxRowSet, _rxFactory, _bUseRowSetFilter, _bUseRowSetOrder, NULL );
-}
-
-//------------------------------------------------------------------------------
Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
const Reference< XPropertySet>& _rxRowSetProps,
const Reference< XMultiServiceFactory>& _rxFactory)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 10995ef..83aa0a9 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -377,9 +377,6 @@ public:
static void appendAddrCol( ::rtl::OUStringBuffer& rStr, sal_Int32 nCol, bool bRel );
static void appendAddrRow( ::rtl::OUStringBuffer& rStr, sal_Int32 nRow, bool bRel );
- static void appendAddrName( ::rtl::OUStringBuffer& rStr, sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel );
-
- static void appendAddress( ::rtl::OUStringBuffer& rStr, const Address& rPos );
// encoded text output ----------------------------------------------------
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index d7cc27d..dea3445 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -485,25 +485,6 @@ void StringHelper::appendAddrRow( OUStringBuffer& rStr, sal_Int32 nRow, bool bRe
appendDec( rStr, nRow + 1 );
}
-void StringHelper::appendAddrName( OUStringBuffer& rStr, sal_Unicode cPrefix, sal_Int32 nColRow, bool bRel )
-{
- rStr.append( cPrefix );
- if( bRel && (nColRow != 0) )
- {
- rStr.append( OOX_DUMP_R1C1OPEN );
- appendDec( rStr, nColRow );
- rStr.append( OOX_DUMP_R1C1CLOSE );
- }
- else if( !bRel )
- appendDec( rStr, nColRow + 1 );
-}
-
-void StringHelper::appendAddress( OUStringBuffer& rStr, const Address& rPos )
-{
- appendAddrCol( rStr, rPos.mnCol, true );
- appendAddrRow( rStr, rPos.mnRow, true );
-}
-
// encoded text output --------------------------------------------------------
void StringHelper::appendCChar( OUStringBuffer& rStr, sal_Unicode cChar, bool bPrefix )
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx
index 0354e31..af4f8e4 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -163,7 +163,6 @@ public:
inline explicit BinRangeList() {}
void read( SequenceInputStream& rStrm );
- void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false );
};
// ----------------------------------------------------------------------------
diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index 704df9f..6b1631c 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -94,9 +94,6 @@ typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef;
/** Decodes BIFF stream contents that are encoded using the old XOR algorithm. */
class BiffDecoder_XOR : public BiffDecoderBase
{
-public:
- explicit BiffDecoder_XOR( sal_uInt16 nKey, sal_uInt16 nHash );
-
private:
/** Copy constructor for cloning. */
BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder );
@@ -128,12 +125,6 @@ private:
/** Decodes BIFF stream contents that are encoded using the RC4 algorithm. */
class BiffDecoder_RCF : public BiffDecoderBase
{
-public:
- explicit BiffDecoder_RCF(
- sal_uInt8 pnSalt[ 16 ],
- sal_uInt8 pnVerifier[ 16 ],
- sal_uInt8 pnVerifierHash[ 16 ] );
-
private:
/** Copy constructor for cloning. */
BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder );
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 50dba76..4325068 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -130,11 +130,6 @@ public:
/** Imports a web query table identifier from the PCITEM_MISSING, PCITEM_STRING, or PCITEM_INDEX record. */
void importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId );
- /** Imports connection settings from the DBQUERY record. */
- void importDbQuery( BiffInputStream& rStrm );
- /** Imports connection settings from the QUERYTABLESETTINGS record. */
- void importQueryTableSettings( BiffInputStream& rStrm );
-
/** Returns the unique connection identifier. */
inline sal_Int32 getConnectionId() const { return maModel.mnId; }
/** Returns the source data type of the connection. */
@@ -157,8 +152,6 @@ public:
/** Creates a new empty connection. */
Connection& createConnection();
- /** Creates a new empty connection with a valid but unused identifier. */
- Connection& createConnectionWithId();
/** Maps all connections by their identifier. */
void finalizeImport();
diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index 4c47693..339d1b5 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -102,8 +102,6 @@ public:
void setCellPos( sal_Int32 nElement, sal_Int32 nParentContext, const ::rtl::OUString& rValue );
/** Imports the client anchor settings from a VML element. */
void importVmlAnchor( const ::rtl::OUString& rAnchor );
- /** Imports the client anchor settings from a BIFF or DFF stream. */
- void importBiffAnchor( BinaryInputStream& rStrm );
/** Calculates the resulting shape anchor in EMUs. */
::oox::drawingml::EmuRectangle calcAnchorRectEmu(
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index c10c5b6..e0a80ce 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -202,22 +202,6 @@ private:
// ============================================================================
-/** A placeholder object for unknown/unsupported object types. */
-class BiffPlaceholderObject : public BiffDrawingObjectBase
-{
-public:
- explicit BiffPlaceholderObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-};
-
-// ============================================================================
-
/** A group object that is able to contain other child objects. */
class BiffGroupObject : public BiffDrawingObjectBase
{
@@ -246,36 +230,6 @@ protected:
sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group.
};
-// ============================================================================
-
-/** A simple line object. */
-class BiffLineObject : public BiffDrawingObjectBase
-{
-public:
- explicit BiffLineObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
- virtual void implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
- virtual void implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
- virtual void implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
-protected:
- BiffObjLineModel maLineModel; /// Line formatting.
- sal_uInt16 mnArrows; /// Line arrows.
- sal_uInt8 mnStartPoint; /// Starting point.
-};
-
-// ============================================================================
-
/** A simple rectangle object (used as base class for oval objects). */
class BiffRectObject : public BiffDrawingObjectBase
{
@@ -309,81 +263,6 @@ protected:
};
// ============================================================================
-
-/** A simple oval object. */
-class BiffOvalObject : public BiffRectObject
-{
-public:
- explicit BiffOvalObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-};
-
-// ============================================================================
-
-/** A simple arc object. */
-class BiffArcObject : public BiffDrawingObjectBase
-{
-public:
- explicit BiffArcObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
- virtual void implReadObjBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
- virtual void implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
- virtual void implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
-protected:
- BiffObjFillModel maFillModel; /// Fill formatting.
- BiffObjLineModel maLineModel; /// Line formatting.
- sal_uInt8 mnQuadrant; /// Visible quadrant of the circle.
-};
-
-// ============================================================================
-
-/** A simple polygon object. */
-class BiffPolygonObject : public BiffRectObject
-{
-public:
- explicit BiffPolygonObject( const WorksheetHelper& rHelper );
-
-protected:
- /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
- virtual void implReadObjBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
- virtual void implReadObjBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize );
-
- /** Creates the corresponding XShape and insert it into the passed container. */
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- implConvertAndInsert( BiffDrawingBase& rDrawing,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
-private:
- /** Reads the COORDLIST record following the OBJ record. */
- void importCoordList( BiffInputStream& rStrm );
-
-protected:
- typedef ::std::vector< ::com::sun::star::awt::Point > PointVector;
- PointVector maCoords; /// Coordinates relative to bounding rectangle.
- sal_uInt16 mnPolyFlags; /// Additional flags.
- sal_uInt16 mnPointCount; /// Polygon point count.
-};
-
-// ============================================================================
// BIFF drawing page
// ============================================================================
diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index 56e47fd..53f6bce 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -111,18 +111,6 @@ public:
// ----------------------------------------------------------------------------
-/** Context handler derived from the WorkbookHelper helper class.
-
- Used to import contexts in global workbook fragments.
- */
-class BiffWorkbookContextBase : public BiffContextHandler, public WorkbookHelper
-{
-protected:
- explicit BiffWorkbookContextBase( const WorkbookHelper& rHelper );
-};
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list