binfilter/bf_basic/source/basmgr/basmgr.cxx | 2
binfilter/bf_basic/source/classes/sbxmod.cxx | 18
---
binfilter/bf_forms/source/component/Image.hxx | 1
binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx | 2
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 4
binfilter/bf_sd/source/core/sd_drawdoc2.cxx | 4
binfilter/bf_starmath/source/starmath_node.cxx | 1
binfilter/bf_starmath/source/starmath_smdll.cxx | 7 -
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx | 4
binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx | 60
+++++-----
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 2
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 1
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 7 -
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 1
binfilter/inc/bf_basic/sbxfac.hxx | 5
17 files changed, 42 insertions(+), 81 deletions(-)
New commits:
commit 5fb512c849e4bbe5918465113b095c793c0252f2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jun 6 10:37:57 2012 +0200
Fixes for various Clang (on Mac OS X) warnings
Change-Id: I06df07f6d4133658fad90d5622762a8d1cdf04af
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx
b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index efda967..5e3c517 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -2075,7 +2075,7 @@ Any LibraryContainer_Impl::getByName( const OUString&
aName )
Reference< XNameContainer > xModuleContainer =
(XNameContainer*)new ModuleContainer_Impl( pLib );
- Reference< XNameContainer > xDialogContainer;
+ Reference< XNameContainer > xDialogContainer =
(XNameContainer*)new DialogContainer_Impl( pLib );
BasicLibInfo* pLibInfo = mpMgr->FindLibInfo( pLib );
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx
b/binfilter/bf_basic/source/classes/sbxmod.cxx
index f5b6be5..1ffa8e6 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -356,24 +356,6 @@ SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
return NULL;
}
-// Ausstrahlen eines Hints an alle Basics
-
-static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
-{
- // Selbst ein BASIC?
- if( pObj->IsA( TYPE(StarBASIC) ) && pObj->IsBroadcaster() )
- pObj->GetBroadcaster().Broadcast( SbxHint( nId, p ) );
- // Dann die Unterobjekte fragen
- SbxArray* pObjs = pObj->GetObjects();
- for( USHORT i = 0; i < pObjs->Count(); i++ )
- {
- SbxVariable* pVar = pObjs->Get( i );
- if( pVar->IsA( TYPE(SbxObject) ) )
- _SendHint( PTR_CAST(SbxObject,pVar), nId, p );
- }
-}
-
-
// #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
// beim Programm-Ende freigeben, damit nichts gehalten wird.
void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
diff --git a/binfilter/bf_forms/source/component/Image.hxx
b/binfilter/bf_forms/source/component/Image.hxx
index 8bdda6f..09d86fa 100644
--- a/binfilter/bf_forms/source/component/Image.hxx
+++ b/binfilter/bf_forms/source/component/Image.hxx
@@ -170,6 +170,7 @@ public:
// OComponentHelper
virtual void SAL_CALL disposing();
+ using OImageControl_BASE::disposing;
// ::com::sun::star::form::XApproveActionBroadcaster
virtual void SAL_CALL addApproveActionListener(const
::com::sun::star::uno::Reference<
::com::sun::star::form::XApproveActionListener>& _rxListener)
diff --git
a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
index 74085bb..ddd4695 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
@@ -516,7 +516,7 @@ void
ScXMLChangeTrackingImportHelper::CreateGeneratedActions(ScMyGeneratedList&
ScMyGeneratedList::iterator aItr = rList.begin();
while (aItr != rList.end())
{
- if (((*aItr)->nID == 0))
+ if ((*aItr)->nID == 0)
{
ScBaseCell* pCell = NULL;
if ((*aItr)->pCellInfo)
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index 876ce46..cdba6bf 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -976,9 +976,7 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if ( eMode != SC_SIZE_ORIGINAL )
/*N*/ {
-/*N*/ if (bWidth)
-/*N*/ bOutline = bOutline;
-/*N*/ else
+/*N*/ if (!bWidth)
/*N*/ bOutline = bOutline || pDoc->UpdateOutlineRow( nStartNo,
nEndNo, nTab, bShow );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
index 8a7aad0..7b97f0e 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc2.cxx
@@ -396,8 +396,6 @@ LanguageType SdDrawDocument::GetLanguage( const USHORT nId
) const
void SdDrawDocument::WorkStartupHdl()
{
- BOOL bLclChanged = IsChanged();
-
SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT);
if (pHandoutMPage->GetAutoLayout() == AUTOLAYOUT_NONE)
@@ -413,7 +411,7 @@ void SdDrawDocument::WorkStartupHdl()
if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE)
pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, TRUE);
- SetChanged(bLclChanged || FALSE);
+ SetChanged(FALSE);
}
SdAnimationInfo* SdDrawDocument::GetAnimationInfo(SdrObject* pObject) const
diff --git a/binfilter/bf_starmath/source/starmath_node.cxx
b/binfilter/bf_starmath/source/starmath_node.cxx
index 2396a97..586c005 100644
--- a/binfilter/bf_starmath/source/starmath_node.cxx
+++ b/binfilter/bf_starmath/source/starmath_node.cxx
@@ -2217,7 +2217,6 @@ void SmRectangleNode::Draw(OutputDevice &rDev, const
Point &rPosition) const
/*N*/ SmNode::Prepare(rFormat, rDocShell);
/*N*/
/*N*/ const SmSym *pSym;
-/*N*/ /*SmModule *pp =*/ SM_MOD1();
/*N*/
/*N*/ Size aOldSize = GetFont().GetSize();
/*N*/ if ((pSym =
rDocShell.GetSymSetManager().GetSymbolByName(GetToken().aText)))
diff --git a/binfilter/bf_starmath/source/starmath_smdll.cxx
b/binfilter/bf_starmath/source/starmath_smdll.cxx
index df68499..4f10a08 100644
--- a/binfilter/bf_starmath/source/starmath_smdll.cxx
+++ b/binfilter/bf_starmath/source/starmath_smdll.cxx
@@ -62,12 +62,7 @@ BOOL SmDLL::bInitialized = FALSE;
/*N*/ delete (*ppShlPtr);
/*N*/ (*ppShlPtr) = new SmModule(pFact);
/*N*/ (*ppShlPtr)->pSmDocShellFactory = pFact;
-/*N*/
-/*N*/ String aResDll(C2S("sm"));
-/*N*/
-/*N*/ /*SfxModule *p =*/ SM_MOD1();
-/*N*/
-}
+/*N*/ }
/*************************************************************************
|*
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 257d40f..a8308e6 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -311,9 +311,9 @@ struct FactoryInfo
//---------------------------------------------------------------------------------------------------------
void setIcon( sal_Int32 nNewIcon )
{
- if( nNewIcon != nNewIcon )
+ if( nIcon != nNewIcon )
{
- nNewIcon = nNewIcon;
+ nIcon = nNewIcon;
bChangedIcon = sal_True;
}
};
diff --git a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
index 72c8cb4..b05b6ff 100644
--- a/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx
@@ -69,36 +69,36 @@ void XBMReader::InitTable()
{
memset( pHexTable, 0, sizeof( short ) );
- pHexTable['0'] = 0;
- pHexTable['1'] = 1;
- pHexTable['2'] = 2;
- pHexTable['3'] = 3;
- pHexTable['4'] = 4;
- pHexTable['5'] = 5;
- pHexTable['6'] = 6;
- pHexTable['7'] = 7;
- pHexTable['8'] = 8;
- pHexTable['9'] = 9;
- pHexTable['A'] = 10;
- pHexTable['B'] = 11;
- pHexTable['C'] = 12;
- pHexTable['D'] = 13;
- pHexTable['E'] = 14;
- pHexTable['F'] = 15;
- pHexTable['X'] = 0;
- pHexTable['a'] = 10;
- pHexTable['b'] = 11;
- pHexTable['c'] = 12;
- pHexTable['d'] = 13;
- pHexTable['e'] = 14;
- pHexTable['f'] = 15;
- pHexTable['x'] = 0;
- pHexTable[' '] = -1;
- pHexTable[','] = -1;
- pHexTable['}'] = -1;
- pHexTable['\n'] = -1;
- pHexTable['\t'] = -1;
- pHexTable['\0'] = -1;
+ pHexTable[int('0')] = 0;
+ pHexTable[int('1')] = 1;
+ pHexTable[int('2')] = 2;
+ pHexTable[int('3')] = 3;
+ pHexTable[int('4')] = 4;
+ pHexTable[int('5')] = 5;
+ pHexTable[int('6')] = 6;
+ pHexTable[int('7')] = 7;
+ pHexTable[int('8')] = 8;
+ pHexTable[int('9')] = 9;
+ pHexTable[int('A')] = 10;
+ pHexTable[int('B')] = 11;
+ pHexTable[int('C')] = 12;
+ pHexTable[int('D')] = 13;
+ pHexTable[int('E')] = 14;
+ pHexTable[int('F')] = 15;
+ pHexTable[int('X')] = 0;
+ pHexTable[int('a')] = 10;
+ pHexTable[int('b')] = 11;
+ pHexTable[int('c')] = 12;
+ pHexTable[int('d')] = 13;
+ pHexTable[int('e')] = 14;
+ pHexTable[int('f')] = 15;
+ pHexTable[int('x')] = 0;
+ pHexTable[int(' ')] = -1;
+ pHexTable[int(',')] = -1;
+ pHexTable[int('}')] = -1;
+ pHexTable[int('\n')] = -1;
+ pHexTable[int('\t')] = -1;
+ pHexTable[int('\0')] = -1;
}
// ------------------------------------------------------------------------
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
index f3146a1..9ca8771 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
@@ -153,7 +153,7 @@ struct TabInfo
/*N*/ // in Fensterkoordinaten umwandeln....
/*N*/ aClipRec = pView->pImpEditView->GetWindowPos( aClipRec );
/*N*/
-/*N*/ if ( ( pView == pCurView ) )
+/*N*/ if ( pView == pCurView )
/*N*/ Paint( pView->pImpEditView, aClipRec, sal_True );
/*N*/ else
/*N*/ pView->GetWindow()->Invalidate( aClipRec );
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index f9a477e..953dd66 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -89,7 +89,6 @@ namespace binfilter {
/*N*/ {
/*N*/ // Owner holen
/*N*/ DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus
Parent != 3DObject");
-/*N*/ /*E3dObject* pOwner =*/ (E3dObject*)GetOwnerObj();
/*N*/
/*N*/ // call parent
/*N*/ SdrObject* pRetval = SdrObjList::RemoveObject(nObjNum);
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index d707279..aad7064 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -579,8 +579,6 @@ struct ParaRstFmt
/*N*/ const SfxPoolItem* pChrFmtItem = 0;
/*N*/ aCharSet.GetItemState( RES_TXTATR_CHARFMT, FALSE, &pChrFmtItem );
/*N*/ #endif
-/*N*/ SFX_ITEM_SET == aCharSet.GetItemState( RES_TXTATR_CHARFMT, FALSE )
||
-/*N*/ SFX_ITEM_SET == aCharSet.GetItemState( RES_TXTATR_INETFMT, FALSE );
/*N*/
/*N*/ for(; aSt < aEnd; ++aSt )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
index bfc4e7c..564b2e5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docftn.cxx
@@ -261,13 +261,6 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwFtnInfo &rOld = GetFtnInfo();
/*N*/
-/*N*/ rOld.ePos == FTNPOS_CHAPTER &&
-/*N*/ rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
-/*N*/ rInfo.aQuoVadis != rOld.aQuoVadis ||
-/*N*/ rInfo.aErgoSum != rOld.aErgoSum ||
-/*N*/ rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType()
||
-/*N*/ rInfo.GetPrefix() != rOld.GetPrefix() ||
-/*N*/ rInfo.GetSuffix() != rOld.GetSuffix();
/*N*/ SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
/*N*/ *pNewChrFmt = rInfo.GetCharFmt( *this );
/*N*/ bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index d6e0c10..1b06c67 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -348,7 +348,7 @@ typedef LinkStruct* LinkStructPtr;
/*N*/ return ;
// die aktuellen Seitennummern ins Verzeichnis eintragen
-/*?*/ (SwDoc*)GetFmt()->GetDoc();
+/*?*/ GetFmt()->GetDoc();
/*?*/
/*?*/ // nach dem Setzen der richtigen Seitennummer, das Mapping-Array
/*?*/ // wieder loeschen !!
diff --git a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
index b9c4187..bf4b8b3 100644
--- a/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx
@@ -2203,7 +2203,6 @@ namespace binfilter {
/*N*/ const SwFmtFrmSize &rSz = GetFmt()->GetFrmSize();
/*N*/ SwTwips nMinHeight = rSz.GetSizeType() == ATT_MIN_SIZE ?
/*N*/ rSz.GetHeight() : 0;
-/*N*/ (SwLayoutFrm*)Lower();
/*N*/ if( nMinHeight < (Frm().*fnRect->fnGetHeight)() )
/*N*/ {
/*N*/ SwLayoutFrm *pCell = (SwLayoutFrm*)Lower();
diff --git a/binfilter/inc/bf_basic/sbxfac.hxx
b/binfilter/inc/bf_basic/sbxfac.hxx
index 59de60f..b9fd475 100644
--- a/binfilter/inc/bf_basic/sbxfac.hxx
+++ b/binfilter/inc/bf_basic/sbxfac.hxx
@@ -34,13 +34,12 @@
#include "sbxdef.hxx"
-class String;
-class UniString;
-
namespace binfilter {
class SbxBase;
class SbxObject;
+class String;
+class UniString;
class SbxFactory
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
