[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - extensions/source setup_native/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Nov 24 17:37:28 PST 2009
extensions/source/update/check/updatecheck.cxx | 8 +++++---
extensions/source/update/check/updatehdl.cxx | 10 ++++++++++
extensions/source/update/feed/updatefeed.cxx | 6 ++++--
setup_native/source/win32/msi-encodinglist.txt | 13 +++++++++++++
4 files changed, 32 insertions(+), 5 deletions(-)
New commits:
commit 592a004d66f1c877def4e7290561a34556774daa
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Nov 24 13:40:24 2009 +0000
CWS-TOOLING: integrate CWS localization37
2009-11-20 17:34:04 +0100 ihi r277585 : not yet the best solution
2009-11-19 14:34:34 +0100 ihi r277560 : #i103247# updated Luxembourgish autocorrect data
2009-11-16 16:58:56 +0100 ihi r277525 : added ast to no_ms_lang
2009-11-16 16:57:23 +0100 ihi r277524 : added ast
2009-11-16 16:41:22 +0100 ihi r277523 : #i106900# updated identifier ShowAnnotation -> ShowAnnotations
2009-11-16 16:39:34 +0100 ihi r277522 : small helper script
2009-11-16 15:24:34 +0100 ihi r277520 : Fixed german and removed ln ti pap ur
2009-11-11 14:27:38 +0100 releng r277457 : added ug, om, si, oc, or, ml, as to non ms langs
2009-11-11 14:23:30 +0100 releng r277456 : Fix for merging more then just one
2009-11-11 14:12:52 +0100 ihi r277455 : #i106775# Merge of OOo 3.2 l10n cws localization37 nb nn he ga uk my bg ja uz fi bn kid fr nl vi ca pt-BR ru ka oc gl cs km kn ko sh si om gu sk sl zh-CN ku or da sr de sv hi-IN pa-IN ta te pl th hu dz lv pt tr en-GB id el ar as eo es ml et eu zh-TW is ug it mr
2009-11-05 23:07:09 +0100 ihi r277375 : added om kid , removed dupe ta-IN
2009-11-03 18:09:39 +0100 ihi r277327 : removed dupe
2009-11-02 19:02:55 +0100 ihi r277303 : #i105973 obsolete sdf files removed
2009-11-02 19:02:16 +0100 ihi r277302 : #i105973 obsolete sdf files removed
2009-10-13 19:19:06 +0200 ihi r276871 : CWS-TOOLING: rebase CWS localization37 to branches/OOO320 at 276773 (milestone: OOO320:m1)
2009-10-01 13:19:45 +0200 ihi r276598 : key -> ky ... this one triggered a bad crash in rsc
2009-09-09 17:02:20 +0200 ihi r276004 : added some langs
2009-09-09 13:17:16 +0200 ihi r275986 : lucky local cygwin fix
2009-09-03 18:47:45 +0200 ihi r275769 : #104328# deal with l10nless src files
2009-09-03 15:58:51 +0200 ihi r275760 : added some new langs
2009-09-03 15:54:16 +0200 ihi r275759 : old localize.pl tool used as a helper
2009-09-03 15:53:48 +0200 ihi r275758 : do not merge not wellformated sdf files
2009-09-03 15:51:59 +0200 ihi r275757 : old localize.pl tool used as a helper
2009-09-03 15:50:03 +0200 ihi r275756 : some small helpers added
2009-09-01 18:22:04 +0200 ihi r275681 : update DEV300 code line with OOO310 strings
2009-09-01 13:45:43 +0200 ihi r275658 : #i104680# prevent that self defined or dupe ms ids are merged
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index ad3f1fb..81258d6 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -4,6 +4,8 @@ af 1252 1078 # Afrikaans
ar 1256 1025
ar-SA 1256 1025
as-IN 0 1101 # Assamese
+as 0 1101 # Assamese
+ast 1252 1610
be-BY 1251 1059 # Belarusian
bg 1251 1026 # Bulgarian
bn 0 2117 # Bengali
@@ -12,6 +14,7 @@ bn-IN 0 1093 # Bengali India
br 1252 1150 # Breton
brx 0 1603 # Bodo (India)
bs 0 5146 # bosnian
+bo 0 2121
ca 1252 1027 # Catalan
cs 1250 1029 # Czech
cy 1252 1106 # Welsh
@@ -55,12 +58,15 @@ ko 949 1042
kok 0 1111 # Konkani
ks 0 1120 # Kashmiri
ku 0 1574
+kid 1252 1033 # key id pseudo language
+ky 0 2100
lo 0 1108 # Lao
lt 1257 1063 # Lithuanian
lv 1257 1062 # Latvian
mai 0 1605 # Maithili (India)
mk 1251 1071 # Macedonian
ml-IN 0 1100
+ml 0 1100
mn 0 1104 # Mongolian
mni 0 1112 # Manipuri
mn-TR 0 2128 # Mongolian Classical/traditional
@@ -80,10 +86,13 @@ or 0 1096 # Oriya
oc 1252 1154 # Occitan-lengadocian
or-IN 0 1096
pa-IN 0 1094 # Punjabi
+pap 0 2171
+om 0 2162
pl 1250 1045
pt 1252 2070
pt-BR 1252 1046
pt-PT 1252 2070
+ps 0 2171
rm 0 1047 # Raeto-Romance
ro 1250 1048 # Romanian
ru 1251 1049
@@ -91,6 +100,7 @@ rw 0 1569 # Kinyarwanda
sa-IN 0 1103 # Sanskrit
sat 0 1606 # Santali
sb 0 1070 # Sorbian
+sc 0 3047
sd 0 1113 # Sindhi
sh 1250 2074 # Serbian Latin
sk 1250 1051 # Slovak
@@ -103,9 +113,11 @@ st 0 1072 # Southern Sotho, Sutu
sv 1252 1053
sw 1252 1089 # Swahili
sw-TZ 1252 1089 # Swahili
+si 0 2133
ta 0 1097 # Tamil
ta-IN 0 1097 # Tamil
te-IN 0 1098
+te 0 1098
tg 0 1064 # Tajik
th 874 1054
ti-ER 0 1139
@@ -117,6 +129,7 @@ uk 1251 1058 # Ukrainian
ur 1256 1056 # Urdu
ur-IN 0 2080
uz 0 1091 # Uzbek (Latin)
+ug 0 2200
ve 0 1075 # Venda
vi 1258 1066 # Vietnamese
xh 0 1076 # Xhosa
commit ed90a6682330b8745b35438dc4cb15a960a05198
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Nov 24 10:58:25 2009 +0000
CWS-TOOLING: integrate CWS dv16
2009-11-23 10:05:46 +0100 jsk r277590 : dv16: (no issue-id) - in some cases it takes longer than 10ms to open the hyphenation dialog. Allowed a max of 2 seconds for that
2009-11-23 07:13:17 +0100 dv r277589 : #i106978# Fixed dangerous debugging code
2009-11-19 12:54:29 +0100 dv r277559 : #i106978# the extension manager should set an interaction handler when looking for updates
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index fd9e8ca..ea8f76c 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -1528,6 +1528,8 @@ void UpdateCheck::showExtensionDialog()
rtl::Reference<UpdateHandler>
UpdateCheck::getUpdateHandler()
{
+ osl::MutexGuard aGuard(m_aMutex);
+
if( ! m_aUpdateHandler.is() )
m_aUpdateHandler = new UpdateHandler(m_xContext, this);
@@ -1540,12 +1542,12 @@ uno::Reference< task::XInteractionHandler >
UpdateCheck::getInteractionHandler() const
{
osl::MutexGuard aGuard(m_aMutex);
-
+
uno::Reference< task::XInteractionHandler > xHandler;
-
+
if( m_aUpdateHandler.is() && m_aUpdateHandler->isVisible() )
xHandler = m_aUpdateHandler.get();
-
+
return xHandler;
}
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index d75386b..fb34016 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -200,6 +200,10 @@ void UpdateHandler::setVisible( bool bVisible )
if ( !mxUpdDlg.is() )
createDialog();
+ // this should never happen, but if it happens we better return here
+ if ( !mxUpdDlg.is() )
+ return;
+
updateState( meCurState );
uno::Reference< awt::XWindow > xWindow( mxUpdDlg, uno::UNO_QUERY );
@@ -1032,6 +1036,12 @@ void UpdateHandler::showControls( short nControls )
//--------------------------------------------------------------------
void UpdateHandler::createDialog()
{
+ if ( !mxContext.is() )
+ {
+ OSL_ASSERT( false );
+ return;
+ }
+
uno::Reference< lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager() );
if( xServiceManager.is() )
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index e018274..59b971d 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -114,14 +114,16 @@ public:
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
sal_Int32 n = m_xStream->readBytes(aData, nBytesToRead);
- OSL_TRACE( aData.get()->elements );
+ if ( n )
+ OSL_TRACE( "Read [%d] bytes: %s\n", n, aData.get()->elements );
return n;
};
virtual sal_Int32 SAL_CALL readSomeBytes(uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException)
{
sal_Int32 n = m_xStream->readSomeBytes(aData, nMaxBytesToRead);
- OSL_TRACE( aData.get()->elements );
+ if ( n )
+ OSL_TRACE( "Read [%d] bytes: %s\n", n, aData.get()->elements );
return n;
};
virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
More information about the ooo-build-commit
mailing list