[Libreoffice-commits] .: 3 commits - oox/inc oox/source sc/source unusedcode.easy vcl/win
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Mar 20 06:48:41 PDT 2012
oox/inc/oox/dump/dumperbase.hxx | 7 --
oox/inc/oox/dump/oledumper.hxx | 5 -
oox/inc/oox/ole/vbacontrol.hxx | 2
oox/source/dump/dumperbase.cxx | 15 -----
oox/source/dump/oledumper.cxx | 7 --
oox/source/ole/vbacontrol.cxx | 5 -
sc/source/filter/inc/biffhelper.hxx | 4 -
sc/source/filter/inc/biffoutputstream.hxx | 8 ---
sc/source/filter/inc/drawingmanager.hxx | 6 --
sc/source/filter/inc/formulabase.hxx | 3 -
sc/source/filter/oox/biffhelper.cxx | 21 -------
sc/source/filter/oox/biffoutputstream.cxx | 14 -----
sc/source/filter/oox/drawingmanager.cxx | 79 ------------------------------
sc/source/filter/oox/formulabase.cxx | 9 ---
unusedcode.easy | 14 -----
vcl/win/source/gdi/winlayout.cxx | 4 +
16 files changed, 3 insertions(+), 200 deletions(-)
New commits:
commit da8034199e840092cd80d498b3cdb9d8a4c350f0
Author: Petr Vorel <petr.vorel at gmail.com>
Date: Tue Mar 20 13:33:56 2012 +0000
remove unused code (oox, sc)
diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx
index be8303f..5f390fa 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -607,8 +607,6 @@ public:
/** Converts the passed packed number to a double. */
static double calcDoubleFromRk( sal_Int32 nRkValue );
- /** Converts the passed double to a packed number, returns true on success. */
- static bool calcRkFromDouble( sal_Int32& ornRkValue, double fValue );
/** Converts the passed BIFF error to a double containing the respective Calc error code. */
static double calcDoubleFromError( sal_uInt8 nErrorCode );
@@ -616,8 +614,6 @@ public:
/** Returns a text encoding from an Windows code page.
@return The corresponding text encoding or RTL_TEXTENCODING_DONTKNOW. */
static rtl_TextEncoding calcTextEncodingFromCodePage( sal_uInt16 nCodePage );
- /** Returns a Windows code page from a text encoding. */
- static sal_uInt16 calcCodePageFromTextEncoding( rtl_TextEncoding eTextEnc );
// BIFF12 import ----------------------------------------------------------
diff --git a/sc/source/filter/inc/biffoutputstream.hxx b/sc/source/filter/inc/biffoutputstream.hxx
index 75440e1..a38bfdf 100644
--- a/sc/source/filter/inc/biffoutputstream.hxx
+++ b/sc/source/filter/inc/biffoutputstream.hxx
@@ -87,7 +87,6 @@ private:
8224 bytes in BIFF8).
To start writing a record, call startRecord() with the record identifier.
- Each record must be closed by calling endRecord().
If some data exceeds the record size limit, a CONTINUE record will be
started automatically and the new data will be written to this record. If
@@ -99,18 +98,11 @@ private:
class BiffOutputStream : public BinaryOutputStream
{
public:
- explicit BiffOutputStream(
- BinaryOutputStream& rOutStream,
- sal_uInt16 nMaxRecSize );
-
// record control ---------------------------------------------------------
/** Starts a new record. */
void startRecord( sal_uInt16 nRecId );
- /** Finishes the current record. Must be called for every started record. */
- void endRecord();
-
/** Sets size of data portion in bytes. 0 or 1 means no portions are used. */
void setPortionSize( sal_uInt8 nSize );
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index a7580a3..c597b03 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -125,8 +125,6 @@ public:
static BiffDrawingObjectRef importObjBiff4( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
/** Reads the BIFF5 OBJ record, returns a new drawing object. */
static BiffDrawingObjectRef importObjBiff5( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
- /** Reads the BIFF8 OBJ record, returns a new drawing object. */
- static BiffDrawingObjectRef importObjBiff8( const WorksheetHelper& rHelper, BiffInputStream& rStrm );
/** Sets whether this is an area object (then its width and height must be greater than 0). */
inline void setAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
@@ -452,10 +450,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape,
const ::com::sun::star::awt::Rectangle& rShapeRect ) = 0;
-protected:
- /** Appends a new drawing object to the list of raw objects (without DFF data). */
- void appendRawObject( const BiffDrawingObjectRef& rxDrawingObj );
-
private:
typedef RefMap< sal_uInt16, BiffDrawingObjectBase > BiffDrawingObjectMapById;
typedef ::std::vector< sal_uInt16 > BiffObjIdVector;
diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index d71249d..9ec1a98 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -212,20 +212,6 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm,
return aDecDbl.mfValue;
}
-/*static*/ bool BiffHelper::calcRkFromDouble( sal_Int32& ornRkValue, double fValue )
-{
- if( lclCalcRkFromDouble( ornRkValue, fValue ) )
- return true;
-
- if( lclCalcRkFromDouble( ornRkValue, fValue * 100 ) )
- {
- ornRkValue |= BIFF_RK_100FLAG;
- return true;
- }
-
- return false;
-}
-
/*static*/ double BiffHelper::calcDoubleFromError( sal_uInt8 nErrorCode )
{
sal_uInt16 nApiError = 0x7FFF;
@@ -261,13 +247,6 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm,
return eTextEnc;
}
-/*static*/ sal_uInt16 BiffHelper::calcCodePageFromTextEncoding( rtl_TextEncoding eTextEnc )
-{
- sal_uInt32 nCodePage = rtl_getWindowsCodePageFromTextEncoding( eTextEnc );
- OSL_ENSURE( (0 < nCodePage) && (nCodePage <= SAL_MAX_UINT16), "BiffHelper::calcCodePageFromTextEncoding - unknown text encoding" );
- return static_cast< sal_uInt16 >( (nCodePage == 0) ? 1252 : nCodePage );
-}
-
// BIFF12 import --------------------------------------------------------------
/*static*/ OUString BiffHelper::readString( SequenceInputStream& rStrm, bool b32BitLen, bool bAllowNulChars )
diff --git a/sc/source/filter/oox/biffoutputstream.cxx b/sc/source/filter/oox/biffoutputstream.cxx
index 88bded6..8914cf1 100644
--- a/sc/source/filter/oox/biffoutputstream.cxx
+++ b/sc/source/filter/oox/biffoutputstream.cxx
@@ -85,14 +85,6 @@ void BiffOutputRecordBuffer::fill( sal_uInt8 nValue, sal_uInt16 nBytes )
// ============================================================================
-BiffOutputStream::BiffOutputStream( BinaryOutputStream& rOutStream, sal_uInt16 nMaxRecSize ) :
- BinaryStreamBase( true ),
- maRecBuffer( rOutStream, nMaxRecSize ),
- mnPortionSize( 0 ),
- mnPortionPos( 0 )
-{
-}
-
// record control -------------------------------------------------------------
void BiffOutputStream::startRecord( sal_uInt16 nRecId )
@@ -101,12 +93,6 @@ void BiffOutputStream::startRecord( sal_uInt16 nRecId )
setPortionSize( 1 );
}
-void BiffOutputStream::endRecord()
-{
- setPortionSize( 1 );
- maRecBuffer.endRecord();
-}
-
void BiffOutputStream::setPortionSize( sal_uInt8 nSize )
{
OSL_ENSURE( mnPortionPos == 0, "BiffOutputStream::setPortionSize - block operation inside portion" );
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 5ba29e2..a1cfef9 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -389,69 +389,6 @@ BiffDrawingObjectBase::~BiffDrawingObjectBase()
return xDrawingObj;
}
-/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff8( const WorksheetHelper& rHelper, BiffInputStream& rStrm )
-{
- BiffDrawingObjectRef xDrawingObj;
-
- if( rStrm.getRemaining() >= 10 )
- {
- sal_uInt16 nSubRecId, nSubRecSize, nObjType;
- rStrm >> nSubRecId >> nSubRecSize >> nObjType;
- OSL_ENSURE( nSubRecId == BIFF_ID_OBJCMO, "BiffDrawingObjectBase::importObjBiff8 - OBJCMO subrecord expected" );
- if( (nSubRecId == BIFF_ID_OBJCMO) && (nSubRecSize >= 6) )
- {
- switch( nObjType )
- {
-#if 0
- // in BIFF8, all simple objects support text
- case BIFF_OBJTYPE_LINE:
- case BIFF_OBJTYPE_ARC:
- xDrawingObj.reset( new XclImpTextObj( rHelper ) );
- // lines and arcs may be 2-dimensional
- xDrawingObj->setAreaObj( false );
- break;
-
- // in BIFF8, all simple objects support text
- case BIFF_OBJTYPE_RECTANGLE:
- case BIFF_OBJTYPE_OVAL:
- case BIFF_OBJTYPE_POLYGON:
- case BIFF_OBJTYPE_DRAWING:
- case BIFF_OBJTYPE_TEXT:
- xDrawingObj.reset( new XclImpTextObj( rHelper ) );
- break;
-#endif
-
- case BIFF_OBJTYPE_GROUP: xDrawingObj.reset( new BiffGroupObject( rHelper ) ); break;
-#if 0
- case BIFF_OBJTYPE_CHART: xDrawingObj.reset( new XclImpChartObj( rHelper ) ); break;
- case BIFF_OBJTYPE_BUTTON: xDrawingObj.reset( new XclImpButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_PICTURE: xDrawingObj.reset( new XclImpPictureObj( rHelper ) ); break;
- case BIFF_OBJTYPE_CHECKBOX: xDrawingObj.reset( new XclImpCheckBoxObj( rHelper ) ); break;
- case BIFF_OBJTYPE_OPTIONBUTTON: xDrawingObj.reset( new XclImpOptionButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_EDIT: xDrawingObj.reset( new XclImpEditObj( rHelper ) ); break;
- case BIFF_OBJTYPE_LABEL: xDrawingObj.reset( new XclImpLabelObj( rHelper ) ); break;
- case BIFF_OBJTYPE_DIALOG: xDrawingObj.reset( new XclImpDialogObj( rHelper ) ); break;
- case BIFF_OBJTYPE_SPIN: xDrawingObj.reset( new XclImpSpinButtonObj( rHelper ) ); break;
- case BIFF_OBJTYPE_SCROLLBAR: xDrawingObj.reset( new XclImpScrollBarObj( rHelper ) ); break;
- case BIFF_OBJTYPE_LISTBOX: xDrawingObj.reset( new XclImpListBoxObj( rHelper ) ); break;
- case BIFF_OBJTYPE_GROUPBOX: xDrawingObj.reset( new XclImpGroupBoxObj( rHelper ) ); break;
- case BIFF_OBJTYPE_DROPDOWN: xDrawingObj.reset( new XclImpDropDownObj( rHelper ) ); break;
- case BIFF_OBJTYPE_NOTE: xDrawingObj.reset( new XclImpNoteObj( rHelper ) ); break;
-#endif
-
- default:
-#if 0
- OSL_ENSURE( false, "BiffDrawingObjectBase::importObjBiff8 - unknown object type" );
-#endif
- xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
- }
- }
- }
-
- xDrawingObj->importObjBiff8( rStrm );
- return xDrawingObj;
-}
-
Reference< XShape > BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase& rDrawing,
const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
{
@@ -1285,14 +1222,6 @@ void BiffDrawingBase::importObj( BiffInputStream& rStrm )
}
}
-void BiffDrawingBase::setSkipObj( sal_uInt16 nObjId )
-{
- /* Store identifiers of objects to be skipped in a separate list (the OBJ
- record may not be read yet). In the finalization phase, all objects
- registered here will be skipped. */
- maSkipObjs.push_back( nObjId );
-}
-
void BiffDrawingBase::finalizeImport()
{
Reference< XShapes > xShapes( mxDrawPage, UNO_QUERY );
@@ -1330,14 +1259,6 @@ Reference< XShape > BiffDrawingBase::createAndInsertXShape( const OUString& rSer
return xShape;
}
-// protected ------------------------------------------------------------------
-
-void BiffDrawingBase::appendRawObject( const BiffDrawingObjectRef& rxDrawingObj )
-{
- OSL_ENSURE( rxDrawingObj.get(), "BiffDrawingBase::appendRawObject - unexpected empty object reference" );
- maRawObjs.append( rxDrawingObj );
-}
-
// ============================================================================
BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :
diff --git a/unusedcode.easy b/unusedcode.easy
index d3f49cb..5998942 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -913,14 +913,7 @@ oox::formulaimport::XmlStream::skipElement(int)
oox::ole::WordVbaProjectFilter_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
oox::ole::WordVbaProjectFilter_getSupportedServiceNames()
oox::xls::BiffDetector_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
-oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
-oox::xls::BiffDrawingObjectBase::importObjBiff8(oox::xls::WorksheetHelper const&, oox::xls::BiffInputStream&)
-oox::xls::BiffHelper::calcCodePageFromTextEncoding(unsigned short)
-oox::xls::BiffHelper::calcRkFromDouble(int&, double)
oox::xls::BiffInputStream::resetRecord(bool, unsigned short)
-oox::xls::BiffOutputStream::BiffOutputStream(oox::BinaryOutputStream&, unsigned short)
-oox::xls::BiffOutputStream::endRecord()
oox::xls::BiffOutputStream::fill(unsigned char, int, unsigned long)
oox::xls::BiffOutputStream::sizeBase() const
oox::xls::BiffOutputStream::startRecord(unsigned short)
commit 04919d8f9c1c3372acecbb3716d6f557316eb3e5
Author: Petr Vorel <petr.vorel at gmail.com>
Date: Tue Mar 20 13:32:47 2012 +0000
remove unused code (oox, sc)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 7cba7ae..534776b 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -993,8 +993,6 @@ public:
inline const StorageRef& getRootStorage() const { return mxCfgData->getRootStorage(); }
inline const ::rtl::OUString& getSysFileName() const { return mxCfgData->getSysFileName(); }
- void setStringOption( const String& rKey, const String& rData );
-
const ::rtl::OUString& getStringOption( const String& rKey, const ::rtl::OUString& rDefault ) const;
bool getBoolOption( const String& rKey, bool bDefault ) const;
template< typename Type >
@@ -1005,7 +1003,6 @@ public:
template< typename ListType >
::boost::shared_ptr< ListType > createNameList( const String& rListName );
- void setNameList( const String& rListName, const NameListRef& rxList );
void eraseNameList( const String& rListName );
NameListRef getNameList( const String& rListName ) const;
@@ -1792,10 +1789,6 @@ public:
const BinaryInputStreamRef& rxStrm,
const ::rtl::OUString& rSysFileName );
- explicit BinaryStreamObject(
- const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxStrm );
-
protected:
void dumpBinaryStream( bool bShowOffset = true );
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 1a94e77..42abf2d 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -331,11 +331,6 @@ protected:
const String& rPropNameList,
bool b64BitPropFlags = false );
void construct(
- const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxStrm,
- const String& rPropNameList,
- bool b64BitPropFlags = false );
- void construct(
const InputObjectBase& rParent,
const String& rPropNameList,
bool b64BitPropFlags = false );
diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx
index 4647245..b4d2afb 100644
--- a/oox/inc/oox/ole/vbacontrol.hxx
+++ b/oox/inc/oox/ole/vbacontrol.hxx
@@ -65,8 +65,6 @@ public:
inline const AxPairData& getPosition() const { return maPos; }
/** Returns the unique identifier of this control. */
inline sal_Int32 getId() const { return mnId; }
- /** Returns true, if the control is visible. */
- bool isVisible() const;
/** Returns true, if this control is a container control. */
bool isContainer() const;
/** Returns the length of the stream data for stream based controls. */
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 54159b4..f078111 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1699,11 +1699,6 @@ void Config::construct( const sal_Char* pcEnvVar, const Reference< XComponentCon
mxCfgData.reset( new SharedConfigData( OUString::createFromAscii( pcFileName ), rxContext, rxRootStrg, rSysFileName, rMediaDesc ) );
}
-void Config::setStringOption( const String& rKey, const String& rData )
-{
- mxCfgData->setOption( rKey, rData );
-}
-
const OUString& Config::getStringOption( const String& rKey, const OUString& rDefault ) const
{
const OUString* pData = implGetOption( rKey );
@@ -1726,11 +1721,6 @@ bool Config::isImportEnabled() const
return getBoolOption( "enable-import", true );
}
-void Config::setNameList( const String& rListName, const NameListRef& rxList )
-{
- mxCfgData->setNameList( rListName, rxList );
-}
-
void Config::eraseNameList( const String& rListName )
{
mxCfgData->eraseNameList( rListName );
@@ -2837,11 +2827,6 @@ BinaryStreamObject::BinaryStreamObject( const ObjectBase& rParent, const BinaryI
InputObjectBase::construct( rParent, rxStrm, rSysFileName );
}
-BinaryStreamObject::BinaryStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm )
-{
- InputObjectBase::construct( rParent, rxStrm );
-}
-
void BinaryStreamObject::dumpBinaryStream( bool bShowOffset )
{
mxStrm->seekToStart();
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 8c5e5a0..bb3f115 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -1050,13 +1050,6 @@ void AxPropertyObjectBase::construct( const ObjectBase& rParent,
constructAxPropObj( rPropNameList, b64BitPropFlags );
}
-void AxPropertyObjectBase::construct( const OutputObjectBase& rParent,
- const BinaryInputStreamRef& rxStrm, const String& rPropNameList, bool b64BitPropFlags )
-{
- OleInputObjectBase::construct( rParent, rxStrm );
- constructAxPropObj( rPropNameList, b64BitPropFlags );
-}
-
void AxPropertyObjectBase::construct( const InputObjectBase& rParent,
const String& rPropNameList, bool b64BitPropFlags )
{
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 0a4b91b..14768e1 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -225,11 +225,6 @@ bool VbaSiteModel::importBinaryModel( BinaryInputStream& rInStrm )
return aReader.finalizeImport();
}
-bool VbaSiteModel::isVisible() const
-{
- return getFlag( mnFlags, VBA_SITE_VISIBLE );
-}
-
bool VbaSiteModel::isContainer() const
{
return !getFlag( mnFlags, VBA_SITE_OSTREAM );
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 0199d17..66ceccd 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -295,9 +295,6 @@ class ApiTokenIterator
{
public:
explicit ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 nSpacesOpCode, bool bSkipSpaces );
- /** Copy constructor that allows to change the skip spaces mode. */
- explicit ApiTokenIterator( const ApiTokenIterator& rIter, bool bSkipSpaces );
-
inline bool is() const { return mpToken != mpTokenEnd; }
inline const ApiToken* get() const { return mpToken; }
inline const ApiToken* operator->() const { return mpToken; }
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 276564e..934ff8c 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -184,15 +184,6 @@ ApiTokenIterator::ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 n
skipSpaces();
}
-ApiTokenIterator::ApiTokenIterator( const ApiTokenIterator& rIter, bool bSkipSpaces ) :
- mpToken( rIter.mpToken ),
- mpTokenEnd( rIter.mpTokenEnd ),
- mnSpacesOpCode( rIter.mnSpacesOpCode ),
- mbSkipSpaces( bSkipSpaces )
-{
- skipSpaces();
-}
-
ApiTokenIterator& ApiTokenIterator::operator++()
{
if( is() )
diff --git a/unusedcode.easy b/unusedcode.easy
index 1377bba..d3f49cb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -866,11 +866,7 @@ nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas:
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
oox::core::PowerPointExport::WriteTextStyleLevel(boost::shared_ptr<sax_fastparser::FastSerializerHelper>, int, int)
-oox::dump::AxPropertyObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, bool)
-oox::dump::BinaryStreamObject::BinaryStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
oox::dump::Config::requestEncryptionData(comphelper::IDocPasswordVerifier&)
-oox::dump::Config::setNameList(oox::dump::String const&, boost::shared_ptr<oox::dump::NameListBase> const&)
-oox::dump::Config::setStringOption(oox::dump::String const&, oox::dump::String const&)
oox::dump::ConfigItemBase::readConfigLine(oox::TextInputStream&) const
oox::dump::DffStreamObject::construct(oox::dump::ObjectBase const&, oox::dump::BinaryInputStreamRef const&, rtl::OUString const&)
oox::dump::DffStreamObject::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
@@ -914,11 +910,8 @@ oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, un
oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&)
oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const
oox::formulaimport::XmlStream::skipElement(int)
-oox::ole::VbaSiteModel::isVisible() const
oox::ole::WordVbaProjectFilter_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
oox::ole::WordVbaProjectFilter_getSupportedServiceNames()
-oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&)
-oox::xls::ApiTokenIterator::ApiTokenIterator(oox::xls::ApiTokenIterator const&, bool)
oox::xls::BiffDetector_createInstance(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
oox::xls::BiffDrawingBase::appendRawObject(boost::shared_ptr<oox::xls::BiffDrawingObjectBase> const&)
oox::xls::BiffDrawingBase::setSkipObj(unsigned short)
commit eeffbc94d129756410bd2a9198dff5858479738f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Mar 20 13:16:38 2012 +0000
Resolves: fdo#46923/fdo#46750 take mnSubStringMin into account
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 5d0611b..1039526 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1861,6 +1861,8 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
//position so that iterating over glyph slots one at a time for
//glyph fallback can keep context as to what characters are the
//inputs that caused a missing glyph in a given font.
+ //
+ //See: fdo#46923/fdo#46750 for extra complexities
{
int dir = 1;
int out = rVI.mnMinCharPos;
@@ -1871,7 +1873,7 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
}
for(c = rVI.mnMinCharPos; c < rVI.mnEndCharPos; ++c)
{
- int i = out;
+ int i = out - mnSubStringMin;
mpGlyphs2Chars[i] = c;
out += dir;
}
More information about the Libreoffice-commits
mailing list