diff -r 64e2bd0eeb25 sfx2/source/dialog/tabdlg.cxx
--- a/sfx2/source/dialog/tabdlg.cxx	Wed May 26 22:29:39 2010 +0200
+++ b/sfx2/source/dialog/tabdlg.cxx	Wed Jun 02 09:23:07 2010 +0200
@@ -57,7 +57,10 @@
 #undef SfxTabPage
 #define SfxTabPage ::SfxTabPage
 #undef SfxTabDialog
-#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
+#else /* !ENABLE_LAYOUT_SFX_TABDIALOG */
+#undef SfxTabPage
+#define SfxTabPage ::SfxTabPage
+#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
 
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
@@ -239,6 +242,8 @@
 
 #if !ENABLE_LAYOUT_SFX_TABDIALOG
 
+#undef SfxTabPage
+
 void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame)
 {
     if (pImpl)
@@ -477,7 +482,10 @@
 #define aHelpBtn(this) aHelpBtn (this, "BTN_HELP")
 #define aResetBtn(this) aResetBtn (this, "BTN_RESET")
 #define aBaseFmtBtn(this) aBaseFmtBtn (this, "BTN_BASEFMT")
-#endif /* ENABLE_LAYOUT_SFX_TABDIALOG */
+#else /* !ENABLE_LAYOUT_SFX_TABDIALOG */
+#undef SfxTabPage
+#define SfxTabPage ::SfxTabPage
+#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
 
 #define INI_LIST(ItemSetPtr) \
 	aTabCtrl	( this, ResId(ID_TABCONTROL,*rResId.GetResMgr() ) ),\