[Libreoffice-commits] .: 49 commits - connectivity/inc connectivity/source desktop/util drawinglayer/source officecfg/registry readlicense_oo/docs readlicense_oo/odt sfx2/source svx/source sysui/desktop xmlhelp/prj xmlhelp/source xmlhelp/util
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Dec 20 04:20:59 PST 2010
connectivity/inc/connectivity/sqlnode.hxx | 1
connectivity/source/parse/sqlnode.cxx | 10
desktop/util/template.manifest | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 2
readlicense_oo/docs/readme/readme.xrm | 147 ++--
readlicense_oo/odt/CREDITS.odt |binary
sfx2/source/appl/sfxhelp.cxx | 20
sfx2/source/appl/shutdowniconunx.cxx | 16
sfx2/source/doc/docfile.cxx | 329 +++++-----
svx/source/intro/ooo.src | 2
sysui/desktop/freedesktop/freedesktop-menus.spec | 4
sysui/desktop/mandriva/mandriva-menus.spec | 7
sysui/desktop/productversion.mk | 12
sysui/desktop/redhat/redhat-menus.spec | 5
sysui/desktop/share/create_tree.sh | 7
sysui/desktop/suse/suse-menus.spec | 5
xmlhelp/prj/build.lst | 2
xmlhelp/source/cxxhelp/provider/databases.hxx | 18
xmlhelp/source/cxxhelp/provider/provider.cxx | 6
xmlhelp/source/treeview/makefile.mk | 1
xmlhelp/source/treeview/tvread.cxx | 5
xmlhelp/util/makefile.mk | 1
23 files changed, 329 insertions(+), 275 deletions(-)
New commits:
commit f4b7f75ef20073751f8be542633ca5013727331d
Merge: 3b27e34... 668fbd9...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 13:14:30 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-core
commit 3b27e34b953c114fec7f6c23ce0e6c583d463c46
Merge: f854bf9... b453305...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 01:29:39 2010 +0100
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
diff --cc connectivity/source/parse/sqlnode.cxx
index 72c8291,b27aa28..a6dc5ca
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@@ -2513,6 -2514,7 +2514,7 @@@ void OSQLParseNode::parseLeaf(::rtl::OU
rString.append(m_aNodeValue);
rString.appendAscii("#");
break;
-
++
case SQL_NODE_INTNUM:
case SQL_NODE_APPROXNUM:
{
diff --cc sfx2/source/appl/shutdowniconunx.cxx
index 371140c,7791ad7..a255834
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@@ -327,22 -354,32 +327,38 @@@ static gboolean display_menu_cb( GtkWid
return TRUE;
}
-extern "C" {
- static gboolean
- show_at_idle( gpointer )
- {
- ::SolarMutexGuard aGuard;
- gtk_widget_show_all( GTK_WIDGET( pTrayIcon ) );
- return FALSE;
- }
+#ifdef ENABLE_GIO
+/*
+ * See rhbz#610103. If the quickstarter is running, then LibreOffice is
+ * upgraded, then the old quickstarter is still running, but is now unreliable
+ * as the old install has been deleted. A fairly intractable problem but we
+ * can avoid much of the pain if we turn off the quickstarter if we detect
+ * that it has been physically deleted.
+*/
+static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
+ GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
+{
+ if (event_type == G_FILE_MONITOR_EVENT_DELETED)
+ exit_quickstarter_cb(NULL);
}
+#endif
+ #ifdef ENABLE_GIO
+ /*
+ * See rhbz#610103. If the quickstarter is running, then LibreOffice is
+ * upgraded, then the old quickstarter is still running, but is now unreliable
+ * as the old install has been deleted. A fairly intractable problem but we
+ * can avoid much of the pain if we turn off the quickstarter if we detect
+ * that it has been physically deleted.
+ */
+ static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
+ GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
+ {
+ if (event_type == G_FILE_MONITOR_EVENT_DELETED)
+ exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
+ }
+ #endif
+
void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray()
{
::SolarMutexGuard aGuard;
diff --cc sysui/desktop/share/create_tree.sh
index 3a7128f,e7b3303..160b2db
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@@ -92,11 -92,10 +92,12 @@@ f
mkdir -p ${DESTDIR}/usr/bin
- office_root=/opt/${PREFIX}
+ office_prefix=/opt
+ office_root=${office_prefix}/${PREFIX}
-cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
+#this symlink is needed to have the API boostrap functions running right
+ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/libreoffice
+
cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
commit b4533051a5b364470be0a2f0ee461f45419a836d
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Dec 18 20:35:16 2010 +0100
Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
commit 57662199c719e0efde3aefce9e06f19429bce344
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Dec 16 20:53:32 2010 +0100
Correct credits url to website conventions
diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src
index ad9f89e..635789d 100644
--- a/svx/source/intro/ooo.src
+++ b/svx/source/intro/ooo.src
@@ -111,7 +111,7 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_LINK
{
- Text[ en-US ] = "http://libreoffice.org/credits.html";
+ Text[ en-US ] = "http://www.libreoffice.org/credits.html";
};
StringArray ABOUT_STR_DEVELOPER_ARY
{
commit 55abe868d44218c0af7e55fb83a11d07ecb01894
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Dec 15 22:56:22 2010 +0100
wikihelp: Use the right Help ID URL, fdo#32338.
The offline help has a fallback mechanism that (for non-existing Help IDs)
tries to traverse the parent windows to find at least something. This is not
desired in the case of on-line help, because there we can easily define new
redirects, without recompiling LibreOffice.
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 339e664..53c15ce 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -745,6 +745,17 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask ,
return pHelpWindow;
}
+/// Check for built-in help
+static bool impl_hasHelpInstalled()
+{
+ String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
+ AppendConfigToken_Impl( aHelpRootURL, sal_True );
+ Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
+
+ return ( aFactories.getLength() != 0 );
+}
+
+/// Redirect the vnd.sun.star.help:// urls to http://help.libreoffice.org
static bool impl_showOnlineHelp( const String& rURL )
{
String aInternal( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
@@ -811,13 +822,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow )
}
}
- // check if help is available
- String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") );
- AppendConfigToken_Impl( aHelpRootURL, sal_True );
- Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL );
- if ( 0 == aFactories.getLength() )
+ if ( !impl_hasHelpInstalled() )
{
- // no factories -> no help -> try online
if ( impl_showOnlineHelp( aHelpURL ) )
return TRUE;
else
@@ -871,7 +877,7 @@ BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow )
{
String aHelpModuleName( GetHelpModuleName_Impl() );
String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName );
- if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
+ if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) )
{
// no help found -> try with parent help id.
Window* pParent = pWindow->GetParent();
commit 042933bbfb3ff69a34a0df12105e084cc95961e0
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Wed Dec 15 15:44:47 2010 +0100
convert from the KDE pattern|description format if needed, just in case
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 9a8b762..cef3d39 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -323,6 +323,7 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
// _dialog->currentFilter() wouldn't quite work, because it returns only e.g. "*.doc",
// without the description, and there may be several filters with the same pattern
QString filter = _dialog->filterWidget()->currentText();
+ filter = filter.mid( filter.indexOf( '|' ) + 1 ); // convert from the pattern|description format if needed
filter.replace( "\\/", "/" );
//default if not found
commit 65dc25b5ee9431d2fc7354d7871c5db3494db3f8
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Wed Dec 15 15:23:52 2010 +0100
save with the proper .doc variant (fdo#32219)
KFileDialog::currentFilter() returns only the pattern and not
the full filter text, so *.doc alone is ambiguous.
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 3c2bdd8..9a8b762 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -299,10 +299,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
if (!_filter.isNull())
_filter.append("\n");
- //add to hash map for reverse lookup in getCurrentFilter
- _filters.insert(f, t);
-
- // '/' meed to be escaped to else they are assumed to be mime types by kfiledialog
+ // '/' need to be escaped else they are assumed to be mime types by kfiledialog
//see the docs
t.replace("/", "\\/");
@@ -323,7 +320,10 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title )
rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
throw( uno::RuntimeException )
{
- QString filter = _filters[_dialog->currentFilter()];
+ // _dialog->currentFilter() wouldn't quite work, because it returns only e.g. "*.doc",
+ // without the description, and there may be several filters with the same pattern
+ QString filter = _dialog->filterWidget()->currentText();
+ filter.replace( "\\/", "/" );
//default if not found
if (filter.isNull())
@@ -608,7 +608,6 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
throw( uno::Exception, uno::RuntimeException )
{
_filter.clear();
- _filters.clear();
// parameter checking
uno::Any arg;
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.hxx b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
index e806c11..e1b8a15 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.hxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.hxx
@@ -79,9 +79,6 @@ protected:
//running filter string to add to dialog
QString _filter;
- //filter for reverse lookup of filter text
- QHash<QString, QString> _filters;
-
//mapping of SAL control ID's to created custom controls
QHash<sal_Int16, QWidget*> _customWidgets;
commit d2d5e0d1e55ee692632aa547f17f6a48179af2b7
Merge: fae626b... 760601c...
Author: Noel Power <noel.power at novell.com>
Date: Wed Dec 15 11:04:54 2010 +0000
Merge commit 'ooo/OOO330_m18' into libreoffice-3-3
diff --cc connectivity/source/parse/sqlnode.cxx
index c8b5ff6,1b71a66..b27aa28
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@@ -1427,9 -1425,10 +1427,10 @@@ OSQLParser::OSQLParser(const ::com::sun
{ OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
{ OSQLParseNode::character_string_type, "character_string_type" },
{ OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" },
- { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" }
+ { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" },
+ { OSQLParseNode::cast_spec, "cast_spec" }
};
- size_t nRuleMapCount = sizeof( aRuleDescriptions ) / sizeof( aRuleDescriptions[0] );
+ size_t nRuleMapCount = SAL_N_ELEMENTS( aRuleDescriptions );
OSL_ENSURE( nRuleMapCount == size_t( OSQLParseNode::rule_count ), "OSQLParser::OSQLParser: added a new rule? Adjust this map!" );
for ( size_t mapEntry = 0; mapEntry < nRuleMapCount; ++mapEntry )
commit fae626b938106e00d8f4dfb5c4ca8e9294b37c30
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 12 10:03:13 2010 +0100
fdo#31716 the help text is not used for anything -- do not set it
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 2aee922..c499ee8 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -409,7 +409,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
}
const String sItemText = pSVMenu->GetItemText(nSlotId);
- const String sHelpText = pSVMenu->GetHelpText(nSlotId);
+ const String sHelpText; // not used for anything -> just empty string
if ( pPopup )
{
@@ -815,7 +815,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
rCtrl.Bind( this, nSID, *pSubMenu,
- pSVMenu->GetItemText(nSID), pSVMenu->GetHelpText(nSID),
+ pSVMenu->GetItemText(nSID), String(),
*pBindings );
// Activate weiterleiten
@@ -1331,7 +1331,7 @@ void SfxVirtualMenu::InitPopup( USHORT nPos, BOOL /*bOLE*/ )
DBG_OUTF( ("Neues VirtualMenu %lx erzeugt", pSubMenu) );
rCtrl.Bind( this, nSID, *pSubMenu,
- pSVMenu->GetItemText(nSID), pSVMenu->GetHelpText(nSID),
+ pSVMenu->GetItemText(nSID), String(),
*pBindings );
}
}
commit d873fc5f1226f4689936b736704b2f3d9156bbe5
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Dec 14 16:32:58 2010 +0100
use BrOffice also in the help content when enabled (fdo#31770)
use ::utl::ConfigManager::GetDirectConfigProperty to get
the product name; it returns BrOffice in pt_BR locales
when BrOffice branding enabled
Signed off by Michael Meeks <michael.meeks at novell.com>
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 7430bf6..00e285c 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,4 +1,4 @@
-xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper l10ntools NULL
+xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper l10ntools unotools NULL
xh xmlhelp usr1 - all xh_mkout NULL
xh xmlhelp\inc nmake - all xh_inc NULL
xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 134adbd..5f029c2 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -310,14 +310,16 @@ namespace chelp {
int m_nCustomCSSDocLength;
char* m_pCustomCSSDoc;
rtl::OUString m_aCSS;
-
-#define PRODUCTNAME 0
-#define PRODUCTVERSION 1
-#define VENDORNAME 2
-#define VENDORVERSION 3
-#define VENDORSHORT 4
-#define NEWPRODUCTNAME 5
-#define NEWPRODUCTVERSION 6
+
+ enum {
+ PRODUCTNAME = 0,
+ PRODUCTVERSION,
+ VENDORNAME,
+ VENDORVERSION,
+ VENDORSHORT,
+ NEWPRODUCTNAME,
+ NEWPRODUCTVERSION
+ };
int m_vAdd[7];
rtl::OUString m_vReplacement[7];
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 365fff0..e6f4898 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <unotools/configmgr.hxx>
#include <rtl/bootstrap.hxx>
#include "databases.hxx"
@@ -306,9 +307,10 @@ void ContentProvider::init()
* productversion,
*/
+ rtl::OUString productname;
+ ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productname;
+
xHierAccess = getHierAccess( sProvider, "org.openoffice.Setup" );
- rtl::OUString productname(
- getKey( xHierAccess,"Product/ooName" ) );
rtl::OUString setupversion(
getKey( xHierAccess,"Product/ooSetupVersion" ) );
diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk
index 0c38586..3dc6545 100644
--- a/xmlhelp/source/treeview/makefile.mk
+++ b/xmlhelp/source/treeview/makefile.mk
@@ -57,6 +57,7 @@ SHL1STDLIBS=\
$(CPPULIB) \
$(COMPHELPERLIB) \
$(EXPATASCII3RDLIB) \
+ $(UNOTOOLSLIB) \
$(SALLIB)
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 988a775..9d3ffa8 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -36,6 +36,7 @@
#include "tvread.hxx"
#include <expat.h>
#include <osl/file.hxx>
+#include <unotools/configmgr.hxx>
#include <com/sun/star/frame/XConfigManager.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -676,10 +677,12 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr )
/* reading setup */
/**********************************************************************/
+ rtl::OUString productName;
+ ::utl::ConfigManager::GetDirectConfigProperty(::utl::ConfigManager::PRODUCTNAME) >>= productName;
+
xHierAccess = getHierAccess( sProvider,
"org.openoffice.Setup" );
- rtl::OUString productName( getKey( xHierAccess,"Product/ooName" ) );
rtl::OUString setupversion( getKey( xHierAccess,"Product/ooSetupVersion" ) );
rtl::OUString setupextension;
diff --git a/xmlhelp/util/makefile.mk b/xmlhelp/util/makefile.mk
index 66551f1..5bc5bc6 100644
--- a/xmlhelp/util/makefile.mk
+++ b/xmlhelp/util/makefile.mk
@@ -59,6 +59,7 @@ SHL1STDLIBS= \
$(COMPHELPERLIB) \
$(SALLIB) \
$(EXPATASCII3RDLIB) \
+ $(UNOTOOLSLIB) \
$(UCBHELPERLIB) \
$(BERKELEYLIB) \
$(XSLTLIB)
commit 45b2e791e0ef33c7665cf6047a6dcb88c2862799
Author: Petr Mladek <pmladek at suse.cz>
Date: Sun Dec 12 20:54:39 2010 +0100
fix broffice branding packages (fdo#32229)
- rename the packages from broffice.org to broffice
- add /opt/broffice compat symlink
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 01bec9f..30c2dd6 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -318,6 +318,10 @@ done
# glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374)
# https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362
%defattr(-, root, root)
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755, root, root) /opt/%unixfilename
+%endif
%attr(0755, root, root) /usr/bin/*
/usr/share/applications/%unixfilename-base.desktop
/usr/share/applications/%unixfilename-calc.desktop
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index f02a468..f068788 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -309,7 +309,12 @@ fi
%files
-%attr(0755,root,root) /usr/bin/%unixfilename
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755,root,root) /opt/%unixfilename
+%attr(0755,root,root) /usr/bin/libreoffice
+%attr(0755,root,root) /usr/bin/libreoffice-printeradmin
+%endif
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index e9bd131..6f41333 100644
--- a/sysui/desktop/productversion.mk
+++ b/sysui/desktop/productversion.mk
@@ -65,11 +65,11 @@ PKGVERSION.libreoffice = $(PKGVERSION)
UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l)
ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice:s/.//g)
-PRODUCTNAME.broffice.org = BrOffice.org
-PRODUCTVERSION.broffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.broffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.broffice.org = $(PKGVERSION)
-UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)
-ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g)
+PRODUCTNAME.broffice = BrOffice
+PRODUCTVERSION.broffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.broffice = $(PKGVERSION)
+UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l)
+ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g)
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index ce9cdc2..663fe23 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -268,7 +268,12 @@ for theme in gnome hicolor locolor; do
done
%files
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755,root,root) /opt/%unixfilename
%attr(0755,root,root) /usr/bin/libreoffice
+%attr(0755,root,root) /usr/bin/libreoffice-printeradmin
+%endif
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 48b0458..e7b3303 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -92,13 +92,17 @@ fi
mkdir -p ${DESTDIR}/usr/bin
-office_root=/opt/${PREFIX}
+office_prefix=/opt
+office_root=${office_prefix}/${PREFIX}
cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
if test "${PREFIX}" != libreoffice ; then
+ # compat symlinks
+ mkdir -p ${DESTDIR}${office_prefix}
+ ln -sf libreoffice ${DESTDIR}${office_root}
ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice-printeradmin
fi
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 52df81f..fe70969 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -280,7 +280,12 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt
done
%files
+%if %unixfilename != libreoffice
+# compat symlinks
+%attr(0755,root,root) /opt/%unixfilename
%attr(0755,root,root) /usr/bin/libreoffice
+%attr(0755,root,root) /usr/bin/libreoffice-printeradmin
+%endif
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)
commit 39f5301bdfa200b092da69718c84d19acaac0791
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 9 20:32:23 2010 +0000
Resolves: rhbz#661809 ne_simple_propfind can touch gcrypt as well
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 3946eb0..dc5ed6d 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -260,6 +260,8 @@ extern "C" void NPFR_propnames_results( void* userdata,
theResources->push_back( theResource );
}
+extern osl::Mutex aGlobalNeonMutex;
+
// -------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------
@@ -287,12 +289,15 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
thePropNames[ theIndex ].nspace = NULL;
thePropNames[ theIndex ].name = NULL;
- nError = ne_simple_propfind( inSession,
- inPath,
- inDepth,
- thePropNames,
- NPFR_propfind_results,
- &ioResources );
+ {
+ osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
+ nError = ne_simple_propfind( inSession,
+ inPath,
+ inDepth,
+ thePropNames,
+ NPFR_propfind_results,
+ &ioResources );
+ }
for ( theIndex = 0; theIndex < thePropCount; theIndex ++ )
free( (void *)thePropNames[ theIndex ].name );
@@ -302,6 +307,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
else
{
// ALLPROP
+ osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
nError = ne_simple_propfind( inSession,
inPath,
inDepth,
commit d565aa114b1c8533bb267d5635a6af19e6536ffa
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Dec 9 11:59:50 2010 +0000
cleanup deliver syntax
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 1739f6f..d4d5026 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,9 +4,9 @@ mkdir: %_DEST%\pck%_EXT%
dos: echo =====================================================================
dos: echo Delivering LICENSE files
dos: echo =====================================================================
-..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\osl\LICENSE
+..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl\license.txt
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl\LICENSE.odt
..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
commit cc504fa0699657ac4123c3d4c0ba40db7e9d26de
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Dec 9 11:49:52 2010 +0000
further simplification of license build / installation
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index 0b41cff..ee1facd 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -6,23 +6,11 @@ TARGET=source
.INCLUDE: settings.mk
# ------------------------------------------------------------------
-.IF "$(GUI)"=="WNT"
-SYSLICBASE=license.txt LICENSE.odt
-SYSLICDEST=$(MISC)$/license$/wnt
-.ELSE # "$(GUI)"=="WNT"
-SYSLICBASE=LICENSE LICENSE.odt
-SYSLICDEST=$(MISC)$/license$/unx
-.ENDIF # "$(GUI)"=="WNT"
-
-SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)$(i:e))
-
-fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
-
# ------------------------------------------------------------------
.INCLUDE: target.mk
# ------------------------------------------------------------------
-ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics \
+ALLTAR: $(MISC)/$/license.txt $(MISC)/$/LICENSE \
$(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
$(MISC)$/THIRDPARTYLICENSEREADME.html
@@ -36,16 +24,13 @@ just_for_nice_optics: $(fallbacklicenses)
@$(ECHONL)
# for windows, convert linends to DOS
-$(SYSLICDEST)$/license.% : txt$/license.%
- @-$(MKDIRHIER) $(SYSLICDEST)
+$(MISC)$/license.txt : txt$/license.txt
$(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
-
# for others just copy
-$(SYSLICDEST)$/LICENSE : txt$/license.txt
- @-$(MKDIRHIER) $(SYSLICDEST)
+$(MISC)$/LICENSE : txt$/license.txt
$(COPY) $< $@
-$(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
- @-$(MKDIRHIER) $(SYSLICDEST)
+
+$(MISC)$/SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
$(COPY) $< $@
# just copy into misc
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index deb1c94..1739f6f 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,17 +4,17 @@ mkdir: %_DEST%\pck%_EXT%
dos: echo =====================================================================
dos: echo Delivering LICENSE files
dos: echo =====================================================================
-..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\unx\LICENSE*.odt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\LICENSE*.odt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl
+
..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
# URE:
mkdir: %_DEST%\bin%_EXT%\ure
-..\%__SRC%\misc\license\unx\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license.txt %_DEST%\bin%_EXT%\ure\license.txt
+..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
+..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\ure\license.txt
..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
commit 50db6d730f388a77b6e341afbac7502a30b0259a
Author: Michael Meeks <michael.meeks at novell.com>
Date: Wed Dec 8 20:48:37 2010 +0000
get the rule names right, and cleanup delivery
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index dcbafb0..0b41cff 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -22,7 +22,9 @@ fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(forea
.INCLUDE: target.mk
# ------------------------------------------------------------------
-ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics
+ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics \
+ $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
+ $(MISC)$/THIRDPARTYLICENSEREADME.html
.IF "$(fallbacklicenses)"!=""
$(fallbacklicenses) : $(SOURCELICENCES)
@@ -47,9 +49,9 @@ $(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
$(COPY) $< $@
# just copy into misc
-$(MISC)$/LICENSE.odt: LICENSE.odt
- $(COPY) LICENSE.odt $@
-$(MISC)$/CREDITS.odt: CREDITS.odt
- $(COPY) CREDITS.odt $@
-$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
- $(COPY) THIRDPARTYLICENSEREADME.html $@
+$(MISC)$/LICENSE.odt: odt/LICENSE.odt
+ $(COPY) odt/LICENSE.odt $@
+$(MISC)$/CREDITS.odt: odt/CREDITS.odt
+ $(COPY) odt/CREDITS.odt $@
+$(MISC)$/THIRDPARTYLICENSEREADME.html: html/THIRDPARTYLICENSEREADME.html
+ $(COPY) html/THIRDPARTYLICENSEREADME.html $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index aa771c5..deb1c94 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,30 +4,20 @@ mkdir: %_DEST%\pck%_EXT%
dos: echo =====================================================================
dos: echo Delivering LICENSE files
dos: echo =====================================================================
-
-# Can we finally unify Windows and unx file names to upper case
-# LICENSE/LICENSE.html?
-# FIXME: is - can you solve this?
..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\unx\LICENSE*.html %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\unx\LICENSE*.odt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\LICENSE*.odt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.html %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.rtf %_DEST%\bin%_EXT%\osl
+..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
+..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
# URE:
mkdir: %_DEST%\bin%_EXT%\ure
-..\%__SRC%\misc\license\unx\LICENSE_en-US %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
+..\%__SRC%\misc\license\unx\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
+..\%__SRC%\misc\license\wnt\license.txt %_DEST%\bin%_EXT%\ure\license.txt
-# RTF only for Windows?
-# Why? It comes from cws_src680_langsupporter.
..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
-..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
dos: echo =====================================================================
dos: echo Delivering README files
commit 17744748fa68f55c0133b34330d572f799e4f5a9
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Dec 9 10:55:33 2010 +0000
Simplify, remove lang suffix, remove html and rtf licenses, to use odt.
Conflicts:
readlicense_oo/odt/makefile.mk
diff --git a/readlicense_oo/html/makefile.mk b/readlicense_oo/html/makefile.mk
deleted file mode 100644
index 332d23d..0000000
--- a/readlicense_oo/html/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=readlicense_oo
-TARGET=html
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-all: $(MISC)$/THIRDPARTYLICENSEREADME.html
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
- $(COPY) THIRDPARTYLICENSEREADME.html $@
-
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index 0568a98..dcbafb0 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -7,14 +7,14 @@ TARGET=source
# ------------------------------------------------------------------
.IF "$(GUI)"=="WNT"
-SYSLICBASE=license.txt license.html license.rtf
+SYSLICBASE=license.txt LICENSE.odt
SYSLICDEST=$(MISC)$/license$/wnt
.ELSE # "$(GUI)"=="WNT"
-SYSLICBASE=LICENSE LICENSE.html
+SYSLICBASE=LICENSE LICENSE.odt
SYSLICDEST=$(MISC)$/license$/unx
.ENDIF # "$(GUI)"=="WNT"
-SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)_en-US$(i:e))
+SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)$(i:e))
fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
@@ -34,19 +34,22 @@ just_for_nice_optics: $(fallbacklicenses)
@$(ECHONL)
# for windows, convert linends to DOS
-$(SYSLICDEST)$/license_en-US.% : source$/license$/license_en-US.%
+$(SYSLICDEST)$/license.% : txt$/license.%
@-$(MKDIRHIER) $(SYSLICDEST)
$(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
# for others just copy
-$(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt
+$(SYSLICDEST)$/LICENSE : txt$/license.txt
@-$(MKDIRHIER) $(SYSLICDEST)
$(COPY) $< $@
-
-$(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html
+$(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
@-$(MKDIRHIER) $(SYSLICDEST)
$(COPY) $< $@
-$(SYSLICDEST)$/LICENSE.odt : source$/license$/license.odt
- @-$(MKDIRHIER) $(SYSLICDEST)
- $(COPY) $< $@
+# just copy into misc
+$(MISC)$/LICENSE.odt: LICENSE.odt
+ $(COPY) LICENSE.odt $@
+$(MISC)$/CREDITS.odt: CREDITS.odt
+ $(COPY) CREDITS.odt $@
+$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
+ $(COPY) THIRDPARTYLICENSEREADME.html $@
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
deleted file mode 100644
index 89cea1a..0000000
--- a/readlicense_oo/odt/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=readlicense_oo
-TARGET=odt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/LICENSE.odt: LICENSE.odt
- $(COPY) LICENSE.odt $@
-$(MISC)$/CREDITS.odt: CREDITS.odt
- $(COPY) CREDITS.odt $@
diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst
index 0f484d0..2296ead 100644
--- a/readlicense_oo/prj/build.lst
+++ b/readlicense_oo/prj/build.lst
@@ -1,7 +1,5 @@
-ro readlicense_oo : l10n solenv LIBXSLT:libxslt NULL
-ro readlicense_oo usr1 - all ro_root NULL
-ro readlicense_oo\docs\readme nmake - all ro_readme NULL
-ro readlicense_oo\html nmake - all ro_html NULL
-ro readlicense_oo\odt nmake - all ro_odt NULL
-ro readlicense_oo nmake - all ro_conv NULL
+ro readlicense_oo : l10n solenv LIBXSLT:libxslt NULL
+ro readlicense_oo usr1 - all ro_root NULL
+ro readlicense_oo\docs\readme nmake - all ro_readme NULL
+ro readlicense_oo nmake - all ro_conv NULL
diff --git a/readlicense_oo/source/license/license_en-US.html b/readlicense_oo/source/license/license_en-US.html
deleted file mode 100644
index 3064ab1..0000000
--- a/readlicense_oo/source/license/license_en-US.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><!--This file was converted to xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more info.--><head profile="http://dublincore.org/documents/dcmi-terms/"><meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8"/><title xml:lang="en-US">- no title specified</title><meta name="DCTERMS.title" content="" xml:lang="en-US"/><meta name="DCTERMS.language" content="en-US" scheme="DCTERMS.RFC4646"/><meta name="DCTERMS.source" content="http://xml.openoffice.org/odf2xhtml"/><meta name="DCTERMS.issued" content="2010-09-23T20:59:05" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.contributor" content="Cédric Bosdonnat"/><meta name="DCTERMS.modified" content="2010-10-13T20:07:34" scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.provenance" content="" xml:lang="en-US"/><meta name="DCTERMS.subject" content="," xml:lang="en-US"/><link rel="schema.DC" href="http://purl.org/dc/elements/1.1/" hreflang="en"/><link rel=
"schema.DCTERMS" href="http://purl.org/dc/terms/" hreflang="en"/><link rel="schema.DCTYPE" href="http://purl.org/dc/dcmitype/" hreflang="en"/><link rel="schema.DCAM" href="http://purl.org/dc/dcam/" hreflang="en"/><base href="."/><style type="text/css">
- @page { }
- table { border-collapse:collapse; border-spacing:0; empty-cells:show }
- td, th { vertical-align:top; font-size:12pt;}
- h1, h2, h3, h4, h5, h6 { clear:both }
- ol, ul { margin:0; padding:0;}
- li { list-style: none; margin:0; padding:0;}
- <!-- "li span.odfLiEnd" - IE 7 issue-->
- li span. { clear: both; line-height:0; width:0; height:0; margin:0; padding:0; }
- span.footnodeNumber { padding-right:1em; }
- span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000; margin:0; border:0; padding:0; }
- * { margin:0;}
- .Heading_20_1 { font-size:24pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale; writing-mode:page; font-weight:bold; }
- .Heading_20_2 { font-size:18pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
- .Heading_20_3 { font-size:14pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
- .Heading_20_4 { font-size:12pt; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; font-weight:bold; }
- .Horizontal_20_Line_borderStart { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; padding:0in; border-left-style:none; border-right-style:none; border-top-style:none; padding-bottom:0.1965in; border-bottom-style:none; }
- .Horizontal_20_Line { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; padding:0in; border-left-style:none; border-right-style:none; padding-top:0in; padding-bottom:0.1965in; border-top-style:none; border-bottom-style:none; }
- .Horizontal_20_Line_borderEnd { font-size:6pt; font-family:Thorndale AMT; writing-mode:page; margin-bottom:0.1965in; padding:0in; border-left-style:none; border-right-style:none; border-bottom-width:0.0399cm; border-bottom-style:double; border-bottom-color:#808080; padding-top:0in; border-top-style:none;}
- .List_20_Contents { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-left:0.3937in; margin-right:0in; text-indent:0in; }
- .P1 { font-size:12pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale AMT; writing-mode:page; text-align:left ! important; }
- .P10 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:center ! important; font-weight:bold; }
- .P11 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P12 { font-size:24pt; font-weight:bold; margin-bottom:0.0835in; margin-top:0.1665in; font-family:Thorndale; writing-mode:page; }
- .P13 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P14 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P15 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P16 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P17 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P18 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P19 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P2 { font-size:10pt; margin-bottom:0.1965in; margin-top:0in; font-family:Cumberland AMT; writing-mode:page; }
- .P20 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P21 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P22 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P23 { font-size:12pt; margin-bottom:0in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P24 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P25 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P26 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P27 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P28 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P29 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P3 { font-size:12pt; margin-left:0.3937in; margin-right:0in; text-indent:0in; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; margin-bottom:0.1965in; }
- .P30 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P31 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P32 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P33 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P34 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P35 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P36 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P37 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P38 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P39 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P4 { font-size:10pt; margin-bottom:0in; margin-top:0in; font-family:Cumberland AMT; writing-mode:page; font-weight:bold; }
- .P40 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P41 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P42 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P43 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P44 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P45 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P46 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P47 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P48 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P49 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P5_borderStart { border-left-style:none; border-right-style:none; border-top-style:none; font-size:6pt; margin-top:0in; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-bottom:0.1965in; border-bottom-style:none; }
- .P5 { border-left-style:none; border-right-style:none; font-size:6pt; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-bottom:0.1965in; padding-top:0in; border-top-style:none; border-bottom-style:none; }
- .P5_borderEnd { border-bottom-width:0.0399cm; border-bottom-style:double; border-bottom-color:#808080; border-left-style:none; border-right-style:none; font-size:6pt; margin-bottom:0.1965in; padding:0in; font-family:Thorndale AMT; writing-mode:page; margin-left:2.928in; margin-right:2.928in; text-align:center ! important; text-indent:0in; padding-top:0in; border-top-style:none;}
- .P50 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P51 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P52 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P53 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P54 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P55 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P56 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P57 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P58 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P59 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P6 { font-size:10pt; margin-bottom:0.1965in; margin-left:0.3937in; margin-right:0.3937in; margin-top:0in; text-indent:0in; font-family:Thorndale AMT; writing-mode:page; font-style:italic; }
- .P60 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P61 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P62 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P63 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P64 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P65 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P66 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P67 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P68 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P69 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; }
- .P7 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:left ! important; }
- .P8 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; text-align:center ! important; }
- .P9 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in; font-family:Thorndale AMT; writing-mode:page; font-style:italic; font-weight:bold; }
- .Preformatted_20_Text { font-size:10pt; font-family:Cumberland AMT; writing-mode:page; margin-top:0in; margin-bottom:0in; }
- .Quotations { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-left:0.3937in; margin-right:0.3937in; margin-top:0in; margin-bottom:0.1965in; text-indent:0in; }
- .Text_20_body { font-size:12pt; font-family:Thorndale AMT; writing-mode:page; margin-top:0in; margin-bottom:0.0835in; }
- .Bullet_20_Symbols { font-family:OpenSymbol; }
- .Emphasis { font-style:italic; }
- .Strong_20_Emphasis { font-weight:bold; }
- .T1 { font-style:italic; }
- .T2 { font-style:italic; }
- .T4 { font-weight:bold; }
- .T5 { font-size:18pt; font-weight:bold; }
- .T6 { color:#000000; }
- .T7 { font-size:10pt; font-style:italic; }
- <!-- ODF styles with no properties representable as CSS -->
- .Numbering_20_Symbols .T3 { }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list