[Libreoffice-commits] core.git: 3 commits - readlicense_oo/docs scp2/source svtools/source sw/source
Miklos Vajna
vmiklos at suse.cz
Tue Feb 5 01:57:36 PST 2013
readlicense_oo/docs/readme.xrm | 1
scp2/source/ooo/scpaction_ooo.scp | 8 +++++
svtools/source/config/miscopt.cxx | 47 ++++++++++++++++------------------
sw/source/ui/uno/SwXFilterOptions.cxx | 6 ++--
4 files changed, 35 insertions(+), 27 deletions(-)
New commits:
commit 117b3242dbdcf5c9690921f2f4cf1495df10c11e
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Feb 4 01:32:26 2013 +0100
scp2: copy the install script to the tarball on Linux
Change-Id: I657b2ec94e6029cc14bd29611c7b0c3ce359103b
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 6539717..5788125 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -147,6 +147,7 @@
<p id="rpminstall5" xml:lang="en-US">For Fedora-based systems: su -c 'yum install *.rpm'</p>
<p id="rpminstall6" xml:lang="en-US">For Mandriva-based systems: sudo urpmi *.rpm</p>
<p id="rpminstall7" xml:lang="en-US">For other RPM-based systems (Suse, etc.): rpm -Uvh *.rpm</p>
+ <p id="rpminstall7a" xml:lang="en-US">Alternatively, you can use the 'install' script, located in the toplevel directory of this archive to perform an installation as a user. The script will set up ${PRODUCTNAME} to have its own profile for this installation, separated from your normal ${PRODUCTNAME} profile.</p>
<p id="rpminstall8" xml:lang="en-US">The above command does the first part of the installation process. To complete the process, you also need to install the desktop integration packages. To do this, change directory to the "desktop-integration" directory that is within the "RPMS" directory, using the following command:</p>
<p id="rpminstall9" xml:lang="en-US">cd desktop-integration</p>
<p id="rpminstallA" xml:lang="en-US">Now run the installation command again:</p>
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 4622731..63a1d04 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -53,6 +53,14 @@ ScpAction scp_Copy_Readme_Txt
End
#endif
+#if !defined(WNT) && !defined(MACOSX)
+ScpAction scp_Copy_Install
+ Copy = "userscripts/install";
+ Name = "install";
+ UnixRights = 755;
+End
+#endif
+
#if defined(WNT) && defined(_gcc3)
#if defined(MINGW_GCCDLL)
ScpAction SCP_COPY_MINGW_GCCS
commit 9d2629a753c7cdf2a334f3f40954b1d0cc631297
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Feb 4 18:45:29 2013 +0100
svtools: ASCII_STR is no longer necessary
Change-Id: I08a6485d32699100b09235b2168512974347c0fa
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index d79ad29..6b03eb9 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -40,31 +40,30 @@ using namespace ::osl ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star;
-#define ASCII_STR(s) OUString( RTL_CONSTASCII_USTRINGPARAM(s) )
-#define ROOTNODE_MISC ASCII_STR("Office.Common/Misc")
+#define ROOTNODE_MISC "Office.Common/Misc"
// PROPERTYHANDLE defines must be sequential from zero for Commit/Load
-#define PROPERTYNAME_PLUGINSENABLED ASCII_STR("PluginsEnabled")
+#define PROPERTYNAME_PLUGINSENABLED "PluginsEnabled"
#define PROPERTYHANDLE_PLUGINSENABLED 0
-#define PROPERTYNAME_SYMBOLSET ASCII_STR("SymbolSet")
+#define PROPERTYNAME_SYMBOLSET "SymbolSet"
#define PROPERTYHANDLE_SYMBOLSET 1
-#define PROPERTYNAME_TOOLBOXSTYLE ASCII_STR("ToolboxStyle")
+#define PROPERTYNAME_TOOLBOXSTYLE "ToolboxStyle"
#define PROPERTYHANDLE_TOOLBOXSTYLE 2
-#define PROPERTYNAME_USESYSTEMFILEDIALOG ASCII_STR("UseSystemFileDialog")
+#define PROPERTYNAME_USESYSTEMFILEDIALOG "UseSystemFileDialog"
#define PROPERTYHANDLE_USESYSTEMFILEDIALOG 3
-#define PROPERTYNAME_SYMBOLSTYLE ASCII_STR("SymbolStyle")
+#define PROPERTYNAME_SYMBOLSTYLE "SymbolStyle"
#define PROPERTYHANDLE_SYMBOLSTYLE 4
-#define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog")
+#define PROPERTYNAME_USESYSTEMPRINTDIALOG "UseSystemPrintDialog"
#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
-#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
+#define PROPERTYNAME_SHOWLINKWARNINGDIALOG "ShowLinkWarningDialog"
#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 6
-#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
+#define PROPERTYNAME_DISABLEUICUSTOMIZATION "DisableUICustomization"
#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 7
-#define PROPERTYNAME_ALWAYSALLOWSAVE ASCII_STR("AlwaysAllowSave")
+#define PROPERTYNAME_ALWAYSALLOWSAVE "AlwaysAllowSave"
#define PROPERTYHANDLE_ALWAYSALLOWSAVE 8
-#define PROPERTYNAME_EXPERIMENTALMODE ASCII_STR("ExperimentalMode")
+#define PROPERTYNAME_EXPERIMENTALMODE "ExperimentalMode"
#define PROPERTYHANDLE_EXPERIMENTALMODE 9
-#define PROPERTYNAME_MACRORECORDERMODE ASCII_STR("MacroRecorderMode")
+#define PROPERTYNAME_MACRORECORDERMODE "MacroRecorderMode"
#define PROPERTYHANDLE_MACRORECORDERMODE 10
#define VCL_TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) // from <vcl/toolbox.hxx>
@@ -688,17 +687,17 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
// Build list of configuration key names.
const OUString pProperties[] =
{
- PROPERTYNAME_PLUGINSENABLED,
- PROPERTYNAME_SYMBOLSET,
- PROPERTYNAME_TOOLBOXSTYLE,
- PROPERTYNAME_USESYSTEMFILEDIALOG,
- PROPERTYNAME_SYMBOLSTYLE,
- PROPERTYNAME_USESYSTEMPRINTDIALOG,
- PROPERTYNAME_SHOWLINKWARNINGDIALOG,
- PROPERTYNAME_DISABLEUICUSTOMIZATION,
- PROPERTYNAME_ALWAYSALLOWSAVE,
- PROPERTYNAME_EXPERIMENTALMODE,
- PROPERTYNAME_MACRORECORDERMODE
+ OUString(PROPERTYNAME_PLUGINSENABLED),
+ OUString(PROPERTYNAME_SYMBOLSET),
+ OUString(PROPERTYNAME_TOOLBOXSTYLE),
+ OUString(PROPERTYNAME_USESYSTEMFILEDIALOG),
+ OUString(PROPERTYNAME_SYMBOLSTYLE),
+ OUString(PROPERTYNAME_USESYSTEMPRINTDIALOG),
+ OUString(PROPERTYNAME_SHOWLINKWARNINGDIALOG),
+ OUString(PROPERTYNAME_DISABLEUICUSTOMIZATION),
+ OUString(PROPERTYNAME_ALWAYSALLOWSAVE),
+ OUString(PROPERTYNAME_EXPERIMENTALMODE),
+ OUString(PROPERTYNAME_MACRORECORDERMODE)
};
// Initialize return sequence with these list ...
commit 533f0368f71bd1dabfd29c9b0551ad3beecfcf1f
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Mon Feb 4 18:40:15 2013 +0100
sw: kill RTL_CONSTASCII_USTRINGPARAM in defines of SwXFilterOptions
Change-Id: I4d210ecfa846c5c78970d11057c029efe0c78a3b
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx
index 0359c69..13b2189 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/ui/uno/SwXFilterOptions.cxx
@@ -37,9 +37,9 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
-#define SWFILTEROPTIONSOBJ_SERVICE RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.FilterOptionsDialog")
-#define SWFILTEROPTIONSOBJ_IMPLNAME RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.FilterOptionsDialog")
-#define FILTER_OPTIONS_NAME RTL_CONSTASCII_USTRINGPARAM("FilterOptions")
+#define SWFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog"
+#define SWFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Writer.FilterOptionsDialog"
+#define FILTER_OPTIONS_NAME "FilterOptions"
SwXFilterOptions::SwXFilterOptions() :
bExport( sal_False )
More information about the Libreoffice-commits
mailing list