l10ntools/source/helpmerge.cxx | 17 ++++++++++++++++-
sal/inc/rtl/ustring.hxx | 2 +-
scp2/source/gnome/module_gnome.scp | 4 ----
scp2/source/kde/module_kde.scp | 2 +-
scp2/source/onlineupdate/module_onlineupdate.scp | 2 +-
scp2/source/ooo/module_systemint.scp | 2 +-
scp2/source/stdlibs/module_stdlibs.scp | 4 ----
scp2/source/tde/module_tde.scp | 2 +-
8 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit f3b0081044d0a5b98c6c8a5e2bf3dfd84287bc21
Author: Andras Timar <ati...@suse.com>
Date: Fri Sep 14 22:44:28 2012 +0200
trim leading (and trailing) spaces when extracting help string
and put leading spaces back on merge. It will result in cleaner
strings in .po files, and indentation of Basic code examples
will be kept more easily.
Change-Id: Icdd5cb94069f506ed0b7edf7483ccfd139f296aa
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8e8d33f..cbf38fb 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -155,7 +155,7 @@ bool HelpParser::CreateSDF(
rtl::OUString()).
replaceAll(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t")),
- rtl::OUString()));
+ rtl::OUString()).trim());
sBuffer.append( sOUPrj );
sBuffer.append('\t');
if ( !rRoot_in.isEmpty())
@@ -374,8 +374,23 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const
rtl::OString& sCur ,
if( pEntrys != NULL)
{
rtl::OString sNewText;
+ rtl::OUString sSourceText(
+ pXMLElement->ToOUString().
+ replaceAll(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")),
+ rtl::OUString()).
+ replaceAll(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\t")),
+ rtl::OUString()));
+ // re-add spaces to the beginning of translated string,
+ // important for indentation of Basic code examples
+ sal_Int32 nPreSpaces = 0;
+ sal_Int32 nLen = sSourceText.getLength();
+ while ( (nPreSpaces < nLen) &&
(*(sSourceText.getStr()+nPreSpaces) == ' ') )
+ nPreSpaces++;
pEntrys->GetText( sNewText, STRING_TYP_TEXT, sCur , true );
rtl::OUString sNewdata(
+ sSourceText.copy(0,nPreSpaces) +
rtl::OStringToOUString(sNewText, RTL_TEXTENCODING_UTF8));
if (!sNewdata.isEmpty())
{
commit fa81ac50dd6613ff9c55d2169538a062a417e89d
Author: Andras Timar <ati...@suse.com>
Date: Fri Sep 14 22:43:43 2012 +0200
remove DONTSHOWINUSERINSTALL style, because it is not interpreted
Change-Id: I146e29a68b04ce227fd2b9568fd2bbcd79b45792
diff --git a/scp2/source/gnome/module_gnome.scp
b/scp2/source/gnome/module_gnome.scp
index 9194825..80ec3f7 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -32,11 +32,7 @@ Module gid_Module_Optional_Gnome
Default = YES;
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
-#ifdef UNX
Styles = ();
-#else
- Styles = (DONTSHOWINUSERINSTALL);
-#endif
#ifdef ENABLE_GNOMEVFS
XpdCheckSolaris = "SUNWgnome-vfs";
#endif
diff --git a/scp2/source/kde/module_kde.scp b/scp2/source/kde/module_kde.scp
index 55180c5..f1bc11c 100644
--- a/scp2/source/kde/module_kde.scp
+++ b/scp2/source/kde/module_kde.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Kde
Default = YES;
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_KDE);
- Styles = (DONTSHOWINUSERINSTALL);
+ Styles = ();
Files = (
#ifdef ENABLE_KDE
gid_File_Lib_Kdebe
diff --git a/scp2/source/onlineupdate/module_onlineupdate.scp
b/scp2/source/onlineupdate/module_onlineupdate.scp
index b33235b..29da635 100644
--- a/scp2/source/onlineupdate/module_onlineupdate.scp
+++ b/scp2/source/onlineupdate/module_onlineupdate.scp
@@ -33,7 +33,7 @@ Module gid_Module_Optional_Onlineupdate
Sortkey = "800";
ParentID = gid_Module_Optional;
Default = YES;
- Styles = (DONTSHOWINUSERINSTALL);
+ Styles = ();
Files = (gid_File_Bin_UnpackUpdate,
gid_File_Lib_Updchk,
gid_File_Lib_Updchkui,
diff --git a/scp2/source/ooo/module_systemint.scp
b/scp2/source/ooo/module_systemint.scp
index 12ccef4..bb628f6 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -38,7 +38,7 @@ Module gid_Module_Optional_Systemintegration
#ifdef WNT
Styles = (HIDDEN_ROOT);
#else
- Styles =
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
+ Styles = (SYSTEMMODULE,NOTRELOCATABLE,INSTALLCANFAIL,USEFORCE);
#endif
#if (defined(LINUX)) || (defined(SOLARIS))
PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
diff --git a/scp2/source/stdlibs/module_stdlibs.scp
b/scp2/source/stdlibs/module_stdlibs.scp
index f938f85..537e392 100644
--- a/scp2/source/stdlibs/module_stdlibs.scp
+++ b/scp2/source/stdlibs/module_stdlibs.scp
@@ -32,11 +32,7 @@ Module gid_Module_Optional_Stdlibs
Default = NO;
PackageInfo = "packinfo_ure.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_STDLIBS);
-#ifdef UNX
Styles = ();
-#else
- Styles = (DONTSHOWINUSERINSTALL);
-#endif
Files = (
#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) ||
defined(DRAGONFLY))
diff --git a/scp2/source/tde/module_tde.scp b/scp2/source/tde/module_tde.scp
index dcdd867..e302c54 100644
--- a/scp2/source/tde/module_tde.scp
+++ b/scp2/source/tde/module_tde.scp
@@ -30,7 +30,7 @@ Module gid_Module_Optional_Tde
Default = YES;
PackageInfo = "packinfo_office.txt";
MOD_NAME_DESC(MODULE_OPTIONAL_TDE);
- Styles = (DONTSHOWINUSERINSTALL);
+ Styles = ();
Files = (
#ifdef ENABLE_TDE
gid_File_Lib_Tdebe
commit 7a7429bc00af4ae8d6315a7c57978540a883cee2
Author: Andras Timar <ati...@suse.com>
Date: Fri Sep 14 13:14:24 2012 +0200
typo: Uniocde -> Unicode
Change-Id: I1befdc4c9772c4bf66ee12bf0d2d4aa303903099
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 3e4e541..4afb1d2 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -169,7 +169,7 @@ public:
}
/**
- New string from a Uniocde character buffer array.
+ New string from a Unicode character buffer array.
@param value a Unicode character array.
@param length the number of character which should be copied.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
