[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_sw binfilter/bf_xmloff
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx |2 -
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx |1
binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx |2 -
binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx|4
+-
binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx|2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 20
+-
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx |6
+--
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx|2 -
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx |2 -
binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx|2 -
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx|2 -
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx|4
+-
15 files changed, 27 insertions(+), 28 deletions(-)
New commits:
commit 0b54eb6b70f1102a84ee9da01b2c6aea1aa50904
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon May 7 23:13:07 2012 +0200
Some cppcheck cleaning
Change-Id: Ib0dee8fed7c3ac54870024853d0bcdfcb964039d
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
index 1310b8c..e13b783 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
@@ -2126,7 +2126,7 @@ void WinMtfOutput::Push() // !! to
be able to access the o
void WinMtfOutput::Pop()
{
// Die aktuellen Daten vom Stack holen
-if( vSaveStack.size() )
+if( !vSaveStack.empty() )
{
// Die aktuelle Daten auf dem Stack sichern
SaveStructPtr pSave( vSaveStack.back() );
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
index de2dc23..51814e8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
@@ -383,7 +383,6 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet rSet,
sal_Bool bIsValueSea
}
}
delete pBoxItem;
-delete pBreakItem;
delete pBreakItem ;
delete pAutoKernItem ;
delete pWLineItem;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
index d816c6c..e9b20a1 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
@@ -445,7 +445,7 @@ void SchXMLTableHelper::applyTableSimple(
double fVal;
const sal_Bool bConstConvertNan = bConvertNaN;
-for( ++iRow, nRow = 0; iRow != rTable.aData.end(); iRow++, nRow++ )
+for( ++iRow, nRow = 0; iRow != rTable.aData.end(); ++iRow, nRow++ )
{
aCategories[ nRow ] = (*iRow)[ 0 ].aString;
for( nCol = 1; nCol nColumnCount; nCol++ )
diff --git a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
index 71f2587..12fdc17 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
@@ -125,7 +125,7 @@ OUString SAL_CALL SvXMLAttributeList::getValueByName(const
OUString sName) thro
{
::std::vectorstruct SvXMLTagAttribute_Impl::iterator ii =
m_pImpl-vecAttribute.begin();
-for( ; ii != m_pImpl-vecAttribute.end() ; ii ++ ) {
+for( ; ii != m_pImpl-vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
return (*ii).sValue;
}
@@ -172,7 +172,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString
sName )
{
::std::vectorstruct SvXMLTagAttribute_Impl::iterator ii =
m_pImpl-vecAttribute.begin();
-for( ; ii != m_pImpl-vecAttribute.end() ; ii ++ ) {
+for( ; ii != m_pImpl-vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
m_pImpl-vecAttribute.erase( ii );
break;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
index 866686f..7d6238c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
@@ -130,7 +130,7 @@ void XMLShapeStyleContext::FillPropertySet( const
Reference beans::XPropertySet
// first, look for the old format, where we had a text:list-style-name
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_svtools/svdde.hxx |4
1 file changed, 4 deletions(-)
New commits:
commit 1a0db504b60623eeb45d64a8ce8d1463983f6c2a
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed May 2 12:26:52 2012 +0200
Remove unused parts
Change-Id: Ife64c1e95ae1dcf5554fc8e59d1afbffa3ffebec
diff --git a/binfilter/inc/bf_svtools/svdde.hxx
b/binfilter/inc/bf_svtools/svdde.hxx
index e74f360..f9aa33a 100644
--- a/binfilter/inc/bf_svtools/svdde.hxx
+++ b/binfilter/inc/bf_svtools/svdde.hxx
@@ -55,8 +55,6 @@ struct DdeDataImp;
struct DdeImp;
DECLARE_LIST( DdeConnections, DdeConnection* )
-DECLARE_LIST( DdeTransactions, DdeTransaction* )
-DECLARE_LIST( DdeFormats, long )
#ifdef WNT
class DdeService;
@@ -236,7 +234,6 @@ class DdeConnection
{
friend classDdeInternal;
friend classDdeTransaction;
-DdeTransactions aTransactions;
DdeString* pService;
DdeString* pTopic;
DdeImp* pImp;
@@ -397,7 +394,6 @@ protected:
const DdeTopic* GetSysTopic() const { return pSysTopic; }
private:
DdeTopics aTopics;
-DdeFormats aFormats;
DdeTopic* pSysTopic;
DdeString* pName;
ConvList* pConv;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scripting/source
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f93dc708a807a74cb176dd37a484ad8f947b191 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Apr 18 22:51:44 2012 +0200 Fix another extra parenthesis diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx index 68f6001..6588c2f 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx @@ -362,7 +362,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE storage::XScriptInfoAccess ( xScriptStorage, UNO_QUERY_THROW ); Sequence Reference storage::XScriptInfo results = xScriptInfoAccess-getAllImplementations( ); -Reference lang::XEventListener xEL_ScriptStorageMgr(( xScriptStorageMgr ,UNO_QUERY_THROW ); +Reference lang::XEventListener xEL_ScriptStorageMgr( xScriptStorageMgr ,UNO_QUERY_THROW ); lang::EventObject event( results[ 0 ] ); xEL_ScriptStorageMgr-disposing( event ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source toolkit/inc toolkit/source unusedcode.easy
connectivity/source/drivers/mozab/MResultSet.cxx | 14 --
connectivity/source/drivers/mozab/MResultSet.hxx |1 -
toolkit/inc/toolkit/awt/vclxdevice.hxx |1 -
toolkit/inc/toolkit/awt/vclxwindows.hxx |1 -
toolkit/source/awt/vclxdevice.cxx|5 -
toolkit/source/awt/vclxwindows.cxx |7 ---
unusedcode.easy |3 ---
7 files changed, 32 deletions(-)
New commits:
commit 393b14fddd7b328a6e2af78c0c351447ccb0ba6a
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Apr 17 22:08:56 2012 +0200
Remove some unused methods
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx
b/connectivity/source/drivers/mozab/MResultSet.cxx
index ed92e42..6e1cdbe 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -717,16 +717,6 @@ void SAL_CALL OResultSet::release() throw()
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
}
-//
-
-void OResultSet::initializeRow(OValueRow _rRow,sal_Int32 _nColumnCount)
-{
-if(!_rRow.is())
-{
-_rRow = new OValueVector(_nColumnCount);
-(_rRow-get())[0].setBound(sal_True);
-
::std::for_each(_rRow-get().begin()+1,_rRow-get().end(),TSetBound(sal_False));
-}
-}
// -
void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString
rMatchString )
@@ -1205,10 +1195,6 @@ void SAL_CALL OResultSet::executeQuery() throw(
::com::sun::star::sdbc::SQLExcep
OSL_ENSURE(m_xColumns.is(), Need the Columns!!);
-// sal_Int32 nColumnCount = m_xColumns-size();
-// initializeRow(m_aRow,nColumnCount);
-// initializeRow(m_aEvaluateRow,nColumnCount);
-
switch( m_pSQLIterator-getStatementType() )
{
case SQL_STATEMENT_SELECT:
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx
b/connectivity/source/drivers/mozab/MResultSet.hxx
index 47e9ad1..2559b7f 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -258,7 +258,6 @@ protected:
void parseParameter( const OSQLParseNode* pNode, rtl::OUString
rMatchString );
void fillRowData() throw( ::com::sun::star::sdbc::SQLException );
-void initializeRow(OValueRow _rRow,sal_Int32 _nColumnCount);
void analyseWhereClause( const OSQLParseNode*
parseTree,
MQueryExpression
queryExpression);
diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx
b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index fba5ec7..b800b2c 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx
@@ -75,7 +75,6 @@ public:
OutputDevice* GetOutputDevice() const { return mpOutputDevice; }
voidSetCreatedWithToolkit( sal_Bool
bCreatedWithToolkit );
-sal_BoolIsCreatedWithToolkit() const;
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx
b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index 3949b54..a1f0784 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx
@@ -338,7 +338,6 @@ public:
static void ImplGetPropertyIds( std::list sal_uInt16 aIds );
virtual voidGetPropertyIds( std::list sal_uInt16 aIds ) { return
ImplGetPropertyIds( aIds ); }
-::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
getFirstActionListener ();
};
//
diff --git a/toolkit/source/awt/vclxdevice.cxx
b/toolkit/source/awt/vclxdevice.cxx
index 40a5bb7..39c74b1 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -81,11 +81,6 @@ void VCLXDevice::SetCreatedWithToolkit( sal_Bool
bCreatedWithToolkit )
nFlags = ~FLAGS_CREATEDWITHTOOLKIT;
}
-sal_Bool VCLXDevice::IsCreatedWithToolkit() const
-{
-return ( nFlags FLAGS_CREATEDWITHTOOLKIT ) != 0;
-}
-
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXDevice::queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException)
{
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 64a4ad8..b8d13e2 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1335,13 +1335,6 @@ void VCLXRadioButton::ImplClickedOrToggled( sal_Bool
bToggled )
}
}
-::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/basidesh.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8bfee2c0eb6fcec49d05562bf1cb945356a4180e
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 16 21:14:57 2012 +0200
Resolves: fdo#48368 CRASH closing IDE
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index e4dcd98..02e10c2 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -417,9 +417,9 @@ sal_uInt16 BasicIDEShell::PrepareClose( sal_Bool bUI,
sal_Bool bForBrowsing )
else
{
sal_Bool bCanClose = sal_True;
-for ( sal_uLong nWin = 0; bCanClose ( nWin aIDEWindowTable.size()
); nWin++ )
+for (IDEWindowTable::const_iterator it = aIDEWindowTable.begin();
bCanClose (it != aIDEWindowTable.end()); ++it)
{
-IDEBaseWindow* pWin = aIDEWindowTable[ nWin ];
+IDEBaseWindow* pWin = it-second;
if ( !pWin-CanClose() )
{
if ( !m_aCurLibName.isEmpty() ( pWin-IsDocument(
m_aCurDocument ) || pWin-GetLibName() != m_aCurLibName ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit daae05ccf52e37afc41dc1976afcc1f7c6fd978c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 14 10:05:34 2012 +0200
WaE fix
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index af2e37f..98b4e9c 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
fprintf( fp, \nMinAutoPaperSize: %li x %li,
pEE-GetMinAutoPaperSize().Width(), pEE-GetMinAutoPaperSize().Height() );
fprintf( fp, \nUpdate: %i, pEE-GetUpdateMode() );
-fprintf( fp, \nNumber of Views: %i, pEE-GetViewCount() );
+fprintf( fp, \nNumber of Views: % SAL_PRIuUINT64, pEE-GetViewCount() );
for ( sal_uInt16 nView = 0; nView pEE-GetViewCount(); nView++ )
{
EditView* pV = pEE-GetView( nView );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 95cc5de63b20c5986fe8f3913da86002eabd7cb1
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 14 18:06:08 2012 +0200
Resolves: fdo#48683 nice crash when hitting DEL
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 0d6877b..5ea5d71 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2436,7 +2436,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
// Remove portion;
sal_uInt8 nType = pTP-GetKind();
pParaPortion-GetTextPortions().Remove( nPortion );
-delete pTP;
if ( nType == PORTIONKIND_LINEBREAK )
{
TextPortion* pNext = pParaPortion-GetTextPortions()[ nPortion
];
@@ -2444,7 +2443,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
{
// Remove dummy portion
pParaPortion-GetTextPortions().Remove( nPortion );
-delete pNext;
}
}
}
@@ -2462,7 +2460,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
{
// Discard portion; if possible, correct the ones before,
// if the Hyphenator portion has swallowed one character...
-pParaPortion-GetTextPortions().Remove( nLastPortion );
if ( nLastPortion pTP-GetLen() )
{
TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
@@ -2470,7 +2467,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
pPrev-GetSize().Width() = (-1);
}
-delete pTP;
+pParaPortion-GetTextPortions().Remove( nLastPortion );
}
}
#if OSL_DEBUG_LEVEL 2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/drawingmanager.hxx | 15 --
sc/source/filter/oox/drawingmanager.cxx | 165
unusedcode.easy |3
3 files changed, 183 deletions(-)
New commits:
commit 7b0bf8878b057def9539ddde8aef790e30b58532
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Apr 13 20:07:44 2012 +0200
Cleaning sc module (oox)
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 6a713e0..c10c5b6 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -117,13 +117,6 @@ public:
explicitBiffDrawingObjectBase( const WorksheetHelper rHelper
);
virtual ~BiffDrawingObjectBase();
-/** Reads the BIFF3 OBJ record, returns a new drawing object. */
-static BiffDrawingObjectRef importObjBiff3( const WorksheetHelper
rHelper, BiffInputStream rStrm );
-/** Reads the BIFF4 OBJ record, returns a new drawing object. */
-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 );
-
/** Sets whether this is an area object (then its width and height must be
greater than 0). */
inline void setAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
/** If set to true, the object supports a simple on-click macro and/or
hyperlink. */
@@ -187,14 +180,6 @@ protected:
const ::com::sun::star::awt::Rectangle rShapeRect
) const = 0;
private:
-/** Reads the contents of a BIFF3 OBJ record. */
-voidimportObjBiff3( BiffInputStream rStrm );
-/** Reads the contents of a BIFF4 OBJ record. */
-voidimportObjBiff4( BiffInputStream rStrm );
-/** Reads the contents of a BIFF5 OBJ record. */
-voidimportObjBiff5( BiffInputStream rStrm );
-
-private:
ShapeAnchor maAnchor; /// Position of the drawing object.
::rtl::OUString maObjName; /// Name of the object.
::rtl::OUString maMacroName;/// Name of an attached macro.
diff --git a/sc/source/filter/oox/drawingmanager.cxx
b/sc/source/filter/oox/drawingmanager.cxx
index 1e00ff7..8c46db1 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -270,120 +270,6 @@ BiffDrawingObjectBase::~BiffDrawingObjectBase()
{
}
-/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff3( const
WorksheetHelper rHelper, BiffInputStream rStrm )
-{
-BiffDrawingObjectRef xDrawingObj;
-
-if( rStrm.getRemaining() = 30 )
-{
-sal_uInt16 nObjType;
-rStrm.skip( 4 );
-rStrm nObjType;
-switch( nObjType )
-{
-case BIFF_OBJTYPE_GROUP:xDrawingObj.reset( new
BiffGroupObject( rHelper ) );break;
-case BIFF_OBJTYPE_LINE: xDrawingObj.reset( new
BiffLineObject( rHelper ) ); break;
-case BIFF_OBJTYPE_RECTANGLE:xDrawingObj.reset( new
BiffRectObject( rHelper ) ); break;
-case BIFF_OBJTYPE_OVAL: xDrawingObj.reset( new
BiffOvalObject( rHelper ) ); break;
-case BIFF_OBJTYPE_ARC: xDrawingObj.reset( new
BiffArcObject( rHelper ) ); break;
-#if 0
-case BIFF_OBJTYPE_CHART:xDrawingObj.reset( new
XclImpChartObj( rHelper ) ); break;
-case BIFF_OBJTYPE_TEXT: xDrawingObj.reset( new
XclImpTextObj( rHelper ) ); break;
-case BIFF_OBJTYPE_BUTTON: xDrawingObj.reset( new
XclImpButtonObj( rHelper ) );break;
-case BIFF_OBJTYPE_PICTURE: xDrawingObj.reset( new
XclImpPictureObj( rHelper ) ); break;
-#endif
-default:
-#if 0
-OSL_ENSURE( false, BiffDrawingObjectBase::importObjBiff3 -
unknown object type );
-#endif
-xDrawingObj.reset( new BiffPlaceholderObject( rHelper ) );
-}
-}
-
-xDrawingObj-importObjBiff3( rStrm );
-return xDrawingObj;
-}
-
-/*static*/ BiffDrawingObjectRef BiffDrawingObjectBase::importObjBiff4( const
WorksheetHelper rHelper, BiffInputStream rStrm )
-{
-BiffDrawingObjectRef xDrawingObj;
-
-if( rStrm.getRemaining() = 30 )
-{
-sal_uInt16 nObjType;
-rStrm.skip( 4 );
-rStrm nObjType;
-switch( nObjType )
-{
-case BIFF_OBJTYPE_GROUP:xDrawingObj.reset( new
BiffGroupObject( rHelper ) );break;
-case BIFF_OBJTYPE_LINE: xDrawingObj.reset( new
BiffLineObject( rHelper ) ); break;
-case BIFF_OBJTYPE_RECTANGLE:xDrawingObj.reset( new
BiffRectObject( rHelper ) ); break;
-case BIFF_OBJTYPE_OVAL: xDrawingObj.reset( new
BiffOvalObject( rHelper
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/commentsbuffer.hxx |8 --
sc/source/filter/inc/querytablebuffer.hxx |7 --
sc/source/filter/inc/richstring.hxx |7 --
sc/source/filter/inc/scenariobuffer.hxx |3 -
sc/source/filter/oox/commentsbuffer.cxx | 46
sc/source/filter/oox/querytablebuffer.cxx | 65 ---
sc/source/filter/oox/richstring.cxx | 83 --
sc/source/filter/oox/scenariobuffer.cxx | 35
unusedcode.easy |9 ---
9 files changed, 263 deletions(-)
New commits:
commit bb5fa5773461e14de153266ccfa36e5f454ff9b8
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Apr 13 22:57:19 2012 +0200
Cleaning sc (oox)
diff --git a/sc/source/filter/inc/commentsbuffer.hxx
b/sc/source/filter/inc/commentsbuffer.hxx
index 9827b82..b02e209 100644
--- a/sc/source/filter/inc/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -81,14 +81,6 @@ public:
voidfinalizeImport();
private:
-/** Reads a BIFF2-BIFF5 NOTE record. */
-voidimportNoteBiff2( BiffInputStream rStrm );
-/** Reads a BIFF8 NOTE record. */
-voidimportNoteBiff8( BiffInputStream rStrm );
-/** Reads a NOTESOUND record. */
-voidimportNoteSound( BiffInputStream rStrm );
-
-private:
CommentModelmaModel;
};
diff --git a/sc/source/filter/inc/querytablebuffer.hxx
b/sc/source/filter/inc/querytablebuffer.hxx
index 8496e40..79116ec 100644
--- a/sc/source/filter/inc/querytablebuffer.hxx
+++ b/sc/source/filter/inc/querytablebuffer.hxx
@@ -70,13 +70,6 @@ public:
/** Imports query table settings from the QUERYTABLE record. */
voidimportQueryTable( SequenceInputStream rStrm );
-/** Imports query table settings from the QUERYTABLE record. */
-voidimportQueryTable( BiffInputStream rStrm );
-/** Imports query table settings from the QUERYTABLEREFRESH record. */
-voidimportQueryTableRefresh( BiffInputStream rStrm );
-/** Imports query table settings from the QUERYTABLESETTINGS record. */
-voidimportQueryTableSettings( BiffInputStream rStrm );
-
/** Inserts a web query into the sheet. */
voidfinalizeImport();
diff --git a/sc/source/filter/inc/richstring.hxx
b/sc/source/filter/inc/richstring.hxx
index 07a645a..95dd4f5 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -251,13 +251,6 @@ public:
/** Imports a Unicode rich-string from the passed record stream. */
voidimportString( SequenceInputStream rStrm, bool bRich );
-/** Imports nChars byte characters from the passed BIFF stream and appends
a new text portion. */
-voidimportCharArray( BiffInputStream rStrm, sal_uInt16
nChars, rtl_TextEncoding eTextEnc );
-/** Imports a byte string from the passed BIFF stream and appends new text
portions. */
-voidimportByteString( BiffInputStream rStrm,
rtl_TextEncoding eTextEnc, BiffStringFlags nFlags = BIFF_STR_DEFAULT );
-/** Imports a Unicode rich-string from the passed BIFF stream and appends
new text portions. */
-voidimportUniString( BiffInputStream rStrm,
BiffStringFlags nFlags = BIFF_STR_DEFAULT );
-
/** Final processing after import of all strings. */
voidfinalizeImport();
diff --git a/sc/source/filter/inc/scenariobuffer.hxx
b/sc/source/filter/inc/scenariobuffer.hxx
index 4205d8b..3e5c203 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -79,9 +79,6 @@ public:
/** Imports a new cell for this scenario from a INPUTCELLS record. */
voidimportInputCells( SequenceInputStream rStrm );
-/** Imports a scenario definition from a SCENARIO record. */
-voidimportScenario( BiffInputStream rStrm );
-
/** Creates the scenario in the Calc document. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/commentsbuffer.cxx
b/sc/source/filter/oox/commentsbuffer.cxx
index 0ea4ca2..3bbf751 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -220,52 +220,6 @@ void Comment::finalizeImport()
// private
-void Comment::importNoteBiff2( BiffInputStream rStrm )
-{
-sal_uInt16 nTotalLen;
-rStrm nTotalLen;
-sal_uInt16 nPartLen = ::std::min( nTotalLen, static_cast sal_uInt16 (
rStrm.getRemaining() ) );
-RichStringRef xNoteText = createText();
-xNoteText-importCharArray( rStrm, nPartLen, getTextEncoding() );
-
-nTotalLen = nTotalLen - nPartLen; // operator-=() gives compiler warning
-while( (nTotalLen 0) (rStrm.getNextRecId() == BIFF_ID_NOTE)
rStrm.startNextRecord
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/pivotcachebuffer.hxx |4
sc/source/filter/inc/pivottablebuffer.hxx | 15 --
sc/source/filter/oox/pivotcachebuffer.cxx | 19 ---
sc/source/filter/oox/pivottablebuffer.cxx | 158 --
unusedcode.easy |8 -
5 files changed, 204 deletions(-)
New commits:
commit e00e693d2b3c39246328a99adc142284edbed285
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Apr 13 23:11:31 2012 +0200
Some cleaning sc (oox)
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx
b/sc/source/filter/inc/pivotcachebuffer.hxx
index cb57fef..31be3e4 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -455,10 +455,6 @@ public:
WorksheetHelper rSheetHelper, sal_Int32 nRowIdx )
const;
private:
-/** Reads the worksheet source range from the DCONREF record. */
-voidimportDConRef( BiffInputStream rStrm );
-/** Reads the defined name used for source data from the DCONNAME record.
*/
-voidimportDConName( BiffInputStream rStrm );
/** Reads the sheet name and URL from the DCONREF, DCONNAME, or DCONBINAME
records. */
voidimportDConUrl( BiffInputStream rStrm );
diff --git a/sc/source/filter/inc/pivottablebuffer.hxx
b/sc/source/filter/inc/pivottablebuffer.hxx
index 3be8691..a907b3f 100644
--- a/sc/source/filter/inc/pivottablebuffer.hxx
+++ b/sc/source/filter/inc/pivottablebuffer.hxx
@@ -154,10 +154,6 @@ public:
/** Imports pivot field item reference settings from the PTREFERENCEITEM
record. */
voidimportPTReferenceItem( SequenceInputStream rStrm );
-/** Imports pivot field settings from the PTFIELD and following records. */
-voidimportPTField( BiffInputStream rStrm );
-/** Imports pivot field settings from the PTFIELD2 record. */
-voidimportPTField2( BiffInputStream rStrm );
/** Imports settings of an item in this pivot field from the PTFITEM
record. */
voidimportPTFItem( BiffInputStream rStrm );
@@ -348,17 +344,6 @@ public:
/** Reads the settings of a field located in the data dimension from the
PTDATAFIELD record. */
voidimportPTDataField( SequenceInputStream rStrm );
-/** Reads global pivot table settings from the PTDEFINITION record. */
-voidimportPTDefinition( BiffInputStream rStrm, sal_Int16
nSheet );
-/** Reads additional global pivot table settings from the PTDEFINITION2
record. */
-voidimportPTDefinition2( BiffInputStream rStrm );
-/** Reads the indexes of all fields located in the row or column dimension
from a PTROWCOLFIELDS record. */
-voidimportPTRowColFields( BiffInputStream rStrm );
-/** Reads the settings of all fields located in the page dimension from a
PTPAGEFIELDS record. */
-voidimportPTPageFields( BiffInputStream rStrm );
-/** Reads the settings of a field located in the data dimension from a
PTDATAFIELD record. */
-voidimportPTDataField( BiffInputStream rStrm );
-
/** Creates and returns a new pivot table field. */
PivotTableFieldcreateTableField();
/** Creates and returns a new pivot table filter. */
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx
b/sc/source/filter/oox/pivotcachebuffer.cxx
index 2a07a61..395c2a8 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -1330,25 +1330,6 @@ void PivotCache::importPCItemIndexList( BiffInputStream
rStrm, WorksheetHelper
// private
-void PivotCache::importDConRef( BiffInputStream rStrm )
-{
-BinRange aBinRange;
-aBinRange.read( rStrm, false ); // always 8-bit column indexes
-// store range address unchecked with sheet index 0, will be
resolved/checked later
-getAddressConverter().convertToCellRangeUnchecked(
maSheetSrcModel.maRange, aBinRange, 0 );
-
-// the URL with (required) sheet name and optional URL of an external
document
-importDConUrl( rStrm );
-OSL_ENSURE( !maSheetSrcModel.maSheet.isEmpty(), PivotCache::importDConRef
- missing sheet name );
-}
-
-void PivotCache::importDConName( BiffInputStream rStrm )
-{
-maSheetSrcModel.maDefName = (getBiff() == BIFF8) ? rStrm.readUniString() :
rStrm.readByteStringUC( false, getTextEncoding() );
-OSL_ENSURE( !maSheetSrcModel.maDefName.isEmpty(),
PivotCache::importDConName - missing defined name );
-importDConUrl( rStrm );
-}
-
void PivotCache::importDConUrl( BiffInputStream rStrm )
{
// the URL with sheet name and optional URL of an external document
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx
b/sc/source/filter/oox/pivottablebuffer.cxx
index 0a5dc73..c203cbf 100644
--- a/sc/source/filter/oox
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/commentsbuffer.hxx |2 --
sc/source/filter/inc/condformatbuffer.hxx |2 --
sc/source/filter/inc/stylesbuffer.hxx |2 --
sc/source/filter/oox/commentsbuffer.cxx | 29 -
sc/source/filter/oox/condformatbuffer.cxx |5 -
sc/source/filter/oox/stylesbuffer.cxx | 15 ---
unusedcode.easy |3 ---
7 files changed, 58 deletions(-)
New commits:
commit b3e2cbc68f3501d3925f8789b1addc8ad4f8e9c0
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 9 11:37:16 2012 +0200
Dump other unused functions in oox
diff --git a/sc/source/filter/inc/commentsbuffer.hxx
b/sc/source/filter/inc/commentsbuffer.hxx
index 81143a9..9827b82 100644
--- a/sc/source/filter/inc/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -73,8 +73,6 @@ public:
voidimportCommentPr( const AttributeList rAttribs );
/** Imports a cell comment from the passed stream of a COMMENT record. */
voidimportComment( SequenceInputStream rStrm );
-/** Imports a cell comment from the passed stream of a NOTE record. */
-voidimportNote( BiffInputStream rStrm );
/** Creates and returns a new rich-string object for the comment text. */
RichStringRef createText();
diff --git a/sc/source/filter/inc/condformatbuffer.hxx
b/sc/source/filter/inc/condformatbuffer.hxx
index 393a9d0..e236375 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -168,8 +168,6 @@ public:
CondFormatRef importConditionalFormatting( const AttributeList
rAttribs );
/** Imports settings from the CONDFORMATTING record. */
CondFormatRef importCondFormatting( SequenceInputStream rStrm );
-/** Imports settings from the CFHEADER record. */
-voidimportCfHeader( BiffInputStream rStrm );
/** Creates all conditional formatting in the Calc document. */
voidfinalizeImport();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 22af2be..409af4d 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -148,8 +148,6 @@ public:
voidimportPaletteColor( const AttributeList rAttribs );
/** Appends a new color from the passed RGBCOLOR record. */
voidimportPaletteColor( SequenceInputStream rStrm );
-/** Imports the PALETTE record from the passed stream. */
-voidimportPalette( BiffInputStream rStrm );
/** Rturns the RGB value of the color with the passed index. */
sal_Int32 getColor( sal_Int32 nPaletteIdx ) const;
diff --git a/sc/source/filter/oox/commentsbuffer.cxx
b/sc/source/filter/oox/commentsbuffer.cxx
index a1bef7d..0ea4ca2 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -145,35 +145,6 @@ void Comment::importComment( SequenceInputStream rStrm )
getAddressConverter().convertToCellRangeUnchecked( maModel.maRange,
aBinRange, getSheetIndex() );
}
-void Comment::importNote( BiffInputStream rStrm )
-{
-BinAddress aBinAddr;
-rStrm aBinAddr;
-// cell range will be checked while inserting the comment into the document
-getAddressConverter().convertToCellRangeUnchecked( maModel.maRange,
BinRange( aBinAddr ), getSheetIndex() );
-
-// remaining record data is BIFF dependent
-switch( getBiff() )
-{
-case BIFF2:
-case BIFF3:
-importNoteBiff2( rStrm );
-break;
-case BIFF4:
-case BIFF5:
-importNoteBiff2( rStrm );
-// in BIFF4 and BIFF5, comments can have an associated sound
-if( (rStrm.getNextRecId() == BIFF_ID_NOTESOUND)
rStrm.startNextRecord() )
-importNoteSound( rStrm );
-break;
-case BIFF8:
-importNoteBiff8( rStrm );
-break;
-case BIFF_UNKNOWN:
-break;
-}
-}
-
RichStringRef Comment::createText()
{
maModel.mxText.reset( new RichString( *this ) );
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index b10210f..2985a8f 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -735,11 +735,6 @@ CondFormatRef CondFormatBuffer::importCondFormatting(
SequenceInputStream rStrm
return xCondFmt;
}
-void CondFormatBuffer::importCfHeader( BiffInputStream rStrm )
-{
-createCondFormat()-importCfHeader( rStrm );
-}
-
void CondFormatBuffer::finalizeImport()
{
maCondFormats.forEachMem( CondFormat::finalizeImport );
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 11a5608..26b146a 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
[Libreoffice-commits] .: sc/source sd/source unusedcode.easy
sc/source/filter/inc/numberformatsbuffer.hxx |2
sc/source/filter/inc/pivotcachebuffer.hxx |2
sc/source/filter/inc/scenariobuffer.hxx|2
sc/source/filter/inc/stylesbuffer.hxx |5
sc/source/filter/oox/numberformatsbuffer.cxx | 28 ---
sc/source/filter/oox/pivotcachebuffer.cxx | 30 ---
sc/source/filter/oox/scenariobuffer.cxx| 11 -
sc/source/filter/oox/stylesbuffer.cxx | 152 -
sd/source/ui/inc/View.hxx |2
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 37
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx |6
sd/source/ui/view/sdview4.cxx | 53 -
unusedcode.easy|6
13 files changed, 336 deletions(-)
New commits:
commit b42c792f50ed11a3efc9c20a4e7eed5163fdaed7
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 9 13:00:31 2012 +0200
Remove some unused methods
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx
b/sc/source/filter/inc/numberformatsbuffer.hxx
index 6df9586..ac9a63b 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -111,8 +111,6 @@ public:
NumberFormatRef importNumFmt( const AttributeList rAttribs );
/** Inserts a new number format code from a NUMFMT record. */
voidimportNumFmt( SequenceInputStream rStrm );
-/** Inserts a new number format code from a FORMAT record. */
-voidimportFormat( BiffInputStream rStrm );
/** Final processing after import of all style settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx
b/sc/source/filter/inc/pivotcachebuffer.hxx
index 7e7c16f..2fd32fe 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -414,8 +414,6 @@ public:
/** Reads sheet source settings from the PCDSHEETSOURCE record. */
voidimportPCDSheetSource( SequenceInputStream rStrm,
const ::oox::core::Relations rRelations );
-/** Reads cache source settings from the PCDSOURCE record. */
-voidimportPCDSource( BiffInputStream rStrm );
/** Reads pivot cache global settings from the PCDEFINITION record. */
voidimportPCDefinition( BiffInputStream rStrm );
diff --git a/sc/source/filter/inc/scenariobuffer.hxx
b/sc/source/filter/inc/scenariobuffer.hxx
index dc996c7..4205d8b 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -114,8 +114,6 @@ public:
voidimportScenarios( const AttributeList rAttribs );
/** Imports sheet scenario settings from a SCENARIOS record. */
voidimportScenarios( SequenceInputStream rStrm );
-/** Imports sheet scenario settings from a SCENARIOS record. */
-voidimportScenarios( BiffInputStream rStrm );
/** Creates and returns a new scenario in this collection. */
Scenario createScenario();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 409af4d..07f2a7a 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -280,8 +280,6 @@ public:
/** Imports a font style flag from a DXF record. */
voidimportDxfFlag( sal_Int32 nElement,
SequenceInputStream rStrm );
-/** Imports the FONT record from the passed stream. */
-voidimportFont( BiffInputStream rStrm );
/** Imports the FONTCOLOR record from the passed stream. */
voidimportFontColor( BiffInputStream rStrm );
/** Sets the font attributes from the font block of a CFRULE record. */
@@ -783,9 +781,6 @@ public:
/** Imports the XF record from the passed stream. */
voidimportXf( SequenceInputStream rStrm, bool bCellXf );
-/** Imports the XF record from the passed stream. */
-voidimportXf( BiffInputStream rStrm );
-
/** Final processing after import of all style settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 1eab9e5..5133a91 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2019,34 +2019,6 @@ void NumberFormatsBuffer::importNumFmt(
SequenceInputStream rStrm )
createNumFmt( nNumFmtId, aFmtCode );
}
-void NumberFormatsBuffer::importFormat( BiffInputStream rStrm )
-{
-OUString aFmtCode;
-switch( getBiff() )
-{
-case BIFF2:
-case BIFF3:
-aFmtCode = rStrm.readByteStringUC( false, getTextEncoding() );
-break;
-case BIFF4
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/biffinputstream.hxx|3
sc/source/filter/inc/excelhandlers.hxx | 12
sc/source/filter/inc/pivottablefragment.hxx | 15
sc/source/filter/inc/querytablefragment.hxx | 14
sc/source/filter/inc/sheetdatacontext.hxx | 57 ---
sc/source/filter/inc/workbookhelper.hxx |2
sc/source/filter/oox/biffinputstream.cxx|5
sc/source/filter/oox/excelhandlers.cxx |6
sc/source/filter/oox/pivottablefragment.cxx | 22 -
sc/source/filter/oox/querytablefragment.cxx | 17 -
sc/source/filter/oox/sheetdatacontext.cxx | 429
sc/source/filter/oox/workbookhelper.cxx | 59 ---
unusedcode.easy |9
13 files changed, 650 deletions(-)
New commits:
commit 26398f9dbf7134f79993f2f8258613124ac2483b
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 9 13:34:35 2012 +0200
cleaning in oox part
diff --git a/sc/source/filter/inc/biffinputstream.hxx
b/sc/source/filter/inc/biffinputstream.hxx
index 47ee2b0..dd931dd 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -227,9 +227,6 @@ public:
/** Closes the input stream but not the wrapped stream. */
virtual voidclose();
-/** Returns the absolute position in the wrapped binary stream. */
-sal_Int64 tellBase() const;
-
// BinaryInputStream interface (stream read access) ---
/** Reads nBytes bytes to the passed sequence.
diff --git a/sc/source/filter/inc/excelhandlers.hxx
b/sc/source/filter/inc/excelhandlers.hxx
index 2051a55..56e47fd 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -205,18 +205,6 @@ protected:
//
-/** Fragment handler derived from the WorksheetHelper helper class.
-
-Used to import sheet fragments.
- */
-class BiffWorksheetFragmentBase : public BiffFragmentHandler, public
WorksheetHelper
-{
-protected:
-explicitBiffWorksheetFragmentBase(
-const WorksheetHelper rHelper,
-const BiffWorkbookFragmentBase rParent );
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/pivottablefragment.hxx
b/sc/source/filter/inc/pivottablefragment.hxx
index 5053c72..6e09312 100644
--- a/sc/source/filter/inc/pivottablefragment.hxx
+++ b/sc/source/filter/inc/pivottablefragment.hxx
@@ -96,21 +96,6 @@ private:
};
//
-//
-
-class BiffPivotTableContext : public BiffWorksheetContextBase
-{
-public:
-explicitBiffPivotTableContext( const WorksheetHelper rHelper
);
-
-/** Imports all records related to the current pivot table. */
-virtual voidimportRecord( BiffInputStream rStrm );
-
-private:
-PivotTable mrPivotTable;
-};
-
-//
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/querytablefragment.hxx
b/sc/source/filter/inc/querytablefragment.hxx
index 5609eb0..5a01a04 100644
--- a/sc/source/filter/inc/querytablefragment.hxx
+++ b/sc/source/filter/inc/querytablefragment.hxx
@@ -57,20 +57,6 @@ private:
//
-class BiffQueryTableContext : public BiffWorksheetContextBase
-{
-public:
-explicitBiffQueryTableContext( const WorksheetHelper rHelper
);
-
-/** Imports all records related to the current query table. */
-virtual voidimportRecord( BiffInputStream rStrm );
-
-private:
-QueryTable mrQueryTable;
-};
-
-//
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index 324b12a..05c8768 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -130,63 +130,6 @@ private:
//
-/** This class implements importing row settings and all cells of a sheet.
- */
-class BiffSheetDataContext : public BiffWorksheetContextBase, private
SheetDataContextBase
-{
-public:
-explicitBiffSheetDataContext( const WorksheetHelper rHelper );
-
-/** Tries to import a sheet data record. */
-virtual voidimportRecord( BiffInputStream rStrm );
-
-private:
-/** Imports row settings from a ROW record. */
-voidimportRow( BiffInputStream rStrm );
-
-/** Reads an XF identifier and initializes a new cell. */
-boolreadCellXfId( BiffInputStream
[Libreoffice-commits] .: canvas/inc canvas/source unusedcode.easy
canvas/inc/canvas/canvastools.hxx | 45
canvas/source/tools/canvastools.cxx | 39 ---
unusedcode.easy |1
3 files changed, 1 insertion(+), 84 deletions(-)
New commits:
commit 161fb1781bec7e587743b7589d00c9eb7fa00ac7
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 9 13:45:35 2012 +0200
Remove canvas::tools::calcRectToRectTransform
diff --git a/canvas/inc/canvas/canvastools.hxx
b/canvas/inc/canvas/canvastools.hxx
index a1bee2d..1605b66 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -225,60 +225,17 @@ namespace canvas
@param i_Transformation
Transformation to apply to the input rectangle
-@see calcRectToRectTransform()
-
@return a reference to the resulting rectangle
*/
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange calcTransformedRectBounds(
::basegfx::B2DRange o_Rect,
const
::basegfx::B2DRange i_Rect,
const
::basegfx::B2DHomMatrix i_Transformation );
-/** Calc a transform that maps one rectangle on top of
-another.
-
-The method is a kissing cousin to
-calcTransformedRectBounds(). It can be used to modify the
-given transformation matrix, such that it transforms the
-given input rectangle to the given output rectangle,
-changing only translation and scale (if necessary). Thus,
-if you've calculated an output rectangle via
-calcTransformedRectBounds(), you can move and scale that
-rectangle as you like, and have this method calculate the
-required total transformation for it.
-
-@param o_transform
-Output parameter, to receive the resulting transformation
-matrix.
-
-@param i_destRect
-Input parameter, specifies the requested destination
-rectangle. The resulting transformation will exactly map
-the source rectangle to the destination rectangle.
-
-@param i_srcRect
-Input parameter, specifies the original source
-rectangle. The resulting transformation will exactly map
-the source rectangle to the destination rectangle.
-
-@param i_transformation
-The original transformation matrix. This is changed with
-translations and scalings (if necessary), to exactly map
-the source rectangle to the destination rectangle.
-
-@return a reference to the resulting transformation matrix
-
-@see calcTransformedRectBounds()
-*/
-CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix
calcRectToRectTransform( ::basegfx::B2DHomMatrixo_transform,
- const
::basegfx::B2DRangei_destRect,
- const
::basegfx::B2DRangei_srcRect,
- const
::basegfx::B2DHomMatrixi_transformation );
-
/** Calc a transform that maps the upper, left corner of a
rectangle to the origin.
The method is a specialized version of
-calcRectToRectTransform(), mapping the input rectangle's
+calcRectToRectTransform() (Removed now), mapping the input
rectangle's
the upper, left corner to the origin, and leaving the size
untouched.
diff --git a/canvas/source/tools/canvastools.cxx
b/canvas/source/tools/canvastools.cxx
index a089f54..4a55ad5 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -688,45 +688,6 @@ namespace canvas
return outRect;
}
-::basegfx::B2DHomMatrix calcRectToRectTransform(
::basegfx::B2DHomMatrix o_transform,
- const
::basegfx::B2DRangedestRect,
- const
::basegfx::B2DRangesrcRect,
- const
::basegfx::B2DHomMatrixtransformation )
-{
-if( srcRect.isEmpty() ||
-destRect.isEmpty() )
-{
-return o_transform=transformation;
-}
-
-// transform inputRect by transformation
-::basegfx::B2DRectangle aTransformedRect;
-calcTransformedRectBounds( aTransformedRect,
- srcRect,
- transformation );
-
-// now move resulting left,top point of bounds to (0,0)
-basegfx::B2DHomMatrix
aCorrectedTransform(basegfx
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_colorcfg.cxx|2 +- binfilter/bf_svtools/source/config/svt_viewoptions.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 07afc5b2071ff48beb3093536a7ea68273b4e967 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Apr 9 14:06:58 2012 +0200 s/pathes/paths/ diff --git a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx index 45a090e..962954a 100644 --- a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx +++ b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx @@ -34,7 +34,7 @@ #include tools/color.hxx #include tools/debug.hxx #include unotools/configitem.hxx -#include unotools/configpathes.hxx +#include unotools/configpaths.hxx #include com/sun/star/uno/Sequence.h #include bf_svtools/poolitem.hxx //Any2Bool #include bf_svtools/smplhint.hxx diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx index 2b78f3a..4699e2d 100644 --- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx +++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx @@ -38,7 +38,7 @@ #include com/sun/star/container/XNameAccess.hpp #include com/sun/star/beans/XPropertySet.hpp #include rtl/ustrbuf.hxx -#include unotools/configpathes.hxx +#include unotools/configpaths.hxx #include comphelper/configurationhelper.hxx #include comphelper/processfactory.hxx #include itemholder1.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_svtools binfilter/inc
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx |2 +-
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx|4 ++--
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx |4 ++--
binfilter/bf_svtools/source/config/svt_pathoptions.cxx |6 +++---
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |2 +-
binfilter/inc/bf_svtools/pathoptions.hxx |4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 48d44b8fa4d45754cf1f15f7bab20af20ff69985
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Apr 9 14:43:39 2012 +0200
s/pathes/paths
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 0fb4b7c..de0bbbe 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -345,7 +345,7 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // Default pathes
+/*N*/ // Default paths
/*N*/ maLibraryPath = SvtPathOptions().GetBasicPath();
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index d8217ff..600fc16 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -215,7 +215,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() :
ConfigItem( ASCII_STR(Office
{
case ::com::sun::star::uno::TypeClass_STRING :
{
-// multi pathes
+// multi paths
if ( pValues[nProp] = aTempStr )
aFullPath = aPathOpt.SubstituteVariable( aTempStr
);
else
@@ -227,7 +227,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() :
ConfigItem( ASCII_STR(Office
case ::com::sun::star::uno::TypeClass_SEQUENCE :
{
-// single pathes
+// single paths
aFullPath = OUString();
Sequence OUString aList;
if ( pValues[nProp] = aList )
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 933d7e1..257d40f 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -146,7 +146,7 @@ struct FactoryInfo
//-
// returns list of properties, which has changed only!
-// We use given value of sNodeBase to build full qualified pathes ...
+// We use given value of sNodeBase to build full qualified paths ...
// Last sign of it must be /. Beacuse we use it directly, without
any additional things!
css::uno::Sequence css::beans::PropertyValue getChangedProperties(
const ::rtl::OUString sNodeBase )
{
@@ -744,7 +744,7 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName(
const ::rtl::OUString sN
*//*-*/
void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence
::rtl::OUString lFactories )
{
-// Expand every set node name in lFactories to full qualified pathes to
his properties
+// Expand every set node name in lFactories to full qualified paths to his
properties
// and get right values from configuration.
const css::uno::Sequence ::rtl::OUString lProperties =
impl_ExpandSetNames( lFactories );
const css::uno::Sequence css::uno::AnylValues = GetProperties(
lProperties );
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index d091052..aa3e187 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -154,7 +154,7 @@ class SvtPathOptions_Impl
public:
SvtPathOptions_Impl();
-// get the pathes, not const because of using a mutex
+// get the paths, not const because of using a mutex
const String GetPath( SvtPathOptions::Pathes );
const String GetAddinPath() { return GetPath(
SvtPathOptions::PATH_ADDIN ); }
const String GetAutoCorrectPath() { return GetPath(
SvtPathOptions::PATH_AUTOCORRECT ); }
@@ -182,7 +182,7 @@ class SvtPathOptions_Impl
const String GetUIConfigPath() { return GetPath(
SvtPathOptions::PATH_UICONFIG ); }
const String GetFingerprintPath() { return GetPath(
SvtPathOptions::PATH_FINGERPRINT ); }
-// set the pathes
[Libreoffice-commits] .: sw/source unusedcode.easy vbahelper/inc vbahelper/source
sw/source/core/doc/docbm.cxx | 12
sw/source/core/inc/MarkManager.hxx |3 ---
unusedcode.easy |2 --
vbahelper/inc/vbahelper/vbahelper.hxx|4
vbahelper/source/vbahelper/vbahelper.cxx | 17 -
5 files changed, 38 deletions(-)
New commits:
commit 1ea28ebcf0a7719fd2ba18054c5dfbb1da229348
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 13:12:03 2012 +0200
Dump MarkManager::dumpFieldmarks + extractIntFromAny from vbahelper
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index fdbddb5..ea2a433 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -304,18 +304,6 @@ namespace sw { namespace mark
MarkManager::MarkManager(SwDoc rDoc)
: m_pDoc(rDoc)
{ }
-#ifdef DBG_UTIL
-void MarkManager::dumpFieldmarks( ) const
-{
-const_iterator_t pIt = m_vFieldmarks.begin();
-for (; pIt != m_vFieldmarks.end( ); pIt++)
-{
-rtl::OUString str = (*pIt)-ToString();
-OSL_TRACE(%s\n,
-::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr());
-}
-}
-#endif
::sw::mark::IMark* MarkManager::makeMark(const SwPaM rPaM,
const ::rtl::OUString rName,
const IDocumentMarkAccess::MarkType eType)
diff --git a/sw/source/core/inc/MarkManager.hxx
b/sw/source/core/inc/MarkManager.hxx
index 1c917c7..6fc8a4d 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -45,9 +45,6 @@ namespace sw { namespace mark
{
public:
MarkManager(/*[in/out]*/ SwDoc rDoc);
-#ifdef DBG_UTIL
-void dumpFieldmarks( ) const;
-#endif
// IDocumentMarkAccess
virtual ::sw::mark::IMark* makeMark(const SwPaM rPaM, const
::rtl::OUString rName, IDocumentMarkAccess::MarkType eMark);
diff --git a/unusedcode.easy b/unusedcode.easy
index 6699ed5..7441a3a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -790,7 +790,6 @@
nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const)
nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents
const)
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents
const)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const,
basegfx::B2DRange const,
basegfx::B2DConnectedRangescanvas::SpriteRedrawManager::SpriteInfo::ConnectedComponents
const)
-ooo::vba::extractIntFromAny(com::sun::star::uno::Any const)
oox::PropertyMap::dump(com::sun::star::uno::Referencecom::sun::star::beans::XPropertySet)
oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext
const)
oox::core::FilterBase::openSubStorage(rtl::OUString const, bool) const
@@ -872,4 +871,3 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry*
const, unsigned short)
svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short)
svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray
const*, unsigned short, unsigned short)
svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const, unsigned short)
-sw::mark::MarkManager::dumpFieldmarks() const
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx
b/vbahelper/inc/vbahelper/vbahelper.hxx
index 9a3da3c..e9a316b 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -99,10 +99,6 @@ namespace ooo
VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell,
const css::uno::Any From, const css::uno::Any To, const css::uno::Any
Copies, const css::uno::Any Preview, const css::uno::Any ActivePrinter, const
css::uno::Any PrintToFile, const css::uno::Any Collate, const css::uno::Any
PrToFileName, sal_Bool bSelection );
VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any
EnableChanges, SfxViewShell* );
-/** Extracts a 32-bit integer value from the passed Any, which may
contain an integer or floating-point value.
-Throws, if the Any is empty or contains an incompatible type. */
-VBAHELPER_DLLPUBLIC sal_Int32 extractIntFromAny( const css::uno::Any
rAny ) throw (css::uno::RuntimeException);
-
/** Extracts a boolean value from the passed Any, which may contain a
Boolean or an integer or floating-point value.
Throws, if the Any is empty or contains an incompatible type. */
VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any rAny
) throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx
b/vbahelper/source/vbahelper/vbahelper.cxx
index a8cfb1a..b91ef85 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -476,23 +476,6 @@ void PrintOutHelper
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/viewsettings.hxx |9 --
sc/source/filter/oox/viewsettings.cxx | 109 --
unusedcode.easy |4 -
3 files changed, 122 deletions(-)
New commits:
commit ade4aac3dcaa29872f0f8a81e5e332f5566faddf
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 13:33:05 2012 +0200
Clean oox::xls::SheetViewSettings
diff --git a/sc/source/filter/inc/viewsettings.hxx
b/sc/source/filter/inc/viewsettings.hxx
index dde5451..c5a7f93 100644
--- a/sc/source/filter/inc/viewsettings.hxx
+++ b/sc/source/filter/inc/viewsettings.hxx
@@ -127,15 +127,6 @@ public:
/** Imports the CHARTSHEETVIEW record containing view settings of a chart
sheet. */
voidimportChartSheetView( SequenceInputStream rStrm );
-/** Imports the WINDOW2 record containing sheet view settings. */
-voidimportWindow2( BiffInputStream rStrm );
-/** Imports the PANE record containing sheet pane settings. */
-voidimportPane( BiffInputStream rStrm );
-/** Imports the SCL record containing sheet zoom settings. */
-voidimportScl( BiffInputStream rStrm );
-/** Imports the SELECTION record containing selection settings for a pane.
*/
-voidimportSelection( BiffInputStream rStrm );
-
/** Converts all imported sheet view settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/viewsettings.cxx
b/sc/source/filter/oox/viewsettings.cxx
index 10e9f9f..3503011 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -364,115 +364,6 @@ void SheetViewSettings::importChartSheetView(
SequenceInputStream rStrm )
rModel.mbZoomToFit = getFlag( nFlags, BIFF12_CHARTSHEETVIEW_ZOOMTOFIT );
}
-void SheetViewSettings::importWindow2( BiffInputStream rStrm )
-{
-OSL_ENSURE( maSheetViews.empty(), SheetViewSettings::importWindow2 -
multiple WINDOW2 records );
-SheetViewModel rModel = *createSheetView();
-if( getBiff() == BIFF2 )
-{
-rModel.mbShowFormulas = rStrm.readuInt8() != 0;
-rModel.mbShowGrid = rStrm.readuInt8() != 0;
-rModel.mbShowHeadings = rStrm.readuInt8() != 0;
-rModel.mnPaneState = (rStrm.readuInt8() == 0) ? XML_split : XML_frozen;
-rModel.mbShowZeros = rStrm.readuInt8() != 0;
-BinAddress aFirstPos;
-rStrm aFirstPos;
-rModel.maFirstPos = getAddressConverter().createValidCellAddress(
aFirstPos, getSheetIndex(), false );
-rModel.mbDefGridColor = rStrm.readuInt8() != 0;
-rModel.maGridColor.importColorRgb( rStrm );
-}
-else
-{
-sal_uInt16 nFlags;
-BinAddress aFirstPos;
-rStrm nFlags aFirstPos;
-
-rModel.maFirstPos = getAddressConverter().createValidCellAddress(
aFirstPos, getSheetIndex(), false );
-rModel.mnPaneState= getFlagValue( nFlags, BIFF_WINDOW2_FROZEN,
getFlagValue( nFlags, BIFF_WINDOW2_FROZENNOSPLIT, XML_frozen, XML_frozenSplit
), XML_split );
-rModel.mbSelected = getFlag( nFlags, BIFF_WINDOW2_SELECTED );
-rModel.mbRightToLeft = getFlag( nFlags, BIFF_WINDOW2_RIGHTTOLEFT );
-rModel.mbDefGridColor = getFlag( nFlags, BIFF_WINDOW2_DEFGRIDCOLOR );
-rModel.mbShowFormulas = getFlag( nFlags, BIFF_WINDOW2_SHOWFORMULAS );
-rModel.mbShowGrid = getFlag( nFlags, BIFF_WINDOW2_SHOWGRID );
-rModel.mbShowHeadings = getFlag( nFlags, BIFF_WINDOW2_SHOWHEADINGS );
-rModel.mbShowZeros= getFlag( nFlags, BIFF_WINDOW2_SHOWZEROS );
-rModel.mbShowOutline = getFlag( nFlags, BIFF_WINDOW2_SHOWOUTLINE );
-
-if( getBiff() == BIFF8 )
-{
-rModel.mnViewType = getFlagValue( nFlags,
BIFF_WINDOW2_PAGEBREAKMODE, XML_pageBreakPreview, XML_normal );
-
-rModel.maGridColor.importColorId( rStrm );
-// zoom data not included in chart sheets
-if( (getSheetType() != SHEETTYPE_CHARTSHEET)
(rStrm.getRemaining() = 6) )
-{
-rStrm.skip( 2 );
-sal_uInt16 nPageZoom, nNormalZoom;
-rStrm nPageZoom nNormalZoom;
-rModel.mnSheetLayoutZoom = nPageZoom;
-rModel.mnNormalZoom = nNormalZoom;
-}
-}
-else
-{
-rModel.maGridColor.importColorRgb( rStrm );
-}
-}
-}
-
-void SheetViewSettings::importPane( BiffInputStream rStrm )
-{
-OSL_ENSURE( !maSheetViews.empty(), SheetViewSettings::importPane -
missing leading WINDOW2 record );
-if( !maSheetViews.empty() )
-{
-sal_uInt8 nActivePaneId;
-sal_uInt16 nSplitX, nSplitY;
-BinAddress aSecondPos;
-rStrm nSplitX nSplitY aSecondPos nActivePaneId;
-
-SheetViewModel rModel = *maSheetViews.back();
-rModel.mfSplitX = nSplitX;
-rModel.mfSplitY = nSplitY;
-rModel.maSecondPos
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/workbooksettings.hxx | 14 ---
sc/source/filter/oox/workbooksettings.cxx | 38 --
unusedcode.easy |7 -
3 files changed, 59 deletions(-)
New commits:
commit 2283607f49146c8b1e6dd618d5fa1f89f7804797
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 13:59:17 2012 +0200
Clean oox::xls::WorkbookSettings
diff --git a/sc/source/filter/inc/workbooksettings.hxx
b/sc/source/filter/inc/workbooksettings.hxx
index 07683d4..ed47d54 100644
--- a/sc/source/filter/inc/workbooksettings.hxx
+++ b/sc/source/filter/inc/workbooksettings.hxx
@@ -111,20 +111,6 @@ public:
/** Sets the save external linked values flag, e.g. from the WSBOOL
record. */
voidsetSaveExtLinkValues( bool bSaveExtLinks );
-/** Imports the CALCCOUNT record. */
-voidimportCalcCount( BiffInputStream rStrm );
-/** Imports the CALCMODE record. */
-voidimportCalcMode( BiffInputStream rStrm );
-/** Imports the DELTA record. */
-voidimportDelta( BiffInputStream rStrm );
-/** Imports the ITERATION record. */
-voidimportIteration( BiffInputStream rStrm );
-/** Imports the REFMODE record. */
-voidimportRefMode( BiffInputStream rStrm );
-/** Imports the SAVERECALC record. */
-voidimportSaveRecalc( BiffInputStream rStrm );
-/** Imports the UNCALCED record. */
-voidimportUncalced( BiffInputStream rStrm );
/** Converts the imported workbook settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/workbooksettings.cxx
b/sc/source/filter/oox/workbooksettings.cxx
index 0bdbf41..5d0048f 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -195,44 +195,6 @@ void WorkbookSettings::setSaveExtLinkValues( bool
bSaveExtLinks )
maBookSettings.mbSaveExtLinkValues = bSaveExtLinks;
}
-void WorkbookSettings::importCalcCount( BiffInputStream rStrm )
-{
-maCalcSettings.mnIterateCount = rStrm.readuInt16();
-}
-
-void WorkbookSettings::importCalcMode( BiffInputStream rStrm )
-{
-sal_Int16 nCalcMode = rStrm.readInt16() + 1;
-static const sal_Int32 spnCalcModes[] = { XML_autoNoTable, XML_manual,
XML_auto };
-maCalcSettings.mnCalcMode = STATIC_ARRAY_SELECT( spnCalcModes, nCalcMode,
XML_auto );
-}
-
-void WorkbookSettings::importDelta( BiffInputStream rStrm )
-{
-rStrm maCalcSettings.mfIterateDelta;
-}
-
-void WorkbookSettings::importIteration( BiffInputStream rStrm )
-{
-maCalcSettings.mbIterate = rStrm.readuInt16() != 0;
-}
-
-void WorkbookSettings::importRefMode( BiffInputStream rStrm )
-{
-maCalcSettings.mnRefMode = (rStrm.readuInt16() == 0) ? XML_R1C1 : XML_A1;
-}
-
-void WorkbookSettings::importSaveRecalc( BiffInputStream rStrm )
-{
-maCalcSettings.mbCalcOnSave = rStrm.readuInt16() != 0;
-}
-
-void WorkbookSettings::importUncalced( BiffInputStream )
-{
-// existence of this record indicates incomplete recalc
-maCalcSettings.mbCalcCompleted = false;
-}
-
void WorkbookSettings::finalizeImport()
{
// default settings
diff --git a/unusedcode.easy b/unusedcode.easy
index 4fc0cb6..eb7fa0a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -819,13 +819,6 @@ oox::xls::WorkbookGlobals::createBuffersPerSheet(short)
oox::xls::WorkbookGlobals::setCodePage(unsigned short)
oox::xls::WorkbookGlobals::setIsWorkbookFile()
oox::xls::WorkbookHelper::setAppFontEncoding(unsigned short)
-oox::xls::WorkbookSettings::importCalcCount(oox::xls::BiffInputStream)
-oox::xls::WorkbookSettings::importCalcMode(oox::xls::BiffInputStream)
-oox::xls::WorkbookSettings::importDelta(oox::xls::BiffInputStream)
-oox::xls::WorkbookSettings::importIteration(oox::xls::BiffInputStream)
-oox::xls::WorkbookSettings::importRefMode(oox::xls::BiffInputStream)
-oox::xls::WorkbookSettings::importSaveRecalc(oox::xls::BiffInputStream)
-oox::xls::WorkbookSettings::importUncalced(oox::xls::BiffInputStream)
oox::xls::WorksheetHelper::getBiffDrawing() const
oox::xls::WorksheetHelper::setDefaultColumnFormat(int, int, int)
oox::xls::WorksheetHelper::setLabelRanges(oox::xls::ApiCellRangeList const,
oox::xls::ApiCellRangeList const)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/autofiltercontext.hxx| 15 --
sc/source/filter/inc/biffcodec.hxx|3
sc/source/filter/inc/drawingmanager.hxx |2
sc/source/filter/inc/externallinkfragment.hxx | 28
sc/source/filter/oox/autofiltercontext.cxx| 17 --
sc/source/filter/oox/biffcodec.cxx|8 -
sc/source/filter/oox/drawingmanager.cxx | 37 -
sc/source/filter/oox/externallinkfragment.cxx | 172 --
unusedcode.easy |4
9 files changed, 286 deletions(-)
New commits:
commit 6266d51db89429f16d4e4bc4ccb4c896096cda90
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 19:18:42 2012 +0200
Keep on cleaning oox
diff --git a/sc/source/filter/inc/autofiltercontext.hxx
b/sc/source/filter/inc/autofiltercontext.hxx
index 6583fd3..e10f24e 100644
--- a/sc/source/filter/inc/autofiltercontext.hxx
+++ b/sc/source/filter/inc/autofiltercontext.hxx
@@ -94,21 +94,6 @@ private:
//
-class BiffAutoFilterContext : public BiffWorksheetContextBase
-{
-public:
-explicitBiffAutoFilterContext( const WorksheetHelper rHelper,
AutoFilter rAutoFilter );
-
-protected:
-/** Imports all records related to the current auto filter. */
-virtual voidimportRecord( BiffInputStream rStrm );
-
-private:
-AutoFilter mrAutoFilter;
-};
-
-//
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/biffcodec.hxx
b/sc/source/filter/inc/biffcodec.hxx
index 672a816..704df9f 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -168,9 +168,6 @@ class BiffCodecHelper : public WorkbookHelper
public:
explicitBiffCodecHelper( const WorkbookHelper rHelper );
-/** Implementation helper, reads the FILEPASS and returns a decoder
object. */
-static BiffDecoderRef implReadFilePass( BiffInputStream rStrm, BiffType
eBiff );
-
/** Clones the contained decoder object if existing and sets it at the
passed stream. */
voidcloneDecoder( BiffInputStream rStrm );
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index b80d79f..6a713e0 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -422,8 +422,6 @@ public:
explicitBiffDrawingBase( const WorksheetHelper rHelper,
const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XDrawPage rxDrawPage );
-/** Imports a plain OBJ record (without leading DFF data). */
-voidimportObj( BiffInputStream rStrm );
/** Sets the object with the passed identifier to be skipped on import. */
voidsetSkipObj( sal_uInt16 nObjId );
diff --git a/sc/source/filter/inc/externallinkfragment.hxx
b/sc/source/filter/inc/externallinkfragment.hxx
index 8324f4f..3c90791 100644
--- a/sc/source/filter/inc/externallinkfragment.hxx
+++ b/sc/source/filter/inc/externallinkfragment.hxx
@@ -113,34 +113,6 @@ private:
};
//
-//
-
-class BiffExternalSheetDataContext : public BiffWorkbookContextBase
-{
-public:
-explicitBiffExternalSheetDataContext( const WorkbookHelper
rHelper, bool bImportDefNames );
-virtual ~BiffExternalSheetDataContext();
-
-/** Tries to import a record related to external links and defined names.
*/
-virtual voidimportRecord( BiffInputStream rStrm );
-
-private:
-voidimportExternSheet( BiffInputStream rStrm );
-voidimportExternalBook( BiffInputStream rStrm );
-voidimportExternalName( BiffInputStream rStrm );
-voidimportXct( BiffInputStream rStrm );
-voidimportCrn( BiffInputStream rStrm );
-voidimportDefinedName( BiffInputStream rStrm );
-
-/** Sets the passed cell value to the passed position in the sheet cache.
*/
-voidsetCellValue( const BinAddress rBinAddr, const
::com::sun::star::uno::Any rValue );
-
-private:
-ExternalLinkRef mxExtLink; /// Current external link.
-::com::sun::star::uno::Reference
::com::sun::star::sheet::XExternalSheetCache
-mxSheetCache; /// The sheet cache used to
store external cell values.
-boolmbImportDefNames;
-};
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/oox/autofiltercontext.cxx
b/sc/source/filter/oox/autofiltercontext.cxx
index c58cb4d..52f6f0a 100644
--- a/sc/source/filter/oox/autofiltercontext.cxx
+++ b/sc/source
[Libreoffice-commits] .: oox/source
oox/source/vml/vmlformatting.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c893a820c447c9014d35597a37c3220c261e35ae
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 7 21:12:27 2012 +0200
Fix Redundant assignment of nModToken in switch
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index f7ebde4..4bc582d 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -248,7 +248,7 @@ bool lclExtractDouble( double orfValue, sal_Int32
ornEndPos, const OUString r
sal_Int32 nModToken = XML_TOKEN_INVALID;
switch( AttributeConversion::decodeToken( aColorIndex.copy( 0,
nOpenParen ) ) )
{
-case XML_darken:nModToken = XML_shade;
+case XML_darken:nModToken = XML_shade;break;
case XML_lighten: nModToken = XML_tint;
}
sal_Int32 nValue = aColorIndex.copy( nOpenParen + 1, nCloseParen -
nOpenParen - 1 ).toInt32();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/worksheetsettings.hxx | 19 --
sc/source/filter/oox/worksheetsettings.cxx | 82 -
unusedcode.easy|9 ---
3 files changed, 110 deletions(-)
New commits:
commit b63afcd27df0eb7123782b7d80bc0963df9fedb9
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 7 23:14:32 2012 +0200
Clean oox::xls::WorksheetSettings
diff --git a/sc/source/filter/inc/worksheetsettings.hxx
b/sc/source/filter/inc/worksheetsettings.hxx
index 175c61d..26e8019 100644
--- a/sc/source/filter/inc/worksheetsettings.hxx
+++ b/sc/source/filter/inc/worksheetsettings.hxx
@@ -109,25 +109,6 @@ public:
/** Imports phonetic settings from the PHONETICPR record. */
voidimportPhoneticPr( SequenceInputStream rStrm );
-/** Imports sheet properties from a SHEETEXT record. */
-voidimportSheetExt( BiffInputStream rStrm );
-/** Imports sheet properties from a SHEETPR record. */
-voidimportSheetPr( BiffInputStream rStrm );
-/** Imports protection status from the PROTECT record. */
-voidimportProtect( BiffInputStream rStrm );
-/** Imports object protection status from the OBJECTPROTECT record. */
-voidimportObjectProtect( BiffInputStream rStrm );
-/** Imports scenario protection status from the SCENPROTECT record. */
-voidimportScenProtect( BiffInputStream rStrm );
-/** Imports sheet password hash from the PASSWORD record. */
-voidimportPassword( BiffInputStream rStrm );
-/** Imports protection settings from the SHEETPROTECTION record. */
-voidimportSheetProtection( BiffInputStream rStrm );
-/** Imports the VBA code module name from the CODENAME record. */
-voidimportCodeName( BiffInputStream rStrm );
-/** Imports phonetic settings from the PHONETICPR record. */
-voidimportPhoneticPr( BiffInputStream rStrm );
-
/** Converts the imported worksheet settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/worksheetsettings.cxx
b/sc/source/filter/oox/worksheetsettings.cxx
index 768041b..3010aec 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -237,88 +237,6 @@ void WorksheetSettings::importPhoneticPr(
SequenceInputStream rStrm )
maPhoneticSett.importPhoneticPr( rStrm );
}
-void WorksheetSettings::importSheetExt( BiffInputStream rStrm )
-{
-rStrm.skip( 16 );
-sal_uInt32 nFlags;
-rStrm nFlags;
-sal_uInt8 nColorIdx = extractValue sal_uInt8 ( nFlags, 0, 7 );
-if( nColorIdx != BIFF_SHEETEXT_NOTABCOLOR )
-maSheetSettings.maTabColor.setPaletteClr( nColorIdx );
-}
-
-void WorksheetSettings::importSheetPr( BiffInputStream rStrm )
-{
-sal_uInt16 nFlags;
-rStrm nFlags;
-// worksheet vs. dialogsheet
-if( getFlag( nFlags, BIFF_SHEETPR_DIALOGSHEET ) )
-{
-OSL_ENSURE( getSheetType() == SHEETTYPE_WORKSHEET,
WorksheetSettings::importSheetPr - unexpected sheet type );
-setSheetType( SHEETTYPE_DIALOGSHEET );
-}
-// outline settings
-maSheetSettings.mbApplyStyles = getFlag( nFlags, BIFF_SHEETPR_APPLYSTYLES
);
-maSheetSettings.mbSummaryRight = getFlag( nFlags,
BIFF_SHEETPR_SYMBOLSRIGHT );
-maSheetSettings.mbSummaryBelow = getFlag( nFlags,
BIFF_SHEETPR_SYMBOLSBELOW );
-// fit printout to width/height
-getPageSettings().setFitToPagesMode( getFlag( nFlags,
BIFF_SHEETPR_FITTOPAGES ) );
-// save external linked values, in BIFF5-BIFF8 moved to BOOKBOOK record
-if( getBiff() = BIFF4 )
-getWorkbookSettings().setSaveExtLinkValues( !getFlag( nFlags,
BIFF_SHEETPR_SKIPEXT ) );
-}
-
-void WorksheetSettings::importProtect( BiffInputStream rStrm )
-{
-maSheetProt.mbSheet = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importObjectProtect( BiffInputStream rStrm )
-{
-maSheetProt.mbObjects = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importScenProtect( BiffInputStream rStrm )
-{
-maSheetProt.mbScenarios = rStrm.readuInt16() != 0;
-}
-
-void WorksheetSettings::importPassword( BiffInputStream rStrm )
-{
-rStrm maSheetProt.mnPasswordHash;
-}
-
-void WorksheetSettings::importSheetProtection( BiffInputStream rStrm )
-{
-sal_uInt32 nFlags = rStrm.readuInt32();
-// set flag means protection is disabled
-maSheetProt.mbObjects = !getFlag( nFlags, BIFF_SHEETPROT_OBJECTS
);
-maSheetProt.mbScenarios= !getFlag( nFlags,
BIFF_SHEETPROT_SCENARIOS );
-maSheetProt.mbFormatCells = !getFlag( nFlags,
BIFF_SHEETPROT_FORMAT_CELLS );
-maSheetProt.mbFormatColumns= !getFlag( nFlags,
BIFF_SHEETPROT_FORMAT_COLUMNS );
-maSheetProt.mbFormatRows = !getFlag( nFlags,
BIFF_SHEETPROT_FORMAT_ROWS );
-maSheetProt.mbInsertColumns= !getFlag( nFlags
[Libreoffice-commits] .: editeng/source slideshow/source xmlsecurity/source
editeng/source/editeng/impedit3.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
xmlsecurity/source/helper/documentsignaturehelper.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a16060116346533923c607bd406d3fea511b41ec
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 01:01:31 2012 +0200
Fix Prefer prefix ++/-- operators
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a380c08..46cfe04 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2349,7 +2349,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
DBG_ASSERT( (nInvPos != aPositions.end()), InvPos ?! );
::std::set sal_uInt32 ::iterator i = nInvPos;
-i++;
+++i;
while ( i != aPositions.end() )
{
TextPortion* pNew = new TextPortion( static_castsal_uInt16(*i++) -
static_castsal_uInt16(*nInvPos++) );
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index ca91a6c..7718019 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -902,7 +902,7 @@ PolygonMap::iterator SlideShowImpl::findPolygons(
uno::Referencedrawing::XDrawP
if(aIter-first == xDrawPage)
bFound = true;
else
-aIter++;
+++aIter;
}
return aIter;
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 7523bf1..8b10f03 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -374,7 +374,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
//find the file in the element list
typedef ::std::vector ::rtl::OUString ::const_iterator CIT;
-for (CIT aIter = sElementList.begin(); aIter sElementList.end();
aIter++)
+for (CIT aIter = sElementList.begin(); aIter !=
sElementList.end(); ++aIter)
{
::rtl::OUString sElementListURI = *aIter;
if (alg == OOo2Document)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/pagesettings.hxx | 25
sc/source/filter/oox/pagesettings.cxx | 100 --
unusedcode.easy | 12
3 files changed, 137 deletions(-)
New commits:
commit c1036d7ab06e6b85763e90659c08e1f450ff50ab
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 7 01:20:48 2012 +0200
Remove unused code oox::xls::PageSettings
diff --git a/sc/source/filter/inc/pagesettings.hxx
b/sc/source/filter/inc/pagesettings.hxx
index 0ce662c..5ff75bc 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -125,31 +125,6 @@ public:
/** Imports the PICTURE record from the passed stream. */
voidimportPicture( const ::oox::core::Relations
rRelations, SequenceInputStream rStrm );
-/** Imports the LEFTMARGIN record from the passed BIFF stream. */
-voidimportLeftMargin( BiffInputStream rStrm );
-/** Imports the RIGHTMARGIN record from the passed BIFF stream. */
-voidimportRightMargin( BiffInputStream rStrm );
-/** Imports the TOPMARGIN record from the passed BIFF stream. */
-voidimportTopMargin( BiffInputStream rStrm );
-/** Imports the BOTTOMMARGIN record from the passed BIFF stream. */
-voidimportBottomMargin( BiffInputStream rStrm );
-/** Imports the SETUP record from the passed BIFF stream. */
-voidimportPageSetup( BiffInputStream rStrm );
-/** Imports the HCENTER record from the passed BIFF stream. */
-voidimportHorCenter( BiffInputStream rStrm );
-/** Imports the VCENTER record from the passed BIFF stream. */
-voidimportVerCenter( BiffInputStream rStrm );
-/** Imports the PRINTHEADERS record from the passed BIFF stream. */
-voidimportPrintHeaders( BiffInputStream rStrm );
-/** Imports the PRINTGRIDLINES record from the passed BIFF stream. */
-voidimportPrintGridLines( BiffInputStream rStrm );
-/** Imports the HEADER record from the passed BIFF stream. */
-voidimportHeader( BiffInputStream rStrm );
-/** Imports the FOOTER record from the passed BIFF stream. */
-voidimportFooter( BiffInputStream rStrm );
-/** Imports the PICTURE record from the passed BIFF stream. */
-voidimportPicture( BiffInputStream rStrm );
-
/** Sets whether percentual scaling or fit to width/height scaling is
used. */
voidsetFitToPagesMode( bool bFitToPages );
diff --git a/sc/source/filter/oox/pagesettings.cxx
b/sc/source/filter/oox/pagesettings.cxx
index 6f140b1..8fcbd72 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -328,106 +328,6 @@ void PageSettings::importPicture( const Relations
rRelations, SequenceInputStre
importPictureData( rRelations, BiffHelper::readString( rStrm ) );
}
-void PageSettings::importLeftMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfLeftMargin;
-}
-
-void PageSettings::importRightMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfRightMargin;
-}
-
-void PageSettings::importTopMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfTopMargin;
-}
-
-void PageSettings::importBottomMargin( BiffInputStream rStrm )
-{
-rStrm maModel.mfBottomMargin;
-}
-
-void PageSettings::importPageSetup( BiffInputStream rStrm )
-{
-sal_uInt16 nPaperSize, nScale, nFirstPage, nFitToWidth, nFitToHeight,
nFlags;
-rStrm nPaperSize nScale nFirstPage nFitToWidth nFitToHeight
nFlags;
-
-maModel.mnPaperSize = nPaperSize; // equal in BIFF and OOX
-maModel.mnScale = nScale;
-maModel.mnFirstPage = nFirstPage;
-maModel.mnFitToWidth = nFitToWidth;
-maModel.mnFitToHeight= nFitToHeight;
-maModel.mnOrientation= getFlagValue( nFlags, BIFF_PAGESETUP_PORTRAIT,
XML_portrait, XML_landscape );
-maModel.mnPageOrder = getFlagValue( nFlags, BIFF_PAGESETUP_INROWS,
XML_overThenDown, XML_downThenOver );
-maModel.mbValidSettings = !getFlag( nFlags, BIFF_PAGESETUP_INVALID );
-maModel.mbUseFirstPage = true;
-maModel.mbBlackWhite = getFlag( nFlags, BIFF_PAGESETUP_BLACKWHITE );
-
-if( getBiff() = BIFF5 )
-{
-sal_uInt16 nHorPrintRes, nVerPrintRes, nCopies;
-rStrm nHorPrintRes nVerPrintRes maModel.mfHeaderMargin
maModel.mfFooterMargin nCopies;
-
-maModel.mnCopies = nCopies;
-maModel.mnOrientation = getFlagValue( nFlags,
BIFF_PAGESETUP_DEFAULTORIENT, XML_default, maModel.mnOrientation );
-maModel.mnHorPrintRes = nHorPrintRes;
-maModel.mnVerPrintRes = nVerPrintRes;
-maModel.mnCellComments = getFlagValue( nFlags,
BIFF_PAGESETUP_PRINTNOTES, XML_asDisplayed, XML_none );
-maModel.mbUseFirstPage = getFlag( nFlags, BIFF_PAGESETUP_USEFIRSTPAGE
[Libreoffice-commits] .: desktop/source framework/source jvmfwk/source package/source
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |2 +-
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |2 +-
desktop/source/deployment/manager/dp_extensionmanager.cxx|2 +-
desktop/source/deployment/manager/dp_properties.cxx |2 +-
desktop/source/deployment/registry/dp_backenddb.cxx |2 +-
desktop/source/deployment/registry/package/dp_package.cxx|4 ++--
framework/source/uielement/toolbarsmenucontroller.cxx|2 +-
jvmfwk/source/elements.cxx |2 +-
package/source/xstor/ohierarchyholder.cxx|2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7d2508572a0389bcb1c803911024296f411af653
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Apr 5 21:15:13 2012 +0200
Fix Prefer prefix ++/-- operators
Includes too replacement by != for comparison between current and end
iterators
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 96c5b1c..03bf3cb 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -337,7 +337,7 @@ void ExtensionBox_Impl::select( const rtl::OUString sName
)
const ::osl::MutexGuard aGuard( m_entriesMutex );
typedef ::std::vector TEntry_Impl ::const_iterator It;
-for ( It iIter = m_vEntries.begin(); iIter m_vEntries.end(); iIter++ )
+for ( It iIter = m_vEntries.begin(); iIter != m_vEntries.end(); ++iIter )
{
if ( sName.equals( (*iIter)-m_sTitle ) )
{
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8852e93..8023678 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -424,7 +424,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
//Construct a string of all messages contained in the
exceptions plus the respective download URLs
::rtl::OUStringBuffer buf(256);
typedef ::std::vector ::std::pairOUString,
cssu::Exception ::const_iterator CIT;
-for (CIT j = vecExceptions.begin(); j !=
vecExceptions.end(); j++)
+for (CIT j = vecExceptions.begin(); j !=
vecExceptions.end(); ++j)
{
if (j != vecExceptions.begin())
buf.appendAscii(\n);
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index d7654b6..b5822ec 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1181,7 +1181,7 @@ uno::Sequence uno::SequenceReferencedeploy::XPackage
citVecVec = vecExtensions.begin();
sal_Int32 j = 0;
uno::Sequence uno::SequenceReferencedeploy::XPackage
seqSeq(vecExtensions.size());
-for (;citVecVec != vecExtensions.end(); citVecVec++, j++)
+for (;citVecVec != vecExtensions.end(); ++citVecVec, j++)
{
seqSeq[j] = comphelper::containerToSequence(*citVecVec);
}
diff --git a/desktop/source/deployment/manager/dp_properties.cxx
b/desktop/source/deployment/manager/dp_properties.cxx
index ec8120f..160e8a5 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -69,7 +69,7 @@ ExtensionProperties::ExtensionProperties(
dp_misc::readProperties(props, contentProps);
typedef ::std::list ::std::pair OUString, OUString ::const_iterator CI;
-for (CI i = props.begin(); i != props.end(); i++)
+for (CI i = props.begin(); i != props.end(); ++i)
{
if (i-first.equals(OUSTR(PROP_SUPPRESS_LICENSE)))
m_prop_suppress_license = i-second;
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx
b/desktop/source/deployment/registry/dp_backenddb.cxx
index a219f13..1d06860 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -311,7 +311,7 @@ void BackendDb::writeVectorOfPair(
Referencecss::xml::dom::XNode(
vectorNode, css::uno::UNO_QUERY_THROW));
typedef ::std::vector ::std::pair OUString, OUString
::const_iterator CIT;
-for (CIT i = vecPairs.begin(); i != vecPairs.end(); i++)
+for (CIT i = vecPairs.begin(); i != vecPairs.end(); ++i)
{
const Referencecss::xml::dom::XElement pairNode(
doc-createElementNS(sNameSpace, sPrefix + sPairTagName));
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index
[Libreoffice-commits] .: sw/source
sw/source/core/docnode/ndcopy.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a04fee7204b769dc98c3592aaed2dce5e8eb0161
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Mar 26 23:11:58 2012 +0200
Fix Prefer prefix ++/-- operators for non-primitive types
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 97557f2..9b1ec4c 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1478,7 +1478,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
//die Chains entsprechend aufgebaut werden koennen.
::std::vector SwFrmFmt* aVecSwFrmFmt;
-for (::std::set _ZSortFly ::const_iterator it=aSet.begin() ; it !=
aSet.end(); it++ )
+for (::std::set _ZSortFly ::const_iterator it=aSet.begin() ; it !=
aSet.end(); ++it )
{
// #i59964#
// correct determination of new anchor position
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |8
sw/source/filter/ww8/docxexport.cxx |2 +-
sw/source/filter/ww8/rtfattributeoutput.cxx |4 ++--
sw/source/filter/ww8/rtfexport.cxx |2 +-
sw/source/filter/ww8/wrtw8nds.cxx|2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 4da30c0b41b854a402e913b467d7e1a0a1b067a3
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 24 23:50:59 2012 +0100
check end of iterator with != instead of
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 77da6da..ba2420f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -606,7 +606,7 @@ void DocxAttributeOutput::DoWriteBookmarks()
{
// Write the start bookmarks
for ( std::vector OString ::const_iterator it = m_rMarksStart.begin(),
end = m_rMarksStart.end();
- it end; ++it )
+ it != end; ++it )
{
const OString rName = *it;
@@ -622,7 +622,7 @@ void DocxAttributeOutput::DoWriteBookmarks()
// export the end bookmarks
for ( std::vector OString ::const_iterator it = m_rMarksEnd.begin(), end
= m_rMarksEnd.end();
- it end; ++it )
+ it != end; ++it )
{
const OString rName = *it;
@@ -3455,14 +3455,14 @@ void DocxAttributeOutput::WriteFormData_Impl( const
::sw::mark::IFieldmark rFie
void DocxAttributeOutput::WriteBookmarks_Impl( std::vector OUString
rStarts,
std::vector OUString rEnds )
{
-for ( std::vector OUString ::const_iterator it = rStarts.begin(), end =
rStarts.end(); it end; ++it )
+for ( std::vector OUString ::const_iterator it = rStarts.begin(), end =
rStarts.end(); it != end; ++it )
{
OString rName = OUStringToOString( *it, RTL_TEXTENCODING_UTF8
).getStr( );
m_rMarksStart.push_back( rName );
}
rStarts.clear();
-for ( std::vector OUString ::const_iterator it = rEnds.begin(), end =
rEnds.end(); it end; ++it )
+for ( std::vector OUString ::const_iterator it = rEnds.begin(), end =
rEnds.end(); it != end; ++it )
{
OString rName = OUStringToOString( *it, RTL_TEXTENCODING_UTF8
).getStr( );
m_rMarksEnd.push_back( rName );
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 5f7c6da..ceec8e2 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -133,7 +133,7 @@ void DocxExport::AppendBookmarks( const SwTxtNode rNode,
xub_StrLen nAktPos, xu
if ( GetBookmarks( rNode, nAktPos, nAktPos + nLen, aMarks ) )
{
for ( IMarkVector::const_iterator it = aMarks.begin(), end =
aMarks.end();
- it end; ++it )
+ it != end; ++it )
{
IMark* pMark = (*it);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 70a6a27..7cdae5f 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1435,7 +1435,7 @@ void RtfAttributeOutput::WriteField_Impl( const SwField*
pFld, ww::eField /*eTyp
void RtfAttributeOutput::WriteBookmarks_Impl( std::vector rtl::OUString
rStarts, std::vector rtl::OUString rEnds )
{
-for ( std::vector OUString ::const_iterator it = rStarts.begin(), end =
rStarts.end(); it end; ++it )
+for ( std::vector OUString ::const_iterator it = rStarts.begin(), end =
rStarts.end(); it != end; ++it )
{
m_aRun-append({ OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_BKMKSTART );
m_aRun-append(m_rExport.OutString(*it, m_rExport.eCurrentEncoding));
@@ -1443,7 +1443,7 @@ void RtfAttributeOutput::WriteBookmarks_Impl(
std::vector rtl::OUString rSta
}
rStarts.clear();
-for ( std::vector OUString ::const_iterator it = rEnds.begin(), end =
rEnds.end(); it end; ++it )
+for ( std::vector OUString ::const_iterator it = rEnds.begin(), end =
rEnds.end(); it != end; ++it )
{
m_aRun-append({ OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_BKMKEND );
m_aRun-append(m_rExport.OutString(*it, m_rExport.eCurrentEncoding));
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index ecb21cb..dda8b81 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -149,7 +149,7 @@ void RtfExport::AppendBookmarks( const SwTxtNode rNode,
xub_StrLen nAktPos, xub
if ( GetBookmarks( rNode, nAktPos, nAktPos + nLen, aMarks ) )
{
for ( IMarkVector::const_iterator it = aMarks.begin(), end =
aMarks.end();
-it end; ++it )
+it != end; ++it )
{
IMark* pMark = (*it);
xub_StrLen nStart = pMark-GetMarkStart().nContent.GetIndex();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/filtuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fa2cccb7cb334bb78bab6fd02b08021a2a94f201
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 10:47:43 2012 +0100
Reduce scope of nChar
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 4fe9f0f..16fb7ed 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -82,7 +82,6 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj,
SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE
static void load_CharSet( rtl_TextEncoding nCharSet, bool bExport )
{
-sal_Int32 nChar = 0;
SequenceAny aValues;
const Any *pProperties;
SequenceOUString aNames(1);
@@ -99,6 +98,7 @@ static void load_CharSet( rtl_TextEncoding nCharSet, bool
bExport )
if( pProperties[0].hasValue() )
{
+sal_Int32 nChar = 0;
pProperties[0] = nChar;
if( nChar = 0)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/ww8par.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2255d1f25f6e9bf4baac9ca5ef9668eb3c518ee4
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 10:56:17 2012 +0100
Simplify these 2 conditions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 254b4c9..db0fdb5 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2360,7 +2360,7 @@ CharSet SwWW8ImplReader::GetCurrentCharSet()
{
if (!maFontSrcCharSets.empty())
eSrcCharSet = maFontSrcCharSets.top();
-if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) (nCharFmt != -1)
nCharFmt = 0 (size_t)nCharFmt vColl.size() )
+if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) nCharFmt = 0
(size_t)nCharFmt vColl.size() )
eSrcCharSet = vColl[nCharFmt].GetCharSet();
if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
StyleExists(nAktColl) nAktColl vColl.size())
eSrcCharSet = vColl[nAktColl].GetCharSet();
@@ -2422,7 +2422,7 @@ CharSet SwWW8ImplReader::GetCurrentCJKCharSet()
eSrcCharSet = maFontSrcCJKCharSets.top();
if (!vColl.empty())
{
-if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) (nCharFmt != -1)
nCharFmt = 0 (size_t)nCharFmt vColl.size() )
+if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW) nCharFmt = 0
(size_t)nCharFmt vColl.size() )
eSrcCharSet = vColl[nCharFmt].GetCJKCharSet();
if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW nAktColl
vColl.size())
eSrcCharSet = vColl[nAktColl].GetCJKCharSet();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dpitemdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2b24cfe22d5d29645d2d926251c29514887fe3a9 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Mar 18 15:38:33 2012 +0100 Fix Same expression on both sides of '==' diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index fe2c540..be4ef7e 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -214,7 +214,7 @@ bool ScDPItemData::IsCaseInsEqual(const ScDPItemData r) const } if (mbStringInterned r.mbStringInterned) -return mpString == mpString; +return mpString == r.mpString; return ScGlobal::GetpTransliteration()-isEqual(GetString(), r.GetString()); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/items/algitem.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 49d7d4b3255f731ce9a8b5256da25f6a9bf53169
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 16:36:54 2012 +0100
Fix redundant assignment of nAngle in switch
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index ff93abb..5fa6d82 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -180,8 +180,8 @@ sal_Int32 SvxOrientationItem::GetRotation( sal_Int32
nStdAngle ) const
sal_Int32 nAngle = nStdAngle;
switch( static_cast SvxCellOrientation ( GetValue() ) )
{
-case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
-case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;
+case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;break;
+case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;break;
default: ; //prevent warning
}
return nAngle;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/unocomponent
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx |4
++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0fa12e0b119ca4240b1acffd5a7958628f373af3
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 17:31:51 2012 +0100
Prefer prefix ++/-- operators for non-primitive types
diff --git
a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index a43b2ba..41b3d66 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -252,12 +252,12 @@ public:
void dump()
{
printf(Destinations:\n);
-for(ScannerTestServiceTokenMap::iterator
i=destMap.begin();i!=destMap.end();i++)
+for(ScannerTestServiceTokenMap::iterator
i=destMap.begin();i!=destMap.end();++i)
{
printf( %s\n, i-getStr());
}
printf(Ctrls:\n);
-for(ScannerTestServiceTokenMap::iterator
i=ctrlMap.begin();i!=ctrlMap.end();i++)
+for(ScannerTestServiceTokenMap::iterator
i=ctrlMap.begin();i!=ctrlMap.end();++i)
{
printf( %s\n, i-getStr());
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/chart/MultiPropertySetHandler.hxx |8
xmloff/source/core/RDFaImportHelper.cxx |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9032c7f63e28e5a9de00b3b868452581f6f5f145
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 17:55:24 2012 +0100
Some cppcheck cleaning
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx
b/xmloff/source/chart/MultiPropertySetHandler.hxx
index ab0ce3a..953e943 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -209,7 +209,7 @@ MultiPropertySetHandler::MultiPropertySetHandler
(::com::sun::star::uno::Referen
MultiPropertySetHandler::~MultiPropertySetHandler (void)
{
::std::map ::rtl::OUString, PropertyWrapperBase*,
OUStringComparison::iterator I;
-for (I=aPropertyList.begin(); I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(); I!=aPropertyList.end(); ++I)
delete I-second;
}
@@ -220,7 +220,7 @@ sal_BoolMultiPropertySetHandler::GetProperties (void)
::std::map ::rtl::OUString, PropertyWrapperBase*,
OUStringComparison::iterator I;
::com::sun::star::uno::Sequence ::rtl::OUString aNameList
(aPropertyList.size());
int i;
-for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
aNameList[i++] = I-second-msName;
if ( ! MultiGet(aNameList))
if ( ! SingleGet(aNameList))
@@ -243,7 +243,7 @@ sal_BoolMultiPropertySetHandler::MultiGet (const
::com::sun::star::uno::Se
int i;
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any
aValueList =
xMultiSet-getPropertyValues (rNameList);
-for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
I-second-SetValue (aValueList[i++]);
}
catch (const ::com::sun::star::beans::UnknownPropertyException)
@@ -269,7 +269,7 @@ sal_BoolMultiPropertySetHandler::SingleGet (const
::com::sun::star::uno::Se
{
::std::map ::rtl::OUString, PropertyWrapperBase*,
OUStringComparison::iterator I;
int i;
-for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); I++)
+for (I=aPropertyList.begin(),i=0; I!=aPropertyList.end(); ++I)
I-second-SetValue (xSingleSet-getPropertyValue
(rNameList[i++]));
}
catch (const ::com::sun::star::beans::UnknownPropertyException)
diff --git a/xmloff/source/core/RDFaImportHelper.cxx
b/xmloff/source/core/RDFaImportHelper.cxx
index 6b980d4..be466c8 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -236,7 +236,7 @@ RDFaReader::ReadCURIEs(::rtl::OUString const i_rCURIEs)
const
}
}
while (!CURIEs.isEmpty());
-if (!vec.size())
+if (vec.empty())
{
OSL_TRACE( ReadCURIEs: invalid CURIEs );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/XMLRedlineExport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b1b4f699fc47d2c40034453754d01a1bbb0a7734
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 17:58:35 2012 +0100
Prefer prefix ++/-- operators for non-primitive types
diff --git a/xmloff/source/text/XMLRedlineExport.cxx
b/xmloff/source/text/XMLRedlineExport.cxx
index 007aac1..917fb95 100644
--- a/xmloff/source/text/XMLRedlineExport.cxx
+++ b/xmloff/source/text/XMLRedlineExport.cxx
@@ -177,7 +177,7 @@ void XMLRedlineExport::ExportChangesList(
// iterate over changes list
for( ChangesListType::iterator aIter = pChangesList-begin();
aIter != pChangesList-end();
- aIter++ )
+ ++aIter )
{
ExportChangedRegion( *aIter );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svl/source
svl/source/numbers/zformat.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c8ef98c5ad22ba585a28d81360e15fe2dcefc3ad
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 18:30:07 2012 +0100
Add parenthesis for avoid false report by cppcheck
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 0aed979..aa7a243 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3840,7 +3840,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
nPrecExp = 0;
if (rInfo.nCntPost)// NachkommaStellen
{
-if (rInfo.nCntPost + nPrecExp 15 nPrecExp 15)
+if ((rInfo.nCntPost + nPrecExp) 15 nPrecExp 15)
{
sStr = ::rtl::math::doubleToUString( fNumber,
rtl_math_StringFormat_F, 15-nPrecExp, '.');
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/WW8FFData.cxx |2 +-
sw/source/filter/ww8/wrtw8nds.cxx |4 ++--
sw/source/filter/xml/XMLRedlineImportHelper.cxx |2 +-
sw/source/filter/xml/xmltexti.cxx |2 +-
sw/source/ui/dochdl/swdtflvr.cxx|2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit f96ac4aa501fb50150af9c9164f3bc1657f9c896
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 11 10:01:26 2012 +0100
Some cppcheck cleaning
diff --git a/sw/source/filter/ww8/WW8FFData.cxx
b/sw/source/filter/ww8/WW8FFData.cxx
index f6e665f..7f347d8 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -163,7 +163,7 @@ void WW8FFData::Write(SvStream * pDataStrm)
const ::rtl::OUString rEntry = *aIt;
WriteOUString(pDataStrm, rEntry, false);
-aIt++;
+++aIt;
}
}
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 53f95ad..1c7e87b 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1676,7 +1676,7 @@ bool MSWordExportBase::NearestBookmark( xub_StrLen
rNearest, const xub_StrLen n
{
bool bHasBookmark = false;
-if ( m_rSortedMarksStart.size( ) 0 )
+if ( !m_rSortedMarksStart.empty() )
{
IMark* pMarkStart = m_rSortedMarksStart.front();
xub_StrLen nNext = pMarkStart-GetMarkStart().nContent.GetIndex();
@@ -1687,7 +1687,7 @@ bool MSWordExportBase::NearestBookmark( xub_StrLen
rNearest, const xub_StrLen n
}
}
-if ( m_rSortedMarksEnd.size( ) 0 )
+if ( !m_rSortedMarksEnd.empty() )
{
IMark* pMarkEnd = m_rSortedMarksEnd[0];
xub_StrLen nNext = pMarkEnd-GetMarkEnd().nContent.GetIndex();
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 49a3110..b91a81b 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -330,7 +330,7 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
{
// delete all left over (and obviously incomplete) RedlineInfos (and map)
RedlineMapType::iterator aFind = aRedlineMap.begin();
-for( ; aRedlineMap.end() != aFind; aFind++ )
+for( ; aRedlineMap.end() != aFind; ++aFind )
{
RedlineInfo* pInfo = aFind-second;
diff --git a/sw/source/filter/xml/xmltexti.cxx
b/sw/source/filter/xml/xmltexti.cxx
index 4b77b18..d690dee 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -946,7 +946,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin(
aCommandSequence[nIndex].Handle = -1;
aCommandSequence[nIndex].Value = makeAny(
OUString((*aIter).second) );
aCommandSequence[nIndex].State =
beans::PropertyState_DIRECT_VALUE;
-aIter++, nIndex++;
+++aIter, ++nIndex;
}
// unfortunately the names of the properties are depending on the
object
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index adfa4d1..2760a7d 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -854,7 +854,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
// remove all DDE-Bookmarks, they are invalid inside the clipdoc!
for(::std::vector ::sw::mark::IMark* ::iterator ppMark =
vDdeMarks.begin();
ppMark != vDdeMarks.end();
-ppMark++)
+++ppMark)
pMarkAccess-deleteMark(*ppMark);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/dptabsrc.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 4c5fd7a27b5337c4da4f02133c2d023d4caebe66 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Mar 10 19:03:32 2012 +0100 Fix : statement following break will never be executed diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 3d41f86..65d70c7 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -2527,8 +2527,6 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const case SC_DAPI_LEVEL_DAY: nGroupBy = sheet::DataPilotFieldGroupBy::DAYS; break; -nGroupBy = sheet::DataPilotFieldGroupBy::YEARS; -break; default: ; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/vba/vbaapplication.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 638f68e68a1810ba3a3cd603c509745360b2ef8d
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 10 19:57:24 2012 +0100
Fix Prefer prefix ++/-- operators for non-primitive types
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index b51623c..c674791 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1667,7 +1667,7 @@ ScVbaApplication::GetSaveAsFilename( const
::com::sun::star::uno::Any InitialFi
{
break;
}
-aIt++;
+++aIt;
}
if ( !bValidFilter )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/vba/vbarange.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c604a738f48ffa4c12f7c9801d03a146303d3123
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 10 19:58:39 2012 +0100
Fix Possible null pointer dereference
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 6ae2d08..d8c3a9f 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4527,10 +4527,10 @@ ScVbaRange::AutoFilter( const uno::Any Field, const
uno::Any Criteria1, const
if ( xCurrent.is() )
{
ScVbaRange* pRange = getImplementation( xCurrent );
-if ( pRange-isSingleCellRange() )
-throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Can't create AutoFilter) ), uno::Reference
uno::XInterface () );
if ( pRange )
{
+if ( pRange-isSingleCellRange() )
+ throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Can't create AutoFilter) ), uno::Reference
uno::XInterface () );
RangeHelper currentRegion( pRange-mxRange );
autoFiltAddress =
currentRegion.getCellRangeAddressable()-getRangeAddress();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lotuswordpro/source sw/source writerfilter/source
lotuswordpro/source/filter/lwpfilter.cxx | 16
sw/source/filter/ww8/rtfimportfilter.cxx |2 +-
writerfilter/source/filter/WriterFilterDetection.cxx |2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 39c2a52d198f513c2f5afbd38dd9b14bff388d6e
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 3 14:56:17 2012 +0100
Avoid temporary rtl::OUString
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx
b/lotuswordpro/source/filter/lwpfilter.cxx
index 1f66f94..dc2bfee 100644
--- a/lotuswordpro/source/filter/lwpfilter.cxx
+++ b/lotuswordpro/source/filter/lwpfilter.cxx
@@ -114,7 +114,7 @@ sal_Bool LWPFilterReader::filter( const Sequence
PropertyValue aDescriptor )
for( sal_Int32 i = 0; i aDescriptor.getLength(); i++ )
{
//Note we should attempt to use InputStream if it exists first!
-if( aDescriptor[i].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(URL)) )
+if(
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL)) )
aDescriptor[i].Value = sURL;
}
@@ -218,11 +218,11 @@ Sequence OUString
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
sal_Int32 nPropertyCount = aDescriptor.getLength();
for( sal_Int32 nProperty=0; nPropertynPropertyCount; ++nProperty )
{
-if( aDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(TypeName)) )
+if(
aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(TypeName))
)
{
aDescriptor[nProperty].Value = aTypeName;
}
-else if( aDescriptor[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(AsTemplate)) )
+else if(
aDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(AsTemplate))
)
{
bOpenAsTemplate = sal_True;
}
@@ -232,17 +232,17 @@ Sequence OUString
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
{
OUString strTemp;
aDescriptor[i].Value = strTemp;
-if( aDescriptor[i].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(InputStream)) )
+if(
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(InputStream)) )
{
uno::Reference XInputStream rInputStream;
aDescriptor[i].Value = rInputStream;
//
-// TRANSFORM IMPLEMENTATION HERE!!
+// TODO TRANSFORM IMPLEMENTATION HERE!!
// and call m_DocumentHandler's SAX mDochods
//
if( IsWordproFile(rInputStream) )
{
-if( aTypeName ==
OUString(RTL_CONSTASCII_USTRINGPARAM(wordpro_template)) )
+if(
aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(wordpro_template)) )
{
if(!bOpenAsTemplate)
{
@@ -259,7 +259,7 @@ Sequence OUString
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
}
return ret;
}
-else if( aDescriptor[i].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(URL)) )
+else if(
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL)) )
{
OUStringsURL;
OUStringsFileName;
@@ -277,7 +277,7 @@ Sequence OUString
LWPFilterImportFilter::getSupportedServiceNames( void ) thro
//end with .lwp:
if( IsWordproFile(sURL) )
{
-if( aTypeName ==
OUString(RTL_CONSTASCII_USTRINGPARAM(wordpro_template)) )
+if(
aTypeName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(wordpro_template)) )
{
if(!bOpenAsTemplate)
{
diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx
b/sw/source/filter/ww8/rtfimportfilter.cxx
index 25f0a78..e3b553b 100644
--- a/sw/source/filter/ww8/rtfimportfilter.cxx
+++ b/sw/source/filter/ww8/rtfimportfilter.cxx
@@ -84,7 +84,7 @@ sal_Bool RtfImportFilter::filter( const uno::Sequence
beans::PropertyValue a
OUString sTemp;
for ( sal_Int32 i = 0; i aDescriptor.getLength(); i++ )
{
-if( aDescriptor[i].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM(URL)) )
+if(
aDescriptor[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(URL)) )
{
aDescriptor[i].Value = sTemp;
aURL = sTemp;
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx
b/writerfilter/source/filter/WriterFilterDetection.cxx
index ff2e22e..f9d9ca4 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -71,7 +71,7 @@ OUString WriterFilterDetection::detect( uno::Sequence
beans::PropertyValue r
uno::Reference io::XInputStream xInputStream;
for( sal_Int32 nProperty = 0; nProperty nPropertyCount; ++nProperty )
{
-if( pValues[nProperty].Name ==
OUString(RTL_CONSTASCII_USTRINGPARAM
[Libreoffice-commits] .: hwpfilter/source oox/source sax/source unoxml/source
hwpfilter/source/hwpreader.hxx |2 +-
oox/source/drawingml/shape.cxx |4 ++--
sax/source/fastparser/facreg.cxx |4 ++--
unoxml/source/dom/saxbuilder.cxx |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 5122196acc2e8e9d8e71dad3d941b373b09e0b03
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Mar 3 15:05:28 2012 +0100
Avoid temporary rtl::OUString
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 6a7ce4f..62205a7 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -351,7 +351,7 @@ extern C
OUString aImplementationName = OUString::createFromAscii(
pImplName );
-if (aImplementationName == OUString(RTL_CONSTASCII_USTRINGPARAM(
IMPLEMENTATION_NAME )) )
+if (aImplementationName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
IMPLEMENTATION_NAME )) )
{
xRet = createSingleFactory( xSMgr, aImplementationName,
HwpImportFilter_CreateInstance,
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 2b2d815..a2e29c5 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -383,7 +383,7 @@ Reference XShape Shape::createAndInsert(
aTransformation.scale(1/360.0, 1/360.0);
// special for lineshape
-if ( aServiceName ==
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.LineShape)) )
+if (
aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.drawing.LineShape))
)
{
::basegfx::B2DPolygon aPoly;
aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
@@ -404,7 +404,7 @@ Reference XShape Shape::createAndInsert(
maShapeProperties[ PROP_PolyPolygon ] = aPolyPolySequence;
}
-else if ( aServiceName ==
OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.drawing.ConnectorShape)) )
+else if (
aServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.drawing.ConnectorShape))
)
{
::basegfx::B2DPolygon aPoly;
aPoly.insert( 0, ::basegfx::B2DPoint( 0, 0 ) );
diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index 2f0eba3..35db3e1 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -52,13 +52,13 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
fastsax_component_getFactory(
OUString aImplementationName( OUString::createFromAscii( pImplName ) );
-if (aImplementationName == OUString( RTL_CONSTASCII_USTRINGPARAM(
PARSER_IMPLEMENTATION_NAME ) ) )
+if (aImplementationName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
PARSER_IMPLEMENTATION_NAME ) ) )
{
xRet = createSingleFactory( xSMgr, aImplementationName,
FastSaxParser_CreateInstance,
FastSaxParser::getSupportedServiceNames_Static() );
}
-else if (aImplementationName == OUString( RTL_CONSTASCII_USTRINGPARAM(
SERIALIZER_IMPLEMENTATION_NAME ) ) )
+else if (aImplementationName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
SERIALIZER_IMPLEMENTATION_NAME ) ) )
{
xRet = createSingleFactory( xSMgr, aImplementationName,
FastSaxSerializer_CreateInstance,
diff --git a/unoxml/source/dom/saxbuilder.cxx b/unoxml/source/dom/saxbuilder.cxx
index fb79fff..f91851b 100644
--- a/unoxml/source/dom/saxbuilder.cxx
+++ b/unoxml/source/dom/saxbuilder.cxx
@@ -231,7 +231,7 @@ namespace DOM
newprefix = attr_qname.copy(attr_qname.indexOf(':')+1);
aNSMap.insert(NSMap::value_type(newprefix, attr_value));
}
-else if (attr_qname ==
OUString(RTL_CONSTASCII_USTRINGPARAM(xmlns)))
+else if
(attr_qname.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(xmlns)))
{
// new default prefix
aNSMap.insert(NSMap::value_type(OUString(), attr_value));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_tools.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4a8710409fbf69fb4c3e175c1a17d72ea06576ef Author: Julien Nabet serval2...@yahoo.fr Date: Sat Mar 3 23:41:06 2012 +0100 Fix lacking break in switch diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 56aed72..84d9741 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -518,6 +518,7 @@ static bool isOperator( char c ) case '?': case '$': ret = true; +break; default: ret = false; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/ui/ControlScroller.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bad98a1aa71e1a76c6ca4033f82168fe5b098b64 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Feb 23 20:00:40 2012 +0100 fdo#46339: Fix Query Wizard by putting the right ElementName diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index a04d1c1..037a3ee 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -111,7 +111,7 @@ public abstract class ControlScroller iStartPosY = iCompPosY + SORELFIRSTPOSY; int ScrollHeight = iCompHeight - 2; nlineincrement = 1; -sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), imgBackground); +sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), TitleScrollBar); xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar + sIncSuffix, 0, new AdjustmentListenerImpl(), new String[] ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/com
wizards/com/sun/star/wizards/ui/ControlScroller.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3a326c16127c9f696e6e4e264729991c4ef4981 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Feb 23 20:00:40 2012 +0100 fdo#46339: Fix Query Wizard by putting the right ElementName diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index a04d1c1..037a3ee 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -111,7 +111,7 @@ public abstract class ControlScroller iStartPosY = iCompPosY + SORELFIRSTPOSY; int ScrollHeight = iCompHeight - 2; nlineincrement = 1; -sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), imgBackground); +sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), TitleScrollBar); xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar + sIncSuffix, 0, new AdjustmentListenerImpl(), new String[] ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vbahelper/source
vbahelper/source/vbahelper/vbapagesetupbase.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit b8629e45c3451c40777934b2cdc110d25be75faf
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Feb 17 23:02:06 2012 +0100
Fix never read reported by clang
diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
index 1cdca49..14deb67 100644
--- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx
+++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx
@@ -310,11 +310,6 @@ void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32
orientation ) throw (c
mxPageProps-setPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Width)), aHeight );
mxPageProps-setPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Height)), aWidth );
}
-
-if( isLandscape )
-{
-orientation = mnOrientLandscape;
-}
}
catch( uno::Exception )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 140c90f4302303faf146c4a509acfb1d21c26164 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Feb 18 08:03:35 2012 +0100 Fix pEncryptedData not initialized diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 30a8e11..5134008 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -149,6 +149,8 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( //remember the position of the element to be signed sal_Bool isParentRef = sal_True; +pEncryptedData = pTemplate-getNativeElement(); + xmlNodePtr pParent = pEncryptedData-parent; xmlNodePtr referenceNode; @@ -179,8 +181,6 @@ SAL_CALL XMLEncryption_NssImpl :: encrypt( return aTemplate; } -pEncryptedData = pTemplate-getNativeElement() ; - //Find the element to be encrypted. //Encrypt the template ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/source
tools/source/generic/poly.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2dd1722d2729f0d6cda6e31297f3e03ae36c555f
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 16 22:36:35 2012 +0100
Fix a bug found with cclang
Null pointer passed as an argument to a 'nonnull'
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 3c86a7a..4e71b35 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -88,7 +88,7 @@ ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, sal_Bool
bFlags )
if( bFlags )
{
mpFlagAry = new sal_uInt8[ nInitSize ];
-memset( mpPointAry, 0, nInitSize );
+memset( mpFlagAry, 0, nInitSize );
}
else
mpFlagAry = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - tools/source
tools/source/generic/poly.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9315b52380648c83db09b171a92134f8d2e4de5d
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 16 22:39:00 2012 +0100
Apply master fix 2dd1722d2729f0d6cda6e31297f3e03ae36c555f
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 14b34d3..a34e1e6 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -88,7 +88,7 @@ ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, sal_Bool
bFlags )
if( bFlags )
{
mpFlagAry = new sal_uInt8[ nInitSize ];
-memset( mpPointAry, 0, nInitSize );
+memset( mpFlagAry, 0, nInitSize );
}
else
mpFlagAry = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source
package/source/zippackage/ZipPackageStream.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 47e38fb11f9d6e76aefbee75eaf25e4344d03a20
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 12 14:29:55 2012 +0100
If we can have a few more information...
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index b3db1c6..5cb6720 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -538,9 +538,10 @@ uno::Reference io::XInputStream SAL_CALL
ZipPackageStream::getInputStream()
OSL_FAIL( ZipException thrown );//rException.Message);
return uno::Reference io::XInputStream ();
}
-catch ( Exception )
+catch ( Exception ex )
{
OSL_FAIL( Exception is thrown during stream wrapping!\n );
+OSL_FAIL(OUStringToOString(ex.Message,
RTL_TEXTENCODING_UTF8).getStr());
return uno::Reference io::XInputStream ();
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |2 --
1 file changed, 2 deletions(-)
New commits:
commit 5be2521a90766ba0dcefeb05af8b2bdaf06a53a0
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 12 17:41:05 2012 +0100
in_list_end never read, let's drop it
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 66b9025..a667e0a 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -822,7 +822,6 @@ int rc = 0;
off_t in_list_size = 0;
char* in_list;
char* in_list_cursor;
-char* in_list_end;
char* in_list_base;
struct hash* dep_hash;
char* base_dir;
@@ -842,7 +841,6 @@ char* base_dir;
if(!rc)
{
dep_hash = hash_create( kDEFAULT_HASH_SIZE);
-in_list_end = in_list + in_list_size;
in_list_base = in_list_cursor = in_list;
/* extract filename of dep file from a 'space' separated list */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unosrch.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 1fb6237c08b25e043ae70b16aa784d5a762612ef Author: Julien Nabet serval2...@yahoo.fr Date: Sun Feb 12 18:08:56 2012 +0100 Fix call delete twice on the same variable diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 9ad8a5f..5af5aa6 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -428,7 +428,6 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet rSet, sal_Bool bIsValueSea } delete pBoxItem; delete pBreakItem; -delete pBreakItem ; delete pAutoKernItem ; delete pWLineItem; delete pTabItem; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/propctrlr/formmetadata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5972e4db625500261d924028189793c7d51b576e Author: Julien Nabet serval2...@yahoo.fr Date: Sat Feb 11 14:04:11 2012 +0100 Fix cppcheck warning same expression on both sides of '|' diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 7b1e069..957d9d1 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -166,7 +166,7 @@ namespace pcr DEF_INFO_3( ALLOWADDITIONS,ALLOW_ADDITIONS,ALLOW_ADDITIONS, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), DEF_INFO_3( ALLOWEDITS,ALLOW_EDITS,ALLOW_EDITS, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), DEF_INFO_3( ALLOWDELETIONS,ALLOW_DELETIONS,ALLOW_DELETIONS, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), -DEF_INFO_4( INSERTONLY,DATAENTRY, DATAENTRY, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE, COMPOSEABLE ), +DEF_INFO_3( INSERTONLY,DATAENTRY, DATAENTRY, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), DEF_INFO_4( NAVIGATION,NAVIGATION, NAVIGATION, FORM_VISIBLE, DATA_PROPERTY, ENUM, COMPOSEABLE ), DEF_INFO_4( CYCLE, CYCLE, CYCLE, FORM_VISIBLE, DATA_PROPERTY, ENUM, COMPOSEABLE ), DEF_INFO_3( FILTERPROPOSAL,FILTERPROPOSAL, FILTERPROPOSAL, FORM_VISIBLE, DATA_PROPERTY, COMPOSEABLE ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: linguistic/source
linguistic/source/spelldsp.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fef3122259092e03b3cf11721171d4b621c3a97f
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Feb 11 17:34:20 2012 +0100
Avoid Possible null pointer dereference in linguistic/source/spelldsp.hxx
(Thank you to Ivan and Riccardo for their suggestions)
diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx
index 9ae9cd4..e2186f9 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -73,7 +73,7 @@ class SpellCheckerDispatcher :
::com::sun::star::linguistic2::XSearchableDictionaryList xDicList;
LngSvcMgr rMgr;
-linguistic::SpellCache *pCache; // Spell Cache (holds known words)
+mutable linguistic::SpellCache *pCache; // Spell Cache (holds known
words)
// disallow copy-constructor and assignment-operator for now
SpellCheckerDispatcher(const SpellCheckerDispatcher );
@@ -134,7 +134,7 @@ public:
inline linguistic::SpellCache SpellCheckerDispatcher::GetCache() const
{
if (!pCache)
-((SpellCheckerDispatcher *) this)-pCache = new
linguistic::SpellCache();
+pCache = new linguistic::SpellCache();
return *pCache;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/bootstrp
tools/bootstrp/cppdep.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 992e1a772e01a53673fb6cdd3467102a486f4e59
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 5 09:27:48 2012 +0100
Some cppcheck cleaning
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 3c3fd61..979201b 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -150,12 +150,8 @@ rtl::OString CppDep::Exists(const rtl::OString rFileName)
if ( stat( pFullName, aBuf ) == 0 )
{
#ifdef DEBUG_VERBOSE
-fprintf( stderr, Got Dependency , pFullName );
+fprintf( stderr, Got Dependency %s \\\n, pFullName );
#endif
-#ifdef DEBUG_VERBOSE
-fprintf( stderr, %s \\\n, pFullName );
-#endif
-
return rtl::OString(pFullName);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx|2 -- bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx |2 -- bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx |2 -- bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx|2 -- 17 files changed, 34 deletions(-) New commits: commit 9377bb4dcc0d179293c044663c0bea5a113b64d9 Author: Julien Nabet serval2...@yahoo.fr Date: Sun Feb 5 10:19:40 2012 +0100 Some cppcheck cleaning diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx index 457b4f6..ca6b6a5 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/cpp2uno.cxx @@ -442,8 +442,6 @@ static typelib_TypeClass cpp_mediate( throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no member description found! )), (XInterface *)pThis ); -// is here for dummy -eRet = typelib_TypeClass_VOID; } } diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx index bc049b5..eed34e3 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx @@ -490,8 +490,6 @@ static typelib_TypeClass cpp_mediate( throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no member description found! )), (XInterface *)pCppI ); -// is here for dummy -eRet = typelib_TypeClass_VOID; } } diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index 91b96cd..d347aa0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -393,8 +393,6 @@ namespace throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( no member description found! )), (XInterface *)pCppI ); -// is here for dummy -eRet = typelib_TypeClass_VOID; } } diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index e962174..e2d9f83 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -533,8 +533,6 @@ namespace throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( no member description found! )), (XInterface *)pCppI ); -// is here for dummy -eRet = typelib_TypeClass_VOID; } } diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx index c496ab0..12ba0f6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx @@ -473,8 +473,6 @@ static typelib_TypeClass cpp_mediate( throw RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( no member description found! )), (XInterface *)pThis ); -// is here for dummy -eRet = typelib_TypeClass_VOID; } } diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index 7c46d1a..6cc5cce 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -401,8 +401,6 @@ namespace throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( no member description found! )), (XInterface *)pCppI ); -// is here for dummy -eRet = typelib_TypeClass_VOID; } } diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index f1597c3..a275312 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno
[Libreoffice-commits] .: comphelper/source cui/source filter/source framework/source sfx2/source svl/source svx/source
comphelper/source/misc/mediadescriptor.cxx|8 ++--
cui/source/customize/cfgutil.cxx | 24 +++---
filter/source/config/cache/filtercache.cxx|4 +-
framework/source/dispatch/dispatchinformationprovider.cxx |4 +-
framework/source/services/pathsettings.cxx| 12 +++
sfx2/source/appl/appserv.cxx |8 ++--
sfx2/source/appl/workwin.cxx |8 ++--
svl/source/config/itemholder2.cxx |4 +-
svx/source/unodraw/recoveryui.cxx |4 +-
9 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit fa6665282e2a7c8753eb35b2f03499134413caca
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 5 10:49:59 2012 +0100
Some cppcheck cleaning
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 90b713c..038e718 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -369,8 +369,8 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
}
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException )
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -750,8 +750,8 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const
::rtl::OUString sURL, s
return xUriRef-getUriReference();
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f5fb4a8..02055ae 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -172,8 +172,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
if (xStyle.is())
xStyle-getPropertyValue(STYLEPROP_UINAME) = aStyle.sLabel;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ aStyle.sLabel = ::rtl::OUString(); }
@@ -212,8 +212,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
else
xFamilyInfo-getPropertyValue(STYLEPROP_UINAME) =
aFamilyInfo.sLabel;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ return ::std::vector SfxStyleInfo_Impl (); }
@@ -236,8 +236,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
xFamilies-getByName(sFamily) = xStyleSet;
lStyleNames = xStyleSet-getElementNames();
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ return ::std::vector SfxStyleInfo_Impl (); }
@@ -259,8 +259,8 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl
aStyle)
continue;
xStyle-getPropertyValue(PROP_UINAME) = aStyleInfo.sLabel;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ continue; }
@@ -513,8 +513,8 @@ void SfxConfigGroupListBox_Impl::InitModule()
pEntry-SetUserData(pInfo);
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
@@ -879,8 +879,8 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference
XComponentContext xC
sUIName =
lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Name)
), ::rtl::OUString());
}
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(css::uno::Exception)
{ sUIName = ::rtl::OUString(); }
diff --git a/filter/source/config/cache/filtercache.cxx
b/filter/source/config/cache/filtercache.cxx
index b623e13..ca1af31 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -931,8 +931,8 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const
::rtl::OUString sDirect
{
aValue = xAccess-getByName(sKey);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit df58753d51c41253f26104d146a73ba74c42e33e
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Feb 5 13:23:59 2012 +0100
Remove wrong return
This return prevented the execution of the following code
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index f3c768d..865c906 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -1039,8 +1039,6 @@ Reference XResultSet SAL_CALL
MacabDatabaseMetaData::getProcedures(
Reference XResultSet SAL_CALL MacabDatabaseMetaData::getVersionColumns(
const Any, const ::rtl::OUString, const ::rtl::OUString table )
throw(SQLException, RuntimeException)
{
-return new ODatabaseMetaDataResultSet(
ODatabaseMetaDataResultSet::eVersionColumns );
-
::connectivity::ODatabaseMetaDataResultSet* pResult = new
::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
Reference XResultSet xRef = pResult;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/scmod.cxx|2 +-
sc/source/ui/view/cellsh1.cxx |2 +-
sc/source/ui/view/editsh.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit bf2300fb0704f92f312b96b2e624a1730df5dd45
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Feb 4 21:50:55 2012 +0100
Fix 3 Possible inefficient checking
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 47ef6b9..a9da20e 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2162,7 +2162,7 @@ sal_Bool ScModule::UnregisterRefWindow( sal_uInt16
nSlotId, Window *pWnd )
rlRefWindow.erase( i );
-if( !rlRefWindow.size() )
+if( rlRefWindow.empty() )
m_mapRefWindow.erase( nSlotId );
return sal_True;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e9a574f..603d7b8 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1836,7 +1836,7 @@ void ScCellShell::ExecuteEdit( SfxRequest rReq )
pScMod-InputKeyEvent( KeyEvent('=',KeyCode())
);
std::vectorrtl::OUString aNames =
pDlg-GetSelectedNames();
-if (aNames.size())
+if (!aNames.empty())
{
rtl::OUStringBuffer aBuffer;
for
(std::vectorrtl::OUString::const_iterator itr = aNames.begin();
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index c843e96..e339b2c 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -438,7 +438,7 @@ void ScEditShell::Execute( SfxRequest rReq )
if ( nRet == BTN_PASTE_NAME )
{
std::vectorrtl::OUString aNames =
pDlg-GetSelectedNames();
-if (aNames.size())
+if (!aNames.empty())
{
rtl::OUStringBuffer aBuffer;
for (std::vectorrtl::OUString::const_iterator itr =
aNames.begin();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/fields/cellfml.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9d0136679e441413b6945d2a40aa892b50ee19a8
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Feb 3 21:58:38 2012 +0100
Fix iterator erase management (thank you Stephan)
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 33b953e..99e48df 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -959,7 +959,7 @@ void SwTableFormula::GetBoxes( const SwTableBox rSttBox,
break;
// dann mal die Tabellenkoepfe raus:
-for( SwSelBoxes::iterator it = rBoxes.begin(); it != rBoxes.end();
++it )
+for( SwSelBoxes::iterator it = rBoxes.begin(); it != rBoxes.end();
)
{
pLine = it-second-GetUpper();
while( pLine-GetUpper() )
@@ -968,7 +968,10 @@ void SwTableFormula::GetBoxes( const SwTableBox rSttBox,
if( pTbl-IsHeadline( *pLine ) )
{
rBoxes.erase( it++ );
---it;
+}
+else
+{
+++it;
}
}
} while( sal_False );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source svx/source
framework/source/accelerators/globalacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/moduleacceleratorconfiguration.cxx |4 +--
framework/source/accelerators/presethandler.cxx | 12
+-
framework/source/services/autorecovery.cxx | 10
svx/source/unodraw/unoshcol.cxx |4 +--
5 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit f58c49b39a7c6a8490033360f78768ee0a26f167
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 2 22:53:48 2012 +0100
Some cppcheck cleaning
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx
b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 84da269..c5853f8 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -119,8 +119,8 @@ void GlobalAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster-addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 9c3fb8f..7100685 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -153,8 +153,8 @@ void ModuleAcceleratorConfiguration::impl_ts_fillCache()
m_xCfgListener = new WeakChangesListener(this);
xBroadcaster-addChangesListener(m_xCfgListener);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index d276b48..b68fdc4 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -501,8 +501,8 @@ void PresetHandler::connectToResource(
PresetHandler::EConfigType
xUser = m_lDocumentStorages.openPath(sRelPathUser , eUserMode
);
xShare = xUser;
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ xShare.clear(); xUser.clear(); }
}
@@ -822,8 +822,8 @@ css::uno::Reference css::embed::XStorage
PresetHandler::impl_openPathIgnoring
else
xPath = m_aSharedStorages-m_lStoragesUser.openPath(sPath, eMode);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{ xPath.clear(); }
return xPath;
@@ -921,8 +921,8 @@ css::uno::Reference css::embed::XStorage
PresetHandler::impl_openLocalizedPat
if (xFolder-isStorageElement(pNames[i]))
lSubFolders.push_back(pNames[i]);
}
-catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+catch(const css::uno::RuntimeException)
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 6d2b6b6..cae935b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1336,7 +1336,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = 0;
}
-catch(const css::uno::Exception ex)
+catch(const css::uno::Exception)
{
// a) FULL DISC seams to be the problem behind
= show error and retry it forever (e.g. retry=300)
// b) unknown problem (may be locking problem)
= reset RETRY value to more usefull value(!) (e.g. retry=3)
@@ -1355,7 +1355,7 @@ void AutoRecovery::implts_flushConfigItem(const
AutoRecovery::TDocumentInfo rIn
nRetry = RETRY_STORE_ON_MIGHT_FULL_DISC_USEFULL;
else
if (nRetry = GIVE_UP_RETRY)
-throw ex; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
+throw; // force stacktrace to know if there exist might
other reasons, why an AutoSave can fail !!!
--nRetry;
}
@@ -2374,7 +2374,7 @@ void
[Libreoffice-commits] .: sc/inc sc/source unusedcode.easy
sc/inc/nameuno.hxx |5 -
sc/source/ui/unoobj/nameuno.cxx |8
unusedcode.easy |1 -
3 files changed, 14 deletions(-)
New commits:
commit 0dbda27fb81bc063c865a6829fb035322fd77035
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Feb 2 23:18:07 2012 +0100
Remove things not used
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index a83748c..ee66e26 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -173,11 +173,6 @@ public:
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames()
throw(::com::sun::star::uno::RuntimeException);
-
-// methods accessible via getImplementation()
-voidSetContentWithGrammar( const ::rtl::OUString
aContent,
-const formula::FormulaGrammar::Grammar
eGrammar )
-throw(::com::sun::star::uno::RuntimeException);
};
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index efb00e6..48baee8 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -265,14 +265,6 @@ void SAL_CALL ScNamedRangeObj::setContent( const
rtl::OUString aContent )
Modify_Impl( NULL, NULL, aContStr, NULL,
NULL,formula::FormulaGrammar::GRAM_PODF_A1 );
}
-void ScNamedRangeObj::SetContentWithGrammar( const ::rtl::OUString aContent,
-const formula::FormulaGrammar::Grammar
eGrammar )
-throw(::com::sun::star::uno::RuntimeException)
-{
-String aContStr(aContent);
-Modify_Impl( NULL, NULL, aContStr, NULL, NULL, eGrammar );
-}
-
table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition()
throw(uno::RuntimeException)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 15364fe..28a91d7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -176,7 +176,6 @@ ScMyCellInfo::ScMyCellInfo()
ScMyStyleRanges::SetStylesToRanges(ScRangeList*, rtl::OUString const*, short,
rtl::OUString const*, ScXMLImport)
ScMyStyleRanges::SetStylesToRanges(ScRangeListRef, rtl::OUString const*,
short, rtl::OUString const*, ScXMLImport)
ScNameDefDlg::LinkStubEdModifyHdl(void*, void*)
-ScNamedRangeObj::SetContentWithGrammar(rtl::OUString const,
formula::FormulaGrammar::Grammar)
ScNamedRangeObj::getImplementation(com::sun::star::uno::Referencecom::sun::star::uno::XInterface)
ScOutputData::DrawEditParam::getEngineWidth(ScFieldEditEngine*) const
ScRTFColTwips::Insert(ScRTFColTwips const*, unsigned short, unsigned short)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/accessibility/AccessibleStaticTextBase.cxx |2 +-
sw/source/core/doc/ftnidx.cxx | 10 ++
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 428c9d516d3408460f1b7f8ce2c753b9a829de87
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 19:36:28 2012 +0100
Some cppcheck cleaning
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 9e234d9..734dc1b 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -344,7 +344,7 @@ namespace accessibility
{
// Keep 'invalid' values at the TextSegment
if( aTextSegment.SegmentStart != -1
-aTextSegment.SegmentStart != -1 )
+aTextSegment.SegmentEnd != -1 )
{
// #112814# Correct TextSegment by paragraph offset
sal_Int32 nOffset(0);
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 3ccd856..52f9873 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -192,10 +192,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex rStt )
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
@@ -281,10 +278,7 @@ void SwFtnIdxs::UpdateAllFtn()
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/helper/propertymap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 34c5059b80777244e25dee1299ea258c8d7ba4fe
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 21:40:29 2012 +0100
Fix Prefer prefix ++/-- operators for non-primitive types
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index 0bf875c..bf92f7a 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -236,7 +236,7 @@ const Any* PropertyMap::getProperty( sal_Int32 nPropId )
const
void PropertyMap::assignAll( const PropertyMap rPropMap )
{
-for( PropertyMap::const_iterator it=rPropMap.begin(); it !=
rPropMap.end(); it++ )
+for( PropertyMap::const_iterator it=rPropMap.begin(); it !=
rPropMap.end(); ++it )
(*this)[it-first] = it-second;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source extensions/source filter/source framework/source sfx2/source
desktop/source/deployment/registry/dp_backend.cxx |2 +-
extensions/source/ole/oleobjw.cxx |2 --
filter/source/config/cache/basecontainer.cxx |2 +-
filter/source/config/cache/filterfactory.cxx |6 +++---
filter/source/config/cache/typedetection.cxx |2 +-
filter/source/msfilter/svdfppt.cxx|2 +-
framework/source/services/modulemanager.cxx |2 +-
sfx2/source/notify/eventsupplier.cxx |4 ++--
sfx2/source/view/ipclient.cxx |4 ++--
9 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit f2d66c1c50f81a2694447e8b197eb6ac97f7
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 22:52:43 2012 +0100
Some cppcheck cleaning
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index cbb1bec..f25c8a8 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -309,7 +309,7 @@ void PackageRegistryBackend::deleteUnusedFolders(
//In case the folder containing all the data folder does not
//exist yet, we ignore the exception
if (e.Code != ucb::IOErrorCode_NOT_EXISTING)
-throw e;
+throw;
}
}
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 9d203c8..de7abc0 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -2171,8 +2171,6 @@ Any
IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc aFuncDesc,
BasicErrorException aBasicErrExp(message,
ReferenceXInterface(), nErrorCode, message);
throw InvocationTargetException(message,
ReferenceXInterface(), makeAny(aBasicErrExp));
// End add
-
-break;
}
case DISP_E_MEMBERNOTFOUND:
message = OUSTR([automation bridge]: A function with the name \)
diff --git a/filter/source/config/cache/basecontainer.cxx
b/filter/source/config/cache/basecontainer.cxx
index 7fa2faa..642c726 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -344,7 +344,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const
::rtl::OUString sItem)
}
catch(const css::container::NoSuchElementException exNotExist)
{
-throw exNotExist;
+throw;
}
catch(const css::uno::Exception)
{
diff --git a/filter/source/config/cache/filterfactory.cxx
b/filter/source/config/cache/filterfactory.cxx
index 4620b3e..cbd1e7e 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -415,7 +415,7 @@ OUStringList
FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
lResult.push_back(sName);
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{ continue; }
}
@@ -540,7 +540,7 @@ OUStringList
FilterFactory::impl_getListOfInstalledModules() const
return lModules;
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -634,7 +634,7 @@ OUStringList
FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
}
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 7a5ec96..0a06025 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -966,7 +966,7 @@ void
TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor rDescript
xSeek-seek(0);
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 326c56f..2b9f19f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7319,7 +7319,7 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference XCell xCell )
}
}
-void ApplyCellLineAttributes( const SdrObject* pLine, Reference XTable
xTable, const std::vector sal_Int32 vPositions, sal_Int32 nColumns )
+void ApplyCellLineAttributes( const SdrObject* pLine, Reference XTable
xTable, const std::vector sal_Int32 vPositions, sal_Int32 nColumns )
{
try
{
diff --git a/framework/source/services/modulemanager.cxx
b/framework/source/services/modulemanager.cxx
index 4cec298..9ae3cfd 100644
--- a/framework/source/services/modulemanager.cxx
+++ b
[Libreoffice-commits] .: cui/source
cui/source/customize/acccfg.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a3e9dedc68658bb62f7b58040f6fcaf4e03ed93e
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jan 31 22:49:51 2012 +0100
Fix Throwing a copy of the caught exception instead of rethrowing
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 9a2a918..5c79188 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -885,7 +885,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
m_xModule = css::uno::Reference css::ui::XAcceleratorConfiguration
(xUICfgManager-getShortCutManager(), css::uno::UNO_QUERY_THROW);
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{ m_xSMGR.clear(); }
}
@@ -1021,7 +1021,7 @@ void SfxAcceleratorConfigPage::Apply(const
css::uno::Reference css::ui::XAccele
xAccMgr-removeKeyEvent(aAWTKey);
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -1299,7 +1299,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl,
sfx2::FileDialogHelper*, EMPTYARG
}
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -1401,7 +1401,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SaveHdl,
sfx2::FileDialogHelper*, EMPTYARG
}
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -1438,7 +1438,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet(
SfxItemSet )
m_xAct-store();
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{ return sal_False; }
@@ -1527,7 +1527,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const
String sCommand)
}
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/filter/filter.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4d83e7010870fb8d74b19c28f1c4cd3fa616f514
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jan 31 22:56:20 2012 +0100
Fix Possible inefficient checking for 'rChunkData' emptiness
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index bd95ab7..ee1f329 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -1961,7 +1961,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic
rGraphic, const String
if ( aAdditionalChunkSequence[ j
].Value = aByteSeq )
{
std::vector
vcl::PNGWriter::ChunkData rChunkData = aPNGWriter.GetChunks();
-if ( rChunkData.size() )
+if ( !rChunkData.empty() )
{
sal_uInt32 nChunkLen =
aByteSeq.getLength();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx | 23 +++
1 file changed, 3 insertions(+), 20 deletions(-)
New commits:
commit 6c779863bbd25499f4c7dff7d201403ebef898be
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 19:00:00 2012 +0100
Fix Found duplicate branches for if and else
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index bf1b89f..196b013 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -332,27 +332,10 @@ bool WinSalInstance::CheckYieldMutex()
bool bRet = true;
SalData*pSalData = GetSalData();
DWORD nCurThreadId = GetCurrentThreadId();
-if ( pSalData-mnAppThreadId != nCurThreadId )
-{
-if ( pSalData-mpFirstInstance )
-{
-SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-if ( pYieldMutex-mnThreadId != nCurThreadId )
-{
-bRet = false;
-}
-}
-}
-else
+if ( pSalData-mpFirstInstance )
{
-if ( pSalData-mpFirstInstance )
-{
-SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-if ( pYieldMutex-mnThreadId != nCurThreadId )
-{
-bRet = false;
-}
-}
+SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
+bRet = (pYieldMutex-mnThreadId == nCurThreadId);
}
return bRet;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 9b6cb7319e46a2da6f5d3e3f748f103cb508f698
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 21:16:20 2012 +0100
Just some simplification
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 196b013..d0a6bd0 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -329,15 +329,13 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount )
bool WinSalInstance::CheckYieldMutex()
{
-bool bRet = true;
SalData*pSalData = GetSalData();
-DWORD nCurThreadId = GetCurrentThreadId();
if ( pSalData-mpFirstInstance )
{
SalYieldMutex* pYieldMutex =
pSalData-mpFirstInstance-mpSalYieldMutex;
-bRet = (pYieldMutex-mnThreadId == nCurThreadId);
+return (pYieldMutex-mnThreadId == (GetCurrentThreadId()));
}
-return bRet;
+return true;
}
// ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/filter/sgvtext.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 10bfc4df5335c6cd2ae700df7485668d896998b5 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jan 30 21:21:34 2012 +0100 Replace literal control characters (thank you Eike !) diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx index 8848c1f..28f950b 100644 --- a/svtools/source/filter/sgvtext.cxx +++ b/svtools/source/filter/sgvtext.cxx @@ -136,10 +136,10 @@ extern SgfFontLst* pSgfFonts; //EscBold, EscLSlnt,EscRSlnt,EscUndln,EscDbUnd,EscKaptF,EscStrik,EscDbStk, //EscSupSc,EscSubSc,Esc2DShd,Esc3DShd,Esc4DShd]; // Justify muss spaetestens am Anfang des Absatzes stehen -#define EscSet' ' /* Flag setzen */ -#define EscReset ' ' /* Flag loeschen */ +#define EscSet'\x1e' /* Flag setzen */ +#define EscReset '\x1f' /* Flag loeschen */ #define EscDeflt '\x11' /* Flag auf default setzen */ -#define EscToggl ' ' /* Flag Toggeln */ +#define EscToggl '\x1d' /* Flag Toggeln */ #define EscRelat '%' #define EscNoFlg 0 #define EscNoVal -2147483647 /* -MaxLongInt */ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/gio/gio_datasupplier.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 400f715ad7ebecb9c657fed4ade40bd5135efde2 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jan 30 22:05:13 2012 +0100 Don't repeat a return ! diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 252cbbf..57e4300 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -138,8 +138,6 @@ DataSupplier::~DataSupplier() maResults[ nIndex ]-aId = aId; return aId; - -return aId; } return ::rtl::OUString(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/vba/vbaselection.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 17dcc215e0501dfb0821c0ee42ab5ae5699caae2
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 30 22:28:39 2012 +0100
Don't need a break after a throw
diff --git a/sw/source/ui/vba/vbaselection.cxx
b/sw/source/ui/vba/vbaselection.cxx
index 4ddee39..14152f8 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -163,7 +163,6 @@ SwVbaSelection::HomeKey( const uno::Any _unit, const
uno::Any _extend ) throw
default:
{
throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Not implemented) ), uno::Reference
uno::XInterface () );
-break;
}
}
}
@@ -199,7 +198,6 @@ SwVbaSelection::EndKey( const uno::Any _unit, const
uno::Any _extend ) throw (
default:
{
throw uno::RuntimeException( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(Not implemented) ), uno::Reference
uno::XInterface () );
-break;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 82a061079ae03f841713fd26c809d45621a59836
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 23 21:09:24 2012 +0100
Fix fdo#44040 VIEWING: Crash when page preview after f4 (data sources)
Caolán fixed Iterator management which was buggy. (thank you !)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 4d980a0..6e31141 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1410,24 +1410,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const
EventObject _rSource ) thr
Reference XDispatch xSource(_rSource.Source, UNO_QUERY);
if(xSource.is())
{
-for ( ExternalFeaturesMap::iterator aLoop =
m_aExternalFeatures.begin();
- aLoop != m_aExternalFeatures.end();
- ++aLoop
-)
+ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
+ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end();
+while (aLoop != aEnd)
{
-if ( aLoop-second.xDispatcher.get() == xSource.get() )
+ExternalFeaturesMap::iterator aI = aLoop++;
+if ( aI-second.xDispatcher.get() == xSource.get() )
{
-ExternalFeaturesMap::iterator aPrevious = aLoop;
---aPrevious;
+sal_uInt16 nSlot = aI-first;
// remove it
-m_aExternalFeatures.erase( aLoop );
+m_aExternalFeatures.erase(aI);
// maybe update the UI
-implCheckExternalSlot(aLoop-first);
+implCheckExternalSlot(nSlot);
// continue, the same XDispatch may be resposible for more
than one URL
-aLoop = aPrevious;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/ui/browser/unodatbr.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit 4d60e1a0832dafe05b4eecee7c9607bbd2ce1b07
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 23 21:22:59 2012 +0100
Fix fdo#44040 VIEWING: Crash when page preview after f4 (data sources)
Caolán fixed iterator management which was buggy. (thank you !)
(cherry picked from commit 82a061079ae03f841713fd26c809d45621a59836)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 9ca1392..7567542 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1410,24 +1410,22 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const
EventObject _rSource ) thr
Reference XDispatch xSource(_rSource.Source, UNO_QUERY);
if(xSource.is())
{
-for ( ExternalFeaturesMap::iterator aLoop =
m_aExternalFeatures.begin();
- aLoop != m_aExternalFeatures.end();
- ++aLoop
-)
+ExternalFeaturesMap::iterator aLoop = m_aExternalFeatures.begin();
+ExternalFeaturesMap::iterator aEnd = m_aExternalFeatures.end();
+while (aLoop != aEnd)
{
-if ( aLoop-second.xDispatcher.get() == xSource.get() )
+ExternalFeaturesMap::iterator aI = aLoop++;
+if ( aI-second.xDispatcher.get() == xSource.get() )
{
-ExternalFeaturesMap::iterator aPrevious = aLoop;
---aPrevious;
+sal_uInt16 nSlot = aI-first;
// remove it
-m_aExternalFeatures.erase( aLoop );
+m_aExternalFeatures.erase(aI);
// maybe update the UI
-implCheckExternalSlot(aLoop-first);
+implCheckExternalSlot(nSlot);
// continue, the same XDispatch may be resposible for more
than one URL
-aLoop = aPrevious;
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/wrtw8esh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0d5167915b47df7c3e450614ea50d845ba959df3
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 21 09:30:05 2012 +0100
Fix Possible inefficient checking for 'aChrSetArr' emptiness
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 3d3cc83..86e9a4a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -888,7 +888,7 @@ void MSWord_SdrAttrIter::NextPara( sal_uInt16 nPar )
rtl_TextEncoding MSWord_SdrAttrIter::GetNextCharSet() const
{
-if( aChrSetArr.size() )
+if( !aChrSetArr.empty() )
return (rtl_TextEncoding)aChrSetArr[ aChrSetArr.size() - 1 ];
return eNdChrSet;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/webdav/LockEntrySequence.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9dfa70c22d4f3ad480ffb98c0c8e1ea40f03dc18 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jan 16 20:45:44 2012 +0100 Fix Same expression on both sides of '||' diff --git a/ucb/source/ucp/webdav/LockEntrySequence.cxx b/ucb/source/ucp/webdav/LockEntrySequence.cxx index 49e5547..075af01 100644 --- a/ucb/source/ucp/webdav/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav/LockEntrySequence.cxx @@ -171,7 +171,7 @@ extern C int LockEntrySequence_endelement_callback( break; case STATE_LOCKENTRY: -if ( !pCtx-hasType || !pCtx-hasType ) +if ( !pCtx-hasType || !pCtx-hasScope ) return 1; // abort break; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source writerperfect/source
sw/source/core/crsr/findfmt.cxx |2 +-
sw/source/core/layout/ftnfrm.cxx |2 +-
sw/source/core/layout/pagechg.cxx |2 +-
sw/source/filter/ww8/ww8par6.cxx |2 +-
writerperfect/source/filter/FontStyle.cxx |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 79eb7c0cab7a7b4e0583e9582ad5e7f9e81af7d7
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 14 11:29:07 2012 +0100
Some cppcheck cleaning
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index 058a5f4..7902ab5 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -59,7 +59,7 @@ sal_Bool SwPaM::Find( const SwFmt rFmt, SwMoveFn fnMove,
while( !bFound
0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly )))
{
-if( 0 != ( bFound = pNode-GetFmtColl() == rFmt ))
+if( 0 != ( bFound = (pNode-GetFmtColl() == rFmt) ))
{
// wurde die FormatCollection gefunden, dann handelt es sich auf
// jedenfall um einen SwCntntNode !!
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 1b4a14e..d485bc1 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -3008,7 +3008,7 @@ sal_Bool SwCntntFrm::MoveFtnCntFwd( sal_Bool bMakePage,
SwFtnBossFrm *pOldBoss )
sal_Bool bSameBoss = sal_True;
SwFtnBossFrm * const pNewBoss = pNewUpper-FindFtnBossFrm();
//Wechseln wir die Spalte/Seite?
-if ( sal_False == ( bSameBoss = pNewBoss == pOldBoss ) )
+if ( sal_False == ( bSameBoss = (pNewBoss == pOldBoss) ) )
{
bSamePage = pOldBoss-FindPageFrm() == pNewBoss-FindPageFrm(); //
Seitenwechsel?
pNewUpper-Calc();
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index 79d7d1b..55fdefe 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -246,7 +246,7 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib,
SwPageDesc *pPgDsc ) :
//Body-Bereich erzeugen und einsetzen, aber nur wenn ich nicht gerade
//eine Leerseite bin.
SwDoc *pDoc = pFmt-GetDoc();
-if ( sal_False == (bEmptyPage = pFmt == pDoc-GetEmptyPageFmt()) )
+if ( sal_False == (bEmptyPage = (pFmt == pDoc-GetEmptyPageFmt())) )
{
bEmptyPage = sal_False;
Calc(); //Damit die PrtArea stimmt.
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 4db2f04..e83b262 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1540,7 +1540,7 @@ bool SwWW8ImplReader::SetFlyBordersShadow(SfxItemSet
rFlySet,
static void FlySecur1(short rSize, const bool bBorder)
{
short nMin = MINFLY +
-bBorder ? MAX_BORDER_SIZE : MAX_EMPTY_BORDER;
+(bBorder ? MAX_BORDER_SIZE : MAX_EMPTY_BORDER);
if ( rSize nMin )
rSize = nMin;
diff --git a/writerperfect/source/filter/FontStyle.cxx
b/writerperfect/source/filter/FontStyle.cxx
index b2d0080..7e94b4a 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -61,7 +61,7 @@ void
FontStyleManager::writeFontsDeclaration(OdfDocumentHandler *pHandler) const
{
TagOpenElement(office:font-face-decls).write(pHandler);
std::mapWPXString, shared_ptrFontStyle, ltstr::const_iterator iter;
-for (iter = mStyleHash.begin(); iter != mStyleHash.end(); iter++)
+for (iter = mStyleHash.begin(); iter != mStyleHash.end(); ++iter)
{
(iter-second)-write(pHandler);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/main/ChartView.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c447d9ba8c7d40670c59a9ec9d45f32a36c1efcd
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 14 12:33:24 2012 +0100
Some cppcheck cleaning
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 3e5df18..1750879 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1428,7 +1428,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer
//use first coosys only so far; todo: calculate for more than one coosys
if we have more in future
//todo: this is just a workaround at the moment for pie and donut labels
bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
-if( !bIsPieOrDonut rVCooSysList.size() 0 )
+if( !bIsPieOrDonut (!rVCooSysList.empty()) )
{
VCoordinateSystem* pVCooSys = rVCooSysList[0];
pVCooSys-createMaximumAxesLabels();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source extensions/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 29 +++--
connectivity/source/drivers/mozab/mozab.xcu|2
connectivity/source/drivers/mozab/mozab2.xcu |2
extensions/source/abpilot/abspilot.src |2
4 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit 8d7e1a6e13008bd7d35896e676796196038f1105
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 9 23:56:33 2012 +0100
Enabling Icedove addressbook connection for Base (Thank you Caolan)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 4db639b..6e11eb3 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -69,24 +69,27 @@ namespace
}
// ---
-static const char* DefaultProductDir[3][3] =
+const size_t NB_PRODUCTS = 3;
+const size_t NB_CANDIDATES = 4;
+
+static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
{
#if defined(XP_WIN)
-{ Mozilla/SeaMonkey/, NULL, NULL },
-{ Mozilla/Firefox/, NULL, NULL },
-{ Thunderbird/, Mozilla/Thunderbird/, NULL }
+{ Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Mozilla/Firefox/, NULL, NULL, NULL },
+{ Thunderbird/, Mozilla/Thunderbird/, NULL, NULL }
#elif(MACOSX)
-{ ../Mozilla/SeaMonkey/, NULL, NULL },
-{ Firefox/, NULL, NULL },
-{ ../Thunderbird/, NULL, NULL }
+{ ../Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Firefox/, NULL, NULL, NULL },
+{ ../Thunderbird/, NULL, NULL, NULL }
#else
-{ .mozilla/seamonkey/, NULL, NULL },
-{ .mozilla/firefox/, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/ }
+{ .mozilla/seamonkey/, NULL, NULL, NULL },
+{ .mozilla/firefox/, NULL, NULL, NULL },
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
#endif
};
-static const char* ProductRootEnvironmentVariable[3] =
+static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
{
MOZILLA_PROFILE_ROOT,
MOZILLA_FIREFOX_PROFILE_ROOT,
@@ -98,7 +101,7 @@ namespace
{
size_t productIndex = _product - 1;
-static ::rtl::OUString s_productDirectories[3];
+static ::rtl::OUString s_productDirectories[NB_PRODUCTS];
if ( s_productDirectories[ productIndex ].isEmpty() )
{
@@ -117,7 +120,7 @@ namespace
const char* pProfileRegistry = profiles.ini;
// check all possible candidates
-for ( size_t i=0; i3; ++i )
+for ( size_t i=0; iNB_CANDIDATES; ++i )
{
if ( NULL == DefaultProductDir[ productIndex ][ i ] )
break;
diff --git a/connectivity/source/drivers/mozab/mozab.xcu
b/connectivity/source/drivers/mozab/mozab.xcu
index fa732d6..e554e46 100644
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -84,7 +84,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=Features
node oor:name=EscapeDateTime oor:op=replace
diff --git a/connectivity/source/drivers/mozab/mozab2.xcu
b/connectivity/source/drivers/mozab/mozab2.xcu
index d1a620d..d6a6317 100644
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -52,7 +52,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=MetaData
node oor:name=SupportsBrowsing oor:op=replace
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 289e466..c246af9 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -120,7 +120,7 @@ TabPage RID_PAGE_SELECTABTYPE
{
HelpID = extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD;
Size= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-Text [ en-US ] = Thunderbird;
+Text [ en-US ] = Thunderbird/Icedove;
};
RadioButton RB_KAB
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/file_image_unx.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 05c51d5dfb58549e5bf26cb5c8b9b4f0083dca25
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jan 10 00:02:01 2012 +0100
Some cppcheck cleaning
diff --git a/desktop/unx/source/file_image_unx.c
b/desktop/unx/source/file_image_unx.c
index 078585f..fe3384b 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -90,6 +90,7 @@ int file_image_pagein (file_image * image)
file_imagew;
long s;
size_tk;
+// force touching of each page despite the optimizer
volatile char c = 0;
if (image == 0)
@@ -116,8 +117,6 @@ int file_image_pagein (file_image * image)
if (w.m_size 0)
{
c ^= ((char*)(w.m_base))[0];
-w.m_base = (char*)(w.m_base) + w.m_size;
-w.m_size -= w.m_size;
}
return (0);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c0f7e132ea87aa3dd7bb604f24a97e1302b8b9c3
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 8 11:11:40 2012 +0100
Cherry pick fix for fdo#44065
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 9ef1314..e15da07 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -118,7 +118,7 @@ namespace connectivity { namespace mozab {
{ WebPage2, homeurl,
DEF_CARD_ACCESS( WebPage2 ) },
{ BirthYear, birthyear,
DEF_CARD_ACCESS( BirthYear ) },
{ BirthMonth, birthmonth,
DEF_CARD_ACCESS( BirthMonth ) },
-{ BirthYear, birthday,
DEF_CARD_ACCESS( BirthDay ) },
+{ BirthDay, birthday,
DEF_CARD_ACCESS( BirthDay ) },
{ Custom1,custom1,
DEF_CARD_ACCESS( Custom1 ) },
{ Custom2,custom2,
DEF_CARD_ACCESS( Custom2 ) },
{ Custom3,custom3,
DEF_CARD_ACCESS( Custom3 ) },
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 948f57e74dda7e64b7c72208eaec00eac1bb96ba
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Jan 7 17:48:13 2012 +0100
Fix fdo#44065
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 9ef1314..e15da07 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -118,7 +118,7 @@ namespace connectivity { namespace mozab {
{ WebPage2, homeurl,
DEF_CARD_ACCESS( WebPage2 ) },
{ BirthYear, birthyear,
DEF_CARD_ACCESS( BirthYear ) },
{ BirthMonth, birthmonth,
DEF_CARD_ACCESS( BirthMonth ) },
-{ BirthYear, birthday,
DEF_CARD_ACCESS( BirthDay ) },
+{ BirthDay, birthday,
DEF_CARD_ACCESS( BirthDay ) },
{ Custom1,custom1,
DEF_CARD_ACCESS( Custom1 ) },
{ Custom2,custom2,
DEF_CARD_ACCESS( Custom2 ) },
{ Custom3,custom3,
DEF_CARD_ACCESS( Custom3 ) },
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/source
basegfx/source/polygon/b2dpolypolygoncutter.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 66fd9a610cd876c236486a2089d8d58dca866e25
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Jan 6 18:57:39 2012 +0100
Fix Same expression on both sides of '' (reported by cppcheck)
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index d32ee87..8745241 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -282,7 +282,7 @@ namespace basegfx
bOnEdge = false;
}
}
-while(bOnEdge pPNa2 != rPNa pPNa2 != rPNa);
+while(bOnEdge pPNa2 != rPNa pPNb2 != rPNb);
if(bOnEdge)
{
@@ -408,7 +408,7 @@ namespace basegfx
bOnEdge = false;
}
}
-while(bOnEdge pPNa2 != rPNa pPNa2 != rPNa);
+while(bOnEdge pPNa2 != rPNa pPNb2 != rPNb);
if(bOnEdge)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/ole/oleobjw.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b07d24180641d3b9fe2f0ac2602f8263fcf3aaa6
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jan 3 20:34:06 2012 +0100
Fix replace INVOKE_PROPERTYPUT, put INVOKE_PROPERTYPUTREF instead
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 8fb9261..9d203c8 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1814,7 +1814,7 @@ Any
IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc aFuncDesc,
if (dispparams.cNamedArgs 0
! (dispparams.cNamedArgs == 1
(aFuncDesc-invkind == INVOKE_PROPERTYPUT ||
-aFuncDesc-invkind == INVOKE_PROPERTYPUT)))
+aFuncDesc-invkind == INVOKE_PROPERTYPUTREF)))
{
//set up an array containing the member and parameter names
//which is then used in ITypeInfo::GetIDsOfNames
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/window/menu.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 86b528bb05a8b3a389ebdf6ce09d9963019ec058
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 30 12:43:15 2011 +0100
Checking is useless here
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c44f906..baa6bdb 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -5404,7 +5404,7 @@ void MenuBarWindow::KillActivePopup()
pActivePopup-Deactivate();
pActivePopup-bInCallback = sal_False;
// check for pActivePopup, if stopped by deactivate...
-if ( pActivePopup pActivePopup-ImplGetWindow() )
+if ( pActivePopup-ImplGetWindow() )
{
pActivePopup-ImplGetFloatingWindow()-StopExecute();
pActivePopup-ImplGetFloatingWindow()-doShutdown();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/control/button.cxx | 15 --- 1 file changed, 15 deletions(-) New commits: commit 4fd2b87dc4cc30de67fb26436ed9aee26b738368 Author: Julien Nabet serval2...@yahoo.fr Date: Fri Dec 30 13:50:16 2011 +0100 Useless since LoadThemedImageList (reported by cppcheck) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index f41cf74..e49e0cb 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2938,21 +2938,6 @@ Image RadioButton::GetRadioImage( const AllSettings rSettings, sal_uInt16 nFlag pSVData-maCtrlData.mnLastRadioWColor = rStyleSettings.GetWindowColor().GetColor(); pSVData-maCtrlData.mnLastRadioLColor = rStyleSettings.GetLightColor().GetColor(); -Color pColorAry1[6]; -Color pColorAry2[6]; -pColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 ); -pColorAry1[1] = Color( 0xFF, 0xFF, 0x00 ); -pColorAry1[2] = Color( 0xFF, 0xFF, 0xFF ); -pColorAry1[3] = Color( 0x80, 0x80, 0x80 ); -pColorAry1[4] = Color( 0x00, 0x00, 0x00 ); -pColorAry1[5] = Color( 0x00, 0xFF, 0x00 ); -pColorAry2[0] = rStyleSettings.GetFaceColor(); -pColorAry2[1] = rStyleSettings.GetWindowColor(); -pColorAry2[2] = rStyleSettings.GetLightColor(); -pColorAry2[3] = rStyleSettings.GetShadowColor(); -pColorAry2[4] = rStyleSettings.GetDarkShadowColor(); -pColorAry2[5] = rStyleSettings.GetWindowTextColor(); - ResMgr* pResMgr = ImplGetResMgr(); pSVData-maCtrlData.mpRadioImgList = new ImageList(); if( pResMgr ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/FrameControlsManager.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ebfaf933172ecf7d357b2454750033d4c6e57cd9
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Dec 29 10:55:37 2011 +0100
Some cppcheck cleaning
diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx
b/sw/source/ui/docvw/FrameControlsManager.cxx
index 6b00d56..2ee4886 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/ui/docvw/FrameControlsManager.cxx
@@ -129,7 +129,7 @@ void SwFrameControlsManager::HideControls( FrameControlType
eType )
while ( pIt != m_aControls[eType].end() )
{
( *pIt )-ShowAll( false );
-pIt++;
+++pIt;
}
}
@@ -163,7 +163,7 @@ void SwFrameControlsManager::SetHeaderFooterControl( const
SwPageFrm* pPageFrm,
if ( pToTest-GetPageFrame( ) == pPageFrm
pToTest-IsHeader( ) == bHeader )
pControl = *pIt;
-pIt++;
+++pIt;
}
if ( !pControl.get() )
@@ -197,7 +197,7 @@ void SwFrameControlsManager::SetPageBreakControl( const
SwPageFrm* pPageFrm )
SwPageBreakWin* pToTest = dynamic_cast SwPageBreakWin* ( pIt-get()
);
if ( pToTest-GetPageFrame( ) == pPageFrm )
pControl = *pIt;
-pIt++;
+++pIt;
}
if ( !pControl.get() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4e41996b5693414c0887c2c4d929cd16f4eb4577
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Dec 29 11:53:28 2011 +0100
Some cppcheck cleaning
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 95895e8..ad4b03e 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -245,7 +245,7 @@ xub_StrLen lcl_getMinPos( xub_StrLen pos1, xub_StrLen pos2 )
min = pos2;
else if ( pos2 == STRING_NOTFOUND pos1 != STRING_NOTFOUND )
min = pos1;
-else if ( pos2 != STRING_NOTFOUND pos2 != STRING_NOTFOUND )
+else if ( pos1 != STRING_NOTFOUND pos2 != STRING_NOTFOUND )
{
if ( pos1 pos2 )
min = pos1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/mathmlexport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 74b675cb6988c8ea731536832a0f8b5196f7521e
Author: Julien Nabet serval2...@yahoo.fr
Date: Thu Dec 29 11:35:59 2011 +0100
Some cppcheck cleaning
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index f8b3b38..8c456e4 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1160,7 +1160,7 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode,
int nLevel)
static bool lcl_HasEffectOnMathvariant( const SmTokenType eType )
{
return eType == TBOLD || eType == TNBOLD ||
-eType == TITALIC || eType == TNBOLD ||
+eType == TITALIC || eType == TNITALIC ||
eType == TSANS || eType == TSERIF || eType == TFIXED;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/tool/viewopti.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 86f08de96f4680938444a090912c85e4d23507e8
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Dec 28 22:25:56 2011 +0100
Same expression for comparison and for assignment
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index c5e5c7b..4de68ce 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -90,7 +90,6 @@ void ScGridOptions::SetDefaults()
const ScGridOptions ScGridOptions::operator=( const ScGridOptions rCpy )
{
nFldDrawX = rCpy.nFldDrawX; // UINT32
-nFldDrawX = rCpy.nFldDrawX;
nFldDivisionX = rCpy.nFldDivisionX;
nFldDrawY = rCpy.nFldDrawY;
nFldDivisionY = rCpy.nFldDivisionY;
@@ -109,7 +108,6 @@ const ScGridOptions ScGridOptions::operator=( const
ScGridOptions rCpy )
int ScGridOptions::operator==( const ScGridOptions rCpy ) const
{
return ( nFldDrawX== rCpy.nFldDrawX
- nFldDrawX== rCpy.nFldDrawX
nFldDivisionX== rCpy.nFldDivisionX
nFldDrawY== rCpy.nFldDrawY
nFldDivisionY== rCpy.nFldDivisionY
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/pdfextoutdevdata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 39b185e9ce2aa86b36ca80f8286533c306107826 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Dec 28 22:55:15 2011 +0100 Fix init order diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index a2d856d..23d81a4 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -511,8 +511,8 @@ PDFExtOutDevData::PDFExtOutDevData( const OutputDevice rOutDev ) : mbTransitionEffects ( sal_True ), mbUseLosslessCompression( sal_True ), mbReduceImageResolution ( sal_False ), -mbExportNDests ( sal_False ), mbExportHiddenSlides( sal_False ), +mbExportNDests ( sal_False ), mnFormsFormat ( 0 ), mnPage ( -1 ), mpPageSyncData ( NULL ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/source
filter/source/pdf/impdialog.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a8c895bc18f3167961ab676ec17e1db41d6a378 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Dec 28 23:15:03 2011 +0100 Fix order init diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index b10bf68..583b96b 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -461,9 +461,9 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent, maCbAllowDuplicateFieldNames( this, PDFFilterResId( CB_ALLOWDUPLICATEFIELDNAMES ) ), maCbExportBookmarks( this, PDFFilterResId( CB_EXPORTBOOKMARKS ) ), +maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ), maCbExportNotes( this, PDFFilterResId( CB_EXPORTNOTES ) ), maCbExportNotesPages( this, PDFFilterResId( CB_EXPORTNOTESPAGES ) ), -maCbExportHiddenSlides( this, PDFFilterResId( CB_EXPORTHIDDENSLIDES ) ), maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ), maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ), maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION ) ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/TextRunStyle.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 372ea70b5b42504bd42531d9915a2a71a7e30de8
Author: julien julien@julienPC
Date: Sun Dec 25 13:58:55 2011 +0100
Some cppcheck cleaning
diff --git a/writerperfect/source/filter/TextRunStyle.cxx
b/writerperfect/source/filter/TextRunStyle.cxx
index 6cc7378..abce545 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -195,7 +195,7 @@ void ParagraphStyleManager::clean()
void ParagraphStyleManager::write(OdfDocumentHandler *pHandler) const
{
for (std::mapWPXString, shared_ptrParagraphStyle,
ltstr::const_iterator iter = mStyleHash.begin();
-iter != mStyleHash.end(); iter++)
+iter != mStyleHash.end(); ++iter)
{
if (strcmp(iter-second-getName().cstr(), Standard) == 0)
continue;
@@ -254,7 +254,7 @@ void SpanStyleManager::clean()
void SpanStyleManager::write(OdfDocumentHandler *pHandler) const
{
for (std::mapWPXString, shared_ptrSpanStyle, ltstr::const_iterator
iter = mStyleHash.begin();
-iter != mStyleHash.end(); iter++)
+iter != mStyleHash.end(); ++iter)
{
(iter-second)-write(pHandler);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/dbase/DIndex.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 84a3f11c7a0cce586c15246079ea807aec38a439
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Dec 12 22:00:26 2011 +0100
Remove ByteString
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx
b/connectivity/source/drivers/dbase/DIndex.cxx
index 0e22387..c5a0e4c 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -443,7 +443,7 @@ sal_Bool ODbaseIndex::DropImpl()
Config aInfFile(sPhysicalPath);
aInfFile.SetGroup(dBASE_III_GROUP);
sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-ByteString aKeyName;
+rtl::OString aKeyName;
String sEntry = m_Name;
sEntry += String::CreateFromAscii(.ndx);
@@ -452,7 +452,7 @@ sal_Bool ODbaseIndex::DropImpl()
{
// References the Key to an Index-file?
aKeyName = aInfFile.GetKeyName( nKey );
-if (aKeyName.Copy(0,3) == NDX)
+if (aKeyName.copy(0,3) == NDX)
{
if(sEntry ==
String(rtl::OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable-getConnection()-getTextEncoding(
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/resource/core_resource.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 444eb68e8a6b35752bac4ff12fc83e44f36bb44b Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 12 22:31:09 2011 +0100 Remove ByteString diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 975096e..a7cd085 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -56,9 +56,9 @@ namespace dbaccess ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale(); -ByteString sFileName(dba); +rtl::OString sFileName(dba); -m_pImpl = ResMgr::CreateResMgr(sFileName.GetBuffer(), aLocale); +m_pImpl = ResMgr::CreateResMgr(sFileName.getStr(), aLocale); } //-- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/svhtml/htmlout.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit a1b970a10e00b34ab6d8608cb02247b8f0195573
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 13:07:04 2011 +0100
Remove ByteString
diff --git a/svtools/source/svhtml/htmlout.cxx
b/svtools/source/svhtml/htmlout.cxx
index deb530b..cf3f746 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -885,9 +885,8 @@ SvStream HTMLOutFuncs::OutScript( SvStream rStrm,
{
// Wir schreiben das Modul mm ANSI-Zeichensatz, aber mit
// System-Zeilenumbruechen raus.
-ByteString sSource(rtl::OUStringToOString(rSource, eDestEnc));
-sSource.ConvertLineEnd( GetSystemLineEnd() );
-rStrm sSource.GetBuffer();
+rtl::OString sSource(rtl::OUStringToOString(rSource, eDestEnc));
+rStrm sSource.getStr() sNewLine;
}
rStrm sNewLine;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/base/formats.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 4046a1dfc2ba5b52cab7083f4817351c647a59c3
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 13:45:53 2011 +0100
Remove ByteString
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 2bfa066..1c5ec07 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1325,8 +1325,7 @@ rEntry
if( pFDesc-cItems )
{
-ByteString sDesc( pFDesc-fgd[ 0
].cFileName );
-bRet = 4 sDesc.Len() sDesc.Copy(
sDesc.Len()-4 ).EqualsIgnoreCaseAscii( .URL );
+bRet = (4 (pFDesc-fgd[ 0
].cFileName.size())) sDesc.Copy( sDesc.Len()-4 ).EqualsIgnoreCaseAscii(
.URL );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source sc/source svx/source
desktop/source/deployment/manager/dp_manager.cxx |2 +-
sc/source/filter/xml/xmlexprt.cxx|4 ++--
svx/source/xml/xmlgrhlp.cxx |4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit eba2e6a9c32d5c5a7bdb4c8ccc515903b247c12d
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 14:48:16 2011 +0100
Remove ByteString
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 508d6bb..63720c5 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1037,7 +1037,7 @@ Referencedeployment::XPackage
PackageManagerImpl::getDeployedPackage_(
if (INetContentTypes::parse( data.mediaType, type, subType, params ))
{
INetContentTypeParameter const * param = params.find(
-ByteString(platform) );
+rtl::OString(platform) );
if (param != 0 !platform_fits( param-m_sValue ))
throw lang::IllegalArgumentException(
getResourceString(RID_STR_NO_SUCH_PACKAGE) + id,
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 3ad8b8b..1757c6b 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1650,8 +1650,8 @@ void ScXMLExport::CopySourceStream( sal_Int32
nStartOffset, sal_Int32 nEndOffset
if ( getExportFlags() EXPORT_PRETTY )
{
-ByteString aOutStr(\n );
-uno::Sequencesal_Int8 aOutSeq(
(sal_Int8*)aOutStr.GetBuffer(), aOutStr.Len() );
+const rtl::OString aOutStr(\n );
+uno::Sequencesal_Int8 aOutSeq( (sal_Int8*)aOutStr.getStr(),
aOutStr.getLength() );
xDestStream-writeBytes( aOutSeq );
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 3fc611c..3d61519 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -548,11 +548,11 @@ String SvXMLGraphicHelper::ImplGetGraphicMimeType( const
String rFileName ) con
if( ( rFileName.Len() = 4 ) ( rFileName.GetChar( rFileName.Len() - 4 )
== '.' ) )
{
-const ByteString
aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3),
+const rtl::OString
aExt(rtl::OUStringToOString(rFileName.Copy(rFileName.Len() - 3),
RTL_TEXTENCODING_ASCII_US));
for( long i = 0, nCount = SAL_N_ELEMENTS( aMapper ); ( i nCount )
!aMimeType.Len(); i++ )
-if( aExt == aMapper[ i ].pExt )
+if( aExt.getStr() == aMapper[ i ].pExt )
aMimeType = String( aMapper[ i ].pMimeType,
RTL_TEXTENCODING_ASCII_US );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/dlg/directsql.cxx |3 +++
dbaccess/source/ui/inc/directsql.hxx |2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 15f8fce9860100505c4c6a54f5f003375fbd8275
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 16:36:38 2011 +0100
Remove ByteString
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index f0d6f0d..e650fb3 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -36,6 +36,7 @@
#include vcl/svapp.hxx
#include osl/mutex.hxx
#include tools/diagnose_ex.h
+#include rtl/strbuf.hxx
//
namespace dbaui
@@ -46,6 +47,8 @@ namespace dbaui
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
+using ::rtl::OStringBuffer;
+
//
//= LargeEntryListBox
//
diff --git a/dbaccess/source/ui/inc/directsql.hxx
b/dbaccess/source/ui/inc/directsql.hxx
index 250c667..96c2ebc 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -126,7 +126,7 @@ namespace dbaui
{ \
const sal_Char* pError = impl_CheckInvariants();\
if (pError) \
-OSL_FAIL((ByteString(methodname) += ByteString(: ) +=
ByteString(pError)).GetBuffer()); \
+OSL_FAIL(rtl::OStringBuffer(methodname).append(:
).append(pError). makeStringAndClear().getStr()); \
}
#else
#define CHECK_INVARIANTS(methodname)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/misc/moduledbu.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 5c4503898742a151e7521cae0649ff5eb6f19220
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 20:38:34 2011 +0100
Remove ByteString
diff --git a/dbaccess/source/ui/misc/moduledbu.cxx
b/dbaccess/source/ui/misc/moduledbu.cxx
index dfd95ae..18c2888 100644
--- a/dbaccess/source/ui/misc/moduledbu.cxx
+++ b/dbaccess/source/ui/misc/moduledbu.cxx
@@ -86,8 +86,7 @@ ResMgr* OModuleImpl::getResManager()
if (!m_pRessources)
{
// create a manager with a fixed prefix
-ByteString aMgrName = ByteString( dbu );
-m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
+m_pRessources = ResMgr::CreateResMgr(rtl::OString(dbu).getStr());
}
return m_pRessources;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/base/formats.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 60beba6a73c46d4564599467badd6136f9523434
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Dec 11 22:30:46 2011 +0100
Revert buggy 4046a1dfc2ba5b52cab7083f4817351c647a59c3
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 1c5ec07..2bfa066 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1325,7 +1325,8 @@ rEntry
if( pFDesc-cItems )
{
-bRet = (4 (pFDesc-fgd[ 0
].cFileName.size())) sDesc.Copy( sDesc.Len()-4 ).EqualsIgnoreCaseAscii(
.URL );
+ByteString sDesc( pFDesc-fgd[ 0
].cFileName );
+bRet = 4 sDesc.Len() sDesc.Copy(
sDesc.Len()-4 ).EqualsIgnoreCaseAscii( .URL );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
