summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2006-08-24 09:47:17 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2006-08-24 09:47:17 +0000
commit4c142f2dcd9c5c4a166a80b43f049caf1a7abe93 (patch)
tree7bed71b3f88356133cbf92e73c1e80b6bbe2cbb5 /sfx2
parente89ddb2e83cbce88c30a58ecba3fbaea6cc348f7 (diff)
INTEGRATION: CWS sb56 (1.13.6); FILE MERGED
2006/07/07 09:17:30 sb 1.13.6.1: #i67105# Made code compile (warning-free) with debug=x.
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/objface.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index debdd2d49518..856c282d3bce 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: objface.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: hr $ $Date: 2006-06-19 22:17:37 $
+ * last change: $Author: ihi $ $Date: 2006-08-24 10:47:17 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -477,7 +477,7 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
#endif
@@ -501,7 +501,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
#endif
@@ -551,7 +551,7 @@ ULONG SfxInterface::GetChildWindowId (USHORT nNo) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nCWCount = pImpData->pChildWindows->Count();
DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
#endif
@@ -574,7 +574,7 @@ ULONG SfxInterface::GetChildWindowFeature (USHORT nNo) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nCWCount = pImpData->pChildWindows->Count();
DBG_ASSERT( nNo<nCWCount,"ChildWindow ist unbekannt!" );
#endif
@@ -624,7 +624,7 @@ const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
#endif
@@ -645,7 +645,7 @@ ULONG SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
#endif
@@ -666,7 +666,7 @@ BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
nNo -= nBaseCount;
}
-#ifdef DEBUG
+#ifdef DBG_UTIL
USHORT nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unbekannt!" );
#endif