[Libreoffice-commits] .: unotools/source vcl/source
unotools/source/misc/fontcvt.cxx | 100 +--
vcl/source/gdi/outdev3.cxx | 13 +
2 files changed, 108 insertions(+), 5 deletions(-)
New commits:
commit 84a99c009e76582e79cc8341e2931d5b8261bb68
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 18 16:06:03 2012 +
Related: fdo#50284 apple's modern symbol font is unicode encoded
So codepoints that are from the legacy range need to be converted to their
unicode equivalents even in the presence of an installed symbol font on
MacOSX.
This should work out ok if input codepoints that exist in the apple symbol
unicode are used, they should be left untouched by this conversion.
Change-Id: Ia9996e2d9bf632c86c8d26832d77c7c662cf1076
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 96212c0..6aaef61 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -719,6 +719,79 @@ static const sal_Unicode aMTExtraTab[224] =
0, 0, 0, 0
};
+static const sal_Unicode aAdobeSymbolToAppleSymbolTab[224] =
+{
+// F020
+0x0020,0x0021,0x2200,0x0023,
+0x2203,0x0025,0x0026,0x220D,
+0x0028,0x0029,0x2217,0x002B,
+0x002C,0x2212,0x002E,0x002F,
+// F030
+0x0030,0x0031,0x0032,0x0033,
+0x0034,0x0035,0x0036,0x0037,
+0x0038,0x0039,0x003A,0x003B,
+0x003C,0x003D,0x003E,0x003F,
+// F040
+0x2245,0x0391,0x0392,0x03A7,
+0x0394,0x0395,0x03A6,0x0393,
+0x0397,0x0399,0x03D1,0x039A,
+0x039B,0x039C,0x039D,0x039F,
+// F050
+0x03A0,0x0398,0x03A1,0x03A3,
+0x03A4,0x03A5,0x03C2,0x03A9,
+0x039E,0x03A8,0x0396,0x005B,
+0x2234,0x005D,0x22A5,0x005F,
+// F060
+0xF8E5,0x03B1,0x03B2,0x03C7,
+0x03B4,0x03B5,0x03C6,0x03B3,
+0x03B7,0x03B9,0x03D5,0x03BA,
+0x03BB,0x03BC,0x03BD,0x03BF,
+// F070
+0x03C0,0x03B8,0x03C1,0x03C3,
+0x03C4,0x03C5,0x03D6,0x03C9,
+0x03BE,0x03C8,0x03B6,0x007B,
+0x007C,0x007D,0x223C,0x007F,
+// F080
+0x0080,0x0081,0x0082,0x0083,
+0x0084,0x0085,0x0086,0x0087,
+0x0088,0x0089,0x008A,0x008B,
+0x008C,0x008D,0x008E,0x008F,
+// F090
+0x0090,0x0091,0x0092,0x0093,
+0x0094,0x0095,0x0096,0x0097,
+0x0098,0x0099,0x009A,0x009B,
+0x009C,0x009D,0x009E,0x009F,
+// F0a0
+0x20AC,0x03D2,0x2032,0x2264,
+0x2044,0x221E,0x0192,0x2663,
+0x2666,0x2665,0x2660,0x2194,
+0x2190,0x2191,0x2192,0x2193,
+// F0b0
+0x00B0,0x00B1,0x2033,0x2065,
+0x00D7,0x221D,0x2202,0x2022,
+0x00F7,0x2260,0x2261,0x2248,
+0x2026,0x23D0,0x23AF,0x21B5,
+// F0c0
+0x2135,0x2111,0x211C,0x2118,
+0x2297,0x2295,0x2205,0x2229,
+0x222A,0x2283,0x2287,0x2284,
+0x2282,0x2286,0x2208,0x2209,
+// F0d0
+0x2220,0x2207,0x00AE,0x00A9,
+0x2122,0x220F,0x221A,0x22C5,
+0x00AC,0x2227,0x2228,0x21D4,
+0x21D0,0x21D1,0x21D2,0x21D3,
+// F0e0
+0x25CA,0x3008,0x00AE,0x00A9,
+0x2122,0x2211,0x239B,0x239C,
+0x239D,0x23A1,0x23A2,0x23A3,
+0x23A7,0x23A8,0x23A9,0x23AA,
+// F0f0
+0xF8FF,0x3009,0x222B,0x2320,
+0x23AE,0x2321,0x239E,0x239F,
+0x23A0,0x23A4,0x23A5,0x23A6,
+0x23AB,0x23AC,0x23AD,0x00FF
+};
//===
@@ -1324,7 +1397,7 @@ void ConvertChar::RecodeString( String rStr, xub_StrLen
nIndex, xub_StrLen nLen
struct RecodeTable { const char* pOrgName; ConvertChar aCvt;};
-static RecodeTable aRecodeTable[] =
+static RecodeTable aStarSymbolRecodeTable[] =
{
// the first two entries must be StarMath and StarBats; do not reorder!
// reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
@@ -1348,6 +1421,10 @@ static RecodeTable aRecodeTable[] =
{mtextra, {aMTExtraTab, StarSymbol, NULL}}
};
+static RecodeTable aAppleSymbolRecodeTable[] = {
+{symbol, {aAdobeSymbolToAppleSymbolTab, AppleSymbol, NULL}}
+};
+
static ConvertChar aImplStarSymbolCvt = { NULL, StarBats,
ImplStarSymbolToStarBats };
//
[Libreoffice-commits] .: unotools/source
unotools/source/misc/fontcvt.cxx | 43 ---
1 file changed, 27 insertions(+), 16 deletions(-)
New commits:
commit 0d777f33a1d818a7fd27d755e54db64823f46636
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 17 15:49:52 2012 +
Resolves: fdo#31055 fallback to a default bullet on symbol lack
a) fix up some entries in Wingdings for which we do have a suitable mapping
after all
b) on complete failure for mapping to OpenSymbol show a default
bullet, which is better than no glyph
c) document that the original tables were against StarSymbol which
had extra glyphs (and/or I thought it had)
Change-Id: I5e43cc0a5216e76d00b7df1a69967e08c3656e21
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index c4c6613..3d5d30d 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -21,18 +21,16 @@
#include unotools/fontdefs.hxx
#include sal/macros.h
-#ifndef _STLP_MAP
#include map
-#endif
-#ifndef _STLP_VECTOR
#include vector
-#endif
-#ifndef _STLP_ALGORITHM
#include algorithm
-#endif
-#ifndef _STLP_FUNCTIONAL
#include functional
-#endif
+
+//These conversion tables were designed for StarSymbol. OpenSymbol
+//originally didn't have the same code points as StarSymbol, and
+//then gained some extra code points, but there are still potentially
+//various holes in OpenSymbol which were filled by StarSymbol, i.e.
+//destination mapping points which are empty in OpenSymbol
//===
// note: the character mappings that are only approximations
@@ -307,17 +305,17 @@ static const sal_Unicode aWingDings2Tab[224] =
0xe569,0xe56a,0xe56b,0xe56c,
0xe56d,0xe56e,0xe56f,0xe570,
0xe571,0xe572,0xe573,0xe574,
-0xe575,0xe576,0xe577,0xe578,
+0xe575, 0, 0,0xe578,
// F0a0
0xe579,0xe57a,0xe57b,0xe57c,
-0xe57d,0xe57e,0xe57f,0xe580,
-0xe581,0xe582,0xe583,0xe584,
-0xe585,0xe586,0xe587,0xe588,
+ 0, 0, 0, 0,
+ 0, 0, 0,0xe584,
+0xe585, 0,0xe586, 0,
// F0b0
-0xe589,0xe58a,0xe58b,0xe58c,
+ 0, 0, 0, 0,
0xe58d,0xe58e,0xe58f,0xe590,
-0xe591,0xe592,0xe593,0xe594,
-0xe595,0xe596,0xe597,0xe598,
+ 0, 0,0xe593,0xe594,
+ 0, 0, 0,0xe587,
// F0c0
0xe599,0xe59a,0xe59b,0xe59c,
0xe59d,0xe59e,0xe59f,0xe5a0,
@@ -334,7 +332,7 @@ static const sal_Unicode aWingDings2Tab[224] =
0xe5c1,0xe5c2,0xe5c3,0xe5c4,
0xe5c5,0xe5c6,0xe5c7,0xe5c8,
// F0f0
-0xe5c9,0,0xe5cb,0xe5cc,
+0xe5c9,0, 0xe5cb,0xe477,
0xe5cd,0xe5ce,0xe5cf,0xe5d0,
0x203b,0x2042, 0, 0,
0, 0, 0, 0
@@ -1278,7 +1276,20 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar )
const
cIndex -= 0xF000;
// recode the symbol
if( cIndex=0x0020 cIndex=0x00FF )
+{
cRetVal = mpCvtTab[ cIndex - 0x0020 ];
+
+if (!cRetVal mpSubsFontName)
+{
+if (!strcmp(mpSubsFontName, OpenSymbol) ||
(!strcmp(mpSubsFontName, StarSymbol)))
+{
+cRetVal = 0xE12C;
+SAL_WARN( unotools, Forcing a bullet substition from
0x
+OString::valueOf(cChar, 16) to 0x
+OString::valueOf(cRetVal, 16));
+}
+}
+}
}
return cRetVal ? cRetVal : cChar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/misc/fontcvt.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 439d600138515d10b40a00653f8ac51e5ccfc1e5
Author: Michael Meeks michael.me...@suse.com
Date: Mon Dec 17 20:19:47 2012 +
32bit compile fix for OString::valueOf usage.
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 3d5d30d..96212c0 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1285,8 +1285,8 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar )
const
{
cRetVal = 0xE12C;
SAL_WARN( unotools, Forcing a bullet substition from
0x
-OString::valueOf(cChar, 16) to 0x
-OString::valueOf(cRetVal, 16));
+OString::valueOf((sal_Int32)cChar, 16) to 0x
+OString::valueOf((sal_Int32)cRetVal, 16));
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/i18n/localedatawrapper.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 1d486e6c65806a9ca4b9e06504056cc16f687475
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 13 21:56:17 2012 +0100
added FIXME-BCP47 marker, adapted debug check
Change-Id: I334b00c907099517d327bf6314c4e853530a58cf
diff --git a/unotools/source/i18n/localedatawrapper.cxx
b/unotools/source/i18n/localedatawrapper.cxx
index ceffc85..8e283b6 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -285,6 +285,7 @@ void LocaleDataWrapper::invalidateData()
String aDebugLocale;
if (areChecksEnabled())
{
+/* FIXME-BCP47: handle language tags! */
aDebugLocale = xLoc[i].Language;
if ( !xLoc[i].Country.isEmpty() )
{
@@ -333,10 +334,10 @@ void LocaleDataWrapper::invalidateData()
// In checks, exclude known problems because no MS-LCID defined
// and default for Language found.
if ( areChecksEnabled()
- !aDebugLocale.EqualsAscii( ar_SD ) // Sudan/ar
- !aDebugLocale.EqualsAscii( en_CB ) // Carribean
is not a country
-// !aDebugLocale.EqualsAscii( en_BG ) // ?!?
Bulgaria/en
-// !aDebugLocale.EqualsAscii( es_BR ) // ?!?
Brazil/es
+ !aDebugLocale.EqualsAscii( ar-SD ) // Sudan/ar
+ !aDebugLocale.EqualsAscii( en-CB ) // Carribean
is not a country
+// !aDebugLocale.EqualsAscii( en-BG ) // ?!?
Bulgaria/en
+// !aDebugLocale.EqualsAscii( es-BR ) // ?!?
Brazil/es
)
{
rtl::OUStringBuffer aMsg;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5138bde880dcd9c7cf7f0d5ff57510d4d6702846
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 13:36:15 2012 +0100
merge failure
Change-Id: I5c716353b231d9c36972bce8c99d9c3c3e74b1e4
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index e37725f..f3febee 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -123,8 +123,8 @@ public:
sal_BoolIsReadOnly( SvtSysLocaleOptions::EOption
eOption ) const;
const Locale GetRealLocale() { return
m_aRealLocale.getLocale(); }
const Locale GetRealUILocale() { return
m_aRealUILocale.getLocale(); }
-LanguageTypeGetRealLanguage() { return
m_eRealLanguage.getLanguageType(); }
-LanguageTypeGetRealUILanguage() { return
m_eRealUILanguage.getLanguageType(); }
+LanguageTypeGetRealLanguage() { return
m_eRealLocale.getLanguageType(); }
+LanguageTypeGetRealUILanguage() { return
m_eRealUILocale.getLanguageType(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3f4c6698d56a345f7624ebc0aad4f0b041f0fc3e
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 13:56:37 2012 +0100
need more coffee
Change-Id: I0ca6898de11e42a36453e3f0fae8d86d84c9352f
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index f3febee..b05837e 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -123,8 +123,8 @@ public:
sal_BoolIsReadOnly( SvtSysLocaleOptions::EOption
eOption ) const;
const Locale GetRealLocale() { return
m_aRealLocale.getLocale(); }
const Locale GetRealUILocale() { return
m_aRealUILocale.getLocale(); }
-LanguageTypeGetRealLanguage() { return
m_eRealLocale.getLanguageType(); }
-LanguageTypeGetRealUILanguage() { return
m_eRealUILocale.getLanguageType(); }
+LanguageTypeGetRealLanguage() { return
m_aRealLocale.getLanguageType(); }
+LanguageTypeGetRealUILanguage() { return
m_aRealUILocale.getLanguageType(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx |8
unotools/source/i18n/transliterationwrapper.cxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7ccdadb57c18e53e887ac294a26f3756e7843927
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 14:42:22 2012 +0100
use LanguageTag::reset()
Change-Id: I592cb042465ceda960a0b34dfe3eb6d669868acf
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index b05837e..10c7574 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -291,11 +291,11 @@ void SvtSysLocaleOptions_Impl::MakeRealLocale()
if (m_aLocaleString.isEmpty())
{
LanguageType nLang = MsLangId::getSystemLanguage();
-m_aRealLocale = LanguageTag( nLang);
+m_aRealLocale.reset( nLang);
}
else
{
-m_aRealLocale = LanguageTag( m_aLocaleString);
+m_aRealLocale.reset( m_aLocaleString);
}
}
@@ -304,11 +304,11 @@ void SvtSysLocaleOptions_Impl::MakeRealUILocale()
if (m_aUILocaleString.isEmpty())
{
LanguageType nLang = MsLangId::getSystemUILanguage();
-m_aRealUILocale = LanguageTag( nLang);
+m_aRealUILocale.reset( nLang);
}
else
{
-m_aRealUILocale = LanguageTag( m_aUILocaleString);
+m_aRealUILocale.reset( m_aUILocaleString);
}
}
diff --git a/unotools/source/i18n/transliterationwrapper.cxx
b/unotools/source/i18n/transliterationwrapper.cxx
index 11f188e..a2c57fe 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -109,7 +109,7 @@ void TransliterationWrapper::setLanguageLocaleImpl(
sal_uInt16 nLang )
{
if( LANGUAGE_NONE == nLang )
nLang = LANGUAGE_SYSTEM;
-aLanguageTag = LanguageTag( nLang);
+aLanguageTag.reset( nLang);
}
@@ -175,7 +175,7 @@ void TransliterationWrapper::loadModuleByImplName(
com::sun::star::lang::Locale aLocale( aLanguageTag.getLocale());
// Reset LanguageTag, so the next call to loadModuleIfNeeded() forces
// new settings.
-aLanguageTag = LanguageTag( LANGUAGE_DONTKNOW);
+aLanguageTag.reset( LANGUAGE_DONTKNOW);
if ( xTrans.is() )
xTrans-loadModuleByImplName( rModuleName, aLocale );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx | 48 ++--
1 file changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 4a2236a4a8c069a7ab82ac9c2fe3d6bd5630d1aa
Author: Eike Rathke er...@redhat.com
Date: Thu Nov 15 12:53:36 2012 +0100
changed tabs to spaces
tabs creeped in with b4d1aaa074e2be9fd778134c40f99d2ab8a01e93
Change-Id: Idb73a4db82970a3af06e7d50e4d71d4a3ece44cf
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index 4f0f964..80946fd 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -79,14 +79,14 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
OUStringm_aCurrencyString; // USD-en-US or EUR-de-DE
OUStringm_aDatePatternsString; // Y-M-D;M-D
sal_Boolm_bDecimalSeparator; //use decimal separator
same as locale
- sal_Boolm_bIgnoreLanguageChange; //OS language
change doesn't affect LO document language
+sal_Boolm_bIgnoreLanguageChange; //OS language change
doesn't affect LO document language
sal_Boolm_bROLocale;
sal_Boolm_bROUILocale;
sal_Boolm_bROCurrency;
sal_Boolm_bRODatePatterns;
sal_Boolm_bRODecimalSeparator;
- sal_Boolm_bROIgnoreLanguageChange;
+sal_Boolm_bROIgnoreLanguageChange;
static const Sequence /* const */ OUString GetPropertyNames();
voidMakeRealLocale();
@@ -117,9 +117,9 @@ public:
sal_BoolIsDecimalSeparatorAsLocale() const { return
m_bDecimalSeparator;}
voidSetDecimalSeparatorAsLocale( sal_Bool bSet);
-
- sal_BoolIsIgnoreLanguageChange() const {
return m_bIgnoreLanguageChange;}
- voidSetIgnoreLanguageChange( sal_Bool
bSet);
+
+sal_BoolIsIgnoreLanguageChange() const { return
m_bIgnoreLanguageChange;}
+voidSetIgnoreLanguageChange( sal_Bool bSet);
sal_BoolIsReadOnly( SvtSysLocaleOptions::EOption
eOption ) const;
const Locale GetRealLocale() { return m_aRealLocale; }
@@ -157,7 +157,7 @@ const Sequence OUString
SvtSysLocaleOptions_Impl::GetPropertyNames()
PROPERTYNAME_CURRENCY,
PROPERTYNAME_DECIMALSEPARATOR,
PROPERTYNAME_DATEPATTERNS,
- PROPERTYNAME_IGNORELANGCHANGE
+PROPERTYNAME_IGNORELANGCHANGE
};
const Sequence OUString seqPropertyNames( pProperties, PROPERTYCOUNT );
return seqPropertyNames;
@@ -173,7 +173,7 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
, m_bROCurrency(CFG_READONLY_DEFAULT)
, m_bRODatePatterns(CFG_READONLY_DEFAULT)
, m_bRODecimalSeparator(sal_False)
- , m_bROIgnoreLanguageChange(sal_False)
+, m_bROIgnoreLanguageChange(sal_False)
{
if ( IsValidConfigMgr() )
@@ -253,8 +253,8 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
m_bRODatePatterns = pROStates[nProp];
}
break;
- case
PROPERTYHANDLE_IGNORELANGCHANGE :
- {
+case PROPERTYHANDLE_IGNORELANGCHANGE :
+{
sal_Bool bValue = sal_Bool();
if ( pValues[nProp] = bValue )
m_bIgnoreLanguageChange = bValue;
@@ -263,8 +263,8 @@ SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
SAL_WARN( unotools.config, Wrong
property type! );
}
m_bROIgnoreLanguageChange = pROStates[nProp];
- }
- break;
+}
+break;
default:
SAL_WARN( unotools.config, Wrong property
type! );
}
@@ -406,14 +406,14 @@ void SvtSysLocaleOptions_Impl::Commit()
++nRealCount;
}
break;
- case PROPERTYHANDLE_IGNORELANGCHANGE :
- if (!m_bROIgnoreLanguageChange)
- {
- pNames[nRealCount] = aOrgNames[nProp];
- pValues[nRealCount] =
m_bIgnoreLanguageChange;
- ++nRealCount;
-
[Libreoffice-commits] .: unotools/source
unotools/source/config/securityoptions.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit b0c9f3b5f6cc86a94991c5970278f69df15aa7c1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 25 15:41:42 2012 +0200
fdo#55019: Cope with empty TrustedAuthor entries
Change-Id: I9c01c1c718897a4be992150170a6ed9b5bd8a0a0
diff --git a/unotools/source/config/securityoptions.cxx
b/unotools/source/config/securityoptions.cxx
index 1df26b1..1f8f0a2 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -26,6 +26,7 @@
#include com/sun/star/uno/Sequence.hxx
#include com/sun/star/beans/PropertyValue.hpp
+#include comphelper/sequenceasvector.hxx
#include tools/urlobj.hxx
#include tools/wldcrd.hxx
@@ -473,7 +474,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
Sequence Any lValues = GetProperties( lAllAuthors );
if( lValues.getLength() == c2 )
{
-m_seqTrustedAuthors.realloc( c1 );
+comphelper::SequenceAsVector SvtSecurityOptions::Certificate v;
SvtSecurityOptions::Certificate aCert( 3 );
for( i1 = 0, i2 = 0 ; i1 c1 ; ++i1 )
{
@@ -483,8 +484,16 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
++i2;
lValues[ i2 ] = aCert[ 2 ];
++i2;
-m_seqTrustedAuthors[ i1 ] = aCert;
+// Filter out TrustedAuthor entries with empty RawData, which
+// would cause an unexpected std::bad_alloc in
+// SecurityEnvironment_NssImpl::createCertificateFromAscii and
+// have been observed in the wild (fdo#55019):
+if( !aCert[ 2 ].isEmpty() )
+{
+v.push_back( aCert );
+}
}
+m_seqTrustedAuthors = v.getAsConstList();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/useroptions.cxx | 38 -
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit f59733d45f900bf3e1427f69d7172cde5d877399
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 29 23:55:45 2012 +0100
fix build
Change-Id: I3616e62689246a091d9f26d69105a27f64553d48
diff --git a/unotools/source/config/useroptions.cxx
b/unotools/source/config/useroptions.cxx
index adb5db0..3e81f7e 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -56,26 +56,26 @@ OUString const sData = org.openoffice.UserProfile/Data;
// vOptionNames[] -- names of the user option entries
// The order corresponds to the #define USER_OPT_* list in useroptions.hxx.
OUString const vOptionNames[] = {
-l, // USER_OPT_CITY
-o, // USER_OPT_COMPANY
-c, // USER_OPT_COUNTRY
-mail, // USER_OPT_EMAIL
-facsimiletelephonenumber, // USER_OPT_FAX
-givenname, // USER_OPT_FIRSTNAME
-sn,// USER_OPT_LASTNAME
-position, // USER_OPT_POSITION
-st,// USER_OPT_STATE
-street,// USER_OPT_STREET
-homephone, // USER_OPT_TELEPHONEHOME
-telephonenumber, // USER_OPT_TELEPHONEWORK
-title, // USER_OPT_TITLE
-initials, // USER_OPT_ID
-postalcode,// USER_OPT_ZIP
-fathersname, // USER_OPT_FATHERSNAME
-apartment, // USER_OPT_APARTMENT
-customernumber,// USER_OPT_CUSTOMERNUMBER
+OUString(l), // USER_OPT_CITY
+OUString(o), // USER_OPT_COMPANY
+OUString(c), // USER_OPT_COUNTRY
+OUString(mail), // USER_OPT_EMAIL
+OUString(facsimiletelephonenumber), // USER_OPT_FAX
+OUString(givenname), // USER_OPT_FIRSTNAME
+OUString(sn),// USER_OPT_LASTNAME
+OUString(position), // USER_OPT_POSITION
+OUString(st),// USER_OPT_STATE
+OUString(street),// USER_OPT_STREET
+OUString(homephone), // USER_OPT_TELEPHONEHOME
+OUString(telephonenumber), // USER_OPT_TELEPHONEWORK
+OUString(title), // USER_OPT_TITLE
+OUString(initials), // USER_OPT_ID
+OUString(postalcode),// USER_OPT_ZIP
+OUString(fathersname), // USER_OPT_FATHERSNAME
+OUString(apartment), // USER_OPT_APARTMENT
+OUString(customernumber) // USER_OPT_CUSTOMERNUMBER
};
-unsigned const nOptionNameCount = sizeof vOptionNames / sizeof vOptionNames[0];
+const sal_uInt16 nOptionNameCount = SAL_N_ELEMENTS(vOptionNames);
} // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/i18n/localedatawrapper.cxx | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 209f1cdc933e42d097c03b35cbf8a6f7d52314b4
Author: Eike Rathke er...@redhat.com
Date: Wed Jun 20 14:49:56 2012 +0200
adapt callers of getCurrFormatsImpl() to changes
06e2005ed83567452783003e3113ad6a92190c2d changed String to OUString and
initialized some variables with -1 instead of STRING_NOTFOUND, which was
unsigned 0x so var1var2 was true if var1 had a value other than
default and var2 was default. After the change the comparison had logic
reversed and the result was a default negative currency format with
parentheses for all locales.
Change-Id: I3fe49fed7c1047618dc653fce992eb01582c398d
diff --git a/unotools/source/i18n/localedatawrapper.cxx
b/unotools/source/i18n/localedatawrapper.cxx
index f4714b6..0c130ec 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -801,21 +801,20 @@ void LocaleDataWrapper::getCurrFormatsImpl()
const ::rtl::OUString rCode = pFormatArr[nNeg].Code;
sal_Int32 nDelim = rCode.indexOf(';');
scanCurrFormatImpl( rCode, nDelim+1, nSign, nPar, nNum, nBlank, nSym );
-if (areChecksEnabled() (nNum == -1 ||
-nSym == -1 || (nPar == -1
-nSign == -1)))
+if (areChecksEnabled() (nNum == -1 || nSym == -1 || (nPar == -1
nSign == -1)))
{
rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM(
LocaleDataWrapper::getCurrFormatsImpl:
CurrNegativeFormat?));
outputCheckMessage( appendLocaleInfo( aMsg ) );
}
+// NOTE: one of nPar or nSign are allowed to be -1
if (nBlank == -1)
{
if ( nSym nNum )
{
-if ( nPar nSym )
+if ( -1 nPar nPar nSym )
nCurrNegativeFormat = 0;// ($1)
-else if ( nSign nSym )
+else if ( -1 nSign nSign nSym )
nCurrNegativeFormat = 1;// -$1
else if ( nNum nSign )
nCurrNegativeFormat = 3;// $1-
@@ -824,9 +823,9 @@ void LocaleDataWrapper::getCurrFormatsImpl()
}
else
{
-if ( nPar nNum )
+if ( -1 nPar nPar nNum )
nCurrNegativeFormat = 4;// (1$)
-else if ( nSign nNum )
+else if ( -1 nSign nSign nNum )
nCurrNegativeFormat = 5;// -1$
else if ( nSym nSign )
nCurrNegativeFormat = 7;// 1$-
@@ -838,9 +837,9 @@ void LocaleDataWrapper::getCurrFormatsImpl()
{
if ( nSym nNum )
{
-if ( nPar nSym )
+if ( -1 nPar nPar nSym )
nCurrNegativeFormat = 14; // ($ 1)
-else if ( nSign nSym )
+else if ( -1 nSign nSign nSym )
nCurrNegativeFormat = 9;// -$ 1
else if ( nNum nSign )
nCurrNegativeFormat = 12; // $ 1-
@@ -849,9 +848,9 @@ void LocaleDataWrapper::getCurrFormatsImpl()
}
else
{
-if ( nPar nNum )
+if ( -1 nPar nPar nNum )
nCurrNegativeFormat = 15; // (1 $)
-else if ( nSign nNum )
+else if ( -1 nSign nSign nNum )
nCurrNegativeFormat = 8;// -1 $
else if ( nSym nSign )
nCurrNegativeFormat = 10; // 1 $-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/confignode.cxx |8
unotools/source/config/docinfohelper.cxx |4 ++--
unotools/source/ucbhelper/ucblockbytes.cxx | 10 --
3 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit fa1da8256c136e697f7b02d0dfeae9cfbe583d88
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed May 30 23:42:46 2012 -0500
targeted string re-work
Change-Id: I3ef48c34e9e0e1c0e567b013b55a630ee1c7e9c5
diff --git a/unotools/source/config/confignode.cxx
b/unotools/source/config/confignode.cxx
index 9888490..3c290d7 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -349,7 +349,7 @@ namespace utl
Reference XServiceInfo xSI(m_xHierarchyAccess, UNO_QUERY);
if (xSI.is())
{
-try { bIsSet =
xSI-supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.configuration.SetAccess)));
}
+try { bIsSet =
xSI-supportsService(::rtl::OUString(com.sun.star.configuration.SetAccess)); }
catch(Exception) { }
}
return bIsSet;
@@ -491,7 +491,7 @@ namespace utl
//
static const ::rtl::OUString lcl_getProviderServiceName( )
{
-static ::rtl::OUString s_sProviderServiceName(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.configuration.ConfigurationProvider
) );
+static ::rtl::OUString s_sProviderServiceName(
com.sun.star.configuration.ConfigurationProvider );
return s_sProviderServiceName;
}
@@ -523,8 +523,8 @@ namespace utl
aArgs.put( depth, i_nDepth );
::rtl::OUString sAccessService( i_bUpdatable ?
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.configuration.ConfigurationUpdateAccess )) :
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
com.sun.star.configuration.ConfigurationAccess )));
+::rtl::OUString(
com.sun.star.configuration.ConfigurationUpdateAccess ) :
+::rtl::OUString(
com.sun.star.configuration.ConfigurationAccess ));
Reference XInterface xRoot(
i_rxConfigProvider-createInstanceWithArguments(
sAccessService, aArgs.getWrappedPropertyValues() ),
diff --git a/unotools/source/config/docinfohelper.cxx
b/unotools/source/config/docinfohelper.cxx
index b44e763..d8aa666 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -66,8 +66,8 @@ namespace utl
}
}
-::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM($_OS) );
-::rtl::OUString arch( RTL_CONSTASCII_USTRINGPARAM($_ARCH) );
+::rtl::OUString os( $_OS );
+::rtl::OUString arch( $_ARCH );
::rtl::Bootstrap::expandMacros(os);
::rtl::Bootstrap::expandMacros(arch);
aResult.append( (sal_Unicode)'$' );
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx
b/unotools/source/ucbhelper/ucblockbytes.cxx
index 679d83e..5db6638 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1027,9 +1027,7 @@ static sal_Bool UCBOpenContentSync(
aExcep.Server = aURL.GetHost();
aExcep.Classification = InteractionClassification_ERROR;
aExcep.Message =
-rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(
-server not responding after five seconds));
+rtl::OUString( server not responding after five
seconds);
Any request;
request = aExcep;
ucbhelper::InteractionRequest *ir =
@@ -1335,7 +1333,7 @@ sal_Bool UcbLockBytes::setInputStream_Impl( const
ReferenceXInputStream rxInp
{
Reference XMultiServiceFactory xFactory =
::comphelper::getProcessServiceFactory();
Reference XOutputStream rxTempOut = Reference
XOutputStream (
-xFactory-createInstance (
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.io.TempFile)) ),
+xFactory-createInstance (
::rtl::OUString(com.sun.star.io.TempFile) ),
UNO_QUERY );
if( rxTempOut.is() )
@@ -1680,7 +1678,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const
Reference XContent xCo
{
Reference XCommandProcessor xProcessor( xContent, UNO_QUERY );
Command aCommand;
-aCommand.Name =
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(setPropertyValues));
+aCommand.Name = ::rtl::OUString(setPropertyValues);
aCommand.Handle = -1; /* unknown */
aCommand.Argument =
[Libreoffice-commits] .: unotools/source
unotools/source/config/historyoptions.cxx | 38 ++
1 file changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 4ccb4bda483eb548eb6efb5e2f1952f094522320
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Apr 20 09:21:42 2012 +0200
fdo#46074 Ignore corrupted items in Recent Documents
diff --git a/unotools/source/config/historyoptions.cxx
b/unotools/source/config/historyoptions.cxx
index 2045074..8ee53cc 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -33,6 +33,7 @@
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
+#include cassert
#include deque
#include algorithm
@@ -391,20 +392,37 @@ Sequence Sequence PropertyValue
SvtHistoryOptions_Impl::GetList( EHistoryT
const sal_Int32 nLength =
xOrderList-getElementNames().getLength();
Sequence Sequence PropertyValue aRet(nLength);
+sal_Int32 nCount = 0;
for(sal_Int32 nItem=0; nItemnLength; ++nItem)
{
-::rtl::OUString sUrl;
-xOrderList-getByName(::rtl::OUString::valueOf(nItem)) =
xSet;
-xSet-getPropertyValue(rtl::OUString(s_sHistoryItemRef)) =
sUrl;
-
-xItemList-getByName(sUrl) = xSet;
-seqProperties[s_nOffsetURL ].Value = sUrl;
-xSet-getPropertyValue(rtl::OUString(s_sFilter)) =
seqProperties[s_nOffsetFilter ].Value;
-xSet-getPropertyValue(rtl::OUString(s_sTitle))=
seqProperties[s_nOffsetTitle].Value;
-xSet-getPropertyValue(rtl::OUString(s_sPassword)) =
seqProperties[s_nOffsetPassword ].Value;
-aRet[nItem] = seqProperties;
+try
+{
+::rtl::OUString sUrl;
+xOrderList-getByName(::rtl::OUString::valueOf(nItem)) =
xSet;
+xSet-getPropertyValue(rtl::OUString(s_sHistoryItemRef))
= sUrl;
+
+xItemList-getByName(sUrl) = xSet;
+seqProperties[s_nOffsetURL ].Value = sUrl;
+xSet-getPropertyValue(rtl::OUString(s_sFilter)) =
seqProperties[s_nOffsetFilter ].Value;
+xSet-getPropertyValue(rtl::OUString(s_sTitle))=
seqProperties[s_nOffsetTitle].Value;
+xSet-getPropertyValue(rtl::OUString(s_sPassword)) =
seqProperties[s_nOffsetPassword ].Value;
+aRet[nCount++] = seqProperties;
+}
+catch(const css::uno::Exception ex)
+{
+// https://bugs.freedesktop.org/show_bug.cgi?id=46074
+// FILEOPEN: No Recent Documents... discusses a problem
+// with corrupted
/org.openoffice.Office/Histories/Histories
+// configuration items; to work around that problem, simply
+// ignore such corrupted individual items here, so that at
+// least newly added items are successfully reported back
+// from this function:
+LogHelper::logIt(ex);
+}
}
+assert(nCount = nLength);
+aRet.realloc(nCount);
seqReturn = aRet;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/ucbhelper/ucblockbytes.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ebe26f72e90337da2d14f3029de148904e3e30b6
Author: Tor Lillqvist t...@iki.fi
Date: Thu Mar 1 01:55:01 2012 +0200
WaE: 'unused' attribute ignored when parsing type
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx
b/unotools/source/ucbhelper/ucblockbytes.cxx
index 816703a..49566c3 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1591,7 +1591,7 @@ void UcbLockBytes::Cancel()
}
//
-IMPL_LINK( UcbLockBytes, DataAvailHdl, SAL_UNUSED_PARAMETER void*, EMPTYARG )
+IMPL_LINK( UcbLockBytes, DataAvailHdl, void*, EMPTYARG )
{
if ( hasInputStream_Impl() m_xHandler.Is() )
m_xHandler-Handle( UcbLockBytesHandler::DATA_AVAILABLE, this );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/ucbhelper/tempfile.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c6560c6f07f7f71842d7314157feaca2fa4a03c9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 12:56:43 2011 +
Resolves fdo#41295 tmp name reuse in mass pdf export
diff --git a/unotools/source/ucbhelper/tempfile.cxx
b/unotools/source/ucbhelper/tempfile.cxx
index d157bab..6728c80 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -206,8 +206,8 @@ void CreateTempName_Impl( String rName, sal_Bool bKeep,
sal_Bool bDir = sal_Tru
aName += String::CreateFromAscii( lu );
rName.Erase();
-unsigned long nSeed = Time::GetSystemTicks() % nMax;
-for ( unsigned long u = nSeed; ++u != nSeed; )
+static unsigned long u = Time::GetSystemTicks() % nMax;
+for ( unsigned long nSeed = u; ++u != nSeed; )
{
u %= nMax;
String aTmp( aName );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/pathoptions.cxx | 33 +
1 file changed, 9 insertions(+), 24 deletions(-)
New commits:
commit baa36ed2f1f35f311e11aa630ea16e969f841303
Author: Michael Meeks michael.me...@suse.com
Date: Tue Sep 27 14:44:54 2011 +0100
remove obsolete and unused defines
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index 7bfbf48..b760576 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -70,32 +70,17 @@ using ::rtl::OUString;
using ::rtl::OString;
using ::rtl::OStringToOUString;
-// define
-
-#define SEARCHPATH_DELIMITER';'
-
-#define ASCII_STR(s)OUString(
RTL_CONSTASCII_USTRINGPARAM(s) )
-
-#define SIGN_STARTVARIABLE ASCII_STR($()
-#define SIGN_ENDVARIABLEASCII_STR())
+#define SEARCHPATH_DELIMITER ';'
+#define SIGN_STARTVARIABLEOUString( RTL_CONSTASCII_USTRINGPARAM( $( ) )
+#define SIGN_ENDVARIABLE OUString( RTL_CONSTASCII_USTRINGPARAM( ) ) )
// Supported variables by the old SvtPathOptions implementation
-#define SUBSTITUTE_INST $(inst)
-#define SUBSTITUTE_PROG $(prog)
-#define SUBSTITUTE_USER $(user)
-#define SUBSTITUTE_INSTPATH $(instpath)
-#define SUBSTITUTE_PROGPATH $(progpath)
-#define SUBSTITUTE_USERPATH $(userpath)
-#define SUBSTITUTE_INSTURL $(insturl)
-#define SUBSTITUTE_PROGURL $(progurl)
-#define SUBSTITUTE_USERURL $(userurl)
-#define SUBSTITUTE_PATH $(path)
-//#define SUBSTITUTE_LANG $(lang)
-#define SUBSTITUTE_LANGID $(langid)
-#define SUBSTITUTE_VLANG$(vlang)
-#define SUBSTITUTE_WORKDIRURL $(workdirurl)
-
-#define STRPOS_NOTFOUND -1
+#define SUBSTITUTE_INSTPATH $(instpath)
+#define SUBSTITUTE_PROGPATH $(progpath)
+#define SUBSTITUTE_USERPATH $(userpath)
+#define SUBSTITUTE_PATH $(path)
+
+#define STRPOS_NOTFOUND -1
struct OUStringHashCode
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
