basic/source/sbx/sbxvalue.cxx | 6 +++---
oox/source/export/drawingml.cxx | 2 +-
sfx2/source/control/bindings.cxx | 2 +-
sfx2/source/control/dispatch.cxx | 4 ++--
sfx2/source/control/shell.cxx | 2 +-
svl/inc/svl/itemset.hxx | 2 +-
svl/source/items/itempool.cxx | 4 ++--
svl/source/items/rngitem_inc.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
tools/inc/tools/solar.h | 6 ------
tools/source/fsys/dirent.cxx | 2 +-
tools/source/fsys/wntmsc.cxx | 2 +-
12 files changed, 15 insertions(+), 21 deletions(-)
New commits:
commit 160cfb5e5e4ab6c9e6062c74ba6ed1c610a4981a
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Nov 19 21:14:55 2012 +0200
Bin the HACK() sillyness
Change-Id: Ieeebc4098404fa006d66bb8b656172a4348b1dc1
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 1bd875b..b14735c 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -187,7 +187,7 @@ void SbxValue::Clear()
{
if( aData.pObj != this )
{
- HACK(nicht bei Parent-Prop - sonst CyclicRef)
+ SAL_WARN("basic.sbx", "nicht bei Parent-Prop - sonst
CyclicRef");
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
sal_Bool bParentProp = pThisVar && 5345 ==
( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
@@ -538,7 +538,7 @@ sal_Bool SbxValue::Put( const SbxValues& rVal )
{
OSL_FAIL( "TheRealValue" );
}
- HACK(nicht bei Parent-Prop - sonst CyclicRef)
+ SAL_WARN("basic.sbx", "nicht bei Parent-Prop -
sonst CyclicRef");
SbxVariable *pThisVar = PTR_CAST(SbxVariable,
this);
sal_Bool bParentProp = pThisVar && 5345 ==
( (sal_Int16) ( pThisVar->GetUserData() &
0xFFFF ) );
@@ -802,7 +802,7 @@ sal_Bool SbxValue::SetType( SbxDataType t )
case SbxOBJECT:
if( aData.pObj && aData.pObj != this )
{
- HACK(nicht bei Parent-Prop - sonst CyclicRef)
+ SAL_WARN("basic.sbx", "nicht bei Parent-Prop - sonst
CyclicRef");
SbxVariable *pThisVar = PTR_CAST(SbxVariable, this);
sal_uInt16 nSlotId = pThisVar
? ( (sal_Int16) ( pThisVar->GetUserData()
& 0xFFFF ) )
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 963c169..09d7c5f 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1534,7 +1534,7 @@ void SfxBindings::UpdateControllers_Impl
{
pEnumCache->Invalidate(sal_False);
- HACK(CONTROL/SELECT Kram)
+ // HACK(CONTROL/SELECT Kram) ???
if ( eState == SFX_ITEM_DONTCARE && pFound->nWhichId == 10144 )
{
SfxVoidItem aVoid(0);
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 935077c..975b834 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1220,7 +1220,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*,
pReq )
{
Flush();
SfxSlotServer aSvr;
- if ( _FindServer(pReq->GetSlot(), aSvr, HACK(x) sal_True ) )
+ if ( _FindServer(pReq->GetSlot(), aSvr, sal_True ) ) // HACK(x),
whatever that was supposed to mean
{
const SfxSlot *pSlot = aSvr.GetSlot();
SfxShell *pSh = GetShell(aSvr.GetShellLevel());
@@ -1676,7 +1676,7 @@ void SfxDispatcher::FlushImpl()
//--------------------------------------------------------------------
void SfxDispatcher::SetSlotFilter
(
- HACK(hier muss mal ein enum rein)
+ // HACK(hier muss mal ein enum rein) ???
sal_Bool bEnable, /* sal_True:
only enable specified slots,
disable all other
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index fe034f0..db940f0 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1002,7 +1002,7 @@ void SfxShell::SetVerbs(const
com::sun::star::uno::Sequence < com::sun::star::em
pNewSlot->nValue = 0;
pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState);
- pNewSlot->pType = 0; HACK(SFX_TYPE(SfxVoidItem))
+ pNewSlot->pType = 0; // HACK(SFX_TYPE(SfxVoidItem)) ???
pNewSlot->pName = U2S(aVerbs[n].VerbName).getStr();
pNewSlot->pLinkedSlot = 0;
pNewSlot->nArgDefCount = 0;
diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx
index 04076d7..a38398a 100644
--- a/svl/inc/svl/itemset.hxx
+++ b/svl/inc/svl/itemset.hxx
@@ -118,7 +118,7 @@ public:
virtual void InvalidateItem( sal_uInt16 nWhich );
virtual sal_uInt16 ClearItem( sal_uInt16 nWhich = 0);
virtual void ClearInvalidItems( sal_Bool bHardDefault =
sal_False );
- void InvalidateAllItems(); HACK(via nWhich = 0)
+ void InvalidateAllItems(); // HACK(via nWhich = 0)
???
inline void SetParent( const SfxItemSet* pNew );
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index e6fdc8c..5448421 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -376,7 +376,7 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
if ( pImp->mpSecondary )
{
#ifdef DBG_UTIL
- HACK( "fuer Image, dort gibt es derzeit keine Statics - Bug" )
+ SAL_WARN( "svl.items", "fuer Image, dort gibt es derzeit keine Statics
- Bug" );
if ( pImp->ppStaticDefaults )
{
// Delete() ist noch nicht gelaufen?
@@ -514,7 +514,7 @@ void SfxItemPool::Delete()
sal_uInt16 nArrCnt;
//Erst die SetItems abraeumen
- HACK( "fuer Image, dort gibt es derzeit keine Statics - Bug" )
+ SAL_WARN( "svl.items", "fuer Image, dort gibt es derzeit keine Statics -
Bug" );
if ( pImp->ppStaticDefaults )
{
for ( nArrCnt = GetSize_Impl();
diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index 8580b58..e172069 100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.cxx
@@ -177,7 +177,7 @@ SfxItemPresentation SfxXRangesItem::GetPresentation(
SfxItemPresentation /*ePres
XubString &/*rText*/,
const IntlWrapper * ) const
{
- HACK(n. i.)
+ // not implemented
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bca2249..063cb02 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -572,7 +572,7 @@ sal_Bool GetDocFontList_Impl( const FontList** ppFontList,
SvxFontNameBox_Impl*
bChanged =
( ( *ppFontList != pNewFontList ) ||
pBox->GetListCount() != pNewFontList->GetFontNameCount() );
- HACK(vergleich ist unvollstaendig)
+ // HACK(vergleich ist unvollstaendig) ???
if ( bChanged )
*ppFontList = pNewFontList;
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 5818e8f..7c43173 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -143,12 +143,6 @@ template<typename T> inline T Abs(T a) { return
(a>=0?a:-a); }
#define EXTERN_C
#endif
-#ifdef NOHACKS
-#define HACK( comment ) #error hack: comment
-#else
-#define HACK( comment )
-#endif
-
#define _LF ((char)0x0A)
#define _CR ((char)0x0D)
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 6efde8a..cc0d3ff 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -1482,7 +1482,7 @@ FSysError DirEntry::CopyTo( const DirEntry& rDest,
FSysAction nActions ) const
#ifdef UNX
{
// create hardlink
- HACK(redirection missing)
+ // redirection missing
rtl::OString aThis(rtl::OUStringToOString(GetFull(),
osl_getThreadTextEncoding()));
rtl::OString aDest(rtl::OUStringToOString(rDest.GetFull(),
osl_getThreadTextEncoding()));
if (link(aThis.getStr(), aDest.getStr()) == -1)
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 80fa6e8..8a82ae8 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.cxx
@@ -602,7 +602,7 @@ sal_Bool FileStat::Update( const DirEntry& rDirEntry,
sal_Bool bForceAccess )
DirEntry aDirEntry( aPath );
// Is a medium in this device?
- HACK("How?")
+ // How?
sal_Bool bAccess = sal_True;
const DirEntry *pTop = aDirEntry.ImpGetTopPtr();
rtl::OString aName = rtl::OString(pTop->aName).toAsciiLowerCase();
commit debea9d3250e809e323461324514e9d073d06e3a
Author: Tor Lillqvist <t...@iki.fi>
Date: Mon Nov 19 21:11:47 2012 +0200
no matching function for call to 'max(int, long int)'
Change-Id: I7533098781b0b6987cd852d74a688aac6e0af056
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index efbb1de..7b3d722 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1075,7 +1075,7 @@ void DrawingML::WriteParagraphNumbering( Reference<
XPropertySet > rXPropSet, sa
} else {
if( nBulletRelSize && nBulletRelSize != 100 )
mpFS->singleElementNS( XML_a, XML_buSzPct,
- XML_val, IS( std::min(
25000, std::max( 400000, 1000*( (sal_Int32)nBulletRelSize ) ) ) ), FSEND );
+ XML_val, IS( std::min(
(sal_Int32)25000, std::max( (sal_Int32)400000, 1000*( (sal_Int32)nBulletRelSize
) ) ) ), FSEND );
if( bHasFontDesc )
mpFS->singleElementNS( XML_a, XML_buFont,
XML_typeface,
OUStringToOString( aFontDesc.Name, RTL_TEXTENCODING_UTF8 ).getStr(),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
