[Libreoffice-commits] .: 4 commits - toolkit/inc toolkit/source

[Caolán McNamara]

 toolkit/inc/layout/layout-post.hxx |    4 +++-
 toolkit/inc/layout/layout-pre.hxx  |    2 --
 toolkit/source/awt/vclxwindows.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b91c280d3680af2b164b8640425a2435d99bc2c8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 18 12:47:55 2010 +0100

    WaE, silence warning

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 9332a0b..c5bf9f3 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2434,7 +2434,7 @@ throw(::com::sun::star::uno::RuntimeException)
         ::vos::OGuard aGuard( GetMutex() );
         if ( GetWindow() )
         {
-            sal_Int8 nCancel;
+            sal_Int8 nCancel(0);
             Value >>= nCancel;
 
             Dialog* pDlg = (Dialog*) GetWindow();
commit 98eb383972886a35cd22b33f77931ba2700745ff
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 18 12:32:15 2010 +0100

    remove dups

diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
index c135630..bc2ad28 100644
--- a/toolkit/inc/layout/layout-post.hxx
+++ b/toolkit/inc/layout/layout-post.hxx
@@ -75,7 +75,6 @@
 #undef RadioButton
 #undef ResetButton
 #undef RetryButton
-#undef SfxTabPage
 #undef SfxTabDialog
 #undef SfxTabPage
 #undef SvxFontListBox
commit 52c1662ed1ac2cdc3611df4767d643f80c311be2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 18 12:31:20 2010 +0100

    add matching undefs

diff --git a/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
index 888cf65..c135630 100644
--- a/toolkit/inc/layout/layout-post.hxx
+++ b/toolkit/inc/layout/layout-post.hxx
@@ -77,6 +77,9 @@
 #undef RetryButton
 #undef SfxTabPage
 #undef SfxTabDialog
+#undef SfxTabPage
+#undef SvxFontListBox
+#undef SvxLanguageBox
 #undef SpinField
 #undef TabDialog
 #undef TabControl
commit e438034071b352e4fe3b42e25d3d63dcefb1f76d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 18 12:29:34 2010 +0100

    same ifdef inside itself

diff --git a/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
index e017b42..07da433 100644
--- a/toolkit/inc/layout/layout-pre.hxx
+++ b/toolkit/inc/layout/layout-pre.hxx
@@ -77,10 +77,8 @@
 #define RetryButton layout::RetryButton
 #define SfxTabDialog layout::SfxTabDialog
 #define SfxTabPage layout::SfxTabPage
-#if ENABLE_LAYOUT
 #define SvxFontListBox layout::SvxFontListBox
 #define SvxLanguageBox layout::SvxLanguageBox
-#endif
 #define SpinField layout::SpinField
 #define TabControl layout::TabControl
 #define TabPage layout::TabPage