[Libreoffice-commits] .: patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Fri Dec 3 09:12:22 PST 2010
patches/dev300/apply | 10 --
patches/dev300/fix-gtk-a11y.diff | 38 ----------
patches/dev300/gui-sw-insert-symbol.diff | 19 -----
patches/dev300/padmin-nofontconfig.diff | 115 -------------------------------
4 files changed, 2 insertions(+), 180 deletions(-)
New commits:
commit cbaa06acbc6b719c010b810661dcd0b05a046000
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Dec 3 17:12:31 2010 +0000
remove obsolete, and merged patches
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7d40f98..191fef2 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -204,9 +204,6 @@ selection-crash-svx-svdmrkv.diff, i#76084, jianhua
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
warning-return-values-stlport.diff, jholesov
-# fix a11y bug
-fix-gtk-a11y.diff, i#98533, michael
-
# gcc OOMs here otherwise (x86_64)
writerfilter-qnametostr-NOOPTFILES.diff
@@ -304,9 +301,6 @@ sd-toolbar-advanced-shapes.diff, n#171052, rodo
svx-shapes-default-word-wrap-enable.diff, n#171052, rodo
svx-honour-customshape-capabilities.diff, n#395372, thorsten
-# disable font management dialog in padmin
-padmin-nofontconfig.diff, michael
-
# Fix for n#113235
wizards-source-importwizard-filesmodul-xba.diff, i#56633, noelpwer
@@ -448,12 +442,12 @@ speed-local-link.diff, i#63927, michael
fpicker-kde-gcc4-visibility.diff, pmladek
[ Misc ]
-# Insert symbol defaults to the Symbol font - not a random one
-gui-sw-insert-symbol.diff, i#15512, michael
# Address data source ordering x#62860
addrbk-datasrc-ordering.diff, michael
# Changed the default option in the Templates and Documents dialog.
svtools-default-new-document.diff, rodo
+
+# FIX case of autocomplete foo [!] - needs re-writing to use character class ...
# contextual autocomplete
context-autocomplete.diff, i#22961, michael
diff --git a/patches/dev300/fix-gtk-a11y.diff b/patches/dev300/fix-gtk-a11y.diff
deleted file mode 100644
index 2976087..0000000
--- a/patches/dev300/fix-gtk-a11y.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- vcl/unx/source/plugadapt/salplug.cxx | 20 --------------------
- 1 files changed, 0 insertions(+), 20 deletions(-)
-
-diff --git vcl/unx/source/plugadapt/salplug.cxx vcl/unx/source/plugadapt/salplug.cxx
-index 683d8e2..b328f8c 100644
---- vcl/unx/source/plugadapt/salplug.cxx
-+++ vcl/unx/source/plugadapt/salplug.cxx
-@@ -87,26 +87,6 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
- if( pInst )
- {
- pCloseModule = aMod;
--
-- /*
-- * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
-- * not access the 'gnome_accessibility_module_shutdown' anymore.
-- * So make sure libgtk+ & co are still mapped into memory when
-- * atk-bridge's atexit handler gets called.
-- */
-- if( rModuleBase.equalsAscii("gtk") )
-- {
-- pCloseModule = NULL;
-- }
-- /*
-- * #i109007# KDE3 seems to have the same problem; an atexit cleanup
-- * handler, which cannot be resolved anymore if the plugin is already unloaded.
-- */
-- else if( rModuleBase.equalsAscii("kde") )
-- {
-- pCloseModule = NULL;
-- }
--
- GetSalData()->m_pPlugin = aMod;
- }
- else
---
-1.7.0.1
-
diff --git a/patches/dev300/gui-sw-insert-symbol.diff b/patches/dev300/gui-sw-insert-symbol.diff
deleted file mode 100644
index e2dc64a..0000000
--- a/patches/dev300/gui-sw-insert-symbol.diff
+++ /dev/null
@@ -1,19 +0,0 @@
----
- sw/source/ui/config/viewopt.cxx | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git sw/source/ui/config/viewopt.cxx sw/source/ui/config/viewopt.cxx
-index 6960e56..77af27f 100644
---- sw/source/ui/config/viewopt.cxx
-+++ sw/source/ui/config/viewopt.cxx
-@@ -221,6 +221,7 @@ SwViewOption::SwViewOption() :
- mbViewLayoutBookMode(FALSE),
- bShowPlaceHolderFields( sal_True ),
-
-+ sSymbolFont( RTL_CONSTASCII_USTRINGPARAM( "symbol" ) ),
- nZoom( 100 ),
- eZoom( SVX_ZOOM_PERCENT ),
- nTblDest(TBL_DEST_CELL)
---
-1.7.0.1
-
diff --git a/patches/dev300/padmin-nofontconfig.diff b/patches/dev300/padmin-nofontconfig.diff
deleted file mode 100644
index 220e530..0000000
--- a/patches/dev300/padmin-nofontconfig.diff
+++ /dev/null
@@ -1,115 +0,0 @@
----
- padmin/source/makefile.mk | 8 +++++++-
- padmin/source/padialog.cxx | 12 +++++++++++-
- padmin/source/padialog.hxx | 2 ++
- 3 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git padmin/source/makefile.mk padmin/source/makefile.mk
-index 8bcbd51..b049082 100644
---- padmin/source/makefile.mk
-+++ padmin/source/makefile.mk
-@@ -43,6 +43,10 @@ LIBTARGET=NO
-
- .INCLUDE: settings.mk
-
-+.IF "$(FONTCONFIG_FONTS)" != ""
-+CFLAGS+=-DFONTCONFIG_FONTS
-+.ENDIF
-+
- # --- Files --------------------------------------------------------
-
- SRS1NAME=$(TARGET)
-@@ -65,11 +69,13 @@ SLOFILES=\
- $(SLO)$/progress.obj \
- $(SLO)$/newppdlg.obj \
- $(SLO)$/prtsetup.obj \
-- $(SLO)$/fontentry.obj \
- $(SLO)$/helper.obj \
- $(SLO)$/adddlg.obj \
- $(SLO)$/titlectrl.obj
-
-+.IF "$(FONTCONFIG_FONTS)" == ""
-+SLOFILES+= $(SLO)$/fontentry.obj
-+.ENDIF
-
- OBJFILES=\
- $(OBJ)/pamain.obj
-diff --git padmin/source/padialog.cxx padmin/source/padialog.cxx
-index b5c6653..cfcbf03 100644
---- padmin/source/padialog.cxx
-+++ padmin/source/padialog.cxx
-@@ -31,7 +31,11 @@
- #include <string.h>
- #include <math.h>
-
-+#include "tools/urlobj.hxx"
-+
-+#ifndef FONTCONFIG_FONTS
- #include "padialog.hrc"
-+#endif
- #include "fontentry.hxx"
- #include "helper.hxx"
- #include "padialog.hxx"
-@@ -94,7 +98,9 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
- m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
- m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
- m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ),
-+ #ifndef FONTCONFIG_FONTS
- m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
-+ #endif
- m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
- m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
- m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
-@@ -139,11 +145,12 @@ void PADialog::Init()
- m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
-- m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
- m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
-
-+ #ifndef FONTCONFIG_FONTS
-+ m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
- if( ! rFontManager.checkImportPossible() )
- m_aFontsPB.Enable( FALSE );
-@@ -152,6 +159,7 @@ void PADialog::Init()
- m_aFontsPB.Enable( FALSE );
- m_aFontsPB.Show( FALSE );
- }
-+ #endif
- }
-
- PADialog::~PADialog()
-@@ -217,11 +225,13 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushButton*, pButton )
- PrintTestPage();
- else if( pButton == &m_aAddPB )
- AddDevice();
-+ #ifndef FONTCONFIG_FONTS
- else if( pButton == &m_aFontsPB )
- {
- FontNameDlg aDialog( this );
- aDialog.Execute();
- }
-+ #endif
- else if( static_cast<Button*>(pButton) == &m_aCUPSCB )
- {
- m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() );
-diff --git padmin/source/padialog.hxx padmin/source/padialog.hxx
-index a3064ed..c74388c 100644
---- padmin/source/padialog.hxx
-+++ padmin/source/padialog.hxx
-@@ -74,7 +74,9 @@ namespace padmin {
-
- FixedLine m_aSepButtonFL;
- PushButton m_aAddPB;
-+#ifndef FONTCONFIG_FONTS
- PushButton m_aFontsPB;
-+#endif
- CancelButton m_aCancelButton;
-
- String m_aDefPrt;
---
-1.7.0.1
-
More information about the Libreoffice-commits
mailing list