[ooo-build-commit] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                               |    3 ++-
 patches/dev300/layout-fix-experimental-layout.diff |    9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 8fd8c453246c6d865a8e8b0ad70705cc0fa9e21e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 1 16:24:29 2010 +0300

    Drop the MSI patchability patch for now
    
    We (Novell) haven't built MSI patches lately anyway.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 986447d..0948246 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1782,7 +1782,8 @@ sled10-splash.diff, i#123456, pmladek
 xulrunner-1.9.1.diff, ccheney
 
 [ NovellLikeOnlyWin32 ]
-novell-win32-msi-patchability.diff, tml
+# Drop this for now
+# novell-win32-msi-patchability.diff, tml
 
 [ MacOSXOnly ]
 SectionOwner => thorsten
commit f011a802c23f34eaad4fc029373cbfa6e5bf4a0e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 1 16:24:04 2010 +0300

    Adapt to the CHINA001 cleanup

diff --git a/patches/dev300/layout-fix-experimental-layout.diff b/patches/dev300/layout-fix-experimental-layout.diff
index 1dca850..af7e249 100644
--- a/patches/dev300/layout-fix-experimental-layout.diff
+++ b/patches/dev300/layout-fix-experimental-layout.diff
@@ -153,8 +153,8 @@ 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
-     virtual void		SetText( const XubString& rStr ); //add by CHINA001
-     virtual String   	GetText() const; //add by CHINA001
+     virtual void		SetText( const XubString& rStr );
+     virtual String   	GetText() const;
  };
 -#if ENABLE_LAYOUT
 +
@@ -163,7 +163,7 @@ index d8ae113..f811170 100644
  {
  //add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg
 @@ -384,7 +385,7 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
-     virtual String   	GetText() const; //add by CHINA001
+     virtual String   	GetText() const;
  };
  } // end namespace layout
 -#endif /* ENABLE_LAYOUT */
@@ -171,6 +171,3 @@ index d8ae113..f811170 100644
  //------------------------------------------------------------------------
  //AbstractDialogFactory_Impl implementations
  class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory
--- 
-1.7.0.1
-