[Libreoffice-commits] core.git: 12 commits - config_host.mk.in configure.ac desktop/source extensions/source filter/source include/unotools instsetoo_native/CustomTarget_install.mk instsetoo_native/util Makefile.in officecfg/registry postprocess/CustomTarget_registry.mk solenv/bin solenv/gbuild svl/source svtools/source sw/source sw/uiconfig unotools/source
Michael Stahl
mstahl at redhat.com
Tue Oct 1 09:10:00 PDT 2013
Makefile.in | 56 +++++-----
config_host.mk.in | 2
configure.ac | 4
desktop/source/app/app.cxx | 26 ----
extensions/source/nsplugin/source/so_env.cxx | 5
filter/source/config/cache/constant.hxx | 4
filter/source/config/cache/filtercache.cxx | 41 -------
filter/source/config/cache/filtercache.hxx | 8 -
filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu | 2
filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu | 2
filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu | 2
filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu | 2
filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu | 2
filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu | 2
filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu | 2
filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu | 2
filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu | 2
filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu | 2
filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu | 2
filter/source/config/fragments/filters/writerweb8_writer_ui.xcu | 4
filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu | 2
filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu | 2
filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu | 2
filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu | 2
include/unotools/configmgr.hxx | 6 -
instsetoo_native/CustomTarget_install.mk | 22 +--
instsetoo_native/util/openoffice.lst.in | 2
officecfg/registry/data/org/openoffice/Office/Compatibility.xcu | 2
officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu | 2
postprocess/CustomTarget_registry.mk | 1
solenv/bin/callcatcher.Makefile | 1
solenv/bin/install-gdb-printers | 2
solenv/gbuild/gbuild.mk | 2
solenv/gbuild/platform/com_GCC_class.mk | 2
svl/source/misc/mediatyp.src | 16 +-
svtools/source/dialogs/formats.src | 18 +--
svtools/source/misc/imagemgr.src | 22 +--
sw/source/ui/config/optcomp.cxx | 19 ---
sw/source/ui/inc/optcomp.hxx | 1
sw/uiconfig/swriter/ui/optcompatpage.ui | 8 -
unotools/source/config/configmgr.cxx | 18 ---
45 files changed, 101 insertions(+), 231 deletions(-)
New commits:
commit 7c358450e389d682657be283026403fb6e8931ba
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 17:50:47 2013 +0200
extensions: kill StarOffice/StarSuite branding in browser plugin
Change-Id: Ia4c291936ad0b31e67d8edb046424d29462171b5
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index b09f11c..a2a98d9 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -434,14 +434,11 @@ char* NSP_getProductName()
strcpy(productName, pStart);
}
fclose(fp);
- if ((*productName == 0) ||
- (0 != STRNICMP(productName, "StarOffice", sizeof("StarOffice"))))
+ if (*productName == 0)
{
strcpy(productName, PLUGIN_NAME);
return productName;
}
- memset(productName, 0, sizeof(productName));
- strcat(productName, "StarOffice/StarSuite");
return productName;
}
commit abd3338486a515380d50c4ee5f4ab242fb5fd4bd
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 17:46:21 2013 +0200
desktop: stop replacing %PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION
... and %PRODUCTXMLFILEFORMATNAME at runtime and hard-code
OpenOffice.org 1.0 for these too.
Change-Id: Id96390506d2a0f367f932e85d3115362ad483bc3
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 267d60a..c062956 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -468,10 +468,6 @@ namespace
: public rtl::Static< OUString, OOOVendor > {};
struct Extension
: public rtl::Static< OUString, Extension > {};
- struct XMLFileFormatName
- : public rtl::Static< OUString, XMLFileFormatName > {};
- struct XMLFileFormatVersion
- : public rtl::Static< OUString, XMLFileFormatVersion > {};
}
OUString ReplaceStringHookProc( const OUString& rStr )
@@ -486,15 +482,10 @@ OUString ReplaceStringHookProc( const OUString& rStr )
OUString sAboutBoxVersion = AboutBoxVersion::get();
OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get();
OUString sExtension = Extension::get();
- OUString sXMLFileFormatName = XMLFileFormatName::get();
- OUString sXMLFileFormatVersion = XMLFileFormatVersion::get();
if ( sBrandName.isEmpty() )
{
sBrandName = utl::ConfigManager::getProductName();
- sXMLFileFormatName = utl::ConfigManager::getProductXmlFileFormat();
- sXMLFileFormatVersion =
- utl::ConfigManager::getProductXmlFileFormatVersion();
sVersion = utl::ConfigManager::getProductVersion();
sAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion();
sAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix();
@@ -510,8 +501,6 @@ OUString ReplaceStringHookProc( const OUString& rStr )
sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix );
sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion );
sRet = sRet.replaceAll( "%PRODUCTEXTENSION", sExtension );
- sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATNAME", sXMLFileFormatName );
- sRet = sRet.replaceAll( "%PRODUCTXMLFILEFORMATVERSION", sXMLFileFormatVersion );
}
if ( sRet.indexOf( "%OOOVENDOR" ) != -1 )
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index b8bc42d..1b24feb 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -50,10 +50,6 @@ public:
static OUString getProductName();
- static OUString getProductXmlFileFormat();
-
- static OUString getProductXmlFileFormatVersion();
-
static OUString getProductVersion();
static OUString getVendor();
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index d59d4e2..f311460 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -356,42 +356,42 @@ String STR_SVT_MIMETYPE_INET_MULTI_MIXED
String STR_SVT_MIMETYPE_APP_SXCALC
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ;
};
String STR_SVT_MIMETYPE_APP_SXCHART
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Chart" ;
};
String STR_SVT_MIMETYPE_APP_SXDRAW
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ;
};
String STR_SVT_MIMETYPE_APP_SXMATH
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Formula" ;
};
String STR_SVT_MIMETYPE_APP_SXWRITER
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIMPRESS
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ;
};
String STR_SVT_MIMETYPE_APP_SXGLOBAL
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ;
};
String STR_SVT_MIMETYPE_APP_SXIPACKED
{
- Text [ en-US ] = "%PRODUCTNAME %PRODUCTXMLFILEFORMATVERSION Presentation (packed)" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Presentation (packed)" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
index 21a176f..b9451a1 100644
--- a/svtools/source/dialogs/formats.src
+++ b/svtools/source/dialogs/formats.src
@@ -225,35 +225,35 @@ String STR_FORMAT_ID_GRAPHOBJ
};
String STR_FORMAT_ID_STARWRITER_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Writer object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Writer object";
};
String STR_FORMAT_ID_STARWRITERWEB_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Writer/Web object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Writer/Web object";
};
String STR_FORMAT_ID_STARWRITERGLOB_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Writer/Master object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Writer/Master object";
};
String STR_FORMAT_ID_STARDRAW_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Draw object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Draw object";
};
String STR_FORMAT_ID_STARIMPRESS_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Impress object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Impress object";
};
String STR_FORMAT_ID_STARCALC_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Calc object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Calc object";
};
String STR_FORMAT_ID_STARCHART_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Chart object";
};
String STR_FORMAT_ID_STARMATH_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Math object";
+ Text [ en-US ] = "OpenOffice.org 1.0 Math object";
};
String STR_FORMAT_ID_WMF
{
@@ -273,7 +273,7 @@ String STR_FORMAT_ID_DBACCESS_COMMAND
};
String STR_FORMAT_ID_DIALOG_60
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION dialog";
+ Text [ en-US ] = "OpenOffice.org 1.0 dialog";
};
String STR_FORMAT_ID_FILEGRPDESCRIPTOR
{
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index e11dee5..c750faa 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -280,19 +280,19 @@ String STR_DESCRIPTION_FACTORY_DATABASE
};
String STR_DESCRIPTION_CALC_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet Template" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet Template" ;
};
String STR_DESCRIPTION_DRAW_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing Template" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Drawing Template" ;
};
String STR_DESCRIPTION_IMPRESS_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation Template" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Presentation Template" ;
};
String STR_DESCRIPTION_WRITER_TEMPLATE
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document Template" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Text Document Template" ;
};
String STR_DESCRIPTION_LOCALE_VOLUME
{
@@ -327,37 +327,37 @@ String STR_DESCRIPTION_POWERPOINT_SHOW
String STR_DESCRIPTION_SXMATH_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Formula" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Formula" ;
};
String STR_DESCRIPTION_SXCHART_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Chart" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Chart" ;
};
String STR_DESCRIPTION_SXDRAW_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Drawing" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Drawing" ;
};
String STR_DESCRIPTION_SXCALC_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Spreadsheet" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Spreadsheet" ;
};
String STR_DESCRIPTION_SXIMPRESS_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Presentation" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Presentation" ;
};
String STR_DESCRIPTION_SXWRITER_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Text Document" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Text Document" ;
};
String STR_DESCRIPTION_SXGLOBAL_DOC
{
- Text [ en-US ] = "%PRODUCTXMLFILEFORMATNAME %PRODUCTXMLFILEFORMATVERSION Master Document" ;
+ Text [ en-US ] = "OpenOffice.org 1.0 Master Document" ;
};
String STR_DESCRIPTION_MATHML_DOC
{
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index bd50f96..31ff1cd 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -129,18 +129,6 @@ OUString utl::ConfigManager::getProductVersion() {
OUString("Product/ooSetupVersion"));
}
-OUString utl::ConfigManager::getProductXmlFileFormat() {
- return getConfigurationString(
- OUString("/org.openoffice.Setup"),
- OUString("Product/ooXMLFileFormatName"));
-}
-
-OUString utl::ConfigManager::getProductXmlFileFormatVersion() {
- return getConfigurationString(
- OUString("/org.openoffice.Setup"),
- OUString("Product/ooXMLFileFormatVersion"));
-}
-
OUString utl::ConfigManager::getVendor() {
return getConfigurationString(
OUString("/org.openoffice.Setup"),
commit 31e37f8f405d53ad0d5b1a271e07976328f93d64
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 17:26:46 2013 +0200
remove SwCompatibilityOptPage::ReplaceFormatName
... which probably didn't do anything anyway since the dialog actually
used %WRITERCOMPATIBILITYVERSIONOOO11 and not the variables replaced
here.
Change-Id: I27a59382476979b3bbcdb7fc06eda2243d1487e1
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index d6029e4..f793df0 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -113,11 +113,6 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet
for (sal_uInt16 nId = COPT_USE_PRINTERDEVICE; nId <= COPT_EXPAND_WORDSPACE; ++nId)
{
OUString sEntry = m_pFormattingLB->GetEntry(nId);
- if ( COPT_USE_OUR_TABSTOPS == nId ||
- COPT_USE_LINESPACING == nId ||
- COPT_USE_OBJECTPOSITIONING == nId ||
- COPT_USE_OUR_TEXTWRAPPING == nId )
- ReplaceFormatName( sEntry );
SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry( sEntry );
if ( pEntry )
{
@@ -143,20 +138,6 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage()
delete m_pImpl;
}
-void SwCompatibilityOptPage::ReplaceFormatName( OUString& rEntry )
-{
- OUString sFormatName(utl::ConfigManager::getProductName());
- const bool bOpenOffice = ( sFormatName == "OpenOffice.org" );
- const OUString sFormatVersion = bOpenOffice
- ? OUString("1.1")
- : OUString("6.0/7");
- if ( !bOpenOffice && ( sFormatName != "StarSuite" ) )
- sFormatName = "StarOffice";
-
- rEntry = rEntry.replaceFirst( "%FORMATNAME", sFormatName )
- .replaceFirst( "%FORMATVERSION", sFormatVersion );
-}
-
sal_uLong convertBools2Ulong_Impl
(
bool _bUsePrtMetrics,
diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/ui/inc/optcomp.hxx
index fd9f127..3d9dce0 100644
--- a/sw/source/ui/inc/optcomp.hxx
+++ b/sw/source/ui/inc/optcomp.hxx
@@ -56,7 +56,6 @@ private:
// private methods
void InitControls( const SfxItemSet& rSet );
- void ReplaceFormatName( OUString& rEntry );
void SetCurrentOptions( sal_uLong nOptions );
sal_uLong GetDocumentOptions() const;
void WriteOptions();
commit f67d166b30dcba9e854716b29e1035693ef7481b
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 17:23:10 2013 +0200
remove run-time replacement of %WRITERCOMPATIBILITYVERSIONOOO11
Instead hard-code OpenOffice.org 1.1 as the value, since StarOffice and
StarSuite are irrelevant.
Change-Id: I9ab3d1cf38cf64cd4e440b3ae43158f748ead7d2
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2e3ee0e..267d60a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -472,8 +472,6 @@ namespace
: public rtl::Static< OUString, XMLFileFormatName > {};
struct XMLFileFormatVersion
: public rtl::Static< OUString, XMLFileFormatVersion > {};
- struct WriterCompatibilityVersionOOo11
- : public rtl::Static< OUString, WriterCompatibilityVersionOOo11 > {};
}
OUString ReplaceStringHookProc( const OUString& rStr )
@@ -528,19 +526,6 @@ OUString ReplaceStringHookProc( const OUString& rStr )
sRet = sRet.replaceAll( "%OOOVENDOR", sOOOVendor );
}
- if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 )
- {
- OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get();
- if ( sWriterCompatibilityVersionOOo11.isEmpty() )
- {
- sWriterCompatibilityVersionOOo11 =
- utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1();
- }
-
- sRet = sRet.replaceAll( "%WRITERCOMPATIBILITYVERSIONOOO11",
- sWriterCompatibilityVersionOOo11 );
- }
-
return sRet;
}
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index f5964a50..b8bc42d 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -58,8 +58,6 @@ public:
static OUString getVendor();
- static OUString getWriterCompatibilityVersionOOo_1_1();
-
static void storeConfigItems();
SAL_DLLPRIVATE static ConfigManager & getConfigManager();
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index b526ec2..39acd6f 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -57,7 +57,6 @@ LibreOffice
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
ADDSYSTEMINTEGRATION 1
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
@@ -109,7 +108,6 @@ LibreOffice_Dev
UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
ADDSYSTEMINTEGRATION 1
- WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
PACKAGEVERSION @LIBO_VERSION_MAJOR at .@LIBO_VERSION_MINOR at .@LIBO_VERSION_MICRO at .@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
PACKAGEREVISION {buildid}
LICENSENAME LGPL
diff --git a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
index 6ba5066..a1c5820 100644
--- a/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Compatibility.xcu
@@ -20,7 +20,7 @@
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Compatibility" oor:package="org.openoffice.Office">
<node oor:name="WriterCompatibilityVersion">
<prop oor:name="OOo11" oor:type="xs:string">
- <value>${WRITERCOMPATIBILITYVERSIONOOO11}</value>
+ <value>OpenOffice.org 1.1</value>
</prop>
</node>
<node oor:name="AllFileFormats">
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b353f7a..d60bd0d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -558,7 +558,6 @@ postprocess_main_SED := \
-e 's,$${STARTCENTER_INFO_URL},http://www.libreoffice.org/,g' \
-e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \
-e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \
- -e 's,$${WRITERCOMPATIBILITYVERSIONOOO11},OpenOffice.org 1.1,g' \
$(call gb_CustomTarget_get_workdir,postprocess/registry)/main.xcd : \
| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index d0c28b9..77fc546 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -56,12 +56,12 @@
<item translatable="yes">Use printer metrics for document formatting</item>
<item translatable="yes">Add spacing between paragraphs and tables (in current document)</item>
<item translatable="yes">Add paragraph and table spacing at tops of pages (in current document)</item>
- <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 tabstop formatting</item>
+ <item translatable="yes">Use OpenOffice.org 1.1 tabstop formatting</item>
<item translatable="yes">Do not add leading (extra space) between lines of text</item>
- <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 line spacing</item>
+ <item translatable="yes">Use OpenOffice.org 1.1 line spacing</item>
<item translatable="yes">Add paragraph and table spacing at bottom of table cells</item>
- <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 object positioning</item>
- <item translatable="yes">Use %WRITERCOMPATIBILITYVERSIONOOO11 text wrapping around objects</item>
+ <item translatable="yes">Use OpenOffice.org 1.1 object positioning</item>
+ <item translatable="yes">Use OpenOffice.org 1.1 text wrapping around objects</item>
<item translatable="yes">Consider wrapping style when positioning objects</item>
<item translatable="yes">Expand word space on lines with manual line breaks in justified paragraphs</item>
<item translatable="yes"><User settings></item>
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index cac6b8b..bd50f96 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -147,12 +147,6 @@ OUString utl::ConfigManager::getVendor() {
OUString("Product/ooVendor"));
}
-OUString utl::ConfigManager::getWriterCompatibilityVersionOOo_1_1() {
- return getConfigurationString(
- OUString("/org.openoffice.Office.Compatibility"),
- OUString("WriterCompatibilityVersion/OOo11"));
-}
-
void utl::ConfigManager::storeConfigItems() {
getConfigManager().doStoreConfigItems();
}
commit 041d2b88a473cc7ba9b68113f7642dd8417369e4
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 17:01:14 2013 +0200
filter config: stop replacing %productname% / %formatversion%
... at runtime. Hard-code these to OpenOffice.org 1.0, since nobody
will ever build a "StarOffice" or "StarSuite" any more.
Change-Id: I1785dea8dfd15a9384f9fecd92935a6043d995bc
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 6deb60f..2061ae2 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -94,8 +94,6 @@
#define CFGDIRECTKEY_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/L10N/ooLocale" )
#define CFGDIRECTKEY_DEFAULTFRAMELOADER _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.TypeDetection.Misc/Defaults/DefaultFrameLoader")
#define CFGDIRECTKEY_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/L10N/ooLocale" )
-#define CFGDIRECTKEY_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatName" )
-#define CFGDIRECTKEY_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooXMLFileFormatVersion" )
#define CFGDIRECTKEY_PRODUCTNAME _FILTER_CONFIG_FROM_ASCII_("/org.openoffice.Setup/Product/ooName" )
// Note that these flag bits have parallel names in
@@ -170,8 +168,6 @@
/** @short some default values.
*/
#define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US")
-#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org")
-#define DEFAULT_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("1.0")
/** @short used for the queries of the FilterFactory service.
*/
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 0c6bd37..adbb01c 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -95,8 +95,6 @@ FilterCache* FilterCache::clone() const
pClone->m_lURLPattern2Types = m_lURLPattern2Types;
pClone->m_sActLocale = m_sActLocale;
- pClone->m_sFormatName = m_sFormatName;
- pClone->m_sFormatVersion = m_sFormatVersion;
pClone->m_eFillState = m_eFillState;
@@ -152,8 +150,6 @@ void FilterCache::takeOver(const FilterCache& rClone)
m_lChangedContentHandlers.clear();
m_sActLocale = rClone.m_sActLocale;
- m_sFormatName = rClone.m_sFormatName;
- m_sFormatVersion = rClone.m_sFormatVersion;
m_eFillState = rClone.m_eFillState;
@@ -209,23 +205,6 @@ void FilterCache::load(EFillState eRequired,
m_sActLocale = DEFAULT_OFFICELOCALE;
}
- impl_getDirectCFGValue(CFGDIRECTKEY_FORMATNAME) >>= m_sFormatName;
- if (m_sFormatName.isEmpty())
- impl_getDirectCFGValue(CFGDIRECTKEY_PRODUCTNAME) >>= m_sFormatName;
-
- if (m_sFormatName.isEmpty())
- {
- _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format name => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATNAME));
- m_sFormatName = DEFAULT_FORMATNAME;
- }
-
- impl_getDirectCFGValue(CFGDIRECTKEY_FORMATVERSION) >>= m_sFormatVersion;
- if (m_sFormatVersion.isEmpty())
- {
- _FILTER_CONFIG_LOG_1_("FilterCache::ctor() ... could not specify format version => use default \"%s\"\n", _FILTER_CONFIG_TO_ASCII_(DEFAULT_FORMATVERSION));
- m_sFormatVersion = DEFAULT_FORMATVERSION;
- }
-
// Support the old configuration support. Read it only one times during office runtime!
impl_readOldFormat();
@@ -1580,8 +1559,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
- OUString sFormatName = m_sFormatName ;
- OUString sFormatVersion = m_sFormatVersion;
OUString sActLocale = m_sActLocale ;
aLock.clear();
// <- SAFE ----------------------------------
@@ -1595,9 +1572,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ;
::comphelper::SequenceAsHashMap lUINames;
- const char FORMATNAME_VAR[] = "%productname%";
- const char FORMATVERSION_VAR[] = "%formatversion%";
- // patch %PRODUCTNAME and %FORMATNAME
for ( pLocale = lLocales.begin();
pLocale != lLocales.end() ;
++pLocale )
@@ -1607,21 +1581,6 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
OUString sValue;
xUIName->getByName(sLocale) >>= sValue;
- // replace %productname%
- sal_Int32 nIndex = sValue.indexOf(FORMATNAME_VAR);
- while(nIndex != -1)
- {
- sValue = sValue.replaceAt(nIndex, RTL_CONSTASCII_LENGTH(FORMATNAME_VAR), sFormatName);
- nIndex = sValue.indexOf(FORMATNAME_VAR, nIndex);
- }
- // replace %formatversion%
- nIndex = sValue.indexOf(FORMATVERSION_VAR);
- while(nIndex != -1)
- {
- sValue = sValue.replaceAt(nIndex, RTL_CONSTASCII_LENGTH(FORMATVERSION_VAR), sFormatVersion);
- nIndex = sValue.indexOf(FORMATVERSION_VAR, nIndex);
- }
-
lUINames[sLocale] <<= sValue;
}
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index 92defa6..e1f2a8c 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -223,14 +223,6 @@ class FilterCache : public BaseLock
OUString m_sActLocale;
//---------------------------------------
- /** TODO */
- OUString m_sFormatName;
-
- //---------------------------------------
- /** TODO */
- OUString m_sFormatVersion;
-
- //---------------------------------------
/** @short contains status, which cache items/properties
was already loaded from the underlying configuration.
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
index a5868a3..722ea2a 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc__ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Calc)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Spreadsheet</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
index 534b963..ebc2d35 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart__ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Chart)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Chart</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Chart</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
index 43e0600..063a415 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw__ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Draw)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Drawing</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
index 7747e57..351d5ad 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress__ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Impress)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Presentation</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Presentation</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
index 48c3aef..e93ac4d 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Math__ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Math)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Formula</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Formula</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
index 581624e..40f1485 100644
--- a/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
+++ b/filter/source/config/fragments/filters/StarOffice_XML__Writer__ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="StarOffice XML (Writer)">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
index 84b7b1e..2a64e72 100644
--- a/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="calc_StarOffice_XML_Calc_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Spreadsheet Template</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Spreadsheet Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
index 0106bf1..644e106 100644
--- a/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="draw_StarOffice_XML_Draw_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing Template</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Drawing Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
index 40214fb..9f2a41a 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Draw_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="impress_StarOffice_XML_Draw">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Drawing (Impress)</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Drawing (Impress)</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
index 4114bca..54e73b6 100644
--- a/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="impress_StarOffice_XML_Impress_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Presentation Template</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Presentation Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
index 73dbe7c..6420df8 100644
--- a/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="writer_StarOffice_XML_Writer_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document Template</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Text Document Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
index 1327f32..592f27b 100644
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="writer_globaldocument_StarOffice_XML_Writer_GlobalDocument">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Master Document</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Master Document</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
index 680cb5c..904c259 100644
--- a/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="writer_globaldocument_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Text Document</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
index 95406ae..1965b43 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="writer_web_StarOffice_XML_Writer_Web_Template">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% HTML Template</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 HTML Template</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
index 7a2d642..31d5833 100644
--- a/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="writer_web_StarOffice_XML_Writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Text Document (Writer/Web)</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Text Document (Writer/Web)</value>
</prop>
</node>
diff --git a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
index 299b59b..2dda07c 100644
--- a/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
+++ b/filter/source/config/fragments/filters/writerweb8_writer_ui.xcu
@@ -17,6 +17,6 @@
-->
<node oor:name="writerweb8_writer">
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% Text (Writer/Web)</value>
- </prop>
+ <value xml:lang="en-US">Text (Writer/Web)</value>
+ </prop>
</node>
diff --git a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
index 4c454df..1a34933 100644
--- a/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
+++ b/filter/source/config/fragments/types/draw_StarOffice_XML_Draw.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Draw)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Zeichnung</value>
+ <value>OpenOffice.org 1.0 Drawing</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Draw 6.0</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
index 8376bb4..4e39cd8 100644
--- a/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
+++ b/filter/source/config/fragments/types/impress_StarOffice_XML_Impress.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Impress)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Präsentation</value>
+ <value>OpenOffice.org 1.0 Presentation</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Impress 6.0</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
index 2373067..051c381 100644
--- a/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
+++ b/filter/source/config/fragments/types/math_StarOffice_XML_Math.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Math)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Formel</value>
+ <value>OpenOffice.org 1.0 Formula</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Math 6.0</value></prop>
</node>
diff --git a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
index fe626d3..34db4e3 100644
--- a/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
+++ b/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
@@ -23,7 +23,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML (Writer)</value></prop>
<prop oor:name="UIName">
- <value>%productname% %formatversion% Textdokument</value>
+ <value>OpenOffice.org 1.0 Text Document</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Writer 6.0</value></prop>
</node>
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
index 9c40327..973d2e1 100644
--- a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
@@ -59,7 +59,7 @@
<value>com.sun.star.chart2.ChartDocument</value>
</prop>
<prop oor:name="UIName">
- <value xml:lang="en-US">%productname% %formatversion% Report Chart</value>
+ <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
</prop>
</node>
</node>
commit 664594651b2f61b671a05913faf958d6575a598d
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 16:13:49 2013 +0200
filter config: another case of accidental OpenOffice.org XML rebranding
... but apparently only used as a fall-back.
Change-Id: Iebaf3d01a2eeb8aceef0168b2e1817cdd4cde5ab
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx
index 6e34cee..6deb60f 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -170,7 +170,7 @@
/** @short some default values.
*/
#define DEFAULT_OFFICELOCALE _FILTER_CONFIG_FROM_ASCII_("en-US")
-#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("LibreOffice")
+#define DEFAULT_FORMATNAME _FILTER_CONFIG_FROM_ASCII_("OpenOffice.org")
#define DEFAULT_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_("1.0")
/** @short used for the queries of the FilterFactory service.
commit 50e3ac997d1fc05002ba09ebddfa05aa1f2cacd7
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 15:31:55 2013 +0200
install-tb target should hopefully be obsoleted by instdir too
Change-Id: I14a74b660d965d19027cefab2c84d1c0ea38ce79
diff --git a/Makefile.in b/Makefile.in
index 4bace59..450d674 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-.PHONY : all bootstrap build check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip install-tb subsequentcheck tags
+.PHONY : all bootstrap build check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@@ -313,17 +313,6 @@ else ifeq ($(OS),MACOSX)
@echo "To debug: gdb $(TESTINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
endif
-install-tb:
- @rm -rf $(TESTINSTALLDIR)
- @mkdir $(TESTINSTALLDIR)
-ifeq ($(OS_FOR_BUILD),WNT)
- cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
-else
- @ooinstall $(TESTINSTALLDIR)/opt
- @install-gdb-printers
-endif
- @rm -f $(BUILDDIR)/install && ln -s $(TESTINSTALLDIR)/opt/ $(BUILDDIR)/install
-
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
commit 8539eeb163eea7123b8ea0450712a7965336c809
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 15:31:09 2013 +0200
callcatcher doesn't need ooinstall to run tests any more
Change-Id: I370345bc9b2ec1158a873a3c691b6a6f929e04b1
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 2694847..3720139 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -24,7 +24,6 @@ include $(SOLARENV)/gbuild/gbuild.mk
findunusedcode:
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
- ooinstall -l $(TESTINSTALLDIR)/opt
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
commit b81f49ce0f3ebf8ff7ed583ba99f31f7c1d49b95
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 17:39:52 2013 +0200
test-install: get rid of opt/
Change-Id: Ie390749c0b28e47848c361d874bb447f39cfeb12
diff --git a/Makefile.in b/Makefile.in
index 2fe9941..4bace59 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -283,13 +283,13 @@ endif
test-install: build
@rm -rf $(TESTINSTALLDIR)
- @mkdir $(TESTINSTALLDIR)
+ @mkdir -p $(TESTINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
else
- @ooinstall $(TESTINSTALLDIR)/opt
+ @ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
- @macosx-codesign-app-bundle $(TESTINSTALLDIR)/opt/LibreOffice.app
+ @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
endif
ifneq ($(OS),MACOSX)
@install-gdb-printers -L
@@ -298,7 +298,7 @@ endif
@echo
@echo "If you want to edit the .ui files with glade first execute:"
@echo
- @echo "export GLADE_CATALOG_SEARCH_PATH=$(SRCDIR)/install/share/glade"
+ @echo "export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade"
ifeq ($(OS),LINUX)
@echo
@echo "Test installation finished, you can now execute:"
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 7936e35..ba9fc4b 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -98,13 +98,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
- mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/opt
+ mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
- $(TESTINSTALLDIR)/opt/
+ $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
endif
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 599c1b1..af76390 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -9,7 +9,7 @@
GDBDIR="${SOLARENV}/gdb"
SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
-INSTALLDIR="${TESTINSTALLDIR}/opt"
+INSTALLDIR="${TESTINSTALLDIR}"
DYLIB=so
if [ "$(uname)" = Darwin ]; then
INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
commit f1d0889058c112c5a594755be7f3482ced2da395
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 15:30:08 2013 +0200
put result of make test-install into top-level test-install dir
... and rename all DEVINSTALL variables to TESTINSTALL.
Change-Id: I2f745ff6324c078d5fd7d272911a9268fc5efd27
diff --git a/Makefile.in b/Makefile.in
index 4ebdd7c..2fe9941 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,7 @@ $(foreach target,$(gbuild_TARGETS),$(target)_% $(foreach module,$(gbuild_modules
clean: clean-host clean-build
clean-host:
- rm -fr $(DEVINSTALLDIR)
+ rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(OUTDIR)
rm -fr $(WORKDIR)
@@ -282,14 +282,14 @@ endif
@false
test-install: build
- @rm -rf $(DEVINSTALLDIR)
- @mkdir $(DEVINSTALLDIR)
+ @rm -rf $(TESTINSTALLDIR)
+ @mkdir $(TESTINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
- cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
+ cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
else
- @ooinstall $(DEVINSTALLDIR)/opt
+ @ooinstall $(TESTINSTALLDIR)/opt
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
- @macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/LibreOffice.app
+ @macosx-codesign-app-bundle $(TESTINSTALLDIR)/opt/LibreOffice.app
endif
ifneq ($(OS),MACOSX)
@install-gdb-printers -L
@@ -303,26 +303,26 @@ ifeq ($(OS),LINUX)
@echo
@echo "Test installation finished, you can now execute:"
@echo
- @echo "$(DEVINSTALLDIR)/program/soffice"
+ @echo "$(TESTINSTALLDIR)/program/soffice"
else ifeq ($(OS),MACOSX)
@echo
@echo "Developer installation finished, you can now run:"
@echo
- @echo " open $(DEVINSTALLDIR)/LibreOffice.app"
+ @echo " open $(TESTINSTALLDIR)/LibreOffice.app"
@echo
- @echo "To debug: gdb $(DEVINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
+ @echo "To debug: gdb $(TESTINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
endif
install-tb:
- @rm -rf $(DEVINSTALLDIR)
- @mkdir $(DEVINSTALLDIR)
+ @rm -rf $(TESTINSTALLDIR)
+ @mkdir $(TESTINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
- cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
+ cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS)
else
- @ooinstall $(DEVINSTALLDIR)/opt
+ @ooinstall $(TESTINSTALLDIR)/opt
@install-gdb-printers
endif
- @rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install
+ @rm -f $(BUILDDIR)/install && ln -s $(TESTINSTALLDIR)/opt/ $(BUILDDIR)/install
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
diff --git a/config_host.mk.in b/config_host.mk.in
index 3b58d66..c25addb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -86,7 +86,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
-export DEVINSTALLDIR=@DEVINSTALLDIR@
export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
export DISABLE_ACTIVEX=@DISABLE_ACTIVEX@
@@ -553,6 +552,7 @@ export TDE_CFLAGS=$(gb_SPACE)@TDE_CFLAGS@
export TDE_LIBS=$(gb_SPACE)@TDE_LIBS@
export TELEPATHY_CFLAGS=$(gb_SPACE)@TELEPATHY_CFLAGS@
export TELEPATHY_LIBS=$(gb_SPACE)@TELEPATHY_LIBS@
+export TESTINSTALLDIR=@TESTINSTALLDIR@
export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
export TLS=@TLS@
export TMPDIR=@TEMP_DIRECTORY@
diff --git a/configure.ac b/configure.ac
index 8cb15d7..31988cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12263,8 +12263,8 @@ AC_SUBST(DOCDIR)
INSTALLDIR="$LIBDIR/$INSTALLDIRNAME"
AC_SUBST(INSTALLDIR)
-DEVINSTALLDIR="$OUTDIR/installation"
-AC_SUBST(DEVINSTALLDIR)
+TESTINSTALLDIR="${BUILDDIR}/test-install/${INPATH}"
+AC_SUBST(TESTINSTALLDIR)
# ===================================================================
# De- or increase default verbosity of build process
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 0aeb5f7..7936e35 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -95,20 +95,20 @@ endef
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
rm -rf $(instsetoo_OUT)
-ifeq (TRUE,$(LIBO_DEV_INSTALL))
+ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
- unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
- mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
- rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
+ unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
+ mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/opt
+ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
- unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
- mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
- $(DEVINSTALLDIR)/opt/
- rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
- rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
+ unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+ mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
+ $(TESTINSTALLDIR)/opt/
+ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
+ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk
endif
-else # LIBO_DEV_INSTALL
+else # LIBO_TEST_INSTALL
$(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
@@ -124,6 +124,6 @@ ifneq (WNT,$(OS))
$(foreach lang,$(instsetoo_native_WITH_LANG),\
$(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
endif
-endif # LIBO_DEV_INSTALL
+endif # LIBO_TEST_INSTALL
# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 7c24f9a..2694847 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -24,7 +24,7 @@ include $(SOLARENV)/gbuild/gbuild.mk
findunusedcode:
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
- ooinstall -l $(DEVINSTALLDIR)/opt
+ ooinstall -l $(TESTINSTALLDIR)/opt
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
callanalyse $(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 4c2aa39..599c1b1 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -9,7 +9,7 @@
GDBDIR="${SOLARENV}/gdb"
SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
-INSTALLDIR="${DEVINSTALLDIR}/opt"
+INSTALLDIR="${TESTINSTALLDIR}/opt"
DYLIB=so
if [ "$(uname)" = Darwin ]; then
INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 23a2431..23e2d09 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -262,7 +262,7 @@ gb_GLOBALDEFS += \
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
-gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(DEVINSTALLDIR)/)
+gb_USER_INSTALLATION = $(call gb_Helper_make_url,$(TESTINSTALLDIR)/)
include $(GBUILDDIR)/Deliver.mk
commit be59288ff46a7f3462f5d055f06edacc59340c36
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 15:08:15 2013 +0200
make dev-install is obsolete
There is no need for developers to run it as part of the daily workflow
because instdir is much easier to use, so just let it print an error
message. Also remove the "install" symlink.
Provide the previous dev-install functionality as "test-install" target
so that it is possible to quickly create some kind of actual
installation against which the subsequentchecks can run by
setting OOO_TEST_SOFFICE, to e.g. check that scp2 isn't missing files.
Change-Id: I8c0b05a87f55b1db8c1d1e76f64ab64b9cc695eb
diff --git a/Makefile.in b/Makefile.in
index 0dbf4ea..4ebdd7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip install-tb subsequentcheck tags
+.PHONY : all bootstrap build check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip install-tb subsequentcheck tags
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@@ -266,7 +266,22 @@ install-strip:
endif # !MACOSX
-dev-install: build
+dev-install:
+ @echo
+ @echo "dev-install is obsolete! Just build with \"make check\" and run"
+ifeq ($(OS),MACOSX)
+ @echo " open instdir/*/$(PRODUCTNAME).app"
+ @echo
+ @echo "To debug: gdb instdir/*/$(PRODUCTNAME).app/Contents/MacOS/soffice"
+else
+ @echo " instdir/*/program/soffice"
+endif
+ @echo
+ @echo "(only if you have good reason to test an actual installation: make test-install)"
+ @echo
+ @false
+
+test-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
ifeq ($(OS_FOR_BUILD),WNT)
@@ -280,28 +295,24 @@ ifneq ($(OS),MACOSX)
@install-gdb-printers -L
endif
endif
- @rm -f $(BUILDDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(BUILDDIR)/install
@echo
@echo "If you want to edit the .ui files with glade first execute:"
@echo
@echo "export GLADE_CATALOG_SEARCH_PATH=$(SRCDIR)/install/share/glade"
ifeq ($(OS),LINUX)
@echo
- @echo "Developer installation finished, you can now execute:"
+ @echo "Test installation finished, you can now execute:"
@echo
- @echo "$(BUILDDIR)/install/program/soffice"
+ @echo "$(DEVINSTALLDIR)/program/soffice"
else ifeq ($(OS),MACOSX)
@echo
@echo "Developer installation finished, you can now run:"
@echo
- @echo " open $(BUILDDIR)/install/LibreOffice.app"
+ @echo " open $(DEVINSTALLDIR)/LibreOffice.app"
@echo
- @echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
+ @echo "To debug: gdb $(DEVINSTALLDIR)/LibreOffice.app/Contents/MacOS/soffice"
endif
-dev-install-nocheck: build-nocheck
- $(MAKE) dev-install -o build
-
install-tb:
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
commit 9b92f2146010f96f453384ef6439629dc1cc4f43
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 15:48:23 2013 +0200
gbuild: fix dependencies in gb_SrsPartTarget__command_dep
Use -MP to output dummy rules for included files so build doesn't break
when an included file is removed.
Change-Id: Ib230cfa5d5da71c7f5c15af5bdaa5004e6b7a122
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 7fd6c50..1bb16ba 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -163,7 +163,7 @@ define gb_SrsPartTarget__command_dep
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && cd $(SRCDIR) && \
$(gb_GCCP) \
- -MM -MT $(call gb_SrsPartTarget_get_target,$(1)) \
+ -MM -MP -MT $(call gb_SrsPartTarget_get_target,$(1)) \
$(INCLUDE) \
$(DEFS) \
-c -x c++-header $(2) \
More information about the Libreoffice-commits
mailing list