Bin the HACK() sillyness

Change-Id: Ieeebc4098404fa006d66bb8b656172a4348b1dc1

11 files changed, 14 insertions, 20 deletions

diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 1bd875bec702..b14735c9890a 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 963c169f042f..09d7c5f503a4 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 935077c27f39..975b834331e3 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 fe034f0b0d48..db940f033ddd 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 04076d794abb..a38398ac1ce7 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 e6fdc8c0335b..54484216c200 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 8580b58cc1b6..e1720690624d 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 bca2249f4d21..063cb02fe2fc 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 5818e8f91fa9..7c43173b9104 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 6efde8a9b427..cc0d3ff73490 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 80fa6e8068c9..8a82ae8cea0c 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();