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

[Tor Lillqvist]

 patches/dev300/fpicker-show-checkbox.diff         |    4 ++--
 patches/dev300/psprint-postscript-page-setup.diff |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 772e15ac0dc68888efe42281ce4395c47fc9f327
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 14:54:05 2009 +0300

    Adapt fpicker-show-checkbox.diff for dev300-m54
    
    * patches/dev300/fpicker-show-checkbox.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/fpicker-show-checkbox.diff b/patches/dev300/fpicker-show-checkbox.diff
index 7cc8984..09ceb74 100644
--- a/patches/dev300/fpicker-show-checkbox.diff
+++ b/patches/dev300/fpicker-show-checkbox.diff
@@ -15,8 +15,8 @@
  # --- Files --------------------------------------------------------
  
  SRS1NAME=dialogs
---- svx/source/dialog/optgdlg.cxx.old	2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/optgdlg.cxx	2009-04-06 16:41:56.000000000 +0000
+--- svx/source/cui/optgdlg.cxx
++++ svx/source/cui/optgdlg.cxx
 @@ -136,7 +136,7 @@ int OfaMiscTabPage::DeactivatePage( SfxI
  	return LEAVE_PAGE;
  }
commit 0431167236ef9a682a95932a951aa0285f58d0b6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 14:51:35 2009 +0300

    psprint has moved
    
    * patches/dev300/psprint-postscript-page-setup.diff: Adapt for moved
      files in dev300-m54.

diff --git a/patches/dev300/psprint-postscript-page-setup.diff b/patches/dev300/psprint-postscript-page-setup.diff
index d2ab102..71a4489 100644
--- a/patches/dev300/psprint-postscript-page-setup.diff
+++ b/patches/dev300/psprint-postscript-page-setup.diff
@@ -1,5 +1,5 @@
---- psprint/inc/psprint/printerjob.hxx	2005-09-08 18:35:45.000000000 +0200
-+++ psprint/inc/psprint/printerjob.hxx	2006-05-16 20:23:54.000000000 +0200
+--- vcl/inc/vcl/printerjob.hxx
++++ vcl/inc/vcl/printerjob.hxx
 @@ -99,7 +99,7 @@ private:            // private methods
  
      bool			writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
@@ -9,8 +9,8 @@
      void			writeJobPatch( osl::File* File, const JobData& );
      bool            writeProlog (osl::File* pFile, const JobData& );
  
---- psprint/source/printergfx/printerjob.cxx	2006-05-04 10:41:55.000000000 +0200
-+++ psprint/source/printergfx/printerjob.cxx	2006-05-16 20:23:10.000000000 +0200
+--- vcl/unx/source/printergfx/printerjob.cxx
++++ vcl/unx/source/printergfx/printerjob.cxx
 @@ -1047,14 +1047,6 @@ PrinterJob::StartPage (const JobData& rJ
      if( ! (pPageHeader && pPageBody) )
          return sal_False;