rpms/openoffice.org/F-11 openoffice.org-3.1.1.ooo104306.moverecentlyused.patch, NONE, 1.1 openoffice.org.spec, 1.1926, 1.1927
Caolan McNamara
caolanm at fedoraproject.org
Tue Aug 18 07:48:30 UTC 2009
- Previous message: rpms/openoffice.org/devel openoffice.org-3.1.1.ooo104306.moverecentlyused.patch, NONE, 1.1 openoffice.org.spec, 1.1982, 1.1983
- Next message: rpms/hunspell-uk/devel .cvsignore, 1.4, 1.5 hunspell-uk.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26275
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
Log Message:
Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
openoffice.org-3.1.1.ooo104306.moverecentlyused.patch:
postprocess/prj/build.lst | 2 -
sfx2/inc/pch/precompiled_sfx2.hxx | 1
sfx2/prj/build.lst | 2 -
sfx2/source/appl/sfxpicklist.cxx | 4 --
sfx2/source/doc/objstor.cxx | 3 --
sfx2/util/makefile.mk | 1
shell/prj/d.lst | 4 --
shell/source/unix/sysshell/makefile.mk | 4 --
shell/source/unix/sysshell/recently_used_file_handler.cxx | 1
solenv/inc/libs.mk | 2 -
vcl/inc/vcl/salinst.hxx | 2 +
vcl/inc/vcl/svapp.hxx | 14 +++++++++
vcl/source/app/svapp.cxx | 6 ++++
vcl/unx/gtk/app/gtkinst.cxx | 6 ++++
vcl/unx/headless/svpinst.cxx | 4 ++
vcl/unx/headless/svpinst.hxx | 2 +
vcl/unx/inc/plugins/gtk/gtkinst.hxx | 1
vcl/unx/inc/salinst.h | 2 +
vcl/unx/source/app/salinst.cxx | 20 ++++++++++++++
19 files changed, 61 insertions(+), 20 deletions(-)
--- NEW FILE openoffice.org-3.1.1.ooo104306.moverecentlyused.patch ---
diff -ru vcl.orig/inc/vcl/salinst.hxx vcl/inc/vcl/salinst.hxx
--- vcl.orig/inc/vcl/salinst.hxx 2009-08-17 14:51:16.000000000 +0100
+++ vcl/inc/vcl/salinst.hxx 2009-08-17 15:06:37.000000000 +0100
@@ -171,6 +171,8 @@
enum ConnectionIdentifierType { AsciiCString, Blob };
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
+
+ virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType) = 0;
};
// called from SVMain
diff -ru vcl.orig/inc/vcl/svapp.hxx vcl/inc/vcl/svapp.hxx
--- vcl.orig/inc/vcl/svapp.hxx 2009-08-17 14:51:15.000000000 +0100
+++ vcl/inc/vcl/svapp.hxx 2009-08-17 15:01:49.000000000 +0100
@@ -479,6 +479,20 @@
*/
static const ::rtl::OUString& GetDesktopEnvironment();
+ /** Add a file to the system shells recent document list if there is any.
+ This function may have no effect under Unix because there is no
+ standard API among the different desktop managers.
+
+ @param rFileUrl
+ The file url of the document.
+
+ @param rMimeType
+ The mime content type of the document specified by aFileUrl.
+ If an empty string will be provided "application/octet-stream"
+ will be used.
+ */
+ static void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
private:
DECL_STATIC_LINK( Application, PostEventHandler, void* );
diff -ru vcl.orig/source/app/svapp.cxx vcl/source/app/svapp.cxx
--- vcl.orig/source/app/svapp.cxx 2009-08-17 14:51:13.000000000 +0100
+++ vcl/source/app/svapp.cxx 2009-08-17 15:06:40.000000000 +0100
@@ -1989,6 +1989,12 @@
return SalGetDesktopEnvironment();
}
+void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+ ImplSVData* pSVData = ImplGetSVData();
+ pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType);
+}
+
BOOL Application::IsAccessibilityEnabled()
{
return FALSE;
diff -ru vcl.orig/unx/gtk/app/gtkinst.cxx vcl/unx/gtk/app/gtkinst.cxx
--- vcl.orig/unx/gtk/app/gtkinst.cxx 2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/gtk/app/gtkinst.cxx 2009-08-17 15:12:52.000000000 +0100
@@ -221,6 +221,12 @@
return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
}
+void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+{
+ GtkRecentManager *manager = gtk_recent_manager_get_default ();
+ gtk_recent_manager_add_item (manager, rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8).getStr());
+}
+
GtkYieldMutex::GtkYieldMutex()
{
}
diff -ru vcl.orig/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.cxx
--- vcl.orig/unx/headless/svpinst.cxx 2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/headless/svpinst.cxx 2009-08-17 15:14:50.000000000 +0100
@@ -504,6 +504,10 @@
}
}
+void SvpSalInstance::AddToRecentDocumentList(const rtl::OUString&, const rtl::OUString&)
+{
+}
+
SvpSalTimer::~SvpSalTimer()
{
}
diff -ru vcl.orig/unx/headless/svpinst.hxx vcl/unx/headless/svpinst.hxx
--- vcl.orig/unx/headless/svpinst.hxx 2009-08-17 14:51:09.000000000 +0100
+++ vcl/unx/headless/svpinst.hxx 2009-08-17 15:14:14.000000000 +0100
@@ -193,6 +193,8 @@
virtual SalSession* CreateSalSession();
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+
+ virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
};
#endif // _SV_SALINST_HXX
diff -ru vcl.orig/unx/inc/plugins/gtk/gtkinst.hxx vcl/unx/inc/plugins/gtk/gtkinst.hxx
--- vcl.orig/unx/inc/plugins/gtk/gtkinst.hxx 2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/inc/plugins/gtk/gtkinst.hxx 2009-08-17 15:09:05.000000000 +0100
@@ -91,6 +91,7 @@
virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle );
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE );
virtual SalSystem* CreateSalSystem();
+ virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
};
class GtkSalSystem : public X11SalSystem
diff -ru vcl.orig/unx/inc/salinst.h vcl/unx/inc/salinst.h
--- vcl.orig/unx/inc/salinst.h 2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/inc/salinst.h 2009-08-17 15:16:21.000000000 +0100
@@ -115,6 +115,8 @@
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
+ virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
+
bool isPrinterInit() const
{
diff -ru vcl.orig/unx/source/app/salinst.cxx vcl/unx/source/app/salinst.cxx
--- vcl.orig/unx/source/app/salinst.cxx 2009-08-17 14:51:10.000000000 +0100
+++ vcl/unx/source/app/salinst.cxx 2009-08-17 15:38:31.000000000 +0100
@@ -35,6 +35,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <osl/module.hxx>
+
#include <salunx.h>
#ifndef _VOS_MUTEX_HXX
@@ -276,3 +279,21 @@
{
delete pFrame;
}
+
+extern "C" { static void SAL_CALL thisModule() {} }
+
+void X11SalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+{
+ const rtl::OUString SYM_ADD_TO_RECENTLY_USED_FILE_LIST(RTL_CONSTASCII_USTRINGPARAM("add_to_recently_used_file_list"));
+ const rtl::OUString LIB_RECENT_FILE(RTL_CONSTASCII_USTRINGPARAM("librecentfile.so"));
+ typedef void (*PFUNC_ADD_TO_RECENTLY_USED_LIST)(const rtl::OUString&, const rtl::OUString&);
+
+ PFUNC_ADD_TO_RECENTLY_USED_LIST add_to_recently_used_file_list = 0;
+
+ osl::Module module;
+ module.loadRelative( &thisModule, LIB_RECENT_FILE );
+ if (module.is())
+ add_to_recently_used_file_list = (PFUNC_ADD_TO_RECENTLY_USED_LIST)module.getFunctionSymbol(SYM_ADD_TO_RECENTLY_USED_FILE_LIST);
+ if (add_to_recently_used_file_list)
+ add_to_recently_used_file_list(rFileUrl, rMimeType);
+}
diff -ru shell.orig/prj/d.lst shell/prj/d.lst
--- shell.orig/prj/d.lst 2009-08-17 14:50:14.000000000 +0100
+++ shell/prj/d.lst 2009-08-17 14:53:04.000000000 +0100
@@ -1,7 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\shell
-
-..\inc\*.hxx %_DEST%\inc%_EXT%\shell\*.hxx
-
..\%__SRC%\slb\*.lib %_DEST%\lib%_EXT%\*.lib
..\%__SRC%\slb\*.a %_DEST%\lib%_EXT%\*.a
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
diff -ru shell.orig/source/unix/sysshell/makefile.mk shell/source/unix/sysshell/makefile.mk
--- shell.orig/source/unix/sysshell/makefile.mk 2009-08-17 14:50:17.000000000 +0100
+++ shell/source/unix/sysshell/makefile.mk 2009-08-17 15:33:43.000000000 +0100
@@ -48,10 +48,6 @@
.IF "$(OS)" != "MACOSX"
-LIB1OBJFILES=$(SLO)$/systemshell.obj
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1ARCHIV=$(SLB)$/lib$(TARGET).a
-
SLOFILES=$(SLO)$/recently_used_file.obj \
$(SLO)$/recently_used_file_handler.obj
diff -ru shell.orig/source/unix/sysshell/recently_used_file_handler.cxx shell/source/unix/sysshell/recently_used_file_handler.cxx
--- shell.orig/source/unix/sysshell/recently_used_file_handler.cxx 2009-08-17 14:50:17.000000000 +0100
+++ shell/source/unix/sysshell/recently_used_file_handler.cxx 2009-08-17 15:34:56.000000000 +0100
@@ -31,7 +31,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-#include "systemshell.hxx"
#include "osl/process.h"
#include "rtl/ustring.hxx"
#include "rtl/string.hxx"
diff -ru sfx2.orig/inc/pch/precompiled_sfx2.hxx sfx2/inc/pch/precompiled_sfx2.hxx
--- sfx2.orig/inc/pch/precompiled_sfx2.hxx 2009-08-17 14:51:35.000000000 +0100
+++ sfx2/inc/pch/precompiled_sfx2.hxx 2009-08-17 15:38:12.000000000 +0100
@@ -484,7 +484,6 @@
#include "sal/config.h"
#include "sal/types.h"
#include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
#include "sj2/sjapplet.hxx"
#include "sot/clsids.hxx"
#include "sot/exchange.hxx"
diff -ru sfx2.orig/prj/build.lst sfx2/prj/build.lst
--- sfx2.orig/prj/build.lst 2009-08-17 14:51:16.000000000 +0100
+++ sfx2/prj/build.lst 2009-08-17 14:53:21.000000000 +0100
@@ -1,4 +1,4 @@
-sf sfx2 : idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg NULL
+sf sfx2 : idl basic xmlscript framework setup_native sax SYSTRAY_GTK:libegg NULL
sf sfx2 usr1 - all sf_mkout NULL
sf sfx2\inc nmake - all sf_inc NULL
sf sfx2\prj get - all sf_prj NULL
diff -ru sfx2.orig/source/appl/sfxpicklist.cxx sfx2/source/appl/sfxpicklist.cxx
--- sfx2.orig/source/appl/sfxpicklist.cxx 2009-08-17 14:51:30.000000000 +0100
+++ sfx2/source/appl/sfxpicklist.cxx 2009-08-17 15:38:30.000000000 +0100
@@ -43,8 +43,6 @@
#include <unotools/localfilehelper.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <shell/systemshell.hxx>
-
// ----------------------------------------------------------------------------
#include <sfx2/app.hxx>
@@ -470,7 +468,7 @@
pDocSh->Get_Impl()->bWaitingForPicklist = sal_False;
if ( aURL.GetProtocol() == INET_PROT_FILE )
- SystemShell::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
+ Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : String() );
}
break;
}
diff -ru sfx2.orig/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
--- sfx2.orig/source/doc/objstor.cxx 2009-08-17 14:51:30.000000000 +0100
+++ sfx2/source/doc/objstor.cxx 2009-08-17 15:38:28.000000000 +0100
@@ -99,7 +99,6 @@
#include <sot/storinfo.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
-#include <shell/systemshell.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/documentconstants.hxx>
@@ -820,7 +819,7 @@
if ( aUrl.GetProtocol() == INET_PROT_FILE )
{
const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
- SystemShell::AddToRecentDocumentList(
+ Application::AddToRecentDocumentList(
aUrl.GetURLNoPass( INetURLObject::NO_DECODE ),
(pOrgFilter) ? pOrgFilter->GetMimeType() : String() );
}
diff -ru sfx2.orig/util/makefile.mk sfx2/util/makefile.mk
--- sfx2.orig/util/makefile.mk 2009-08-17 14:51:39.000000000 +0100
+++ sfx2/util/makefile.mk 2009-08-17 15:36:35.000000000 +0100
@@ -87,7 +87,6 @@
$(TOOLSLIB) \
$(I18NISOLANGLIB) \
$(SAXLIB) \
- $(SYSSHELLLIB) \
$(COMPHELPERLIB) \
$(UCBHELPERLIB) \
$(CPPUHELPERLIB) \
diff -ru solenv.orig/inc/libs.mk solenv/inc/libs.mk
--- solenv.orig/inc/libs.mk 2009-08-17 14:51:30.000000000 +0100
+++ solenv/inc/libs.mk 2009-08-17 14:51:57.000000000 +0100
@@ -274,7 +274,6 @@
ISDLIB=-lsd$(DLLPOSTFIX)
PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-SYSSHELLLIB=-lsysshell
.IF "$(GUI)$(COM)"=="WNTGCC"
JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
@@ -485,7 +484,6 @@
FREETYPELIB=freetype.lib
PKGCHKLIB=ipkgchk.lib
HELPLINKERLIB=ihelplinker.lib
-SYSSHELLLIB=sysshell.lib
JVMACCESSLIB = ijvmaccess.lib
CPPUNITLIB = cppunit.lib
XSLTLIB = libxslt.lib $(ZLIB3RDLIB) $(LIBXML2LIB)
diff -ru postprocess.orig/prj/build.lst postprocess/prj/build.lst
--- postprocess.orig/prj/build.lst 2009-08-17 14:53:51.000000000 +0100
+++ postprocess/prj/build.lst 2009-08-17 14:54:09.000000000 +0100
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native shell slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -p -r1.1926 -r1.1927
--- openoffice.org.spec 25 Jul 2009 15:26:04 -0000 1.1926
+++ openoffice.org.spec 18 Aug 2009 07:48:29 -0000 1.1927
@@ -151,6 +151,7 @@ Patch75: workspace.calc311fixes.patch
Patch76: openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
Patch77: openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patch
Patch78: workspace.os132.patch
+Patch79: openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1660,6 +1661,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch76 -p0 -b .oooXXXXX.svx.64bit.patch
%patch77 -p0 -b .ooo103651.canvas.nosubpixel.patch
%patch78 -p0 -b .workspace.os132.patch
+%patch79 -p0 -b .openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4162,9 +4164,10 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Sat Jul 25 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
+* Tue Aug 18 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.6-UNBUILT
- Resolves: rhbz#512355 add openoffice.org-3.1.0.ooo103651.canvas.nosubpixel.patc
- add workspace.os132.patch to avoid switch html view overwrite horror
+- Resolves: rhbz#517843 add openoffice.org-3.1.1.ooo104306.moverecentlyused.patch
* Thu Jul 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
- Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
- Previous message: rpms/openoffice.org/devel openoffice.org-3.1.1.ooo104306.moverecentlyused.patch, NONE, 1.1 openoffice.org.spec, 1.1982, 1.1983
- Next message: rpms/hunspell-uk/devel .cvsignore, 1.4, 1.5 hunspell-uk.spec, 1.5, 1.6 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list