[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                               |    1 
 patches/dev300/build-fix-layout-numfmt.diff        |   13 -------
 patches/dev300/layout-fix-experimental-layout.diff |   38 +++------------------
 3 files changed, 6 insertions(+), 46 deletions(-)

New commits:
commit 38803f951efb0038581e27b26ef8946c2ad34587
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:56:22 2011 +0300

    Make layout-fix-experimental-layout.diff apply again
    
    Also, delete build-fix-layout-numfmt.diff, as what it did is undone by
    layout-fix-experimental-layout.diff.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ee626de..442855e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1227,7 +1227,6 @@ layout-accessibility-dispose-only-once.diff, n#500267, janneke
 buildfix-toolkit-workben-layout.diff
 buildfix-svx-uiconfig-layout.diff
 buildfix-sw-uiconfig-layout.diff
-build-fix-layout-numfmt.diff
 # Fix heavy parallel build of the zips containing the xmls
 layout-parallel-build.diff
 layout-fix-experimental-layout.diff, n#557230, thorsten
diff --git a/patches/dev300/build-fix-layout-numfmt.diff b/patches/dev300/build-fix-layout-numfmt.diff
deleted file mode 100644
index c791f38..0000000
--- a/patches/dev300/build-fix-layout-numfmt.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- cui/source/tabpages/numfmt.cxx
-+++ cui/source/tabpages/numfmt.cxx
-@@ -25,6 +25,10 @@
-  *
-  ************************************************************************/
- 
-+#if !ENABLE_LAYOUT_EXPERIMENTAL && defined (ENABLE_LAYOUT)
-+#undef ENABLE_LAYOUT
-+#endif
-+ 
- // include ---------------------------------------------------------------
- #include <svl/eitem.hxx>
- #include <svl/intitem.hxx>
diff --git a/patches/dev300/layout-fix-experimental-layout.diff b/patches/dev300/layout-fix-experimental-layout.diff
index af7e249..092946b 100644
--- a/patches/dev300/layout-fix-experimental-layout.diff
+++ b/patches/dev300/layout-fix-experimental-layout.diff
@@ -1,18 +1,9 @@
----
- cui/source/inc/numfmt.hxx          |    6 ++++++
- cui/source/tabpages/numfmt.cxx     |   20 ++++++++------------
- sc/source/ui/attrdlg/scdlgfact.cxx |    8 ++------
- sc/source/ui/attrdlg/scdlgfact.hxx |    5 +++--
- 4 files changed, 19 insertions(+), 20 deletions(-)
-
-diff --git cui/source/inc/numfmt.hxx cui/source/inc/numfmt.hxx
-index b5638c5..98b49d5 100644
 --- cui/source/inc/numfmt.hxx
 +++ cui/source/inc/numfmt.hxx
 @@ -77,8 +77,12 @@ public:
+ };
  
  // -----------------------------------------------------------------------
- 
 +#if ENABLE_LAYOUT_EXPERIMENTAL
  #include <sfx2/layout.hxx>
  #include <layout/layout-pre.hxx>
@@ -32,21 +23,8 @@ index b5638c5..98b49d5 100644
  
  #endif
  
-diff --git cui/source/tabpages/numfmt.cxx cui/source/tabpages/numfmt.cxx
-index c58c45c..87047e8 100644
 --- cui/source/tabpages/numfmt.cxx
 +++ cui/source/tabpages/numfmt.cxx
-@@ -25,10 +25,6 @@
-  *
-  ************************************************************************/
- 
--#if !ENABLE_LAYOUT_EXPERIMENTAL && defined (ENABLE_LAYOUT)
--#undef ENABLE_LAYOUT
--#endif
--
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_cui.hxx"
- 
 @@ -233,19 +229,19 @@ void SvxNumberPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt )
  
  #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
@@ -71,9 +49,9 @@ index c58c45c..87047e8 100644
  SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*				pParent,
                                                  const SfxItemSet&	rCoreAttrs )
 @@ -276,7 +272,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*				pParent,
-         aFtComment      ( this, CUI_RES( FT_COMMENT ) ),
-         aEdComment      ( this, CUI_RES( ED_COMMENT ) ),
-         
+         aFtLanguage     ( this, CUI_RES( FT_LANGUAGE ) ),
+         aLbLanguage     ( this, CUI_RES( LB_LANGUAGE ), sal_False ),
+         aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
 -#if ENABLE_LAYOUT
 +#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT
          aWndPreview     ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
@@ -115,8 +93,6 @@ index c58c45c..87047e8 100644
          if (aLbFormat.GetSelectEntryPos () == LISTBOX_ENTRY_NOTFOUND)
  #else /* !ENABLE_LAYOUT */
          // Current category may be UserDefined with no format entries defined.
-diff --git sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.cxx
-index 3d261aa..46da823 100644
 --- sc/source/ui/attrdlg/scdlgfact.cxx
 +++ sc/source/ui/attrdlg/scdlgfact.cxx
 @@ -28,10 +28,6 @@
@@ -138,7 +114,7 @@ index 3d261aa..46da823 100644
 +#if ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT
  namespace layout
  {
- IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for ScAttrDlg, ScHFEditDlg, ScStyleDlg, ScSubTotalDlg,ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
+ IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
 @@ -184,7 +180,7 @@ String AbstractTabDialog_Impl::GetText() const
      return pDlg->GetText();
  }
@@ -146,10 +122,8 @@ index 3d261aa..46da823 100644
 -#endif /* ENABLE_LAYOUT */
 +#endif /* ENABLE_LAYOUT_EXPERIMENTAL && ENABLE_LAYOUT */
  
- //add for AbstractTabDialog_Impl end
+ 
  // AbstractScImportAsciiDlg_Impl begin
-diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
-index d8ae113..f811170 100644
 --- sc/source/ui/attrdlg/scdlgfact.hxx
 +++ sc/source/ui/attrdlg/scdlgfact.hxx
 @@ -368,7 +368,8 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog