[Libreoffice-commits] .: 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                  |    7 ---
 patches/dev300/jvmfwk-modified-javavendors-xml.diff   |   25 -----------
 patches/dev300/sfx2-check-existing-template-dirs.diff |   39 ------------------
 3 files changed, 71 deletions(-)

New commits:
commit 016edf095eb4b6394ce6d3b2bb6215fb7da9781c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 14:56:22 2011 +0200

    bin obsolete sfx2-check-existing-template-dirs.diff
    
    fixed another way in CWS fwk103 for OOo-3.2 (i#100518)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2a1d81a..b717db2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -248,9 +248,6 @@ automation-testtool-oobuildfix.diff, n#145906, noelpwer
 # Added support for "application/octet-stream" mime type in package manager
 desktop-application-octet-stream-mime-type.diff, i#73301, flr
 
-# avoid error messages about missing directories with templates
-sfx2-check-existing-template-dirs.diff, i#100518, pmladek
-
 # Use the characters after the string to get a better kerning
 # FIXME: temporarily disabled as this causes a race condition in calc's cell format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
diff --git a/patches/dev300/sfx2-check-existing-template-dirs.diff b/patches/dev300/sfx2-check-existing-template-dirs.diff
deleted file mode 100644
index 72f0432..0000000
--- a/patches/dev300/sfx2-check-existing-template-dirs.diff
+++ /dev/null
@@ -1,39 +0,0 @@
----
- sfx2/source/doc/doctemplates.cxx |   12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git sfx2/source/doc/doctemplates.cxx sfx2/source/doc/doctemplates.cxx
-index 72fe259..f33d3dd 100644
---- sfx2/source/doc/doctemplates.cxx
-+++ sfx2/source/doc/doctemplates.cxx
-@@ -34,6 +34,7 @@
- #include <tools/urlobj.hxx>
- #include <rtl/ustring.hxx>
- #include <rtl/ustrbuf.hxx>
-+#include <osl/file.hxx>
- #include <tools/resary.hxx>
- #include <vcl/svapp.hxx>
- #include <vcl/wrkwin.hxx>
-@@ -1226,11 +1227,16 @@ void SfxDocTplService_Impl::doUpdate()
-     while ( nCountDir )
-     {
-         nCountDir--;
--        if ( Content::create( pDirs[ nCountDir ], aQuietEnv, aDirContent ) )
-+        osl::Directory aDirectory (pDirs[ nCountDir ]);
-+        osl::FileBase::RC nError = aDirectory.open();
-+        if (nError == osl::FileBase::E_None || bWriteableDirectory)
-         {
--            createFromContent( aGroupList, aDirContent, sal_False, bWriteableDirectory );
-+            if ( Content::create( pDirs[ nCountDir ], aQuietEnv, aDirContent ) )
-+            {
-+                createFromContent( aGroupList, aDirContent, sal_False, bWriteableDirectory );
-+            }
-+            aDirectory.close();
-         }
--
-         bWriteableDirectory = sal_False;
-     }
- 
--- 
-1.7.0.1
-
commit f87f96ae1dcf53d5f97c1ec1fdf9a9b2aafb4b8a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 14:53:23 2011 +0200

    pushed jvmfwk-modified-javavendors-xml.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 861e915..2a1d81a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -248,10 +248,6 @@ automation-testtool-oobuildfix.diff, n#145906, noelpwer
 # Added support for "application/octet-stream" mime type in package manager
 desktop-application-octet-stream-mime-type.diff, i#73301, flr
 
-# select the java automatically when the system javavendors.xml is modified
-# do not force to do it the user manually
-jvmfwk-modified-javavendors-xml.diff, i#99619, pmladek
-
 # avoid error messages about missing directories with templates
 sfx2-check-existing-template-dirs.diff, i#100518, pmladek
 
diff --git a/patches/dev300/jvmfwk-modified-javavendors-xml.diff b/patches/dev300/jvmfwk-modified-javavendors-xml.diff
deleted file mode 100644
index ca49cfe..0000000
--- a/patches/dev300/jvmfwk-modified-javavendors-xml.diff
+++ /dev/null
@@ -1,25 +0,0 @@
----
- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx |    7 +------
- 1 files changed, 1 insertions(+), 6 deletions(-)
-
-diff --git jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-index 4392ee2..391121f 100755
---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-@@ -81,12 +81,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
-     JavaInfo * pInfo = NULL;
-     errcode = jfw_getSelectedJRE( & pInfo);
- 
--    if (errcode == JFW_E_INVALID_SETTINGS)
--    {
--        fprintf(stderr,"javaldx failed. User must select a JRE from options dialog!");
--        return -1;
--    }
--    else if (errcode != JFW_E_NONE)
-+    if (errcode != JFW_E_NONE && errcode != JFW_E_INVALID_SETTINGS)
-     {
-         fprintf(stderr,"javaldx failed! \n");
-         return -1;
--- 
-1.7.0.1
-