[Libreoffice-commits] .: sw/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Mon Dec 19 23:52:32 PST 2011


 sw/source/ui/config/optpage.cxx   |    4 ++++
 sw/source/ui/dialog/swdlgfact.cxx |    2 ++
 sw/source/ui/inc/optpage.hxx      |    3 +++
 3 files changed, 9 insertions(+)

New commits:
commit 149968b4b1eeeed3669ee4229c753afdc0cd322d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Dec 20 01:48:35 2011 -0600

    re-add the #ifdef DBG_UTIL that seems to have accidentally been removed.

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index ecf345a..c8be2e2 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1729,6 +1729,8 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
 }
 
 
+#ifdef DBG_UTIL
+
 void lcl_SetPosSize(Window& rWin, Point aPos, Size aSize)
 {
     aPos = rWin.LogicToPixel(aPos, MAP_APPFONT);
@@ -1861,6 +1863,8 @@ IMPL_LINK_INLINE_START( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
     return 0;
 }
 IMPL_LINK_INLINE_END( SwTestTabPage, AutoClickHdl, CheckBox *, EMPTYARG )
+#endif
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 7a63661..a31db0d 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1645,7 +1645,9 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
             break;
         case RID_SW_TP_OPTTEST_PAGE :
         case TP_OPTTEST_PAGE :
+#ifdef DBG_UTIL
             pRet = SwTestTabPage::Create;
+#endif
             break;
         case TP_OPTPRINT_PAGE :
         case RID_SW_TP_HTML_OPTPRINT_PAGE:
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index a2ebae6..3824419 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -361,6 +361,8 @@ public:
  TabPage test settings for SW
 --------------------------------------------------------- */
 
+#ifdef DBG_UTIL
+
 class SwTestTabPage : public SfxTabPage
 {
 public:
@@ -392,6 +394,7 @@ private:
     DECL_LINK( AutoClickHdl, CheckBox * );
 
 };
+#endif // DBG_UTIL
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list