[Libreoffice-commits] .: patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Fri Apr 1 04:48:55 PDT 2011
patches/dev300/apply | 17 +----------------
patches/dev300/default-font-aasize.diff | 20 --------------------
patches/dev300/default-font-size.diff | 20 --------------------
patches/dev300/uses-vfs.diff | 20 --------------------
patches/dev300/vfs-kde-too.diff | 21 ---------------------
5 files changed, 1 insertion(+), 97 deletions(-)
New commits:
commit 1903a4d226c14078e5c98062cb70c3d594d3f1b8
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Apr 1 12:47:51 2011 +0100
merge, and remove obsolete pieces
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7bfab9b..06eea37 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,7 +10,7 @@ PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
# -------- Functional sub-sets --------
-Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
+Common : BuildBits, TemporaryHacks, \
Fixes, DefaultSettings, Features, VCL, Misc, HelpContent, \
Icons, CalcFixes, WriterFixes, EasterEgg, \
Cleanups, WMF, GnomeVFS, \
@@ -201,11 +201,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
# for mixed font set
#FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
-[ FixesNotForUpstream ]
-
-# Tell the desktop we support the VFS
-uses-vfs.diff, i#43504, michael
-
[ Fixes ]
# use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
sd-toolbar-advanced-shapes.diff, n#171052, rodo
@@ -438,18 +433,8 @@ win32-prebuilt-writingaids-zip.diff
win32-prebuilt-writingaids-zip-scp2.diff
[ DefaultSettings ]
-
-# default to anti-alias at point size of 1 point
-default-font-aasize.diff, michael
-# set default font size to 10pt
-default-font-size.diff, i#35565, michael
# Optimal Page Wrap should be default for graphics insertion (X#59831)
writer-default-as-optimal-page-wrap.diff, i#38108, jody
-#
-# Controversial bits - no use filing up-stream
-#
-# Use the Gnome VFS on KDE as well if it's there (better than nothing)
-vfs-kde-too.diff, michael
[ LinuxOnly ]
# search <ooo-home>/share/template/common for language independent templates
diff --git a/patches/dev300/default-font-aasize.diff b/patches/dev300/default-font-aasize.diff
deleted file mode 100644
index 28053cb..0000000
--- a/patches/dev300/default-font-aasize.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- .../schema/org/openoffice/Office/Common.xcs | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index cb19bb0..016684c 100644
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -3069,7 +3069,7 @@
- <desc>Specifies an additional limit if Font Antialiasing is enabled. Fonts that are smaller than the specified limit are not anti-aliased.</desc>
- <label>Font Antialiasing Minimum Pixel Height</label>
- </info>
-- <value>8</value>
-+ <value>1</value>
- </prop>
- </group>
- </group>
---
-1.7.0.1
-
diff --git a/patches/dev300/default-font-size.diff b/patches/dev300/default-font-size.diff
deleted file mode 100644
index cfac3f2..0000000
--- a/patches/dev300/default-font-size.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- vcl/source/app/settings.cxx | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx
-index 432624e..22ca7dc 100755
---- vcl/source/app/settings.cxx
-+++ vcl/source/app/settings.cxx
-@@ -547,7 +547,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
-
- void ImplStyleData::SetStandardStyles()
- {
-- Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
-+ Font aStdFont( FAMILY_SWISS, Size( 0, 10 ) );
- aStdFont.SetCharSet( gsl_getSystemTextEncoding() );
- aStdFont.SetWeight( WEIGHT_NORMAL );
- aStdFont.SetName( utl::DefaultFontConfiguration::get()->getUserInterfaceFont(com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("en") ), rtl::OUString(), rtl::OUString() ) ) );
---
-1.7.0.1
-
diff --git a/patches/dev300/uses-vfs.diff b/patches/dev300/uses-vfs.diff
deleted file mode 100644
index 544744e..0000000
--- a/patches/dev300/uses-vfs.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sysui/desktop/mimetypes/openoffice.applications | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sysui/desktop/mimetypes/openoffice.applications sysui/desktop/mimetypes/openoffice.applications
-index d262102..e6fb09d 100644
---- sysui/desktop/mimetypes/openoffice.applications
-+++ sysui/desktop/mimetypes/openoffice.applications
-@@ -3,7 +3,7 @@ OFFICENAME
- name=%PRODUCTNAME
- can_open_multiple_files=true
- expects_uris=true
-+ uses_gnomevfs=true
- requires_terminal=false
-- supported_uri_schemes=file,http,https,smb
- mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,app
lication/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd
.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;
-
---
-1.7.0.1
-
diff --git a/patches/dev300/vfs-kde-too.diff b/patches/dev300/vfs-kde-too.diff
deleted file mode 100644
index eaf4917..0000000
--- a/patches/dev300/vfs-kde-too.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- desktop/source/app/appinit.cxx | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git desktop/source/app/appinit.cxx desktop/source/app/appinit.cxx
-index 25798d9..2f77133 100644
---- desktop/source/app/appinit.cxx
-+++ desktop/source/app/appinit.cxx
-@@ -146,7 +146,8 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
- );
- rtl::OUString aDesktopEnvironment;
- if ((aValue >>= aDesktopEnvironment)
-- && aDesktopEnvironment.equalsAscii("GNOME"))
-+ && (aDesktopEnvironment.equalsAscii("GNOME") ||
-+ aDesktopEnvironment.equalsAscii("KDE")))
- {
- Reference<XContentProviderManager> xCPM =
- cb->getContentProviderManagerInterface();
---
-1.7.0.1
-
More information about the Libreoffice-commits
mailing list