diff -Nru libreoffice-3.6.1~rc2/Repository.mk libreoffice-3.6.2~rc2/Repository.mk
--- libreoffice-3.6.1~rc2/Repository.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/Repository.mk 2012-09-25 12:13:30.000000000 +0000
@@ -27,6 +27,8 @@
#*************************************************************************
$(eval $(call gb_Helper_register_executables,NONE, \
+ HelpIndexer \
+ HelpLinker \
bestreversemap \
bmp \
bmpsum \
@@ -83,8 +85,6 @@
$(eval $(call gb_Helper_register_executables,OOO, \
gnome-open-url.bin \
- HelpLinker \
- HelpIndexer \
spadmin.bin \
$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
tdefilepicker \
@@ -355,6 +355,8 @@
swd \
swui \
t602filter \
+ tdeab1 \
+ tdeabdrv1 \
textconversiondlgs \
textfd \
tk \
@@ -552,6 +554,7 @@
slideshow \
stringresource \
syssh \
+ tdebe1 \
ucpcmis1 \
ucpexpand1 \
ucpext \
diff -Nru libreoffice-3.6.1~rc2/basic/source/runtime/runtime.cxx libreoffice-3.6.2~rc2/basic/source/runtime/runtime.cxx
--- libreoffice-3.6.1~rc2/basic/source/runtime/runtime.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/basic/source/runtime/runtime.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -711,17 +711,17 @@
SbiOpcode eOp = (SbiOpcode ) ( *pCode++ );
sal_uInt32 nOp1, nOp2;
- if (eOp < SbOP0_END)
+ if (eOp <= SbOP0_END)
{
(this->*( aStep0[ eOp ] ) )();
}
- else if (eOp >= SbOP1_START && eOp < SbOP1_END)
+ else if (eOp >= SbOP1_START && eOp <= SbOP1_END)
{
nOp1 = *pCode++; nOp1 |= *pCode++ << 8; nOp1 |= *pCode++ << 16; nOp1 |= *pCode++ << 24;
(this->*( aStep1[ eOp - SbOP1_START ] ) )( nOp1 );
}
- else if (eOp >= SbOP2_START && eOp < SbOP2_END)
+ else if (eOp >= SbOP2_START && eOp <= SbOP2_END)
{
nOp1 = *pCode++; nOp1 |= *pCode++ << 8; nOp1 |= *pCode++ << 16; nOp1 |= *pCode++ << 24;
nOp2 = *pCode++; nOp2 |= *pCode++ << 8; nOp2 |= *pCode++ << 16; nOp2 |= *pCode++ << 24;
diff -Nru libreoffice-3.6.1~rc2/berkeleydb/makefile.mk libreoffice-3.6.2~rc2/berkeleydb/makefile.mk
--- libreoffice-3.6.1~rc2/berkeleydb/makefile.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/berkeleydb/makefile.mk 2012-09-25 12:13:30.000000000 +0000
@@ -82,7 +82,7 @@
.IF "$(COM)"=="GCC"
CFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS)
-.IF "$(ENABLE_SYMBOLS)"!=""
+.IF "$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE"
CFLAGS+=-g
CXXFLAGS+=-g
.ENDIF
diff -Nru libreoffice-3.6.1~rc2/binaryurp/source/bridge.cxx libreoffice-3.6.2~rc2/binaryurp/source/bridge.cxx
--- libreoffice-3.6.1~rc2/binaryurp/source/bridge.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/binaryurp/source/bridge.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -678,7 +678,24 @@
void Bridge::handleRequestChangeReply(
bool exception, BinaryAny const & returnValue)
{
- throwException(exception, returnValue);
+ try {
+ throwException(exception, returnValue);
+ } catch (css::uno::RuntimeException & e) {
+ // Before OOo 2.2, Java URP would throw a RuntimeException when
+ // receiving a requestChange message (see i#35277 "Java URP: Support
+ // Manipulation of Protocol Properties"):
+ if (mode_ != MODE_REQUESTED) {
+ throw;
+ }
+ SAL_WARN(
+ "binaryurp",
+ "requestChange caught RuntimeException \'" << e.Message
+ << "' in state 'requested'");
+ mode_ = MODE_NORMAL;
+ getWriter()->unblock();
+ decrementCalls();
+ return;
+ }
sal_Int32 n = *static_cast< sal_Int32 * >(
returnValue.getValue(
css::uno::TypeDescription(cppu::UnoType< sal_Int32 >::get())));
diff -Nru libreoffice-3.6.1~rc2/config_host.mk.in libreoffice-3.6.2~rc2/config_host.mk.in
--- libreoffice-3.6.1~rc2/config_host.mk.in 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/config_host.mk.in 2012-09-25 12:13:30.000000000 +0000
@@ -233,7 +233,7 @@
export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
-export INTRO_BIPMAP=@INTRO_BITMAP@
+export INTRO_BITMAP=@INTRO_BITMAP@
export JAVAFLAGS=@JAVAFLAGS@
export JAVAIFLAGS=@JAVAIFLAGS@
export JAVAINTERPRETER=@JAVAINTERPRETER@
diff -Nru libreoffice-3.6.1~rc2/configure.in libreoffice-3.6.2~rc2/configure.in
--- libreoffice-3.6.1~rc2/configure.in 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/configure.in 2012-09-25 12:13:30.000000000 +0000
@@ -561,7 +561,8 @@
AC_ARG_ENABLE(mergelibs,
AS_HELP_STRING([--enable-mergelibs],
- [Enables linking of big merged library used for better performance.])
+ [Enables linking of big, merged, library. Experimental feature tested
+ only on Linux and Android.])
)
AC_ARG_ENABLE(graphite,
@@ -3126,6 +3127,8 @@
GUIBASE=unx
OS=LINUX
RTL_OS=kFreeBSD
+ P_SEP=:
+
case "$host_cpu" in
i*86)
@@ -3683,7 +3686,11 @@
ENABLE_SYMBOLS="TRUE"
AC_MSG_RESULT([yes])
else
- ENABLE_SYMBOLS=
+ if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
+ ENABLE_SYMBOLS="FALSE"
+ else
+ ENABLE_SYMBOLS=
+ fi
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_SYMBOLS)
@@ -9577,7 +9584,7 @@
dnl Set the variables
TDE_CFLAGS="-I$tqt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
- TDE_LIBS="-L$tde_libdir -L$tqt_libdir -ltdeui -ltdecore -ltqt -ltqt-mt"
+ TDE_LIBS="-L$tde_libdir -L$tqt_libdir -lkio -ltdeui -ltdecore -ltqt -ltqt-mt"
fi
AC_SUBST(TDE_CFLAGS)
AC_SUBST(TDE_LIBS)
@@ -11646,9 +11653,17 @@
# ===================================================================
AC_MSG_CHECKING([whether to create a big library for better performance])
MERGELIBS=
-if test "$enable_mergelibs" = "yes"; then
- MERGELIBS="TRUE"
- AC_MSG_RESULT([yes])
+if test $enable_mergelibs = yes; then
+ if test $WITH_BINFILTER = YES; then
+ add_warning "--enable-mergelibs conflicts with --enable-binfilter. Disabling mergelibs."
+ AC_MSG_RESULT([no])
+ else
+ if test $_os != Linux -a $_os != Android; then
+ add_warning "--enable-mergelibs is not tested for this platform"
+ fi
+ MERGELIBS="TRUE"
+ AC_MSG_RESULT([yes])
+ fi
else
AC_MSG_RESULT([no])
fi
diff -Nru libreoffice-3.6.1~rc2/connectivity/Configuration_tdeab.mk libreoffice-3.6.2~rc2/connectivity/Configuration_tdeab.mk
--- libreoffice-3.6.1~rc2/connectivity/Configuration_tdeab.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/Configuration_tdeab.mk 2012-09-25 12:13:30.000000000 +0000
@@ -14,6 +14,8 @@
# Major Contributor(s):
# Copyright (C) 2012 Red Hat, Inc., David Tardon
# (initial developer)
+# Copyright (C) 2012 Timothy Pearson
+# (TDE version)
#
# All Rights Reserved.
#
@@ -28,7 +30,7 @@
$(eval $(call gb_Configuration_Configuration,driver_tdeab))
$(eval $(call gb_Configuration_add_spool_modules,driver_tdeab,connectivity/registry/tdeab,\
- org/openoffice/Office/DataAccess/Drivers-tab.xcu \
+ org/openoffice/Office/DataAccess/Drivers-tdeab.xcu \
))
$(eval $(call gb_Configuration_add_localized_datas,driver_tdeab,connectivity/registry/tdeab,\
diff -Nru libreoffice-3.6.1~rc2/connectivity/Library_dbtools.mk libreoffice-3.6.2~rc2/connectivity/Library_dbtools.mk
--- libreoffice-3.6.1~rc2/connectivity/Library_dbtools.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/Library_dbtools.mk 2012-09-25 12:13:30.000000000 +0000
@@ -27,8 +27,6 @@
$(eval $(call gb_Library_Library,dbtools))
-# connectivity_generated causes cyclic dependency here, so set include path
-# for that instead
$(eval $(call gb_Library_use_packages,dbtools,\
connectivity_inc \
))
@@ -42,9 +40,7 @@
$(eval $(call gb_Library_set_include,dbtools,\
$$(INCLUDE) \
- -I$(SRCDIR)/connectivity/inc \
-I$(SRCDIR)/connectivity/source/inc \
- -I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
))
$(eval $(call gb_Library_use_api,dbtools,\
diff -Nru libreoffice-3.6.1~rc2/connectivity/Library_tdeab1.mk libreoffice-3.6.2~rc2/connectivity/Library_tdeab1.mk
--- libreoffice-3.6.1~rc2/connectivity/Library_tdeab1.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/Library_tdeab1.mk 2012-09-25 12:13:30.000000000 +0000
@@ -33,6 +33,11 @@
$(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1))
+$(eval $(call gb_Library_set_include,tdeab1,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_api,tdeab1,\
offapi \
udkapi \
diff -Nru libreoffice-3.6.1~rc2/connectivity/Library_tdeabdrv1.mk libreoffice-3.6.2~rc2/connectivity/Library_tdeabdrv1.mk
--- libreoffice-3.6.1~rc2/connectivity/Library_tdeabdrv1.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/Library_tdeabdrv1.mk 2012-09-25 12:13:30.000000000 +0000
@@ -27,11 +27,20 @@
$(eval $(call gb_Library_Library,tdeabdrv1))
+$(eval $(call gb_Library_set_include,tdeabdrv1,\
+ -I$(SRCDIR)/connectivity/source/inc \
+ $$(INCLUDE) \
+))
+
$(eval $(call gb_Library_use_api,tdeabdrv1,\
offapi \
udkapi \
))
+$(eval $(call gb_Library_use_externals,tdeabdrv1,\
+ tde \
+))
+
$(eval $(call gb_Library_add_libs,tdeabdrv1,\
-lkabc \
))
diff -Nru libreoffice-3.6.1~rc2/connectivity/Module_connectivity.mk libreoffice-3.6.2~rc2/connectivity/Module_connectivity.mk
--- libreoffice-3.6.1~rc2/connectivity/Module_connectivity.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/Module_connectivity.mk 2012-09-25 12:13:30.000000000 +0000
@@ -74,7 +74,7 @@
))
endif
-ifeq ($(ENABLE_TAB),TRUE)
+ifeq ($(ENABLE_TDEAB),TRUE)
$(eval $(call gb_Module_add_targets,connectivity,\
Configuration_tdeab \
Library_tdeab1 \
diff -Nru libreoffice-3.6.1~rc2/connectivity/Package_inc.mk libreoffice-3.6.2~rc2/connectivity/Package_inc.mk
--- libreoffice-3.6.1~rc2/connectivity/Package_inc.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/Package_inc.mk 2012-09-25 12:13:30.000000000 +0000
@@ -27,6 +27,9 @@
$(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc/connectivity))
+# sqlbison.hxx is generated and thus in another package
+$(call gb_Package_get_target,connectivity_inc) : $(call gb_Package_get_target,connectivity_generated)
+
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.hxx,BlobHelper.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,CommonTools.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx))
diff -Nru libreoffice-3.6.1~rc2/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu libreoffice-3.6.2~rc2/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu
--- libreoffice-3.6.1~rc2/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-
-
-
-
-
-
- com.sun.star.comp.sdbc.tdeab.Driver
-
-
- TDE Address Book
-
-
-
-
- true
-
-
-
-
-
-
diff -Nru libreoffice-3.6.1~rc2/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu libreoffice-3.6.2~rc2/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu
--- libreoffice-3.6.1~rc2/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/registry/tdeab/org/openoffice/Office/DataAccess/Drivers.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+ com.sun.star.comp.sdbc.tdeab.Driver
+
+
+ TDE Address Book
+
+
+
+
+ true
+
+
+
+
+
+
diff -Nru libreoffice-3.6.1~rc2/connectivity/source/parse/sqlbison.y libreoffice-3.6.2~rc2/connectivity/source/parse/sqlbison.y
--- libreoffice-3.6.1~rc2/connectivity/source/parse/sqlbison.y 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/connectivity/source/parse/sqlbison.y 2012-09-25 12:13:30.000000000 +0000
@@ -4519,7 +4519,7 @@
//------------------------------------------------------------------
::rtl::OUString ConvertLikeToken(const OSQLParseNode* pTokenNode, const OSQLParseNode* pEscapeNode, sal_Bool bInternational)
{
- ::rtl::OUStringBuffer aMatchStr;
+ ::rtl::OUStringBuffer aMatchStr(0);
if (pTokenNode->isToken())
{
sal_Unicode cEscape = 0;
@@ -4541,18 +4541,34 @@
sReplace.appendAscii("%_",2);
}
+ bool wasEscape = false;
for (sal_Int32 i = 0; i < nLen; i++)
{
const sal_Unicode c = aMatchStr[i];
- if (c == sSearch[0] || c == sSearch[1])
+ // SQL standard requires the escape to be followed
+ // by a meta-character ('%', '_' or itself), else error
+ // We are more lenient here and let it escape anything.
+ // Especially since some databases (e.g. Microsoft SQL Server)
+ // have more meta-characters than the standard, such as e.g. '[' and ']'
+ if (wasEscape)
{
- if (i > 0 && aMatchStr[i - 1] == cEscape)
- continue;
- else
- {
- const sal_Unicode cCharacter = sReplace[(c == sSearch[0] ? 0 : 1)];
- aMatchStr[i] = cCharacter;
- }
+ wasEscape=false;
+ continue;
+ }
+ if (c == cEscape)
+ {
+ wasEscape=true;
+ continue;
+ }
+ int match = -1;
+ if (c == sSearch[0])
+ match=0;
+ else if (c == sSearch[1])
+ match=1;
+
+ if (match != -1)
+ {
+ aMatchStr[i] = sReplace[match];
}
}
}
diff -Nru libreoffice-3.6.1~rc2/cppuhelper/source/defaultbootstrap.cxx libreoffice-3.6.2~rc2/cppuhelper/source/defaultbootstrap.cxx
--- libreoffice-3.6.1~rc2/cppuhelper/source/defaultbootstrap.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/cppuhelper/source/defaultbootstrap.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -130,9 +130,10 @@
rtl::OUString const & theName, rtl::OUString const & theLoader,
rtl::OUString const & theUri, rtl::OUString const & thePrefix,
css::uno::Reference< css::uno::XComponentContext > const &
- theAlienContext):
+ theAlienContext,
+ rtl::OUString const & theRdbFile):
name(theName), loader(theLoader), uri(theUri), prefix(thePrefix),
- alienContext(theAlienContext)
+ alienContext(theAlienContext), rdbFile(theRdbFile)
{}
explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {}
@@ -142,6 +143,7 @@
rtl::OUString const uri;
rtl::OUString const prefix;
css::uno::Reference< css::uno::XComponentContext > const alienContext;
+ rtl::OUString const rdbFile;
std::vector< rtl::OUString > services;
std::vector< rtl::OUString > singletons;
};
@@ -149,12 +151,12 @@
struct Implementation: private boost::noncopyable {
Implementation(
rtl::OUString const & name, rtl::OUString const & loader,
- rtl::OUString const & uri,
- rtl::OUString const & prefix = rtl::OUString(),
- css::uno::Reference< css::uno::XComponentContext > const &
- alienContext
- = css::uno::Reference< css::uno::XComponentContext >()):
- info(new ImplementationInfo(name, loader, uri, prefix, alienContext)),
+ rtl::OUString const & uri, rtl::OUString const & prefix,
+ css::uno::Reference< css::uno::XComponentContext > const & alienContext,
+ rtl::OUString const & rdbFile):
+ info(
+ new ImplementationInfo(
+ name, loader, uri, prefix, alienContext, rdbFile)),
loaded(false)
{}
@@ -466,7 +468,7 @@
implementation_.reset(
new Implementation(
attrImplementation_, attrLoader_, attrUri_, attrPrefix_,
- alienContext_));
+ alienContext_, reader_.getUrl()));
if (!data_->namedImplementations.insert(
NamedImplementations::value_type(
attrImplementation_, implementation_)).
@@ -1502,7 +1504,9 @@
boost::shared_ptr< Implementation > impl(
new Implementation(
name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
- readLegacyRdbString(uri, implKey, "UNO/LOCATION")));
+ readLegacyRdbString(uri, implKey, "UNO/LOCATION"),
+ rtl::OUString(),
+ css::uno::Reference< css::uno::XComponentContext >(), uri));
if (!data_.namedImplementations.insert(
NamedImplementations::value_type(name, impl)).
second)
@@ -1744,7 +1748,7 @@
j != data_.namedImplementations.end();)
{
assert(j->second.get() != 0);
- if (j->second->info->uri == *i) {
+ if (j->second->info->rdbFile == *i) {
clear.push_back(j->second);
//TODO: The below leaves data_ in an inconsistent state upon
// exceptions:
diff -Nru libreoffice-3.6.1~rc2/cui/source/options/optgdlg.cxx libreoffice-3.6.2~rc2/cui/source/options/optgdlg.cxx
--- libreoffice-3.6.1~rc2/cui/source/options/optgdlg.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/cui/source/options/optgdlg.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1248,6 +1248,22 @@
static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM("UILocale"));
static Sequence< OUString > seqInstalledLanguages;
+static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocaleWrapper )
+{
+ Sequence< OUString > aDateAcceptancePatterns = rLocaleWrapper.getDateAcceptancePatterns();
+ sal_Int32 nPatterns = aDateAcceptancePatterns.getLength();
+ rtl::OUStringBuffer aBuf( nPatterns * 6 ); // 6 := length of Y-M-D;
+ SAL_WARN_IF( !nPatterns, "cui.options", "No date acceptance pattern");
+ if (nPatterns)
+ {
+ const OUString* pPatterns = aDateAcceptancePatterns.getConstArray();
+ aBuf.append( pPatterns[0]);
+ for (sal_Int32 i=1; i < nPatterns; ++i)
+ aBuf.append(';').append( pPatterns[i]);
+ }
+ return aBuf.makeStringAndClear();
+}
+
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
aUILanguageGB(this, CUI_RES(FL_UI_LANG )),
@@ -1261,6 +1277,9 @@
aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)),
aCurrencyFT( this, CUI_RES(FT_CURRENCY )),
aCurrencyLB( this, CUI_RES(LB_CURRENCY )),
+ aDatePatternsFI( this, CUI_RES(FI_DATEPATTERNS )),
+ aDatePatternsFT( this, CUI_RES(FT_DATEPATTERNS )),
+ aDatePatternsED( this, CUI_RES(ED_DATEPATTERNS )),
aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )),
aWesternLanguageFI(this, CUI_RES(FI_WEST_LANG )),
aWesternLanguageFT(this, CUI_RES(FT_WEST_LANG )),
@@ -1383,6 +1402,8 @@
delete pLanguageTable;
aLocaleSettingLB.SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) );
+ aDatePatternsED.SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) );
+
Link aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
aAsianSupportCB.SetClickHdl( aLink );
aCTLSupportCB.SetClickHdl( aLink );
@@ -1579,6 +1600,11 @@
if ( sOldCurr != sNewCurr )
pLangConfig->aSysLocaleOptions.SetCurrencyConfigString( sNewCurr );
+ // Configured date acceptance patterns, for example Y-M-D;M-D or empty for
+ // locale default.
+ if (aDatePatternsED.GetText() != aDatePatternsED.GetSavedValue())
+ pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( aDatePatternsED.GetText());
+
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY );
sal_Bool bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
@@ -1730,6 +1756,22 @@
aCurrencyFT.Enable(!bReadonly);
aCurrencyFI.Show(bReadonly);
+ // date acceptance patterns
+ OUString aDatePatternsString = pLangConfig->aSysLocaleOptions.GetDatePatternsConfigString();
+ if (aDatePatternsString.isEmpty())
+ {
+ Locale aTempLocale;
+ SvxLanguageToLocale( aTempLocale, Application::GetSettings().GetLanguage());
+ LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale );
+ aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper);
+ }
+ aDatePatternsED.SetText( aDatePatternsString);
+ bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS);
+ aDatePatternsED.Enable(!bReadonly);
+ aDatePatternsFT.Enable(!bReadonly);
+ aDatePatternsFI.Show(bReadonly);
+ aDatePatternsED.SaveValue();
+
//western/CJK/CLK language
LanguageType eCurLang = LANGUAGE_NONE;
LanguageType eCurLangCJK = LANGUAGE_NONE;
@@ -1913,14 +1955,98 @@
}
aCurrencyLB.SelectEntryPos( nPos );
- //update the decimal separator key of the related CheckBox
+ // obtain corresponding locale data
Locale aTempLocale;
SvxLanguageToLocale( aTempLocale, eLang );
LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale );
+
+ // update the decimal separator key of the related CheckBox
String sTempLabel(sDecimalSeparatorLabel);
sTempLabel.SearchAndReplaceAscii("%1", aLocaleWrapper.getNumDecimalSep() );
aDecimalSeparatorCB.SetText(sTempLabel);
+ // update the date acceptance patterns
+ OUString aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper);
+ aDatePatternsED.SetText( aDatePatternsString);
+
+ return 0;
+}
+
+IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
+{
+ OUString aPatterns( pEd->GetText());
+ bool bValid = true;
+ if (!aPatterns.isEmpty())
+ {
+ for (sal_Int32 nIndex=0; nIndex >= 0 && bValid; /*nop*/)
+ {
+ OUString aPat( aPatterns.getToken( 0, ';', nIndex));
+ if (aPat.isEmpty() && nIndex < 0)
+ {
+ // Indicating failure when about to append a pattern is too
+ // confusing. Empty patterns are ignored anyway when sequencing
+ // to SvtSysLocale.
+ continue; // for
+ }
+ else if (aPat.getLength() < 2)
+ bValid = false;
+ else
+ {
+ bool bY, bM, bD;
+ bY = bM = bD = false;
+ bool bSep = true;
+ for (sal_Int32 i = 0; i < aPat.getLength() && bValid; /*nop*/)
+ {
+ sal_uInt32 c = aPat.iterateCodePoints( &i);
+ // Only one Y,M,D per pattern, separated by any character(s).
+ switch (c)
+ {
+ case 'Y':
+ if (bY || !bSep)
+ bValid = false;
+ bY = true;
+ bSep = false;
+ break;
+ case 'M':
+ if (bM || !bSep)
+ bValid = false;
+ bM = true;
+ bSep = false;
+ break;
+ case 'D':
+ if (bD || !bSep)
+ bValid = false;
+ bD = true;
+ bSep = false;
+ break;
+ default:
+ bSep = true;
+ }
+ }
+ // At least one of Y,M,D
+ bValid &= (bY || bM || bD);
+ }
+ }
+ }
+ if (bValid)
+ {
+ pEd->SetControlForeground();
+ pEd->SetControlBackground();
+ }
+ else
+ {
+ // color to use as foreground for an invalid pattern
+ #define INVALID_PATTERN_FOREGROUND_COLOR Color(COL_WHITE)
+ // color to use as background for an invalid pattern
+ #define INVALID_PATTERN_BACKGROUND_COLOR Color(0xff6563)
+#if 0
+ //! Gives white on white!?!
+ pEd->SetControlBackground( INVALID_PATTERN_BACKGROUND_COLOR);
+ pEd->SetControlForeground( INVALID_PATTERN_FOREGROUND_COLOR);
+#else
+ pEd->SetControlForeground( INVALID_PATTERN_BACKGROUND_COLOR);
+#endif
+ }
return 0;
}
diff -Nru libreoffice-3.6.1~rc2/cui/source/options/optgdlg.hrc libreoffice-3.6.2~rc2/cui/source/options/optgdlg.hrc
--- libreoffice-3.6.1~rc2/cui/source/options/optgdlg.hrc 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/cui/source/options/optgdlg.hrc 2012-09-25 12:13:30.000000000 +0000
@@ -203,6 +203,9 @@
#define FT_USERINTERFACE 30
#define LB_USERINTERFACE 31
#define STR_IB_LANGCHANGE_TITLE 32
+#define FI_DATEPATTERNS 33
+#define FT_DATEPATTERNS 34
+#define ED_DATEPATTERNS 35
#define FL_FILEDLG 53
#define FI_FILEDLG_RO 54
diff -Nru libreoffice-3.6.1~rc2/cui/source/options/optgdlg.hxx libreoffice-3.6.2~rc2/cui/source/options/optgdlg.hxx
--- libreoffice-3.6.1~rc2/cui/source/options/optgdlg.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/cui/source/options/optgdlg.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -180,6 +180,9 @@
CheckBox aDecimalSeparatorCB;
FixedText aCurrencyFT;
ListBox aCurrencyLB;
+ ReadOnlyImage aDatePatternsFI;
+ FixedText aDatePatternsFT;
+ Edit aDatePatternsED;
FixedLine aLinguLanguageGB;
ReadOnlyImage aWesternLanguageFI;
@@ -208,6 +211,7 @@
DECL_LINK( SupportHdl, CheckBox* ) ;
DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ;
+ DECL_LINK( DatePatternsHdl, Edit* ) ;
public:
OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
diff -Nru libreoffice-3.6.1~rc2/cui/source/options/optgdlg.src libreoffice-3.6.2~rc2/cui/source/options/optgdlg.src
--- libreoffice-3.6.1~rc2/cui/source/options/optgdlg.src 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/cui/source/options/optgdlg.src 2012-09-25 12:13:30.000000000 +0000
@@ -578,21 +578,41 @@
TabStop = TRUE ;
Sort = TRUE;
};
+ FixedImage FI_DATEPATTERNS
+ {
+ Pos = MAP_APPFONT ( 5 , 78 ) ;
+ Size = MAP_APPFONT ( 6 , 6 ) ;
+ Hide = TRUE;
+ };
+ FixedText FT_DATEPATTERNS
+ {
+ Pos = MAP_APPFONT ( 12 , 76 ) ;
+ Size = MAP_APPFONT ( 108 , 8 ) ;
+ Text [ en-US ] = "Date acceptance ~patterns";
+ };
+ Edit ED_DATEPATTERNS
+ {
+ HelpID = "cui:Edit:OFA_TP_LANGUAGES:ED_DATEPATTERNS";
+ Pos = MAP_APPFONT ( 123 , 74 ) ;
+ Size = MAP_APPFONT ( 125 , 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ };
FixedLine FL_LINGU_LANG
{
- Pos = MAP_APPFONT ( 6 , 77 ) ;
+ Pos = MAP_APPFONT ( 6 , 92 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Default languages for documents";
};
FixedImage FI_WEST_LANG
{
- Pos = MAP_APPFONT ( 5 , 92 ) ;
+ Pos = MAP_APPFONT ( 5 , 107 ) ;
Size = MAP_APPFONT ( 6 , 6 ) ;
Hide = TRUE;
};
FixedText FT_WEST_LANG
{
- Pos = MAP_APPFONT ( 12 , 90 ) ;
+ Pos = MAP_APPFONT ( 12 , 105 ) ;
Size = MAP_APPFONT ( 108 , 8 ) ;
Text [ en-US ] = "Western";
};
@@ -600,7 +620,7 @@
ListBox LB_WEST_LANG
{
HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG";
- Pos = MAP_APPFONT ( 123 , 88 ) ;
+ Pos = MAP_APPFONT ( 123 , 103 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
Border = TRUE ;
@@ -609,20 +629,20 @@
};
FixedImage FI_ASIAN_LANG
{
- Pos = MAP_APPFONT ( 5 , 108 ) ;
+ Pos = MAP_APPFONT ( 5 , 123 ) ;
Size = MAP_APPFONT ( 6 , 6 ) ;
Hide = TRUE;
};
FixedText FT_ASIAN_LANG
{
- Pos = MAP_APPFONT ( 12 , 106 ) ;
+ Pos = MAP_APPFONT ( 12 , 121 ) ;
Size = MAP_APPFONT ( 108 , 8 ) ;
Text [ en-US ] = "Asian";
};
ListBox LB_ASIAN_LANG
{
HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG";
- Pos = MAP_APPFONT ( 123 , 104 ) ;
+ Pos = MAP_APPFONT ( 123 , 119 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
Border = TRUE ;
@@ -631,20 +651,20 @@
};
FixedImage FI_COMPLEX_LANG
{
- Pos = MAP_APPFONT ( 5 , 124 ) ;
+ Pos = MAP_APPFONT ( 5 , 139 ) ;
Size = MAP_APPFONT ( 6 , 6 ) ;
Hide = TRUE;
};
FixedText FT_COMPLEX_LANG
{
- Pos = MAP_APPFONT ( 12 , 122 ) ;
+ Pos = MAP_APPFONT ( 12 , 137 ) ;
Size = MAP_APPFONT ( 108 , 8 ) ;
Text [ en-US ] = "C~TL";
};
ListBox LB_COMPLEX_LANG
{
HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG";
- Pos = MAP_APPFONT ( 123 , 120 ) ;
+ Pos = MAP_APPFONT ( 123 , 135 ) ;
Size = MAP_APPFONT ( 125 , 60 ) ;
DropDown = TRUE ;
Border = TRUE ;
@@ -654,39 +674,39 @@
CheckBox CB_CURRENT_DOC
{
HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC";
- Pos = MAP_APPFONT ( 123 , 135 ) ;
+ Pos = MAP_APPFONT ( 123 , 150 ) ;
Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "For the current document only";
};
FixedLine FL_ENHANCED
{
- Pos = MAP_APPFONT ( 6 , 145 ) ;
+ Pos = MAP_APPFONT ( 6 , 160 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Enhanced language support";
};
FixedImage FI_ASIANSUPPORT
{
- Pos = MAP_APPFONT ( 5 , 160 ) ;
+ Pos = MAP_APPFONT ( 5 , 175 ) ;
Size = MAP_APPFONT ( 6 , 6 ) ;
Hide = TRUE;
};
CheckBox CB_ASIANSUPPORT
{
HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT";
- Pos = MAP_APPFONT ( 12 , 158 ) ;
+ Pos = MAP_APPFONT ( 12 , 173 ) ;
Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "E~nabled for Asian languages";
};
FixedImage FI_CTLSUPPORT
{
- Pos = MAP_APPFONT ( 5 , 175 ) ;
+ Pos = MAP_APPFONT ( 5 , 190 ) ;
Size = MAP_APPFONT ( 6 , 6 ) ;
Hide = TRUE;
};
CheckBox CB_CTLSUPPORT
{
HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT";
- Pos = MAP_APPFONT ( 12 , 173 ) ;
+ Pos = MAP_APPFONT ( 12 , 188 ) ;
Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Ena~bled for complex text layout (CTL)";
};
diff -Nru libreoffice-3.6.1~rc2/dbaccess/source/core/api/KeySet.cxx libreoffice-3.6.2~rc2/dbaccess/source/core/api/KeySet.cxx
--- libreoffice-3.6.1~rc2/dbaccess/source/core/api/KeySet.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/dbaccess/source/core/api/KeySet.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1441,11 +1441,12 @@
bRet = m_xDriverSet->next();
if ( bRet )
{
+ const int cc = m_xSetMetaData->getColumnCount();
+
ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size() + m_pForeignColumnNames->size());
- ORowSetRow aFullRow = new connectivity::ORowVector< ORowSetValue >(m_pColumnNames->size());
+ ORowSetRow aFullRow = new connectivity::ORowVector< ORowSetValue >(cc);
// Fetch the columns only once and in order, to satisfy restrictive backends such as ODBC
- const int cc = m_xSetMetaData->getColumnCount();
connectivity::ORowVector< ORowSetValue >::Vector::iterator aFRIter = aFullRow->get().begin();
// Column 0 is reserved for the bookmark; unused here.
++aFRIter;
diff -Nru libreoffice-3.6.1~rc2/dbaccess/source/core/api/RowSet.cxx libreoffice-3.6.2~rc2/dbaccess/source/core/api/RowSet.cxx
--- libreoffice-3.6.1~rc2/dbaccess/source/core/api/RowSet.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/dbaccess/source/core/api/RowSet.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -569,6 +569,8 @@
// the columns must be disposed before the querycomposer is disposed because
// their owner can be the composer
TDataColumns().swap(m_aDataColumns);// clear and resize capacity
+ ::std::vector().swap(m_aReadOnlyDataColumns);
+
m_xColumns = NULL;
if ( m_pColumns )
m_pColumns->disposing();
@@ -1250,6 +1252,7 @@
void ORowSet::impl_restoreDataColumnsWriteable_throw()
{
+ assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || m_aReadOnlyDataColumns.size() == 0 );
TDataColumns::iterator aIter = m_aDataColumns.begin();
::std::vector >::iterator aReadIter = m_aReadOnlyDataColumns.begin();
for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
diff -Nru libreoffice-3.6.1~rc2/dbaccess/source/core/api/RowSetCache.cxx libreoffice-3.6.2~rc2/dbaccess/source/core/api/RowSetCache.cxx
--- libreoffice-3.6.1~rc2/dbaccess/source/core/api/RowSetCache.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/dbaccess/source/core/api/RowSetCache.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -857,7 +857,7 @@
sal_Bool ORowSetCache::moveWindow()
{
OSL_ENSURE(m_nStartPos >= 0,"ORowSetCache::moveWindow: m_nStartPos is less than 0!");
- OSL_ENSURE(m_nEndPos > m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos not smaller than m_nEndPos");
+ OSL_ENSURE(m_nEndPos >= m_nStartPos,"ORowSetCache::moveWindow: m_nStartPos not smaller than m_nEndPos");
OSL_ENSURE(m_nEndPos-m_nStartPos <= m_nFetchSize,"ORowSetCache::moveWindow: m_nStartPos and m_nEndPos too far apart");
if ( m_nStartPos < m_nPosition && m_nPosition <= m_nEndPos )
diff -Nru libreoffice-3.6.1~rc2/dbaccess/source/ui/dlg/queryfilter.cxx libreoffice-3.6.2~rc2/dbaccess/source/ui/dlg/queryfilter.cxx
--- libreoffice-3.6.1~rc2/dbaccess/source/ui/dlg/queryfilter.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/dbaccess/source/ui/dlg/queryfilter.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -369,8 +369,10 @@
_rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() );
if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != SQLFilterOperator::NOT_SQLNULL )
{
- String sPredicateValue = m_aPredicateInput.getPredicateValue( _rValue.GetText(), getMatchingColumn( _rValue ), sal_True );
- ::Replace_OS_PlaceHolder( sPredicateValue );
+ String sPredicateValue = m_aPredicateInput.getPredicateValue( _rValue.GetText(), getMatchingColumn( _rValue ), sal_False );
+ if ( _rFilter.Handle == SQLFilterOperator::LIKE ||
+ _rFilter.Handle == SQLFilterOperator::NOT_LIKE )
+ ::Replace_OS_PlaceHolder( sPredicateValue );
_rFilter.Value <<= ::rtl::OUString(sPredicateValue);
}
return bHaving;
@@ -486,7 +488,9 @@
::rtl::OUString aCondition;
_rItem.Value >>= aCondition;
String aStr = aCondition.getStr();
- ::Replace_SQL_PlaceHolder(aStr);
+ if ( _rItem.Handle == SQLFilterOperator::LIKE ||
+ _rItem.Handle == SQLFilterOperator::NOT_LIKE )
+ ::Replace_SQL_PlaceHolder(aStr);
aStr.EraseTrailingChars();
Reference< XPropertySet > xColumn = getColumn( _rItem.Name );
diff -Nru libreoffice-3.6.1~rc2/debian/changelog libreoffice-3.6.2~rc2/debian/changelog
--- libreoffice-3.6.1~rc2/debian/changelog 2012-09-14 21:02:13.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/changelog 2012-10-08 12:11:35.000000000 +0000
@@ -1,3 +1,47 @@
+libreoffice (1:3.6.2~rc2-0ubuntu3) quantal-proposed; urgency=high
+
+ * packaging shouldnt try to move stuff it doesnt build on armel/armhf
+
+ -- Bjoern Michaelsen Mon, 08 Oct 2012 13:19:24 +0200
+
+libreoffice (1:3.6.2~rc2-0ubuntu2) quantal-proposed; urgency=high
+
+ * do not build extensions on armel, armhf for bug 1062448
+ * update to unitymenus patch Change-Id
+ Ia8f82024e56ad83c8979d60df3c94e8209fe2552 (LP: #1062757) (LP: #1062812)
+
+ -- Bjoern Michaelsen Sun, 07 Oct 2012 10:18:24 +0200
+
+libreoffice (1:3.6.2~rc2-0ubuntu1) quantal-proposed; urgency=low
+
+ * update to unitymenus patch to 7ffc24eb76325afef89c25e8a7fe13124ed5a041
+ * lo-menubar is obsolete with this (C/P/R needs to stay there until 14.04 LTS)
+
+ -- Bjoern Michaelsen Fri, 05 Oct 2012 15:54:49 +0200
+
+libreoffice (1:3.6.2~rc2-0ubuntu1~ppa2) quantal; urgency=low
+
+ * update to Antonios fixes for today
+
+ -- Bjoern Michaelsen Thu, 04 Oct 2012 21:26:52 +0200
+
+libreoffice (1:3.6.2~rc2-0ubuntu1~ppa1) quantal; urgency=low
+
+ * ttf-sil-gentium-basic has been renamed to fonts-sil-gentium
+ * new upstream release 3.6.2.2
+ * update unitymenus patch to 767bae2cefd4cfcaa852c2c39e651bab81e4e134
+
+ -- Bjoern Michaelsen Wed, 03 Oct 2012 14:52:05 +0200
+
+libreoffice (1:3.6.1~rc2-1ubuntu6~ppa1) quantal; urgency=low
+
+ * update unitymenus to commit 22774aff3f1d4b2a09d713555e0180a3eded3155
+ * make metapackage explicit in short description (LP: #1045165)
+ * drop ttf-sil-gentium-basic and filter-mobiledev to suggests on
+ metapackage (LP: #1045165)
+
+ -- Bjoern Michaelsen Fri, 21 Sep 2012 16:55:33 +0200
+
libreoffice (1:3.6.1~rc2-1ubuntu5) quantal; urgency=low
* update unitymenus to commit a12a4a6befd8688495b966fb4741f61242740389
diff -Nru libreoffice-3.6.1~rc2/debian/control libreoffice-3.6.2~rc2/debian/control
--- libreoffice-3.6.1~rc2/debian/control 2012-09-13 01:40:51.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/control 2012-10-08 12:17:28.000000000 +0000
@@ -4,8 +4,8 @@
Maintainer: Ubuntu Core Developers
XSBC-Original-Maintainer: Debian LibreOffice Maintainers
Uploaders: Rene Engelhard
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libcmis-dev (>= 0.2.1), liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.1ubuntu1), libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9),, bsh (>= 2.0b4), fontforge
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libcmis-dev (>= 0.2.1), liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.1ubuntu1), libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet3.0-java, bsh (>= 2.0b4), fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), base-files (= 7.0), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
@@ -17,10 +17,10 @@
Package: libreoffice
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, ttf-dejavu, ${java-common-depends}, ${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils, libreoffice-gnome | libreoffice-kde
-Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
-Description: office productivity suite
+Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, fonts-sil-gentium, libreoffice-filter-mobiledev, ${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
+Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@ -323,7 +323,9 @@
Recommends: libreoffice-style-tango
Section: gnome
Enhances: libreoffice
-Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
+Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar
+Provides: lo-menubar
+Replaces: lo-menubar
Description: office productivity suite -- GTK+ integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3181,7 +3183,7 @@
Package: libreoffice-presentation-minimizer
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
@@ -3200,7 +3202,7 @@
Package: libreoffice-presenter-console
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
@@ -3225,7 +3227,7 @@
Package: libreoffice-pdfimport
Section: misc
Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for importing PDF documents
diff -Nru libreoffice-3.6.1~rc2/debian/control.in libreoffice-3.6.2~rc2/debian/control.in
--- libreoffice-3.6.1~rc2/debian/control.in 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/control.in 2012-10-08 12:11:35.000000000 +0000
@@ -56,8 +56,6 @@
libreofficeVER-math,
libreofficeVER-base%OOO_NO_BASE_ARCHS%,
ttf-dejavu,
- ttf-sil-gentium-basic,
- libreofficeVER-filter-mobiledev,
${java-common-depends},
${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils, libreoffice-gnome | libreoffice-kde
@@ -79,11 +77,13 @@
openclipart-libreoffice,
pstoedit,
imagemagick | graphicsmagick-imagemagick-compat,
+ fonts-sil-gentium,
+ libreofficeVER-filter-mobiledev,
${gstreamer-plugins-suggests},
${libldap-suggests},
${ooo-binfilter-dep},
${ooo-officebean-dep}
-Description: office productivity suite
+Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@ -456,7 +456,9 @@
Recommends: libreofficeVER-style-tango
Section: gnome
Enhances: libreofficeVER
-Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
+Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar
+Provides: lo-menubar
+Replaces: lo-menubar
Description: office productivity suite -- GTK+ integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff -Nru libreoffice-3.6.1~rc2/debian/patches/debian-debug.diff libreoffice-3.6.2~rc2/debian/patches/debian-debug.diff
--- libreoffice-3.6.1~rc2/debian/patches/debian-debug.diff 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/patches/debian-debug.diff 2012-10-08 12:11:35.000000000 +0000
@@ -2,7 +2,7 @@
index 3257668..afd36de 100755
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
-@@ -3582,8 +3582,13 @@
+@@ -3683,8 +3683,13 @@ dnl whether to include symbols into final build.
dnl ===================================================================
AC_MSG_CHECKING([whether to include symbols])
if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
@@ -16,8 +16,8 @@
+ AC_MSG_RESULT([yes])
+ fi
else
- ENABLE_SYMBOLS=
- AC_MSG_RESULT([no])
+ if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
+ ENABLE_SYMBOLS="FALSE"
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index c73333f..9338110 100644
--- libreoffice-3.5.0/solenv/inc/unxgcc.mk
diff -Nru libreoffice-3.6.1~rc2/debian/patches/kfreebsd-add-missing-P_SEP.diff libreoffice-3.6.2~rc2/debian/patches/kfreebsd-add-missing-P_SEP.diff
--- libreoffice-3.6.1~rc2/debian/patches/kfreebsd-add-missing-P_SEP.diff 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/patches/kfreebsd-add-missing-P_SEP.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/configure.in-old 2012-08-23 22:22:17.023096695 +0200
-+++ b/configure.in 2012-08-23 22:22:48.827254399 +0200
-@@ -3126,6 +3126,8 @@
- GUIBASE=unx
- OS=LINUX
- RTL_OS=kFreeBSD
-+ P_SEP=:
-+
- case "$host_cpu" in
-
- i*86)
diff -Nru libreoffice-3.6.1~rc2/debian/patches/make-package-modules-not-suck.diff libreoffice-3.6.2~rc2/debian/patches/make-package-modules-not-suck.diff
--- libreoffice-3.6.1~rc2/debian/patches/make-package-modules-not-suck.diff 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/patches/make-package-modules-not-suck.diff 2012-10-08 12:11:35.000000000 +0000
@@ -52,19 +52,6 @@
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
-diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
-index 88a2926..beaaf0ab 100644
---- a/scp2/source/gnome/module_gnome.scp
-+++ b/scp2/source/gnome/module_gnome.scp
-@@ -62,7 +62,7 @@ Module gid_Module_Optional_Gnome
- gid_File_Lib_Gconfbe
- #endif
- #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-- gid_File_Share_Registry_Gnome_Xcd
-+ ,gid_File_Share_Registry_Gnome_Xcd
- #endif
- );
- End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index e3313c8..3f5e257 100644
--- a/scp2/source/impress/module_impress.scp
diff -Nru libreoffice-3.6.1~rc2/debian/patches/series libreoffice-3.6.2~rc2/debian/patches/series
--- libreoffice-3.6.1~rc2/debian/patches/series 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/patches/series 2012-10-08 12:11:35.000000000 +0000
@@ -25,7 +25,6 @@
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
-kfreebsd-add-missing-P_SEP.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
#remove-broken-mysqlcon-version-check.diff
#fdo-51324-lp-1017125-rhbz-806236-rhbz-823272-erase-o.diff
diff -Nru libreoffice-3.6.1~rc2/debian/patches/split-binfilters-and-evo.diff libreoffice-3.6.2~rc2/debian/patches/split-binfilters-and-evo.diff
--- libreoffice-3.6.1~rc2/debian/patches/split-binfilters-and-evo.diff 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/patches/split-binfilters-and-evo.diff 2012-10-08 12:11:35.000000000 +0000
@@ -124,14 +124,14 @@
#endif // #ifdef UNX
--- libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp-old 2011-12-20 05:15:16.000000000 +0100
+++ libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp 2011-12-20 05:15:30.000000000 +0100
-@@ -42,6 +42,7 @@
- #endif
+@@ -43,6 +43,7 @@ Module gid_Module_Optional_Gnome
Files = (
+ #ifdef ENABLE_EVOAB2
gid_File_Lib_Evoab,
+ gid_File_Share_Registry_Evoab_Xcd,
+ #endif
+ #ifdef ENABLE_GTK
gid_File_Lib_Fps_Gnome,
- gid_File_Lib_Vclplug_Gtk,
- #ifdef ENABLE_GTK3
diff -u binfilter-old/file_binfilter.scp binfilter/file_binfilter.scp
--- libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-06 14:02:07.000000000 +0000
+++ libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-20 10:16:46.000000000 +0000
diff -Nru libreoffice-3.6.1~rc2/debian/patches/unitymenus.diff libreoffice-3.6.2~rc2/debian/patches/unitymenus.diff
--- libreoffice-3.6.1~rc2/debian/patches/unitymenus.diff 2012-09-14 21:20:22.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/patches/unitymenus.diff 2012-10-08 12:11:35.000000000 +0000
@@ -1,10 +1,10 @@
-commit b999fa88dd114693be3e2db6581eefacaaa637ea
+commit dcbb294362cbfb30721defd2096896ed579fa564
Author: Antonio Fernandez
-Date: Tue Sep 11 12:21:28 2012 +0100
+Date: Sat Oct 6 14:59:47 2012 +0100
- Fixed crashes when executing some menu actions.
+ Fixed a crash on non-Unity WM.
- Change-Id: I80bb1ed74e823d4b66df05eb15c9b5ed2e58b7f6
+ Change-Id: Ia8f82024e56ad83c8979d60df3c94e8209fe2552
framework/inc/classes/menumanager.hxx | 22 +-
framework/inc/uielement/menubarmanager.hxx | 24 +-
framework/inc/uielement/menubarmerger.hxx | 16 +-
@@ -16,24 +16,24 @@
vcl/Library_vcl.mk | 1 +
vcl/Library_vclplug_gtk.mk | 11 +-
vcl/Library_vclplug_gtk3.mk | 3 +
- vcl/inc/salmenu.hxx | 7 +-
- vcl/inc/unx/gtk/gloactiongroup.h | 93 ++++
- vcl/inc/unx/gtk/glomenu.h | 138 ++++++
- vcl/inc/unx/gtk/gtkframe.hxx | 5 +
+ vcl/inc/salmenu.hxx | 11 +-
+ vcl/inc/unx/gtk/gloactiongroup.h | 95 +++
+ vcl/inc/unx/gtk/glomenu.h | 144 +++++
+ vcl/inc/unx/gtk/gtkframe.hxx | 10 +
vcl/inc/unx/gtk/gtkinst.hxx | 5 +-
- vcl/inc/unx/gtk/gtksalmenu.hxx | 117 +++++
+ vcl/inc/unx/gtk/gtksalmenu.hxx | 128 ++++
vcl/inc/unx/salmenu.h | 8 +-
- vcl/inc/vcl/menu.hxx | 156 +++++--
- vcl/source/window/menu.cxx | 21 +-
- vcl/unx/gtk/app/gtkinst.cxx | 30 ++
- vcl/unx/gtk/window/gloactiongroup.cxx | 378 +++++++++++++++
- vcl/unx/gtk/window/glomenu.cxx | 590 ++++++++++++++++++++++++
- vcl/unx/gtk/window/gtkframe.cxx | 18 +-
- vcl/unx/gtk/window/gtksalmenu.cxx | 612 +++++++++++++++++++++++++
+ vcl/inc/vcl/menu.hxx | 156 ++++-
+ vcl/source/window/menu.cxx | 20 +-
+ vcl/unx/gtk/app/gtkinst.cxx | 30 +
+ vcl/unx/gtk/window/gloactiongroup.cxx | 421 +++++++++++++
+ vcl/unx/gtk/window/glomenu.cxx | 653 ++++++++++++++++++++
+ vcl/unx/gtk/window/gtkframe.cxx | 197 +++++-
+ vcl/unx/gtk/window/gtksalmenu.cxx | 808 +++++++++++++++++++++++++
vcl/unx/gtk3/window/gtk3gloactiongroup.cxx | 2 +
vcl/unx/gtk3/window/gtk3glomenu.cxx | 2 +
vcl/unx/gtk3/window/gtk3gtksalmenu.cxx | 2 +
- 28 files changed, 2240 insertions(+), 112 deletions(-)
+ 28 files changed, 2745 insertions(+), 115 deletions(-)
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 3ac4588..56ecc90 100644
--- a/framework/inc/classes/menumanager.hxx
@@ -326,10 +326,10 @@
AddonsOptions aAddonOptions;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
-index 4c64446..7d4b8d9 100644
+index 685d988..3a59299 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
-@@ -196,7 +196,7 @@ MenuBarManager::MenuBarManager(
+@@ -199,7 +199,7 @@ MenuBarManager::MenuBarManager(
const Reference< XURLTransformer >& _xURLTransformer,
const Reference< XDispatchProvider >& rDispatchProvider,
const rtl::OUString& rModuleIdentifier,
@@ -338,7 +338,7 @@
: ThreadHelpBase( &Application::GetSolarMutex() ), OWeakObject()
, m_bDisposed( sal_False )
, m_bRetrieveImages( sal_False )
-@@ -771,7 +771,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
+@@ -776,7 +776,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
}
@@ -347,7 +347,7 @@
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CheckAndAddMenuExtension" );
static const char REFERENCECOMMAND_BEFORE[] = ".uno:About";
-@@ -803,7 +803,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
+@@ -808,7 +808,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
}
}
@@ -356,16 +356,16 @@
{
if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
-@@ -813,7 +813,7 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId)
- // vcl handler
- //_________________________________________________________________________________________________________________
+@@ -848,7 +848,7 @@ private:
+
+ }
-IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
+IMPL_LINK( MenuBarManager, Activate, AbstractMenu *, pMenu )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Activate" );
if ( pMenu == m_pVCLMenu )
-@@ -863,8 +863,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
+@@ -902,8 +902,9 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
( pMenu->GetItemText( nItemId ).Len() == 0 ))
{
String aCommand = pMenu->GetItemCommand( nItemId );
@@ -376,7 +376,7 @@
}
}
-@@ -1004,11 +1005,14 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
+@@ -1043,11 +1044,14 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
}
}
@@ -392,7 +392,7 @@
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Deactivate" );
if ( pMenu == m_pVCLMenu )
-@@ -1044,7 +1048,7 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
+@@ -1083,7 +1087,7 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
return 0;
}
@@ -401,7 +401,7 @@
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Select" );
URL aTargetURL;
-@@ -1219,7 +1223,7 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa
+@@ -1258,7 +1262,7 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa
return sal_False;
}
@@ -410,7 +410,7 @@
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::FillMenuManager" );
m_xFrame = rFrame;
-@@ -1664,8 +1668,8 @@ void MenuBarManager::RetrieveImageManagers()
+@@ -1703,8 +1707,8 @@ void MenuBarManager::RetrieveImageManagers()
}
void MenuBarManager::FillMenuWithConfiguration(
@@ -421,7 +421,7 @@
const ::rtl::OUString& rModuleIdentifier,
const Reference< XIndexAccess >& rItemContainer,
const Reference< XURLTransformer >& rTransformer )
-@@ -1675,7 +1679,7 @@ void MenuBarManager::FillMenuWithConfiguration(
+@@ -1714,7 +1718,7 @@ void MenuBarManager::FillMenuWithConfiguration(
MenuBarManager::FillMenu( nId, pMenu, rModuleIdentifier, rItemContainer, xEmptyDispatchProvider );
// Merge add-on menu entries into the menu bar
@@ -430,7 +430,7 @@
AddonsOptions().GetMergeMenuInstructions(),
rModuleIdentifier );
-@@ -1700,15 +1704,15 @@ void MenuBarManager::FillMenuWithConfiguration(
+@@ -1739,15 +1743,15 @@ void MenuBarManager::FillMenuWithConfiguration(
}
void MenuBarManager::FillMenu(
@@ -449,7 +449,7 @@
{
Sequence< PropertyValue > aProp;
rtl::OUString aCommandURL;
-@@ -1811,7 +1815,7 @@ void MenuBarManager::FillMenu(
+@@ -1850,7 +1854,7 @@ void MenuBarManager::FillMenu(
}
void MenuBarManager::MergeAddonMenus(
@@ -458,7 +458,7 @@
const MergeMenuInstructionContainer& aMergeInstructionContainer,
const ::rtl::OUString& rModuleIdentifier )
{
-@@ -1836,7 +1840,7 @@ void MenuBarManager::MergeAddonMenus(
+@@ -1875,7 +1879,7 @@ void MenuBarManager::MergeAddonMenus(
MenuBarMerger::GetSubMenu( rMergeInstruction.aMergeMenu, aMergeMenuItems );
// try to find the reference point for our merge operation
@@ -467,7 +467,7 @@
ReferencePathInfo aResult = MenuBarMerger::FindReferencePath( aMergePath, pMenu );
if ( aResult.eResult == RP_OK )
-@@ -1916,7 +1920,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
+@@ -1955,7 +1959,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
sal_uInt16 nId = 1;
// Fill menu bar with container contents
@@ -476,7 +476,7 @@
// Refill menu manager again
Reference< XDispatchProvider > xDispatchProvider;
-@@ -1996,7 +2000,7 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUStri
+@@ -2035,7 +2039,7 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const ::rtl::OUStri
m_aMenuItemHandlerVector.push_back( pMenuItemHandler );
}
@@ -642,7 +642,7 @@
index 120199c..fd66689 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
-@@ -111,6 +111,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
+@@ -110,6 +110,9 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
vcl/unx/gtk3/gdi/gtk3salprn-gtk \
vcl/unx/gtk3/window/gtk3gtkframe \
vcl/unx/gtk3/window/gtk3gtkobject \
@@ -653,7 +653,7 @@
$(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\
diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx
-index 1d14a7e..2f8d680 100644
+index 1d14a7e..3411cb2 100644
--- a/vcl/inc/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
@@ -41,7 +41,7 @@ class SalFrame;
@@ -674,11 +674,22 @@
Image maImage;
rtl::OUString maToolTipText;
-@@ -91,6 +91,9 @@ public:
+@@ -75,7 +75,7 @@ public:
+ virtual ~SalMenu();
+
+ virtual sal_Bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars
+- // otherwise only menu messages are processed (eg, OLE on Windows)
++ // otherwise only menu messages are processed (eg, OLE on Windows)
+
+ virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) = 0;
+ virtual void RemoveItem( unsigned nPos ) = 0;
+@@ -91,6 +91,11 @@ public:
virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure
virtual void RemoveMenuBarButton( sal_uInt16 nId );
-+ virtual void SetItemCommand( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& aCommandStr ) {}
++ // FIXME: Make the other VCL native backends to work with these new methods.
++ virtual void SetItemCommand( unsigned, SalMenuItem*, const rtl::OUString& ) {}
++ virtual void ShowItem( unsigned nPos, sal_Bool bShow ) { EnableItem( nPos, bShow ); }
+ virtual void Freeze() {}
+
// return an empty rectangle if not implemented
@@ -686,10 +697,10 @@
// but rectangle cannot be determined
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
new file mode 100644
-index 0000000..e0d783f
+index 0000000..61ec718
--- /dev/null
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*
@@ -759,11 +770,13 @@
+
+void g_lo_action_group_insert (GLOActionGroup *group,
+ const gchar *action_name,
-+ gint item_id);
++ gint item_id,
++ gboolean submenu);
+
+void g_lo_action_group_insert_stateful (GLOActionGroup *group,
+ const gchar *action_name,
+ gint item_id,
++ gboolean submenu,
+ const GVariantType *parameter_type,
+ const GVariantType *state_type,
+ GVariant *state_hint,
@@ -785,10 +798,10 @@
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
new file mode 100644
-index 0000000..c45be50
+index 0000000..4c7c3e5
--- /dev/null
+++ b/vcl/inc/unx/gtk/glomenu.h
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,144 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*
@@ -819,6 +832,7 @@
+
+#define G_LO_MENU_ATTRIBUTE_ACCELERATOR "accel"
+#define G_LO_MENU_ATTRIBUTE_COMMAND "command"
++#define G_LO_MENU_ATTRIBUTE_SUBMENU_ACTION "submenu-action"
+
+G_BEGIN_DECLS
+
@@ -919,6 +933,11 @@
+ gint section,
+ gint position);
+
++void g_lo_menu_set_submenu_action_to_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position,
++ const gchar *action);
++
+GLOMenu * g_lo_menu_get_menu_containing_item (GLOMenu *menu,
+ gint item_id);
+
@@ -928,26 +947,31 @@
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
-index 50258e0..cd080d0 100644
+index 50258e0..96a7399 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
-@@ -221,6 +221,9 @@ class GtkSalFrame : public SalFrame
+@@ -221,6 +221,14 @@ class GtkSalFrame : public SalFrame
GdkRegion* m_pRegion;
#endif
+ SalMenu* m_pSalMenu;
-+ sal_uInt32 m_nWatcherId;
++ friend void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame);
++ friend void on_registrar_available (GDBusConnection*, const gchar*, const gchar*, gpointer);
++ friend void on_registrar_unavailable (GDBusConnection*, const gchar*, gpointer);
++ guint m_nWatcherId;
++ guint m_nMenuExportId;
++ guint m_nActionGroupExportId;
+
void Init( SalFrame* pParent, sal_uLong nStyle );
void Init( SystemParentData* pSysData );
void InitCommon();
-@@ -345,7 +348,9 @@ public:
+@@ -345,7 +353,9 @@ public:
virtual void SetTitle( const rtl::OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
virtual void SetMenu( SalMenu *pSalMenu );
+ virtual SalMenu* GetMenu( void );
virtual void DrawMenuBar();
-+ void SetWatcherId( sal_uInt32 watcherId );
++ void EnsureAppMenuWatch();
virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle );
// Before the window is visible, a resize event
@@ -976,10 +1000,10 @@
bool IsTimerExpired();
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
new file mode 100644
-index 0000000..f746b4b
+index 0000000..6e7084b
--- /dev/null
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
-@@ -0,0 +1,117 @@
+@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*
@@ -1006,45 +1030,40 @@
+#ifndef GTKSALMENU_HXX
+#define GTKSALMENU_HXX
+
-+#include
-+#include
-+#include
-+#include
-+
++#include
+#include
+
-+#include "glomenu.h"
-+#include "gloactiongroup.h"
++#include
++#include
++#include
++#include
++#include
+
+
+class MenuItemList;
+class GtkSalMenuItem;
+
++
+class GtkSalMenu : public SalMenu
+{
+private:
+ std::vector< GtkSalMenuItem* > maItems;
+
+ sal_Bool mbMenuBar;
-+ sal_Bool mbVisible;
+ Menu* mpVCLMenu;
+ GtkSalMenu* mpParentSalMenu;
+ const GtkSalFrame* mpFrame;
+
-+ sal_uInt32 mWatcherId;
-+
+ // GMenuModel and GActionGroup attributes
+ GMenuModel* mpMenuModel;
+ GActionGroup* mpActionGroup;
+
-+ sal_Int32 GetPositionFromItem( GtkSalMenuItem* pSalMenuItem );
-+ void GetItemSectionAndPosition( unsigned nPos, unsigned *insertSection, unsigned *insertPos );
++ GtkSalMenu* GetMenuForItemCommand( gchar* aCommand, gboolean bGetSubmenu );
+
+public:
+ GtkSalMenu( sal_Bool bMenuBar );
+ virtual ~GtkSalMenu();
+
-+ virtual void SetVisibleMenuBar( sal_Bool bVisible );
+ virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars
+ // otherwise only menu messages are processed (eg, OLE on Windows)
+
@@ -1055,6 +1074,7 @@
+ virtual const GtkSalFrame* GetFrame() const;
+ virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
+ virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
++ virtual void ShowItem( unsigned nPos, sal_Bool bShow );
+ virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText );
+ virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
+ virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
@@ -1071,13 +1091,28 @@
+ virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; }
+ virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; }
+ virtual GActionGroup* GetActionGroup() { return mpActionGroup; }
-+ GtkSalMenu* GetMenuForItemCommand( gchar* aCommand );
++ virtual sal_Bool IsItemVisible( unsigned nPos );
+
+ void NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText );
-+ void NativeSetItemCommand( unsigned nSection, unsigned nItemPos, GtkSalMenuItem* pItem, const gchar* aCommandStr );
++ void NativeSetItemCommand( unsigned nSection,
++ unsigned nItemPos,
++ sal_uInt16 nId,
++ const gchar* aCommand,
++ MenuItemBits nBits,
++ gboolean bChecked,
++ gboolean bIsSubmenu );
+ void NativeSetEnableItem( gchar* aCommand, gboolean bEnable );
+ void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck );
+ void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName );
++
++ void DispatchCommand( gint itemId, const gchar* aCommand );
++ void Activate( const gchar* aMenuCommand );
++ void Deactivate( const gchar* aMenuCommand );
++ void DisconnectFrame();
++ void Display( sal_Bool bVisible );
++ void UpdateNativeMenu();
++// void UpdateNativeSubMenu();
++ bool PrepUpdate();
+};
+
+class GtkSalMenuItem : public SalMenuItem
@@ -1087,11 +1122,11 @@
+ virtual ~GtkSalMenuItem();
+
+ sal_uInt16 mnId; // Item ID
-+ MenuItemBits mnBits; // Item bits
+ MenuItemType mnType; // Item type
-+ Menu* mpVCLMenu; // VCL Menu into which this MenuItem is inserted
-+ GtkSalMenu* mpParentMenu; // The menu in which this menu item is inserted
-+ GtkSalMenu* mpSubMenu; // Sub menu of this item (if defined)
++ sal_Bool mbVisible; // Item visibility.
++ Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted
++ GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted
++ GtkSalMenu* mpSubMenu; // Submenu of this item (if defined)
+};
+
+#endif // GTKSALMENU_HXX
@@ -1387,28 +1422,19 @@
// highlight link will be called with a MenuBarButtonHighlightArg
// the bHighlight member of that struct shall contain the new state
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
-index 3b4ac0d..e921805 100644
+index 3b4ac0d..1115111 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
-@@ -1146,7 +1146,8 @@ void Menu::Select()
+@@ -1811,7 +1811,8 @@ void Menu::ShowItem( sal_uInt16 nItemId, sal_Bool bVisible )
+ // as long as there is no support to hide native menu entries, we just disable them
+ // TODO: add support to show/hide native menu entries
+ if( ImplGetSalMenu() )
+- ImplGetSalMenu()->EnableItem( nPos, bVisible );
++// ImplGetSalMenu()->EnableItem( nPos, bVisible );
++ ImplGetSalMenu()->ShowItem( nPos, bVisible );
}
}
--#if defined(QUARTZ)
-+// FIXME: Workaround to make GLOMenu without defining macros.
-+//#if defined(QUARTZ)
- void Menu::ImplSelectWithStart( Menu* pSMenu )
- {
- Menu* pOldStartedFrom = pStartedFrom;
-@@ -1157,7 +1158,7 @@ void Menu::ImplSelectWithStart( Menu* pSMenu )
- pOldStartedFrom->pStartedFrom = pOldStartedStarted;
- pStartedFrom = pOldStartedFrom;
- }
--#endif
-+//#endif
-
- void Menu::RequestHelp( const HelpEvent& )
- {
@@ -1958,10 +1959,15 @@ sal_Bool Menu::GetItemImageMirrorMode( sal_uInt16 nItemId ) const
void Menu::SetItemCommand( sal_uInt16 nItemId, const String& rCommand )
@@ -1426,11 +1452,12 @@
}
const XubString& Menu::GetItemCommand( sal_uInt16 nItemId ) const
-@@ -3238,6 +3244,15 @@ void Menu::HighlightItem( sal_uInt16 nItemPos )
+@@ -3238,6 +3244,16 @@ void Menu::HighlightItem( sal_uInt16 nItemPos )
}
}
-+void Menu::Freeze() {
++void Menu::Freeze(void)
++{
+ SalMenu *pSalMenu = ImplGetSalMenu();
+
+ if ( pSalMenu ) {
@@ -1492,10 +1519,10 @@
GtkSalTimer *pTimer = new GtkSalTimer();
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
new file mode 100644
-index 0000000..33e756c
+index 0000000..756779a
--- /dev/null
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
-@@ -0,0 +1,378 @@
+@@ -0,0 +1,421 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*
@@ -1524,7 +1551,6 @@
+#include
+#include
+#include
-+#include
+
+
+/*
@@ -1542,7 +1568,8 @@
+ GObject parent_instance;
+
+ gint item_id; // Menu item ID.
-+ gboolean enabled; // TRUE if action is enabled, FALSE otherwise.
++ gboolean submenu; // TRUE if action is a submenu action.
++ gboolean enabled; // TRUE if action is enabled.
+ GVariantType* parameter_type; // A GVariantType with the action parameter type.
+ GVariantType* state_type; // A GVariantType with item state type
+ GVariant* state_hint; // A GVariant with state hints.
@@ -1564,6 +1591,7 @@
+g_lo_action_init (GLOAction *action)
+{
+ action->item_id = -1;
++ action->submenu = FALSE;
+ action->enabled = TRUE;
+ action->parameter_type = NULL;
+ action->state_type = NULL;
@@ -1657,51 +1685,92 @@
+ if (enabled)
+ *enabled = action->enabled;
+
-+ if (parameter_type) {
++ if (parameter_type)
+ *parameter_type = action->parameter_type;
-+ }
+
-+ if (state_type) {
++ if (state_type)
+ *state_type = action->state_type;
-+ }
+
-+ if (state_hint) {
-+ *state_hint = (action->state_hint) ? g_variant_ref(action->state_hint) : NULL;
-+ }
++ if (state_hint)
++ *state_hint = (action->state_hint) ? g_variant_ref (action->state_hint) : NULL;
+
-+ if (state) {
-+ *state = (action->state) ? g_variant_ref(action->state) : NULL;
-+ }
++ if (state)
++ *state = (action->state) ? g_variant_ref (action->state) : NULL;
+
+ return TRUE;
+}
+
+static void
-+g_lo_action_group_change_state (GActionGroup *group,
-+ const gchar *action_name,
-+ GVariant *value)
++g_lo_action_group_perform_submenu_action (GLOActionGroup *group,
++ const gchar *action_name,
++ GVariant *state)
+{
-+ if (!action_name || !value)
++ GTK_YIELD_GRAB();
++
++ GtkSalFrame* pFrame = group->priv->frame;
++
++ if (pFrame == NULL)
+ return;
+
-+ GLOActionGroup* lo_group = G_LO_ACTION_GROUP (group);
++ GtkSalMenu* pSalMenu = static_cast (pFrame->GetMenu());
+
-+ GLOAction* action = G_LO_ACTION (g_hash_table_lookup (lo_group->priv->table, action_name));
++ if (pSalMenu != NULL) {
++ gboolean bState = g_variant_get_boolean (state);
+
-+ if (action == NULL)
-+ return;
++ if (bState == TRUE)
++ pSalMenu->Activate (action_name);
++ else
++ pSalMenu->Deactivate (action_name);
++ }
++}
++
++static void
++g_lo_action_group_change_state (GActionGroup *group,
++ const gchar *action_name,
++ GVariant *value)
++{
++ g_return_if_fail (value != NULL);
+
-+ if (action->state_type == NULL)
-+ action->state_type = g_variant_type_copy(g_variant_get_type(value));
++ g_variant_ref_sink (value);
+
-+ g_return_if_fail (g_variant_is_of_type(value, action->state_type) == TRUE);
++ if (action_name != NULL)
++ {
++ GLOActionGroup* lo_group = G_LO_ACTION_GROUP (group);
++ GLOAction* action = G_LO_ACTION (g_hash_table_lookup (lo_group->priv->table, action_name));
+
-+ if (action->state)
-+ g_variant_unref(action->state);
++ if (action != NULL)
++ {
++ if (action->submenu == TRUE)
++ g_lo_action_group_perform_submenu_action (lo_group, action_name, value);
++ else
++ {
++ gboolean is_new = FALSE;
++
++ /* If action already exists but has no state, it should be removed and added again. */
++ if (action->state_type == NULL)
++ {
++ g_action_group_action_removed (G_ACTION_GROUP (group), action_name);
++ action->state_type = g_variant_type_copy (g_variant_get_type(value));
++ is_new = TRUE;
++ }
+
-+ action->state = g_variant_take_ref(value);
++ if (g_variant_is_of_type (value, action->state_type) == TRUE)
++ {
++ if (action->state)
++ g_variant_unref(action->state);
++
++ action->state = g_variant_ref (value);
++
++ if (is_new)
++ g_action_group_action_added (G_ACTION_GROUP (group), action_name);
++ else
++ g_action_group_action_state_changed (group, action_name, value);
++ }
++ }
++ }
++ }
+
-+ g_action_group_action_state_changed(group, action_name, value);
++ g_variant_unref (value);
+}
+
+static void
@@ -1712,38 +1781,37 @@
+ GTK_YIELD_GRAB();
+
+ GLOActionGroup *lo_group = G_LO_ACTION_GROUP (group);
-+ GLOAction* action = G_LO_ACTION (g_hash_table_lookup (lo_group->priv->table, action_name));
-+
+ GtkSalFrame *pFrame = lo_group->priv->frame;
+
-+ if ( pFrame == NULL )
-+ return;
-+
-+ GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pFrame->GetMenu() );
-+
-+ if ( pSalMenu == NULL )
-+ return;
++ if ( parameter != NULL )
++ g_action_group_change_action_state( group, action_name, parameter );
+
-+ GtkSalMenu* pSalSubMenu = pSalMenu->GetMenuForItemCommand( (gchar*) action_name );
-+ Menu* pSubMenu = ( pSalMenu != NULL ) ? pSalSubMenu->GetMenu() : NULL;
-+
-+ MenuBar* pMenuBar = static_cast< MenuBar* >( pSalMenu->GetMenu() );
++ if ( pFrame != NULL )
++ {
++ GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pFrame->GetMenu() );
+
-+ pMenuBar->HandleMenuCommandEvent( pSubMenu, action->item_id );
++ if ( pSalMenu != NULL )
++ {
++ GLOAction* action = G_LO_ACTION (g_hash_table_lookup (lo_group->priv->table, action_name));
++ pSalMenu->DispatchCommand( action->item_id, action_name );
++ }
++ }
+}
+
+void
+g_lo_action_group_insert (GLOActionGroup *group,
+ const gchar *action_name,
-+ gint item_id)
++ gint item_id,
++ gboolean submenu)
+{
-+ g_lo_action_group_insert_stateful (group, action_name, item_id, NULL, NULL, NULL, NULL);
++ g_lo_action_group_insert_stateful (group, action_name, item_id, submenu, NULL, NULL, NULL, NULL);
+}
+
+void
+g_lo_action_group_insert_stateful (GLOActionGroup *group,
+ const gchar *action_name,
+ gint item_id,
++ gboolean submenu,
+ const GVariantType *parameter_type,
+ const GVariantType *state_type,
+ GVariant *state_hint,
@@ -1756,13 +1824,15 @@
+ if (old_action == NULL || old_action->item_id != item_id)
+ {
+ if (old_action != NULL)
-+ g_action_group_action_removed (G_ACTION_GROUP (group), action_name);
++ g_lo_action_group_remove (group, action_name);
++// g_action_group_action_removed (G_ACTION_GROUP (group), action_name);
+
+ GLOAction* action = g_lo_action_new();
+
+ g_hash_table_insert (group->priv->table, g_strdup (action_name), action);
+
+ action->item_id = item_id;
++ action->submenu = submenu;
+
+ if (parameter_type)
+ action->parameter_type = (GVariantType*) parameter_type;
@@ -1771,10 +1841,10 @@
+ action->state_type = (GVariantType*) state_type;
+
+ if (state_hint)
-+ action->state_hint = g_variant_take_ref (state_hint);
++ action->state_hint = g_variant_ref_sink (state_hint);
+
+ if (state)
-+ action->state = g_variant_take_ref (state);
++ action->state = g_variant_ref_sink (state);
+
+ g_action_group_action_added (G_ACTION_GROUP (group), action_name);
+ }
@@ -1876,10 +1946,10 @@
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
new file mode 100644
-index 0000000..9c0f835
+index 0000000..2ecf23a
--- /dev/null
+++ b/vcl/unx/gtk/window/glomenu.cxx
-@@ -0,0 +1,590 @@
+@@ -0,0 +1,653 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/*
@@ -1988,13 +2058,20 @@
+}
+
+gint
-+g_lo_menu_get_n_items_from_section (GLOMenu *menu,
-+ gint section)
++g_lo_menu_get_n_items_from_section (GLOMenu *menu,
++ gint section)
+{
-+ GLOMenu *model = G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
++ g_return_val_if_fail (0 <= section && section < (gint) menu->items->len, -1);
++
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
++
++ g_return_val_if_fail (model != NULL, -1);
++
++ gint length = model->items->len;
+
-+ return model->items->len;
++ g_object_unref (model);
++
++ return length;
+}
+
+static void
@@ -2018,9 +2095,9 @@
+}
+
+void
-+g_lo_menu_insert (GLOMenu *menu,
-+ gint position,
-+ const gchar *label)
++g_lo_menu_insert (GLOMenu *menu,
++ gint position,
++ const gchar *label)
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+
@@ -2039,20 +2116,21 @@
+}
+
+void
-+g_lo_menu_insert_in_section (GLOMenu *menu,
-+ gint section,
-+ gint position,
-+ const gchar *label)
++g_lo_menu_insert_in_section (GLOMenu *menu,
++ gint section,
++ gint position,
++ const gchar *label)
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+ g_return_if_fail (0 <= section && section < (gint) menu->items->len);
+
-+ GLOMenu *model = G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
+ g_lo_menu_insert (model, position, label);
++
++ g_object_unref (model);
+}
+
+GLOMenu *
@@ -2071,7 +2149,7 @@
+ g_return_if_fail (attribute != NULL);
+ g_return_if_fail (valid_attribute_name (attribute));
+
-+ if (position >= menu->items->len)
++ if (position >= (gint) menu->items->len)
+ return;
+
+ struct item menu_item = g_array_index (menu->items, struct item, position);
@@ -2080,7 +2158,27 @@
+ g_hash_table_insert (menu_item.attributes, g_strdup (attribute), g_variant_ref_sink (value));
+ else
+ g_hash_table_remove (menu_item.attributes, attribute);
++}
++
++GVariant*
++g_lo_menu_get_attribute_value_from_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position,
++ const gchar *attribute,
++ const GVariantType *type)
++{
++ GMenuModel *model = G_MENU_MODEL (g_lo_menu_get_section (menu, section));
++
++ g_return_val_if_fail (model != NULL, NULL);
++
++ GVariant *value = g_menu_model_get_item_attribute_value (model,
++ position,
++ attribute,
++ type);
+
++ g_object_unref (model);
++
++ return value;
+}
+
+void
@@ -2108,8 +2206,7 @@
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+
-+ GLOMenu *model = G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
@@ -2117,29 +2214,32 @@
+
+ // Notify the update.
+ g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
++
++ g_object_unref (model);
+}
+
+gchar *
-+g_lo_menu_get_label_from_item_in_section (GLOMenu *menu,
-+ gint section,
-+ gint position)
++g_lo_menu_get_label_from_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position)
+{
+ g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+
-+ GMenuModel *model = G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION);
++ GVariant *label_value = g_lo_menu_get_attribute_value_from_item_in_section (menu,
++ section,
++ position,
++ G_MENU_ATTRIBUTE_LABEL,
++ G_VARIANT_TYPE_STRING);
+
-+ g_return_val_if_fail (model != NULL, NULL);
++ gchar *label = NULL;
+
-+ GVariant *current_label = g_menu_model_get_item_attribute_value (G_MENU_MODEL(model),
-+ position,
-+ G_MENU_ATTRIBUTE_LABEL,
-+ G_VARIANT_TYPE_STRING);
++ if (label_value)
++ {
++ label = g_variant_dup_string (label_value, NULL);
++ g_variant_unref (label_value);
++ }
+
-+ if (current_label)
-+ return g_strdup (g_variant_get_string (current_label, NULL));
-+ else
-+ return NULL;
++ return label;
+}
+
+void
@@ -2164,6 +2264,8 @@
+
+ g_lo_menu_set_attribute_value (menu, position, G_MENU_ATTRIBUTE_ACTION, action_value);
+ g_lo_menu_set_attribute_value (menu, position, G_MENU_ATTRIBUTE_TARGET, target_value);
++
++ g_menu_model_items_changed (G_MENU_MODEL (menu), position, 1, 1);
+}
+
+void
@@ -2175,16 +2277,13 @@
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+
-+ struct item menu_item = g_array_index (menu->items, struct item, section);
-+
-+ GLOMenu *model = G_LO_MENU (g_hash_table_lookup (menu_item.links, G_MENU_LINK_SECTION));
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
+ g_lo_menu_set_action_and_target_value (model, position, command, target_value);
+
-+ // Notify the update.
-+ g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
++ g_object_unref (model);
+}
+
+void
@@ -2195,8 +2294,7 @@
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+
-+ GMenuModel *model = G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION);
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
@@ -2207,33 +2305,36 @@
+ else
+ value = NULL;
+
-+ g_lo_menu_set_attribute_value (G_LO_MENU (model), position, G_LO_MENU_ATTRIBUTE_ACCELERATOR, value);
++ g_lo_menu_set_attribute_value (model, position, G_LO_MENU_ATTRIBUTE_ACCELERATOR, value);
+
+ // Notify the update.
-+ g_menu_model_items_changed (model, position, 1, 1);
++ g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
++
++ g_object_unref (model);
+}
+
+gchar *
-+g_lo_menu_get_accelerator_from_item_in_section (GLOMenu *menu,
-+ gint section,
-+ gint position)
++g_lo_menu_get_accelerator_from_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position)
+{
+ g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+
-+ GMenuModel *model = G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION);
++ GVariant *accel_value = g_lo_menu_get_attribute_value_from_item_in_section (menu,
++ section,
++ position,
++ G_LO_MENU_ATTRIBUTE_ACCELERATOR,
++ G_VARIANT_TYPE_STRING);
+
-+ g_return_val_if_fail (model != NULL, NULL);
++ gchar *accel = NULL;
+
-+ GVariant *current_accel = g_menu_model_get_item_attribute_value (model,
-+ position,
-+ G_LO_MENU_ATTRIBUTE_ACCELERATOR,
-+ G_VARIANT_TYPE_STRING);
++ if (accel_value != NULL)
++ {
++ accel = g_variant_dup_string (accel_value, NULL);
++ g_variant_unref (accel_value);
++ }
+
-+ if (current_accel)
-+ return g_strdup (g_variant_get_string (current_accel, NULL));
-+ else
-+ return NULL;
++ return accel;
+}
+
+void
@@ -2244,8 +2345,7 @@
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+
-+ GMenuModel *model = G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION);
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
@@ -2256,33 +2356,36 @@
+ else
+ value = NULL;
+
-+ g_lo_menu_set_attribute_value (G_LO_MENU (model), position, G_LO_MENU_ATTRIBUTE_COMMAND, value);
++ g_lo_menu_set_attribute_value (model, position, G_LO_MENU_ATTRIBUTE_COMMAND, value);
+
+ // Notify the update.
-+ g_menu_model_items_changed (model, position, 1, 1);
++ g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
++
++ g_object_unref (model);
+}
+
+gchar *
-+g_lo_menu_get_command_from_item_in_section (GLOMenu *menu,
-+ gint section,
-+ gint position)
++g_lo_menu_get_command_from_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position)
+{
+ g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+
-+ GMenuModel *model = G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION);
++ GVariant *command_value = g_lo_menu_get_attribute_value_from_item_in_section (menu,
++ section,
++ position,
++ G_LO_MENU_ATTRIBUTE_COMMAND,
++ G_VARIANT_TYPE_STRING);
+
-+ g_return_val_if_fail (model != NULL, NULL);
++ gchar *command = NULL;
+
-+ GVariant *command = g_menu_model_get_item_attribute_value (model,
-+ position,
-+ G_LO_MENU_ATTRIBUTE_COMMAND,
-+ G_VARIANT_TYPE_STRING);
++ if (command_value != NULL)
++ {
++ command = g_variant_dup_string (command_value, NULL);
++ g_variant_unref (command_value);
++ }
+
-+ if (command)
-+ return g_strdup (g_variant_get_string (command, NULL));
-+ else
-+ return NULL;
++ return command;
+}
+
+void
@@ -2307,10 +2410,10 @@
+}
+
+void
-+g_lo_menu_insert_section (GLOMenu *menu,
-+ gint position,
++g_lo_menu_insert_section (GLOMenu *menu,
++ gint position,
+ const gchar *label,
-+ GMenuModel* section)
++ GMenuModel *section)
+{
+ g_return_if_fail (G_IS_LO_MENU (menu));
+
@@ -2319,7 +2422,7 @@
+
+ struct item menu_item;
+
-+ g_lo_menu_struct_item_init(&menu_item);
++ g_lo_menu_struct_item_init (&menu_item);
+
+ g_array_insert_val (menu->items, position, menu_item);
+
@@ -2362,8 +2465,7 @@
+ g_return_if_fail (G_IS_LO_MENU (menu));
+ g_return_if_fail (0 <= section && section < (gint) menu->items->len);
+
-+ GLOMenu *model = G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
@@ -2371,18 +2473,19 @@
+
+ // Notify the update.
+ g_menu_model_items_changed (G_MENU_MODEL (model), position, 1, 1);
++
++ g_object_unref (model);
+}
+
+GLOMenu *
-+g_lo_menu_get_submenu_from_item_in_section (GLOMenu *menu,
-+ gint section,
-+ gint position)
++g_lo_menu_get_submenu_from_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position)
+{
+ g_return_val_if_fail (G_IS_LO_MENU (menu), NULL);
+ g_return_val_if_fail (0 <= section && section < (gint) menu->items->len, NULL);
+
-+ GLOMenu *model = G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_val_if_fail (model != NULL, NULL);
+
@@ -2391,9 +2494,38 @@
+ if (0 <= position && position < (gint) model->items->len)
+ submenu = g_menu_model_get_item_link (G_MENU_MODEL (model), position, G_MENU_LINK_SUBMENU);
+
++ g_object_unref (model);
++
+ return G_LO_MENU (submenu);
+}
+
++void
++g_lo_menu_set_submenu_action_to_item_in_section (GLOMenu *menu,
++ gint section,
++ gint position,
++ const gchar *action)
++{
++ g_return_if_fail (G_IS_LO_MENU (menu));
++
++ GMenuModel *model = G_MENU_MODEL (g_lo_menu_get_section (menu, section));
++
++ g_return_if_fail (model != NULL);
++
++ GVariant *value;
++
++ if (action != NULL)
++ value = g_variant_new_string (action);
++ else
++ value = NULL;
++
++ g_lo_menu_set_attribute_value (G_LO_MENU (model), position, G_LO_MENU_ATTRIBUTE_SUBMENU_ACTION, value);
++
++ // Notify the update.
++ g_menu_model_items_changed (model, position, 1, 1);
++
++ g_object_unref (model);
++}
++
+static void
+g_lo_menu_clear_item (struct item *menu_item)
+{
@@ -2410,9 +2542,9 @@
+ g_return_if_fail (G_IS_LO_MENU (menu));
+ g_return_if_fail (0 <= position && position < (gint) menu->items->len);
+
++ g_menu_model_items_changed (G_MENU_MODEL (menu), position, 1, 0);
+ g_lo_menu_clear_item (&g_array_index (menu->items, struct item, position));
+ g_array_remove_index (menu->items, position);
-+ g_menu_model_items_changed (G_MENU_MODEL (menu), position, 1, 0);
+}
+
+void
@@ -2423,12 +2555,13 @@
+ g_return_if_fail (G_IS_LO_MENU (menu));
+ g_return_if_fail (0 <= section && section < (gint) menu->items->len);
+
-+ GLOMenu *model = G_LO_MENU (G_MENU_MODEL_CLASS (g_lo_menu_parent_class)
-+ ->get_item_link (G_MENU_MODEL (menu), section, G_MENU_LINK_SECTION));
++ GLOMenu *model = g_lo_menu_get_section (menu, section);
+
+ g_return_if_fail (model != NULL);
+
+ g_lo_menu_remove (model, position);
++
++ g_object_unref (model);
+}
+
+static void
@@ -2471,20 +2604,229 @@
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
-index 36be0b2..d43371c 100644
+index 36be0b2..7e944c6 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
-@@ -532,6 +532,9 @@ GtkSalFrame::~GtkSalFrame()
- g_object_unref( G_OBJECT( m_pForeignParent ) );
- if( m_pForeignTopLevel )
- g_object_unref( G_OBJECT( m_pForeignTopLevel) );
-+
-+ if ( m_nWatcherId > 0 )
-+ g_bus_unwatch_name( m_nWatcherId );
+@@ -31,6 +31,9 @@
+ #include
+ #include
+ #include
++#include
++#include
++#include
+ #include
+ #include
+ #include
+@@ -45,6 +48,7 @@
+ #include
+ #endif
+
++#include
+ #include
+ #include
+ #include
+@@ -103,6 +107,7 @@ using namespace com::sun::star;
+
+ int GtkSalFrame::m_nFloats = 0;
+
++static GDBusConnection* pSessionBus = NULL;
+ static sal_uInt16 GetKeyModCode( guint state )
+ {
+ sal_uInt16 nCode = 0;
+@@ -482,6 +487,153 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
+ Init( pSysData );
}
- void GtkSalFrame::moveWindow( long nX, long nY )
-@@ -639,6 +642,8 @@ void GtkSalFrame::InitCommon()
++#if !GTK_CHECK_VERSION(3,0,0)
++static void
++gdk_x11_window_set_utf8_property (GdkWindow *window,
++ const gchar *name,
++ const gchar *value)
++{
++ GdkDisplay* display = gdk_window_get_display (window);
++
++ if (value != NULL)
++ {
++ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
++ GDK_WINDOW_XID (window),
++ gdk_x11_get_xatom_by_name_for_display (display, name),
++ gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
++ PropModeReplace, (guchar *)value, strlen (value));
++ }
++ else
++ {
++ XDeleteProperty (GDK_DISPLAY_XDISPLAY (display),
++ GDK_WINDOW_XID (window),
++ gdk_x11_get_xatom_by_name_for_display (display, name));
++ }
++}
++#endif
++
++// AppMenu watch functions.
++
++static void ObjectDestroyedNotify( gpointer data )
++{
++ if ( data ) {
++ g_object_unref( data );
++ }
++}
++
++void ensure_dbus_setup( GdkWindow* gdkWindow, GtkSalFrame* pSalFrame )
++{
++ if ( gdkWindow != NULL && g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) == NULL )
++ {
++ // Get a DBus session connection.
++ if(!pSessionBus)
++ pSessionBus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
++ if( pSessionBus == NULL )
++ return;
++
++ // Create menu model and action group attached to this frame.
++ GMenuModel* pMenuModel = G_MENU_MODEL( g_lo_menu_new() );
++ GActionGroup* pActionGroup = ( ( GActionGroup* ) g_lo_action_group_new( reinterpret_cast< gpointer >( pSalFrame ) ) );
++
++ // Generate menu paths.
++ XLIB_Window windowId = GDK_WINDOW_XID( gdkWindow );
++ gchar* aDBusPath = g_strdup_printf("/window/%lu", windowId);
++ gchar* aDBusWindowPath = g_strdup_printf( "/window/%lu", windowId );
++ gchar* aDBusMenubarPath = g_strdup_printf( "/window/%lu/menus/menubar", windowId );
++
++ // Publish the menu model and the action group.
++ SAL_INFO("vcl.unity", "exporting menu model at " << pMenuModel << " for window " << windowId);
++ pSalFrame->m_nMenuExportId = g_dbus_connection_export_menu_model (pSessionBus, aDBusMenubarPath, pMenuModel, NULL);
++ pSalFrame->m_nActionGroupExportId = g_dbus_connection_export_action_group( pSessionBus, aDBusPath, pActionGroup, NULL);
++
++ // Set window properties.
++ g_object_set_data_full( G_OBJECT(gdkWindow), "g-lo-menubar", pMenuModel, ObjectDestroyedNotify);
++ g_object_set_data_full( G_OBJECT(gdkWindow), "g-lo-action-group", pActionGroup, ObjectDestroyedNotify);
++
++ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_UNIQUE_BUS_NAME", g_dbus_connection_get_unique_name( pSessionBus ) );
++ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_APPLICATION_OBJECT_PATH", "" );
++ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_WINDOW_OBJECT_PATH", aDBusWindowPath );
++ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_MENUBAR_OBJECT_PATH", aDBusMenubarPath );
++
++ g_free( aDBusPath );
++ g_free( aDBusWindowPath );
++ g_free( aDBusMenubarPath );
++ }
++}
++
++void on_registrar_available( GDBusConnection * /*connection*/,
++ const gchar * /*name*/,
++ const gchar * /*name_owner*/,
++ gpointer user_data )
++{
++ SolarMutexGuard aGuard;
++
++ GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data );
++ GdkWindow* gdkWindow = gtk_widget_get_window( pSalFrame->getWindow() );
++
++ ensure_dbus_setup(gdkWindow, pSalFrame);
++
++ SalMenu* pSalMenu = pSalFrame->GetMenu();
++
++ if ( pSalMenu != NULL )
++ {
++ GtkSalMenu* pGtkSalMenu = static_cast(pSalMenu);
++ pGtkSalMenu->UpdateNativeMenu();
++ pGtkSalMenu->Display( sal_True );
++ }
++}
++
++// This is called when the registrar becomes unavailable. It shows the menubar.
++void on_registrar_unavailable( GDBusConnection * /*connection*/,
++ const gchar * /*name*/,
++ gpointer user_data )
++{
++ SolarMutexGuard aGuard;
++
++ SAL_INFO("vcl.unity", "on_registrar_unavailable");
++
++ pSessionBus = NULL;
++ GtkSalFrame* pSalFrame = reinterpret_cast< GtkSalFrame* >( user_data );
++
++ SalMenu* pSalMenu = pSalFrame->GetMenu();
++
++ if ( pSalMenu ) {
++ GtkSalMenu* pGtkSalMenu = static_cast< GtkSalMenu* >( pSalMenu );
++ pGtkSalMenu->DisconnectFrame();
++ pGtkSalMenu->Display( sal_False );
++ }
++}
++
++void GtkSalFrame::EnsureAppMenuWatch()
++{
++ SolarMutexGuard aGuard;
++
++ if ( m_nWatcherId )
++ //g_bus_unwatch_name( m_nWatcherId );
++ return;
++
++
++ // Get a DBus session connection.
++ if ( pSessionBus == NULL )
++ {
++ pSessionBus = g_bus_get_sync( G_BUS_TYPE_SESSION, NULL, NULL );
++
++ if ( pSessionBus == NULL )
++ return;
++ }
++
++ // Publish the menu only if AppMenu registrar is available.
++ m_nWatcherId = g_bus_watch_name_on_connection( pSessionBus,
++ "com.canonical.AppMenu.Registrar",
++ G_BUS_NAME_WATCHER_FLAGS_NONE,
++ on_registrar_available,
++ on_registrar_unavailable,
++ static_cast(this),
++ NULL );
++
++ ensure_dbus_setup( gtk_widget_get_window(GTK_WIDGET(m_pWindow)), static_cast(this) );
++}
++
+ GtkSalFrame::~GtkSalFrame()
+ {
+ for( unsigned int i = 0; i < SAL_N_ELEMENTS(m_aGraphics); ++i )
+@@ -523,10 +675,35 @@ GtkSalFrame::~GtkSalFrame()
+
+ if( m_pFixedContainer )
+ gtk_widget_destroy( GTK_WIDGET( m_pFixedContainer ) );
+- if( m_pWindow )
+ {
+- g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", NULL );
+- gtk_widget_destroy( m_pWindow );
++ SolarMutexGuard aGuard;
++ if(m_nWatcherId)
++ g_bus_unwatch_name(m_nWatcherId);
++ if(m_pSalMenu)
++ static_cast(m_pSalMenu)->DisconnectFrame();
++ if( m_pWindow )
++ {
++ g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", NULL );
++ if(m_nMenuExportId)
++ {
++ if(pSessionBus)
++ g_dbus_connection_unexport_menu_model(pSessionBus, m_nMenuExportId);
++ GLOMenu* pMenuModel = G_LO_MENU(g_object_get_data( G_OBJECT( m_pWindow ), "g-lo-menubar" ));
++ if(pMenuModel)
++ //g_lo_menu_remove(pMenuModel,0);
++ g_object_unref( pMenuModel );
++ }
++ if(m_nActionGroupExportId)
++ {
++ if(pSessionBus)
++ g_dbus_connection_unexport_action_group(pSessionBus, m_nActionGroupExportId);
++ GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP(g_object_get_data( G_OBJECT( m_pWindow ), "g-lo-action-group" ));
++ if(pActionGroup)
++ //g_lo_action_group_clear( pActionGroup );
++ g_object_unref( pActionGroup );
++ }
++ gtk_widget_destroy( m_pWindow );
++ }
+ }
+ if( m_pForeignParent )
+ g_object_unref( G_OBJECT( m_pForeignParent ) );
+@@ -639,6 +816,8 @@ void GtkSalFrame::InitCommon()
m_pRegion = NULL;
m_ePointerStyle = 0xffff;
m_bSetFocusOnMap = false;
@@ -2493,13 +2835,17 @@
gtk_widget_set_app_paintable( m_pWindow, TRUE );
gtk_widget_set_double_buffered( m_pWindow, FALSE );
-@@ -1288,14 +1293,25 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon )
+@@ -1288,8 +1467,18 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon )
g_list_free( pIcons );
}
-void GtkSalFrame::SetMenu( SalMenu* )
+void GtkSalFrame::SetMenu( SalMenu* pSalMenu )
+{
++ if(m_pSalMenu)
++ {
++ static_cast(m_pSalMenu)->DisconnectFrame();
++ }
+ m_pSalMenu = pSalMenu;
+}
+
@@ -2509,23 +2855,12 @@
}
void GtkSalFrame::DrawMenuBar()
- {
- }
-
-+void GtkSalFrame::SetWatcherId( sal_uInt32 watcherId )
-+{
-+ m_nWatcherId = watcherId;
-+}
-+
- void GtkSalFrame::Center()
- {
- long nX, nY;
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
new file mode 100644
-index 0000000..b61af31
+index 0000000..65ee72b
--- /dev/null
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
-@@ -0,0 +1,612 @@
+@@ -0,0 +1,808 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright © 2011 Canonical Ltd.
@@ -2548,46 +2883,265 @@
+ * Author: Antonio Fernández
+ */
+
-+#include "unx/gtk/gtksalmenu.hxx"
++#include
+
-+//#include
+#include
+#include
+#include
+#include
+
-+#include
++#if GTK_CHECK_VERSION(3,0,0)
++# include
++#endif
++
++#include
++
++#include
++
++#include
+
-+using namespace std;
++static sal_Bool bMenuVisibility = sal_False;
+
++static gchar* GetCommandForSpecialItem( GtkSalMenuItem* pSalMenuItem )
++{
++ gchar* aCommand = NULL;
++
++ sal_uInt16 nId = pSalMenuItem->mnId;
++
++ // If item belongs to window list, generate a command with "window-(id)" format.
++ if ( ( nId >= START_ITEMID_WINDOWLIST ) && ( nId <= END_ITEMID_WINDOWLIST ) )
++ {
++ aCommand = g_strdup_printf( "window-%d", nId );
++ }
++
++ return aCommand;
++}
+
-+static void UpdateNativeMenu( GtkSalMenu* pMenu )
++static void KeyCodeToGdkKey ( const KeyCode& rKeyCode, guint* pGdkKeyCode, GdkModifierType *pGdkModifiers )
+{
-+ if ( pMenu == NULL )
++ if ( pGdkKeyCode == NULL || pGdkModifiers == NULL )
+ return;
+
-+ Menu* pVCLMenu = pMenu->GetMenu();
-+ GLOMenu* pLOMenu = G_LO_MENU( pMenu->GetMenuModel() );
-+ GActionGroup* pActionGroup = pMenu->GetActionGroup();
++ // Get GDK key modifiers
++ GdkModifierType nModifiers = (GdkModifierType) 0;
++
++ if ( rKeyCode.IsShift() )
++ nModifiers = (GdkModifierType) ( nModifiers | GDK_SHIFT_MASK );
++
++ if ( rKeyCode.IsMod1() )
++ nModifiers = (GdkModifierType) ( nModifiers | GDK_CONTROL_MASK );
++
++ if ( rKeyCode.IsMod2() )
++ nModifiers = (GdkModifierType) ( nModifiers | GDK_MOD1_MASK );
++
++ *pGdkModifiers = nModifiers;
++
++ // Get GDK keycode.
++ guint nKeyCode = 0;
++
++ guint nCode = rKeyCode.GetCode();
++
++ if ( nCode >= KEY_0 && nCode <= KEY_9 )
++ nKeyCode = ( nCode - KEY_0 ) + GDK_0;
++ else if ( nCode >= KEY_A && nCode <= KEY_Z )
++ nKeyCode = ( nCode - KEY_A ) + GDK_A;
++ else if ( nCode >= KEY_F1 && nCode <= KEY_F26 )
++ nKeyCode = ( nCode - KEY_F1 ) + GDK_F1;
++ else
++ {
++ switch( nCode )
++ {
++ case KEY_DOWN: nKeyCode = GDK_Down; break;
++ case KEY_UP: nKeyCode = GDK_Up; break;
++ case KEY_LEFT: nKeyCode = GDK_Left; break;
++ case KEY_RIGHT: nKeyCode = GDK_Right; break;
++ case KEY_HOME: nKeyCode = GDK_Home; break;
++ case KEY_END: nKeyCode = GDK_End; break;
++ case KEY_PAGEUP: nKeyCode = GDK_Page_Up; break;
++ case KEY_PAGEDOWN: nKeyCode = GDK_Page_Down; break;
++ case KEY_RETURN: nKeyCode = GDK_Return; break;
++ case KEY_ESCAPE: nKeyCode = GDK_Escape; break;
++ case KEY_TAB: nKeyCode = GDK_Tab; break;
++ case KEY_BACKSPACE: nKeyCode = GDK_BackSpace; break;
++ case KEY_SPACE: nKeyCode = GDK_space; break;
++ case KEY_INSERT: nKeyCode = GDK_Insert; break;
++ case KEY_DELETE: nKeyCode = GDK_Delete; break;
++ case KEY_ADD: nKeyCode = GDK_plus; break;
++ case KEY_SUBTRACT: nKeyCode = GDK_minus; break;
++ case KEY_MULTIPLY: nKeyCode = GDK_asterisk; break;
++ case KEY_DIVIDE: nKeyCode = GDK_slash; break;
++ case KEY_POINT: nKeyCode = GDK_period; break;
++ case KEY_COMMA: nKeyCode = GDK_comma; break;
++ case KEY_LESS: nKeyCode = GDK_less; break;
++ case KEY_GREATER: nKeyCode = GDK_greater; break;
++ case KEY_EQUAL: nKeyCode = GDK_equal; break;
++ case KEY_FIND: nKeyCode = GDK_Find; break;
++ case KEY_CONTEXTMENU: nKeyCode = GDK_Menu; break;
++ case KEY_HELP: nKeyCode = GDK_Help; break;
++ case KEY_UNDO: nKeyCode = GDK_Undo; break;
++ case KEY_REPEAT: nKeyCode = GDK_Redo; break;
++ case KEY_DECIMAL: nKeyCode = GDK_KP_Decimal; break;
++ case KEY_TILDE: nKeyCode = GDK_asciitilde; break;
++ case KEY_QUOTELEFT: nKeyCode = GDK_quoteleft; break;
++ case KEY_BRACKETLEFT: nKeyCode = GDK_bracketleft; break;
++ case KEY_BRACKETRIGHT: nKeyCode = GDK_bracketright; break;
++ case KEY_SEMICOLON: nKeyCode = GDK_semicolon; break;
++
++ // Special cases
++ case KEY_COPY: nKeyCode = GDK_Copy; break;
++ case KEY_CUT: nKeyCode = GDK_Cut; break;
++ case KEY_PASTE: nKeyCode = GDK_Paste; break;
++ case KEY_OPEN: nKeyCode = GDK_Open; break;
++ }
++ }
++
++ *pGdkKeyCode = nKeyCode;
++}
++
++bool GtkSalMenu::PrepUpdate()
++{
++ const GtkSalFrame* pFrame = GetFrame();
++ if (pFrame)
++ {
++ const GObject* pWindow = G_OBJECT(gtk_widget_get_window( GTK_WIDGET(pFrame->getWindow()) ));
++ if(!pWindow)
++ {
++ SAL_INFO("vcl.unity", "not updating menu model, I have no frame " << mpMenuModel);
++ return false;
++ }
++
++ // the root menu does not have its own model and has to use the one owned by the frame
++ if(mbMenuBar)
++ {
++ mpMenuModel = G_MENU_MODEL( g_object_get_data( G_OBJECT( pWindow ), "g-lo-menubar" ) );
++ mpActionGroup = G_ACTION_GROUP( g_object_get_data( G_OBJECT( pWindow ), "g-lo-action-group" ) );
++
++ if(!mpMenuModel || !mpActionGroup)
++ return false;
++ }
++
++ SAL_INFO("vcl.unity", "updating menu model" << mpMenuModel);
++
++ return true;
++ }
++
++ return false;
++}
++
++/*
++ * Menu updating methods
++ */
++
++void RemoveSpareItemsFromNativeMenu( GLOMenu* pMenu, GList** pOldCommandList, unsigned nSection, unsigned nValidItems )
++{
++ sal_Int32 nSectionItems = g_lo_menu_get_n_items_from_section( pMenu, nSection );
++
++ while ( nSectionItems > (sal_Int32) nValidItems )
++ {
++ gchar* aCommand = g_lo_menu_get_command_from_item_in_section( pMenu, nSection, --nSectionItems );
++
++ if ( aCommand != NULL && pOldCommandList != NULL )
++ *pOldCommandList = g_list_append( *pOldCommandList, g_strdup( aCommand ) );
++
++ g_free( aCommand );
++
++ g_lo_menu_remove_from_section( pMenu, nSection, nSectionItems );
++ }
++}
++
++void RemoveSpareSectionsFromNativeMenu( GLOMenu* pMenu, GList** pOldCommandList, unsigned nLastSection )
++{
++ if ( pMenu == NULL || pOldCommandList == NULL )
++ return;
++
++ sal_Int32 n = g_menu_model_get_n_items( G_MENU_MODEL( pMenu ) ) - 1;
++
++ for ( ; n > (sal_Int32) nLastSection; n-- )
++ {
++ RemoveSpareItemsFromNativeMenu( pMenu, pOldCommandList, n, 0 );
++ g_lo_menu_remove( pMenu, n );
++ }
++}
++
++gint CompareStr( gpointer str1, gpointer str2 )
++{
++ return g_strcmp0( (const gchar*) str1, (const gchar*) str2 );
++}
++
++void RemoveUnusedCommands( GLOActionGroup* pActionGroup, GList* pOldCommandList, GList* pNewCommandList )
++{
++ if ( pActionGroup == NULL || pOldCommandList == NULL )
++ return;
++
++ while ( pNewCommandList != NULL )
++ {
++ GList* pNewCommand = g_list_first( pNewCommandList );
++ pNewCommandList = g_list_remove_link( pNewCommandList, pNewCommand );
++
++ gpointer aCommand = g_list_nth_data( pNewCommand, 0 );
++
++ GList* pOldCommand = g_list_find_custom( pOldCommandList, aCommand, (GCompareFunc) CompareStr );
++
++ if ( pOldCommand != NULL )
++ {
++ pOldCommandList = g_list_remove_link( pOldCommandList, pOldCommand );
++ g_list_free_full( pOldCommand, g_free );
++ }
++
++ g_list_free_full( pNewCommand, g_free );
++ }
++
++ while ( pOldCommandList != NULL )
++ {
++ GList* pCommand = g_list_first( pOldCommandList );
++ pOldCommandList = g_list_remove_link( pOldCommandList, pCommand );
++
++ gchar* aCommand = (gchar*) g_list_nth_data( pCommand, 0 );
++
++ g_lo_action_group_remove( pActionGroup, aCommand );
++
++ g_list_free_full( pCommand, g_free );
++ }
++}
++
++void GtkSalMenu::UpdateNativeMenu()
++{
++ SolarMutexGuard aGuard;
++ if( !PrepUpdate() )
++ return;
++
++
++ Menu* pVCLMenu = mpVCLMenu;
++ GLOMenu* pLOMenu = G_LO_MENU( mpMenuModel );
++ GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup );
++ GList *pOldCommandList = NULL;
++ GList *pNewCommandList = NULL;
+
+ sal_uInt16 nLOMenuSize = g_menu_model_get_n_items( G_MENU_MODEL( pLOMenu ) );
+
+ if ( nLOMenuSize == 0 )
+ g_lo_menu_new_section( pLOMenu, 0, NULL );
+
-+ sal_uInt16 nSection = 0;
-+ sal_uInt16 nItemPos = 0;
-+ sal_uInt16 validItems = 0;
-+ sal_uInt16 nItem;
++ sal_Int32 nSection = 0;
++ sal_Int32 nItemPos = 0;
++ sal_Int32 validItems = 0;
++ sal_Int32 nItem;
++
++ for ( nItem = 0; nItem < ( sal_Int32 ) GetItemCount(); nItem++ ) {
++ if ( IsItemVisible( nItem ) == sal_False )
++ continue;
+
-+ for ( nItem = 0; nItem < pMenu->GetItemCount(); nItem++ ) {
-+ GtkSalMenuItem *pSalMenuItem = pMenu->GetItemAtPos( nItem );
++ GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem );
+ sal_uInt16 nId = pSalMenuItem->mnId;
+
+ if ( pSalMenuItem->mnType == MENUITEM_SEPARATOR )
+ {
++ // Delete extra items from current section.
++ RemoveSpareItemsFromNativeMenu( pLOMenu, &pOldCommandList, nSection, validItems );
++
+ nSection++;
+ nItemPos = 0;
++ validItems = 0;
+
+ if ( nLOMenuSize <= nSection )
+ {
@@ -2614,25 +3168,44 @@
+ gboolean bEnabled = ( itemEnabled == sal_True ) ? TRUE : FALSE;
+ gchar* aNativeCommand = g_strdup( rtl::OUStringToOString( aCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
+
++ // Store current item command in command list.
++ gchar *aCurrentCommand = g_lo_menu_get_command_from_item_in_section( pLOMenu, nSection, nItemPos );
++
++ if ( aCurrentCommand != NULL )
++ pOldCommandList = g_list_append( pOldCommandList, aCurrentCommand );
++
+ // Force updating of native menu labels.
-+ pMenu->NativeSetItemText( nSection, nItemPos, aText );
-+ pMenu->NativeSetAccelerator( nSection, nItemPos, nAccelKey, nAccelKey.GetName( pMenu->GetFrame()->GetWindow() ) );
++ NativeSetItemText( nSection, nItemPos, aText );
++ NativeSetAccelerator( nSection, nItemPos, nAccelKey, nAccelKey.GetName( GetFrame()->GetWindow() ) );
+
-+ if ( g_strcmp0( aNativeCommand, "" ) != 0 && pSalMenuItem->mpSubMenu == NULL )
++ // Some items are special, so they have different commands.
++ if ( g_strcmp0( aNativeCommand, "" ) == 0 )
+ {
-+ pMenu->NativeSetItemCommand( nSection, nItemPos, pSalMenuItem, aNativeCommand );
-+ pMenu->NativeSetEnableItem( aNativeCommand, bEnabled );
++ gchar *aSpecialItemCmd = GetCommandForSpecialItem( pSalMenuItem );
+
-+ if ( ( itemBits & MIB_CHECKABLE ) || ( itemBits & MIB_RADIOCHECK ) )
-+ pMenu->NativeCheckItem( nSection, nItemPos, itemBits, bChecked );
++ if ( aSpecialItemCmd != NULL )
++ {
++ g_free( aNativeCommand );
++ aNativeCommand = aSpecialItemCmd;
++ }
+ }
+
-+ g_free( aNativeCommand );
++ if ( g_strcmp0( aNativeCommand, "" ) != 0 && pSalMenuItem->mpSubMenu == NULL )
++ {
++ NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, bChecked, FALSE );
++ NativeCheckItem( nSection, nItemPos, itemBits, bChecked );
++ NativeSetEnableItem( aNativeCommand, bEnabled );
++
++ pNewCommandList = g_list_append( pNewCommandList, g_strdup( aNativeCommand ) );
++ }
+
+ GtkSalMenu* pSubmenu = pSalMenuItem->mpSubMenu;
+
+ if ( pSubmenu && pSubmenu->GetMenu() )
+ {
++ NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, FALSE, TRUE );
++ pNewCommandList = g_list_append( pNewCommandList, g_strdup( aNativeCommand ) );
++
+ GLOMenu* pSubMenuModel = g_lo_menu_get_submenu_from_item_in_section( pLOMenu, nSection, nItemPos );
+
+ if ( pSubMenuModel == NULL )
@@ -2641,180 +3214,47 @@
+ g_lo_menu_set_submenu_to_item_in_section( pLOMenu, nSection, nItemPos, G_MENU_MODEL( pSubMenuModel ) );
+ }
+
-+ pSubmenu->GetMenu()->Activate();
++ g_object_unref( pSubMenuModel );
+
+ pSubmenu->SetMenuModel( G_MENU_MODEL( pSubMenuModel ) );
-+ pSubmenu->SetActionGroup( pActionGroup );
-+ UpdateNativeMenu( pSubmenu );
++ pSubmenu->SetActionGroup( G_ACTION_GROUP( pActionGroup ) );
+
++ pSubmenu->GetMenu()->Activate();
+ pSubmenu->GetMenu()->Deactivate();
-+ }
-+
-+ nItemPos++;
-+ validItems++;
-+ }
-+}
-+
-+gboolean GenerateMenu(gpointer user_data)
-+{
-+ GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( user_data );
-+
-+ UpdateNativeMenu( pSalMenu );
-+
-+ return TRUE;
-+}
-+
-+void ObjectDestroyedNotify( gpointer data )
-+{
-+ if ( data ) {
-+ g_object_unref( data );
-+ }
-+}
-+
-+void
-+gdk_x11_window_set_utf8_property (GdkWindow *window,
-+ const gchar *name,
-+ const gchar *value)
-+{
-+ GdkDisplay *display;
-+
-+ //if (!WINDOW_IS_TOPLEVEL (window))
-+ //return;
-+
-+ display = gdk_window_get_display (window);
-+
-+ if (value != NULL)
-+ {
-+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-+ GDK_WINDOW_XID (window),
-+ gdk_x11_get_xatom_by_name_for_display (display, name),
-+ gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
-+ PropModeReplace, (guchar *)value, strlen (value));
-+ }
-+ else
-+ {
-+ XDeleteProperty (GDK_DISPLAY_XDISPLAY (display),
-+ GDK_WINDOW_XID (window),
-+ gdk_x11_get_xatom_by_name_for_display (display, name));
-+ }
-+}
-+
-+// FIXME: Check for missing keys. Maybe translating keycodes would be safer...
-+rtl::OUString GetGtkKeyName( rtl::OUString keyName )
-+{
-+ rtl::OUString aGtkKeyName("");
-+
-+ sal_Int32 nIndex = 0;
-+
-+ do
-+ {
-+ rtl::OUString token = keyName.getToken( 0, '+', nIndex );
+
-+ if ( token == "Ctrl" ) {
-+ aGtkKeyName += "";
-+ } else if ( token == "Alt" ) {
-+ aGtkKeyName += "";
-+ } else if ( token == "Shift" ) {
-+ aGtkKeyName += "";
-+ } else {
-+ aGtkKeyName += token;
++ pSubmenu->UpdateNativeMenu();
+ }
-+ } while ( nIndex >= 0 );
-+
-+ return aGtkKeyName;
-+}
-+
-+// AppMenu watch functions.
-+
-+static sal_Bool bDBusIsAvailable = sal_False;
-+
-+static void
-+on_registrar_available (GDBusConnection * /*connection*/,
-+ const gchar * /*name*/,
-+ const gchar * /*name_owner*/,
-+ gpointer user_data)
-+{
-+ GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data );
-+ GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pSalFrame->GetMenu() );
-+
-+ if ( pSalMenu != NULL )
-+ {
-+ MenuBar* pMenuBar = static_cast< MenuBar* >( pSalMenu->GetMenu() );
-+
-+ GtkWidget *pWidget = pSalFrame->getWindow();
-+ GdkWindow *gdkWindow = gtk_widget_get_window( pWidget );
++// else if (pSubMenuModel)
++// {
++// g_lo_menu_set_submenu_to_item_in_section( pLOMenu, nSection, nItemPos, NULL );
++// };
+
-+ if ( gdkWindow != NULL )
-+ {
-+ XLIB_Window windowId = GDK_WINDOW_XID( gdkWindow );
++ g_free( aNativeCommand );
+
-+ gchar* aDBusPath = g_strdup_printf("/window/%lu", windowId);
-+ gchar* aDBusWindowPath = g_strdup_printf( "/window/%lu", windowId );
-+ gchar* aDBusMenubarPath = g_strdup_printf( "/window/%lu/menus/menubar", windowId );
-+
-+ // Get a DBus session connection.
-+ GDBusConnection* pSessionBus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-+
-+ if( pSessionBus == NULL )
-+ return;
-+
-+ // Publish the menu.
-+ if ( aDBusMenubarPath != NULL )
-+ g_dbus_connection_export_menu_model (pSessionBus, aDBusMenubarPath, pSalMenu->GetMenuModel(), NULL);
-+
-+ if ( aDBusPath != NULL )
-+ g_dbus_connection_export_action_group( pSessionBus, aDBusPath, pSalMenu->GetActionGroup(), NULL);
-+
-+ // Set window properties.
-+ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_UNIQUE_BUS_NAME", g_dbus_connection_get_unique_name( pSessionBus ) );
-+ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_APPLICATION_OBJECT_PATH", "" );
-+ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_WINDOW_OBJECT_PATH", aDBusWindowPath );
-+ gdk_x11_window_set_utf8_property ( gdkWindow, "_GTK_MENUBAR_OBJECT_PATH", aDBusMenubarPath );
-+
-+ g_free( aDBusPath );
-+ g_free( aDBusWindowPath );
-+ g_free( aDBusMenubarPath );
-+
-+ bDBusIsAvailable = sal_True;
-+ pSalMenu->SetVisibleMenuBar( sal_True );
-+ pMenuBar->SetDisplayable( sal_False );
-+ }
++ ++nItemPos;
++ ++validItems;
+ }
+
-+ return;
-+}
-+
-+//This is called when the registrar becomes unavailable. It shows the menubar.
-+static void
-+on_registrar_unavailable (GDBusConnection * /*connection*/,
-+ const gchar * /*name*/,
-+ gpointer user_data)
-+{
-+ GtkSalFrame* pSalFrame = static_cast< GtkSalFrame* >( user_data );
-+ GtkSalMenu* pSalMenu = static_cast< GtkSalMenu* >( pSalFrame->GetMenu() );
-+
-+ if ( pSalMenu ) {
-+ MenuBar* pMenuBar = static_cast< MenuBar* >( pSalMenu->GetMenu() );
++ // Delete extra items in last section.
++ RemoveSpareItemsFromNativeMenu( pLOMenu, &pOldCommandList, nSection, validItems );
+
-+ bDBusIsAvailable = sal_False;
-+ pSalMenu->SetVisibleMenuBar( sal_False );
-+ pMenuBar->SetDisplayable( sal_True );
-+ }
++ // Delete extra sections.
++ RemoveSpareSectionsFromNativeMenu( pLOMenu, &pOldCommandList, nSection );
+
-+ return;
++ // Delete unused commands.
++ RemoveUnusedCommands( pActionGroup, pOldCommandList, pNewCommandList );
+}
+
++
+/*
+ * GtkSalMenu
+ */
+
+GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) :
+ mbMenuBar( bMenuBar ),
-+ mbVisible( sal_False ),
+ mpVCLMenu( NULL ),
+ mpParentSalMenu( NULL ),
+ mpFrame( NULL ),
-+ mWatcherId( 0 ),
+ mpMenuModel( NULL ),
+ mpActionGroup( NULL )
+{
@@ -2822,36 +3262,22 @@
+
+GtkSalMenu::~GtkSalMenu()
+{
-+ if ( mbMenuBar == sal_True ) {
-+ g_source_remove_by_user_data( this );
-+
-+ ((GtkSalFrame*) mpFrame)->SetMenu( NULL );
-+
-+ if ( mpActionGroup ) {
-+ g_lo_action_group_clear( G_LO_ACTION_GROUP( mpActionGroup ) );
-+ }
-+
-+ if ( mpMenuModel ) {
-+ g_lo_menu_remove( G_LO_MENU( mpMenuModel ), 0 );
-+ }
-+ }
++ SolarMutexGuard aGuard;
++ if ( mbMenuBar == sal_True )
++ if ( mpFrame )
++ ((GtkSalFrame*) mpFrame)->SetMenu( NULL );
+
+ maItems.clear();
+}
+
-+void GtkSalMenu::SetVisibleMenuBar( sal_Bool bVisible )
-+{
-+// mbVisible = bVisible;
-+}
-+
+sal_Bool GtkSalMenu::VisibleMenuBar()
+{
-+// return mbVisible;
-+ return bDBusIsAvailable;
++ return bMenuVisibility;
+}
+
+void GtkSalMenu::InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos )
+{
++ SolarMutexGuard aGuard;
+ GtkSalMenuItem *pItem = static_cast( pSalMenuItem );
+
+ if ( nPos == MENU_APPEND )
@@ -2864,11 +3290,13 @@
+
+void GtkSalMenu::RemoveItem( unsigned nPos )
+{
++ SolarMutexGuard aGuard;
+ maItems.erase( maItems.begin() + nPos );
+}
+
+void GtkSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos )
+{
++ SolarMutexGuard aGuard;
+ GtkSalMenuItem *pItem = static_cast< GtkSalMenuItem* >( pSalMenuItem );
+ GtkSalMenu *pGtkSubMenu = static_cast< GtkSalMenu* >( pSubMenu );
+
@@ -2881,60 +3309,59 @@
+
+void GtkSalMenu::SetFrame( const SalFrame* pFrame )
+{
++ SolarMutexGuard aGuard;
++ assert(mbMenuBar);
++ SAL_INFO("vcl.unity", "GtkSalMenu set to frame");
+ mpFrame = static_cast< const GtkSalFrame* >( pFrame );
++ GtkSalFrame* pFrameNonConst = const_cast(mpFrame);
+
-+ ( ( GtkSalFrame* ) mpFrame )->SetMenu( this );
-+
-+ GtkWidget *widget = GTK_WIDGET( mpFrame->getWindow() );
-+
-+ GdkWindow *gdkWindow = gtk_widget_get_window( widget );
-+
-+ if (gdkWindow) {
-+ mpMenuModel = G_MENU_MODEL( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-menubar" ) );
-+ mpActionGroup = G_ACTION_GROUP( g_object_get_data( G_OBJECT( gdkWindow ), "g-lo-action-group" ) );
++ // if we had a menu on the GtkSalMenu we have to free it as we generate a
++ // full menu anyway and we might need to reuse an existing model and
++ // actiongroup
++// if(mpMenuModel)
++// {
++// g_object_unref(G_OBJECT(mpMenuModel));
++// mpMenuModel = NULL;
++// }
+
-+ if ( mpMenuModel == NULL && mpActionGroup == NULL ) {
-+ mpMenuModel = G_MENU_MODEL( g_lo_menu_new() );
-+ mpActionGroup = G_ACTION_GROUP( g_lo_action_group_new( ( gpointer ) mpFrame ) );
++// if(mpActionGroup)
++// {
++// g_object_unref(G_OBJECT(mpActionGroup));
++// mpActionGroup = NULL;
++// }
++ pFrameNonConst->SetMenu( this );
++ mpFrame = static_cast< const GtkSalFrame* >( pFrame );
++ pFrameNonConst->EnsureAppMenuWatch();
+
-+ g_object_set_data_full( G_OBJECT( gdkWindow ), "g-lo-menubar", mpMenuModel, ObjectDestroyedNotify );
-+ g_object_set_data_full( G_OBJECT( gdkWindow ), "g-lo-action-group", mpActionGroup, ObjectDestroyedNotify );
++ // Clean menu model and action group if needed.
++ GObject* pWindow = G_OBJECT( gtk_widget_get_window( GTK_WIDGET( pFrameNonConst->getWindow() ) ) );
++ GLOMenu* pMenuModel = G_LO_MENU( g_object_get_data( pWindow, "g-lo-menubar" ) );
++ GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( g_object_get_data( pWindow, "g-lo-action-group" ) );
+
-+ // Publish the menu only if AppMenu registrar is available.
-+ guint nWatcherId = g_bus_watch_name (G_BUS_TYPE_SESSION,
-+ "com.canonical.AppMenu.Registrar",
-+ G_BUS_NAME_WATCHER_FLAGS_NONE,
-+ on_registrar_available,
-+ on_registrar_unavailable,
-+ (gpointer) mpFrame,
-+ NULL);
++ if ( pMenuModel && g_menu_model_get_n_items( G_MENU_MODEL( pMenuModel ) ) > 0 )
++ g_lo_menu_remove( pMenuModel, 0 );
+
-+ ( ( GtkSalFrame* ) mpFrame )->SetWatcherId( nWatcherId );
-+ }
++ if ( pActionGroup )
++ g_lo_action_group_clear( pActionGroup );
+
-+ // Generate the main menu structure.
-+// GenerateMenu( this );
+
-+ // Refresh the menu every second.
-+ // This code is a workaround until required modifications in Gtk+ are available.
-+ g_timeout_add_seconds( 1, GenerateMenu, this );
-+ }
++ // Generate the main menu structure.
++ UpdateNativeMenu();
+}
+
+const GtkSalFrame* GtkSalMenu::GetFrame() const
+{
++ SolarMutexGuard aGuard;
+ const GtkSalMenu* pMenu = this;
+ while( pMenu && ! pMenu->mpFrame )
+ pMenu = pMenu->mpParentSalMenu;
+ return pMenu ? pMenu->mpFrame : NULL;
+}
+
-+void GtkSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck )
-+{
-+}
-+
+void GtkSalMenu::NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck )
+{
++ SolarMutexGuard aGuard;
++
+ if ( mpActionGroup == NULL )
+ return;
+
@@ -2945,42 +3372,39 @@
+ GVariant *pCheckValue = NULL;
+ GVariant *pCurrentState = g_action_group_get_action_state( mpActionGroup, aCommand );
+
-+ if ( bits & MIB_CHECKABLE )
-+ {
-+ pCheckValue = g_variant_new_boolean( bCheck );
-+ }
-+ else if ( bits & MIB_RADIOCHECK )
-+ {
++ if ( bits & MIB_RADIOCHECK )
+ pCheckValue = ( bCheck == TRUE ) ? g_variant_new_string( aCommand ) : g_variant_new_string( "" );
++ else
++ {
++ // By default, all checked items are checkmark buttons.
++ if ( bCheck == TRUE || ( ( bCheck == FALSE ) && pCurrentState != NULL ) )
++ pCheckValue = g_variant_new_boolean( bCheck );
+ }
+
-+ if ( pCurrentState == NULL || g_variant_equal( pCurrentState, pCheckValue) == FALSE )
++ if ( pCheckValue != NULL && ( pCurrentState == NULL || g_variant_equal( pCurrentState, pCheckValue ) == FALSE ) )
+ g_action_group_change_action_state( mpActionGroup, aCommand, pCheckValue );
++
++ if ( pCurrentState != NULL )
++ g_variant_unref( pCurrentState );
+ }
+
+ if ( aCommand )
+ g_free( aCommand );
+}
+
-+void GtkSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable )
-+{
-+}
-+
+void GtkSalMenu::NativeSetEnableItem( gchar* aCommand, gboolean bEnable )
+{
++ SolarMutexGuard aGuard;
+ GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup );
+
+ if ( g_action_group_get_action_enabled( G_ACTION_GROUP( pActionGroup ), aCommand ) != bEnable )
+ g_lo_action_group_set_action_enabled( pActionGroup, aCommand, bEnable );
+}
+
-+void GtkSalMenu::SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& rText )
-+{
-+}
-+
+void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText )
+{
-+ // Replace the "~" character with "_".
++ SolarMutexGuard aGuard;
++ // Replace the '~' character with '_'.
+ rtl::OUString aText = rText.replace( '~', '_' );
+ rtl::OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 );
+
@@ -2994,55 +3418,51 @@
+ g_free( aLabel );
+}
+
-+void GtkSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage)
-+{
-+}
-+
-+void GtkSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& rKeyName )
-+{
-+}
-+
+void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName )
+{
++ SolarMutexGuard aGuard;
++
+ if ( rKeyName.isEmpty() )
+ return;
+
-+ rtl::OString aAccelerator = rtl::OUStringToOString( GetGtkKeyName( rKeyName ), RTL_TEXTENCODING_UTF8 );
++ guint nKeyCode;
++ GdkModifierType nModifiers;
+
-+ gchar* aCurrentAccel = g_lo_menu_get_accelerator_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos );
++ KeyCodeToGdkKey( rKeyCode, &nKeyCode, &nModifiers );
+
-+ if ( aCurrentAccel == NULL && g_strcmp0( aCurrentAccel, aAccelerator.getStr() ) != 0 )
-+ g_lo_menu_set_accelerator_to_item_in_section ( G_LO_MENU( mpMenuModel ), nSection, nItemPos, aAccelerator.getStr() );
++ gchar* aAccelerator = gtk_accelerator_name( nKeyCode, nModifiers );
+
-+ if ( aCurrentAccel )
-+ g_free( aCurrentAccel );
-+}
++ gchar* aCurrentAccel = g_lo_menu_get_accelerator_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos );
+
-+void GtkSalMenu::SetItemCommand( unsigned nPos, SalMenuItem* pSalMenuItem, const rtl::OUString& aCommandStr )
-+{
++ if ( aCurrentAccel == NULL && g_strcmp0( aCurrentAccel, aAccelerator ) != 0 )
++ g_lo_menu_set_accelerator_to_item_in_section ( G_LO_MENU( mpMenuModel ), nSection, nItemPos, aAccelerator );
++
++ g_free( aAccelerator );
+}
+
-+void GtkSalMenu::NativeSetItemCommand( unsigned nSection, unsigned nItemPos, GtkSalMenuItem* pItem, const gchar* aCommand )
++void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
++ unsigned nItemPos,
++ sal_uInt16 nId,
++ const gchar* aCommand,
++ MenuItemBits nBits,
++ gboolean bChecked,
++ gboolean bIsSubmenu )
+{
++ SolarMutexGuard aGuard;
+ GLOActionGroup* pActionGroup = G_LO_ACTION_GROUP( mpActionGroup );
+
+ GVariant *pTarget = NULL;
+
+ if ( g_action_group_has_action( mpActionGroup, aCommand ) == FALSE ) {
-+ gboolean bChecked = ( pItem->mpVCLMenu->IsItemChecked( pItem->mnId ) ) ? TRUE : FALSE;
-+
-+ // FIXME: Why pItem->mnBits differs from GetItemBits value?
-+ MenuItemBits bits = pItem->mpVCLMenu->GetItemBits( pItem->mnId );
-+
-+ if ( bits & MIB_CHECKABLE )
++ if ( ( nBits & MIB_CHECKABLE ) || ( bIsSubmenu == TRUE ) )
+ {
+ // Item is a checkmark button.
+ GVariantType* pStateType = g_variant_type_new( (gchar*) G_VARIANT_TYPE_BOOLEAN );
+ GVariant* pState = g_variant_new_boolean( bChecked );
+
-+ g_lo_action_group_insert_stateful( pActionGroup, aCommand, pItem->mnId, NULL, pStateType, NULL, pState );
++ g_lo_action_group_insert_stateful( pActionGroup, aCommand, nId, bIsSubmenu, NULL, pStateType, NULL, pState );
+ }
-+ else if ( bits & MIB_RADIOCHECK )
++ else if ( nBits & MIB_RADIOCHECK )
+ {
+ // Item is a radio button.
+ GVariantType* pParameterType = g_variant_type_new( (gchar*) G_VARIANT_TYPE_STRING );
@@ -3050,12 +3470,12 @@
+ GVariant* pState = g_variant_new_string( "" );
+ pTarget = g_variant_new_string( aCommand );
+
-+ g_lo_action_group_insert_stateful( pActionGroup, aCommand, pItem->mnId, pParameterType, pStateType, NULL, pState );
++ g_lo_action_group_insert_stateful( pActionGroup, aCommand, nId, FALSE, pParameterType, pStateType, NULL, pState );
+ }
+ else
+ {
+ // Item is not special, so insert a stateless action.
-+ g_lo_action_group_insert( pActionGroup, aCommand, pItem->mnId );
++ g_lo_action_group_insert( pActionGroup, aCommand, nId, FALSE );
+ }
+ }
+
@@ -3070,7 +3490,10 @@
+
+ gchar* aItemCommand = g_strconcat("win.", aCommand, NULL );
+
-+ g_lo_menu_set_action_and_target_value_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand, pTarget );
++ if ( bIsSubmenu == TRUE )
++ g_lo_menu_set_submenu_action_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand );
++ else
++ g_lo_menu_set_action_and_target_value_to_item_in_section( pMenu, nSection, nItemPos, aItemCommand, pTarget );
+
+ g_free( aItemCommand );
+ }
@@ -3079,12 +3502,9 @@
+ g_free( aCurrentCommand );
+}
+
-+void GtkSalMenu::GetSystemMenuData( SystemMenuData* pData )
-+{
-+}
-+
-+GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand )
++GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSubmenu )
+{
++ SolarMutexGuard aGuard;
+ GtkSalMenu* pMenu = NULL;
+
+ for ( sal_uInt16 nPos = 0; nPos < maItems.size(); nPos++ )
@@ -3092,18 +3512,17 @@
+ GtkSalMenuItem *pSalItem = maItems[ nPos ];
+
+ String aItemCommand = mpVCLMenu->GetItemCommand( pSalItem->mnId );
-+
+ gchar* aItemCommandStr = (gchar*) rtl::OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr();
+
+ if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 )
+ {
-+ pMenu = this;
++ pMenu = ( bGetSubmenu == TRUE ) ? pSalItem->mpSubMenu : this;
+ break;
+ }
+ else
+ {
+ if ( pSalItem->mpSubMenu != NULL )
-+ pMenu = pSalItem->mpSubMenu->GetMenuForItemCommand( aCommand );
++ pMenu = pSalItem->mpSubMenu->GetMenuForItemCommand( aCommand, bGetSubmenu );
+
+ if ( pMenu != NULL )
+ break;
@@ -3113,6 +3532,118 @@
+ return pMenu;
+}
+
++void GtkSalMenu::DispatchCommand( gint itemId, const gchar *aCommand )
++{
++ SolarMutexGuard aGuard;
++ // Only the menubar is allowed to dispatch commands.
++ if ( mbMenuBar != TRUE )
++ return;
++
++ GtkSalMenu* pSalSubMenu = GetMenuForItemCommand( (gchar*) aCommand, FALSE );
++ Menu* pSubMenu = ( pSalSubMenu != NULL ) ? pSalSubMenu->GetMenu() : NULL;
++
++ MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu );
++
++ pMenuBar->HandleMenuCommandEvent( pSubMenu, itemId );
++}
++
++void GtkSalMenu::Activate( const gchar* aMenuCommand )
++{
++ if ( mbMenuBar != TRUE )
++ return;
++
++ GtkSalMenu* pSalSubMenu = GetMenuForItemCommand( (gchar*) aMenuCommand, TRUE );
++
++ if ( pSalSubMenu != NULL ) {
++ MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu );
++ pMenuBar->HandleMenuActivateEvent( pSalSubMenu->mpVCLMenu );
++ pSalSubMenu->UpdateNativeMenu();
++ }
++}
++
++void GtkSalMenu::Deactivate( const gchar* aMenuCommand )
++{
++ if ( mbMenuBar == sal_False )
++ return;
++
++ GtkSalMenu* pSalSubMenu = GetMenuForItemCommand( (gchar*) aMenuCommand, TRUE );
++
++ if ( pSalSubMenu != NULL ) {
++ MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu );
++ pMenuBar->HandleMenuDeActivateEvent( pSalSubMenu->mpVCLMenu );
++ }
++}
++
++void GtkSalMenu::DisconnectFrame()
++{
++ if( mbMenuBar == sal_True )
++ {
++ mpMenuModel = NULL;
++ mpActionGroup = NULL;
++ mpFrame = NULL;
++ }
++}
++
++void GtkSalMenu::Display( sal_Bool bVisible )
++{
++ if ( mbMenuBar == sal_False || mpVCLMenu == NULL )
++ return;
++
++ bMenuVisibility = bVisible;
++
++ sal_Bool bVCLMenuVisible = ( bVisible == sal_True ) ? sal_False : sal_True;
++
++ MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu );
++ pMenuBar->SetDisplayable( bVCLMenuVisible );
++}
++
++sal_Bool GtkSalMenu::IsItemVisible( unsigned nPos )
++{
++ SolarMutexGuard aGuard;
++ sal_Bool bVisible = sal_False;
++
++ if ( nPos < maItems.size() )
++ bVisible = ( ( GtkSalMenuItem* ) maItems[ nPos ])->mbVisible;
++
++ return bVisible;
++}
++
++void GtkSalMenu::CheckItem( unsigned, sal_Bool )
++{
++}
++
++void GtkSalMenu::EnableItem( unsigned, sal_Bool )
++{
++}
++
++void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow )
++{
++ SolarMutexGuard aGuard;
++ if ( nPos < maItems.size() )
++ ( ( GtkSalMenuItem* ) maItems[ nPos ] )->mbVisible = bShow;
++}
++
++
++void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const rtl::OUString& )
++{
++}
++
++void GtkSalMenu::SetItemImage( unsigned, SalMenuItem*, const Image& )
++{
++}
++
++void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const rtl::OUString& )
++{
++}
++
++void GtkSalMenu::SetItemCommand( unsigned, SalMenuItem*, const rtl::OUString& )
++{
++}
++
++void GtkSalMenu::GetSystemMenuData( SystemMenuData* )
++{
++}
++
+void GtkSalMenu::Freeze()
+{
+}
@@ -3125,8 +3656,8 @@
+
+GtkSalMenuItem::GtkSalMenuItem( const SalItemParams* pItemData ) :
+ mnId( pItemData->nId ),
-+ mnBits( pItemData->nBits ),
+ mnType( pItemData->eType ),
++ mbVisible( sal_True ),
+ mpVCLMenu( pItemData->pMenu ),
+ mpParentMenu( NULL ),
+ mpSubMenu( NULL )
diff -Nru libreoffice-3.6.1~rc2/debian/rules libreoffice-3.6.2~rc2/debian/rules
--- libreoffice-3.6.1~rc2/debian/rules 2012-09-02 09:35:19.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/rules 2012-10-08 12:11:35.000000000 +0000
@@ -69,9 +69,9 @@
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver:=3.6.1.2
+lo_sources_ver:=3.6.2.2
GIT_TAG:=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3.6-1
+GIT_BRANCH=libreoffice-3-6-2
ifneq ($(findstring ~git,$(DEB_VERSION_UPSTREAM)),)
GIT_TAG=master
endif
@@ -391,7 +391,7 @@
PACKAGE_UNOWINREG_DLL=n
endif
-OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out armel armhf, $(OOO_ARCHS))
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
@@ -2680,17 +2680,19 @@
endif
ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
+ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
mkdir -p $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
$(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
- endif
+ endif
- ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
mkdir -p $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \
$(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
- endif
+ endif
+ endif
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
diff -Nru libreoffice-3.6.1~rc2/debian/scripts/update-unitymenus libreoffice-3.6.2~rc2/debian/scripts/update-unitymenus
--- libreoffice-3.6.1~rc2/debian/scripts/update-unitymenus 2012-09-01 03:18:30.000000000 +0000
+++ libreoffice-3.6.2~rc2/debian/scripts/update-unitymenus 2012-10-08 12:11:35.000000000 +0000
@@ -1,12 +1,13 @@
#!/bin/bash
CURDIR=`readlink -f .`
TMPDIR=`mktemp -d`
+BRANCH=feature/unitymenus-quantal
git clone $1 $TMPDIR/core
cd $TMPDIR/core
-git checkout feature/unitymenus
+git checkout $BRANCH
git rebase $2
-git log -1 feature/unitymenus > $CURDIR/patches/unitymenus.diff
-git diff --stat $2 feature/unitymenus >> $CURDIR/patches/unitymenus.diff
-git diff $2 feature/unitymenus >> $CURDIR/patches/unitymenus.diff
+git log -1 $BRANCH > $CURDIR/patches/unitymenus.diff
+git diff --stat $2 $BRANCH >> $CURDIR/patches/unitymenus.diff
+git diff $2 $BRANCH >> $CURDIR/patches/unitymenus.diff
cd $CURDIR
rm -rf $TMPDIR
diff -Nru libreoffice-3.6.1~rc2/desktop/inc/app.hxx libreoffice-3.6.2~rc2/desktop/inc/app.hxx
--- libreoffice-3.6.1~rc2/desktop/inc/app.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/inc/app.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -203,6 +203,7 @@
sal_Bool m_bMinimized;
sal_Bool m_bInvisible;
+ bool m_bCleanedExtensionCache;
bool m_bServicesRegistered;
sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
diff -Nru libreoffice-3.6.1~rc2/desktop/source/app/app.cxx libreoffice-3.6.2~rc2/desktop/source/app/app.cxx
--- libreoffice-3.6.1~rc2/desktop/source/app/app.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/app/app.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -147,70 +147,81 @@
void removeTree(OUString const & url) {
osl::Directory dir(url);
- switch (dir.open()) {
+ osl::FileBase::RC rc = dir.open();
+ switch (rc) {
case osl::FileBase::E_None:
break;
case osl::FileBase::E_NOENT:
return; //TODO: SAL_WARN if recursive
default:
- throw css::uno::RuntimeException(
- "cannot open directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc);
+ return;
}
for (;;) {
osl::DirectoryItem i;
- osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
+ rc = dir.getNextItem(i, SAL_MAX_UINT32);
if (rc == osl::FileBase::E_NOENT) {
break;
}
if (rc != osl::FileBase::E_None) {
- throw css::uno::RuntimeException(
- "cannot iterate directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ SAL_WARN(
+ "desktop","cannot iterate directory " << url << ": " << +rc);
+ break;
}
osl::FileStatus stat(
osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL);
- if (i.getFileStatus(stat) != osl::FileBase::E_None) {
- throw css::uno::RuntimeException(
- "cannot stat in directory " + url,
- css::uno::Reference< css::uno::XInterface >());
+ rc = i.getFileStatus(stat);
+ if (rc != osl::FileBase::E_None) {
+ SAL_WARN(
+ "desktop", "cannot stat in directory " << url << ": " << +rc);
+ continue;
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
removeTree(stat.getFileURL());
} else {
- if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) {
- throw css::uno::RuntimeException(
- "cannot remove file " + stat.getFileURL(),
- css::uno::Reference< css::uno::XInterface >());
- }
- }
- }
- if (osl::Directory::remove(url) != osl::FileBase::E_None) {
- throw css::uno::RuntimeException(
- "cannot remove directory " + url,
- css::uno::Reference< css::uno::XInterface >());
- }
-}
-
-// Remove any existing UserInstallation's user/extensions/bundled cache
-// remaining from old installations. Apparently due to the old
-// share/prereg/bundled mechanism (disabled since
-// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
-// share/prereg/bundled to avoid startup crashes"), that cache could contain
-// corrupted information (like a UNO component registered twice, which got
-// changed from active to passive registration in one LO version, but the
-// version of the corresponding bundled extension only incremented in a later LO
-// version). At least in theory, this function could be removed again once no
-// UserInstallation can be poisoned by that old share/prereg/bundled mechanism
-// any more. (But then Desktop::SynchronizeExtensionRepositories might need to
-// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force
-// ExtensionManager resync when the implementation changes" which effectively
-// got reverted again now. Now, a mismatch between a UserInstallation's
-// user/extensions/bundled and an installation's share/extensions will always be
-// detected here and lead to a removal of user/extensions/bundled, so that
-// Desktop::SynchronizeExtensionRepositories will then definitely resync
-// share/extensions.)
+ rc = osl::File::remove(stat.getFileURL());
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None, "desktop",
+ "cannot remove file " << stat.getFileURL() << ": " << +rc);
+ }
+ }
+ if (dir.isOpen()) {
+ rc = dir.close();
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None, "desktop",
+ "cannot close directory " << url << ": " << +rc);
+ }
+ rc = osl::Directory::remove(url);
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None, "desktop",
+ "cannot remove directory " << url << ": " << +rc);
+}
+
+// Remove any existing UserInstallation's extensions cache data remaining from
+// old installations. This addresses at least two problems:
+//
+// For one, apparently due to the old share/prereg/bundled mechanism (disabled
+// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
+// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled
+// cache could contain corrupted information (like a UNO component registered
+// twice, which got changed from active to passive registration in one LO
+// version, but the version of the corresponding bundled extension only
+// incremented in a later LO version).
+//
+// For another, UserInstallations have been seen in the wild where no extensions
+// were installed per-user (any longer), but user/uno_packages/cache/registry/
+// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
+// contained data nevertheless.
+//
+// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or
+// one containing an old build ID), then user/extensions/bundled,
+// user/extensions/shared, and user/uno_packages/cache/registry/
+// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are
+// removed. That should prevent any problems starting the service manager due
+// to old junk. Later on in Desktop::SynchronizeExtensionRepositories, the
+// removed cache data is recreated.
+//
// As a special case, if you create a UserInstallation with LO >= 3.6.1, then
// run an old LO <= 3.5.x using share/prereg/bundled on the same
// UserInstallation (so that it partially overwrites user/extensions/bundled,
@@ -223,33 +234,50 @@
// <= 3.5.x messed with user/extensions/bundled in the meantime, then it would
// have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect
// that.
-void refreshBundledExtensionsDir() {
+//
+// Multiple instances of soffice.bin can execute this code in parallel for a
+// single UserInstallation, as it is called before OfficeIPCThread is set up.
+// Therefore, any errors here only lead to SAL_WARNs.
+//
+// At least in theory, this function could be removed again once no
+// UserInstallation can be poisoned by old junk any more.
+bool cleanExtensionCache() {
OUString buildId(
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}");
rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure
- OUString dir("$BUNDLED_EXTENSIONS_USER");
- rtl::Bootstrap::expandMacros(dir); //TODO: detect failure
- OUString url(dir + "/buildid");
- OUString nonPrereg(
- "${$BUNDLED_EXTENSIONS_USER/registry/"
- "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:"
- "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}");
- rtl::Bootstrap::expandMacros(nonPrereg);
- if (nonPrereg == "TRUE") {
- osl::File f(url);
- switch (f.open(osl_File_OpenFlag_Read)) {
+ OUString extDir(
+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
+ ":UserInstallation}/user/extensions");
+ rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure
+ OUString bundledDir = extDir + "/bundled";
+ OUString buildIdFile(bundledDir + "/buildid");
+ OUString bundledRcFile(
+ "$BUNDLED_EXTENSIONS_USER/registry/"
+ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
+ rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure
+ rtl::Bootstrap bundledRc(bundledRcFile);
+ OUString nonPrereg;
+ if (bundledRc.getHandle() == 0
+ || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg)
+ && nonPrereg == "TRUE"))
+ {
+ osl::File f(buildIdFile);
+ osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read);
+ switch (rc) {
case osl::FileBase::E_None:
{
rtl::ByteSequence s1;
- osl::FileBase::RC rc = f.readLine(s1);
- if (f.close() != osl::FileBase::E_None) {
- SAL_WARN(
- "desktop", "cannot close " + url + " after reading");
- }
+ rc = f.readLine(s1);
+ osl::FileBase::RC rc2 = f.close();
+ SAL_WARN_IF(
+ rc2 != osl::FileBase::E_None, "desktop",
+ "cannot close " << buildIdFile << " after reading: "
+ << +rc2);
if (rc != osl::FileBase::E_None) {
- throw css::uno::RuntimeException(
- "cannot read from " + url,
- css::uno::Reference< css::uno::XInterface >());
+ SAL_WARN(
+ "desktop",
+ "cannot read from " << buildIdFile << ": " << +rc);
+ break;
}
OUString s2(
reinterpret_cast< char const * >(s1.getConstArray()),
@@ -257,53 +285,56 @@
// using ISO 8859-1 avoids any and all conversion errors;
// the content should only be a subset of ASCII, anyway
if (s2 == buildId) {
- return;
+ return false;
}
break;
}
case osl::FileBase::E_NOENT:
break;
default:
- throw css::uno::RuntimeException(
- "cannot open " + url + " for reading",
- css::uno::Reference< css::uno::XInterface >());
+ SAL_WARN(
+ "desktop",
+ "cannot open " << buildIdFile << " for reading: " << +rc);
+ break;
}
}
- removeTree(dir);
- switch (osl::Directory::createPath(dir)) {
- case osl::FileBase::E_None:
- case osl::FileBase::E_EXIST:
- break;
- default:
- throw css::uno::RuntimeException(
- "cannot create path " + dir,
- css::uno::Reference< css::uno::XInterface >());
- }
- osl::File f(url);
- if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) !=
- osl::FileBase::E_None)
- {
- throw css::uno::RuntimeException(
- "cannot open " + url + " for writing",
- css::uno::Reference< css::uno::XInterface >());
+ removeTree(extDir);
+ OUString userRcFile(
+ "$UNO_USER_PACKAGES_CACHE/registry/"
+ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
+ rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure
+ osl::FileBase::RC rc = osl::File::remove(userRcFile);
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop",
+ "cannot remove file " << userRcFile << ": " << +rc);
+ rc = osl::Directory::createPath(bundledDir);
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop",
+ "cannot create path " << bundledDir << ": " << +rc);
+ osl::File f(buildIdFile);
+ rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
+ if (rc != osl::FileBase::E_None) {
+ SAL_WARN(
+ "desktop",
+ "cannot open " << buildIdFile << " for writing: " << +rc);
+ return true;
}
rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8));
// using UTF-8 avoids almost all conversion errors (and buildid
// containing single surrogate halves should never happen, anyway); the
// content should only be a subset of ASCII, anyway
- sal_uInt64 n;
- if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None
- || n != static_cast< sal_uInt32 >(buf.getLength()))
- {
- throw css::uno::RuntimeException(
- "cannot write to " + url,
- css::uno::Reference< css::uno::XInterface >());
- }
- if (f.close() != osl::FileBase::E_None) {
- throw css::uno::RuntimeException(
- "cannot close " + url + " after writing",
- css::uno::Reference< css::uno::XInterface >());
- }
+ sal_uInt64 n = 0;
+ rc = f.write(buf.getStr(), buf.getLength(), n);
+ SAL_WARN_IF(
+ (rc != osl::FileBase::E_None
+ || n != static_cast< sal_uInt32 >(buf.getLength())),
+ "desktop",
+ "cannot write to " << buildIdFile << ": " << +rc << ", " << n);
+ rc = f.close();
+ SAL_WARN_IF(
+ rc != osl::FileBase::E_None, "desktop",
+ "cannot close " << buildIdFile << " after writing: " << +rc);
+ return true;
}
}
@@ -531,7 +562,8 @@
}
Desktop::Desktop()
-: m_bServicesRegistered( false )
+: m_bCleanedExtensionCache( false )
+, m_bServicesRegistered( false )
, m_aBootstrapError( BE_OK )
{
RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" );
@@ -546,7 +578,7 @@
RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
SetBootstrapStatus(BS_OK);
- refreshBundledExtensionsDir();
+ m_bCleanedExtensionCache = cleanExtensionCache();
// We need to have service factory before going further, but see fdo#37195.
// Doing this will mmap common.rdb, making it not overwritable on windows,
diff -Nru libreoffice-3.6.1~rc2/desktop/source/app/check_ext_deps.cxx libreoffice-3.6.2~rc2/desktop/source/app/check_ext_deps.cxx
--- libreoffice-3.6.1~rc2/desktop/source/app/check_ext_deps.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/app/check_ext_deps.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -51,6 +51,7 @@
#include "com/sun/star/deployment/ExtensionManager.hpp"
#include "com/sun/star/deployment/LicenseException.hpp"
#include "com/sun/star/deployment/ui/LicenseDialog.hpp"
+#include
#include
#include
#include
@@ -77,12 +78,15 @@
task::XInteractionHandler,
ucb::XProgressHandler >
{
+ uno::Reference mxContext;
Desktop *mpDesktop;
sal_Int32 mnLevel;
sal_Int32 mnProgress;
public:
- SilentCommandEnv( Desktop* pDesktop );
+ SilentCommandEnv(
+ uno::Reference const & xContext,
+ Desktop* pDesktop );
virtual ~SilentCommandEnv();
// XCommandEnvironment
@@ -105,12 +109,14 @@
};
//-----------------------------------------------------------------------------
-SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop )
-{
- mpDesktop = pDesktop;
- mnLevel = 0;
- mnProgress = 25;
-}
+SilentCommandEnv::SilentCommandEnv(
+ uno::Reference const & xContext,
+ Desktop* pDesktop ):
+ mxContext( xContext ),
+ mpDesktop( pDesktop ),
+ mnLevel( 0 ),
+ mnProgress( 25 )
+{}
//-----------------------------------------------------------------------------
SilentCommandEnv::~SilentCommandEnv()
@@ -144,10 +150,9 @@
if ( request >>= licExc )
{
- uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext();
uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
deployment::ui::LicenseDialog::create(
- xContext, VCLUnoHelper::GetInterface( NULL ),
+ mxContext, VCLUnoHelper::GetInterface( NULL ),
licExc.ExtensionName, licExc.Text ) );
sal_Int16 res = xDialog->execute();
if ( res == ui::dialogs::ExecutableDialogResults::CANCEL )
@@ -416,7 +421,20 @@
void Desktop::SynchronizeExtensionRepositories()
{
RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories");
- dp_misc::syncRepositories( new SilentCommandEnv( this ) );
+ uno::Reference< uno::XComponentContext > context(
+ comphelper_getProcessComponentContext());
+ uno::Reference< ucb::XCommandEnvironment > silent(
+ new SilentCommandEnv(context, this));
+ if (m_bCleanedExtensionCache) {
+ deployment::ExtensionManager::get(context)->reinstallDeployedExtensions(
+ true, "user", Reference(), silent);
+ task::OfficeRestartManager::get(context)->requestRestart(
+ silent->getInteractionHandler());
+ } else {
+ // reinstallDeployedExtensions above already calls syncRepositories
+ // internally:
+ dp_misc::syncRepositories(m_bCleanedExtensionCache, silent);
+ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff -Nru libreoffice-3.6.1~rc2/desktop/source/app/sofficemain.cxx libreoffice-3.6.2~rc2/desktop/source/app/sofficemain.cxx
--- libreoffice-3.6.1~rc2/desktop/source/app/sofficemain.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/app/sofficemain.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -69,11 +69,13 @@
const desktop::CommandLineArgs& rCmdLineArgs = aDesktop.GetCommandLineArgs();
if ( rCmdLineArgs.IsHelp() )
{
+ desktop::Desktop::ensureProcessServiceFactory();
desktop::displayCmdlineHelp();
return EXIT_SUCCESS;
}
else if ( rCmdLineArgs.IsVersion() )
{
+ desktop::Desktop::ensureProcessServiceFactory();
desktop::displayVersion();
return EXIT_SUCCESS;
}
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx libreoffice-3.6.2~rc2/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
--- libreoffice-3.6.1~rc2/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1124,7 +1124,7 @@
void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext )
{
- dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
+ dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
}
void ExtensionCmdQueue::stop()
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/inc/dp_misc.h libreoffice-3.6.2~rc2/desktop/source/deployment/inc/dp_misc.h
--- libreoffice-3.6.1~rc2/desktop/source/deployment/inc/dp_misc.h 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/inc/dp_misc.h 2012-09-25 12:13:30.000000000 +0000
@@ -154,8 +154,10 @@
recently added or removed.
*/
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-void syncRepositories(::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
+void syncRepositories(
+ bool force,
+ ::com::sun::star::uno::Reference<
+ ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
}
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_extensionmanager.cxx libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_extensionmanager.cxx
--- libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_extensionmanager.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_extensionmanager.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1205,9 +1205,10 @@
}
}
-//only to be called from unopkg!!!
+// Only to be called from unopkg or soffice bootstrap (with force=true in the
+// latter case):
void ExtensionManager::reinstallDeployedExtensions(
- OUString const & repository,
+ sal_Bool force, OUString const & repository,
Reference const & xAbortChannel,
Reference const & xCmdEnv )
throw (deploy::DeploymentException,
@@ -1220,10 +1221,11 @@
xPackageManager = getPackageManager(repository);
::osl::MutexGuard guard(getMutex());
- xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv);
+ xPackageManager->reinstallDeployedPackages(
+ force, xAbortChannel, xCmdEnv);
//We must sync here, otherwise we will get exceptions when extensions
//are removed.
- dp_misc::syncRepositories(xCmdEnv);
+ dp_misc::syncRepositories(force, xCmdEnv);
const uno::Sequence< Reference > extensions(
xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv));
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_extensionmanager.hxx libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_extensionmanager.hxx
--- libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_extensionmanager.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_extensionmanager.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -182,7 +182,7 @@
css::uno::RuntimeException);
virtual void SAL_CALL reinstallDeployedExtensions(
- ::rtl::OUString const & repository,
+ sal_Bool force, ::rtl::OUString const & repository,
css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
throw (
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_manager.cxx libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_manager.cxx
--- libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_manager.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_manager.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1164,14 +1164,14 @@
//ToDo: the function must not call registerPackage, do this in
//XExtensionManager.reinstallDeployedExtensions
void PackageManagerImpl::reinstallDeployedPackages(
- Reference const & /*xAbortChannel*/,
+ sal_Bool force, Reference const & /*xAbortChannel*/,
Reference const & xCmdEnv_ )
throw (deployment::DeploymentException,
CommandFailedException, CommandAbortedException,
lang::IllegalArgumentException, RuntimeException)
{
check();
- if (office_is_running())
+ if (!force && office_is_running())
throw RuntimeException(
OUSTR("You must close any running Office process before "
"reinstalling packages!"), static_cast(this) );
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_manager.h libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_manager.h
--- libreoffice-3.6.1~rc2/desktop/source/deployment/manager/dp_manager.h 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/manager/dp_manager.h 2012-09-25 12:13:30.000000000 +0000
@@ -236,6 +236,7 @@
css::uno::RuntimeException);
virtual void SAL_CALL reinstallDeployedPackages(
+ sal_Bool force,
css::uno::Reference const & xAbortChannel,
css::uno::Reference const & xCmdEnv )
throw (css::deployment::DeploymentException,
diff -Nru libreoffice-3.6.1~rc2/desktop/source/deployment/misc/dp_misc.cxx libreoffice-3.6.2~rc2/desktop/source/deployment/misc/dp_misc.cxx
--- libreoffice-3.6.1~rc2/desktop/source/deployment/misc/dp_misc.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/deployment/misc/dp_misc.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -591,7 +591,7 @@
}
void syncRepositories(
- Reference const & xCmdEnv)
+ bool force, Reference const & xCmdEnv)
{
OUString sDisable;
::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() );
@@ -602,7 +602,8 @@
//synchronize shared before bundled otherewise there are
//more revoke and registration calls.
sal_Bool bModified = false;
- if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
+ if (force
+ || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
|| needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
{
xExtensionManager =
diff -Nru libreoffice-3.6.1~rc2/desktop/source/pkgchk/unopkg/unopkg_app.cxx libreoffice-3.6.2~rc2/desktop/source/pkgchk/unopkg/unopkg_app.cxx
--- libreoffice-3.6.1~rc2/desktop/source/pkgchk/unopkg/unopkg_app.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/source/pkgchk/unopkg/unopkg_app.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -392,7 +392,7 @@
//synching is done in XExtensionManager.reinstall
if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall"))
&& ! dp_misc::office_is_running())
- dp_misc::syncRepositories(xCmdEnv);
+ dp_misc::syncRepositories(false, xCmdEnv);
if ( subcmd_add || subCommand == "remove" )
{
@@ -436,7 +436,7 @@
RTL_CONSTASCII_STRINGPARAM("reinstall") ))
{
xExtensionManager->reinstallDeployedExtensions(
- repository, Reference(), xCmdEnv);
+ false, repository, Reference(), xCmdEnv);
}
else if ( subCommand == "list" )
{
diff -Nru libreoffice-3.6.1~rc2/desktop/unx/source/start.c libreoffice-3.6.2~rc2/desktop/unx/source/start.c
--- libreoffice-3.6.1~rc2/desktop/unx/source/start.c 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/desktop/unx/source/start.c 2012-09-25 12:13:30.000000000 +0000
@@ -512,6 +512,17 @@
nLen = rtl_string_getLength( pOut ) + 1;
bResult = ( write( fd, rtl_string_getStr( pOut ), nLen ) == (ssize_t) nLen );
+ if ( bResult )
+ {
+ char resp[ strlen( "InternalIPC::ProcessingDone" ) ];
+ ssize_t n = read( fd, resp, SAL_N_ELEMENTS( resp ) );
+ bResult = n == (ssize_t) SAL_N_ELEMENTS( resp )
+ && (memcmp(
+ resp, "InternalIPC::ProcessingDone",
+ SAL_N_ELEMENTS( resp ) )
+ == 0);
+ }
+
/* cleanup */
rtl_uString_release( pEscapedCwdPath );
rtl_uString_release( pBuffer );
diff -Nru libreoffice-3.6.1~rc2/dictionaries/en/Lightproof.py libreoffice-3.6.2~rc2/dictionaries/en/Lightproof.py
--- libreoffice-3.6.1~rc2/dictionaries/en/Lightproof.py 2012-08-21 14:44:33.000000000 +0000
+++ libreoffice-3.6.2~rc2/dictionaries/en/Lightproof.py 2012-09-25 12:13:31.000000000 +0000
@@ -393,7 +393,7 @@
"utilitarian", "utilitarianism", "utilities", "utility", "utilizable",
"utilization", "utilize", "utilized", "utilizes", "utilizing", "utopia",
"utopian", "utopians", "utopias", "Utrecht", "Uttoxeter", "uvula",
-"uvular"])
+"uvular", "usability"])
aAN = set(["f", "F", "FBI", "FDA", "heir", "heirdom", "heired",
"heirer", "heiress", "heiring", "heirloom", "heirship", "honest",
@@ -407,7 +407,7 @@
"R", "s", "S", "SMS", "sos", "SOS", "SPF", "std", "STD", "SUV", "x",
"X", "XML"])
-aB = set(["H", "hallucination", "haute", "hauteur", "herb", "herbaceous", "herbal",
+aB = set(["H", "habitual", "hallucination", "haute", "hauteur", "herb", "herbaceous", "herbal",
"herbalist", "herbalism", "heroic", "hilarious", "historian", "historic", "historical",
"homage", "homophone", "horrendous", "hospitable", "horrific", "hotel", "hypothesis", "Xmas"])
diff -Nru libreoffice-3.6.1~rc2/dictionaries/ru_RU/README_ru_RU.txt libreoffice-3.6.2~rc2/dictionaries/ru_RU/README_ru_RU.txt
--- libreoffice-3.6.1~rc2/dictionaries/ru_RU/README_ru_RU.txt 2012-08-21 14:44:33.000000000 +0000
+++ libreoffice-3.6.2~rc2/dictionaries/ru_RU/README_ru_RU.txt 2012-09-25 12:13:31.000000000 +0000
@@ -1,5 +1,15 @@
* Copyright (c) 1997-2008, Alexander I. Lebedev
+Modifications:
+------------------------------------------------------------------
+2012-08-24: Laszlo Nemeth (nemeth at numbertext org)
+* ru_RU.aff: add TRY line for better suggestions
+ (fix fdo#35001, reported by sasha.libreoffice at gmail)
+
+Copyright:
+------------------------------------------------------------------
+* Copyright (c) 1997-2008, Alexander I. Lebedev
+
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -Nru libreoffice-3.6.1~rc2/dictionaries/ru_RU/ru_RU.aff libreoffice-3.6.2~rc2/dictionaries/ru_RU/ru_RU.aff
--- libreoffice-3.6.1~rc2/dictionaries/ru_RU/ru_RU.aff 2012-08-21 14:44:33.000000000 +0000
+++ libreoffice-3.6.2~rc2/dictionaries/ru_RU/ru_RU.aff 2012-09-25 12:13:31.000000000 +0000
@@ -1,4 +1,5 @@
SET KOI8-R
+TRY
SFX Z Y 4
SFX Z []
diff -Nru libreoffice-3.6.1~rc2/distro-configs/LibreOfficeLinux.conf libreoffice-3.6.2~rc2/distro-configs/LibreOfficeLinux.conf
--- libreoffice-3.6.1~rc2/distro-configs/LibreOfficeLinux.conf 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/distro-configs/LibreOfficeLinux.conf 2012-09-25 12:13:30.000000000 +0000
@@ -27,6 +27,7 @@
--enable-lockdown
--enable-kde
--enable-gstreamer
+--enable-evolution2
--enable-gnome-vfs
--enable-ext-wiki-publisher
--enable-ext-report-builder
diff -Nru libreoffice-3.6.1~rc2/extensions/source/propctrlr/formcomponenthandler.cxx libreoffice-3.6.2~rc2/extensions/source/propctrlr/formcomponenthandler.cxx
--- libreoffice-3.6.1~rc2/extensions/source/propctrlr/formcomponenthandler.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/extensions/source/propctrlr/formcomponenthandler.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -2788,7 +2788,7 @@
// non-linked images ( e.g. those located in the document
// stream ) only if document is available
Reference< XModel > xModel( impl_getContextDocument_nothrow() );
- bool bHandleNonLink = xModel.is();
+ bool bHandleNonLink = false;
Reference< XFilePickerControlAccess > xController(aFileDlg.GetFilePicker(), UNO_QUERY);
DBG_ASSERT(xController.is(), "FormComponentPropertyHandler::impl_browseForImage_nothrow: missing the controller interface on the file picker!");
diff -Nru libreoffice-3.6.1~rc2/extensions/source/update/check/org/openoffice/Office/Jobs.xcu libreoffice-3.6.2~rc2/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
--- libreoffice-3.6.1~rc2/extensions/source/update/check/org/openoffice/Office/Jobs.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/extensions/source/update/check/org/openoffice/Office/Jobs.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -31,7 +31,7 @@
-
+
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/cache/constant.hxx libreoffice-3.6.2~rc2/filter/source/config/cache/constant.hxx
--- libreoffice-3.6.1~rc2/filter/source/config/cache/constant.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/cache/constant.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -69,6 +69,7 @@
#define PROPNAME_USERDATA "UserData"
#define PROPNAME_TEMPLATENAME "TemplateName"
#define PROPNAME_FILEFORMATVERSION "FileFormatVersion"
+#define PROPNAME_EXPORTEXTENSION "ExportExtension"
/** @short used to identify a frame loader or detect service item
property against the configuration API and can be used
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/cache/filtercache.cxx libreoffice-3.6.2~rc2/filter/source/config/cache/filtercache.cxx
--- libreoffice-3.6.1~rc2/filter/source/config/cache/filtercache.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/cache/filtercache.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1825,6 +1825,7 @@
aItem[PROPNAME_UICOMPONENT ] = xItem->getByName(PROPNAME_UICOMPONENT );
aItem[PROPNAME_FILTERSERVICE ] = xItem->getByName(PROPNAME_FILTERSERVICE );
aItem[PROPNAME_DOCUMENTSERVICE ] = xItem->getByName(PROPNAME_DOCUMENTSERVICE );
+ aItem[PROPNAME_EXPORTEXTENSION ] = xItem->getByName(PROPNAME_EXPORTEXTENSION );
// special handling for flags! Convert it from a list of names to its
// int representation ...
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text.xcu libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text.xcu
--- libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -4,6 +4,7 @@
TEXT
0
+ txt
generic_Text
com.sun.star.text.TextDocument
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu
--- libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__StarWriter_Web_.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -4,6 +4,7 @@
TEXT
0
+ txt
generic_Text
com.sun.star.text.WebDocument
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu
--- libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text___txt___csv__StarCalc_.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -4,6 +4,7 @@
0
+ csv
generic_Text
com.sun.star.sheet.SpreadsheetDocument
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__encoded_.xcu libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__encoded_.xcu
--- libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__encoded_.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__encoded_.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -4,6 +4,7 @@
TEXT_DLG
0
+ txt
generic_Text
com.sun.star.text.TextDocument
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu
--- libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument_.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -4,6 +4,7 @@
TEXT_DLG
0
+ txt
generic_Text
com.sun.star.text.GlobalDocument
diff -Nru libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu
--- libreoffice-3.6.1~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web_.xcu 2012-09-25 12:13:30.000000000 +0000
@@ -4,6 +4,7 @@
TEXT_DLG
0
+ txt
generic_Text
com.sun.star.text.WebDocument
diff -Nru libreoffice-3.6.1~rc2/fpicker/source/generic/fpicker.cxx libreoffice-3.6.2~rc2/fpicker/source/generic/fpicker.cxx
--- libreoffice-3.6.1~rc2/fpicker/source/generic/fpicker.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/fpicker/source/generic/fpicker.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -57,7 +57,9 @@
{
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+ return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFilePicker"));
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFilePicker"));
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDE4FilePicker"));
@@ -138,7 +140,9 @@
{
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
#ifdef UNX
- if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
+ if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("tde")))
+ return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.TDEFolderPicker"));
+ else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.KDEFolderPicker"));
else if (aDesktopEnvironment.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("macosx")))
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.AquaFolderPicker"));
diff -Nru libreoffice-3.6.1~rc2/fpicker/source/office/OfficeFilePicker.cxx libreoffice-3.6.2~rc2/fpicker/source/office/OfficeFilePicker.cxx
--- libreoffice-3.6.1~rc2/fpicker/source/office/OfficeFilePicker.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/fpicker/source/office/OfficeFilePicker.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -632,7 +632,7 @@
for(size_t i = 0; i < aPathList.size(); ++i)
{
aObj.SetURL(aPathList[i]);
- aPath[i] = aObj.getName();
+ aPath[i + 1] = aObj.getName();
}
}
diff -Nru libreoffice-3.6.1~rc2/framework/source/uielement/menubarmanager.cxx libreoffice-3.6.2~rc2/framework/source/uielement/menubarmanager.cxx
--- libreoffice-3.6.1~rc2/framework/source/uielement/menubarmanager.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/framework/source/uielement/menubarmanager.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -57,6 +57,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -76,6 +77,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -518,7 +521,9 @@
#ifdef UNIX
//enable some slots hardly, because UNIX clipboard does not notify all changes
// Can be removed if follow up task will be fixed directly within applications.
- if ( pMenuItemHandler->aMenuItemURL == ".uno:Paste" || pMenuItemHandler->aMenuItemURL == ".uno:PasteSpecial"
+ // Note: PasteSpecial is handled specifically by calc
+ if ( pMenuItemHandler->aMenuItemURL == ".uno:Paste" ||
+ ( m_aModuleIdentifier != "com.sun.star.sheet.SpreadsheetDocument" && pMenuItemHandler->aMenuItemURL == ".uno:PasteSpecial" )
|| pMenuItemHandler->aMenuItemURL == ".uno:PasteClipboard" ) // special for draw/impress
bEnabledItem = sal_True;
#endif
@@ -813,11 +818,45 @@
// vcl handler
//_________________________________________________________________________________________________________________
+namespace {
+
+class QuietInteractionContext:
+ public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >,
+ private boost::noncopyable
+{
+public:
+ QuietInteractionContext(
+ com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext >
+ const & context):
+ context_(context) {}
+
+private:
+ virtual ~QuietInteractionContext() {}
+
+ virtual com::sun::star::uno::Any SAL_CALL getValueByName(
+ rtl::OUString const & Name)
+ throw (com::sun::star::uno::RuntimeException)
+ {
+ return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is()
+ ? context_->getValueByName(Name)
+ : com::sun::star::uno::Any();
+ }
+
+ com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext >
+ context_;
+};
+
+}
+
IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::Activate" );
if ( pMenu == m_pVCLMenu )
{
+ com::sun::star::uno::ContextLayer layer(
+ new QuietInteractionContext(
+ com::sun::star::uno::getCurrentContext()));
+
// set/unset hiding disabled menu entries
sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
diff -Nru libreoffice-3.6.1~rc2/g libreoffice-3.6.2~rc2/g
--- libreoffice-3.6.1~rc2/g 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/g 2012-09-25 12:13:30.000000000 +0000
@@ -251,7 +251,7 @@
if [ -d "$DIR" -a "z$PUSH_USER" != "z" ]; then
echo "setting up push url for $DIR"
- (cd $DIR && git config remote.origin.pushurl "ssh://${PUSH_USER}@gerrit.libreoffice.org:29418/${REPO}")
+ (cd $DIR && git config remote.origin.pushurl "ssh://${PUSH_USER}@git.freedesktop.org/git/libreoffice/${REPO}")
elif [ -d "$DIR" -a "z$LAST_WORKING" != "z" ]; then
echo "fetching notes for $REPO ..."
(cd $DIR && git fetch origin 'refs/notes/*:refs/notes/*')
diff -Nru libreoffice-3.6.1~rc2/i18npool/source/localedata/data/hr_HR.xml libreoffice-3.6.2~rc2/i18npool/source/localedata/data/hr_HR.xml
--- libreoffice-3.6.1~rc2/i18npool/source/localedata/data/hr_HR.xml 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/i18npool/source/localedata/data/hr_HR.xml 2012-09-25 12:13:30.000000000 +0000
@@ -35,6 +35,7 @@
Metric
+ D.M
MM.YY
diff -Nru libreoffice-3.6.1~rc2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx libreoffice-3.6.2~rc2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
--- libreoffice-3.6.1~rc2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include
#include
#include
#include "ordinalsuffix.hxx"
@@ -53,6 +54,23 @@
{
}
+namespace
+{
+ OUString mungeUnicodeStringToOUString(const icu::UnicodeString &rIn, UErrorCode &rCode)
+ {
+ // Apply NFKC normalization to get normal letters
+ icu::UnicodeString normalized;
+ icu::Normalizer::normalize(rIn, UNORM_NFKC, 0, normalized, rCode);
+ // Convert the normalized UnicodeString to OUString
+ OUString sRet = (U_SUCCESS(rCode))
+ ? OUString(reinterpret_cast(normalized.getBuffer()), normalized.length())
+ : OUString();
+ // replace any minus signs with hyphen-minus so that negative numbers
+ // from the simple number formatter and heavy-duty pattern formatter
+ // agree as to their negative number sign
+ return sRet.replace(0x2212, '-');
+ }
+}
/*
* For this method to properly return the ordinal suffix for other locales
@@ -69,46 +87,64 @@
CSTR( aLocale.Language ),
CSTR( aLocale.Country ),
CSTR( aLocale.Variant ) );
- icu::RuleBasedNumberFormat formatter(
- icu::URBNF_ORDINAL, rIcuLocale, nCode );
- if ( U_SUCCESS( nCode ) )
+ icu::RuleBasedNumberFormat formatter(icu::URBNF_ORDINAL, rIcuLocale, nCode);
+ if (!U_SUCCESS(nCode))
+ return retValue;
+
+ boost::scoped_ptr xNumberFormat(icu::NumberFormat::createInstance(rIcuLocale, nCode));
+ if (!U_SUCCESS(nCode))
+ return retValue;
+
+ icu::UnicodeString sFormatWithNoOrdinal;
+ xNumberFormat->format((int32_t)nNumber, sFormatWithNoOrdinal, NULL, nCode);
+ if (!U_SUCCESS(nCode))
+ return retValue;
+
+ OUString sValueWithNoOrdinal = mungeUnicodeStringToOUString(sFormatWithNoOrdinal, nCode);
+ if (!U_SUCCESS(nCode))
+ return retValue;
+
+ int32_t nRuleSets = formatter.getNumberOfRuleSetNames( );
+ for (int32_t i = 0; i < nRuleSets; ++i)
{
- int32_t nRuleSets = formatter.getNumberOfRuleSetNames( );
- for ( int32_t i = 0; i < nRuleSets; i++ )
- {
- icu::UnicodeString ruleSet = formatter.getRuleSetName( i );
- // format the string
- icu::UnicodeString icuRet;
- icu::FieldPosition icuPos;
- formatter.format( (int32_t)nNumber, ruleSet, icuRet, icuPos, nCode );
-
- if ( U_SUCCESS( nCode ) )
- {
- // Apply NFKC normalization to get normal letters
- icu::UnicodeString normalized;
- nCode = U_ZERO_ERROR;
- icu::Normalizer::normalize( icuRet, UNORM_NFKC, 0, normalized, nCode );
- if ( U_SUCCESS( nCode ) && ( normalized != icuRet ) )
- {
- // Convert the normalized UnicodeString to OUString
- OUString sValue( reinterpret_cast( normalized.getBuffer( ) ), normalized.length() );
-
- // Remove the number to get the prefix
- sal_Int32 len = OUString::valueOf( nNumber ).getLength( );
-
- sal_Int32 newLength = retValue.getLength() + 1;
- retValue.realloc( newLength );
- retValue[ newLength - 1 ] = sValue.copy( len );
- }
- }
- }
+ icu::UnicodeString ruleSet = formatter.getRuleSetName(i);
+
+ // format the string
+ icu::UnicodeString sFormatWithOrdinal;
+ icu::FieldPosition icuPos;
+ formatter.format( (int32_t)nNumber, ruleSet, sFormatWithOrdinal, icuPos, nCode );
+
+ if (!U_SUCCESS(nCode))
+ continue;
+
+ OUString sValueWithOrdinal = mungeUnicodeStringToOUString(sFormatWithOrdinal, nCode);
+ if (!U_SUCCESS(nCode))
+ continue;
+
+ // fdo#54486 lets make sure that the ordinal format and the non-ordinal
+ // format match at the start, so that the expectation can be verified
+ // that there is some trailing "ordinal suffix" which can be extracted
+ bool bSimpleOrdinalSuffix = sValueWithOrdinal.match(sValueWithNoOrdinal);
+
+ SAL_WARN_IF(!bSimpleOrdinalSuffix, "i18npool", "ordinal " <<
+ sValueWithOrdinal << " didn't start with expected " <<
+ sValueWithNoOrdinal << " prefix");
+
+ if (!bSimpleOrdinalSuffix)
+ continue;
+
+ // Remove the number to get the prefix
+ sal_Int32 len = sValueWithNoOrdinal.getLength();
+
+ sal_Int32 newLength = retValue.getLength() + 1;
+ retValue.realloc( newLength );
+ retValue[ newLength - 1 ] = sValueWithOrdinal.copy( len );
}
return retValue;
}
-
const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix";
OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( RuntimeException )
diff -Nru libreoffice-3.6.1~rc2/idlc/source/idlc.cxx libreoffice-3.6.2~rc2/idlc/source/idlc.cxx
--- libreoffice-3.6.1~rc2/idlc/source/idlc.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/idlc/source/idlc.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -279,6 +279,8 @@
// push the root node on the stack
m_pScopes->push(m_pRoot);
initializePredefinedTypes(m_pRoot);
+
+ m_includes.clear();
}
sal_Bool Idlc::isDocValid()
diff -Nru libreoffice-3.6.1~rc2/instsetoo_native/util/openoffice.lst libreoffice-3.6.2~rc2/instsetoo_native/util/openoffice.lst
--- libreoffice-3.6.1~rc2/instsetoo_native/util/openoffice.lst 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/instsetoo_native/util/openoffice.lst 2012-09-25 12:13:30.000000000 +0000
@@ -5,7 +5,7 @@
{
variables
{
- UREPACKAGEVERSION 3.6.1.2
+ UREPACKAGEVERSION 3.6.2.2
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.6
@@ -51,12 +51,12 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.1.2
+ ABOUTBOXPRODUCTVERSION 3.6.2.2
ABOUTBOXPRODUCTVERSIONSUFFIX
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -103,13 +103,13 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.1.2
+ ABOUTBOXPRODUCTVERSION 3.6.2.2
ABOUTBOXPRODUCTVERSIONSUFFIX
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,12 +162,12 @@
{
PRODUCTNAME URE
PRODUCTVERSION 3.6
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3.6
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -199,11 +199,11 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -240,12 +240,12 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -287,11 +287,11 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION TEST
@@ -328,12 +328,12 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
UNIXBASISROOTNAME lodev3.6
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.6
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -374,12 +374,12 @@
PRODUCTVERSION 3.6
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION .1.2
+ SHORT_PRODUCTEXTENSION .2.2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.6.1.2
+ ABOUTBOXPRODUCTVERSION 3.6.2.2
ABOUTBOXPRODUCTVERSIONSUFFIX
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
@@ -389,7 +389,7 @@
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.6.1.2
+ PACKAGEVERSION 3.6.2.2
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff -Nru libreoffice-3.6.1~rc2/l10ntools/Executable_gsicheck.mk libreoffice-3.6.2~rc2/l10ntools/Executable_gsicheck.mk
--- libreoffice-3.6.1~rc2/l10ntools/Executable_gsicheck.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/Executable_gsicheck.mk 2012-09-25 12:13:30.000000000 +0000
@@ -34,10 +34,12 @@
$(eval $(call gb_Executable_use_libraries,gsicheck,\
sal \
))
+$(eval $(call gb_Executable_use_static_libraries,gsicheck,\
+ transex \
+))
$(eval $(call gb_Executable_add_exception_objects,gsicheck,\
- l10ntools/source/gsicheck \
- l10ntools/source/tagtest \
+ l10ntools/source/gsimain \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff -Nru libreoffice-3.6.1~rc2/l10ntools/StaticLibrary_transex.mk libreoffice-3.6.2~rc2/l10ntools/StaticLibrary_transex.mk
--- libreoffice-3.6.1~rc2/l10ntools/StaticLibrary_transex.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/StaticLibrary_transex.mk 2012-09-25 12:13:30.000000000 +0000
@@ -37,6 +37,8 @@
l10ntools/source/merge \
l10ntools/source/file \
l10ntools/source/directory \
+ l10ntools/source/tagtest \
+ l10ntools/source/gsicheck \
))
# vim: set noet sw=4 ts=4:
diff -Nru libreoffice-3.6.1~rc2/l10ntools/inc/export.hxx libreoffice-3.6.2~rc2/l10ntools/inc/export.hxx
--- libreoffice-3.6.1~rc2/l10ntools/inc/export.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/inc/export.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -71,6 +71,9 @@
typedef boost::unordered_map
MergeDataHashMap;
+typedef boost::unordered_map
+ LineNumberHashMap;
+
#define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"))
#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))
#define LIST_REFID "LIST_REFID"
@@ -374,23 +377,36 @@
OStringBoolHashMap bQuickHelpTextFirst;
OStringHashMap sTitle;
OStringBoolHashMap bTitleFirst;
+ OStringHashMap sSDFLine;
+ LineNumberHashMap nLine;
public:
PFormEntrys( const rtl::OString &rPForm ) : data_( rPForm ) {};
void InsertEntry(const rtl::OString &rId, const rtl::OString &rText,
- const rtl::OString &rQuickHelpText, const rtl::OString &rTitle)
+ const rtl::OString &rQuickHelpText, const rtl::OString &rTitle,
+ const rtl::OString &rSDFLine, const std::size_t nLineIn)
{
-
sText[ rId ] = rText;
bTextFirst[ rId ] = true;
sQuickHelpText[ rId ] = rQuickHelpText;
bQuickHelpTextFirst[ rId ] = true;
sTitle[ rId ] = rTitle;
bTitleFirst[ rId ] = true;
+ sSDFLine[ rId ] = rSDFLine;
+ nLine[ rId ] = nLineIn;
}
sal_Bool GetText( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
sal_Bool GetTransex3Text( rtl::OString &rReturn, sal_uInt16 nTyp, const rtl::OString &nLangIndex, sal_Bool bDel = sal_False );
+ rtl::OString & GetSDF(const rtl::OString &nLangIndex)
+ {
+ return sSDFLine[nLangIndex];
+ }
+
+ std::size_t GetNLine(const rtl::OString &nLangIndex)
+ {
+ return nLine[nLangIndex];
+ }
};
//
@@ -445,7 +461,8 @@
const rtl::OString &rLID, const rtl::OString &rPFO,
const rtl::OString &nLang, const rtl::OString &rTEXT,
const rtl::OString &rQHTEXT, const rtl::OString &rTITLE,
- const rtl::OString &sFilename, bool bCaseSensitive);
+ const rtl::OString &sFilename, bool bCaseSensitive,
+ const rtl::OString &rSDF, std::size_t nLine);
public:
explicit MergeDataFile(const rtl::OString &rFileName,
const rtl::OString& rFile, bool bErrLog, bool bCaseSensitive = false);
diff -Nru libreoffice-3.6.1~rc2/l10ntools/inc/gsicheck.hxx libreoffice-3.6.2~rc2/l10ntools/inc/gsicheck.hxx
--- libreoffice-3.6.1~rc2/l10ntools/inc/gsicheck.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/inc/gsicheck.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -33,6 +33,7 @@
#include
#include
+#include
#include "tagtest.hxx"
@@ -131,6 +132,65 @@
void WriteFixed( LazyStream &aFixOut );
};
+sal_Bool check(rtl::OString s,std::size_t nLine);
+
+void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, rtl::OString const & aPrefix,
+ rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString aUniqueId = rtl::OString() );
+
+void PrintError( rtl::OString const & aMsg, rtl::OString const & aPrefix,
+ rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString const & aUniqueId = rtl::OString() );
+
+bool LanguageOK( rtl::OString const & aLang );
+
+class LazyStream: public std::ofstream
+{
+
+private:
+ rtl::OString aFileName;
+ bool bOpened;
+
+public:
+ LazyStream()
+ : aFileName()
+ , bOpened(false)
+ {};
+
+ void SetFileName( const rtl::OString& rFileName )
+ {
+ aFileName = rFileName;
+ };
+
+ void LazyOpen();
+};
+
+namespace {
+
+sal_Int32 const MAX_GID_LID_LEN = 250;
+
+rtl::OString copyUpTo(
+ rtl::OString const & text, sal_Int32 start, sal_Int32 maximumLength)
+{
+ assert(start >= 0 && start <= text.getLength());
+ return text.copy(start, std::min(text.getLength() - start, maximumLength));
+}
+
+rtl::OString addSuffix(
+ rtl::OString const & pathname, rtl::OString const & suffix)
+{
+ sal_Int32 n = pathname.lastIndexOf('.');
+ if (n == -1) {
+ fprintf(
+ stderr,
+ ("Error: pathname \"%s\" does not contain dot to add suffix in"
+ " front of\n"),
+ pathname.getStr());
+ exit(EXIT_FAILURE);
+ }
+ return pathname.replaceAt(n, 0, suffix);
+}
+
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff -Nru libreoffice-3.6.1~rc2/l10ntools/source/gsicheck.cxx libreoffice-3.6.2~rc2/l10ntools/source/gsicheck.cxx
--- libreoffice-3.6.1~rc2/l10ntools/source/gsicheck.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/source/gsicheck.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -42,37 +42,9 @@
#include "tagtest.hxx"
#include "gsicheck.hxx"
-namespace {
-
-sal_Int32 const MAX_GID_LID_LEN = 250;
-
-rtl::OString copyUpTo(
- rtl::OString const & text, sal_Int32 start, sal_Int32 maximumLength)
-{
- assert(start >= 0 && start <= text.getLength());
- return text.copy(start, std::min(text.getLength() - start, maximumLength));
-}
-
-rtl::OString addSuffix(
- rtl::OString const & pathname, rtl::OString const & suffix)
-{
- sal_Int32 n = pathname.lastIndexOf('.');
- if (n == -1) {
- fprintf(
- stderr,
- ("Error: pathname \"%s\" does not contain dot to add suffix in"
- " front of\n"),
- pathname.getStr());
- exit(EXIT_FAILURE);
- }
- return pathname.replaceAt(n, 0, suffix);
-}
-
-}
-
/*****************************************************************************/
void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, rtl::OString const & aPrefix,
- rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString aUniqueId = rtl::OString() )
+ rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString aUniqueId )
/*****************************************************************************/
{
fprintf( stdout, "%s %s, Line %u", aType.getStr(), aPrefix.getStr(), static_cast( nLine ) );
@@ -87,7 +59,7 @@
/*****************************************************************************/
void PrintError( rtl::OString const & aMsg, rtl::OString const & aPrefix,
- rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString const & aUniqueId = rtl::OString() )
+ rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString const & aUniqueId )
/*****************************************************************************/
{
PrintMessage( "Error:", aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId );
@@ -109,27 +81,6 @@
&& !t0.equalsIgnoreAsciiCase(t1);
}
-class LazyStream: public std::ofstream
-{
-
-private:
- rtl::OString aFileName;
- bool bOpened;
-
-public:
- LazyStream()
- : aFileName()
- , bOpened(false)
- {};
-
- void SetFileName( const rtl::OString& rFileName )
- {
- aFileName = rFileName;
- };
-
- void LazyOpen();
-};
-
void LazyStream::LazyOpen()
{
if ( !bOpened )
@@ -641,411 +592,39 @@
}
}
-
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-/*****************************************************************************/
-
-/*****************************************************************************/
-void Help()
-/*****************************************************************************/
+sal_Bool check(rtl::OString s, std::size_t nLine)
{
- fprintf( stdout, "\n" );
- fprintf( stdout, "gsicheck checks the syntax of tags in SDF-Files\n" );
- fprintf( stdout, " checks for inconsistencies and malicious UTF8 encoding\n" );
- fprintf( stdout, " checks tags in Online Help\n" );
- fprintf( stdout, " relax GID/LID length to %s\n",
- rtl::OString::valueOf(static_cast(MAX_GID_LID_LEN)).getStr() );
- fprintf( stdout, "\n" );
- fprintf( stdout, "Syntax: gsicheck [ -c ] [-f] [ -we ] [ -wef ErrorFilename ] [ -wc ]\n" );
- fprintf( stdout, " [ -wcf CorrectFilename ] [ -s | -t ] [ -l LanguageID ]\n" );
- fprintf( stdout, " [ -r ReferenceFile ] filename\n" );
- fprintf( stdout, "\n" );
- fprintf( stdout, "-c Add context to error message (Print the line containing the error)\n" );
- fprintf( stdout, "-f try to fix errors. See also -wf -wff \n" );
- fprintf( stdout, "-wf Write File containing all fixed parts\n" );
- fprintf( stdout, "-wff Same as above but give own filename\n" );
- fprintf( stdout, "-we Write File containing all errors\n" );
- fprintf( stdout, "-wef Same as above but give own filename\n" );
- fprintf( stdout, "-wc Write File containing all correct parts\n" );
- fprintf( stdout, "-wcf Same as above but give own filename\n" );
- fprintf( stdout, "-s Check only source language. Should be used before handing out to vendor.\n" );
- fprintf( stdout, "-t Check only Translation language(s). Should be used before merging.\n" );
- fprintf( stdout, "-e disable encoding checks. E.g.: double questionmark \'??\' which may be the\n" );
- fprintf( stdout, " result of false conversions\n" );
- fprintf( stdout, "-l ISO language code of the source language.\n" );
- fprintf( stdout, " Default is en-US. Use \"\" (empty string) or 'none'\n" );
- fprintf( stdout, " to disable source language dependent checks\n" );
- fprintf( stdout, "-r Reference filename to check that source language entries\n" );
- fprintf( stdout, " have not been changed\n" );
- fprintf( stdout, "\n" );
-}
-
-SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
- sal_Bool bError = sal_False;
- sal_Bool bPrintContext = sal_False;
- sal_Bool bCheckSourceLang = sal_False;
- sal_Bool bCheckTranslationLang = sal_False;
- sal_Bool bWriteError = sal_False;
- sal_Bool bWriteCorrect = sal_False;
- sal_Bool bWriteFixed = sal_False;
- sal_Bool bFixTags = sal_False;
- sal_Bool bAllowSuspicious = sal_False;
- rtl::OString aErrorFilename;
- rtl::OString aCorrectFilename;
- rtl::OString aFixedFilename;
sal_Bool bFileHasError = sal_False;
- rtl::OString aSourceLang( "en-US" ); // English is default
- rtl::OString aFilename;
- rtl::OString aReferenceFilename;
- sal_Bool bReferenceFile = sal_False;
- for ( int i = 1 ; i < argc ; i++ )
- {
- if ( *argv[ i ] == '-' )
- {
- switch (*(argv[ i ]+1))
- {
- case 'c':bPrintContext = sal_True;
- break;
- case 'w':
- {
- if ( (*(argv[ i ]+2)) == 'e' )
- {
- if ( (*(argv[ i ]+3)) == 'f' )
- if ( (i+1) < argc )
- {
- aErrorFilename = argv[i + 1];
- bWriteError = sal_True;
- i++;
- }
- else
- {
- fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
- bError = sal_True;
- }
- else
- bWriteError = sal_True;
- }
- else if ( (*(argv[ i ]+2)) == 'c' )
- if ( (*(argv[ i ]+3)) == 'f' )
- if ( (i+1) < argc )
- {
- aCorrectFilename = argv[i + 1];
- bWriteCorrect = sal_True;
- i++;
- }
- else
- {
- fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
- bError = sal_True;
- }
- else
- bWriteCorrect = sal_True;
- else if ( (*(argv[ i ]+2)) == 'f' )
- if ( (*(argv[ i ]+3)) == 'f' )
- if ( (i+1) < argc )
- {
- aFixedFilename = argv[i + 1];
- bWriteFixed = sal_True;
- bFixTags = sal_True;
- i++;
- }
- else
- {
- fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
- bError = sal_True;
- }
- else
- {
- bWriteFixed = sal_True;
- bFixTags = sal_True;
- }
- else
- {
- fprintf( stderr, "\nERROR: Unknown Switch %s!\n\n", argv[ i ] );
- bError = sal_True;
- }
- }
- break;
- case 's':bCheckSourceLang = sal_True;
- break;
- case 't':bCheckTranslationLang = sal_True;
- break;
- case 'l':
- {
- if ( (i+1) < argc )
- {
- aSourceLang = argv[ i+1 ];
- if ( aSourceLang.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("none")) )
- aSourceLang = rtl::OString();
- i++;
- }
- else
- {
- fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
- bError = sal_True;
- }
- }
- break;
- case 'r':
- {
- if ( (i+1) < argc )
- {
- aReferenceFilename = argv[ i+1 ];
- bReferenceFile = sal_True;
- i++;
- }
- else
- {
- fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
- bError = sal_True;
- }
- }
- break;
- case 'f':
- {
- bFixTags = sal_True;
- }
- break;
- case 'e':
- {
- bAllowSuspicious = sal_True;
- }
- break;
- default:
- fprintf( stderr, "\nERROR: Unknown Switch %s!\n\n", argv[ i ] );
- bError = sal_True;
- }
- }
- else
- {
- if (aFilename.isEmpty())
- aFilename = argv[i];
- else
- {
- fprintf( stderr, "\nERROR: Only one filename may be specified!\n\n");
- bError = sal_True;
- }
- }
- }
-
-
- if (aFilename.isEmpty() || bError)
- {
- Help();
- exit ( 0 );
- }
-
- if ( !aSourceLang.isEmpty() && !LanguageOK( aSourceLang ) )
- {
- fprintf( stderr, "\nERROR: The Language '%s' is invalid!\n\n", aSourceLang.getStr() );
- Help();
- exit ( 1 );
- }
-
- if ( bCheckSourceLang && bCheckTranslationLang )
- {
- fprintf( stderr, "\nERROR: The Options -s and -t are mutually exclusive.\nUse only one of them.\n\n" );
- Help();
- exit ( 1 );
- }
-
-
-
- std::ifstream aGSI(aFilename.getStr());
- if (!aGSI.is_open()) {
- fprintf( stderr, "\nERROR: Could not open GSI-File %s!\n\n", aFilename.getStr() );
- exit ( 3 );
- }
-
- std::ifstream aReferenceGSI;
- if ( bReferenceFile )
- {
- aReferenceGSI.open(aReferenceFilename.getStr());
- if (!aReferenceGSI.is_open()) {
- fprintf( stderr, "\nERROR: Could not open Input-File %s!\n\n", aFilename.getStr() );
- exit ( 3 );
- }
- }
-
- LazyStream aOkOut;
- if ( bWriteCorrect )
- {
- if (aCorrectFilename.isEmpty())
- {
- aCorrectFilename = addSuffix(
- aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_ok")));
- }
- aOkOut.SetFileName(aCorrectFilename);
- }
-
- LazyStream aErrOut;
- if ( bWriteError )
- {
- if (aErrorFilename.isEmpty())
- {
- aErrorFilename = addSuffix(
- aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_err")));
- }
- aErrOut.SetFileName(aErrorFilename);
- }
-
- LazyStream aFixOut;
- if ( bWriteFixed )
- {
- if (aFixedFilename.isEmpty())
- {
- aFixedFilename = addSuffix(
- aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_fix")));
- }
- aFixOut.SetFileName(aFixedFilename);
- }
-
-
- GSILine* pReferenceLine = NULL;
- std::size_t nReferenceLine = 0;
-
GSILine* pGSILine = NULL;
- rtl::OString aOldId("No Valid ID"); // just set to something which can never be an ID
GSIBlock *pBlock = NULL;
- std::size_t nLine = 0;
+ pGSILine = new GSILine(s, nLine );
- while (!aGSI.eof())
+ if ( !pGSILine->data_.isEmpty() )
{
- std::string s;
- std::getline(aGSI, s);
- nLine++;
- pGSILine = new GSILine(rtl::OString(s.data(), s.length()), nLine );
- sal_Bool bDelete = sal_True;
-
-
- if ( !pGSILine->data_.isEmpty() )
+ if ( FORMAT_UNKNOWN == pGSILine->GetLineFormat() )
{
- if ( FORMAT_UNKNOWN == pGSILine->GetLineFormat() )
- {
- PrintError( "Format of line is unknown. Ignoring!", "Line format", pGSILine->data_.copy( 0,40 ), bPrintContext, pGSILine->GetLineNumber() );
- pGSILine->NotOK();
- if ( bWriteError )
- {
- bFileHasError = sal_True;
- aErrOut.LazyOpen();
- aErrOut << pGSILine->data_.getStr();
- }
- }
- else if ( pGSILine->GetLineType().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("res-comment")) )
- { // ignore comment lines, but write them to Correct Items File
- if ( bWriteCorrect )
- {
- aOkOut.LazyOpen();
- aOkOut << pGSILine->data_.getStr() << '\n';
- }
- }
- else
+ PrintError( "Format of line is unknown. Ignoring!", "Line format", pGSILine->data_.copy( 0,40 ), sal_True, pGSILine->GetLineNumber() );
+ bFileHasError = sal_True;
+ pGSILine->NotOK();
+ }
+ else if ( !(pGSILine->GetLineType().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("res-comment"))) )
+ {
+ pBlock = new GSIBlock( sal_True, sal_False, sal_False, sal_False, sal_False );
+ pBlock->InsertLine( pGSILine, rtl::OString() );
+ bFileHasError |= pBlock->CheckSyntax( nLine, sal_False, sal_False );
+ if (pBlock!=NULL)
{
- rtl::OString aId = pGSILine->GetUniqId();
- if ( aId != aOldId )
- {
- if ( pBlock )
- {
- bFileHasError |= pBlock->CheckSyntax( nLine, !aSourceLang.isEmpty(), bFixTags );
-
- if ( bWriteError )
- pBlock->WriteError( aErrOut, !aSourceLang.isEmpty() );
- if ( bWriteCorrect )
- pBlock->WriteCorrect( aOkOut, !aSourceLang.isEmpty() );
- if ( bWriteFixed )
- pBlock->WriteFixed( aFixOut );
-
- delete pBlock;
- }
- pBlock = new GSIBlock( bPrintContext, bCheckSourceLang, bCheckTranslationLang, bReferenceFile, bAllowSuspicious );
-
- aOldId = aId;
-
-
- // find corresponding line in reference file
- if ( bReferenceFile )
- {
- sal_Bool bContinueSearching = sal_True;
- while ( ( !aReferenceGSI.eof() || pReferenceLine ) && bContinueSearching )
- {
- if ( !pReferenceLine )
- {
- std::string s2;
- std::getline(aReferenceGSI, s2);
- nReferenceLine++;
- pReferenceLine = new GSILine(
- rtl::OString(s2.data(), s2.length()),
- nReferenceLine);
- }
- if ( pReferenceLine->GetLineFormat() != FORMAT_UNKNOWN )
- {
- if ( pReferenceLine->GetUniqId() == aId && pReferenceLine->GetLanguageId() == aSourceLang )
- {
- pBlock->SetReferenceLine( pReferenceLine );
- pReferenceLine = NULL;
- }
- else if ( pReferenceLine->GetUniqId() > aId )
- {
- bContinueSearching = sal_False;
- }
- else
- {
- if ( pReferenceLine->GetUniqId() < aId && pReferenceLine->GetLanguageId() == aSourceLang )
- PrintError( "No Entry in source file found. Entry has been removed from source file", "File format", "", bPrintContext, pGSILine->GetLineNumber(), pReferenceLine->GetUniqId() );
- delete pReferenceLine;
- pReferenceLine = NULL;
- }
- }
- else
- {
- delete pReferenceLine;
- pReferenceLine = NULL;
- }
-
- }
- }
-
- }
-
- pBlock->InsertLine( pGSILine, aSourceLang );
- bDelete = sal_False;
+ delete pBlock;
+ pBlock=NULL;
+ pGSILine=NULL;
}
}
- if ( bDelete )
- delete pGSILine;
-
}
- if ( pBlock )
- {
- bFileHasError |= pBlock->CheckSyntax( nLine, !aSourceLang.isEmpty(), bFixTags );
-
- if ( bWriteError )
- pBlock->WriteError( aErrOut, !aSourceLang.isEmpty() );
- if ( bWriteCorrect )
- pBlock->WriteCorrect( aOkOut, !aSourceLang.isEmpty() );
- if ( bWriteFixed )
- pBlock->WriteFixed( aFixOut );
-
- delete pBlock;
- }
- aGSI.close();
-
- if ( bWriteError )
- aErrOut.close();
- if ( bWriteCorrect )
- aOkOut.close();
- if ( bWriteFixed )
- aFixOut.close();
-
+ delete pGSILine;
if ( bFileHasError )
- return 55;
+ return false;
else
- return 0;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff -Nru libreoffice-3.6.1~rc2/l10ntools/source/gsimain.cxx libreoffice-3.6.2~rc2/l10ntools/source/gsimain.cxx
--- libreoffice-3.6.1~rc2/l10ntools/source/gsimain.cxx 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/source/gsimain.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -0,0 +1,437 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ *
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "sal/config.h"
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include "sal/main.h"
+#include "helper.hxx"
+#include "tagtest.hxx"
+#include "gsicheck.hxx"
+
+void Help()
+{
+ fprintf( stdout, "\n" );
+ fprintf( stdout, "gsicheck checks the syntax of tags in SDF-Files\n" );
+ fprintf( stdout, " checks for inconsistencies and malicious UTF8 encoding\n" );
+ fprintf( stdout, " checks tags in Online Help\n" );
+ fprintf( stdout, " relax GID/LID length to %s\n",
+ rtl::OString::valueOf(static_cast(MAX_GID_LID_LEN)).getStr() );
+ fprintf( stdout, "\n" );
+ fprintf( stdout, "Syntax: gsicheck [ -c ] [-f] [ -we ] [ -wef ErrorFilename ] [ -wc ]\n" );
+ fprintf( stdout, " [ -wcf CorrectFilename ] [ -s | -t ] [ -l LanguageID ]\n" );
+ fprintf( stdout, " [ -r ReferenceFile ] filename\n" );
+ fprintf( stdout, "\n" );
+ fprintf( stdout, "-c Add context to error message (Print the line containing the error)\n" );
+ fprintf( stdout, "-f try to fix errors. See also -wf -wff \n" );
+ fprintf( stdout, "-wf Write File containing all fixed parts\n" );
+ fprintf( stdout, "-wff Same as above but give own filename\n" );
+ fprintf( stdout, "-we Write File containing all errors\n" );
+ fprintf( stdout, "-wef Same as above but give own filename\n" );
+ fprintf( stdout, "-wc Write File containing all correct parts\n" );
+ fprintf( stdout, "-wcf Same as above but give own filename\n" );
+ fprintf( stdout, "-s Check only source language. Should be used before handing out to vendor.\n" );
+ fprintf( stdout, "-t Check only Translation language(s). Should be used before merging.\n" );
+ fprintf( stdout, "-e disable encoding checks. E.g.: double questionmark \'??\' which may be the\n" );
+ fprintf( stdout, " result of false conversions\n" );
+ fprintf( stdout, "-l ISO language code of the source language.\n" );
+ fprintf( stdout, " Default is en-US. Use \"\" (empty string) or 'none'\n" );
+ fprintf( stdout, " to disable source language dependent checks\n" );
+ fprintf( stdout, "-r Reference filename to check that source language entries\n" );
+ fprintf( stdout, " have not been changed\n" );
+ fprintf( stdout, "\n" );
+}
+
+SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
+ sal_Bool bError = sal_False;
+ sal_Bool bPrintContext = sal_False;
+ sal_Bool bCheckSourceLang = sal_False;
+ sal_Bool bCheckTranslationLang = sal_False;
+ sal_Bool bWriteError = sal_False;
+ sal_Bool bWriteCorrect = sal_False;
+ sal_Bool bWriteFixed = sal_False;
+ sal_Bool bFixTags = sal_False;
+ sal_Bool bAllowSuspicious = sal_False;
+ rtl::OString aErrorFilename;
+ rtl::OString aCorrectFilename;
+ rtl::OString aFixedFilename;
+ sal_Bool bFileHasError = sal_False;
+ rtl::OString aSourceLang( "en-US" ); // English is default
+ rtl::OString aFilename;
+ rtl::OString aReferenceFilename;
+ sal_Bool bReferenceFile = sal_False;
+ for ( int i = 1 ; i < argc ; i++ )
+ {
+ if ( *argv[ i ] == '-' )
+ {
+ switch (*(argv[ i ]+1))
+ {
+ case 'c':bPrintContext = sal_True;
+ break;
+ case 'w':
+ {
+ if ( (*(argv[ i ]+2)) == 'e' )
+ {
+ if ( (*(argv[ i ]+3)) == 'f' )
+ if ( (i+1) < argc )
+ {
+ aErrorFilename = argv[i + 1];
+ bWriteError = sal_True;
+ i++;
+ }
+ else
+ {
+ fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ else
+ bWriteError = sal_True;
+ }
+ else if ( (*(argv[ i ]+2)) == 'c' )
+ if ( (*(argv[ i ]+3)) == 'f' )
+ if ( (i+1) < argc )
+ {
+ aCorrectFilename = argv[i + 1];
+ bWriteCorrect = sal_True;
+ i++;
+ }
+ else
+ {
+ fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ else
+ bWriteCorrect = sal_True;
+ else if ( (*(argv[ i ]+2)) == 'f' )
+ if ( (*(argv[ i ]+3)) == 'f' )
+ if ( (i+1) < argc )
+ {
+ aFixedFilename = argv[i + 1];
+ bWriteFixed = sal_True;
+ bFixTags = sal_True;
+ i++;
+ }
+ else
+ {
+ fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ else
+ {
+ bWriteFixed = sal_True;
+ bFixTags = sal_True;
+ }
+ else
+ {
+ fprintf( stderr, "\nERROR: Unknown Switch %s!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ }
+ break;
+ case 's':bCheckSourceLang = sal_True;
+ break;
+ case 't':bCheckTranslationLang = sal_True;
+ break;
+ case 'l':
+ {
+ if ( (i+1) < argc )
+ {
+ aSourceLang = argv[ i+1 ];
+ if ( aSourceLang.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("none")) )
+ aSourceLang = rtl::OString();
+ i++;
+ }
+ else
+ {
+ fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ }
+ break;
+ case 'r':
+ {
+ if ( (i+1) < argc )
+ {
+ aReferenceFilename = argv[ i+1 ];
+ bReferenceFile = sal_True;
+ i++;
+ }
+ else
+ {
+ fprintf( stderr, "\nERROR: Switch %s requires parameter!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ }
+ break;
+ case 'f':
+ {
+ bFixTags = sal_True;
+ }
+ break;
+ case 'e':
+ {
+ bAllowSuspicious = sal_True;
+ }
+ break;
+ default:
+ fprintf( stderr, "\nERROR: Unknown Switch %s!\n\n", argv[ i ] );
+ bError = sal_True;
+ }
+ }
+ else
+ {
+ if (aFilename.isEmpty())
+ aFilename = argv[i];
+ else
+ {
+ fprintf( stderr, "\nERROR: Only one filename may be specified!\n\n");
+ bError = sal_True;
+ }
+ }
+ }
+
+
+ if (aFilename.isEmpty() || bError)
+ {
+ Help();
+ exit ( 0 );
+ }
+
+ if ( !aSourceLang.isEmpty() && !LanguageOK( aSourceLang ) )
+ {
+ fprintf( stderr, "\nERROR: The Language '%s' is invalid!\n\n", aSourceLang.getStr() );
+ Help();
+ exit ( 1 );
+ }
+
+ if ( bCheckSourceLang && bCheckTranslationLang )
+ {
+ fprintf( stderr, "\nERROR: The Options -s and -t are mutually exclusive.\nUse only one of them.\n\n" );
+ Help();
+ exit ( 1 );
+ }
+
+
+
+ std::ifstream aGSI(aFilename.getStr());
+ if (!aGSI.is_open()) {
+ fprintf( stderr, "\nERROR: Could not open GSI-File %s!\n\n", aFilename.getStr() );
+ exit ( 3 );
+ }
+
+ std::ifstream aReferenceGSI;
+ if ( bReferenceFile )
+ {
+ aReferenceGSI.open(aReferenceFilename.getStr());
+ if (!aReferenceGSI.is_open()) {
+ fprintf( stderr, "\nERROR: Could not open Input-File %s!\n\n", aFilename.getStr() );
+ exit ( 3 );
+ }
+ }
+
+ LazyStream aOkOut;
+ if ( bWriteCorrect )
+ {
+ if (aCorrectFilename.isEmpty())
+ {
+ aCorrectFilename = addSuffix(
+ aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_ok")));
+ }
+ aOkOut.SetFileName(aCorrectFilename);
+ }
+
+ LazyStream aErrOut;
+ if ( bWriteError )
+ {
+ if (aErrorFilename.isEmpty())
+ {
+ aErrorFilename = addSuffix(
+ aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_err")));
+ }
+ aErrOut.SetFileName(aErrorFilename);
+ }
+
+ LazyStream aFixOut;
+ if ( bWriteFixed )
+ {
+ if (aFixedFilename.isEmpty())
+ {
+ aFixedFilename = addSuffix(
+ aFilename, rtl::OString(RTL_CONSTASCII_STRINGPARAM("_fix")));
+ }
+ aFixOut.SetFileName(aFixedFilename);
+ }
+
+
+ GSILine* pReferenceLine = NULL;
+ std::size_t nReferenceLine = 0;
+
+ GSILine* pGSILine = NULL;
+ rtl::OString aOldId("No Valid ID"); // just set to something which can never be an ID
+ GSIBlock *pBlock = NULL;
+ std::size_t nLine = 0;
+
+ while (!aGSI.eof())
+ {
+ std::string s;
+ std::getline(aGSI, s);
+ nLine++;
+
+ pGSILine = new GSILine(rtl::OString(s.data(), s.length()), nLine );
+ sal_Bool bDelete = sal_True;
+
+ if ( !pGSILine->data_.isEmpty() )
+ {
+ if ( FORMAT_UNKNOWN == pGSILine->GetLineFormat() )
+ {
+ PrintError( "Format of line is unknown. Ignoring!", "Line format", pGSILine->data_.copy( 0,40 ), bPrintContext, pGSILine->GetLineNumber() );
+ pGSILine->NotOK();
+ if ( bWriteError )
+ {
+ bFileHasError = sal_True;
+ aErrOut.LazyOpen();
+ aErrOut << pGSILine->data_.getStr();
+ }
+ }
+ else if ( pGSILine->GetLineType().equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("res-comment")) )
+ { // ignore comment lines, but write them to Correct Items File
+ if ( bWriteCorrect )
+ {
+ aOkOut.LazyOpen();
+ aOkOut << pGSILine->data_.getStr() << '\n';
+ }
+ }
+ else
+ {
+ rtl::OString aId = pGSILine->GetUniqId();
+ if ( aId != aOldId )
+ {
+ if ( pBlock )
+ {
+ bFileHasError |= pBlock->CheckSyntax( nLine, !aSourceLang.isEmpty(), bFixTags );
+
+ if ( bWriteError )
+ pBlock->WriteError( aErrOut, !aSourceLang.isEmpty() );
+ if ( bWriteCorrect )
+ pBlock->WriteCorrect( aOkOut, !aSourceLang.isEmpty() );
+ if ( bWriteFixed )
+ pBlock->WriteFixed( aFixOut );
+
+ delete pBlock;
+ }
+ pBlock = new GSIBlock( bPrintContext, bCheckSourceLang, bCheckTranslationLang, bReferenceFile, bAllowSuspicious );
+
+ aOldId = aId;
+
+ // find corresponding line in reference file
+ if ( bReferenceFile )
+ {
+ sal_Bool bContinueSearching = sal_True;
+ while ( ( !aReferenceGSI.eof() || pReferenceLine ) && bContinueSearching )
+ {
+ if ( !pReferenceLine )
+ {
+ std::string s2;
+ std::getline(aReferenceGSI, s2);
+ nReferenceLine++;
+ pReferenceLine = new GSILine(
+ rtl::OString(s2.data(), s2.length()),
+ nReferenceLine);
+ }
+ if ( pReferenceLine->GetLineFormat() != FORMAT_UNKNOWN )
+ {
+ if ( pReferenceLine->GetUniqId() == aId && pReferenceLine->GetLanguageId() == aSourceLang )
+ {
+ pBlock->SetReferenceLine( pReferenceLine );
+ pReferenceLine = NULL;
+ }
+ else if ( pReferenceLine->GetUniqId() > aId )
+ {
+ bContinueSearching = sal_False;
+ }
+ else
+ {
+ if ( pReferenceLine->GetUniqId() < aId && pReferenceLine->GetLanguageId() == aSourceLang )
+ PrintError( "No Entry in source file found. Entry has been removed from source file", "File format", "", bPrintContext, pGSILine->GetLineNumber(), pReferenceLine->GetUniqId() );
+ delete pReferenceLine;
+ pReferenceLine = NULL;
+ }
+ }
+ else
+ {
+ delete pReferenceLine;
+ pReferenceLine = NULL;
+ }
+
+ }
+ }
+
+ }
+ pBlock->InsertLine( pGSILine, aSourceLang );
+ bDelete = sal_False;
+ }
+ }
+ if ( bDelete )
+ delete pGSILine;
+ }
+ if ( pBlock )
+ {
+ bFileHasError |= pBlock->CheckSyntax( nLine, !aSourceLang.isEmpty(), bFixTags );
+
+ if ( bWriteError )
+ pBlock->WriteError( aErrOut, !aSourceLang.isEmpty() );
+ if ( bWriteCorrect )
+ pBlock->WriteCorrect( aOkOut, !aSourceLang.isEmpty() );
+ if ( bWriteFixed )
+ pBlock->WriteFixed( aFixOut );
+
+ delete pBlock;
+ }
+ aGSI.close();
+
+ if ( bWriteError )
+ aErrOut.close();
+ if ( bWriteCorrect )
+ aOkOut.close();
+ if ( bWriteFixed )
+ aFixOut.close();
+ if ( bFileHasError )
+ return 55;
+ else
+ return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff -Nru libreoffice-3.6.1~rc2/l10ntools/source/help/LuceneHelper.hxx libreoffice-3.6.2~rc2/l10ntools/source/help/LuceneHelper.hxx
--- libreoffice-3.6.1~rc2/l10ntools/source/help/LuceneHelper.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/source/help/LuceneHelper.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -35,9 +35,17 @@
#pragma warning(disable : 4068 4263 4264 4266)
#endif
+#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
+# pragma GCC visibility push (default)
+#endif
+
#include
#include
+#if defined(__GNUC__) && defined(HAVE_GCC_VISIBILITY_FEATURE)
+# pragma GCC visibility pop
+#endif
+
#if defined _MSC_VER
#pragma warning(pop)
#endif
diff -Nru libreoffice-3.6.1~rc2/l10ntools/source/helpmerge.cxx libreoffice-3.6.2~rc2/l10ntools/source/helpmerge.cxx
--- libreoffice-3.6.1~rc2/l10ntools/source/helpmerge.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/source/helpmerge.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -52,6 +52,7 @@
#include "common.hxx"
#include "helper.hxx"
+#include "gsicheck.hxx"
#if OSL_DEBUG_LEVEL > 2
void HelpParser::Dump(XMLHashMap* rElem_in)
@@ -382,9 +383,12 @@
{
if( pXMLElement != NULL )
{
- data = new XMLData( sNewdata , NULL , true ); // Add new one
- pXMLElement->RemoveAndDeleteAllChildren();
- pXMLElement->AddChild( data );
+ if (check(pEntrys->GetSDF(sCur),pEntrys->GetNLine(sCur)))
+ {
+ data = new XMLData( sNewdata , NULL , true ); // Add new one
+ pXMLElement->RemoveAndDeleteAllChildren();
+ pXMLElement->AddChild( data );
+ }
aLangHM->erase( sCur );
}
}
diff -Nru libreoffice-3.6.1~rc2/l10ntools/source/merge.cxx libreoffice-3.6.2~rc2/l10ntools/source/merge.cxx
--- libreoffice-3.6.1~rc2/l10ntools/source/merge.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/l10ntools/source/merge.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -158,6 +158,7 @@
printf("Warning : Can't open %s\n", rFileName.getStr());
return;
}
+ std::size_t nLine=0;
while (!aInputStream.eof())
{
std::string buf;
@@ -178,11 +179,12 @@
const rtl::OString sTEXT = sLine.getToken( 0, '\t', n ); // token 10
const rtl::OString sQHTEXT = sLine.getToken( 1, '\t', n ); // token 12
const rtl::OString sTITLE = sLine.getToken( 0, '\t', n ); // token 13
+ const rtl::OString sSDF(buf.data(),buf.length());
if (!nLANG.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("en-US")))
{
aLanguageSet.insert(nLANG);
- InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive );
+ InsertEntry( sTYP, sGID, sLID, sPFO, nLANG, sTEXT, sQHTEXT, sTITLE, filename, bCaseSensitive, sSDF, ++nLine);
}
}
}
@@ -250,7 +252,8 @@
const rtl::OString &rLID, const rtl::OString &rPFO,
const rtl::OString &nLANG, const rtl::OString &rTEXT,
const rtl::OString &rQHTEXT, const rtl::OString &rTITLE ,
- const rtl::OString &rInFilename , bool bCaseSensitive
+ const rtl::OString &rInFilename , bool bCaseSensitive,
+ const rtl::OString &rSDFLine, const std::size_t nLine
)
{
MergeData *pData;
@@ -281,7 +284,7 @@
}
// finaly insert the cur string
- pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE );
+ pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE, rSDFLine, nLine );
}
rtl::OString MergeDataFile::CreateKey(const rtl::OString& rTYP, const rtl::OString& rGID,
diff -Nru libreoffice-3.6.1~rc2/more_fonts/fonts/ttf_liberation/makefile.mk libreoffice-3.6.2~rc2/more_fonts/fonts/ttf_liberation/makefile.mk
--- libreoffice-3.6.1~rc2/more_fonts/fonts/ttf_liberation/makefile.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/more_fonts/fonts/ttf_liberation/makefile.mk 2012-09-25 12:13:30.000000000 +0000
@@ -1,29 +1,20 @@
-#*************************************************************************
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# This file is part of the LibreOffice project.
#
-# OpenOffice.org - a multi-platform office productivity suite
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-#
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
PRJ=..$/..
@@ -35,10 +26,12 @@
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
-
-TARFILE_NAME=liberation-fonts-ttf-1.07.1
-TARFILE_MD5=0be45d54cc5e1c2e3102e32b8c190346
-TARFILE_ROOTDIR=liberation-fonts-ttf-1.07.1
+# Note: Current release does not include Liberation Sans Narrow font because
+# that couldn't be relicensed to OFL, so we take the Narrow version from
+# the old release
+TARFILE_NAME=liberation-fonts-ttf-2.00.0
+TARFILE_MD5=cfbf1ac6f61bf6cf45342a0cc9381be5
+TARFILE_ROOTDIR=liberation-fonts-ttf-2.00.0
PATCH_FILES=
@@ -57,4 +50,3 @@
.IF "$(WITH_FONTS)"!="NO"
.INCLUDE : tg_ext.mk
.ENDIF
-
diff -Nru libreoffice-3.6.1~rc2/more_fonts/fonts/ttf_liberation_narrow/makefile.mk libreoffice-3.6.2~rc2/more_fonts/fonts/ttf_liberation_narrow/makefile.mk
--- libreoffice-3.6.1~rc2/more_fonts/fonts/ttf_liberation_narrow/makefile.mk 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-3.6.2~rc2/more_fonts/fonts/ttf_liberation_narrow/makefile.mk 2012-09-25 12:13:30.000000000 +0000
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+#
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=more_fonts
+TARGET=ttf_liberation_narrow
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+# Note: Current release does not include Liberation Sans Narrow font because
+# that couldn't be relicensed to OFL, so we take the Narrow version from
+# the old release
+TARFILE_NAME=liberation-fonts-ttf-1.07.1
+TARFILE_MD5=0be45d54cc5e1c2e3102e32b8c190346
+TARFILE_ROOTDIR=liberation-fonts-ttf-1.07.1
+
+PATCH_FILES=
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(WITH_FONTS)"!="NO"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff -Nru libreoffice-3.6.1~rc2/more_fonts/prj/build.lst libreoffice-3.6.2~rc2/more_fonts/prj/build.lst
--- libreoffice-3.6.1~rc2/more_fonts/prj/build.lst 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/more_fonts/prj/build.lst 2012-09-25 12:13:30.000000000 +0000
@@ -1,6 +1,7 @@
bs more_fonts : solenv NULL
bs more_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
bs more_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
+bs more_fonts\fonts\ttf_liberation_narrow nmake - all libe_fonts_narrow NULL
bs more_fonts\fonts\ttf_gentium nmake - all gent_fonts NULL
bs more_fonts\fonts\ttf_linlibertineg nmake - all linl_fonts NULL
bs more_fonts\fonts\ttf_amt nmake - all amt_fonts NULL
diff -Nru libreoffice-3.6.1~rc2/more_fonts/prj/d.lst libreoffice-3.6.2~rc2/more_fonts/prj/d.lst
--- libreoffice-3.6.1~rc2/more_fonts/prj/d.lst 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/more_fonts/prj/d.lst 2012-09-25 12:13:30.000000000 +0000
@@ -3,8 +3,10 @@
# TODO: replace explicit versions by wildcard when the build system learns to handle them
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf %COMMON_DEST%\pck\*.ttf
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE %COMMON_DEST%\pck\LICENSE_dejavu
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*.ttf %COMMON_DEST%\pck\*.ttf
-..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt %COMMON_DEST%\pck\LICENSE_liberation
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/Liberation*Narrow*.ttf %COMMON_DEST%\pck\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.07.1/License.txt %COMMON_DEST%\pck\LICENSE_liberation_narrow
+..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/Liberation*.ttf %COMMON_DEST%\pck\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-2.00.0/License.txt %COMMON_DEST%\pck\LICENSE_liberation
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck\LICENSE_gentium
..\%__SRC%\misc\build\LinLibertineG\*.ttf %COMMON_DEST%\pck\*.ttf
diff -Nru libreoffice-3.6.1~rc2/nlpsolver/Extension_nlpsolver.mk libreoffice-3.6.2~rc2/nlpsolver/Extension_nlpsolver.mk
--- libreoffice-3.6.1~rc2/nlpsolver/Extension_nlpsolver.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/nlpsolver/Extension_nlpsolver.mk 2012-09-25 12:13:30.000000000 +0000
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
@@ -39,11 +40,9 @@
$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverCommon_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverCommon_en_US.properties))
$(eval $(call gb_Extension_localize_properties,nlpsolver,locale/NLPSolverStatusDialog_en_US.properties,$(SRCDIR)/nlpsolver/src/locale/NLPSolverStatusDialog_en_US.properties))
-$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \
- $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp))
-$(eval $(call gb_Extension_add_file,nlpsolver,help/en-US/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \
- $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp))
-$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Options.xhp, \
- $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Options.xhp))
-$(eval $(call gb_Extension_localize_help,nlpsolver,help/lang/com.sun.star.comp.Calc.NLPSolver/Usage.xhp, \
- $(SRCDIR)/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver/Usage.xhp))
+$(eval $(call gb_Extension_add_helpfiles,nlpsolver,$(SRCDIR)/nlpsolver/help/en, \
+ com.sun.star.comp.Calc.NLPSolver/Options.xhp \
+ com.sun.star.comp.Calc.NLPSolver/Usage.xhp \
+))
+
+# vim: set noet sw=4 ts=4:
diff -Nru libreoffice-3.6.1~rc2/offapi/com/sun/star/deployment/XExtensionManager.idl libreoffice-3.6.2~rc2/offapi/com/sun/star/deployment/XExtensionManager.idl
--- libreoffice-3.6.1~rc2/offapi/com/sun/star/deployment/XExtensionManager.idl 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/offapi/com/sun/star/deployment/XExtensionManager.idl 2012-09-25 12:13:30.000000000 +0000
@@ -260,6 +260,9 @@
Please use this in case of suspected cache inconsistencies only.
+ @param force
+ set to true when called during soffice bootstrap after cleaning
+ old extension cache
@param repositroy
the name of the repository
@param xAbortChannel
@@ -268,6 +271,7 @@
command environment for error and progress handling
*/
void reinstallDeployedExtensions(
+ [in] boolean force,
[in] string repository,
[in] com::sun::star::task::XAbortChannel xAbortChannel,
[in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
diff -Nru libreoffice-3.6.1~rc2/offapi/com/sun/star/deployment/XPackageManager.idl libreoffice-3.6.2~rc2/offapi/com/sun/star/deployment/XPackageManager.idl
--- libreoffice-3.6.1~rc2/offapi/com/sun/star/deployment/XPackageManager.idl 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/offapi/com/sun/star/deployment/XPackageManager.idl 2012-09-25 12:13:30.000000000 +0000
@@ -225,12 +225,16 @@
Please use this in case of suspected cache inconsistencies only.
+ @param force
+ set to true when called during soffice bootstrap after cleaning
+ old extension cache
@param xAbortChannel
abort channel to asynchronously abort the adding process
@param xCmdEnv
command environment for error and progress handling
*/
void reinstallDeployedPackages(
+ [in] boolean force,
[in] com::sun::star::task::XAbortChannel xAbortChannel,
[in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
raises (DeploymentException,
diff -Nru libreoffice-3.6.1~rc2/officecfg/registry/schema/org/openoffice/Setup.xcs libreoffice-3.6.2~rc2/officecfg/registry/schema/org/openoffice/Setup.xcs
--- libreoffice-3.6.1~rc2/officecfg/registry/schema/org/openoffice/Setup.xcs 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/officecfg/registry/schema/org/openoffice/Setup.xcs 2012-09-25 12:13:30.000000000 +0000
@@ -457,6 +457,14 @@
true
+
+
+
+ erAck
+ Indicates the date acceptance patterns defined by the user. By default, this label is empty and the patterns defined in the ooSetupSystemLocale are used.
+
+
+
diff -Nru libreoffice-3.6.1~rc2/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs libreoffice-3.6.2~rc2/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs
--- libreoffice-3.6.1~rc2/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs 2012-09-25 12:13:30.000000000 +0000
@@ -69,6 +69,9 @@
Localized name of the filter, whch can be shown at the UI.
+
+ Extension to use when exporting content using this filter. When this value is not given, it is inferred from the Type associated with this filter.
+
diff -Nru libreoffice-3.6.1~rc2/ooo.lst.in libreoffice-3.6.2~rc2/ooo.lst.in
--- libreoffice-3.6.1~rc2/ooo.lst.in 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/ooo.lst.in 2012-09-25 12:13:30.000000000 +0000
@@ -15,6 +15,7 @@
2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
+cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
diff -Nru libreoffice-3.6.1~rc2/oowintool libreoffice-3.6.2~rc2/oowintool
--- libreoffice-3.6.1~rc2/oowintool 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/oowintool 2012-09-25 12:13:30.000000000 +0000
@@ -1,4 +1,5 @@
-#!/usr/bin/perl -w # -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
+#!/usr/bin/perl -w
+# -*- tab-width: 4; cperl-indent-level: 4; indent-tabs-mode: nil -*-
use File::Copy;
@@ -40,7 +41,7 @@
sub print_syntax()
{
print "oowintool [option] ...\n";
- print " encoding options\n";
+ print " encoding options\n";
print " -w - windows form\n";
print " -u - unix form (default)\n";
print " commands:\n";
@@ -69,7 +70,7 @@
$path =~ s|\\*\s*$||;
}
- # 'Unterminated quoted string errors' from 'ash' when
+ # 'Unterminated quoted string errors' from 'ash' when
# forking cygpath so - reimplement cygpath in perl [ gack ]
if ($format eq 'u' && $input_format eq 'w') {
$path =~ s|\\|/|g;
@@ -206,7 +207,7 @@
sub print_dotnetsdk_dir()
{
- my $dir =
+ my $dir =
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
if ($dir) {
@@ -222,7 +223,7 @@
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.5/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.4/JavaHome") ||
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java\ Development\ Kit/1.3/JavaHome");
- print cygpath($dir, 'w', $output_format);
+ print cygpath($dir, 'w', $output_format);
}
sub copy_dll($$$)
@@ -241,11 +242,11 @@
{
my $checkpath = shift;
my $ver = find_msvc();
- my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{$checkpath});
-d $srcdir && return $ver;
$ver = find_msvs();
- $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{$checkpath});
-d $srcdir && return $ver;
return undef;
@@ -256,7 +257,7 @@
my $dest = shift;
my $ver = msvc_find_version('dll_path');
defined $ver || return;
- my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{'dll_path'});
copy_dll ($srcdir, "msvcp" . $ver->{'dll_suffix'} . ".dll",
@@ -284,6 +285,10 @@
print STDERR "Copying $msm_path/$fname to $dest\n";
copy ("$msm_path/$fname", $dest) || die "copy failed: $!";
}
+ foreach $fname ("Microsoft_VC100_CRT_x86$postfix.msm") {
+ print STDERR "Copying $msm_path/$fname to $dest\n";
+ copy ("$msm_path/$fname", $dest) || print "copy failed: $!";
+ }
}
if (!@ARGV) {
diff -Nru libreoffice-3.6.1~rc2/oox/Library_oox.mk libreoffice-3.6.2~rc2/oox/Library_oox.mk
--- libreoffice-3.6.1~rc2/oox/Library_oox.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/oox/Library_oox.mk 2012-09-25 12:13:30.000000000 +0000
@@ -64,6 +64,7 @@
comphelper \
cppu \
cppuhelper \
+ editeng \
msfilter \
sal \
sax \
diff -Nru libreoffice-3.6.1~rc2/oox/inc/oox/export/vmlexport.hxx libreoffice-3.6.2~rc2/oox/inc/oox/export/vmlexport.hxx
--- libreoffice-3.6.1~rc2/oox/inc/oox/export/vmlexport.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/oox/inc/oox/export/vmlexport.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -30,8 +30,10 @@
#define _OOX_EXPORT_VMLEXPORT_HXX_
#include
+#include
#include
#include
+#include
namespace rtl {
class OString;
@@ -42,11 +44,28 @@
namespace vml {
+/// Interface to be implemented by the parent exporter that knows how to handle shape text.
+class OOX_DLLPUBLIC VMLTextExport
+{
+public:
+ virtual void WriteOutliner(const OutlinerParaObject& rParaObj) = 0;
+ virtual oox::drawingml::DrawingML& GetDrawingML() = 0;
+protected:
+ VMLTextExport() {}
+ virtual ~VMLTextExport() {}
+};
+
class OOX_DLLPUBLIC VMLExport : public EscherEx
{
/// Fast serializer to output the data
::sax_fastparser::FSHelperPtr m_pSerializer;
+ /// Parent exporter, used for text callback.
+ VMLTextExport* m_pTextExport;
+
+ /// The object we're exporting.
+ const SdrObject* m_pSdrObject;
+
/// Fill the shape attributes as they come.
::sax_fastparser::FastAttributeList *m_pShapeAttrList;
@@ -63,7 +82,7 @@
bool *m_pShapeTypeWritten;
public:
- VMLExport( ::sax_fastparser::FSHelperPtr pSerializer );
+ VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* pTextExport = 0 );
virtual ~VMLExport();
::sax_fastparser::FSHelperPtr
@@ -72,7 +91,7 @@
/// Export the sdr object as VML.
///
/// Call this when you need to export the object as VML.
- using EscherEx::AddSdrObject;
+ sal_uInt32 AddSdrObject( const SdrObject& rObj );
protected:
/// Add an attribute to the generated element.
diff -Nru libreoffice-3.6.1~rc2/oox/source/docprop/ooxmldocpropimport.cxx libreoffice-3.6.2~rc2/oox/source/docprop/ooxmldocpropimport.cxx
--- libreoffice-3.6.1~rc2/oox/source/docprop/ooxmldocpropimport.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/oox/source/docprop/ooxmldocpropimport.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -77,7 +77,7 @@
namespace {
-Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException)
+Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException, IllegalArgumentException)
{
Reference< XRelationshipAccess > xRelation( rxStorage, UNO_QUERY_THROW );
Reference< XHierarchicalStorageAccess > xHierarchy( rxStorage, UNO_QUERY_THROW );
@@ -147,19 +147,27 @@
const Reference< XStorage >& rxSource, const Reference< XDocumentProperties >& rxDocumentProperties )
throw (RuntimeException, IllegalArgumentException, SAXException, Exception)
{
+ Sequence< InputSource > aCoreStreams;
+ Sequence< InputSource > aExtStreams;
+ Sequence< InputSource > aCustomStreams;
+
if( !mxContext.is() )
throw RuntimeException();
if( !rxSource.is() || !rxDocumentProperties.is() )
throw IllegalArgumentException();
- Sequence< InputSource > aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "metadata/core-properties" ) );
- // MS Office seems to have a bug, so we have to do similar handling
- if( !aCoreStreams.hasElements() )
- aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_PACKAGE_RELATION_TYPE( "metadata/core-properties" ) );
+ try
+ {
+ aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "metadata/core-properties" ) );
+ // MS Office seems to have a bug, so we have to do similar handling
+ if( !aCoreStreams.hasElements() )
+ aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_PACKAGE_RELATION_TYPE( "metadata/core-properties" ) );
- Sequence< InputSource > aExtStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "extended-properties" ) );
- Sequence< InputSource > aCustomStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "custom-properties" ) );
+ aExtStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "extended-properties" ) );
+ aCustomStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "custom-properties" ) );
+ }
+ catch (const Exception&) {}
if( aCoreStreams.hasElements() || aExtStreams.hasElements() || aCustomStreams.hasElements() )
{
diff -Nru libreoffice-3.6.1~rc2/oox/source/drawingml/textparagraph.cxx libreoffice-3.6.2~rc2/oox/source/drawingml/textparagraph.cxx
--- libreoffice-3.6.1~rc2/oox/source/drawingml/textparagraph.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/oox/source/drawingml/textparagraph.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -129,12 +129,6 @@
const OUString sNumberingLevel( CREATE_OUSTRING( "NumberingLevel" ) );
xProps->setPropertyValue( sNumberingLevel, Any( static_cast< sal_Int16 >( -1 ) ) );
}
- else if ( nLevel > 1 )
- {
- // Even more UGLY HACK
- const OUString sNumberingLevel( CREATE_OUSTRING( "NumberingLevel" ) );
- xProps->setPropertyValue( sNumberingLevel, Any( static_cast< sal_Int16 >( nLevel-1 ) ) );
- }
// FIXME this is causing a lot of dispruption (ie does not work). I wonder what to do -- Hub
// Reference< XTextRange > xEnd( xAt, UNO_QUERY );
diff -Nru libreoffice-3.6.1~rc2/oox/source/export/vmlexport.cxx libreoffice-3.6.2~rc2/oox/source/export/vmlexport.cxx
--- libreoffice-3.6.1~rc2/oox/source/export/vmlexport.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/oox/source/export/vmlexport.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -34,6 +34,8 @@
#include
#include
+#include
+#include
#include
@@ -45,9 +47,11 @@
using namespace sax_fastparser;
using namespace oox::vml;
-VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer )
+VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport* pTextExport )
: EscherEx( EscherExGlobalRef(new EscherExGlobal(0)), 0 ),
m_pSerializer( pSerializer ),
+ m_pTextExport( pTextExport ),
+ m_pSdrObject( 0 ),
m_pShapeAttrList( NULL ),
m_nShapeType( ESCHER_ShpInst_Nil ),
m_pShapeStyle( new OStringBuffer( 200 ) ),
@@ -472,9 +476,13 @@
aPath.append( "e" );
break;
default:
-#if OSL_DEBUG_LEVEL > 0
- fprintf( stderr, "TODO: unhandled segment '%x' in the path\n", nSeg );
-#endif
+ // See EscherPropertyContainer::CreateCustomShapeProperties, by default nSeg is simply the number of points.
+ for (int i = 0; i < nSeg; ++i)
+ {
+ sal_Int32 nX = impl_GetPointComponent(pVerticesIt, nPointSize);
+ sal_Int32 nY = impl_GetPointComponent(pVerticesIt, nPointSize);
+ aPath.append("l").append(nX).append(",").append(nY);
+ }
break;
}
}
@@ -494,6 +502,7 @@
case ESCHER_Prop_fillType: // 384
case ESCHER_Prop_fillColor: // 385
case ESCHER_Prop_fillBackColor: // 387
+ case ESCHER_Prop_fillBlip: // 390
case ESCHER_Prop_fNoFillHitTest: // 447
{
sal_uInt32 nValue;
@@ -506,7 +515,7 @@
{
case ESCHER_FillSolid: pFillType = "solid"; break;
// TODO case ESCHER_FillPattern: pFillType = ""; break;
- // TODO case ESCHER_FillTexture: pFillType = ""; break;
+ case ESCHER_FillTexture: pFillType = "tile"; break;
// TODO case ESCHER_FillPicture: pFillType = ""; break;
// TODO case ESCHER_FillShade: pFillType = ""; break;
// TODO case ESCHER_FillShadeCenter: pFillType = ""; break;
@@ -530,6 +539,19 @@
if ( rProps.GetOpt( ESCHER_Prop_fillBackColor, nValue ) )
impl_AddColor( pAttrList, XML_color2, nValue );
+ EscherPropSortStruct aStruct;
+ if ( rProps.GetOpt( ESCHER_Prop_fillBlip, aStruct ) && m_pTextExport)
+ {
+ SvMemoryStream aStream;
+ int nHeaderSize = 25; // The first bytes are WW8-specific, we're only interested in the PNG
+ aStream.Write(aStruct.pBuf + nHeaderSize, aStruct.nPropSize - nHeaderSize);
+ aStream.Seek(0);
+ Graphic aGraphic;
+ GraphicConverter::Import(aStream, aGraphic, CVT_PNG);
+ OUString aImageId = m_pTextExport->GetDrawingML().WriteImage( aGraphic );
+ pAttrList->add(FSNS(XML_r, XML_id), OUStringToOString(aImageId, RTL_TEXTENCODING_UTF8));
+ }
+
if ( rProps.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) )
impl_AddBool( pAttrList, XML_detectmouseclick, nValue );
@@ -538,6 +560,7 @@
bAlreadyWritten[ ESCHER_Prop_fillType ] = true;
bAlreadyWritten[ ESCHER_Prop_fillColor ] = true;
bAlreadyWritten[ ESCHER_Prop_fillBackColor ] = true;
+ bAlreadyWritten[ ESCHER_Prop_fillBlip ] = true;
bAlreadyWritten[ ESCHER_Prop_fNoFillHitTest ] = true;
break;
@@ -648,7 +671,7 @@
default:
#if OSL_DEBUG_LEVEL > 0
fprintf( stderr, "TODO VMLExport::Commit(), unimplemented id: %d, value: %" SAL_PRIuUINT32 ", data: [%" SAL_PRIuUINT32 ", %p]\n",
- it->nPropId, it->nPropValue, it->nPropSize, it->pBuf );
+ nId, it->nPropValue, it->nPropSize, it->pBuf );
if ( it->nPropSize )
{
const sal_uInt8 *pIt = it->pBuf;
@@ -806,6 +829,37 @@
m_pSerializer->startElementNS( XML_v, nShapeElement, XFastAttributeListRef( m_pShapeAttrList ) );
}
+ // now check if we have some text and we have a text exporter registered
+ const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject);
+ if (pTxtObj && m_pTextExport)
+ {
+ const OutlinerParaObject* pParaObj = 0;
+ bool bOwnParaObj = false;
+
+ /*
+ #i13885#
+ When the object is actively being edited, that text is not set into
+ the objects normal text object, but lives in a seperate object.
+ */
+ if (pTxtObj->IsTextEditActive())
+ {
+ pParaObj = pTxtObj->GetEditOutlinerParaObject();
+ bOwnParaObj = true;
+ }
+ else
+ {
+ pParaObj = pTxtObj->GetOutlinerParaObject();
+ }
+
+ if( pParaObj )
+ {
+ // this is reached only in case some text is attached to the shape
+ m_pTextExport->WriteOutliner(*pParaObj);
+ if( bOwnParaObj )
+ delete pParaObj;
+ }
+ }
+
return nShapeElement;
}
@@ -818,4 +872,10 @@
}
}
+sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj )
+{
+ m_pSdrObject = &rObj;
+ return EscherEx::AddSdrObject(rObj);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff -Nru libreoffice-3.6.1~rc2/package/source/zipapi/ZipFile.cxx libreoffice-3.6.2~rc2/package/source/zipapi/ZipFile.cxx
--- libreoffice-3.6.1~rc2/package/source/zipapi/ZipFile.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/package/source/zipapi/ZipFile.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -699,9 +699,11 @@
// Do *not* compare nMethod / nHow, older versions with
// encrypted streams write mismatching DEFLATE/STORE pairs
// there.
+ // Do *not* compare timestamps, since MSO 2010 can produce documents
+ // with timestamp difference in the central directory entry and local
+ // file header.
bBroken = rEntry.nVersion != nVersion
|| (rEntry.nFlag & ~6L) != (nFlag & ~6L)
- || rEntry.nTime != nTime
|| rEntry.nPathLen != nPathLen
|| !rEntry.sPath.equals( sLOCPath );
}
diff -Nru libreoffice-3.6.1~rc2/reportbuilder/java/com/sun/star/report/ImageService.java libreoffice-3.6.2~rc2/reportbuilder/java/com/sun/star/report/ImageService.java
--- libreoffice-3.6.1~rc2/reportbuilder/java/com/sun/star/report/ImageService.java 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/reportbuilder/java/com/sun/star/report/ImageService.java 2012-09-25 12:13:30.000000000 +0000
@@ -26,7 +26,7 @@
************************************************************************/
package com.sun.star.report;
-import java.awt.Dimension;
+import com.sun.star.awt.Size;
import java.io.InputStream;
@@ -57,7 +57,7 @@
*
* @throws ReportExecutionException
* @return*/
- Dimension getImageSize(final InputStream image) throws ReportExecutionException;
+ Size getImageSize(final InputStream image) throws ReportExecutionException;
/**
* @param image
@@ -65,6 +65,6 @@
*
* @throws ReportExecutionException
* @return*/
- Dimension getImageSize(final byte[] image) throws ReportExecutionException;
+ Size getImageSize(final byte[] image) throws ReportExecutionException;
}
diff -Nru libreoffice-3.6.1~rc2/reportbuilder/java/com/sun/star/report/SOImageService.java libreoffice-3.6.2~rc2/reportbuilder/java/com/sun/star/report/SOImageService.java
--- libreoffice-3.6.1~rc2/reportbuilder/java/com/sun/star/report/SOImageService.java 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/reportbuilder/java/com/sun/star/report/SOImageService.java 2012-09-25 12:13:30.000000000 +0000
@@ -41,8 +41,6 @@
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
-import java.awt.Dimension;
-
import java.io.InputStream;
@@ -78,14 +76,14 @@
}
}
- public Dimension getImageSize(final InputStream image) throws ReportExecutionException
+ public Size getImageSize(final InputStream image) throws ReportExecutionException
{
return getImageSize(new InputStreamToXInputStreamAdapter(image));
}
- private Dimension getImageSize(final XInputStream image) throws ReportExecutionException
+ private Size getImageSize(final XInputStream image) throws ReportExecutionException
{
- final Dimension dim = new Dimension();
+ final Size dim = new Size();
try
{
final PropertyValue[] value = new PropertyValue[]
@@ -105,13 +103,15 @@
if (xInfo.hasPropertyByName("Size100thMM"))
{
Size imageSize = (Size) xImage.getPropertyValue("Size100thMM");
- dim.setSize(imageSize.Width, imageSize.Height);
- if (dim.height == 0 && dim.width == 0)
+ dim.Width = imageSize.Width;
+ dim.Height = imageSize.Height;
+ if (dim.Height == 0 && dim.Width == 0)
{
imageSize = (Size) xImage.getPropertyValue("SizePixel");
final int dpi = java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
final double fac = 2540 / (double) dpi;
- dim.setSize(imageSize.Width * fac, imageSize.Height * fac);
+ dim.Width = (int) (imageSize.Width * fac);
+ dim.Height = (int) (imageSize.Height * fac);
}
}
else if (xInfo.hasPropertyByName("SizePixel"))
@@ -119,7 +119,8 @@
final Size imageSize = (Size) xImage.getPropertyValue("SizePixel");
final int dpi = java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
final double fac = 2540 / dpi;
- dim.setSize(imageSize.Width * fac, imageSize.Height * fac);
+ dim.Width = (int) (imageSize.Width * fac);
+ dim.Height = (int) (imageSize.Height * fac);
}
}
}
@@ -130,7 +131,7 @@
return dim;
}
- public Dimension getImageSize(final byte[] image) throws ReportExecutionException
+ public Size getImageSize(final byte[] image) throws ReportExecutionException
{
return getImageSize(new ByteArrayToXInputStreamAdapter(image));
}
diff -Nru libreoffice-3.6.1~rc2/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java libreoffice-3.6.2~rc2/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java
--- libreoffice-3.6.1~rc2/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/reportbuilder/java/com/sun/star/report/pentaho/output/ImageProducer.java 2012-09-25 12:13:30.000000000 +0000
@@ -26,13 +26,13 @@
************************************************************************/
package com.sun.star.report.pentaho.output;
+import com.sun.star.awt.Size;
import com.sun.star.report.ImageService;
import com.sun.star.report.InputRepository;
import com.sun.star.report.OutputRepository;
import com.sun.star.report.ReportExecutionException;
import com.sun.star.report.pentaho.DefaultNameGenerator;
-import java.awt.Dimension;
import java.awt.Image;
import java.io.BufferedInputStream;
@@ -280,7 +280,7 @@
try
{
final String mimeType = imageService.getMimeType(data);
- final Dimension dims = imageService.getImageSize(data);
+ final Size dims = imageService.getImageSize(data);
// copy the image into the local output-storage
// todo: Implement data-fingerprinting so that we can detect the mime-type
@@ -299,8 +299,8 @@
storage.closeOutputRepository();
}
- final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getWidth() / 100.0);
- final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getHeight() / 100.0);
+ final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.Width / 100.0);
+ final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.Height / 100.0);
final OfficeImage officeImage = new OfficeImage("Pictures/" + name, widthVal, heightVal);
imageCache.put(imageKey, officeImage);
return officeImage;
@@ -352,11 +352,11 @@
inputStream.close();
}
final byte[] data = bout.toByteArray();
- final Dimension dims = imageService.getImageSize(data);
+ final Size dims = imageService.getImageSize(data);
final String mimeType = imageService.getMimeType(data);
- final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getWidth() / 100.0);
- final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getHeight() / 100.0);
+ final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.Width / 100.0);
+ final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.Height / 100.0);
final String filename = copyToOutputRepository(mimeType, data);
final OfficeImage officeImage = new OfficeImage(filename, widthVal, heightVal);
@@ -428,10 +428,10 @@
}
final byte[] data = bout.toByteArray();
- final Dimension dims = imageService.getImageSize(data);
+ final Size dims = imageService.getImageSize(data);
final String mimeType = imageService.getMimeType(data);
- final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getWidth() / 100.0);
- final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.getHeight() / 100.0);
+ final CSSNumericValue widthVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.Width / 100.0);
+ final CSSNumericValue heightVal = CSSNumericValue.createValue(CSSNumericType.MM, dims.Height / 100.0);
if (preserveIRI)
{
diff -Nru libreoffice-3.6.1~rc2/reportdesign/source/core/api/Section.cxx libreoffice-3.6.2~rc2/reportdesign/source/core/api/Section.cxx
--- libreoffice-3.6.1~rc2/reportdesign/source/core/api/Section.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/reportdesign/source/core/api/Section.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -165,6 +165,12 @@
{
OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!");
SectionPropertySet::dispose();
+ uno::Reference const xPageComponent(m_xDrawPage,
+ uno::UNO_QUERY);
+ if (xPageComponent.is())
+ {
+ xPageComponent->dispose();
+ }
cppu::WeakComponentImplHelperBase::dispose();
}
@@ -208,11 +214,15 @@
if ( pModel )
{
uno::Reference const xSection(this);
- m_xDrawPage.set(pModel->createNewPage(xSection)->getUnoPage(),
- uno::UNO_QUERY_THROW);
+ SdrPage & rSdrPage(*pModel->createNewPage(xSection));
+ m_xDrawPage.set(rSdrPage.getUnoPage(), uno::UNO_QUERY_THROW);
m_xDrawPage_ShapeGrouper.set(m_xDrawPage, uno::UNO_QUERY_THROW);
// apparently we may also get OReportDrawPage which doesn't support this
m_xDrawPage_FormSupplier.set(m_xDrawPage, uno::UNO_QUERY);
+ m_xDrawPage_Tunnel.set(m_xDrawPage, uno::UNO_QUERY_THROW);
+ // fdo#53872: now also exchange the XDrawPage in the SdrPage so that
+ // rSdrPage.getUnoPage returns this
+ rSdrPage.SetUnoPage(this);
// createNewPage _should_ have stored away 2 uno::References to this,
// so our ref count cannot be 1 here, so this isn't destroyed here
assert(m_refCount > 1);
diff -Nru libreoffice-3.6.1~rc2/reportdesign/source/core/sdr/RptObject.cxx libreoffice-3.6.2~rc2/reportdesign/source/core/sdr/RptObject.cxx
--- libreoffice-3.6.1~rc2/reportdesign/source/core/sdr/RptObject.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/reportdesign/source/core/sdr/RptObject.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -410,8 +410,10 @@
if ( pPage && !_rRect.IsEmpty() )
{
uno::Reference xSection = pPage->getSection();
- if ( xSection.is() && (static_cast(_rRect.getHeight() + _rRect.Top()) > xSection->getHeight()) )
- xSection->setHeight(_rRect.getHeight() + _rRect.Top());
+ assert(_rRect.getHeight() >= 0);
+ const sal_uInt32 newHeight( ::std::max(0l, _rRect.getHeight()+_rRect.Top()) );
+ if ( xSection.is() && ( newHeight > xSection->getHeight() ) )
+ xSection->setHeight( newHeight );
// TODO
//pModel->GetRefDevice()->Invalidate(INVALIDATE_CHILDREN);
diff -Nru libreoffice-3.6.1~rc2/sal/osl/w32/salinit.cxx libreoffice-3.6.2~rc2/sal/osl/w32/salinit.cxx
--- libreoffice-3.6.1~rc2/sal/osl/w32/salinit.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sal/osl/w32/salinit.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -26,6 +26,10 @@
*
************************************************************************/
+#include "sal/config.h"
+
+#include
+#include
#include "system.h"
#include
@@ -35,6 +39,23 @@
extern "C" {
#endif
+// _set_invalid_parameter_handler appears unavailable with MinGW:
+#if defined _MSC_VER
+namespace {
+
+extern "C" void invalidParameterHandler(
+ wchar_t const * expression, wchar_t const * function, wchar_t const * file,
+ unsigned int line, SAL_UNUSED_PARAMETER uintptr_t)
+{
+ std::wcerr
+ << L"Invalid parameter in \"" << (expression ? expression : L"???")
+ << L"\" (" << (function ? function : L"???") << ") at "
+ << (file ? file : L"???") << L':' << line << std::endl;
+}
+
+}
+#endif
+
// Prototypes for initialization and deinitialization of SAL library
SAL_DLLPUBLIC void SAL_CALL sal_detail_initialize(int argc, char ** argv)
@@ -86,6 +107,14 @@
// How to handle a very unlikely error ???
}
+#if defined _MSC_VER // appears unavailable with MinGW
+ // It appears that at least some jvm.dll versions can cause calls to
+ // _fileno(NULL), which leads to a call of the invalid parameter handler,
+ // and the default handler causes the application to crash, so install a
+ // "harmless" one (cf. fdo#38913):
+ _set_invalid_parameter_handler(&invalidParameterHandler);
+#endif
+
osl_setCommandArgs(argc, argv);
}
diff -Nru libreoffice-3.6.1~rc2/sc/inc/conditio.hxx libreoffice-3.6.2~rc2/sc/inc/conditio.hxx
--- libreoffice-3.6.1~rc2/sc/inc/conditio.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/inc/conditio.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -109,6 +109,12 @@
virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const = 0;
virtual void SetParent( ScConditionalFormat* pNew ) = 0;
+
+ bool operator==( const ScFormatEntry& ) const;
+
+#if DUMP_FORMAT_INFO
+ virtual void dumpInfo() const = 0;
+#endif
protected:
ScDocument* mpDoc;
@@ -273,6 +279,8 @@
void AddEntry( ScFormatEntry* pNew );
void AddRange( const ScRangeList& rRanges );
const ScRangeList& GetRange() const { return maRanges; }
+ // don't use the same name as for the const version
+ ScRangeList& GetRangeList() { return maRanges; }
bool IsEmpty() const { return maEntries.empty(); }
size_t size() const { return maEntries.size(); }
diff -Nru libreoffice-3.6.1~rc2/sc/inc/dpobject.hxx libreoffice-3.6.2~rc2/sc/inc/dpobject.hxx
--- libreoffice-3.6.1~rc2/sc/inc/dpobject.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/inc/dpobject.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -245,7 +245,7 @@
* Remove in the save data entries for members that don't exist anymore.
* This is called during pivot table refresh.
*/
- void SyncAllDimensionMembers();
+ bool SyncAllDimensionMembers();
static bool HasRegisteredSources();
static com::sun::star::uno::Sequence GetRegisteredSources();
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/cell.cxx libreoffice-3.6.2~rc2/sc/source/core/data/cell.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/cell.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/cell.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -267,6 +267,9 @@
bool ScBaseCell::IsBlank() const
{
+ if(eCellType == CELLTYPE_NOTE)
+ return true;
+
return false;
}
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/column3.cxx libreoffice-3.6.2~rc2/sc/source/core/data/column3.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/column3.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/column3.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -401,8 +401,11 @@
SvtBroadcaster* pBC = pOldCell->GetBroadcaster();
bool bKeepBC = pBC && pBC->HasListeners();
// #i99844# do not release broadcaster from old cell, it still has to notify deleted content
- if ( bKeepBC)
- pNoteCell = new ScNoteCell( pBC );
+ if (bKeepBC)
+ {
+ pNoteCell = new ScNoteCell( pBC );
+ pOldCell->ReleaseBroadcaster();
+ }
// remove cell entry in cell item list
SCROW nOldRow = maItems[nIdx].nRow;
@@ -424,7 +427,10 @@
else
{
aHint.GetAddress().SetRow( nOldRow );
- aHint.SetCell( pOldCell );
+ if(bKeepBC)
+ aHint.SetCell( pNoteCell );
+ else
+ aHint.SetCell( pOldCell );
pDocument->Broadcast( aHint );
if (pNoteCell != pOldCell)
{
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/conditio.cxx libreoffice-3.6.2~rc2/sc/source/core/data/conditio.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/conditio.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/conditio.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -57,6 +57,27 @@
{
}
+bool ScFormatEntry::operator==( const ScFormatEntry& r ) const
+{
+ if(GetType() != r.GetType())
+ return false;
+
+ switch(GetType())
+ {
+ case condformat::CONDITION:
+ return static_cast(*this) == static_cast(r);
+ break;
+ default:
+ // TODO: implement also this case
+ // actually return false for these cases is not that bad
+ // as soon as databar and color scale are tested we need
+ // to think about the range
+ return false;
+ }
+
+ return true;
+}
+
bool lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, sal_uInt16 nRecursion = 0 )
{
if (pFormula)
@@ -753,8 +774,21 @@
const ScRange *aRange = rRanges[i];
SCROW nRow = aRange->aEnd.Row();
SCCOL nCol = aRange->aEnd.Col();
- for( SCROW r = aRange->aStart.Row(); r <= nRow; r++ )
- for( SCCOL c = aRange->aStart.Col(); c <= nCol; c++ )
+ SCCOL nColStart = aRange->aStart.Col();
+ SCROW nRowStart = aRange->aEnd.Row();
+ SCTAB nTab = aRange->aStart.Tab();
+
+ // temporary fix to workaorund slow duplicate entry
+ // conditions, prevent to use a whole row
+ if(nRow == MAXROW)
+ {
+ bool bShrunk = false;
+ pDoc->ShrinkToUsedDataArea(bShrunk, nTab, nColStart, nRowStart,
+ nCol, nRow, false);
+ }
+
+ for( SCROW r = nRowStart; r <= nRow; r++ )
+ for( SCCOL c = nColStart; c <= nCol; c++ )
{
double nVal = 0.0;
ScBaseCell *pCell = NULL;
@@ -1126,7 +1160,7 @@
ScRange aPaint( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 );
// kein Paint, wenn es nur die Zelle selber ist
- if ( aPaint.aStart != rChanged || aPaint.aEnd != rChanged )
+ if ( aPaint.IsValid() && (aPaint.aStart != rChanged || aPaint.aEnd != rChanged ))
DataChanged( &aPaint );
}
}
@@ -1289,8 +1323,6 @@
{
return ScConditionEntry::operator==( r ) &&
aStyleName == r.aStyleName;
-
- // Range wird nicht verglichen
}
ScCondFormatEntry::~ScCondFormatEntry()
@@ -1356,13 +1388,14 @@
//! auf gleiche Eintraege in anderer Reihenfolge testen ???
- /*
- for (sal_uInt16 i=0; imnOrderIndex = nCurIndex;
for (++it; it != itEnd; ++it)
{
- if (aPrev != it->maValue)
+ if (!aPrev.IsCaseInsEqual(it->maValue))
++nCurIndex;
it->mnOrderIndex = nCurIndex;
@@ -461,24 +461,27 @@
Reference xRow(xRowSet, UNO_QUERY_THROW);
std::vector aBuckets;
+ ScDPItemData aData;
for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol)
{
xRowSet->first();
- ScDPItemData aData;
aBuckets.clear();
Field& rField = maFields[nCol];
+ SCROW nRow = 0;
do
{
- SCROW nRow = 0;
short nFormatType = NUMBERFORMAT_UNDEFINED;
+ aData.SetEmpty();
getItemValue(*this, aData, xRow, aColTypes[nCol], nCol+1, rNullDate, nFormatType);
- aBuckets.push_back(Bucket(aData, 0, nRow++));
+ aBuckets.push_back(Bucket(aData, 0, nRow));
if (!aData.IsEmpty())
{
maEmptyRows.insert_back(nRow, nRow+1, false);
SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
rField.mnNumFormat = pFormatter ? pFormatter->GetStandardFormat(nFormatType) : 0;
}
+
+ ++nRow;
}
while (xRowSet->next());
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/dpitemdata.cxx libreoffice-3.6.2~rc2/sc/source/core/data/dpitemdata.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/dpitemdata.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/dpitemdata.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -210,8 +210,9 @@
;
}
- if (mbStringInterned && r.mbStringInterned)
- return mpString == r.mpString;
+ if (mbStringInterned && r.mbStringInterned && mpString == r.mpString)
+ // Fast equality check for interned strings.
+ return true;
return ScGlobal::GetpTransliteration()->isEqual(GetString(), r.GetString());
}
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/dpobject.cxx libreoffice-3.6.2~rc2/sc/source/core/data/dpobject.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/dpobject.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/dpobject.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -705,21 +705,27 @@
pSaveData->BuildAllDimensionMembers(GetTableData());
}
-void ScDPObject::SyncAllDimensionMembers()
+bool ScDPObject::SyncAllDimensionMembers()
{
if (!pSaveData)
- return;
+ return false;
// #i111857# don't always create empty mpTableData for external service.
// Ideally, xSource should be used instead of mpTableData.
if (pServDesc)
- return;
+ return false;
ScDPTableData* pData = GetTableData();
+ if (!pData)
+ // No table data exists. This can happen when refreshing from an
+ // external source which doesn't exist.
+ return false;
+
// Refresh the cache wrapper since the cache may have changed.
pData->SetEmptyFlags(pSaveData->GetIgnoreEmptyRows(), pSaveData->GetRepeatIfEmpty());
pData->ReloadCacheTable();
pSaveData->SyncAllDimensionMembers(pData);
+ return true;
}
bool ScDPObject::GetMemberNames( sal_Int32 nDim, Sequence& rNames )
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/fillinfo.cxx libreoffice-3.6.2~rc2/sc/source/core/data/fillinfo.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/fillinfo.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/fillinfo.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -495,6 +495,8 @@
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
if (pBackground != pDefBackground) // Spalten-HG == Standard ?
pThisRowInfo->bEmptyBack = false;
+ if (pCondForm)
+ pThisRowInfo->bEmptyBack = false;
if (bAutoFilter)
pThisRowInfo->bAutoFilter = true;
if (bPushButton)
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/table2.cxx libreoffice-3.6.2~rc2/sc/source/core/data/table2.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/table2.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/table2.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -667,6 +667,12 @@
if (aOldIdToNewId.find(nId) == aOldIdToNewId.end())
{
ScConditionalFormat* pFormat = pOldCondFormatList->GetFormat(nId);
+ if(!pFormat)
+ {
+ // may happen in some strange circumstances where cell storage and
+ // cond format storage are not in sync
+ continue;
+ }
ScConditionalFormat* pNewFormat = pFormat->Clone(pDocument);
pNewFormat->SetKey(0);
//not in list => create entries in both maps and new format
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/data/table3.cxx libreoffice-3.6.2~rc2/sc/source/core/data/table3.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/data/table3.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/data/table3.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -563,7 +563,9 @@
void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
{
- for (SCROW nRow = aSortParam.nRow1; nRow <= aSortParam.nRow2; nRow++)
+ SCROW nRowStart = aSortParam.nRow1;
+ SCROW nRowEnd = aSortParam.nRow2;
+ for (SCROW nRow = nRowStart; nRow <= nRowEnd; nRow++)
{
aCol[nCol1].SwapCell(nRow, aCol[nCol2]);
if (aSortParam.bIncludePattern)
@@ -589,16 +591,19 @@
ScPostIt* pPostIt = itr->second;
++itr;
- if (nCol == nCol1)
+ if(nRow >= nRowStart && nRow <= nRowEnd)
{
- aNoteMap.insert(nCol, nRow, pPostIt);
- maNotes.ReleaseNote(nCol2, nRow);
- }
- else if (nCol == nCol2)
- {
- aNoteMap.insert(nCol, nRow, pPostIt);
- maNotes.ReleaseNote(nCol1, nRow);
+ if (nCol == nCol1)
+ {
+ aNoteMap.insert(nCol2, nRow, pPostIt);
+ maNotes.ReleaseNote(nCol, nRow);
+ }
+ else if (nCol == nCol2)
+ {
+ aNoteMap.insert(nCol1, nRow, pPostIt);
+ maNotes.ReleaseNote(nCol, nRow);
+ }
}
}
@@ -609,6 +614,7 @@
SCCOL nCol = itr->first.first;
SCROW nRow = itr->first.second;
ScPostIt* pPostIt = itr->second;
+ ++itr;
maNotes.insert(nCol, nRow, pPostIt);
aNoteMap.ReleaseNote(nCol, nRow);
@@ -617,7 +623,9 @@
void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
{
- for (SCCOL nCol = aSortParam.nCol1; nCol <= aSortParam.nCol2; nCol++)
+ SCCOL nColStart = aSortParam.nCol1;
+ SCCOL nColEnd = aSortParam.nCol2;
+ for (SCCOL nCol = nColStart; nCol <= nColEnd; nCol++)
{
aCol[nCol].SwapRow(nRow1, nRow2);
if (aSortParam.bIncludePattern)
@@ -655,16 +663,18 @@
ScPostIt* pPostIt = itr->second;
++itr;
- if (nRow == nRow1)
+ if( nCol >= nColStart && nCol <= nColEnd )
{
- aNoteMap.insert(nCol, nRow, pPostIt);
- maNotes.ReleaseNote(nCol, nRow2);
- }
- else if (nRow == nRow2)
- {
- aNoteMap.insert(nCol, nRow, pPostIt);
- maNotes.ReleaseNote(nCol, nRow1);
-
+ if (nRow == nRow1)
+ {
+ aNoteMap.insert(nCol, nRow2, pPostIt);
+ maNotes.ReleaseNote(nCol, nRow);
+ }
+ else if (nRow == nRow2)
+ {
+ aNoteMap.insert(nCol, nRow1, pPostIt);
+ maNotes.ReleaseNote(nCol, nRow);
+ }
}
}
@@ -675,6 +685,7 @@
SCCOL nCol = itr->first.first;
SCROW nRow = itr->first.second;
ScPostIt* pPostIt = itr->second;
+ ++itr;
maNotes.insert(nCol, nRow, pPostIt);
aNoteMap.ReleaseNote(nCol, nRow);
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/tool/address.cxx libreoffice-3.6.2~rc2/sc/source/core/tool/address.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/tool/address.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/tool/address.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -326,6 +326,57 @@
}
+/** Tries to obtain the external document index and replace by actual document
+ name.
+
+ @param ppErrRet
+ Contains the default pointer the caller would return if this method
+ returns FALSE, may be replaced by NULL for type or data errors.
+
+ @returns FALSE only if the input name is numeric and not within the index
+ sequence, or the link type cannot be determined or data mismatch. Returns
+ TRUE in all other cases, also when there is no index sequence or the input
+ name is not numeric.
+ */
+bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExternDocName,
+ const uno::Sequence< const sheet::ExternalLinkInfo > * pExternalLinks)
+{
+ // 1-based, sequence starts with an empty element.
+ if (pExternalLinks && pExternalLinks->getLength() > 1)
+ {
+ // A numeric "document name" is an index into the sequence.
+ if (CharClass::isAsciiNumeric( rExternDocName))
+ {
+ sal_Int32 i = rExternDocName.ToInt32();
+ if (i <= 0 || i >= pExternalLinks->getLength())
+ return false; // with default *ppErrRet
+ const sheet::ExternalLinkInfo & rInfo = (*pExternalLinks)[i];
+ switch (rInfo.Type)
+ {
+ case sheet::ExternalLinkType::DOCUMENT :
+ {
+ rtl::OUString aStr;
+ if (!(rInfo.Data >>= aStr))
+ {
+ OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i);
+ *ppErrRet = NULL;
+ return false;
+ }
+ rExternDocName = aStr;
+ }
+ break;
+ default:
+ OSL_TRACE( "ScRange::Parse_XL_Header: unhandled ExternalLinkType %d for index %d",
+ rInfo.Type, i);
+ *ppErrRet = NULL;
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+
const sal_Unicode* ScRange::Parse_XL_Header(
const sal_Unicode* p,
const ScDocument* pDoc,
@@ -368,36 +419,10 @@
}
++p;
- // 1-based, sequence starts with an empty element.
- if (pExternalLinks && pExternalLinks->getLength() > 1)
- {
- // A numeric "document name" is an index into the sequence.
- if (CharClass::isAsciiNumeric( rExternDocName))
- {
- sal_Int32 i = rExternDocName.ToInt32();
- if (i <= 0 || i >= pExternalLinks->getLength())
- return start;
- const sheet::ExternalLinkInfo & rInfo = (*pExternalLinks)[i];
- switch (rInfo.Type)
- {
- case sheet::ExternalLinkType::DOCUMENT :
- {
- rtl::OUString aStr;
- if (!(rInfo.Data >>= aStr))
- {
- OSL_TRACE( "ScRange::Parse_XL_Header: Data type mismatch for ExternalLinkInfo %d", i);
- return NULL;
- }
- rExternDocName = aStr;
- }
- break;
- default:
- OSL_TRACE( "ScRange::Parse_XL_Header: unhandled ExternalLinkType %d for index %d",
- rInfo.Type, i);
- return NULL;
- }
- }
- }
+ const sal_Unicode* pErrRet = start;
+ if (!lcl_XL_getExternalDoc( &pErrRet, rExternDocName, pExternalLinks))
+ return pErrRet;
+
rExternDocName = ScGlobal::GetAbsDocName(rExternDocName, pDoc->GetDocumentShell());
}
else if (*p == '\'')
@@ -407,6 +432,8 @@
// 'E:\[EXTDATA12B.XLSB]Sheet1:Sheet3'!$A$11
// But, 'Sheet1'!B3 would also be a valid!
// Excel does not allow [ and ] characters in sheet names though.
+ // But, more sickness comes with MOOXML as there may be
+ // '[1]Sheet 4'!$A$1 where [1] is the external doc's index.
p = lcl_ParseQuotedName(p, rExternDocName);
if (!*p || *p != '!')
{
@@ -435,6 +462,14 @@
for ( ; *p != ']'; ++p)
;
++p;
+
+ // Handle '[1]Sheet 4'!$A$1
+ if (nOpen == 0)
+ {
+ const sal_Unicode* pErrRet = start;
+ if (!lcl_XL_getExternalDoc( &pErrRet, rExternDocName, pExternalLinks))
+ return pErrRet;
+ }
}
}
}
diff -Nru libreoffice-3.6.1~rc2/sc/source/core/tool/rangelst.cxx libreoffice-3.6.2~rc2/sc/source/core/tool/rangelst.cxx
--- libreoffice-3.6.1~rc2/sc/source/core/tool/rangelst.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/core/tool/rangelst.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -407,14 +407,6 @@
SCTAB nTab2;
rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
- // delete all entries that are fully deleted
- if( eUpdateRefMode == URM_INSDEL && (nDx < 0 || nDy < 0) )
- {
- vector::iterator itr = std::remove_if(maRanges.begin(), maRanges.end(), FindDeletedRange(nDx, nDy));
- for_each(itr, maRanges.end(), ScDeleteObjectByPtr());
- maRanges.erase(itr, maRanges.end());
- }
-
vector::iterator itr = maRanges.begin(), itrEnd = maRanges.end();
for (; itr != itrEnd; ++itr)
{
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/excel/xestyle.cxx libreoffice-3.6.2~rc2/sc/source/filter/excel/xestyle.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/excel/xestyle.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/excel/xestyle.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1885,6 +1885,33 @@
rStyleSheet->endElement( XML_fill );
}
+
+bool XclExpColor::FillFromItemSet( const SfxItemSet& rItemSet )
+{
+ if( !ScfTools::CheckItem( rItemSet, ATTR_BACKGROUND, true ) )
+ return false;
+
+ const SvxBrushItem& rBrushItem = GETITEM( rItemSet, SvxBrushItem, ATTR_BACKGROUND );
+ maColor = rBrushItem.GetColor();
+
+ return true;
+}
+
+void XclExpColor::SaveXml( XclExpXmlStream& rStrm ) const
+{
+ sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
+ rStyleSheet->startElement( XML_fill,
+ FSEND );
+ rStyleSheet->startElement( XML_patternFill,
+ FSEND );
+ rStyleSheet->singleElement( XML_bgColor,
+ XML_rgb, XclXmlUtils::ToOString(maColor).getStr(),
+ FSEND );
+
+ rStyleSheet->endElement( XML_patternFill );
+ rStyleSheet->endElement( XML_fill );
+}
+
// ----------------------------------------------------------------------------
XclExpXFId::XclExpXFId() :
@@ -2902,11 +2929,11 @@
pCellProt = NULL;
}
- XclExpCellArea* pCellArea = new XclExpCellArea;
- if(!pCellArea->FillFromItemSet( rSet, GetPalette(), GetBiff() ))
+ XclExpColor* pColor = new XclExpColor();
+ if(!pColor->FillFromItemSet( rSet ))
{
- delete pCellArea;
- pCellArea = NULL;
+ delete pColor;
+ pColor = NULL;
}
XclExpFont* pFont = NULL;
@@ -2927,7 +2954,7 @@
++nNumFmtIndex;
}
- maDxf.push_back(new XclExpDxf( rRoot, pAlign, pBorder, pFont, pNumFormat, pCellProt, pCellArea ));
+ maDxf.push_back(new XclExpDxf( rRoot, pAlign, pBorder, pFont, pNumFormat, pCellProt, pColor ));
++nIndex;
}
@@ -2966,16 +2993,15 @@
// ============================================================================
XclExpDxf::XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, XclExpCellBorder* pBorder,
- XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpCellArea* pCellArea)
+ XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor)
: XclExpRoot( rRoot ),
mpAlign(pAlign),
mpBorder(pBorder),
mpFont(pFont),
mpNumberFmt(pNumberFmt),
mpProt(pProt),
- mpCellArea(pCellArea)
+ mpColor(pColor)
{
-
}
XclExpDxf::~XclExpDxf()
@@ -2985,7 +3011,7 @@
delete mpFont;
delete mpNumberFmt;
delete mpProt;
- delete mpCellArea;
+ delete mpColor;
}
void XclExpDxf::SaveXml( XclExpXmlStream& rStrm )
@@ -3003,8 +3029,8 @@
mpNumberFmt->SaveXml(rStrm);
if (mpProt)
mpProt->SaveXml(rStrm);
- if (mpCellArea)
- mpCellArea->SaveXml(rStrm);
+ if (mpColor)
+ mpColor->SaveXml(rStrm);
rStyleSheet->endElement( XML_dxf );
}
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/excel/xipivot.cxx libreoffice-3.6.2~rc2/sc/source/filter/excel/xipivot.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/excel/xipivot.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/excel/xipivot.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1091,7 +1091,11 @@
if( !pCacheField || !pCacheField->IsSupportedField() )
return 0;
- ScDPSaveDimension& rSaveDim = *rSaveData.GetNewDimensionByName( rFieldName );
+ ScDPSaveDimension* pTest = rSaveData.GetNewDimensionByName(rFieldName);
+ if (!pTest)
+ return NULL;
+
+ ScDPSaveDimension& rSaveDim = *pTest;
// orientation
rSaveDim.SetOrientation( static_cast< sal_uInt16 >( maFieldInfo.GetApiOrient( EXC_SXVD_AXIS_ROWCOLPAGE ) ) );
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/inc/lotattr.hxx libreoffice-3.6.2~rc2/sc/source/filter/inc/lotattr.hxx
--- libreoffice-3.6.1~rc2/sc/source/filter/inc/lotattr.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/inc/lotattr.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -42,6 +42,7 @@
class SvxColorItem;
class Color;
class LotAttrTable;
+class LOTUS_ROOT;
namespace editeng { class SvxBorderLine; }
@@ -68,7 +69,7 @@
{
public:
- LotAttrCache ();
+ LotAttrCache(LOTUS_ROOT* pLotRoot);
~LotAttrCache();
@@ -112,13 +113,14 @@
SvxColorItem* pWhite;
Color* pColTab;
boost::ptr_vector aEntries;
+
+ LOTUS_ROOT* mpLotusRoot;
};
class LotAttrCol
{
public:
-
void SetAttr (const SCROW nRow, const ScPatternAttr&);
void Apply (const SCCOL nCol, const SCTAB nTab );
@@ -138,6 +140,7 @@
class LotAttrTable
{
public:
+ LotAttrTable(LOTUS_ROOT* pLotRoot);
void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& );
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/inc/xestyle.hxx libreoffice-3.6.2~rc2/sc/source/filter/inc/xestyle.hxx
--- libreoffice-3.6.1~rc2/sc/source/filter/inc/xestyle.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/inc/xestyle.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -427,6 +427,15 @@
void SaveXml( XclExpXmlStream& rStrm ) const;
};
+struct XclExpColor
+{
+ Color maColor;
+
+ bool FillFromItemSet( const SfxItemSet& rItemSet );
+
+ void SaveXml( XclExpXmlStream& rStrm ) const;
+};
+
// ----------------------------------------------------------------------------
/** A combination of unique XF identifier with real Excel XF index. */
@@ -733,7 +742,7 @@
{
public:
XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, XclExpCellBorder* pBorder,
- XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpCellArea* pCellArea);
+ XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor);
virtual ~XclExpDxf();
virtual void SaveXml( XclExpXmlStream& rStrm );
@@ -744,7 +753,7 @@
XclExpFont* mpFont;
XclExpNumFmt* mpNumberFmt;
XclExpCellProt* mpProt;
- XclExpCellArea* mpCellArea;
+ XclExpColor* mpColor;
};
class XclExpDxfs : public XclExpRecordBase, protected XclExpRoot
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/lotus/lotattr.cxx libreoffice-3.6.2~rc2/sc/source/filter/lotus/lotattr.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/lotus/lotattr.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/lotus/lotattr.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -58,9 +58,10 @@
delete pPattAttr;
}
-LotAttrCache::LotAttrCache ()
+LotAttrCache::LotAttrCache (LOTUS_ROOT* pLotRoot):
+ mpLotusRoot(pLotRoot)
{
- pDocPool = pLotusRoot->pDoc->GetPool();
+ pDocPool = mpLotusRoot->pDoc->GetPool();
pColTab = new Color [ 8 ];
pColTab[ 0 ] = Color( COL_WHITE );
@@ -115,7 +116,7 @@
pAkt->nHash0 = nRefHash;
- pLotusRoot->pFontBuff->Fill( rAttr.nFont, rItemSet );
+ mpLotusRoot->pFontBuff->Fill( rAttr.nFont, rItemSet );
sal_uInt8 nLine = rAttr.nLineStyle;
if( nLine )
@@ -245,6 +246,11 @@
}
}
+LotAttrTable::LotAttrTable(LOTUS_ROOT* pLotRoot):
+ aAttrCache(pLotRoot)
+{
+}
+
void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow,
const LotAttrWK3& rAttr )
{
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/lotus/lotimpop.cxx libreoffice-3.6.2~rc2/sc/source/filter/lotus/lotimpop.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/lotus/lotimpop.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/lotus/lotimpop.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -56,7 +56,7 @@
eActType( Lotus_X),
pRngNmBffWK3( new RangeNameBufferWK3),
pFontBuff( new LotusFontBuffer),
- pAttrTable( new LotAttrTable)
+ pAttrTable( new LotAttrTable(this))
{
}
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/lotus/op.cxx libreoffice-3.6.2~rc2/sc/source/filter/lotus/op.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/lotus/op.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/lotus/op.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -400,7 +400,7 @@
r >> nRow >> nTab >> nCol >> nValue;
- if (ValidColRow( static_cast(nCol), nRow) && nTab < pDoc->GetMaxTableNumber())
+ if (ValidColRow( static_cast(nCol), nRow) && nTab <= pDoc->GetMaxTableNumber())
{
double fValue = Snum32ToDouble( nValue );
@@ -425,7 +425,7 @@
aConv.Reset( aAddress );
aConv.Convert( pErg, nBytesLeft );
- if (ValidColRow( static_cast(nCol), nRow) && nTab < pDoc->GetMaxTableNumber())
+ if (ValidColRow( static_cast(nCol), nRow) && nTab <= pDoc->GetMaxTableNumber())
{
ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg );
@@ -443,7 +443,7 @@
r >> nRow >> nTab >> nCol >> dValue;
- if (ValidColRow( static_cast(nCol), nRow) && nTab < pDoc->GetMaxTableNumber())
+ if (ValidColRow( static_cast(nCol), nRow) && nTab <= pDoc->GetMaxTableNumber())
{
ScValueCell *pCell = new ScValueCell(dValue);
pDoc->PutCell( static_cast(nCol), static_cast(nRow), static_cast(nTab), pCell, true );
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/oox/condformatbuffer.cxx libreoffice-3.6.2~rc2/sc/source/filter/oox/condformatbuffer.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/oox/condformatbuffer.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/oox/condformatbuffer.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -877,6 +877,7 @@
rStrm.skip( 8 );
rStrm >> aRanges;
getAddressConverter().convertToCellRangeList( maModel.maRanges, aRanges, getSheetIndex(), true );
+ mpFormat = new ScConditionalFormat(0, &getScDocument());
}
void CondFormat::importCfRule( SequenceInputStream& rStrm )
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/XMLExportDataPilot.cxx libreoffice-3.6.2~rc2/sc/source/filter/xml/XMLExportDataPilot.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/XMLExportDataPilot.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/XMLExportDataPilot.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -48,6 +48,7 @@
#include "dpsdbtab.hxx"
#include "dpdimsave.hxx"
#include "dpgroup.hxx"
+#include "dputil.hxx"
#include "rangeutl.hxx"
#include "queryentry.hxx"
#include
@@ -610,8 +611,9 @@
{
if (pGroupDim)
{
+ OUString aSrcFieldName = ScDPUtil::getSourceDimensionName(pGroupDim->GetSourceDimName());
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD, XML_TRUE);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, pGroupDim->GetSourceDimName());
+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, aSrcFieldName);
if (pGroupDim->GetDatePart())
{
WriteDatePart(pGroupDim->GetDatePart());
@@ -684,7 +686,8 @@
void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDimensionSaveData* pDimData)
{
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, rtl::OUString(pDim->GetName()));
+ OUString aSrcDimName = ScDPUtil::getSourceDimensionName(pDim->GetName());
+ rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME, aSrcDimName);
if (rExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012)
{
// Export display names only for ODF 1.2 extended or later.
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/XMLTableShapeImportHelper.cxx libreoffice-3.6.2~rc2/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/XMLTableShapeImportHelper.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/XMLTableShapeImportHelper.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -76,6 +76,17 @@
}
}
+// Attempt to find the topmost parent of the group, this is the one we apply
+// offsets to
+uno::Reference< drawing::XShape > lcl_getTopLevelParent( const uno::Reference< drawing::XShape >& rShape )
+{
+ uno::Reference< container::XChild > xChild( rShape, uno::UNO_QUERY );
+ uno::Reference< drawing::XShape > xParent( xChild->getParent(), uno::UNO_QUERY );
+ if ( xParent.is() )
+ return lcl_getTopLevelParent( xParent );
+ return rShape;
+}
+
void XMLTableShapeImportHelper::finishShape(
uno::Reference< drawing::XShape >& rShape,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
@@ -192,6 +203,32 @@
}
else //this are grouped shapes which should also get the layerid
{
+ uno::Reference< drawing::XShapes > xGroup( rShape, uno::UNO_QUERY );
+ // ignore the group ( within group ) object it it exists
+ if ( !bOnTable && !xGroup.is() )
+ {
+ // For cell anchored grouped shape we need to set the start
+ // position from the most top and left positioned shape(s) within
+ // the group
+ Point aStartPoint( rShape->getPosition().X,rShape->getPosition().Y );
+ awt::Size aSize(rShape->getSize() );
+ uno::Reference< drawing::XShape > xChild( rShapes, uno::UNO_QUERY );
+ if (SvxShape* pGroupShapeImp = SvxShape::getImplementation( lcl_getTopLevelParent( xChild ) ))
+ {
+ if (SdrObject *pSdrObj = pGroupShapeImp->GetSdrObject())
+ {
+ if ( ScDrawObjData* pAnchor = ScDrawLayer::GetObjData( pSdrObj ) )
+ {
+ if ( pAnchor->maStartOffset.getX() == 0 && pAnchor->maStartOffset.getY() == 0 )
+ pAnchor->maStartOffset = aStartPoint;
+ if ( aStartPoint.getX() < pAnchor->maStartOffset.getX() )
+ pAnchor->maStartOffset.setX( aStartPoint.getX() );
+ if ( aStartPoint.getY() < pAnchor->maStartOffset.getY() )
+ pAnchor->maStartOffset.setY( aStartPoint.getY() );
+ }
+ }
+ }
+ }
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
sal_Int16 nLayerID(-1);
for( sal_Int16 i=0; i < nAttrCount; ++i )
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlfilti.cxx libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlfilti.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlfilti.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlfilti.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -61,7 +61,6 @@
pDatabaseRangeContext(pTempDatabaseRangeContext),
bSkipDuplicates(false),
bCopyOutputData(false),
- bUseRegularExpressions(false),
bConditionSourceRange(false)
{
ScDocument* pDoc(GetScImport().GetDocument());
@@ -152,7 +151,6 @@
void ScXMLFilterContext::EndElement()
{
- mrQueryParam.bRegExp = bUseRegularExpressions;
mrQueryParam.bInplace = !bCopyOutputData;
mrQueryParam.bDuplicate = !bSkipDuplicates;
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlfilti.hxx libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlfilti.hxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlfilti.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlfilti.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -62,7 +62,6 @@
sal_Int16 nUserListIndex;
bool bSkipDuplicates;
bool bCopyOutputData;
- bool bUseRegularExpressions;
bool bEnabledUserList;
bool bConditionSourceRange;
std::vector maConnStack;
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlimprt.cxx libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlimprt.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlimprt.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlimprt.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -2686,11 +2686,13 @@
if (pStyle)
{
pStyle->FillPropertySet(xProperties);
+ // here needs to be the cond format import method
sal_Int32 nNumberFormat(pStyle->GetNumberFormat());
SetType(xProperties, nNumberFormat, nPrevCellType, sPrevCurrency);
// store first cell of first range for each style, once per sheet
uno::Sequence aAddresses(xSheetCellRanges->getRangeAddresses());
+ pStyle->ApplyCondFormat(aAddresses);
if ( aAddresses.getLength() > 0 )
{
const table::CellRangeAddress& rRange = aAddresses[0];
@@ -2811,6 +2813,7 @@
uno::Reference xActionLockable(xDoc, uno::UNO_QUERY);
if (xActionLockable.is())
xActionLockable->addActionLock();
+ pDoc->EnableAdjustHeight(false);
}
// XServiceInfo
@@ -3101,11 +3104,13 @@
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB nTab=0; nTabSetDrawPageSize(nTab);
if (!pSheetData->IsSheetBlocked( nTab ))
pDoc->SetStreamValid( nTab, true );
+ }
}
- aTables.UpdateRowHeights();
aTables.FixupOLEs();
}
if (GetModel().is())
@@ -3120,6 +3125,7 @@
{
ScModelObj::getImplementation(GetModel())->AfterXMLLoading(true);
}
+ pDoc->EnableAdjustHeight( true );
}
// XEventListener
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlimprt.hxx libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlimprt.hxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlimprt.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlimprt.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -40,6 +40,7 @@
#include "xmlsubti.hxx"
#include "global.hxx"
#include "formula/grammar.hxx"
+#include "rangelst.hxx"
#include "xmlstyle.hxx"
#include "XMLDetectiveContext.hxx"
@@ -56,7 +57,6 @@
#include
#include
-class ScRangeList;
class ScMyStyleNumberFormats;
class XMLNumberFormatAttributesExportHelper;
@@ -858,6 +858,7 @@
com::sun::star::uno::Reference xNumberFormats;
com::sun::star::uno::Reference xNumberFormatTypes;
+ ScRangeList maSheetRanges;
com::sun::star::uno::Reference xSheetCellRanges;
rtl::OUString sEmpty;
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlstyli.cxx libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlstyli.cxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlstyli.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlstyli.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -54,6 +54,15 @@
#include "docuno.hxx"
#include "unonames.hxx"
#include "document.hxx"
+#include "conditio.hxx"
+#include "svl/intitem.hxx"
+#include "rangelst.hxx"
+#include "rangeutl.hxx"
+#include "docfunc.hxx"
+#include "markdata.hxx"
+#include "docpool.hxx"
+#include "scitems.hxx"
+#include "patattr.hxx"
#define XML_LINE_LEFT 0
#define XML_LINE_RIGHT 1
@@ -281,9 +290,12 @@
class ScXMLMapContext : public SvXMLImportContext
{
- rtl::OUString sApplyStyle;
- rtl::OUString sCondition;
- rtl::OUString sBaseCell;
+ rtl::OUString msApplyStyle;
+ rtl::OUString msCondition;
+ rtl::OUString msBaseCell;
+
+ const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
+ ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
ScXMLMapContext(
@@ -292,9 +304,7 @@
const uno::Reference< xml::sax::XAttributeList > & xAttrList );
virtual ~ScXMLMapContext();
- const rtl::OUString& GetApplyStyle() const { return sApplyStyle; }
- const rtl::OUString& GetCondition() const { return sCondition; }
- const rtl::OUString& GetBaseCell() const { return sBaseCell; }
+ ScCondFormatEntry* CreateConditionEntry();
};
ScXMLMapContext::ScXMLMapContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
@@ -313,134 +323,48 @@
if( XML_NAMESPACE_STYLE == nPrefix )
{
if( IsXMLToken(aLocalName, XML_CONDITION ) )
- sCondition = rValue;
+ msCondition = rValue;
else if( IsXMLToken(aLocalName, XML_APPLY_STYLE_NAME ) )
- sApplyStyle = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TABLE_CELL, rValue);
+ msApplyStyle = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_TABLE_CELL, rValue);
else if ( IsXMLToken(aLocalName, XML_BASE_CELL_ADDRESS ) )
- sBaseCell = rValue;
+ msBaseCell = rValue;
}
}
}
-ScXMLMapContext::~ScXMLMapContext()
-{
-}
-
-namespace {
-
-template< typename Type >
-inline void lclAppendProperty( uno::Sequence< beans::PropertyValue >& rProps, const OUString& rPropName, const Type& rValue )
-{
- sal_Int32 nLength = rProps.getLength();
- rProps.realloc( nLength + 1 );
- rProps[ nLength ].Name = rPropName;
- rProps[ nLength ].Value <<= rValue;
-}
-
-} // namespace
-
-void XMLTableStyleContext::SetOperator( uno::Sequence< beans::PropertyValue >& rProps, sheet::ConditionOperator eOp ) const
-{
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OPERATOR ) ), eOp );
-}
-
-void XMLTableStyleContext::SetBaseCellAddress( uno::Sequence< beans::PropertyValue >& rProps, const OUString& rBaseCell ) const
+ScCondFormatEntry* ScXMLMapContext::CreateConditionEntry()
{
- /* Source position must be set as string, because it may refer
- to a sheet that hasn't been loaded yet. */
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCESTR ) ), rBaseCell );
-}
+ OUString aCondition, aConditionNmsp;
+ FormulaGrammar::Grammar eGrammar = FormulaGrammar::GRAM_UNSPECIFIED;
+ GetScImport().ExtractFormulaNamespaceGrammar( aCondition, aConditionNmsp, eGrammar, msCondition );
+ bool bHasNmsp = aCondition.getLength() < msCondition.getLength();
-void XMLTableStyleContext::SetStyle( uno::Sequence& rProps, const OUString& rApplyStyle ) const
-{
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_STYLENAME ) ), rApplyStyle );
-}
+ // parse a condition from the attribute string
+ ScXMLConditionParseResult aParseResult;
+ ScXMLConditionHelper::parseCondition( aParseResult, aCondition, 0 );
-void XMLTableStyleContext::SetFormula( uno::Sequence< beans::PropertyValue >& rProps,
- sal_Int32 nFormulaIdx, const OUString& rFormula, const OUString& rFormulaNmsp,
- FormulaGrammar::Grammar eGrammar, bool bHasNmsp ) const
-{
- OUString aFormula, aFormulaNmsp;
- FormulaGrammar::Grammar eNewGrammar = FormulaGrammar::GRAM_UNSPECIFIED;
- if( bHasNmsp )
- {
- // the entire attribute contains a namespace: internal namespace not allowed
- aFormula = rFormula;
- aFormulaNmsp = rFormulaNmsp;
- eNewGrammar = eGrammar;
- }
- else
+ if( !bHasNmsp )
{
// the attribute does not contain a namespace: try to find a namespace of an external grammar
- GetScImport().ExtractFormulaNamespaceGrammar( aFormula, aFormulaNmsp, eNewGrammar, rFormula, true );
+ FormulaGrammar::Grammar eNewGrammar = FormulaGrammar::GRAM_UNSPECIFIED;
+ GetScImport().ExtractFormulaNamespaceGrammar( aCondition, aConditionNmsp, eNewGrammar, aCondition, true );
if( eNewGrammar != FormulaGrammar::GRAM_EXTERNAL )
- eNewGrammar = eGrammar;
+ eGrammar = eNewGrammar;
}
- // add formula, formula namespace, and grammar with appropriate property names
- sal_Int32 nGrammar = static_cast< sal_Int32 >( eNewGrammar );
- switch( nFormulaIdx )
- {
- case 1:
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FORMULA1 ) ), aFormula );
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FORMULANMSP1 ) ), aFormulaNmsp );
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_GRAMMAR1 ) ), nGrammar );
- break;
- case 2:
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FORMULA2 ) ), aFormula );
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_FORMULANMSP2 ) ), aFormulaNmsp );
- lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_GRAMMAR2 ) ), nGrammar );
- break;
- default:
- OSL_FAIL( "XMLTableStyleContext::SetFormula - invalid formula index" );
- }
-}
+ ScConditionMode eMode = ScConditionEntry::GetModeFromApi(aParseResult.meOperator);
+ rtl::OUString aExpr1, aExpr2, aNmsp1, aNmsp2;
+ ScDocument* pDoc = GetScImport().GetDocument();
-void XMLTableStyleContext::GetConditionalFormat(uno::Any& aAny,
- const rtl::OUString& sTempCondition,
- const rtl::OUString& sApplyStyle, const rtl::OUString& sBaseCell) const
-{
- if (!sTempCondition.isEmpty() && !sApplyStyle.isEmpty())
- {
- uno::Reference xConditionalEntries(aAny, uno::UNO_QUERY);
- if (xConditionalEntries.is())
- {
- uno::Sequence aProps;
- if (!sBaseCell.isEmpty())
- SetBaseCellAddress(aProps, sBaseCell);
- SetStyle(aProps, sApplyStyle);
-
- // extract leading namespace from condition string
- OUString aCondition, aConditionNmsp;
- FormulaGrammar::Grammar eGrammar = FormulaGrammar::GRAM_UNSPECIFIED;
- GetScImport().ExtractFormulaNamespaceGrammar( aCondition, aConditionNmsp, eGrammar, sTempCondition );
- bool bHasNmsp = aCondition.getLength() < sTempCondition.getLength();
-
- // parse a condition from the attribute string
- ScXMLConditionParseResult aParseResult;
- ScXMLConditionHelper::parseCondition( aParseResult, aCondition, 0 );
-
- /* Check the result. A valid value in aParseResult.meToken implies
- that the other members of aParseResult are filled with valid
- data for that token. */
- switch( aParseResult.meToken )
- {
- case XML_COND_CELLCONTENT: // condition is 'cell-content()'
- case XML_COND_ISTRUEFORMULA: // condition is 'is-true-formula()'
- case XML_COND_ISBETWEEN: // condition is 'cell-content-is-between(,)'
- case XML_COND_ISNOTBETWEEN: // condition is 'cell-content-is-not-between(,)'
- SetOperator( aProps, aParseResult.meOperator );
- SetFormula( aProps, 1, aParseResult.maOperand1, aConditionNmsp, eGrammar, bHasNmsp );
- SetFormula( aProps, 2, aParseResult.maOperand2, aConditionNmsp, eGrammar, bHasNmsp );
- break;
+ ScCondFormatEntry* pEntry = new ScCondFormatEntry(eMode, aParseResult.maOperand1, aParseResult.maOperand2, pDoc, ScAddress(), msApplyStyle,
+ aNmsp1, aNmsp2, eGrammar, eGrammar);
- default:; // unacceptable or unknown condition
- }
+ pEntry->SetSrcString(msBaseCell);
+ return pEntry;
+}
- xConditionalEntries->addNew( aProps );
- aAny <<= xConditionalEntries;
- }
- }
+ScXMLMapContext::~ScXMLMapContext()
+{
}
void XMLTableStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
@@ -456,13 +380,6 @@
XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
}
-struct ScXMLMapContent
-{
- rtl::OUString sCondition;
- rtl::OUString sApplyStyle;
- rtl::OUString sBaseCell;
-};
-
TYPEINIT1( XMLTableStyleContext, XMLPropStyleContext );
XMLTableStyleContext::XMLTableStyleContext( ScXMLImport& rImport,
@@ -471,12 +388,11 @@
SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) :
XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle ),
sDataStyleName(),
- sNumberFormat(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"))),
pStyles(&rStyles),
nNumberFormat(-1),
nLastSheet(-1),
- bConditionalFormatCreated(false),
- bParentSet(false)
+ bParentSet(false),
+ mpCondFormat(NULL)
{
}
@@ -494,13 +410,11 @@
if( (XML_NAMESPACE_STYLE == nPrefix) &&
IsXMLToken(rLocalName, XML_MAP ) )
{
- pContext = new ScXMLMapContext(GetImport(), nPrefix, rLocalName, xAttrList);
-
- ScXMLMapContent aMap;
- aMap.sCondition = ((ScXMLMapContext*)pContext)->GetCondition();
- aMap.sApplyStyle = ((ScXMLMapContext*)pContext)->GetApplyStyle();
- aMap.sBaseCell = ((ScXMLMapContext*)pContext)->GetBaseCell();
- aMaps.push_back(aMap);
+ if(!mpCondFormat)
+ mpCondFormat = new ScConditionalFormat( 0, GetScImport().GetDocument() );
+ ScXMLMapContext* pMapContext = new ScXMLMapContext(GetImport(), nPrefix, rLocalName, xAttrList);
+ pContext = pMapContext;
+ mpCondFormat->AddEntry(pMapContext->CreateConditionEntry());
}
if (!pContext)
pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
@@ -508,6 +422,68 @@
return pContext;
}
+void XMLTableStyleContext::ApplyCondFormat( uno::Sequence xCellRanges )
+{
+ if(!mpCondFormat || GetScImport().HasNewCondFormatData())
+ return;
+
+ ScRangeList rRange;
+ sal_Int32 nRanges = xCellRanges.getLength();
+ for(sal_Int32 i = 0; i < nRanges; ++i)
+ {
+ table::CellRangeAddress aAddress = xCellRanges[i];
+ ScRange aRange( aAddress.StartColumn, aAddress.StartRow, aAddress.Sheet, aAddress.EndColumn, aAddress.EndRow, aAddress.Sheet );
+ rRange.Join( aRange, false );
+ }
+
+ ScDocument* pDoc = GetScImport().GetDocument();
+ SCTAB nTab = GetScImport().GetTables().GetCurrentSheet();
+ ScConditionalFormatList* pFormatList = pDoc->GetCondFormList(nTab);
+ for(ScConditionalFormatList::iterator itr = pFormatList->begin(), itrEnd = pFormatList->end();
+ itr != itrEnd; ++itr)
+ {
+ if(itr->EqualEntries(*mpCondFormat))
+ {
+ // we don't need the new cond format entry now
+ // the found one is the same and we just need to add the range to it
+ delete mpCondFormat;
+ mpCondFormat = NULL;
+
+ ScRangeList& rRangeList = itr->GetRangeList();
+ sal_uInt32 nCondId = itr->GetKey();
+ size_t n = rRange.size();
+ for(size_t i = 0; i < n; ++i)
+ {
+ const ScRange* pRange = rRange[i];
+ rRangeList.Join(*pRange);
+ }
+
+ ScPatternAttr aPattern( pDoc->GetPool() );
+ aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nCondId ) );
+ ScMarkData aMarkData;
+ aMarkData.MarkFromRangeList(rRange, true);
+ pDoc->ApplySelectionPattern( aPattern , aMarkData);
+
+ break;
+ }
+ }
+
+ if(mpCondFormat)
+ {
+ sal_uLong nIndex = pDoc->AddCondFormat(mpCondFormat, nTab );
+ mpCondFormat->SetKey(nIndex);
+ mpCondFormat->AddRange(rRange);
+
+ ScPatternAttr aPattern( pDoc->GetPool() );
+ aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_CONDITIONAL, nIndex ) );
+ ScMarkData aMarkData;
+ aMarkData.MarkFromRangeList(rRange, true);
+ pDoc->ApplySelectionPattern( aPattern , aMarkData);
+ }
+
+
+}
+
void XMLTableStyleContext::FillPropertySet(
const uno::Reference< XPropertySet > & rPropSet )
{
@@ -523,21 +499,6 @@
sal_Int32 nNumFmt = GetNumberFormat();
if (nNumFmt >= 0)
AddProperty(CTF_SC_NUMBERFORMAT, uno::makeAny(nNumFmt));
- if (!GetScImport().HasNewCondFormatData() && !bConditionalFormatCreated && (!aMaps.empty()))
- {
- aConditionalFormat = rPropSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CONDXML)));
- std::vector::iterator aItr(aMaps.begin());
- std::vector::iterator aEndItr(aMaps.end());
- while(aItr != aEndItr)
- {
- //rPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_CONDITIONALFORMAT)),
- GetConditionalFormat(aConditionalFormat, aItr->sCondition, aItr->sApplyStyle, aItr->sBaseCell);
-
- ++aItr;
- }
- AddProperty(CTF_SC_IMPORT_MAP, aConditionalFormat);
- bConditionalFormatCreated = sal_True;
- }
}
else if (GetFamily() == XML_STYLE_FAMILY_TABLE_TABLE)
{
diff -Nru libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlstyli.hxx libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlstyli.hxx
--- libreoffice-3.6.1~rc2/sc/source/filter/xml/xmlstyli.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/filter/xml/xmlstyli.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -42,7 +42,7 @@
#include
#include "xmlimprt.hxx"
-class ScSheetSaveData;
+class ScConditionalFormat;
class ScXMLCellImportPropertyMapper : public SvXMLImportPropertyMapper
{
@@ -91,44 +91,20 @@
virtual void finished(
::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const;
};
-struct ScXMLMapContent;
class XMLTableStyleContext : public XMLPropStyleContext
{
::rtl::OUString sDataStyleName;
rtl::OUString sPageStyle;
- const rtl::OUString sNumberFormat;
SvXMLStylesContext* pStyles;
- std::vector aMaps;
- com::sun::star::uno::Any aConditionalFormat;
sal_Int32 nNumberFormat;
SCTAB nLastSheet;
- bool bConditionalFormatCreated;
bool bParentSet;
+ ScConditionalFormat* mpCondFormat;
const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
- void SetOperator(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProps,
- ::com::sun::star::sheet::ConditionOperator eOp ) const;
-
- void SetBaseCellAddress(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProps,
- const ::rtl::OUString& rBaseCell ) const;
-
- void SetStyle(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProps,
- const ::rtl::OUString& rApplyStyle ) const;
-
- void SetFormula(
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProps,
- sal_Int32 nFormulaIdx, const ::rtl::OUString& rFormula,
- const ::rtl::OUString& rFormulaNmsp, ::formula::FormulaGrammar::Grammar eGrammar, bool bHasNmsp ) const;
-
- void GetConditionalFormat(
- ::com::sun::star::uno::Any& aAny, const rtl::OUString& sCondition,
- const rtl::OUString& sApplyStyle, const rtl::OUString& sBaseCell) const;
protected:
virtual void SetAttribute( sal_uInt16 nPrefixKey,
@@ -163,8 +139,12 @@
SCTAB GetLastSheet() const { return nLastSheet; }
void SetLastSheet(SCTAB nNew) { nLastSheet = nNew; }
+ void ApplyCondFormat( com::sun::star::uno::Sequence xCellRanges );
+
private:
using XMLPropStyleContext::SetStyle;
+
+ ScConditionalFormat* CreateCondFormat();
};
class XMLTableStylesContext : public SvXMLStylesContext
diff -Nru libreoffice-3.6.1~rc2/sc/source/ui/app/inputhdl.cxx libreoffice-3.6.2~rc2/sc/source/ui/app/inputhdl.cxx
--- libreoffice-3.6.1~rc2/sc/source/ui/app/inputhdl.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/ui/app/inputhdl.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -129,6 +129,7 @@
size_t nPos = std::distance(rDataSet.begin(), itPos);
size_t nRPos = rDataSet.size() - 1 - nPos;
std::advance(it, nRPos);
+ ++it;
}
for (; it != itEnd; ++it)
@@ -150,7 +151,10 @@
{
ScTypedCaseStrSet::const_iterator it = rDataSet.begin(), itEnd = rDataSet.end();
if (itPos != rDataSet.end())
+ {
it = itPos;
+ ++it;
+ }
for (; it != itEnd; ++it)
{
@@ -1223,9 +1227,12 @@
if ( pActiveView && pFormulaData )
{
rtl::OUString aNew;
- miAutoPosFormula = findText(*pFormulaData, miAutoPosFormula, aAutoSearch, aNew, bBack);
- if (miAutoPosFormula != pFormulaData->end())
- ShowTip( aNew ); // als QuickHelp anzeigen
+ ScTypedCaseStrSet::const_iterator itNew = findText(*pFormulaData, miAutoPosFormula, aAutoSearch, aNew, bBack);
+ if (itNew != pFormulaData->end())
+ {
+ miAutoPosFormula = itNew;
+ ShowTip(aNew); // Display a quick help.
+ }
}
// bei Tab wird vorher immer HideCursor gerufen
@@ -1633,9 +1640,13 @@
if ( aSel.nEndPos == nParLen && aText.getLength() == aAutoSearch.getLength() + nSelLen )
{
rtl::OUString aNew;
- miAutoPosColumn = findText(*pColumnData, miAutoPosColumn, aAutoSearch, aNew, bBack);
- if (miAutoPosColumn != pColumnData->end())
+ ScTypedCaseStrSet::const_iterator itNew =
+ findText(*pColumnData, miAutoPosColumn, aAutoSearch, aNew, bBack);
+
+ if (itNew != pColumnData->end())
{
+ // match found!
+ miAutoPosColumn = itNew;
bInOwnChange = true; // disable ModifyHdl (reset below)
lcl_RemoveLineEnd( aNew );
diff -Nru libreoffice-3.6.1~rc2/sc/source/ui/docshell/dbdocfun.cxx libreoffice-3.6.2~rc2/sc/source/ui/docshell/dbdocfun.cxx
--- libreoffice-3.6.1~rc2/sc/source/ui/docshell/dbdocfun.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/ui/docshell/dbdocfun.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1329,12 +1329,6 @@
}
if ( pDestObj )
{
- // create new database connection for "refresh"
- // (and re-read column entry collections)
- // so all changes take effect
- if ( pNewObj == pOldObj && pDestObj->IsImportData() )
- pDestObj->ClearTableData();
-
pDestObj->ReloadGroupTableData();
pDestObj->InvalidateData(); // before getting the new output area
@@ -1478,7 +1472,8 @@
for (; it != itEnd; ++it)
{
ScDPObject* pObj = *it;
- pObj->SyncAllDimensionMembers();
+ if (!pObj->SyncAllDimensionMembers())
+ continue;
// This action is intentionally not undoable since it modifies cache.
DataPilotUpdate(pObj, pObj, false, bApi);
diff -Nru libreoffice-3.6.1~rc2/sc/source/ui/optdlg/tpdefaults.cxx libreoffice-3.6.2~rc2/sc/source/ui/optdlg/tpdefaults.cxx
--- libreoffice-3.6.1~rc2/sc/source/ui/optdlg/tpdefaults.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/ui/optdlg/tpdefaults.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -48,16 +48,23 @@
{
FreeResource();
- long nTxtW = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
- long nCtrlW = aFtNSheets.GetSizePixel().Width();
- if ( nTxtW >= nCtrlW )
+ // the following computation must be modified accordingly if a third line is added to this dialog
+ long nTxtW1 = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
+ long nCtrlW1 = aFtNSheets.GetSizePixel().Width();
+ long nTxtW2 = aFtSheetPrefix.GetCtrlTextWidth(aFtSheetPrefix.GetText() );
+ long nCtrlW2 = aFtSheetPrefix.GetSizePixel().Width();
+ if ( nTxtW1 >= nCtrlW1 || nTxtW2 >= nCtrlW2)
{
+ long nTxtW = std::max(nTxtW1,nTxtW2);
Size aNewSize = aFtNSheets.GetSizePixel();
- aNewSize.Width() += ( nTxtW - nCtrlW );
+ aNewSize.Width() = nTxtW;
aFtNSheets.SetSizePixel( aNewSize );
+ aFtSheetPrefix.SetSizePixel( aNewSize );
Point aNewPoint = aEdNSheets.GetPosPixel();
- aNewPoint.X() += ( nTxtW - nCtrlW );
+ aNewPoint.X() += (nTxtW - nCtrlW1);
aEdNSheets.SetPosPixel( aNewPoint );
+ aNewPoint.Y() = aEdSheetPrefix.GetPosPixel().Y();
+ aEdSheetPrefix.SetPosPixel( aNewPoint );
}
aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
aEdSheetPrefix.SetModifyHdl( LINK(this, ScTpDefaultsOptions, PrefixModifiedHdl) );
diff -Nru libreoffice-3.6.1~rc2/sc/source/ui/unoobj/docuno.cxx libreoffice-3.6.2~rc2/sc/source/ui/unoobj/docuno.cxx
--- libreoffice-3.6.1~rc2/sc/source/ui/unoobj/docuno.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/ui/unoobj/docuno.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -119,7 +119,7 @@
{MAP_CHAR_LEN(SC_UNO_AUTOCONTFOC), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNO_BASICLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
{MAP_CHAR_LEN(SC_UNO_DIALOGLIBRARIES), 0, &getCppuType((uno::Reference< script::XLibraryContainer >*)0), beans::PropertyAttribute::READONLY, 0},
- {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ), 0, &getCppuType((beans::PropertyValue*)0), beans::PropertyAttribute::READONLY, 0},
+ {MAP_CHAR_LEN(SC_UNO_VBADOCOBJ), 0, &getCppuType(static_cast< const rtl::OUString * >(0)), beans::PropertyAttribute::READONLY, 0},
{MAP_CHAR_LEN(SC_UNO_CALCASSHOWN), PROP_UNO_CALCASSHOWN, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNONAME_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0},
{MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), 0, &getCppuType((lang::Locale*)0), 0, 0},
@@ -1834,15 +1834,10 @@
}
else if ( aString.EqualsAscii( SC_UNO_VBADOCOBJ ) )
{
- // PropertyValue seems extreme because we store
- // the model ( as the value member ) of the PropertyValue that is
- // itself a property of the model ( the intention however is to
+ // Note: the intention really here is to
// store something like a Workbook object... but we don't do that )
// yet
- beans::PropertyValue aProp;
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc") );
- aProp.Value <<= pDocShell->GetModel();
- aRet <<= aProp;
+ aRet = uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisExcelDoc") ) );
}
else if ( aString.EqualsAscii( SC_UNO_RUNTIMEUID ) )
{
diff -Nru libreoffice-3.6.1~rc2/sc/source/ui/view/cliputil.cxx libreoffice-3.6.2~rc2/sc/source/ui/view/cliputil.cxx
--- libreoffice-3.6.1~rc2/sc/source/ui/view/cliputil.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sc/source/ui/view/cliputil.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -114,7 +114,7 @@
SCCOL nCols = aTest.aEnd.Col() - aTest.aStart.Col() + 1;
SCROW nRowTest = (nRows / nSrcRows) * nSrcRows;
SCCOL nColTest = (nCols / nSrcCols) * nSrcCols;
- if (nRows != nRowTest || nCols != nColTest)
+ if ( rDest.size() > 1 && ( nRows != nRowTest || nCols != nColTest ) )
{
// Destination range is not a multiple of the source range. Bail out.
return false;
diff -Nru libreoffice-3.6.1~rc2/scp2/InstallModule_gnome.mk libreoffice-3.6.2~rc2/scp2/InstallModule_gnome.mk
--- libreoffice-3.6.1~rc2/scp2/InstallModule_gnome.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/InstallModule_gnome.mk 2012-09-25 12:13:30.000000000 +0000
@@ -33,9 +33,11 @@
))
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
+ ENABLE_EVOAB2 \
ENABLE_GCONF \
ENABLE_GIO \
ENABLE_GNOMEVFS \
+ ENABLE_GTK \
ENABLE_GTK3 \
ENABLE_LOCKDOWN \
ENABLE_SYSTRAY_GTK \
diff -Nru libreoffice-3.6.1~rc2/scp2/InstallModule_ooo.mk libreoffice-3.6.2~rc2/scp2/InstallModule_ooo.mk
--- libreoffice-3.6.1~rc2/scp2/InstallModule_ooo.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/InstallModule_ooo.mk 2012-09-25 12:13:30.000000000 +0000
@@ -46,6 +46,8 @@
ENABLE_NSPLUGIN \
ENABLE_ONLINE_UPDATE \
ENABLE_OPENGL \
+ ENABLE_TDE \
+ ENABLE_TDEAB \
ENABLE_XMLSEC \
MERGELIBS \
SYSTEM_BOOST \
diff -Nru libreoffice-3.6.1~rc2/scp2/InstallModule_tde.mk libreoffice-3.6.2~rc2/scp2/InstallModule_tde.mk
--- libreoffice-3.6.1~rc2/scp2/InstallModule_tde.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/InstallModule_tde.mk 2012-09-25 12:13:30.000000000 +0000
@@ -34,6 +34,7 @@
$(eval $(call gb_InstallModule_define_if_set,scp2/tde,\
ENABLE_TDE \
+ ENABLE_TDEAB \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/tde,\
diff -Nru libreoffice-3.6.1~rc2/scp2/InstallScript_setup_osl.mk libreoffice-3.6.2~rc2/scp2/InstallScript_setup_osl.mk
--- libreoffice-3.6.1~rc2/scp2/InstallScript_setup_osl.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/InstallScript_setup_osl.mk 2012-09-25 12:13:30.000000000 +0000
@@ -58,7 +58,7 @@
$(if $(filter YES,$(WITH_EXTENSION_INTEGRATION)),\
scp2/extensions \
) \
- $(if $(filter TRUE,$(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO)),\
+ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
scp2/gnome \
) \
$(if $(filter TRUE,$(SOLAR_JAVA)),\
diff -Nru libreoffice-3.6.1~rc2/scp2/Module_scp2.mk libreoffice-3.6.2~rc2/scp2/Module_scp2.mk
--- libreoffice-3.6.1~rc2/scp2/Module_scp2.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/Module_scp2.mk 2012-09-25 12:13:30.000000000 +0000
@@ -66,7 +66,7 @@
$(if $(filter TRUE,$(ENABLE_CRASHDUMP)),\
InstallModule_crashrep \
) \
- $(if $(filter TRUE,$(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO)),\
+ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
InstallModule_gnome \
) \
$(if $(filter TRUE,$(SOLAR_JAVA)),\
diff -Nru libreoffice-3.6.1~rc2/scp2/source/base/registryitem_base.scp libreoffice-3.6.2~rc2/scp2/source/base/registryitem_base.scp
--- libreoffice-3.6.1~rc2/scp2/source/base/registryitem_base.scp 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/source/base/registryitem_base.scp 2012-09-25 12:13:30.000000000 +0000
@@ -50,13 +50,6 @@
Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
End
-RegistryItem gid_Regitem_Odb_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
- ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
- ModuleID = gid_Module_Prg_Base_Bin;
- Subkey = ".odb\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
- Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
-End
-
RegistryItem gid_Regitem_DatabaseDocument_1_Shellex_PropertySheetHandlers_MyPropSheet1
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Base_Bin;
diff -Nru libreoffice-3.6.1~rc2/scp2/source/gnome/module_gnome.scp libreoffice-3.6.2~rc2/scp2/source/gnome/module_gnome.scp
--- libreoffice-3.6.1~rc2/scp2/source/gnome/module_gnome.scp 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/source/gnome/module_gnome.scp 2012-09-25 12:13:30.000000000 +0000
@@ -41,14 +41,16 @@
XpdCheckSolaris = "SUNWgnome-vfs";
#endif
Files = (
+#ifdef ENABLE_EVOAB2
gid_File_Lib_Evoab,
+#endif
+#ifdef ENABLE_GTK
gid_File_Lib_Fps_Gnome,
gid_File_Lib_Vclplug_Gtk,
+#endif
#ifdef ENABLE_GTK3
gid_File_Lib_Vclplug_Gtk3,
#endif
- gid_File_Bin_Gnome_Open_Url,
- gid_File_Bin_Gnome_Open_Url_Bin,
#ifdef ENABLE_SYSTRAY_GTK
gid_File_Lib_QStart_Gtk,
#endif
@@ -59,11 +61,13 @@
gid_File_Lib_GIO,
#endif
#ifdef ENABLE_GCONF
- gid_File_Lib_Gconfbe
+ gid_File_Lib_Gconfbe,
#endif
#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
- gid_File_Share_Registry_Gnome_Xcd
+ gid_File_Share_Registry_Gnome_Xcd,
#endif
+ gid_File_Bin_Gnome_Open_Url,
+ gid_File_Bin_Gnome_Open_Url_Bin
);
End
diff -Nru libreoffice-3.6.1~rc2/scp2/source/ooo/file_library_ooo.scp libreoffice-3.6.2~rc2/scp2/source/ooo/file_library_ooo.scp
--- libreoffice-3.6.1~rc2/scp2/source/ooo/file_library_ooo.scp 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/source/ooo/file_library_ooo.scp 2012-09-25 12:13:30.000000000 +0000
@@ -432,27 +432,16 @@
#ifdef UNX
-#ifdef ENABLE_TDEAB
-File gid_File_Lib_Tdeab_1
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libtdeab1,UNXSUFFIX));
-End
-
-File gid_File_Lib_Tdeab_Drv_1
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libtdeabdrv1,UNXSUFFIX));
-End
-#endif
-
#ifdef ENABLE_KAB
STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
#endif
+#ifdef ENABLE_TDEAB
+STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
+STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
+#endif
+
#ifdef MACOSX
File gid_File_Lib_Macab_1
LIB_FILE_BODY;
diff -Nru libreoffice-3.6.1~rc2/scp2/source/ooo/vc_redist.scp libreoffice-3.6.2~rc2/scp2/source/ooo/vc_redist.scp
--- libreoffice-3.6.1~rc2/scp2/source/ooo/vc_redist.scp 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/source/ooo/vc_redist.scp 2012-09-25 12:13:30.000000000 +0000
@@ -36,6 +36,13 @@
ComponentCondition = "VC_REDIST=1";
End
+MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
+ Feature = gm_Root;
+ Name = "Microsoft_VC100_CRT_x86.msm";
+ RootDir = "TARGETDIR";
+ ComponentCondition = "VC_REDIST=1";
+End
+
MergeModule gid_MergeModule_policy_9_0_Microsoft_VC90_CRT_x86
Feature = gm_Root;
Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
diff -Nru libreoffice-3.6.1~rc2/scp2/source/tde/file_tde.scp libreoffice-3.6.2~rc2/scp2/source/tde/file_tde.scp
--- libreoffice-3.6.1~rc2/scp2/source/tde/file_tde.scp 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/scp2/source/tde/file_tde.scp 2012-09-25 12:13:30.000000000 +0000
@@ -25,7 +25,7 @@
#ifdef ENABLE_TDE
File gid_File_Lib_Tdebe
- TXT_FILE_BODY;
+ LIB_FILE_BODY;
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(tdebe1.uno,UNXSUFFIX));
diff -Nru libreoffice-3.6.1~rc2/sdext/Extension_presenter.mk libreoffice-3.6.2~rc2/sdext/Extension_presenter.mk
--- libreoffice-3.6.1~rc2/sdext/Extension_presenter.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sdext/Extension_presenter.mk 2012-09-25 12:13:30.000000000 +0000
@@ -141,10 +141,6 @@
$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
))
-$(eval $(call gb_Extension_add_files,presenter-screen,help/en-US/com.sun.PresenterScreen-$(sdext_PLATFORM),\
- $(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
-))
-
-$(eval $(call gb_Extension_localize_help,presenter-screen,help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
+$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff -Nru libreoffice-3.6.1~rc2/sfx2/source/bastyp/fltfnc.cxx libreoffice-3.6.2~rc2/sfx2/source/bastyp/fltfnc.cxx
--- libreoffice-3.6.1~rc2/sfx2/source/bastyp/fltfnc.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sfx2/source/bastyp/fltfnc.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -989,6 +989,13 @@
{
lFilterProperties[nFilterProperty].Value >>= sServiceName;
}
+ else if (lFilterProperties[nFilterProperty].Name == "ExportExtension")
+ {
+ // Extension preferred by the filter. This takes precedence
+ // over those that are given in the file format type.
+ lFilterProperties[nFilterProperty].Value >>= sExtension;
+ sExtension = rtl::OUString("*.") + sExtension;
+ }
else if ( lFilterProperties[nFilterProperty].Name == "Type" )
{
lFilterProperties[nFilterProperty].Value >>= sType;
@@ -1025,9 +1032,12 @@
}
else if ( lTypeProperties[nTypeProperty].Name == "Extensions" )
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions;
- lTypeProperties[nTypeProperty].Value >>= lExtensions;
- sExtension = implc_convertStringlistToString( lExtensions, ';', DEFINE_CONST_UNICODE("*.") );
+ if (sExtension.isEmpty())
+ {
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions;
+ lTypeProperties[nTypeProperty].Value >>= lExtensions;
+ sExtension = implc_convertStringlistToString( lExtensions, ';', DEFINE_CONST_UNICODE("*.") );
+ }
}
else if ( lTypeProperties[nTypeProperty].Name == "URLPattern" )
{
diff -Nru libreoffice-3.6.1~rc2/sfx2/source/doc/objxtor.cxx libreoffice-3.6.2~rc2/sfx2/source/doc/objxtor.cxx
--- libreoffice-3.6.1~rc2/sfx2/source/doc/objxtor.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sfx2/source/doc/objxtor.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -144,7 +144,7 @@
if( xProps.is() ) try
{
::rtl::OUString aConstName;
- xProps->getPropertyValue( ::rtl::OUString( "VBAGlobalConstantName" ) ) >>= aConstName;
+ xProps->getPropertyValue( ::rtl::OUString( "ThisVBADocObj" ) ) >>= aConstName;
return ::rtl::OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US );
}
catch (const uno::Exception&) // not supported
diff -Nru libreoffice-3.6.1~rc2/shell/inc/internal/zipfile.hxx libreoffice-3.6.2~rc2/shell/inc/internal/zipfile.hxx
--- libreoffice-3.6.1~rc2/shell/inc/internal/zipfile.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/shell/inc/internal/zipfile.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -163,7 +163,6 @@
private:
StreamInterface *m_pStream;
bool m_bShouldFree;
- long m_iStartOffset;
};
#endif
diff -Nru libreoffice-3.6.1~rc2/shell/source/win32/ooofilereader/basereader.cxx libreoffice-3.6.2~rc2/shell/source/win32/ooofilereader/basereader.cxx
--- libreoffice-3.6.1~rc2/shell/source/win32/ooofilereader/basereader.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/shell/source/win32/ooofilereader/basereader.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -81,9 +81,12 @@
if (m_ZipContent.empty())
m_ZipFile.GetUncompressedContent( ContentName, m_ZipContent );
- xml_parser parser;
- parser.set_document_handler(this); // pass current reader as reader to the sax parser
- parser.parse(&m_ZipContent[0], m_ZipContent.size());
+ if (!m_ZipContent.empty())
+ {
+ xml_parser parser;
+ parser.set_document_handler(this); // pass current reader as reader to the sax parser
+ parser.parse(&m_ZipContent[0], m_ZipContent.size());
+ }
}
catch(std::exception&
#if OSL_DEBUG_LEVEL > 0
diff -Nru libreoffice-3.6.1~rc2/shell/source/win32/zipfile/zipfile.cxx libreoffice-3.6.2~rc2/shell/source/win32/zipfile/zipfile.cxx
--- libreoffice-3.6.1~rc2/shell/source/win32/zipfile/zipfile.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/shell/source/win32/zipfile/zipfile.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -259,9 +259,12 @@
return true;
}
-static bool findCentralDirectoryEnd(StreamInterface *stream, long &startOffset)
+static bool findCentralDirectoryEnd(StreamInterface *stream)
{
- stream->sseek(startOffset, SEEK_SET);
+ if (!stream)
+ return false;
+ stream->sseek(0, SEEK_SET);
+ if (stream->sseek(-1024, SEEK_END)) stream->sseek(0, SEEK_SET);
try
{
while (stream->stell() != -1)
@@ -270,7 +273,6 @@
if (signature == CDIR_END_SIG)
{
stream->sseek(-4, SEEK_CUR);
- startOffset = stream->stell();
return true;
}
else
@@ -284,9 +286,9 @@
return false;
}
-static bool isZipStream(StreamInterface *stream, long &startOffset)
+static bool isZipStream(StreamInterface *stream)
{
- if (!findCentralDirectoryEnd(stream, startOffset))
+ if (!findCentralDirectoryEnd(stream))
return false;
CentralDirectoryEnd end;
if (!readCentralDirectoryEnd(stream, end))
@@ -387,11 +389,10 @@
*/
ZipFile::ZipFile(const std::string &FileName) :
m_pStream(0),
- m_bShouldFree(true),
- m_iStartOffset(0)
+ m_bShouldFree(true)
{
m_pStream = new FileStream(FileName.c_str());
- if (m_pStream && !isZipStream(m_pStream, m_iStartOffset))
+ if (m_pStream && !isZipStream(m_pStream))
{
delete m_pStream;
m_pStream = 0;
@@ -400,10 +401,9 @@
ZipFile::ZipFile(StreamInterface *stream) :
m_pStream(stream),
- m_bShouldFree(false),
- m_iStartOffset(0)
+ m_bShouldFree(false)
{
- if (!isZipStream(stream, m_iStartOffset))
+ if (!isZipStream(stream))
m_pStream = 0;
}
@@ -424,15 +424,14 @@
void ZipFile::GetUncompressedContent(
const std::string &ContentName, /*inout*/ ZipContentBuffer_t &ContentBuffer)
{
- long startOffset = m_iStartOffset;
- if (!findCentralDirectoryEnd(m_pStream, startOffset))
+ if (!findCentralDirectoryEnd(m_pStream))
return;
CentralDirectoryEnd end;
if (!readCentralDirectoryEnd(m_pStream, end))
return;
m_pStream->sseek(end.cdir_offset, SEEK_SET);
CentralDirectoryEntry entry;
- while (m_pStream->stell() != -1 && m_pStream->stell() < startOffset && (unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
+ while (m_pStream->stell() != -1 && (unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
{
if (!readCentralDirectoryEntry(m_pStream, entry))
return;
@@ -487,7 +486,7 @@
ContentBuffer.clear();
return;
}
- (void)inflateEnd(&strm);
+ (void)inflateEnd(&strm);
}
}
@@ -497,15 +496,14 @@
ZipFile::DirectoryPtr_t ZipFile::GetDirectory() const
{
DirectoryPtr_t dir(new Directory_t());
- long startOffset = m_iStartOffset;
- if (!findCentralDirectoryEnd(m_pStream, startOffset))
+ if (!findCentralDirectoryEnd(m_pStream))
return dir;
CentralDirectoryEnd end;
if (!readCentralDirectoryEnd(m_pStream, end))
return dir;
m_pStream->sseek(end.cdir_offset, SEEK_SET);
CentralDirectoryEntry entry;
- while (m_pStream->stell() != -1 && m_pStream->stell() < startOffset && (unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
+ while (m_pStream->stell() != -1 && (unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
{
if (!readCentralDirectoryEntry(m_pStream, entry))
return dir;
@@ -537,15 +535,14 @@
long ZipFile::GetFileLongestFileNameLength() const
{
long lmax = 0;
- long startOffset = m_iStartOffset;
- if (!findCentralDirectoryEnd(m_pStream, startOffset))
+ if (!findCentralDirectoryEnd(m_pStream))
return lmax;
CentralDirectoryEnd end;
if (!readCentralDirectoryEnd(m_pStream, end))
return lmax;
m_pStream->sseek(end.cdir_offset, SEEK_SET);
CentralDirectoryEntry entry;
- while (m_pStream->stell() != -1 && m_pStream->stell() < startOffset && (unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
+ while (m_pStream->stell() != -1 && (unsigned long)m_pStream->stell() < end.cdir_offset + end.cdir_size)
{
if (!readCentralDirectoryEntry(m_pStream, entry))
return lmax;
diff -Nru libreoffice-3.6.1~rc2/solenv/bin/modules/installer/simplepackage.pm libreoffice-3.6.2~rc2/solenv/bin/modules/installer/simplepackage.pm
--- libreoffice-3.6.1~rc2/solenv/bin/modules/installer/simplepackage.pm 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/bin/modules/installer/simplepackage.pm 2012-09-25 12:13:30.000000000 +0000
@@ -60,6 +60,21 @@
}
}
+####################################################
+# Detecting the directory with extensions
+####################################################
+
+sub get_extensions_dir
+{
+ my ( $subfolderdir ) = @_;
+
+ my $extensiondir = $subfolderdir . $installer::globals::separator;
+ if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
+ my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+
+ return $extensionsdir;
+}
+
########################################################################
# Getting the translation file for the Mac Language Pack installer
########################################################################
@@ -671,6 +686,9 @@
installer::logger::print_message( "... removing superfluous directories ...\n" );
installer::logger::include_header_into_logfile("Removing superfluous directories:");
+ my $extensionfolder = get_extensions_dir($subfolderdir);
+ installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
+
if ( $installer::globals::compiler =~ /^unxmacx/ )
{
installer::worker::put_scpactions_into_installset("$installdir/$packagename");
diff -Nru libreoffice-3.6.1~rc2/solenv/bin/modules/installer/systemactions.pm libreoffice-3.6.2~rc2/solenv/bin/modules/installer/systemactions.pm
--- libreoffice-3.6.1~rc2/solenv/bin/modules/installer/systemactions.pm 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/bin/modules/installer/systemactions.pm 2012-09-25 12:13:30.000000000 +0000
@@ -1578,4 +1578,51 @@
return
}
+##############################################################
+# Removing all empty directories below a specified directory
+##############################################################
+
+sub remove_empty_dirs_in_folder
+{
+ my ( $dir ) = @_;
+
+ my @content = ();
+ my $infoline = "";
+
+ $dir =~ s/\Q$installer::globals::separator\E\s*$//;
+
+ if ( -d $dir )
+ {
+ opendir(DIR, $dir);
+ @content = readdir(DIR);
+ closedir(DIR);
+
+ my $oneitem;
+
+ foreach $oneitem (@content)
+ {
+ if ((!($oneitem eq ".")) && (!($oneitem eq "..")))
+ {
+ my $item = $dir . $installer::globals::separator . $oneitem;
+
+ if ( -d $item ) # recursive
+ {
+ remove_empty_dirs_in_folder($item);
+ }
+ }
+ }
+
+ # try to remove empty directory
+ my $returnvalue = rmdir $dir;
+
+ if ( $returnvalue )
+ {
+ $infoline = "Successfully removed empty dir $dir\n";
+ push(@installer::globals::logfileinfo, $infoline);
+ }
+
+ }
+
+}
+
1;
diff -Nru libreoffice-3.6.1~rc2/solenv/bin/modules/installer/windows/msiglobal.pm libreoffice-3.6.2~rc2/solenv/bin/modules/installer/windows/msiglobal.pm
--- libreoffice-3.6.1~rc2/solenv/bin/modules/installer/windows/msiglobal.pm 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/bin/modules/installer/windows/msiglobal.pm 2012-09-25 12:13:30.000000000 +0000
@@ -210,7 +210,7 @@
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ my $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $doinclude ) { push(@ddffile, $ddfline); }
$counter++; # increasing the counter
@@ -230,7 +230,7 @@
my $nextfilestyles = "";
if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
- $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
$counter++; # increasing the counter!
@@ -302,7 +302,7 @@
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ my $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $doinclude ) { push(@ddffile, $ddfline); }
my $nextfile = "";
@@ -323,7 +323,7 @@
my $nextfilestyles = "";
if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
- $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
$counter++;
$nextfile = "";
@@ -384,7 +384,7 @@
write_ddf_file_header(\@ddffile, $cabinetfile, $installdir);
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ my $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $doinclude ) { push(@ddffile, $ddfline); }
my $nextfile = ${$filesref}[$i+1];
@@ -403,7 +403,7 @@
my $nextfilestyles = "";
if ( $nextfile->{'Styles'} ) { $nextfilestyles = $nextfile->{'Styles'}; }
if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) { $localdoinclude = 0; }
- $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $localdoinclude ) { push(@ddffile, $ddfline); }
$i++; # increasing the counter!
$nextfile = ${$filesref}[$i+1];
@@ -468,7 +468,7 @@
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ my $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $doinclude ) { push(@ddffile, $ddfline); }
$counter++; # increasing the counter
@@ -522,7 +522,7 @@
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
- my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
+ my $ddfline = "\"" . $sourcepath . "\" \"" . $uniquename . "\"\n";
if ( $doinclude ) { push(@ddffile, $ddfline); }
}
@@ -625,7 +625,7 @@
if ( $oneline =~ /^\s*\.Set\s+CabinetName.*\=(.*?)\s*$/ ) { $cabinetfile = $1; }
if ( $oneline =~ /^\s*\.Set\s+/ ) { next; }
- if ( $oneline =~ /^\s*\"(.*?)\"\s+(.*?)\s*$/ )
+ if ( $oneline =~ /^\s*\"(.*?)\"\s+\"(.*?)\"\s*$/ )
{
my $sourcefile = $1;
my $uniquefilename = $2;
diff -Nru libreoffice-3.6.1~rc2/solenv/gbuild/Extension.mk libreoffice-3.6.2~rc2/solenv/gbuild/Extension.mk
--- libreoffice-3.6.1~rc2/solenv/gbuild/Extension.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/gbuild/Extension.mk 2012-09-25 12:13:30.000000000 +0000
@@ -43,8 +43,17 @@
gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex)
gb_Extension_HELPEXCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_Extension_HELPEXTARGET)
+gb_Extension_HELPINDEXERTARGET := \
+ $(call gb_Executable_get_target_for_build,HelpIndexer)
+gb_Extension_HELPINDEXERCOMMAND := \
+ $(gb_Helper_set_ld_path) $(gb_Extension_HELPINDEXERTARGET)
+gb_Extension_HELPLINKERTARGET := \
+ $(call gb_Executable_get_target_for_build,HelpLinker)
+gb_Extension_HELPLINKERCOMMAND := \
+ $(gb_Helper_set_ld_path) $(gb_Extension_HELPLINKERTARGET)
# does not contain en-US because it is special cased in gb_Extension_Extension
-gb_Extension_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
+gb_Extension_TRANS_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
+gb_Extension_ALL_LANGS := en-US $(gb_Extension_TRANS_LANGS)
# Substitute platform or copy if no platform has been set
define gb_Extension__subst_platform
@@ -57,6 +66,9 @@
cp -f $(1) $(2))
endef
+$(call gb_Extension_get_workdir,%)/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
# remove extension directory in workdir and oxt file in workdir and outdir
$(call gb_Extension_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),OXT,3)
@@ -95,11 +107,11 @@
$(call gb_Extension__subst_platform,$(call gb_Extension_get_workdir,$*)/description.xml,$(call gb_Extension_get_rootdir,$*)/description.xml) && \
$(call gb_Extension__subst_platform,$(LOCATION)/manifest.xml,$(call gb_Extension_get_rootdir,$*)/META-INF/manifest.xml) && \
cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_rootdir,$*)/registration && \
- $(if $(gb_WITH_LANG),cp $(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call gb_Extension_get_rootdir,$*) &&) \
+ $(if $(gb_WITH_LANG),cp $(foreach lang,$(gb_Extension_TRANS_LANGS),$(call gb_Extension_get_workdir,$*)/description-$(lang).txt) $(call gb_Extension_get_rootdir,$*) &&) \
cd $(call gb_Extension_get_rootdir,$*) && \
$(gb_Extension_ZIPCOMMAND) -rX --filesync \
$(call gb_Extension_get_target,$*) \
- $(FILES))
+ $(sort $(FILES)))
# TODO: needs dependency on $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) once readlicense_oo will be gbuildized
# or just another simpler solution
@@ -115,7 +127,7 @@
$(call gb_Extension_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_Extension_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_LANGS),description-$(lang).txt)
+$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_TRANS_LANGS),description-$(lang).txt)
$(call gb_Extension_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf
$(call gb_Extension_get_workdir,$(1))/description.xml : $$(SDF)
endif
@@ -124,6 +136,8 @@
$(call gb_Deliver_add_deliverable,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_target,$(1)),$(1))
$(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1))
+$(foreach lang,$(gb_Extension_ALL_LANGS), \
+ $(call gb_Extension__compile_help_onelang,$(1),$(lang)))
endef
# Set platform.
@@ -186,7 +200,7 @@
define gb_Extension_localize_properties
$(call gb_Extension_get_target,$(1)) : FILES += $(2)
ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
+$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst -,_,$(gb_Extension_TRANS_LANGS)),$(subst en_US,$(lang),$(2)))
$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
endif
@@ -200,24 +214,106 @@
endef
-# localize extension help
-define gb_Extension_localize_help
-ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(foreach lang,$(gb_Extension_LANGS),$(call gb_Extension_localize_help_onelang,$(1),$(subst lang,$(lang),$(2)),$(3),$(lang)))
-endif
-
-endef
-
-define gb_Extension_localize_help_onelang
-$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf
-$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
- $$(call gb_Output_announce,$(2),$(true),XHP,3)
- mkdir -p $$(dir $$@) && \
- $(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF)
+# add an .xhp help file, to be localized and compiled
+# $(1): extension identifier
+# $(2): absolute path prefix of en-US source file without $(3) (resp. $(4))
+# suffix
+# $(3): relative path of (target) .xhp file (e.g.,
+# com.sun.wiki-publisher/wiki.xhp)
+# $(4): optional relative path of source .xhp file, when it differs from $(3)
+# (i.e., if $(4) is empty the en-US source file is $(2)/$(3), otherwise it
+# is $(2)/$(4))
+define gb_Extension_add_helpfile
+$(foreach lang,$(gb_Extension_ALL_LANGS), \
+ $(call gb_Extension__localize_helpfile_onelang,$(1),$(2),$(3),$(4),$(lang)) \
+ $(call gb_Extension__add_compiled_help_dependency_onelang,$(1),$(lang)))
+endef
+
+# add a list of .xhp help files, to be localized and compiled
+# $(1): extension identifier
+# $(2): absolute path prefix of en-US source files without $(3) suffixes
+# $(3): list of relative paths of .xhp files (see gb_Extension_add_helpfile)
+define gb_Extension_add_helpfiles
+$(foreach helpfile,$(3), \
+ $(call gb_Extension_add_helpfile,$(1),$(2),$(helpfile),))
+endef
+
+# localize one .xhp help file for one language; the result is stored as
+# help/$(4)/$(3) in the extension's workdir; as a special case, if $(4) is
+# "en-US", the source file is just copied, not passed through helpex
+# $(1): extension identifier
+# $(2): absolute path prefix of en-US source file without $(3) (resp. $(4))
+# suffix
+# $(3): relative path of (target) .xhp file (see gb_Extension_add_helpfile)
+# $(4): optional relative path of source .xhp file (see
+# gb_Extension_add_helpfile)
+# $(5): language
+define gb_Extension__localize_helpfile_onelang
+$(call gb_Extension_get_rootdir,$(1))/help/$(5).done : HELPFILES += $(3)
+$(call gb_Extension_get_rootdir,$(1))/help/$(5).done : \
+ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3)
+$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+ SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(2)/$(dir $(or $(4),$(3)))))localize.sdf
+$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : $$(SDF)
+$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+ $(if $(filter-out en-US,$(5)),$(gb_Extension_HELPEXTARGET)) | \
+ $(call gb_Extension_get_workdir,$(1))/help/.dir
+$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \
+ $(2)/$(or $(4),$(3))
+ $$(call gb_Output_announce,$(1) $(3) $(5),$(true),XHP,3)
+ $$(call gb_Helper_abbreviate_dirs, \
+ mkdir -p $$(dir $$@) && \
+ $(if $(filter-out en-US,$(5)), \
+ $(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(5) -m $$(SDF), \
+ cp $$< $$@))
+
+endef
+
+# compile help for one language; the result is stored as help/$(3)/ in the
+# extension's rootdir and marked for zipping into the .oxt
+# $(1): extension identifier
+# $(2): language
+# Target-specific HELPFILES: list of relative paths of .xhp files (see
+# gb_Extension_add_helpfile)
+define gb_Extension__compile_help_onelang
+$(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \
+ $(gb_Extension_HELPINDEXERTARGET) \
+ $(gb_Extension_HELPLINKERTARGET) \
+ $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
+ $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
+ $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl | \
+ $(call gb_Extension_get_rootdir,$(1))/help/.dir
+ $$(call gb_Output_announce,$(1) $(2),$(true),XHC,3)
+ $$(call gb_Helper_abbreviate_dirs, \
+ rm -rf $$(basename $$@) && \
+ mkdir $$(basename $$@) && \
+ $(gb_Extension_HELPLINKERCOMMAND) -mod help \
+ -extlangsrc $(call gb_Extension_get_workdir,$(1))/help/$(2) \
+ -sty $(OUTDIR_FOR_BUILD)/bin/embed.xsl \
+ -extlangdest $$(basename $$@) \
+ -idxcaption $(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
+ -idxcontent $(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl \
+ $$(HELPFILES) && \
+ (cd $(call gb_Extension_get_workdir,$(1))/help/$(2) && \
+ $(gb_Extension_ZIPCOMMAND) -r $$(basename $$@)/help.jar \
+ $$(HELPFILES)) && \
+ $(gb_Extension_HELPINDEXERCOMMAND) -lang $(2) -mod help \
+ -dir $$(basename $$@) && \
+ touch $$@)
+
+endef
+
+# establish the dependency that actually causes inclusion of the compiled help
+# into the .oxt, for one language; in principle, this would only need to be done
+# once per language iff the extension uses any help -- currently it is done from
+# each individual gb_Extension_add_helpfile call (and thus requires $strip
+# to remove duplicates from FILES)
+# $(1): extension identifier
+# $(2): language
+define gb_Extension__add_compiled_help_dependency_onelang
+$(call gb_Extension_get_target,$(1)) : FILES += help/$(2)
+$(call gb_Extension_get_target,$(1)) : \
+ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done
endef
diff -Nru libreoffice-3.6.1~rc2/solenv/gbuild/LinkTarget.mk libreoffice-3.6.2~rc2/solenv/gbuild/LinkTarget.mk
--- libreoffice-3.6.1~rc2/solenv/gbuild/LinkTarget.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/gbuild/LinkTarget.mk 2012-09-25 12:13:30.000000000 +0000
@@ -206,8 +206,10 @@
$(call gb_YaccTarget__command,$<,$*,$@,$(call gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
define gb_YaccTarget_YaccTarget
-$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1))
-$(call gb_YaccTarget_get_header_target,$(1)) :| $(call gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_grammar_target,$(1)) : $(call gb_YaccTarget_get_target,$(1))
+ touch $$@
+$(call gb_YaccTarget_get_header_target,$(1)) : $(call gb_YaccTarget_get_target,$(1))
+ touch $$@
endef
@@ -229,7 +231,8 @@
# gb_LexTarget_LexTarget(scanner-file)
define gb_LexTarget_LexTarget
-$(call gb_LexTarget_get_scanner_target,$(1)) :| $(call gb_LexTarget_get_target,$(1))
+$(call gb_LexTarget_get_scanner_target,$(1)) : $(call gb_LexTarget_get_target,$(1))
+ touch $$@
endef
@@ -704,7 +707,7 @@
$(call gb_LinkTarget_get_target,$(1)) : $$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_target,$$(lib)))
$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
-$$(foreach lib,$$(gb_LINKED_LIBS),$$(call gb_Library_get_headers_target,$$(lib)))
+ $(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib)))
endef
@@ -877,7 +880,7 @@
$(call gb_YaccTarget_YaccTarget,$(2))
$(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2),$(3))
$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2))
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccTarget_get_header_target,$(2)))
+$(call gb_LinkTarget_get_headers_target,$(1)) : $(call gb_YaccTarget_get_header_target,$(2))
$(call gb_LinkTarget__add_include,$(1),$(dir $(call gb_YaccTarget_get_header_target,$(2))))
endef
diff -Nru libreoffice-3.6.1~rc2/solenv/gbuild/gbuild.mk libreoffice-3.6.2~rc2/solenv/gbuild/gbuild.mk
--- libreoffice-3.6.1~rc2/solenv/gbuild/gbuild.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/gbuild/gbuild.mk 2012-09-25 12:13:30.000000000 +0000
@@ -76,12 +76,6 @@
gb_PRODUCT := $(false)
endif
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
-gb_SYMBOL := $(true)
-else
-gb_SYMBOL := $(false)
-endif
-
gb_TIMELOG := 0
ifneq ($(strip $(TIMELOG)$(timelog)),)
gb_TIMELOG := 1
@@ -117,8 +111,18 @@
endif
endif
+ifeq ($(or $(ENABLE_SYMBOLS),$(enable_symbols)),FALSE)
+gb_SYMBOL := $(false)
+else
+ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
+gb_SYMBOL := $(true)
+else
ifneq ($(gb_DEBUGLEVEL),0)
gb_SYMBOL := $(true)
+else
+gb_SYMBOL := $(false)
+endif
+endif
endif
ifneq ($(nodep),)
diff -Nru libreoffice-3.6.1~rc2/solenv/inc/minor.mk libreoffice-3.6.2~rc2/solenv/inc/minor.mk
--- libreoffice-3.6.1~rc2/solenv/inc/minor.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/inc/minor.mk 2012-09-25 12:13:30.000000000 +0000
@@ -6,6 +6,6 @@
VERSIONMAJOR=3
VERSIONMINOR=6
-VERSIONMICRO=1
+VERSIONMICRO=2
COPYRIGHTYEARRANGE=2000-2012
diff -Nru libreoffice-3.6.1~rc2/solenv/inc/settings.mk libreoffice-3.6.2~rc2/solenv/inc/settings.mk
--- libreoffice-3.6.1~rc2/solenv/inc/settings.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/solenv/inc/settings.mk 2012-09-25 12:13:30.000000000 +0000
@@ -1042,7 +1042,7 @@
CDEFS+= -DSUPD=$(UPD)
# flags to enable build with symbols; required for crashdump feature
-.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
+.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || ("$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE")
# if debug is enabled, this may enable less debug info than debug, so rely just on debug
.IF "$(debug)" == ""
CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS)
Binary files /tmp/lSEAOMnIQ2/libreoffice-3.6.1~rc2/src/cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz and /tmp/UJJQTk_K51/libreoffice-3.6.2~rc2/src/cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz differ
diff -Nru libreoffice-3.6.1~rc2/src/fetch.log libreoffice-3.6.2~rc2/src/fetch.log
--- libreoffice-3.6.1~rc2/src/fetch.log 2012-08-27 12:41:46.000000000 +0000
+++ libreoffice-3.6.2~rc2/src/fetch.log 2012-10-02 19:25:09.000000000 +0000
@@ -1,28 +1,28 @@
-Mon Aug 27 14:35:53 CEST 2012
---2012-08-27 14:35:53-- http://dev-www.libreoffice.org/src/86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz
+Tue Oct 2 21:19:55 CEST 2012
+--2012-10-02 21:19:55-- http://dev-www.libreoffice.org/src/86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 614264 (600K) [application/x-gzip]
Saving to: `86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz'
- 0K ........ . 100% 427K=1.4s
+ 0K ........ . 100% 1.07M=0.5s
-2012-08-27 14:35:55 (427 KB/s) - `86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz' saved [614264/614264]
+2012-10-02 21:19:56 (1.07 MB/s) - `86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz' saved [614264/614264]
---2012-08-27 14:35:55-- http://dev-www.libreoffice.org/src/51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
+--2012-10-02 21:19:56-- http://dev-www.libreoffice.org/src/51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 3782207 (3.6M) [application/x-gzip]
Saving to: `51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 83% 957K 1s
- 3072K ........ . 100% 1.16M=3.7s
+ 0K ........ ........ ........ ........ ........ ........ 83% 1.24M 0s
+ 3072K ........ . 100% 1.28M=2.9s
-2012-08-27 14:35:59 (989 KB/s) - `51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz' saved [3782207/3782207]
+2012-10-02 21:19:59 (1.25 MB/s) - `51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz' saved [3782207/3782207]
---2012-08-27 14:35:59-- http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
+--2012-10-02 21:19:59-- http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
@@ -31,143 +31,143 @@
0K ....... 100% 1.04M=0.4s
-2012-08-27 14:36:00 (1.04 MB/s) - `c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2' saved [468395/468395]
+2012-10-02 21:20:00 (1.04 MB/s) - `c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2' saved [468395/468395]
---2012-08-27 14:36:00-- http://dev-www.libreoffice.org/src/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
+--2012-10-02 21:20:00-- http://dev-www.libreoffice.org/src/0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 241 [text/plain]
Saving to: `0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt'
- 0K 100% 16.9M=0s
+ 0K 100% 52.3M=0s
-2012-08-27 14:36:00 (16.9 MB/s) - `0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt' saved [241/241]
+2012-10-02 21:20:00 (52.3 MB/s) - `0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt' saved [241/241]
---2012-08-27 14:36:00-- http://dev-www.libreoffice.org/src/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
+--2012-10-02 21:20:00-- http://dev-www.libreoffice.org/src/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1088522 (1.0M) [application/x-bzip]
Saving to: `6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2'
- 0K ........ ........ 100% 936K=1.1s
+ 0K ........ ........ 100% 945K=1.1s
-2012-08-27 14:36:01 (936 KB/s) - `6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2' saved [1088522/1088522]
+2012-10-02 21:20:01 (945 KB/s) - `6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2' saved [1088522/1088522]
---2012-08-27 14:36:01-- http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+--2012-10-02 21:20:01-- http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 3519470 (3.4M) [application/zip]
Saving to: `17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip'
- 0K ........ ........ ........ ........ ........ ........ 89% 772K 0s
- 3072K ..... 100% 1.15M=4.3s
+ 0K ........ ........ ........ ........ ........ ........ 89% 1.22M 0s
+ 3072K ..... 100% 1.21M=2.8s
-2012-08-27 14:36:06 (801 KB/s) - `17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip' saved [3519470/3519470]
+2012-10-02 21:20:04 (1.22 MB/s) - `17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip' saved [3519470/3519470]
---2012-08-27 14:36:06-- http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
+--2012-10-02 21:20:04-- http://dev-www.libreoffice.org/src/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 315122 (308K) [application/x-gzip]
Saving to: `1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz'
- 0K .... 100% 1.03M=0.3s
+ 0K .... 100% 425K=0.7s
-2012-08-27 14:36:06 (1.03 MB/s) - `1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz' saved [315122/315122]
+2012-10-02 21:20:05 (425 KB/s) - `1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz' saved [315122/315122]
---2012-08-27 14:36:06-- http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+--2012-10-02 21:20:05-- http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 728789 (712K) [application/x-gzip]
Saving to: `18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz'
- 0K ........ ... 100% 1022K=0.7s
+ 0K ........ ... 100% 1.17M=0.6s
-2012-08-27 14:36:07 (1022 KB/s) - `18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz' saved [728789/728789]
+2012-10-02 21:20:05 (1.17 MB/s) - `18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz' saved [728789/728789]
---2012-08-27 14:36:07-- http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+--2012-10-02 21:20:05-- http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1652670 (1.6M) [application/x-gzip]
Saving to: `1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz'
- 0K ........ ........ ........ . 100% 1001K=1.6s
+ 0K ........ ........ ........ . 100% 1.18M=1.3s
-2012-08-27 14:36:09 (1001 KB/s) - `1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz' saved [1652670/1652670]
+2012-10-02 21:20:08 (1.18 MB/s) - `1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz' saved [1652670/1652670]
---2012-08-27 14:36:09-- http://dev-www.libreoffice.org/src/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
+--2012-10-02 21:20:08-- http://dev-www.libreoffice.org/src/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 20335 (20K) [text/html]
Saving to: `24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html'
- 0K 100% 450K=0.04s
+ 0K 100% 610K=0.03s
-2012-08-27 14:36:09 (450 KB/s) - `24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html' saved [20335/20335]
+2012-10-02 21:20:08 (610 KB/s) - `24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html' saved [20335/20335]
---2012-08-27 14:36:09-- http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+--2012-10-02 21:20:08-- http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 769268 (751K) [application/x-gzip]
Saving to: `26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz'
- 0K ........ ... 100% 981K=0.8s
+ 0K ........ ... 100% 1.14M=0.6s
-2012-08-27 14:36:10 (981 KB/s) - `26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz' saved [769268/769268]
+2012-10-02 21:20:09 (1.14 MB/s) - `26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz' saved [769268/769268]
---2012-08-27 14:36:10-- http://dev-www.libreoffice.org/src/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
+--2012-10-02 21:20:09-- http://dev-www.libreoffice.org/src/284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1657246 (1.6M) [application/x-gzip]
Saving to: `284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz'
- 0K ........ ........ ........ . 100% 1013K=1.6s
+ 0K ........ ........ ........ . 100% 1.18M=1.3s
-2012-08-27 14:36:12 (1013 KB/s) - `284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz' saved [1657246/1657246]
+2012-10-02 21:20:10 (1.18 MB/s) - `284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz' saved [1657246/1657246]
---2012-08-27 14:36:12-- http://dev-www.libreoffice.org/src/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
+--2012-10-02 21:20:10-- http://dev-www.libreoffice.org/src/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 3568559 (3.4M) [application/x-gzip]
Saving to: `2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 88% 1.01M 0s
- 3072K ...... 100% 1024K=3.4s
+ 0K ........ ........ ........ ........ ........ ........ 88% 1.21M 0s
+ 3072K ...... 100% 1.16M=2.8s
-2012-08-27 14:36:16 (1.01 MB/s) - `2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz' saved [3568559/3568559]
+2012-10-02 21:20:13 (1.21 MB/s) - `2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz' saved [3568559/3568559]
---2012-08-27 14:36:16-- http://dev-www.libreoffice.org/src/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
+--2012-10-02 21:20:13-- http://dev-www.libreoffice.org/src/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 474681 (464K) [application/x-gzip]
Saving to: `2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz'
- 0K ....... 100% 1.03M=0.4s
+ 0K ....... 100% 1.14M=0.4s
-2012-08-27 14:36:18 (1.03 MB/s) - `2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz' saved [474681/474681]
+2012-10-02 21:20:14 (1.14 MB/s) - `2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz' saved [474681/474681]
---2012-08-27 14:36:18-- http://dev-www.libreoffice.org/src/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+--2012-10-02 21:20:14-- http://dev-www.libreoffice.org/src/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1882664 (1.8M) [application/x-gzip]
Saving to: `2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz'
- 0K ........ ........ ........ .... 100% 1.10M=1.6s
+ 0K ........ ........ ........ .... 100% 1.15M=1.6s
-2012-08-27 14:36:19 (1.10 MB/s) - `2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz' saved [1882664/1882664]
+2012-10-02 21:20:15 (1.15 MB/s) - `2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz' saved [1882664/1882664]
---2012-08-27 14:36:19-- http://dev-www.libreoffice.org/src/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
+--2012-10-02 21:20:16-- http://dev-www.libreoffice.org/src/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
@@ -176,934 +176,945 @@
0K ........ ........ .... 100% 1.10M=1.1s
-2012-08-27 14:36:21 (1.10 MB/s) - `0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz' saved [1326668/1326668]
+2012-10-02 21:20:17 (1.10 MB/s) - `0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz' saved [1326668/1326668]
---2012-08-27 14:36:21-- http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+--2012-10-02 21:20:17-- http://dev-www.libreoffice.org/src/cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz
+Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
+Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 2302736 (2.2M) [application/x-gzip]
+Saving to: `cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz'
+
+ 0K ........ ........ ........ ........ ... 100% 1.13M=1.9s
+
+2012-10-02 21:20:19 (1.13 MB/s) - `cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz' saved [2302736/2302736]
+
+--2012-10-02 21:20:19-- http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 9796 (9.6K) [application/zip]
Saving to: `35c94d2df8893241173de1d16b6034c0-swingExSrc.zip'
- 0K 100% 677K=0.01s
+ 0K 100% 1.40M=0.007s
-2012-08-27 14:36:21 (677 KB/s) - `35c94d2df8893241173de1d16b6034c0-swingExSrc.zip' saved [9796/9796]
+2012-10-02 21:20:19 (1.40 MB/s) - `35c94d2df8893241173de1d16b6034c0-swingExSrc.zip' saved [9796/9796]
---2012-08-27 14:36:21-- http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
+--2012-10-02 21:20:19-- http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 867405 (847K) [application/zip]
Saving to: `35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip'
- 0K ........ ..... 100% 1.08M=0.8s
+ 0K ........ ..... 100% 1.14M=0.7s
-2012-08-27 14:36:22 (1.08 MB/s) - `35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip' saved [867405/867405]
+2012-10-02 21:20:20 (1.14 MB/s) - `35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip' saved [867405/867405]
---2012-08-27 14:36:22-- http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+--2012-10-02 21:20:20-- http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 153157 (150K) [application/zip]
Saving to: `39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip'
- 0K .. 100% 941K=0.2s
+ 0K .. 100% 967K=0.2s
-2012-08-27 14:36:22 (941 KB/s) - `39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip' saved [153157/153157]
+2012-10-02 21:20:20 (967 KB/s) - `39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip' saved [153157/153157]
---2012-08-27 14:36:22-- http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
+--2012-10-02 21:20:20-- http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 463264 (452K) [application/x-gzip]
Saving to: `3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz'
- 0K ....... 100% 1.04M=0.4s
+ 0K ....... 100% 1.11M=0.4s
-2012-08-27 14:36:22 (1.04 MB/s) - `3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz' saved [463264/463264]
+2012-10-02 21:20:21 (1.11 MB/s) - `3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz' saved [463264/463264]
---2012-08-27 14:36:22-- http://dev-www.libreoffice.org/src/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+--2012-10-02 21:20:21-- http://dev-www.libreoffice.org/src/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 189448 (185K) [application/x-gzip]
Saving to: `3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz'
- 0K .. 100% 801K=0.2s
+ 0K .. 100% 951K=0.2s
-2012-08-27 14:36:23 (801 KB/s) - `3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz' saved [189448/189448]
+2012-10-02 21:20:21 (951 KB/s) - `3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz' saved [189448/189448]
---2012-08-27 14:36:23-- http://dev-www.libreoffice.org/src/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
+--2012-10-02 21:20:21-- http://dev-www.libreoffice.org/src/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 441 [text/plain]
Saving to: `48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt'
- 0K 100% 27.5M=0s
+ 0K 100% 3.09K=0.1s
-2012-08-27 14:36:23 (27.5 MB/s) - `48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt' saved [441/441]
+2012-10-02 21:20:21 (3.09 KB/s) - `48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt' saved [441/441]
---2012-08-27 14:36:23-- http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+--2012-10-02 21:20:21-- http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2241498 (2.1M) [application/x-gzip]
Saving to: `48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz'
- 0K ........ ........ ........ ........ .. 100% 1.05M=2.0s
+ 0K ........ ........ ........ ........ .. 100% 1.20M=1.8s
-2012-08-27 14:36:25 (1.05 MB/s) - `48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz' saved [2241498/2241498]
+2012-10-02 21:20:23 (1.20 MB/s) - `48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz' saved [2241498/2241498]
---2012-08-27 14:36:25-- http://dev-www.libreoffice.org/src/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
+--2012-10-02 21:20:23-- http://dev-www.libreoffice.org/src/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 22508 (22K) [application/x-gzip]
Saving to: `4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz'
- 0K 100% 625K=0.04s
+ 0K 100% 688K=0.03s
-2012-08-27 14:36:25 (625 KB/s) - `4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz' saved [22508/22508]
+2012-10-02 21:20:23 (688 KB/s) - `4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz' saved [22508/22508]
---2012-08-27 14:36:25-- http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
+--2012-10-02 21:20:23-- http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 23558405 (22M) [application/x-gzip]
Saving to: `f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 13% 1.12M 17s
- 3072K ........ ........ ........ ........ ........ ........ 26% 1.12M 15s
- 6144K ........ ........ ........ ........ ........ ........ 40% 1.15M 12s
- 9216K ........ ........ ........ ........ ........ ........ 53% 1.13M 9s
- 12288K ........ ........ ........ ........ ........ ........ 66% 1.05M 7s
- 15360K ........ ........ ........ ........ ........ ........ 80% 879K 4s
- 18432K ........ ........ ........ ........ ........ ........ 93% 1.37M 1s
- 21504K ........ ........ ....... 100% 1.13M=20s
+ 0K ........ ........ ........ ........ ........ ........ 13% 1.23M 16s
+ 3072K ........ ........ ........ ........ ........ ........ 26% 1.24M 13s
+ 6144K ........ ........ ........ ........ ........ ........ 40% 1.22M 11s
+ 9216K ........ ........ ........ ........ ........ ........ 53% 1.22M 9s
+ 12288K ........ ........ ........ ........ ........ ........ 66% 1.27M 6s
+ 15360K ........ ........ ........ ........ ........ ........ 80% 1.25M 4s
+ 18432K ........ ........ ........ ........ ........ ........ 93% 1.23M 1s
+ 21504K ........ ........ ....... 100% 1.23M=18s
-2012-08-27 14:36:46 (1.10 MB/s) - `f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz' saved [23558405/23558405]
+2012-10-02 21:20:42 (1.24 MB/s) - `f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz' saved [23558405/23558405]
---2012-08-27 14:36:46-- http://dev-www.libreoffice.org/src/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
+--2012-10-02 21:20:42-- http://dev-www.libreoffice.org/src/599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 674912 (659K) [application/x-gzip]
Saving to: `599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz'
- 0K ........ .. 100% 1011K=0.7s
+ 0K ........ .. 100% 1.15M=0.6s
-2012-08-27 14:36:47 (1011 KB/s) - `599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz' saved [674912/674912]
+2012-10-02 21:20:42 (1.15 MB/s) - `599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz' saved [674912/674912]
---2012-08-27 14:36:47-- http://dev-www.libreoffice.org/src/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
+--2012-10-02 21:20:42-- http://dev-www.libreoffice.org/src/7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 4854591 (4.6M) [application/x-gzip]
Saving to: `7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 64% 1.06M 2s
- 3072K ........ ........ ........ .. 100% 1.12M=4.3s
+ 0K ........ ........ ........ ........ ........ ........ 64% 1.18M 1s
+ 3072K ........ ........ ........ .. 100% 1.24M=3.9s
-2012-08-27 14:36:51 (1.08 MB/s) - `7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz' saved [4854591/4854591]
+2012-10-02 21:20:46 (1.20 MB/s) - `7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz' saved [4854591/4854591]
---2012-08-27 14:36:51-- http://dev-www.libreoffice.org/src/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
+--2012-10-02 21:20:46-- http://dev-www.libreoffice.org/src/7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2424604 (2.3M) [application/x-gzip]
Saving to: `7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz'
- 0K ........ ........ ........ ........ .... 100% 1.08M=2.1s
+ 0K ........ ........ ........ ........ .... 100% 1.17M=2.0s
-2012-08-27 14:36:54 (1.08 MB/s) - `7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz' saved [2424604/2424604]
+2012-10-02 21:20:48 (1.17 MB/s) - `7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz' saved [2424604/2424604]
---2012-08-27 14:36:54-- http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+--2012-10-02 21:20:48-- http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1521926 (1.5M) [application/zip]
Saving to: `798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip'
- 0K ........ ........ ....... 100% 1.06M=1.4s
+ 0K ........ ........ ....... 100% 1.13M=1.3s
-2012-08-27 14:36:57 (1.06 MB/s) - `798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip' saved [1521926/1521926]
+2012-10-02 21:20:50 (1.13 MB/s) - `798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip' saved [1521926/1521926]
---2012-08-27 14:36:57-- http://dev-www.libreoffice.org/src/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
+--2012-10-02 21:20:50-- http://dev-www.libreoffice.org/src/ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 3013744 (2.9M) [application/x-gzip]
Saving to: `ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz'
- 0K ........ ........ ........ ........ ........ ..... 100% 1.09M=2.6s
+ 0K ........ ........ ........ ........ ........ ..... 100% 703K=4.2s
-2012-08-27 14:37:00 (1.09 MB/s) - `ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz' saved [3013744/3013744]
+2012-10-02 21:20:54 (703 KB/s) - `ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz' saved [3013744/3013744]
---2012-08-27 14:37:00-- http://dev-www.libreoffice.org/src/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
+--2012-10-02 21:20:54-- http://dev-www.libreoffice.org/src/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 56041 (55K) [application/x-java-archive]
Saving to: `8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar'
- 0K 100% 801K=0.07s
+ 0K 100% 319K=0.2s
-2012-08-27 14:37:00 (801 KB/s) - `8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar' saved [56041/56041]
+2012-10-02 21:20:54 (319 KB/s) - `8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar' saved [56041/56041]
---2012-08-27 14:37:00-- http://dev-www.libreoffice.org/src/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
+--2012-10-02 21:20:55-- http://dev-www.libreoffice.org/src/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 762803 (745K) [application/x-gzip]
Saving to: `bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz'
- 0K ........ ... 100% 1.06M=0.7s
+ 0K ........ ... 100% 606K=1.2s
-2012-08-27 14:37:00 (1.06 MB/s) - `bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz' saved [762803/762803]
+2012-10-02 21:20:56 (606 KB/s) - `bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz' saved [762803/762803]
---2012-08-27 14:37:01-- http://dev-www.libreoffice.org/src/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
+--2012-10-02 21:20:56-- http://dev-www.libreoffice.org/src/a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 49233648 (47M) [application/x-gzip]
Saving to: `a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 6% 1.06M 41s
- 3072K ........ ........ ........ ........ ........ ........ 12% 1.14M 37s
- 6144K ........ ........ ........ ........ ........ ........ 19% 1.12M 34s
- 9216K ........ ........ ........ ........ ........ ........ 25% 1.11M 32s
- 12288K ........ ........ ........ ........ ........ ........ 31% 1.15M 29s
- 15360K ........ ........ ........ ........ ........ ........ 38% 993K 27s
- 18432K ........ ........ ........ ........ ........ ........ 44% 1.08M 24s
- 21504K ........ ........ ........ ........ ........ ........ 51% 1.06M 21s
- 24576K ........ ........ ........ ........ ........ ........ 57% 1.08M 18s
- 27648K ........ ........ ........ ........ ........ ........ 63% 647K 17s
- 30720K ........ ........ ........ ........ ........ ........ 70% 677K 14s
- 33792K ........ ........ ........ ........ ........ ........ 76% 1.08M 11s
- 36864K ........ ........ ........ ........ ........ ........ 83% 1.06M 8s
- 39936K ........ ........ ........ ........ ........ ........ 89% 1003K 5s
- 43008K ........ ........ ........ ........ ........ ........ 95% 1.00M 2s
- 46080K ........ ........ ........ ....... 100% 917K=48s
+ 0K ........ ........ ........ ........ ........ ........ 6% 1.08M 41s
+ 3072K ........ ........ ........ ........ ........ ........ 12% 1.20M 36s
+ 6144K ........ ........ ........ ........ ........ ........ 19% 1.26M 32s
+ 9216K ........ ........ ........ ........ ........ ........ 25% 1.24M 29s
+ 12288K ........ ........ ........ ........ ........ ........ 31% 1.26M 27s
+ 15360K ........ ........ ........ ........ ........ ........ 38% 1.25M 24s
+ 18432K ........ ........ ........ ........ ........ ........ 44% 1.26M 21s
+ 21504K ........ ........ ........ ........ ........ ........ 51% 1.26M 19s
+ 24576K ........ ........ ........ ........ ........ ........ 57% 1.25M 16s
+ 27648K ........ ........ ........ ........ ........ ........ 63% 1.24M 14s
+ 30720K ........ ........ ........ ........ ........ ........ 70% 1.20M 11s
+ 33792K ........ ........ ........ ........ ........ ........ 76% 1.22M 9s
+ 36864K ........ ........ ........ ........ ........ ........ 83% 1.27M 6s
+ 39936K ........ ........ ........ ........ ........ ........ 89% 1.23M 4s
+ 43008K ........ ........ ........ ........ ........ ........ 95% 1.23M 2s
+ 46080K ........ ........ ........ ....... 100% 1.24M=38s
-2012-08-27 14:37:49 (1001 KB/s) - `a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz' saved [49233648/49233648]
+2012-10-02 21:21:34 (1.23 MB/s) - `a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz' saved [49233648/49233648]
---2012-08-27 14:37:49-- http://dev-www.libreoffice.org/src/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
+--2012-10-02 21:21:34-- http://dev-www.libreoffice.org/src/a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 44798 (44K) [text/html]
Saving to: `a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html'
- 0K 100% 708K=0.06s
+ 0K 100% 653K=0.07s
-2012-08-27 14:37:49 (708 KB/s) - `a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html' saved [44798/44798]
+2012-10-02 21:21:35 (653 KB/s) - `a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html' saved [44798/44798]
---2012-08-27 14:37:49-- http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+--2012-10-02 21:21:35-- http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 23150 (23K) [application/zip]
Saving to: `a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip'
- 0K 100% 564K=0.04s
+ 0K 100% 670K=0.03s
-2012-08-27 14:37:49 (564 KB/s) - `a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip' saved [23150/23150]
+2012-10-02 21:21:35 (670 KB/s) - `a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip' saved [23150/23150]
---2012-08-27 14:37:49-- http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
+--2012-10-02 21:21:35-- http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2732347 (2.6M) [application/zip]
Saving to: `ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip'
- 0K ........ ........ ........ ........ ........ . 100% 985K=2.7s
+ 0K ........ ........ ........ ........ ........ . 100% 1.23M=2.1s
-2012-08-27 14:37:52 (985 KB/s) - `ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip' saved [2732347/2732347]
+2012-10-02 21:21:37 (1.23 MB/s) - `ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip' saved [2732347/2732347]
---2012-08-27 14:37:52-- http://dev-www.libreoffice.org/src/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
+--2012-10-02 21:21:37-- http://dev-www.libreoffice.org/src/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 80427 (79K) [application/x-gzip]
Saving to: `af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz'
- 0K . 100% 835K=0.09s
+ 0K . 100% 816K=0.1s
-2012-08-27 14:37:52 (835 KB/s) - `af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz' saved [80427/80427]
+2012-10-02 21:21:37 (816 KB/s) - `af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz' saved [80427/80427]
---2012-08-27 14:37:52-- http://dev-www.libreoffice.org/src/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
+--2012-10-02 21:21:37-- http://dev-www.libreoffice.org/src/bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 13176 (13K) [text/plain]
Saving to: `bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1'
- 0K 100% 1.08M=0.01s
+ 0K 100% 1.38M=0.009s
-2012-08-27 14:37:52 (1.08 MB/s) - `bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1' saved [13176/13176]
+2012-10-02 21:21:37 (1.38 MB/s) - `bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1' saved [13176/13176]
---2012-08-27 14:37:52-- http://dev-www.libreoffice.org/src/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
+--2012-10-02 21:21:37-- http://dev-www.libreoffice.org/src/c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 686207 (670K) [application/x-gzip]
Saving to: `c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz'
- 0K ........ .. 100% 1.00M=0.7s
+ 0K ........ .. 100% 1.16M=0.6s
-2012-08-27 14:37:53 (1.00 MB/s) - `c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz' saved [686207/686207]
+2012-10-02 21:21:38 (1.16 MB/s) - `c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz' saved [686207/686207]
---2012-08-27 14:37:53-- http://dev-www.libreoffice.org/src/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
+--2012-10-02 21:21:38-- http://dev-www.libreoffice.org/src/ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 3989935 (3.8M) [application/x-gzip]
Saving to: `ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 78% 1.06M 1s
- 3072K ........ .... 100% 1.09M=3.6s
+ 0K ........ ........ ........ ........ ........ ........ 78% 1.20M 1s
+ 3072K ........ .... 100% 1.26M=3.1s
-2012-08-27 14:37:57 (1.07 MB/s) - `ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz' saved [3989935/3989935]
+2012-10-02 21:21:41 (1.21 MB/s) - `ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz' saved [3989935/3989935]
---2012-08-27 14:37:57-- http://dev-www.libreoffice.org/src/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
+--2012-10-02 21:21:41-- http://dev-www.libreoffice.org/src/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 764464 (747K) [application/zip]
Saving to: `d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip'
- 0K ........ ... 100% 1009K=0.7s
+ 0K ........ ... 100% 1.18M=0.6s
-2012-08-27 14:37:58 (1009 KB/s) - `d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip' saved [764464/764464]
+2012-10-02 21:21:42 (1.18 MB/s) - `d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip' saved [764464/764464]
---2012-08-27 14:37:58-- http://dev-www.libreoffice.org/src/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
+--2012-10-02 21:21:42-- http://dev-www.libreoffice.org/src/d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 5515376 (5.3M) [application/x-gzip]
Saving to: `d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 57% 1.05M 2s
- 3072K ........ ........ ........ ........ .... 100% 1.11M=4.9s
+ 0K ........ ........ ........ ........ ........ ........ 57% 1.12M 2s
+ 3072K ........ ........ ........ ........ .... 100% 1.25M=4.5s
-2012-08-27 14:38:03 (1.08 MB/s) - `d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz' saved [5515376/5515376]
+2012-10-02 21:21:47 (1.17 MB/s) - `d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz' saved [5515376/5515376]
---2012-08-27 14:38:03-- http://dev-www.libreoffice.org/src/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
+--2012-10-02 21:21:47-- http://dev-www.libreoffice.org/src/e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 175 [text/plain]
Saving to: `e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt'
- 0K 100% 12.1M=0s
+ 0K 100% 11.0M=0s
-2012-08-27 14:38:03 (12.1 MB/s) - `e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt' saved [175/175]
+2012-10-02 21:21:47 (11.0 MB/s) - `e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt' saved [175/175]
---2012-08-27 14:38:03-- http://dev-www.libreoffice.org/src/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
+--2012-10-02 21:21:47-- http://dev-www.libreoffice.org/src/e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 10960385 (10M) [application/x-bzip]
Saving to: `e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2'
- 0K ........ ........ ........ ........ ........ ........ 28% 1.04M 7s
- 3072K ........ ........ ........ ........ ........ ........ 57% 1.11M 4s
- 6144K ........ ........ ........ ........ ........ ........ 86% 1.15M 1s
- 9216K ........ ........ ....... 100% 1.15M=9.5s
+ 0K ........ ........ ........ ........ ........ ........ 28% 1.23M 6s
+ 3072K ........ ........ ........ ........ ........ ........ 57% 1.23M 4s
+ 6144K ........ ........ ........ ........ ........ ........ 86% 1.16M 1s
+ 9216K ........ ........ ....... 100% 1.19M=8.7s
-2012-08-27 14:38:12 (1.10 MB/s) - `e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2' saved [10960385/10960385]
+2012-10-02 21:21:55 (1.20 MB/s) - `e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2' saved [10960385/10960385]
---2012-08-27 14:38:12-- http://dev-www.libreoffice.org/src/e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
+--2012-10-02 21:21:55-- http://dev-www.libreoffice.org/src/e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 3401513 (3.2M) [application/x-gzip]
Saving to: `e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 92% 1.08M 0s
- 3072K ... 100% 1.13M=3.0s
+ 0K ........ ........ ........ ........ ........ ........ 92% 1.19M 0s
+ 3072K ... 100% 1.31M=2.7s
-2012-08-27 14:38:15 (1.08 MB/s) - `e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz' saved [3401513/3401513]
+2012-10-02 21:21:58 (1.20 MB/s) - `e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz' saved [3401513/3401513]
---2012-08-27 14:38:15-- http://dev-www.libreoffice.org/src/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+--2012-10-02 21:21:58-- http://dev-www.libreoffice.org/src/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 726942 (710K) [application/x-gzip]
Saving to: `ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz'
- 0K ........ ... 100% 1.10M=0.6s
+ 0K ........ ... 100% 1.18M=0.6s
-2012-08-27 14:38:17 (1.10 MB/s) - `ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz' saved [726942/726942]
+2012-10-02 21:21:59 (1.18 MB/s) - `ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz' saved [726942/726942]
---2012-08-27 14:38:17-- http://dev-www.libreoffice.org/src/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+--2012-10-02 21:21:59-- http://dev-www.libreoffice.org/src/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 12735186 (12M) [application/x-gzip]
Saving to: `ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 24% 1.10M 8s
- 3072K ........ ........ ........ ........ ........ ........ 49% 1.11M 6s
- 6144K ........ ........ ........ ........ ........ ........ 74% 1.07M 3s
- 9216K ........ ........ ........ ........ ........ ........ 98% 1.11M 0s
- 12288K .. 100% 1.25M=11s
+ 0K ........ ........ ........ ........ ........ ........ 24% 1.09M 8s
+ 3072K ........ ........ ........ ........ ........ ........ 49% 1.25M 5s
+ 6144K ........ ........ ........ ........ ........ ........ 74% 1.22M 3s
+ 9216K ........ ........ ........ ........ ........ ........ 98% 1.29M 0s
+ 12288K .. 100% 1.23M=10s
-2012-08-27 14:38:28 (1.10 MB/s) - `ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz' saved [12735186/12735186]
+2012-10-02 21:22:09 (1.21 MB/s) - `ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz' saved [12735186/12735186]
---2012-08-27 14:38:28-- http://dev-www.libreoffice.org/src/dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
+--2012-10-02 21:22:09-- http://dev-www.libreoffice.org/src/dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 562616 (549K) [application/x-gzip]
Saving to: `dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz'
- 0K ........ 100% 1.03M=0.5s
+ 0K ........ 100% 1.14M=0.5s
-2012-08-27 14:38:29 (1.03 MB/s) - `dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz' saved [562616/562616]
+2012-10-02 21:22:10 (1.14 MB/s) - `dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz' saved [562616/562616]
---2012-08-27 14:38:29-- http://dev-www.libreoffice.org/src/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
+--2012-10-02 21:22:10-- http://dev-www.libreoffice.org/src/fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 559 [text/plain]
Saving to: `fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt'
- 0K 100% 34.2M=0s
+ 0K 100% 35.0M=0s
-2012-08-27 14:38:29 (34.2 MB/s) - `fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt' saved [559/559]
+2012-10-02 21:22:10 (35.0 MB/s) - `fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt' saved [559/559]
---2012-08-27 14:38:29-- http://dev-www.libreoffice.org/src/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
+--2012-10-02 21:22:10-- http://dev-www.libreoffice.org/src/fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1117561 (1.1M) [application/x-gzip]
Saving to: `fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz'
- 0K ........ ........ . 100% 1.04M=1.0s
+ 0K ........ ........ . 100% 866K=1.3s
-2012-08-27 14:38:30 (1.04 MB/s) - `fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz' saved [1117561/1117561]
+2012-10-02 21:22:12 (866 KB/s) - `fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz' saved [1117561/1117561]
---2012-08-27 14:38:30-- http://dev-www.libreoffice.org/src/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
+--2012-10-02 21:22:12-- http://dev-www.libreoffice.org/src/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 5008644 (4.8M) [application/zip]
Saving to: `f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip'
- 0K ........ ........ ........ ........ ........ ........ 62% 1.03M 2s
- 3072K ........ ........ ........ .... 100% 1.13M=4.5s
+ 0K ........ ........ ........ ........ ........ ........ 62% 1.23M 1s
+ 3072K ........ ........ ........ .... 100% 1.24M=3.9s
-2012-08-27 14:38:35 (1.07 MB/s) - `f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip' saved [5008644/5008644]
+2012-10-02 21:22:16 (1.23 MB/s) - `f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip' saved [5008644/5008644]
---2012-08-27 14:38:35-- http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
+--2012-10-02 21:22:16-- http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 467089 (456K) [application/x-gzip]
Saving to: `0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz'
- 0K ....... 100% 1.05M=0.4s
+ 0K ....... 100% 1.15M=0.4s
-2012-08-27 14:38:35 (1.05 MB/s) - `0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz' saved [467089/467089]
+2012-10-02 21:22:17 (1.15 MB/s) - `0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz' saved [467089/467089]
---2012-08-27 14:38:35-- http://dev-www.libreoffice.org/src/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
+--2012-10-02 21:22:17-- http://dev-www.libreoffice.org/src/061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 14884071 (14M) [application/x-bzip]
Saving to: `061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2'
- 0K ........ ........ ........ ........ ........ ........ 21% 1.10M 10s
- 3072K ........ ........ ........ ........ ........ ........ 42% 1.14M 7s
- 6144K ........ ........ ........ ........ ........ ........ 63% 1.14M 5s
- 9216K ........ ........ ........ ........ ........ ........ 84% 1.14M 2s
- 12288K ........ ........ ........ ........ ... 100% 1.09M=13s
+ 0K ........ ........ ........ ........ ........ ........ 21% 1.22M 9s
+ 3072K ........ ........ ........ ........ ........ ........ 42% 1.24M 7s
+ 6144K ........ ........ ........ ........ ........ ........ 63% 1.26M 4s
+ 9216K ........ ........ ........ ........ ........ ........ 84% 1.23M 2s
+ 12288K ........ ........ ........ ........ ... 100% 1.15M=12s
-2012-08-27 14:38:48 (1.12 MB/s) - `061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2' saved [14884071/14884071]
+2012-10-02 21:22:28 (1.22 MB/s) - `061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2' saved [14884071/14884071]
---2012-08-27 14:38:48-- http://dev-www.libreoffice.org/src/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz
+--2012-10-02 21:22:28-- http://dev-www.libreoffice.org/src/e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 4906938 (4.7M) [application/x-gzip]
Saving to: `e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 64% 1.07M 2s
- 3072K ........ ........ ........ .. 100% 1.16M=4.3s
+ 0K ........ ........ ........ ........ ........ ........ 64% 1.20M 1s
+ 3072K ........ ........ ........ .. 100% 1.26M=3.8s
-2012-08-27 14:38:53 (1.10 MB/s) - `e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz' saved [4906938/4906938]
+2012-10-02 21:22:32 (1.22 MB/s) - `e1e255dc43dbcbb34cb19e8a0eba90ae-mythes-1.2.2.tar.gz' saved [4906938/4906938]
---2012-08-27 14:38:53-- http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+--2012-10-02 21:22:32-- http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1180582 (1.1M) [application/zip]
Saving to: `3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip'
- 0K ........ ........ .. 100% 1.09M=1.0s
+ 0K ........ ........ .. 100% 1.20M=0.9s
-2012-08-27 14:38:54 (1.09 MB/s) - `3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip' saved [1180582/1180582]
+2012-10-02 21:22:33 (1.20 MB/s) - `3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip' saved [1180582/1180582]
---2012-08-27 14:38:54-- http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+--2012-10-02 21:22:33-- http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 5750610 (5.5M) [application/zip]
Saving to: `3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip'
- 0K ........ ........ ........ ........ ........ ........ 54% 1.09M 2s
- 3072K ........ ........ ........ ........ ....... 100% 1.16M=4.9s
+ 0K ........ ........ ........ ........ ........ ........ 54% 1.20M 2s
+ 3072K ........ ........ ........ ........ ....... 100% 1.26M=4.5s
-2012-08-27 14:38:59 (1.12 MB/s) - `3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip' saved [5750610/5750610]
+2012-10-02 21:22:38 (1.23 MB/s) - `3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip' saved [5750610/5750610]
---2012-08-27 14:38:59-- http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+--2012-10-02 21:22:38-- http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 762419 (745K) [application/zip]
Saving to: `8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip'
- 0K ........ ... 100% 1.10M=0.7s
+ 0K ........ ... 100% 1.17M=0.6s
-2012-08-27 14:39:00 (1.10 MB/s) - `8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip' saved [762419/762419]
+2012-10-02 21:22:39 (1.17 MB/s) - `8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip' saved [762419/762419]
---2012-08-27 14:39:00-- http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+--2012-10-02 21:22:39-- http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2938721 (2.8M) [application/zip]
Saving to: `97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip'
- 0K ........ ........ ........ ........ ........ .... 100% 1.11M=2.5s
+ 0K ........ ........ ........ ........ ........ .... 100% 1.21M=2.3s
-2012-08-27 14:39:02 (1.11 MB/s) - `97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip' saved [2938721/2938721]
+2012-10-02 21:22:41 (1.21 MB/s) - `97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip' saved [2938721/2938721]
---2012-08-27 14:39:02-- http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+--2012-10-02 21:22:41-- http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2929311 (2.8M) [application/zip]
Saving to: `ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip'
- 0K ........ ........ ........ ........ ........ .... 100% 1.10M=2.5s
+ 0K ........ ........ ........ ........ ........ .... 100% 1.22M=2.3s
-2012-08-27 14:39:05 (1.10 MB/s) - `ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip' saved [2929311/2929311]
+2012-10-02 21:22:44 (1.22 MB/s) - `ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip' saved [2929311/2929311]
---2012-08-27 14:39:05-- http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+--2012-10-02 21:22:44-- http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 207563 (203K) [application/zip]
Saving to: `d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip'
- 0K ... 100% 953K=0.2s
+ 0K ... 100% 997K=0.2s
-2012-08-27 14:39:05 (953 KB/s) - `d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip' saved [207563/207563]
+2012-10-02 21:22:45 (997 KB/s) - `d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip' saved [207563/207563]
---2012-08-27 14:39:05-- http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+--2012-10-02 21:22:45-- http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1396007 (1.3M) [application/zip]
Saving to: `db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip'
- 0K ........ ........ ..... 100% 1.11M=1.2s
+ 0K ........ ........ ..... 100% 1.20M=1.1s
-2012-08-27 14:39:07 (1.11 MB/s) - `db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip' saved [1396007/1396007]
+2012-10-02 21:22:48 (1.20 MB/s) - `db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip' saved [1396007/1396007]
---2012-08-27 14:39:07-- http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+--2012-10-02 21:22:48-- http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 427800 (418K) [application/zip]
Saving to: `eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip'
- 0K ...... 100% 1009K=0.4s
+ 0K ...... 100% 1.11M=0.4s
-2012-08-27 14:39:07 (1009 KB/s) - `eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip' saved [427800/427800]
+2012-10-02 21:22:48 (1.11 MB/s) - `eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip' saved [427800/427800]
---2012-08-27 14:39:07-- http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+--2012-10-02 21:22:48-- http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 211919 (207K) [application/zip]
Saving to: `f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip'
- 0K ... 100% 952K=0.2s
+ 0K ... 100% 401K=0.5s
-2012-08-27 14:39:07 (952 KB/s) - `f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip' saved [211919/211919]
+2012-10-02 21:22:49 (401 KB/s) - `f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip' saved [211919/211919]
---2012-08-27 14:39:07-- http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+--2012-10-02 21:22:49-- http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 743031 (726K) [application/zip]
Saving to: `ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip'
- 0K ........ ... 100% 1.10M=0.6s
+ 0K ........ ... 100% 1.15M=0.6s
-2012-08-27 14:39:08 (1.10 MB/s) - `ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip' saved [743031/743031]
+2012-10-02 21:22:50 (1.15 MB/s) - `ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip' saved [743031/743031]
---2012-08-27 14:39:08-- http://dev-www.libreoffice.org/src/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
+--2012-10-02 21:22:50-- http://dev-www.libreoffice.org/src/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 884484 (864K) [application/x-gzip]
Saving to: `ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz'
- 0K ........ ..... 100% 1.12M=0.8s
+ 0K ........ ..... 100% 904K=1.0s
-2012-08-27 14:39:09 (1.12 MB/s) - `ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz' saved [884484/884484]
+2012-10-02 21:22:51 (904 KB/s) - `ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz' saved [884484/884484]
---2012-08-27 14:39:09-- http://dev-www.libreoffice.org/src/3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
+--2012-10-02 21:22:51-- http://dev-www.libreoffice.org/src/3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 15139737 (14M) [application/x-gzip]
Saving to: `3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 20% 1.11M 10s
- 3072K ........ ........ ........ ........ ........ ........ 41% 1.15M 7s
- 6144K ........ ........ ........ ........ ........ ........ 62% 1.15M 5s
- 9216K ........ ........ ........ ........ ........ ........ 83% 1.12M 2s
- 12288K ........ ........ ........ ........ ....... 100% 1.10M=13s
+ 0K ........ ........ ........ ........ ........ ........ 20% 616K 19s
+ 3072K ........ ........ ........ ........ ........ ........ 41% 1.11M 11s
+ 6144K ........ ........ ........ ........ ........ ........ 62% 1.18M 6s
+ 9216K ........ ........ ........ ........ ........ ........ 83% 1.23M 3s
+ 12288K ........ ........ ........ ........ ....... 100% 1.23M=15s
-2012-08-27 14:39:22 (1.13 MB/s) - `3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz' saved [15139737/15139737]
+2012-10-02 21:23:06 (1009 KB/s) - `3dd55b952826d2b32f51308f2f91aa89-gettext-0.18.1.1.tar.gz' saved [15139737/15139737]
---2012-08-27 14:39:22-- http://dev-www.libreoffice.org/src/9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
+--2012-10-02 21:23:06-- http://dev-www.libreoffice.org/src/9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 9746957 (9.3M) [application/x-gzip]
Saving to: `9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 32% 1.12M 6s
- 3072K ........ ........ ........ ........ ........ ........ 64% 785K 4s
- 6144K ........ ........ ........ ........ ........ ........ 96% 554K 0s
- 9216K .... 100% 959K=12s
+ 0K ........ ........ ........ ........ ........ ........ 32% 1.22M 5s
+ 3072K ........ ........ ........ ........ ........ ........ 64% 1.24M 3s
+ 6144K ........ ........ ........ ........ ........ ........ 96% 1.26M 0s
+ 9216K .... 100% 1.30M=7.5s
-2012-08-27 14:39:35 (764 KB/s) - `9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz' saved [9746957/9746957]
+2012-10-02 21:23:13 (1.24 MB/s) - `9f6e85e1e38490c3956f4415bcd33e6e-glib-2.28.1.tar.gz' saved [9746957/9746957]
---2012-08-27 14:39:35-- http://dev-www.libreoffice.org/src/a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
+--2012-10-02 21:23:13-- http://dev-www.libreoffice.org/src/a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2241319 (2.1M) [application/x-gzip]
Saving to: `a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz'
- 0K ........ ........ ........ ........ .. 100% 972K=2.3s
+ 0K ........ ........ ........ ........ .. 100% 1.19M=1.8s
-2012-08-27 14:39:37 (972 KB/s) - `a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz' saved [2241319/2241319]
+2012-10-02 21:23:15 (1.19 MB/s) - `a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz' saved [2241319/2241319]
---2012-08-27 14:39:37-- http://dev-www.libreoffice.org/src/3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
+--2012-10-02 21:23:15-- http://dev-www.libreoffice.org/src/3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 788587 (770K) [application/x-gzip]
Saving to: `3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz'
- 0K ........ .... 100% 1.03M=0.7s
+ 0K ........ .... 100% 1.17M=0.6s
-2012-08-27 14:39:38 (1.03 MB/s) - `3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz' saved [788587/788587]
+2012-10-02 21:23:16 (1.17 MB/s) - `3a84ac2da37cae5bf7ce616228c6fbde-libgsf-1.14.19.tar.gz' saved [788587/788587]
---2012-08-27 14:39:38-- http://dev-www.libreoffice.org/src/22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
+--2012-10-02 21:23:16-- http://dev-www.libreoffice.org/src/22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 2121138 (2.0M) [application/x-gzip]
Saving to: `22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz'
- 0K ........ ........ ........ ........ 100% 1.08M=1.9s
+ 0K ........ ........ ........ ........ 100% 1.22M=1.7s
-2012-08-27 14:39:40 (1.08 MB/s) - `22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz' saved [2121138/2121138]
+2012-10-02 21:23:18 (1.22 MB/s) - `22ad1c8d3fda7e73b0798035f3dd96bc-pango-1.28.3.tar.gz' saved [2121138/2121138]
---2012-08-27 14:39:40-- http://dev-www.libreoffice.org/src/0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
+--2012-10-02 21:23:18-- http://dev-www.libreoffice.org/src/0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 575474 (562K) [application/x-gzip]
Saving to: `0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz'
- 0K ........ 100% 1022K=0.6s
+ 0K ........ 100% 619K=0.9s
-2012-08-27 14:39:40 (1022 KB/s) - `0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz' saved [575474/575474]
+2012-10-02 21:23:19 (619 KB/s) - `0611e099e807210cf738dcb41425d104-libcroco-0.6.2.tar.gz' saved [575474/575474]
---2012-08-27 14:39:40-- http://dev-www.libreoffice.org/src/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
+--2012-10-02 21:23:19-- http://dev-www.libreoffice.org/src/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 636510 (622K) [application/x-gzip]
Saving to: `d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz'
- 0K ........ . 100% 1.06M=0.6s
+ 0K ........ . 100% 1.14M=0.5s
-2012-08-27 14:39:41 (1.06 MB/s) - `d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz' saved [636510/636510]
+2012-10-02 21:23:20 (1.14 MB/s) - `d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz' saved [636510/636510]
---2012-08-27 14:39:41-- http://dev-www.libreoffice.org/src/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
+--2012-10-02 21:23:20-- http://dev-www.libreoffice.org/src/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 1066062 (1.0M) [application/x-gzip]
Saving to: `9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz'
- 0K ........ ........ 100% 1.04M=1.0s
+ 0K ........ ........ 100% 1.20M=0.8s
-2012-08-27 14:39:42 (1.04 MB/s) - `9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz' saved [1066062/1066062]
+2012-10-02 21:23:21 (1.20 MB/s) - `9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz' saved [1066062/1066062]
---2012-08-27 14:39:42-- http://dev-www.libreoffice.org/src/a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
+--2012-10-02 21:23:21-- http://dev-www.libreoffice.org/src/a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 986681 (964K) [application/x-gzip]
Saving to: `a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz'
- 0K ........ ....... 100% 569K=1.7s
+ 0K ........ ....... 100% 1.11M=0.8s
-2012-08-27 14:39:44 (569 KB/s) - `a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz' saved [986681/986681]
+2012-10-02 21:23:22 (1.11 MB/s) - `a2c10c04f396a9ce72894beb18b4e1f9-jpeg-8c.tar.gz' saved [986681/986681]
---2012-08-27 14:39:44-- http://dev-www.libreoffice.org/src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
+--2012-10-02 21:23:22-- http://dev-www.libreoffice.org/src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 505085 (493K) [application/x-bzip]
Saving to: `2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2'
- 0K ....... 100% 1.03M=0.5s
+ 0K ....... 100% 1.12M=0.4s
-2012-08-27 14:39:45 (1.03 MB/s) - `2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2' saved [505085/505085]
+2012-10-02 21:23:23 (1.12 MB/s) - `2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2' saved [505085/505085]
---2012-08-27 14:39:45-- http://dev-www.libreoffice.org/src/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
+--2012-10-02 21:23:23-- http://dev-www.libreoffice.org/src/7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 19001722 (18M) [application/x-gzip]
Saving to: `7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz'
- 0K ........ ........ ........ ........ ........ ........ 16% 1.10M 14s
- 3072K ........ ........ ........ ........ ........ ........ 33% 1.16M 11s
- 6144K ........ ........ ........ ........ ........ ........ 49% 1.12M 8s
- 9216K ........ ........ ........ ........ ........ ........ 66% 1.10M 5s
- 12288K ........ ........ ........ ........ ........ ........ 82% 1.12M 3s
- 15360K ........ ........ ........ ........ ........ ........ 99% 1.01M 0s
- 18432K . 100% 5.05M=16s
+ 0K ........ ........ ........ ........ ........ ........ 16% 1.24M 12s
+ 3072K ........ ........ ........ ........ ........ ........ 33% 1.24M 10s
+ 6144K ........ ........ ........ ........ ........ ........ 49% 1.24M 7s
+ 9216K ........ ........ ........ ........ ........ ........ 66% 1.27M 5s
+ 12288K ........ ........ ........ ........ ........ ........ 82% 1.17M 3s
+ 15360K ........ ........ ........ ........ ........ ........ 99% 1.24M 0s
+ 18432K . 100% 1.25M=15s
-2012-08-27 14:40:01 (1.11 MB/s) - `7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz' saved [19001722/19001722]
+2012-10-02 21:23:38 (1.23 MB/s) - `7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz' saved [19001722/19001722]
---2012-08-27 14:40:01-- http://dev-www.libreoffice.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+--2012-10-02 21:23:38-- http://dev-www.libreoffice.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 42487 (41K) [text/plain]
Saving to: `451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt'
- 0K 100% 439K=0.09s
+ 0K 100% 689K=0.06s
-2012-08-27 14:40:01 (439 KB/s) - `451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt' saved [42487/42487]
+2012-10-02 21:23:38 (689 KB/s) - `451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt' saved [42487/42487]
---2012-08-27 14:40:01-- http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
+--2012-10-02 21:23:38-- http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 37482428 (36M) [application/x-bzip]
Saving to: `b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2'
- 0K ........ ........ ........ ........ ........ ........ 8% 621K 54s
- 3072K ........ ........ ........ ........ ........ ........ 16% 940K 41s
- 6144K ........ ........ ........ ........ ........ ........ 25% 1.08M 33s
- 9216K ........ ........ ........ ........ ........ ........ 33% 1.11M 27s
- 12288K ........ ........ ........ ........ ........ ........ 41% 884K 24s
- 15360K ........ ........ ........ ........ ........ ........ 50% 1.41M 19s
- 18432K ........ ........ ........ ........ ........ ........ 58% 1.14M 15s
- 21504K ........ ........ ........ ........ ........ ........ 67% 981K 12s
- 24576K ........ ........ ........ ........ ........ ........ 75% 1.08M 9s
- 27648K ........ ........ ........ ........ ........ ........ 83% 1.13M 6s
- 30720K ........ ........ ........ ........ ........ ........ 92% 1.11M 3s
- 33792K ........ ........ ........ ........ ........ ... 100% 1.14M=36s
+ 0K ........ ........ ........ ........ ........ ........ 8% 1.21M 27s
+ 3072K ........ ........ ........ ........ ........ ........ 16% 1.18M 25s
+ 6144K ........ ........ ........ ........ ........ ........ 25% 1.31M 22s
+ 9216K ........ ........ ........ ........ ........ ........ 33% 1.26M 19s
+ 12288K ........ ........ ........ ........ ........ ........ 41% 1.24M 17s
+ 15360K ........ ........ ........ ........ ........ ........ 50% 1.26M 14s
+ 18432K ........ ........ ........ ........ ........ ........ 58% 1.26M 12s
+ 21504K ........ ........ ........ ........ ........ ........ 67% 1.25M 9s
+ 24576K ........ ........ ........ ........ ........ ........ 75% 1.26M 7s
+ 27648K ........ ........ ........ ........ ........ ........ 83% 1.12M 5s
+ 30720K ........ ........ ........ ........ ........ ........ 92% 1.26M 2s
+ 33792K ........ ........ ........ ........ ........ ... 100% 1.19M=29s
-2012-08-27 14:40:37 (1.01 MB/s) - `b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2' saved [37482428/37482428]
+2012-10-02 21:24:07 (1.23 MB/s) - `b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2' saved [37482428/37482428]
---2012-08-27 14:40:37-- http://dev-www.libreoffice.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
+--2012-10-02 21:24:07-- http://dev-www.libreoffice.org/src/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 376068 (367K) [application/x-gzip]
Saving to: `0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz'
- 0K ..... 100% 961K=0.4s
+ 0K ..... 100% 1.09M=0.3s
-2012-08-27 14:40:38 (961 KB/s) - `0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz' saved [376068/376068]
+2012-10-02 21:24:08 (1.09 MB/s) - `0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz' saved [376068/376068]
---2012-08-27 14:40:38-- http://dev-www.libreoffice.org/src/a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
+--2012-10-02 21:24:08-- http://dev-www.libreoffice.org/src/a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 7260637 (6.9M) [application/x-gzip]
Saving to: `a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 43% 1020K 4s
- 3072K ........ ........ ........ ........ ........ ........ 86% 1.05M 1s
- 6144K ........ ...... 100% 1.09M=6.7s
+ 0K ........ ........ ........ ........ ........ ........ 43% 1.21M 3s
+ 3072K ........ ........ ........ ........ ........ ........ 86% 1.25M 1s
+ 6144K ........ ...... 100% 1.25M=5.6s
-2012-08-27 14:40:45 (1.03 MB/s) - `a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz' saved [7260637/7260637]
+2012-10-02 21:24:13 (1.23 MB/s) - `a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz' saved [7260637/7260637]
---2012-08-27 14:40:45-- http://dev-www.libreoffice.org/src/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
+--2012-10-02 21:24:13-- http://dev-www.libreoffice.org/src/9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 335521 (328K) [application/x-bzip]
Saving to: `9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2'
- 0K ..... 100% 886K=0.4s
+ 0K ..... 100% 1.12M=0.3s
-2012-08-27 14:40:45 (886 KB/s) - `9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2' saved [335521/335521]
+2012-10-02 21:24:14 (1.12 MB/s) - `9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2' saved [335521/335521]
---2012-08-27 14:40:45-- http://dev-www.libreoffice.org/src/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
+--2012-10-02 21:24:14-- http://dev-www.libreoffice.org/src/c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 629054 (614K) [application/x-bzip]
Saving to: `c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2'
- 0K ........ . 100% 996K=0.6s
+ 0K ........ . 100% 1.15M=0.5s
-2012-08-27 14:40:46 (996 KB/s) - `c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2' saved [629054/629054]
+2012-10-02 21:24:14 (1.15 MB/s) - `c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2' saved [629054/629054]
---2012-08-27 14:40:46-- http://dev-www.libreoffice.org/src/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
+--2012-10-02 21:24:14-- http://dev-www.libreoffice.org/src/d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 405362 (396K) [application/x-bzip]
Saving to: `d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2'
- 0K ...... 100% 951K=0.4s
+ 0K ...... 100% 1.11M=0.3s
-2012-08-27 14:40:46 (951 KB/s) - `d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2' saved [405362/405362]
+2012-10-02 21:24:15 (1.11 MB/s) - `d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2' saved [405362/405362]
---2012-08-27 14:40:46-- http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+--2012-10-02 21:24:15-- http://dev-www.libreoffice.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 92050 (90K) [application/x-bzip]
Saving to: `0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2'
- 0K . 100% 752K=0.1s
+ 0K . 100% 896K=0.1s
-2012-08-27 14:40:47 (752 KB/s) - `0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2' saved [92050/92050]
+2012-10-02 21:24:15 (896 KB/s) - `0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2' saved [92050/92050]
---2012-08-27 14:40:47-- http://dev-www.libreoffice.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
+--2012-10-02 21:24:15-- http://dev-www.libreoffice.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 38806420 (37M) [application/x-bzip]
Saving to: `f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2'
- 0K ........ ........ ........ ........ ........ ........ 8% 1018K 34s
- 3072K ........ ........ ........ ........ ........ ........ 16% 1.12M 30s
- 6144K ........ ........ ........ ........ ........ ........ 24% 1.08M 26s
- 9216K ........ ........ ........ ........ ........ ........ 32% 1.07M 24s
- 12288K ........ ........ ........ ........ ........ ........ 40% 850K 22s
- 15360K ........ ........ ........ ........ ........ ........ 48% 877K 19s
- 18432K ........ ........ ........ ........ ........ ........ 56% 1.01M 16s
- 21504K ........ ........ ........ ........ ........ ........ 64% 1.01M 13s
- 24576K ........ ........ ........ ........ ........ ........ 72% 1.09M 10s
- 27648K ........ ........ ........ ........ ........ ........ 81% 894K 7s
- 30720K ........ ........ ........ ........ ........ ........ 89% 1.20M 4s
- 33792K ........ ........ ........ ........ ........ ........ 97% 1.08M 1s
- 36864K ........ ........ 100% 1.09M=37s
+ 0K ........ ........ ........ ........ ........ ........ 8% 1.25M 27s
+ 3072K ........ ........ ........ ........ ........ ........ 16% 1.24M 25s
+ 6144K ........ ........ ........ ........ ........ ........ 24% 1.25M 22s
+ 9216K ........ ........ ........ ........ ........ ........ 32% 1.27M 20s
+ 12288K ........ ........ ........ ........ ........ ........ 40% 1.27M 18s
+ 15360K ........ ........ ........ ........ ........ ........ 48% 1.22M 15s
+ 18432K ........ ........ ........ ........ ........ ........ 56% 1.25M 13s
+ 21504K ........ ........ ........ ........ ........ ........ 64% 1.27M 10s
+ 24576K ........ ........ ........ ........ ........ ........ 72% 1.14M 8s
+ 27648K ........ ........ ........ ........ ........ ........ 81% 732K 6s
+ 30720K ........ ........ ........ ........ ........ ........ 89% 1.22M 3s
+ 33792K ........ ........ ........ ........ ........ ........ 97% 1.22M 1s
+ 36864K ........ ........ 100% 1.26M=32s
-2012-08-27 14:41:24 (1.01 MB/s) - `f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2' saved [38806420/38806420]
+2012-10-02 21:24:47 (1.17 MB/s) - `f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2' saved [38806420/38806420]
---2012-08-27 14:41:24-- http://dev-www.libreoffice.org/src/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
+--2012-10-02 21:24:47-- http://dev-www.libreoffice.org/src/3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 975917 (953K) [application/x-gzip]
Saving to: `3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz'
- 0K ........ ...... 100% 996K=1.0s
+ 0K ........ ...... 100% 1.19M=0.8s
-2012-08-27 14:41:25 (996 KB/s) - `3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz' saved [975917/975917]
+2012-10-02 21:24:48 (1.19 MB/s) - `3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz' saved [975917/975917]
---2012-08-27 14:41:25-- http://dev-www.libreoffice.org/src/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
+--2012-10-02 21:24:48-- http://dev-www.libreoffice.org/src/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 4352127 (4.2M) [application/x-gzip]
Saving to: `3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz'
- 0K ........ ........ ........ ........ ........ ........ 72% 598K 2s
- 3072K ........ ........ .. 100% 1.05M=6.2s
+ 0K ........ ........ ........ ........ ........ ........ 72% 953K 1s
+ 3072K ........ ........ .. 100% 635K=5.1s
-2012-08-27 14:41:32 (682 KB/s) - `3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz' saved [4352127/4352127]
+2012-10-02 21:24:54 (836 KB/s) - `3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz' saved [4352127/4352127]
---2012-08-27 14:41:32-- http://dev-www.libreoffice.org/src/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
+--2012-10-02 21:24:54-- http://dev-www.libreoffice.org/src/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 388940 (380K) [application/x-bzip]
Saving to: `94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2'
- 0K ..... 100% 193K=2.0s
+ 0K ..... 100% 510K=0.7s
-2012-08-27 14:41:34 (193 KB/s) - `94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2' saved [388940/388940]
+2012-10-02 21:24:55 (510 KB/s) - `94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2' saved [388940/388940]
---2012-08-27 14:41:34-- http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
+--2012-10-02 21:24:55-- http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 6651982 (6.3M) [application/zip]
Saving to: `e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip'
- 0K ........ ........ ........ ........ ........ ........ 47% 1.12M 3s
- 3072K ........ ........ ........ ........ ........ ........ 94% 1.13M 0s
- 6144K ..... 100% 1.21M=5.6s
+ 0K ........ ........ ........ ........ ........ ........ 47% 1.01M 3s
+ 3072K ........ ........ ........ ........ ........ ........ 94% 1.23M 0s
+ 6144K ..... 100% 1.22M=5.7s
-2012-08-27 14:41:40 (1.13 MB/s) - `e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip' saved [6651982/6651982]
+2012-10-02 21:25:01 (1.12 MB/s) - `e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip' saved [6651982/6651982]
---2012-08-27 14:41:40-- http://dev-www.libreoffice.org/src/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
+--2012-10-02 21:25:01-- http://dev-www.libreoffice.org/src/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 432064 (422K) [application/x-gzip]
Saving to: `0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz'
- 0K ...... 100% 1.03M=0.4s
+ 0K ...... 100% 289K=1.5s
-2012-08-27 14:41:41 (1.03 MB/s) - `0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz' saved [432064/432064]
+2012-10-02 21:25:03 (289 KB/s) - `0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz' saved [432064/432064]
---2012-08-27 14:41:41-- http://dev-www.libreoffice.org/src/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
+--2012-10-02 21:25:03-- http://dev-www.libreoffice.org/src/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 652066 (637K) [application/x-bzip]
Saving to: `ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2'
- 0K ........ . 100% 1.05M=0.6s
+ 0K ........ . 100% 528K=1.2s
-2012-08-27 14:41:42 (1.05 MB/s) - `ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2' saved [652066/652066]
+2012-10-02 21:25:04 (528 KB/s) - `ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2' saved [652066/652066]
---2012-08-27 14:41:42-- http://dev-www.libreoffice.org/src/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
+--2012-10-02 21:25:04-- http://dev-www.libreoffice.org/src/327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 4461644 (4.3M) [application/x-gzip]
Saving to: `327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz'
- 0K ........ ........ ........ ........ ........ ........ 70% 1.08M 1s
- 3072K ........ ........ .... 100% 1.02M=4.0s
+ 0K ........ ........ ........ ........ ........ ........ 70% 1.05M 1s
+ 3072K ........ ........ .... 100% 1.25M=3.9s
-2012-08-27 14:41:46 (1.06 MB/s) - `327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz' saved [4461644/4461644]
+2012-10-02 21:25:08 (1.10 MB/s) - `327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz' saved [4461644/4461644]
---2012-08-27 14:41:46-- http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+--2012-10-02 21:25:08-- http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70
Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 12288 (12K) [text/plain]
Saving to: `185d60944ea767075d27247c3162b3bc-unowinreg.dll'
- 0K 100% 1.31M=0.009s
+ 0K 100% 1.39M=0.008s
-2012-08-27 14:41:46 (1.31 MB/s) - `185d60944ea767075d27247c3162b3bc-unowinreg.dll' saved [12288/12288]
+2012-10-02 21:25:09 (1.39 MB/s) - `185d60944ea767075d27247c3162b3bc-unowinreg.dll' saved [12288/12288]
diff -Nru libreoffice-3.6.1~rc2/starmath/source/smdetect.cxx libreoffice-3.6.2~rc2/starmath/source/smdetect.cxx
--- libreoffice-3.6.1~rc2/starmath/source/smdetect.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/starmath/source/smdetect.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -322,10 +322,20 @@
{
if (0 == strncmp( "Read( aBuffer2, sizeof(aBuffer2) - 1);
+ aBuffer2[nBytesRead] = 0;
+ if (strstr( aBuffer2, "" ) != NULL ||
+ strstr( aBuffer2, "GetDateSep() != '-')
- {
- nCanForceToIso8601 = 2; // date separator does not interfere
- break;
- }
-
sal_Int32 n;
switch (eDateFormat)
{
@@ -1300,6 +1294,18 @@
return DMY;
}
break;
+ default:
+ case 0:
+ switch ((nOrder & 0xff))
+ {
+ case 'Y':
+ return YMD;
+ case 'M':
+ return MDY;
+ case 'D':
+ return DMY;
+ }
+ break;
}
}
SAL_WARN( "nf.date", "ImpSvNumberInputScan::GetDateOrder: undefined, falling back to locale's default");
@@ -1440,8 +1446,30 @@
nCounter = 1;
switch (nMonthPos) // where is the month
{
- case 0: // not found => only day entered
- pCal->setValue( CalendarFieldIndex::DAY_OF_MONTH, ImplGetDay(0) );
+ case 0: // not found
+ {
+ // If input matched a date pattern, use the pattern
+ // to determine if it is a day, month or year. The
+ // pattern should have only one single value then,
+ // 'D-', 'M-' or 'Y-'. If input did not match a
+ // pattern assume the usual day of current month.
+ sal_uInt32 nDateOrder = (bFormatTurn ?
+ pFormat->GetExactDateOrder() :
+ GetDatePatternOrder());
+ switch (nDateOrder)
+ {
+ case 'Y':
+ pCal->setValue( CalendarFieldIndex::YEAR, ImplGetYear(0) );
+ break;
+ case 'M':
+ pCal->setValue( CalendarFieldIndex::MONTH, ImplGetMonth(0) );
+ break;
+ case 'D':
+ default:
+ pCal->setValue( CalendarFieldIndex::DAY_OF_MONTH, ImplGetDay(0) );
+ break;
+ }
+ }
break;
case 1: // month at the beginning (Jan 01)
pCal->setValue( CalendarFieldIndex::MONTH, Abs(nMonth)-1 );
@@ -2233,6 +2261,7 @@
}
}
+ bool bSignDetectedHere = false;
if ( nSign == 0 // conflict - not signed
&& eScannedType != NUMBERFORMAT_DATE) // and not date
//!? catch time too?
@@ -2240,6 +2269,8 @@
nSign = GetSign(rString, nPos); // 1- DM
if (nNegCheck) // '(' as sign
return MatchedReturn();
+ if (nSign)
+ bSignDetectedHere = true;
}
SkipBlanks(rString, nPos);
@@ -2310,6 +2341,8 @@
const String& rDate = pFormatter->GetDateSep();
bDate = SkipString( rDate, rString, nPos); // 10. 10- 10/
}
+ if (bDate && bSignDetectedHere)
+ nSign = 0; // 'D-' takes precedence over signed date
if (bDate
|| ((MayBeIso8601() || MayBeMonthDate())
&& SkipChar( '-', rString, nPos)))
@@ -2877,6 +2910,12 @@
cDecSep == pFormatter->GetDateSep().GetChar(0) );
bTextInitialized = false;
aUpperCurrSymbol.Erase();
+ InvalidateDateAcceptancePatterns();
+}
+
+
+void ImpSvNumberInputScan::InvalidateDateAcceptancePatterns()
+{
if (sDateAcceptancePatterns.getLength())
sDateAcceptancePatterns = ::com::sun::star::uno::Sequence< ::rtl::OUString >();
}
diff -Nru libreoffice-3.6.1~rc2/svl/source/numbers/zforfind.hxx libreoffice-3.6.2~rc2/svl/source/numbers/zforfind.hxx
--- libreoffice-3.6.1~rc2/svl/source/numbers/zforfind.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svl/source/numbers/zforfind.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -83,6 +83,8 @@
*/
bool CanForceToIso8601( DateFormat eDateFormat );
+ void InvalidateDateAcceptancePatterns();
+
private:
SvNumberFormatter* pFormatter;
String* pUpperMonthText; // Array of month names, uppercase
diff -Nru libreoffice-3.6.1~rc2/svl/source/numbers/zforlist.cxx libreoffice-3.6.2~rc2/svl/source/numbers/zforlist.cxx
--- libreoffice-3.6.1~rc2/svl/source/numbers/zforlist.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svl/source/numbers/zforlist.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -151,19 +151,24 @@
utl::ConfigurationBroadcaster*,
sal_uInt32 nHint)
{
- if ( nHint & SYSLOCALEOPTIONS_HINT_LOCALE )
- {
- ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
- for( size_t i = 0, n = aFormatters.size(); i < n; ++i )
- aFormatters[ i ]->ReplaceSystemCL( eSysLanguage );
- eSysLanguage = MsLangId::getRealLanguage( LANGUAGE_SYSTEM );
- }
- if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
- {
- ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
- for( size_t i = 0, n = aFormatters.size(); i < n; ++i )
- aFormatters[ i ]->ResetDefaultSystemCurrency();
- }
+ ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
+
+ if ( nHint & SYSLOCALEOPTIONS_HINT_LOCALE )
+ {
+ for( size_t i = 0, n = aFormatters.size(); i < n; ++i )
+ aFormatters[ i ]->ReplaceSystemCL( eSysLanguage );
+ eSysLanguage = MsLangId::getRealLanguage( LANGUAGE_SYSTEM );
+ }
+ if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
+ {
+ for( size_t i = 0, n = aFormatters.size(); i < n; ++i )
+ aFormatters[ i ]->ResetDefaultSystemCurrency();
+ }
+ if ( nHint & SYSLOCALEOPTIONS_HINT_DATEPATTERNS )
+ {
+ for( size_t i = 0, n = aFormatters.size(); i < n; ++i )
+ aFormatters[ i ]->InvalidateDateAcceptancePatterns();
+ }
}
@@ -3183,6 +3188,12 @@
}
+void SvNumberFormatter::InvalidateDateAcceptancePatterns()
+{
+ pStringScanner->InvalidateDateAcceptancePatterns();
+}
+
+
sal_uInt32 SvNumberFormatter::ImpGetDefaultSystemCurrencyFormat()
{
if ( nDefaultSystemCurrencyFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
diff -Nru libreoffice-3.6.1~rc2/svtools/source/control/ctrlbox.cxx libreoffice-3.6.2~rc2/svtools/source/control/ctrlbox.cxx
--- libreoffice-3.6.1~rc2/svtools/source/control/ctrlbox.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svtools/source/control/ctrlbox.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -327,6 +327,10 @@
result = std::max(0,
static_cast((m_nRate1 * nWidth) + 0.5)
- (nConstant2 + nConstantD));
+ if (result == 0 && m_nRate1 > 0.0 && nWidth > 0)
+ { // fdo#51777: hack to essentially treat 1 twip DOUBLE border
+ result = 1; // as 1 twip SINGLE border
+ }
}
return result;
}
diff -Nru libreoffice-3.6.1~rc2/svx/inc/svx/svdpage.hxx libreoffice-3.6.2~rc2/svx/inc/svx/svdpage.hxx
--- libreoffice-3.6.1~rc2/svx/inc/svx/svdpage.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svx/inc/svx/svdpage.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -42,12 +42,14 @@
#include
#include "svx/svxdllapi.h"
#include
+#include
#include
#include
//////////////////////////////////////////////////////////////////////////////
// predefines
+namespace reportdesign { class OSection; }
namespace sdr { namespace contact { class ViewContact; }}
class SdrPage;
class SdrModel;
@@ -427,8 +429,8 @@
friend class SvxUnoDrawPagesAccess;
// this class uses its own UNO wrapper
-// and thus has to set mxUnoPage
-friend class ChXChartDocument;
+// and thus has to set mxUnoPage (it also relies on mxUnoPage not being WeakRef)
+friend class reportdesign::OSection;
sal_Int32 nWdt; // Seitengroesse
sal_Int32 nHgt; // Seitengroesse
@@ -437,13 +439,11 @@
sal_Int32 nBordRgt; // Seitenrand rechts
sal_Int32 nBordLwr; // Seitenrand unten
- // this is a weak reference to a possible living api wrapper for this page
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage;
-
protected:
SdrLayerAdmin* pLayerAdmin;
private:
SdrPageProperties* mpSdrPageProperties;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage;
public:
SdrPageProperties& getSdrPageProperties() { return *mpSdrPageProperties; }
@@ -466,6 +466,8 @@
// #i93597#
unsigned mbPageBorderOnlyLeftRight : 1;
+ void SetUnoPage(::com::sun::star::uno::Reference<
+ ::com::sun::star::drawing::XDrawPage> const&);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
public:
diff -Nru libreoffice-3.6.1~rc2/svx/source/accessibility/AccessibleFrameSelector.cxx libreoffice-3.6.2~rc2/svx/source/accessibility/AccessibleFrameSelector.cxx
--- libreoffice-3.6.1~rc2/svx/source/accessibility/AccessibleFrameSelector.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svx/source/accessibility/AccessibleFrameSelector.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -101,6 +101,13 @@
AccFrameSelector::~AccFrameSelector()
{
+ RemoveFrameSelEventListener();
+}
+
+// ----------------------------------------------------------------------------
+
+void AccFrameSelector::RemoveFrameSelEventListener()
+{
if ( mpFrameSel )
{
mpFrameSel->RemoveEventListener( LINK( this, AccFrameSelector, WindowEventListener ) );
@@ -709,6 +716,7 @@
void AccFrameSelector::Invalidate()
{
+ RemoveFrameSelEventListener();
mpFrameSel = 0;
EventObject aEvent;
Reference < XAccessibleContext > xThis( this );
diff -Nru libreoffice-3.6.1~rc2/svx/source/inc/AccessibleFrameSelector.hxx libreoffice-3.6.2~rc2/svx/source/inc/AccessibleFrameSelector.hxx
--- libreoffice-3.6.1~rc2/svx/source/inc/AccessibleFrameSelector.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svx/source/inc/AccessibleFrameSelector.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -127,6 +127,7 @@
private:
void IsValid() throw (::com::sun::star::uno::RuntimeException);
+ void RemoveFrameSelEventListener();
FrameSelector* mpFrameSel;
::osl::Mutex maFocusMutex;
diff -Nru libreoffice-3.6.1~rc2/svx/source/inc/filtnav.hxx libreoffice-3.6.2~rc2/svx/source/inc/filtnav.hxx
--- libreoffice-3.6.1~rc2/svx/source/inc/filtnav.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svx/source/inc/filtnav.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -48,7 +48,6 @@
#include
#include "svx/fmtools.hxx"
#include "fmexch.hxx"
-#include
#include "sqlparserclient.hxx"
class FmFormShell;
diff -Nru libreoffice-3.6.1~rc2/svx/source/svdraw/svdpage.cxx libreoffice-3.6.2~rc2/svx/source/svdraw/svdpage.cxx
--- libreoffice-3.6.1~rc2/svx/source/svdraw/svdpage.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/svx/source/svdraw/svdpage.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1785,10 +1785,13 @@
}
}
+void SdrPage::SetUnoPage(uno::Reference const& xNewPage)
+{
+ mxUnoPage = xNewPage;
+}
uno::Reference< uno::XInterface > SdrPage::getUnoPage()
{
- // try weak reference first
if( !mxUnoPage.is() )
{
// create one
diff -Nru libreoffice-3.6.1~rc2/sw/qa/core/swdoc-test.cxx libreoffice-3.6.2~rc2/sw/qa/core/swdoc-test.cxx
--- libreoffice-3.6.1~rc2/sw/qa/core/swdoc-test.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/qa/core/swdoc-test.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -307,6 +307,7 @@
}
//See https://issues.apache.org/ooo/show_bug.cgi?id=89042
+ //See https://bugs.freedesktop.org/show_bug.cgi?id=53399
{
SwDocStat aDocStat;
@@ -323,15 +324,20 @@
CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3);
const sal_Unicode aShouldBeFive[] = {
+ // f r e n c h space
0x0046, 0x0072, 0x0065, 0x006E, 0x0063, 0x0068, 0x0020,
+ // << nbsp s a v o i
0x00AB, 0x00A0, 0x0073, 0x0061, 0x0076, 0x006F, 0x0069,
- 0x0072, 0x0020, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075,
- 0x006C, 0x0065, 0x0072, 0x00A0, 0x00BB
+ // r nnbsp c a l c u
+ 0x0072, 0x202f, 0x0063, 0x0061, 0x006C, 0x0063, 0x0075,
+ // l e r idspace >>
+ 0x006C, 0x0065, 0x0072, 0x3000, 0x00BB
};
m_pDoc->AppendTxtNode(*aPaM.GetPoint());
m_pDoc->InsertString(aPaM, rtl::OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive)));
pTxtNode = aPaM.GetNode()->GetTxtNode();
+ aDocStat.Reset();
pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
CPPUNIT_ASSERT_MESSAGE("Should be 5", aDocStat.nWord == 5);
}
diff -Nru libreoffice-3.6.1~rc2/sw/source/core/crsr/crsrsh.cxx libreoffice-3.6.2~rc2/sw/source/core/crsr/crsrsh.cxx
--- libreoffice-3.6.1~rc2/sw/source/core/crsr/crsrsh.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/core/crsr/crsrsh.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -690,6 +690,17 @@
bool bInHeaderFooter = pFrm && ( pFrm->IsHeaderFrm() || pFrm->IsFooterFrm() );
if ( bInHeaderFooter != IsHeaderFooterEdit() )
ToggleHeaderFooterEdit();
+ else
+ {
+ // Make sure we have the proper Header/Footer separators shown
+ // as these may be changed if clicking on an empty Header/Footer
+ SetShowHeaderFooterSeparator( Header, pFrm != NULL && pFrm->IsHeaderFrm( ) );
+ SetShowHeaderFooterSeparator( Footer, pFrm != NULL && pFrm->IsFooterFrm( ) );
+
+ // Repaint everything
+ GetWin()->Invalidate();
+ }
+
if( pBlockCrsr && bBlock )
{
diff -Nru libreoffice-3.6.1~rc2/sw/source/core/doc/gctable.cxx libreoffice-3.6.2~rc2/sw/source/core/doc/gctable.cxx
--- libreoffice-3.6.1~rc2/sw/source/core/doc/gctable.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/core/doc/gctable.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -357,19 +357,20 @@
if( 1 == pTblBox->GetTabLines().Count() )
{
- // Box with a Line, then move all the Line's Boxes after this Box
- // into the parent Line and delete this Box
+ // we have a box with a single line, so we just replace it by the line's boxes
SwTableLine* pInsLine = pTblBox->GetUpper();
SwTableLine* pCpyLine = pTblBox->GetTabLines()[0];
SwTableBoxes::iterator it = std::find( pInsLine->GetTabBoxes().begin(), pInsLine->GetTabBoxes().end(), pTblBox );
for( n = 0; n < pCpyLine->GetTabBoxes().size(); ++n )
pCpyLine->GetTabBoxes()[n]->SetUpper( pInsLine );
- pInsLine->GetTabBoxes().insert( it + 1, pCpyLine->GetTabBoxes().begin(), pCpyLine->GetTabBoxes().end());
+ // remove the old box from its parent line
+ it = pInsLine->GetTabBoxes().erase( it );
+ // insert the nested line's boxes in its place
+ pInsLine->GetTabBoxes().insert( it, pCpyLine->GetTabBoxes().begin(), pCpyLine->GetTabBoxes().end());
pCpyLine->GetTabBoxes().clear();
- // Delete the old Box with the Line
- delete *it;
- pInsLine->GetTabBoxes().erase( it );
+ // destroy the removed box
+ delete pTblBox;
return false; // set up anew
}
diff -Nru libreoffice-3.6.1~rc2/sw/source/core/txtnode/txtedt.cxx libreoffice-3.6.2~rc2/sw/source/core/txtnode/txtedt.cxx
--- libreoffice-3.6.1~rc2/sw/source/core/txtnode/txtedt.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/core/txtnode/txtedt.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -71,6 +71,7 @@
#include
#include
#include
+#include
#include
@@ -96,14 +97,6 @@
extern const SwTxtNode *pLinguNode;
extern SwTxtFrm *pLinguFrm;
-bool lcl_IsSkippableWhiteSpace( xub_Unicode cCh )
-{
- return 0x3000 == cCh ||
- ' ' == cCh ||
- '\t' == cCh ||
- 0x0a == cCh;
-}
-
/*
* This has basically the same function as SwScriptInfo::MaskHiddenRanges,
* only for deleted redlines
@@ -731,7 +724,7 @@
// skip non-letter characters:
while ( nBegin < aText.getLength() )
{
- if ( !lcl_IsSkippableWhiteSpace( aText[nBegin] ) )
+ if ( !u_isspace( aText[nBegin] ) )
{
if ( !pLanguage )
{
@@ -1879,7 +1872,7 @@
//do the count
// all counts exclude hidden paras and hidden+redlined within para
// definition of space/white chars in SwScanner (and BreakIter!)
- // uses both lcl_IsSkippableWhiteSpace and BreakIter getWordBoundary in SwScanner
+ // uses both u_isspace and BreakIter getWordBoundary in SwScanner
sal_uInt32 nTmpWords = 0; // count of all words
sal_uInt32 nTmpAsianWords = 0; //count of all Asian codepoints
sal_uInt32 nTmpChars = 0; // count of all chars
diff -Nru libreoffice-3.6.1~rc2/sw/source/core/unocore/unocoll.cxx libreoffice-3.6.2~rc2/sw/source/core/unocore/unocoll.cxx
--- libreoffice-3.6.1~rc2/sw/source/core/unocore/unocoll.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/core/unocore/unocoll.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -86,6 +86,7 @@
#include
#include
#include
+#include
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -1644,7 +1645,20 @@
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
- return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount();
+
+ sal_Int32 count(0);
+ IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
+ for (IDocumentMarkAccess::const_iterator_t ppMark =
+ pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+ {
+ if (IDocumentMarkAccess::BOOKMARK ==
+ IDocumentMarkAccess::GetType(**ppMark))
+ {
+ ++count; // only count real bookmarks
+ }
+ }
+ return count;
}
uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
@@ -1657,12 +1671,26 @@
if(nIndex < 0 || nIndex >= pMarkAccess->getBookmarksCount())
throw IndexOutOfBoundsException();
- uno::Any aRet;
- ::sw::mark::IMark* pBkmk = pMarkAccess->getBookmarksBegin()[nIndex].get();
- const uno::Reference< text::XTextContent > xRef =
- SwXBookmark::CreateXBookmark(*GetDoc(), *pBkmk);
- aRet <<= xRef;
- return aRet;
+ sal_Int32 count(0);
+ for (IDocumentMarkAccess::const_iterator_t ppMark =
+ pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+ {
+ if (IDocumentMarkAccess::BOOKMARK ==
+ IDocumentMarkAccess::GetType(**ppMark))
+ {
+ if (count == nIndex)
+ {
+ uno::Any aRet;
+ const uno::Reference< text::XTextContent > xRef =
+ SwXBookmark::CreateXBookmark(*GetDoc(), **ppMark);
+ aRet <<= xRef;
+ return aRet;
+ }
+ ++count; // only count real bookmarks
+ }
+ }
+ throw IndexOutOfBoundsException();
}
uno::Any SwXBookmarks::getByName(const rtl::OUString& rName)
@@ -1691,13 +1719,19 @@
if(!IsValid())
throw uno::RuntimeException();
+ ::comphelper::SequenceAsVector< ::rtl::OUString > ret;
IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
- uno::Sequence aSeq(pMarkAccess->getBookmarksCount());
- sal_Int32 nCnt = 0;
- for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin();
- ppMark != pMarkAccess->getBookmarksEnd();)
- aSeq[nCnt++] = (*ppMark++)->GetName();
- return aSeq;
+ for (IDocumentMarkAccess::const_iterator_t ppMark =
+ pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+ {
+ if (IDocumentMarkAccess::BOOKMARK ==
+ IDocumentMarkAccess::GetType(**ppMark))
+ {
+ ret.push_back((*ppMark)->GetName()); // only add real bookmarks
+ }
+ }
+ return ret.getAsConstList();
}
sal_Bool SwXBookmarks::hasByName(const OUString& rName)
@@ -1723,7 +1757,19 @@
SolarMutexGuard aGuard;
if(!IsValid())
throw uno::RuntimeException();
- return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount() != 0;
+
+ IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
+ for (IDocumentMarkAccess::const_iterator_t ppMark =
+ pMarkAccess->getBookmarksBegin();
+ ppMark != pMarkAccess->getBookmarksEnd(); ++ppMark)
+ {
+ if (IDocumentMarkAccess::BOOKMARK ==
+ IDocumentMarkAccess::GetType(**ppMark))
+ {
+ return true;
+ }
+ }
+ return false;
}
SwXNumberingRulesCollection::SwXNumberingRulesCollection( SwDoc* _pDoc ) :
diff -Nru libreoffice-3.6.1~rc2/sw/source/core/unocore/unosect.cxx libreoffice-3.6.2~rc2/sw/source/core/unocore/unosect.cxx
--- libreoffice-3.6.1~rc2/sw/source/core/unocore/unosect.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/core/unocore/unosect.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -400,6 +400,14 @@
SwSection *const pRet =
pDoc->InsertSwSection( aPam, aSect, 0, aSet.Count() ? &aSet : 0 );
+ if (!pRet) // fdo#42450 text range could parially overlap existing section
+ {
+ // shouldn't have created an undo object yet
+ pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_INSSECTION, NULL );
+ throw lang::IllegalArgumentException(
+ "SwXTextSection::attach(): invalid TextRange",
+ static_cast< ::cppu::OWeakObject*>(this), 0);
+ }
pRet->GetFmt()->Add(m_pImpl.get());
pRet->GetFmt()->SetXObject(static_cast< ::cppu::OWeakObject*>(this));
diff -Nru libreoffice-3.6.1~rc2/sw/source/filter/html/htmltab.cxx libreoffice-3.6.2~rc2/sw/source/filter/html/htmltab.cxx
--- libreoffice-3.6.1~rc2/sw/source/filter/html/htmltab.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/filter/html/htmltab.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -2072,8 +2072,7 @@
sal_uInt16 HTMLTable::GetBorderWidth( const SvxBorderLine& rBLine,
sal_Bool bWithDistance ) const
{
- sal_uInt16 nBorderWidth = rBLine.GetOutWidth() + rBLine.GetInWidth() +
- rBLine.GetDistance();
+ sal_uInt16 nBorderWidth = rBLine.GetWidth();
if( bWithDistance )
{
if( nCellPadding )
diff -Nru libreoffice-3.6.1~rc2/sw/source/filter/ww8/docxattributeoutput.cxx libreoffice-3.6.2~rc2/sw/source/filter/ww8/docxattributeoutput.cxx
--- libreoffice-3.6.1~rc2/sw/source/filter/ww8/docxattributeoutput.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/filter/ww8/docxattributeoutput.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -45,7 +45,6 @@
#include
#include
#include
-#include
#include
#include
@@ -94,8 +93,10 @@
#include
#include
#include
+#include
#include
#include
+#include
#include
#include
@@ -2333,10 +2334,12 @@
return;
uno::Reference < embed::XEmbeddedObject > xObj(const_cast(m_postponedMath)->GetOLEObj().GetOleRef());
uno::Reference< uno::XInterface > xInterface( xObj->getComponent(), uno::UNO_QUERY );
- if( oox::FormulaExportBase* formulaexport = dynamic_cast< oox::FormulaExportBase* >( xInterface.get()))
- formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion());
- else
- OSL_FAIL( "Math OLE object cannot write out OOXML" );
+// gcc4.4 (and 4.3 and possibly older) have a problem with dynamic_cast directly to the target class,
+// so help it with an intermediate cast. I'm not sure what exactly the problem is, seems to be unrelated
+// to RTLD_GLOBAL, so most probably a gcc bug.
+ oox::FormulaExportBase* formulaexport = dynamic_cast(dynamic_cast(xInterface.get()));
+ assert( formulaexport != NULL );
+ formulaexport->writeFormulaOoxml( m_pSerializer, GetExport().GetFilter().getVersion());
m_postponedMath = NULL;
}
@@ -2420,6 +2423,55 @@
m_pSerializer->mergeTopMarks( sax_fastparser::MERGE_MARKS_POSTPONE );
}
+void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj)
+{
+ const EditTextObject& rEditObj = rParaObj.GetTextObject();
+ MSWord_SdrAttrIter aAttrIter( m_rExport, rEditObj, TXT_HFTXTBOX );
+
+ sal_uInt16 nPara = rEditObj.GetParagraphCount();
+
+ m_pSerializer->startElementNS( XML_w, XML_textbox, FSEND );
+ m_pSerializer->startElementNS( XML_w, XML_txbxContent, FSEND );
+ for (sal_uInt16 n = 0; n < nPara; ++n)
+ {
+ if( n )
+ aAttrIter.NextPara( n );
+
+ String aStr( rEditObj.GetText( n ));
+ xub_StrLen nAktPos = 0;
+ xub_StrLen nEnd = aStr.Len();
+
+ m_pSerializer->startElementNS( XML_w, XML_p, FSEND );
+ do {
+ xub_StrLen nNextAttr = aAttrIter.WhereNext();
+ if( nNextAttr > nEnd )
+ nNextAttr = nEnd;
+
+ m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
+ bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos );
+ if( !bTxtAtr )
+ {
+ String aOut( aStr.Copy( nAktPos, nNextAttr - nAktPos ) );
+ RunText(aOut);
+ }
+
+ m_pSerializer->endElementNS( XML_w, XML_r );
+
+ nAktPos = nNextAttr;
+ aAttrIter.NextPos();
+ }
+ while( nAktPos < nEnd );
+ m_pSerializer->endElementNS( XML_w, XML_p );
+ }
+ m_pSerializer->endElementNS( XML_w, XML_txbxContent );
+ m_pSerializer->endElementNS( XML_w, XML_textbox );
+}
+
+oox::drawingml::DrawingML& DocxAttributeOutput::GetDrawingML()
+{
+ return m_rDrawingML;
+}
+
void DocxAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 nId, bool bAutoUpdate )
{
diff -Nru libreoffice-3.6.1~rc2/sw/source/filter/ww8/docxattributeoutput.hxx libreoffice-3.6.2~rc2/sw/source/filter/ww8/docxattributeoutput.hxx
--- libreoffice-3.6.1~rc2/sw/source/filter/ww8/docxattributeoutput.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/filter/ww8/docxattributeoutput.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -42,6 +42,7 @@
#include
#include
+#include
class SwGrfNode;
class SdrObject;
@@ -68,7 +69,7 @@
};
/// The class that has handlers for various resource types when exporting as DOCX.
-class DocxAttributeOutput : public AttributeOutputBase
+class DocxAttributeOutput : public AttributeOutputBase, public oox::vml::VMLTextExport
{
public:
/// Export the state of RTL/CJK.
@@ -633,6 +634,10 @@
bool HasPostitFields() const;
void WritePostitFields();
+
+ /// VMLTextExport
+ virtual void WriteOutliner(const OutlinerParaObject& rParaObj);
+ virtual oox::drawingml::DrawingML& GetDrawingML();
};
#endif // _DOCXATTRIBUTEOUTPUT_HXX_
diff -Nru libreoffice-3.6.1~rc2/sw/source/filter/ww8/docxexport.cxx libreoffice-3.6.2~rc2/sw/source/filter/ww8/docxexport.cxx
--- libreoffice-3.6.1~rc2/sw/source/filter/ww8/docxexport.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/filter/ww8/docxexport.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -824,7 +824,7 @@
m_pAttrOutput = new DocxAttributeOutput( *this, m_pDocumentFS, m_pDrawingML );
// the related VMLExport
- m_pVMLExport = new VMLExport( m_pDocumentFS );
+ m_pVMLExport = new VMLExport( m_pDocumentFS, m_pAttrOutput );
}
DocxExport::~DocxExport()
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/docvw/HeaderFooterWin.cxx libreoffice-3.6.2~rc2/sw/source/ui/docvw/HeaderFooterWin.cxx
--- libreoffice-3.6.1~rc2/sw/source/ui/docvw/HeaderFooterWin.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/docvw/HeaderFooterWin.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -152,7 +152,6 @@
m_pLine( NULL ),
m_bIsAppearing( false ),
m_nFadeRate( 100 ),
- m_nDelayAppearing( 0 ),
m_aFadeTimer( )
{
// Get the font and configure it
@@ -243,8 +242,6 @@
if ( !PopupMenu::IsInExecute() )
{
m_bIsAppearing = bShow;
- if ( bShow )
- m_nDelayAppearing = 0;
if ( m_aFadeTimer.IsActive( ) )
m_aFadeTimer.Stop();
@@ -390,6 +387,7 @@
aSeq, BColorModifier( Color( COL_WHITE ).getBColor(), 1.0 - nFadeRate, BCOLORMODIFYMODE_INTERPOLATE ) ) );
pProcessor->process( aGhostedSeq );
+ delete pProcessor;
}
bool SwHeaderFooterWin::IsEmptyHeaderFooter( )
@@ -515,14 +513,6 @@
IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler)
{
- const int TICKS_BEFORE_WE_APPEAR = 10;
- if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR )
- {
- ++m_nDelayAppearing;
- m_aFadeTimer.Start();
- return 0;
- }
-
if ( m_bIsAppearing && m_nFadeRate > 0 )
m_nFadeRate -= 25;
else if ( !m_bIsAppearing && m_nFadeRate < 100 )
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/docvw/PageBreakWin.cxx libreoffice-3.6.2~rc2/sw/source/ui/docvw/PageBreakWin.cxx
--- libreoffice-3.6.1~rc2/sw/source/ui/docvw/PageBreakWin.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/docvw/PageBreakWin.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -215,6 +215,7 @@
*this, aNewViewInfos );
pProcessor->process( aGhostedSeq );
+ delete pProcessor;
}
void SwPageBreakWin::Select( )
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/docvw/edtwin.cxx libreoffice-3.6.2~rc2/sw/source/ui/docvw/edtwin.cxx
--- libreoffice-3.6.1~rc2/sw/source/ui/docvw/edtwin.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/docvw/edtwin.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -93,6 +93,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2667,9 +2668,56 @@
const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+ // Are we clicking on a blank header/footer area?
+ FrameControlType eControl;
+ if ( IsInHeaderFooter( aDocPos, eControl ) )
+ {
+ const SwPageFrm* pPageFrm = rSh.GetLayout()->GetPageAtPos( aDocPos );
+
+ // Is it active?
+ bool bActive = true;
+ const SwPageDesc* pDesc = pPageFrm->GetPageDesc();
+
+ const SwFrmFmt* pFmt = pDesc->GetLeftFmt();
+ if ( pPageFrm->OnRightPage() )
+ pFmt = pDesc->GetRightFmt();
+
+ if ( pFmt )
+ {
+ if ( eControl == Header )
+ bActive = pFmt->GetHeader().IsActive();
+ else
+ bActive = pFmt->GetFooter().IsActive();
+ }
+
+ if ( !bActive )
+ {
+ SwPaM aPam( *rSh.GetCurrentShellCursor().GetPoint() );
+ bool bWasInHeader = aPam.GetPoint( )->nNode.GetNode( ).FindHeaderStartNode( ) != NULL;
+ bool bWasInFooter = aPam.GetPoint( )->nNode.GetNode( ).FindFooterStartNode( ) != NULL;
+
+ // Is the cursor in a part like similar to the one we clicked on? For example,
+ // if the cursor is in a header and we click on an empty header... don't change anything to
+ // keep consistent behaviour due to header edit mode (and the same for the footer as well).
+ //
+ // Otherwise, we hide the header/footer control if a separator is shown, and vice versa.
+ if ( !( bWasInHeader && eControl == Header ) &&
+ !( bWasInFooter && eControl == Footer ) )
+ {
+ rSh.SetShowHeaderFooterSeparator( eControl, !rSh.IsShowHeaderFooterSeparator( eControl ) );
+ }
+
+ // Repaint everything
+ Invalidate();
+
+ return;
+ }
+ }
+
if ( lcl_CheckHeaderFooterClick( rSh, aDocPos, rMEvt.GetClicks() ) )
return;
+
if ( IsChainMode() )
{
SetChainMode( sal_False );
@@ -3819,17 +3867,6 @@
}
else
rView.GetPostItMgr()->SetShadowState(0,false);
-
- // Are we moving from or to header / footer area?
- if ( !rSh.IsHeaderFooterEdit() )
- {
- FrameControlType eControl;
- bool bIsInHF = IsInHeaderFooter( aDocPt, eControl );
- if ( !bIsInHF )
- ShowHeaderFooterSeparator( false, false );
- else
- ShowHeaderFooterSeparator( eControl == Header, eControl == Footer );
- }
}
// no break;
case KEY_SHIFT:
@@ -4748,8 +4785,11 @@
if (rView.GetPostItMgr()->IsHit(rCEvt.GetMousePosPixel()))
return;
- if (rCEvt.IsMouseEvent() && lcl_CheckHeaderFooterClick( rSh,
- PixelToLogic( rCEvt.GetMousePosPixel() ), 1 ) )
+ Point aDocPos( PixelToLogic( rCEvt.GetMousePosPixel() ) );
+ if ( !rCEvt.IsMouseEvent() )
+ aDocPos = rSh.GetCharRect().Center();
+
+ if (rCEvt.IsMouseEvent() && lcl_CheckHeaderFooterClick( rSh, aDocPos, 1 ) )
return;
@@ -4765,14 +4805,10 @@
bNoInterrupt = sal_False;
bMBPressed = sal_False;
}
- Point aDocPos( PixelToLogic( rCEvt.GetMousePosPixel() ) );
- if ( !rCEvt.IsMouseEvent() )
- aDocPos = rSh.GetCharRect().Center();
- else
+ if ( rCEvt.IsMouseEvent() )
{
SelectMenuPosition(rSh, rCEvt.GetMousePosPixel());
rView.StopShellTimer();
-
}
const Point aPixPos = LogicToPixel( aDocPos );
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/inc/HeaderFooterWin.hxx libreoffice-3.6.2~rc2/sw/source/ui/inc/HeaderFooterWin.hxx
--- libreoffice-3.6.1~rc2/sw/source/ui/inc/HeaderFooterWin.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/inc/HeaderFooterWin.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -45,7 +45,6 @@
Window* m_pLine;
bool m_bIsAppearing;
int m_nFadeRate;
- int m_nDelayAppearing; //< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over.
Timer m_aFadeTimer;
public:
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/inc/edtwin.hxx libreoffice-3.6.2~rc2/sw/source/ui/inc/edtwin.hxx
--- libreoffice-3.6.1~rc2/sw/source/ui/inc/edtwin.hxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/inc/edtwin.hxx 2012-09-25 12:13:30.000000000 +0000
@@ -150,7 +150,6 @@
bUseInputLanguage: 1,
bObjectSelect : 1;
-
sal_uInt16 nKS_NUMDOWN_Count; // #i23725#
sal_uInt16 nKS_NUMINDENTINC_Count;
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/index/cnttab.cxx libreoffice-3.6.2~rc2/sw/source/ui/index/cnttab.cxx
--- libreoffice-3.6.1~rc2/sw/source/ui/index/cnttab.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/index/cnttab.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -3147,13 +3147,11 @@
ctrl_iterator iterActive = std::find(aControlList.begin(),
aControlList.end(), pActiveCtrl);
- ctrl_iterator iterInsert = iterActive;
-
Size aControlSize(GetOutputSizePixel());
if( WINDOW_EDIT == pActiveCtrl->GetType())
{
- ++iterInsert;
+ ++iterActive;
Selection aSel = ((SwTOXEdit*)pActiveCtrl)->GetSelection();
aSel.Justify();
@@ -3169,7 +3167,7 @@
SwFormToken aTmpToken(TOKEN_TEXT);
SwTOXEdit* pEdit = new SwTOXEdit(&aCtrlParentWin, this, aTmpToken);
- iterInsert = aControlList.insert(iterInsert, pEdit);
+ iterActive = aControlList.insert(iterActive, pEdit);
pEdit->SetText(sRight);
pEdit->SetSizePixel(aControlSize);
@@ -3181,7 +3179,7 @@
}
else
{
- aControlList.erase(iterActive);
+ iterActive = aControlList.erase(iterActive);
pActiveCtrl->Hide();
delete pActiveCtrl;
}
@@ -3189,7 +3187,7 @@
//now the new button
SwTOXButton* pButton = new SwTOXButton(&aCtrlParentWin, this, aToInsertToken);
- aControlList.insert(iterInsert, pButton);
+ aControlList.insert(iterActive, pButton);
pButton->SetPrevNextLink(LINK(this, SwTokenWindow, NextItemBtnHdl));
pButton->SetGetFocusHdl(LINK(this, SwTokenWindow, TbxFocusBtnHdl));
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/uiview/viewsrch.cxx libreoffice-3.6.2~rc2/sw/source/ui/uiview/viewsrch.cxx
--- libreoffice-3.6.1~rc2/sw/source/ui/uiview/viewsrch.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/uiview/viewsrch.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -286,36 +286,36 @@
case SVX_SEARCHCMD_REPLACE_ALL:
{
SwSearchOptions aOpts( pWrtShell, pSrchItem->GetBackward() );
-
- // Fix for i#8288: "Replace all" should leave the cursor at the place it was
- // before executing the command, rather than at the site of the final replacement.
- // To do this take note of the current cursor position before replace all begins:
- // note: must be stored so that it is corrected by PamCorr*
- ::boost::scoped_ptr const pTmpCursor(
- pWrtShell->GetDoc()->CreateUnoCrsr(
- *pWrtShell->GetSwCrsr()->GetPoint()));
-
- if( !pSrchItem->GetSelection() )
- {
- // bestehende Selektionen aufheben,
- // wenn nicht in selektierten Bereichen gesucht werden soll
- pWrtShell->KillSelection(0, false);
- if( DOCPOS_START == aOpts.eEnd )
- pWrtShell->EndDoc();
- else
- pWrtShell->SttDoc();
- }
-
bExtra = sal_False;
sal_uLong nFound;
{ //Scope for SwWait-Object
SwWait aWait( *GetDocShell(), sal_True );
pWrtShell->StartAllAction();
+ if (!pSrchItem->GetSelection())
+ {
+ // if we don't want to search in the selection...
+ pWrtShell->KillSelection(0, false);
+ // i#8288 "replace all" should not change cursor
+ // position, so save current cursor
+ pWrtShell->Push();
+ if (DOCPOS_START == aOpts.eEnd)
+ {
+ pWrtShell->EndDoc();
+ }
+ else
+ {
+ pWrtShell->SttDoc();
+ }
+ }
nFound = FUNC_Search( aOpts );
- // #i8288# Now that everything has been replaced, restore the original cursor position.
- *(pWrtShell->GetSwCrsr()->GetPoint()) =
- *pTmpCursor->GetPoint();
+ if (!pSrchItem->GetSelection())
+ {
+ // create it just to overwrite it with stack cursor
+ pWrtShell->CreateCrsr();
+ // i#8288 restore the original cursor position
+ pWrtShell->Pop(false);
+ }
pWrtShell->EndAllAction();
}
diff -Nru libreoffice-3.6.1~rc2/sw/source/ui/wrtsh/wrtsh1.cxx libreoffice-3.6.2~rc2/sw/source/ui/wrtsh/wrtsh1.cxx
--- libreoffice-3.6.1~rc2/sw/source/ui/wrtsh/wrtsh1.cxx 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/sw/source/ui/wrtsh/wrtsh1.cxx 2012-09-25 12:13:30.000000000 +0000
@@ -1839,9 +1839,9 @@
String sTmp(aDesc.GetName());
if( !rStyleName.Len() || rStyleName == sTmp )
{
- if( (bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() &&
- (bHeader && aDesc.GetMaster().GetHeader().IsActive())) ||
- (!bHeader && aDesc.GetMaster().GetFooter().IsActive()) )
+ if( bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() &&
+ ( (bHeader && aDesc.GetMaster().GetHeader().IsActive()) ||
+ (!bHeader && aDesc.GetMaster().GetFooter().IsActive()) ) )
{
bShowWarning = sal_False;
//Actions have to be closed while the dialog is showing
diff -Nru libreoffice-3.6.1~rc2/swext/Extension_wiki-publisher.mk libreoffice-3.6.2~rc2/swext/Extension_wiki-publisher.mk
--- libreoffice-3.6.1~rc2/swext/Extension_wiki-publisher.mk 2012-08-21 14:44:32.000000000 +0000
+++ libreoffice-3.6.2~rc2/swext/Extension_wiki-publisher.mk 2012-09-25 12:13:30.000000000 +0000
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
@@ -59,15 +60,12 @@
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tables.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tokens.xsl))
$(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(SRCDIR)/swext/mediawiki/help/wikisend.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(SRCDIR)/swext/mediawiki/help/wikiformats.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(SRCDIR)/swext/mediawiki/help/wikiaccount.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(SRCDIR)/swext/mediawiki/help/wiki.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(SRCDIR)/swext/mediawiki/help/wikisettings.xhp))
$(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html))
$(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisend.xhp,$(SRCDIR)/swext/mediawiki/help/wikisend.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiformats.xhp,$(SRCDIR)/swext/mediawiki/help/wikiformats.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiaccount.xhp,$(SRCDIR)/swext/mediawiki/help/wikiaccount.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wiki.xhp,$(SRCDIR)/swext/mediawiki/help/wiki.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisettings.xhp,$(SRCDIR)/swext/mediawiki/help/wikisettings.xhp))
+$(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikisend.xhp,wikisend.xhp))
+$(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikiformats.xhp,wikiformats.xhp))
+$(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikiaccount.xhp,wikiaccount.xhp))
+$(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wiki.xhp,wiki.xhp))
+$(eval $(call gb_Extension_add_helpfile,wiki-publisher,$(SRCDIR)/swext/mediawiki/help,com.sun.wiki-publisher/wikisettings.xhp,wikisettings.xhp))
+
+# vim: set noet sw=4 ts=4:
diff -Nru libreoffice-3.6.1~rc2/translations/source/af/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/af/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/af/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/af/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po 1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-#. extracted from connectivity/registry/tdeab/org/openofffice/Office/DataAccess.oo
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Ftdeab%2Forg%2Fopenofffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: af\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
-"X-Accelerator-Marker: ~\n"
-
-#: Drivers.xcu#.Drivers.Installed.sdbc_address_tdeab.DriverTypeDisplayName.value.text
-msgid "TDE Address Book"
-msgstr ""
diff -Nru libreoffice-3.6.1~rc2/translations/source/af/scp2/source/ooo.po libreoffice-3.6.2~rc2/translations/source/af/scp2/source/ooo.po
--- libreoffice-3.6.1~rc2/translations/source/af/scp2/source/ooo.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/af/scp2/source/ooo.po 2012-09-25 12:13:31.000000000 +0000
@@ -1483,11 +1483,11 @@
msgid "Polish spelling dictionary, hyphenation rules, and thesaurus"
msgstr ""
-#: module_ooo.ulf#STR_NAME_MODULE_EXTENSION_DICTIONARY_PT.LngText.text
+#: module_ooo.ulf#STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_BR.LngText.text
msgid "Brazilian Portuguese"
msgstr ""
-#: module_ooo.ulf#STR_DESC_MODULE_EXTENSION_DICTIONARY_PT.LngText.text
+#: module_ooo.ulf#STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_BR.LngText.text
msgid "Brazilian Portuguese spelling Dictionary (1990 Spelling Agreement), and hyphenation rules"
msgstr ""
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/am/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/am/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#. extracted from connectivity/registry/tdeab/org/openofffice/Office/DataAccess.oo
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Ftdeab%2Forg%2Fopenofffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-14 02:01+0200\n"
-"Last-Translator: Samson \n"
-"Language-Team: LANGUAGE \n"
-"Language: am\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
-"X-Accelerator-Marker: ~\n"
-
-#: Drivers.xcu#.Drivers.Installed.sdbc_address_tdeab.DriverTypeDisplayName.value.text
-msgid "TDE Address Book"
-msgstr "የ TDE አድራሻ ደብተር"
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/am/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/am/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -0,0 +1,20 @@
+#. extracted from connectivity/registry/tdeab/org/openoffice/Office/DataAccess.oo
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Ftdeab%2Forg%2Fopenoffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
+"POT-Creation-Date: 2012-07-13 20:42+0200\n"
+"PO-Revision-Date: 2012-09-10 03:56+0200\n"
+"Last-Translator: Samson \n"
+"Language-Team: LANGUAGE \n"
+"Language: am\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Pootle 2.1.6\n"
+"X-Accelerator-Marker: ~\n"
+
+#: Drivers.xcu#.Drivers.Installed.sdbc_address_tdeab.DriverTypeDisplayName.value.text
+msgid "TDE Address Book"
+msgstr "የ TDE አድራሻ ደብተር"
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/cui/source/options.po libreoffice-3.6.2~rc2/translations/source/am/cui/source/options.po
--- libreoffice-3.6.1~rc2/translations/source/am/cui/source/options.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/cui/source/options.po 2012-09-25 12:13:31.000000000 +0000
@@ -3,8 +3,8 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+cui%2Fsource%2Foptions.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-27 06:04+0200\n"
+"POT-Creation-Date: 2012-09-07 13:08+0200\n"
+"PO-Revision-Date: 2012-09-10 03:58+0200\n"
"Last-Translator: Samson \n"
"Language-Team: LANGUAGE \n"
"Language: am\n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Accelerator-Marker: ~\n"
#: optgenrl.src#RID_SFXPAGE_GENERAL.FT_COMPANY.fixedtext.text
@@ -2118,6 +2118,10 @@
msgid "~Default currency"
msgstr "~ነባር ገንዘብ"
+#: optgdlg.src#OFA_TP_LANGUAGES.FT_DATEPATTERNS.fixedtext.text
+msgid "Date acceptance ~patterns"
+msgstr "የተቀበሉበት ቀን ~ምሳሌ"
+
#: optgdlg.src#OFA_TP_LANGUAGES.FL_LINGU_LANG.fixedline.text
msgid "Default languages for documents"
msgstr "ነባር ቋንቋዎች ለ ሰነዶች"
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/forms/source/resource.po libreoffice-3.6.2~rc2/translations/source/am/forms/source/resource.po
--- libreoffice-3.6.1~rc2/translations/source/am/forms/source/resource.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/forms/source/resource.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: xforms.src#RID_STR_XFORMS_NO_BINDING_EXPRESSION.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/formula/source/core/resource.po libreoffice-3.6.2~rc2/translations/source/am/formula/source/core/resource.po
--- libreoffice-3.6.1~rc2/translations/source/am/formula/source/core/resource.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/formula/source/core/resource.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: core_resource.src#RID_STRLIST_FUNCTION_NAMES.SC_OPCODE_IF.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po libreoffice-3.6.2~rc2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po
--- libreoffice-3.6.1~rc2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: Options.xhp#tit.help.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/readlicense_oo/docs/readme.po libreoffice-3.6.2~rc2/translations/source/am/readlicense_oo/docs/readme.po
--- libreoffice-3.6.1~rc2/translations/source/am/readlicense_oo/docs/readme.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/readlicense_oo/docs/readme.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: readme.xrm#Welcome.Welcome.readmeitem.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/sc/source/ui/src.po libreoffice-3.6.2~rc2/translations/source/am/sc/source/ui/src.po
--- libreoffice-3.6.1~rc2/translations/source/am/sc/source/ui/src.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/sc/source/ui/src.po 2012-09-25 12:13:31.000000000 +0000
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sc%2Fsource%2Fui%2Fsrc.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:38+0200\n"
+"POT-Creation-Date: 2012-07-13 20:41+0200\n"
"PO-Revision-Date: 2012-08-06 18:32+0200\n"
"Last-Translator: Samson \n"
"Language-Team: LANGUAGE \n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: namedlg.src#RID_SCDLG_NAMES.BTN_ADD.pushbutton.text
@@ -1313,10 +1313,6 @@
msgid "Solving Result"
msgstr "የመፍትሄው ውጤት"
-#: datafdlg.src#RID_SCDLG_DATAFORM.LAB_DATAFORM_RECORDNO.fixedtext.text
-msgid "/"
-msgstr "/"
-
#: datafdlg.src#RID_SCDLG_DATAFORM.BTN_DATAFORM_NEW.pushbutton.text
msgid "New"
msgstr "አዲስ"
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/scaddins/source/analysis.po libreoffice-3.6.2~rc2/translations/source/am/scaddins/source/analysis.po
--- libreoffice-3.6.1~rc2/translations/source/am/scaddins/source/analysis.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/scaddins/source/analysis.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: analysis_funcnames.src#RID_ANALYSIS_FUNCTION_NAMES.ANALYSIS_FUNCNAME_Workday.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/scp2/source/ooo.po libreoffice-3.6.2~rc2/translations/source/am/scp2/source/ooo.po
--- libreoffice-3.6.1~rc2/translations/source/am/scp2/source/ooo.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/scp2/source/ooo.po 2012-09-25 12:13:31.000000000 +0000
@@ -1357,11 +1357,11 @@
msgid "Polish spelling dictionary, hyphenation rules, and thesaurus"
msgstr "Polish spelling dictionary, hyphenation rules, and thesaurus"
-#: module_ooo.ulf#STR_NAME_MODULE_EXTENSION_DICTIONARY_PT.LngText.text
+#: module_ooo.ulf#STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_BR.LngText.text
msgid "Brazilian Portuguese"
msgstr "Brazilian Portuguese"
-#: module_ooo.ulf#STR_DESC_MODULE_EXTENSION_DICTIONARY_PT.LngText.text
+#: module_ooo.ulf#STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_BR.LngText.text
msgid "Brazilian Portuguese spelling Dictionary (1990 Spelling Agreement), and hyphenation rules"
msgstr "Brazilian Portuguese spelling Dictionary (1990 Spelling Agreement), and hyphenation rules"
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/sw/source/ui/utlui.po libreoffice-3.6.2~rc2/translations/source/am/sw/source/ui/utlui.po
--- libreoffice-3.6.1~rc2/translations/source/am/sw/source/ui/utlui.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/sw/source/ui/utlui.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: navipi.src#DLG_NAVIGATION_PI.window.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/swext/mediawiki/help.po libreoffice-3.6.2~rc2/translations/source/am/swext/mediawiki/help.po
--- libreoffice-3.6.1~rc2/translations/source/am/swext/mediawiki/help.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/swext/mediawiki/help.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: wiki.xhp#tit.help.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/am/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po libreoffice-3.6.2~rc2/translations/source/am/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po
--- libreoffice-3.6.1~rc2/translations/source/am/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/am/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: WikiExtension.xcu#.WikiExtension.Strings.GeneralSendError.value.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/avmedia/source/framework.po libreoffice-3.6.2~rc2/translations/source/ar/avmedia/source/framework.po
--- libreoffice-3.6.1~rc2/translations/source/ar/avmedia/source/framework.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/avmedia/source/framework.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: mediacontrol.src#AVMEDIA_STR_OPEN.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/avmedia/source/viewer.po libreoffice-3.6.2~rc2/translations/source/ar/avmedia/source/viewer.po
--- libreoffice-3.6.1~rc2/translations/source/ar/avmedia/source/viewer.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/avmedia/source/viewer.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: mediawindow.src#AVMEDIA_STR_INSERTMEDIA_DLG.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/basctl/source/basicide.po libreoffice-3.6.2~rc2/translations/source/ar/basctl/source/basicide.po
--- libreoffice-3.6.1~rc2/translations/source/ar/basctl/source/basicide.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/basctl/source/basicide.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+basctl%2Fsource%2Fbasicide.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-12 13:33+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-26 05:12+0200\n"
+"Last-Translator: Anass \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: moduldlg.src#RID_TD_ORGANIZE.RID_TC_ORGANIZE.RID_TP_MOD.pageitem.text
@@ -137,7 +137,7 @@
#: moduldlg.src#RID_DLG_LIBS.RID_CB_REF.checkbox.text
msgid "Insert as reference (read-only)"
-msgstr "إدراج كمرجع (للقراءة فقط)"
+msgstr "آدرج كمرجع (للقراءة فقط)"
#: moduldlg.src#RID_DLG_LIBS.RID_CB_REPL.checkbox.text
msgid "Replace existing libraries"
@@ -174,7 +174,6 @@
msgstr "تصدير كمكتبة BASIC"
#: moduldlg.src#RID_STR_PACKAGE_BUNDLE.string.text
-#, fuzzy
msgid "Extension"
msgstr "الامتداد"
@@ -533,7 +532,7 @@
#: basidesh.src#RID_POPUP_TABBAR.RID_INSERT.menuitem.text
msgid "Insert"
-msgstr "إدراج"
+msgstr "أدرج"
#: basidesh.src#RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.menuitem.text
msgctxt "basidesh.src#RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.menuitem.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/basctl/source/dlged.po libreoffice-3.6.2~rc2/translations/source/ar/basctl/source/dlged.po
--- libreoffice-3.6.1~rc2/translations/source/ar/basctl/source/dlged.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/basctl/source/dlged.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: managelang.src#RID_DLG_MANAGE_LANGUAGE.FT_LANGUAGE.fixedtext.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/ado/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/ado/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/ado/org/openoffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/ado/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: Drivers.xcu#.Drivers.Installed.sdbc_ado__.DriverTypeDisplayName.value.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/calc/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/calc/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/calc/org/openoffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/calc/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: Drivers.xcu#.Drivers.Installed.sdbc_calc__.DriverTypeDisplayName.value.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: Drivers.xcu#.Drivers.Installed.sdbc_address_evolution_local.DriverTypeDisplayName.value.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/mozab/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/mozab/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/mozab/org/openoffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/mozab/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Fmozab%2Forg%2Fopenoffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-15 19:03+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-26 05:14+0200\n"
+"Last-Translator: Anass \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -29,7 +29,7 @@
#: Drivers.xcu#.Drivers.Installed.sdbc_address_thunderbird_.DriverTypeDisplayName.value.text
msgid "Thunderbird/Icedove Address Book"
-msgstr "دفتر عناوين ثندربرد\\آيس دوف"
+msgstr "دفتر عناوين ثندربرد/آيس دوف"
#: Drivers.xcu#.Drivers.Installed.sdbc_address_ldap__.DriverTypeDisplayName.value.text
msgid "LDAP Address Book"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/mozab2/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/mozab2/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/mozab2/org/openoffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/mozab2/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Fmozab2%2Forg%2Fopenoffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-06-15 19:03+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-26 05:14+0200\n"
+"Last-Translator: Anass \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@
#: Drivers.xcu#.Drivers.Installed.sdbc_address_thunderbird_.DriverTypeDisplayName.value.text
msgid "Thunderbird/Icedove Address Book"
-msgstr "دفتر عناوين ثندربرد\\آيس دوف"
+msgstr "دفتر عناوين ثندربرد/آيس دوف"
#: Drivers.xcu#.Drivers.Installed.sdbc_address_ldap__.DriverTypeDisplayName.value.text
msgid "LDAP Address Book"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/tdeab/org/openofffice/Office/DataAccess.po 1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-#. extracted from connectivity/registry/tdeab/org/openofffice/Office/DataAccess.oo
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Ftdeab%2Forg%2Fopenofffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-15 19:04+0200\n"
-"Last-Translator: Khaled \n"
-"Language-Team: LANGUAGE \n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
-"X-Accelerator-Marker: ~\n"
-
-#: Drivers.xcu#.Drivers.Installed.sdbc_address_tdeab.DriverTypeDisplayName.value.text
-msgid "TDE Address Book"
-msgstr "دفتر عناوين تدي"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po 1970-01-01 00:00:00.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po 2012-09-25 12:13:31.000000000 +0000
@@ -0,0 +1,19 @@
+#. extracted from connectivity/registry/tdeab/org/openoffice/Office/DataAccess.oo
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+connectivity%2Fregistry%2Ftdeab%2Forg%2Fopenoffice%2FOffice%2FDataAccess.oo&subcomponent=ui\n"
+"POT-Creation-Date: 2012-07-13 20:42+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
+"X-Accelerator-Marker: ~\n"
+
+#: Drivers.xcu#.Drivers.Installed.sdbc_address_tdeab.DriverTypeDisplayName.value.text
+msgid "TDE Address Book"
+msgstr ""
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/connectivity/source/resource.po libreoffice-3.6.2~rc2/translations/source/ar/connectivity/source/resource.po
--- libreoffice-3.6.1~rc2/translations/source/ar/connectivity/source/resource.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/connectivity/source/resource.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: conn_error_message.src#256___2_100___0.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/cui/source/dialogs.po libreoffice-3.6.2~rc2/translations/source/ar/cui/source/dialogs.po
--- libreoffice-3.6.1~rc2/translations/source/ar/cui/source/dialogs.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/cui/source/dialogs.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+cui%2Fsource%2Fdialogs.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-13 20:42+0200\n"
-"PO-Revision-Date: 2012-07-31 12:43+0200\n"
-"Last-Translator: safa \n"
+"PO-Revision-Date: 2012-08-26 05:14+0200\n"
+"Last-Translator: Anass \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: thesdlg.src#RID_SVXDLG_THESAURUS.FT_WORD.fixedtext.text
@@ -1195,7 +1195,7 @@
#: about.src#RID_DEFAULTABOUT.ABOUT_STR_COPYRIGHT.string.text
msgid "Copyright © 2000 - 2012 LibreOffice contributors and/or their affiliates"
-msgstr "حقوق النشر © 2000 - 2012 لمساهمي ليبرأوفيس و\\أو الجهات التي ينتمون إليها"
+msgstr "حقوق النشر © 2000 - 2012 لمساهمي ليبرأوفيس و/أو الجهات التي ينتمون إليها"
#: about.src#RID_DEFAULTABOUT.ABOUT_STR_BASED.string.text
msgid "LibreOffice was based on OpenOffice.org"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/cui/source/options.po libreoffice-3.6.2~rc2/translations/source/ar/cui/source/options.po
--- libreoffice-3.6.1~rc2/translations/source/ar/cui/source/options.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/cui/source/options.po 2012-09-25 12:13:31.000000000 +0000
@@ -3,9 +3,9 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+cui%2Fsource%2Foptions.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-07 11:40+0200\n"
-"Last-Translator: safa \n"
+"POT-Creation-Date: 2012-09-07 13:08+0200\n"
+"PO-Revision-Date: 2012-09-10 07:47+0200\n"
+"Last-Translator: Faisal \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -425,7 +425,6 @@
msgstr "مسار الشهادة"
#: optinet2.src#RID_SVXPAGE_INET_SECURITY.FI_SEC_CERTPATH.fixedtext.text
-#, fuzzy
msgid "Select the Network Security Services certificate directory to use for digital signatures."
msgstr "أختر دليل شهادة خدمات أمن الشبكة لاستخدامها للتواقيع الرقمية."
@@ -1224,7 +1223,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_EDITOPTIONS.1.itemlist.text
msgid "%PRODUCTNAME Writer"
-msgstr "%PRODUCTNAME Writer"
+msgstr "%PRODUCTNAME رايتر"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_EDITOPTIONS.2.itemlist.text
msgctxt "treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_EDITOPTIONS.2.itemlist.text"
@@ -1292,7 +1291,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS.1.itemlist.text
msgid "%PRODUCTNAME Writer/Web"
-msgstr "%PRODUCTNAME Writer/Web"
+msgstr "%PRODUCTNAME رايتر/شبكة"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS.2.itemlist.text
msgctxt "treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS.2.itemlist.text"
@@ -1325,7 +1324,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SM_EDITOPTIONS.1.itemlist.text
msgid "%PRODUCTNAME Math"
-msgstr "%PRODUCTNAME Math"
+msgstr "%PRODUCTNAME ماث"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SM_EDITOPTIONS.2.itemlist.text
msgctxt "treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SM_EDITOPTIONS.2.itemlist.text"
@@ -1334,7 +1333,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS.1.itemlist.text
msgid "%PRODUCTNAME Calc"
-msgstr "%PRODUCTNAME Calc"
+msgstr "%PRODUCTNAME كالك"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS.2.itemlist.text
msgctxt "treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS.2.itemlist.text"
@@ -1389,7 +1388,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.1.itemlist.text
msgid "%PRODUCTNAME Impress"
-msgstr "%PRODUCTNAME Impress"
+msgstr "%PRODUCTNAME امبريس"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.2.itemlist.text
msgctxt "treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.2.itemlist.text"
@@ -1413,7 +1412,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.1.itemlist.text
msgid "%PRODUCTNAME Draw"
-msgstr "%PRODUCTNAME Draw"
+msgstr "%PRODUCTNAME درو"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.2.itemlist.text
msgctxt "treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.2.itemlist.text"
@@ -1459,7 +1458,7 @@
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_FILTER_DLG.4.itemlist.text
msgid "Microsoft Office"
-msgstr "Microsoft Office"
+msgstr "مايكروسوفت أوفيس"
#: treeopt.src#RID_OFADLG_OPTIONS_TREE_PAGES.SID_FILTER_DLG.5.itemlist.text
msgid "HTML Compatibility"
@@ -2121,6 +2120,10 @@
msgid "~Default currency"
msgstr "ال~عملة الافتراضيّة"
+#: optgdlg.src#OFA_TP_LANGUAGES.FT_DATEPATTERNS.fixedtext.text
+msgid "Date acceptance ~patterns"
+msgstr ""
+
#: optgdlg.src#OFA_TP_LANGUAGES.FL_LINGU_LANG.fixedline.text
msgid "Default languages for documents"
msgstr "اللغات الافتراضية للمستندات"
@@ -2159,7 +2162,7 @@
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT.GB_WORD.fixedline.text
msgid "Microsoft Word 97/2000/XP"
-msgstr "Microsoft Word 97/2000/XP"
+msgstr "مايكروسوفت وورد 97/2000/XP"
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT.CB_WBAS_CODE.checkbox.text
msgid "Load Basic ~code"
@@ -2176,7 +2179,7 @@
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT.GB_EXCEL.fixedline.text
msgid "Microsoft Excel 97/2000/XP"
-msgstr "Microsoft Excel 97/2000/XP"
+msgstr "مايكروسوفت إكسل 97/2000/XP"
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT.CB_EBAS_CODE.checkbox.text
msgid "Lo~ad Basic code"
@@ -2193,7 +2196,7 @@
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT.GB_PPOINT.fixedline.text
msgid "Microsoft PowerPoint 97/2000/XP"
-msgstr "Microsoft PowerPoint 97/2000/XP"
+msgstr "مايكروسوفت باوربوينت 97/2000/XP"
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT.CB_PBAS_CODE.checkbox.text
msgid "Load Ba~sic code"
@@ -2221,19 +2224,19 @@
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT2.ST_CHG_MATH.string.text
msgid "MathType to %PRODUCTNAME Math or reverse"
-msgstr "MathType إلى %PRODUCTNAME Math أو العكس"
+msgstr "MathType إلى %PRODUCTNAME ماث أو العكس"
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT2.ST_CHG_WRITER.string.text
msgid "WinWord to %PRODUCTNAME Writer or reverse"
-msgstr "WinWord إلى %PRODUCTNAME Writer أو العكس"
+msgstr "WinWord إلى %PRODUCTNAME رايتر أو العكس"
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT2.ST_CHG_CALC.string.text
msgid "Excel to %PRODUCTNAME Calc or reverse"
-msgstr "Excel إلى %PRODUCTNAME Calc أو العكس"
+msgstr "إكسل إلى %PRODUCTNAME كالك أو العكس"
#: optfltr.src#RID_OFAPAGE_MSFILTEROPT2.ST_CHG_IMPRESS.string.text
msgid "PowerPoint to %PRODUCTNAME Impress or reverse"
-msgstr "PowerPoint إلى %PRODUCTNAME Impress أو العكس"
+msgstr "باوربوينت إلى %PRODUCTNAME امبريس أو العكس"
#: dbregister.src#RID_SFXPAGE_DBREGISTER.FT_TYPE.fixedtext.text
msgid "Registered name"
@@ -2274,9 +2277,8 @@
msgstr "مسار الشهادة"
#: certpath.src#RID_SVXDLG_CERTPATH.FT_CERTPATH.fixedtext.text
-#, fuzzy
msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:"
-msgstr "أختر أو أضف دليل شهادة خدمات أمن الموقع الصحيح لاستخدامها للتواقيع الرقمية:"
+msgstr "أختر أو أضف دليل شهادة خدمات أمن الموقع الصحيحة لاستخدامها للتواقيع الرقمية:"
#: certpath.src#RID_SVXDLG_CERTPATH.PB_ADD.pushbutton.text
msgctxt "certpath.src#RID_SVXDLG_CERTPATH.PB_ADD.pushbutton.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/cui/source/tabpages.po libreoffice-3.6.2~rc2/translations/source/ar/cui/source/tabpages.po
--- libreoffice-3.6.1~rc2/translations/source/ar/cui/source/tabpages.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/cui/source/tabpages.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: macroass.src#RID_SVXPAGE_EVENTASSIGN.STR_EVENT.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ext/macromigration.po libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ext/macromigration.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ext/macromigration.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ext/macromigration.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fext%2Fmacromigration.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-07 11:18+0200\n"
+"PO-Revision-Date: 2012-08-24 08:22+0200\n"
"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: macromigration.src#DLG_MACRO_MIGRATION.STR_STATE_CLOSE_SUB_DOCS.string.text
@@ -157,7 +157,7 @@
#: macromigration.src#STR_MIGRATING_LIBS.string.text
msgid "migrating libraries ..."
-msgstr "جارٍ ترحيل المكتبات..."
+msgstr "يرحّل المكتبات..."
#: macromigration.src#STR_OOO_BASIC.string.text
msgid "%PRODUCTNAME Basic"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/app.po libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/app.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/app.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/app.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: app.src#RID_STR_NEW_FORM.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/browser.po libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/browser.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/browser.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/browser.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fbrowser.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-04-07 12:34+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-24 08:22+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -151,15 +151,15 @@
#: sbabrw.src#STR_CONNECTING_DATASOURCE.string.text
msgid "Connecting to \"$name$\" ..."
-msgstr "جارٍ الاتصال بـ \"$name$\" ..."
+msgstr "يتّصل بـ \"$name$\" ..."
#: sbabrw.src#STR_LOADING_QUERY.string.text
msgid "Loading query $name$ ..."
-msgstr "جارٍ تحميل الاستعلام $name$ ..."
+msgstr "يحمّل الاستعلام $name$ ..."
#: sbabrw.src#STR_LOADING_TABLE.string.text
msgid "Loading table $name$ ..."
-msgstr "جارٍ تحميل الجدول $name$ ..."
+msgstr "يحمّل الجدول $name$ ..."
#: sbabrw.src#STR_NO_TABLE_FORMAT_INSIDE.string.text
msgid "No table format could be found."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/dlg.po libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/dlg.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/dlg.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/dlg.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dbaccess%2Fsource%2Fui%2Fdlg.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-12 09:42+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-27 06:43+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: textconnectionsettings.src#DLG_TEXT_CONNECTION_SETTINGS.modaldialog.text
@@ -329,7 +329,7 @@
#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_MSACCESS.string.text
msgid "Set up Microsoft Access connection"
-msgstr "إعداد اتصال Microsoft Access"
+msgstr "إعداد اتصال مايكروسوفت أكسيس"
#: dbadminsetup.src#DLG_DATABASE_WIZARD.STR_PAGETITLE_LDAP.string.text
msgid "Set up LDAP connection"
@@ -513,11 +513,11 @@
#: dbadminsetup.src#PAGE_DBWIZARD_MSACCESS.STR_MSACCESS_HEADERTEXT.string.text
msgid "Set up a connection to a Microsoft Access database"
-msgstr "إعداد الاتصال بقاعدة بيانات Microsoft Access"
+msgstr "إعداد الاتصال بقاعدة بيانات مايكروسوفت أكسيس"
#: dbadminsetup.src#PAGE_DBWIZARD_MSACCESS.STR_MSACCESS_HELPTEXT.string.text
msgid "Please select the Microsoft Access file you want to access."
-msgstr "الرجاء تحديد ملف Microsoft Access الذي تريد الوصول إليه."
+msgstr "الرجاء تحديد ملف مايكروسوفت أكسيس الذي تريد الوصول إليه."
#: dbadminsetup.src#PAGE_DBWIZARD_LDAP.FT_LDAP_HEADERTEXT.fixedtext.text
msgid "Set up a connection to an LDAP directory"
@@ -608,7 +608,7 @@
"Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n"
"%PRODUCTNAME will open this file in read-only mode."
msgstr ""
-"انقر فوق \"استعراض...\" لتحديد جدول بيانات %PRODUCTNAME أو ورقة عمل Microsoft Excel.\n"
+"انقر فوق \"استعراض...\" لتحديد جدول بيانات %PRODUCTNAME أو ورقة عمل مايكروسوفت إكسل.\n"
"سيقوم %PRODUCTNAME بفتح هذا الملف في وضع القراءة فقط."
#: dbadminsetup.src#PAGE_DBWIZARD_SPREADSHEET.STR_SPREADSHEETPATH.string.text
@@ -1362,7 +1362,7 @@
#: AutoControls.src#STR_MSACCESS_MDB_FILE.string.text
msgid "Microsoft Access database file"
-msgstr "ملف قاعدة بيانات Microsoft Access"
+msgstr "ملف قاعدة بيانات مايكروسوفت أكسيس"
#: AutoControls.src#STR_NO_ADDITIONAL_SETTINGS.string.text
msgid "No more settings are necessary. To verify that the connection is working, click the '%test' button."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/misc.po libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/misc.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/misc.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/misc.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: dbumiscres.src#RSC_CHARSETS.1.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/relationdesign.po libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/relationdesign.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dbaccess/source/ui/relationdesign.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dbaccess/source/ui/relationdesign.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: relation.src#STR_QUERY_REL_EDIT_RELATION.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/desktop/source/deployment/gui.po libreoffice-3.6.2~rc2/translations/source/ar/desktop/source/deployment/gui.po
--- libreoffice-3.6.1~rc2/translations/source/ar/desktop/source/deployment/gui.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/desktop/source/deployment/gui.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+desktop%2Fsource%2Fdeployment%2Fgui.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-16 07:32+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-24 08:24+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -42,11 +42,11 @@
#: dp_gui_dialog.src#RID_STR_ADDING_PACKAGES.string.text
msgctxt "dp_gui_dialog.src#RID_STR_ADDING_PACKAGES.string.text"
msgid "Adding %EXTENSION_NAME"
-msgstr "جارٍ إضافة %EXTENSION_NAME"
+msgstr "يضيف %EXTENSION_NAME"
#: dp_gui_dialog.src#RID_STR_REMOVING_PACKAGES.string.text
msgid "Removing %EXTENSION_NAME"
-msgstr "إزالة %EXTENSION_NAME"
+msgstr "يزيل %EXTENSION_NAME"
#: dp_gui_dialog.src#RID_STR_ENABLING_PACKAGES.string.text
msgid "Enabling %EXTENSION_NAME"
@@ -206,7 +206,7 @@
#: dp_gui_updatedialog.src#RID_DLG_UPDATE.RID_DLG_UPDATE_CHECKING.fixedtext.text
msgid "Checking..."
-msgstr "جارٍ الفحص..."
+msgstr "يفحص..."
#: dp_gui_updatedialog.src#RID_DLG_UPDATE.RID_DLG_UPDATE_UPDATE.fixedtext.text
msgid "~Available extension updates"
@@ -412,7 +412,7 @@
#: dp_gui_dialog2.src#RID_DLG_EXTENSION_MANAGER.RID_EM_FT_PROGRESS.fixedtext.text
msgctxt "dp_gui_dialog2.src#RID_DLG_EXTENSION_MANAGER.RID_EM_FT_PROGRESS.fixedtext.text"
msgid "Adding %EXTENSION_NAME"
-msgstr "جارٍ إضافة %EXTENSION_NAME"
+msgstr "يضيف %EXTENSION_NAME"
#: dp_gui_dialog2.src#RID_DLG_EXTENSION_MANAGER.RID_EM_BTN_CLOSE.okbutton.text
msgctxt "dp_gui_dialog2.src#RID_DLG_EXTENSION_MANAGER.RID_EM_BTN_CLOSE.okbutton.text"
@@ -456,7 +456,7 @@
#: dp_gui_updateinstalldialog.src#RID_DLG_UPDATEINSTALL.RID_DLG_UPDATE_INSTALL_DOWNLOADING.fixedtext.text
msgid "Downloading extensions..."
-msgstr "جارٍ تنزيل الامتدادات..."
+msgstr "ينزّل الامتدادات..."
#: dp_gui_updateinstalldialog.src#RID_DLG_UPDATEINSTALL.RID_DLG_UPDATE_INSTALL_RESULTS.fixedtext.text
msgid "Result"
@@ -472,7 +472,7 @@
#: dp_gui_updateinstalldialog.src#RID_DLG_UPDATEINSTALL.RID_DLG_UPDATE_INSTALL_INSTALLING.string.text
msgid "Installing extensions..."
-msgstr "جارٍ تثبيت الامتدادات ..."
+msgstr "يثبّت الامتدادات ..."
#: dp_gui_updateinstalldialog.src#RID_DLG_UPDATEINSTALL.RID_DLG_UPDATE_INSTALL_FINISHED.string.text
msgid "Installation finished"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/af_ZA.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/af_ZA.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/af_ZA.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/af_ZA.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/an_ES.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/an_ES.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/an_ES.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/an_ES.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ar.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ar.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ar.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ar.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/be_BY.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/be_BY.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/be_BY.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/be_BY.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/bg_BG.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/bg_BG.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/bg_BG.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/bg_BG.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/bn_BD.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/bn_BD.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/bn_BD.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/bn_BD.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/br_FR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/br_FR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/br_FR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/br_FR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ca.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ca.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ca.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ca.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/cs_CZ.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/cs_CZ.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/cs_CZ.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/cs_CZ.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/da_DK.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/da_DK.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/da_DK.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/da_DK.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/de.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/de.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/de.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/de.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/el_GR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/el_GR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/el_GR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/el_GR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/en/dialog.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/en/dialog.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/en/dialog.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/en/dialog.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dictionaries%2Fen%2Fdialog.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-12 10:15+0200\n"
+"PO-Revision-Date: 2012-08-26 07:34+0200\n"
"Last-Translator: Faisal \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: en_en_US.properties#spelling.property.text
@@ -113,7 +113,7 @@
#: en_en_US.properties#hlp_minus.property.text
msgid "Change hyphen characters to real minus signs."
-msgstr ""
+msgstr "تغيِّر علامات الواصلة إلى علامات ناقص حقيقية."
#: en_en_US.properties#minus.property.text
msgid "Minus sign"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/en.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/en.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/en.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/en.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/es_ES.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/es_ES.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/es_ES.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/es_ES.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/et_EE.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/et_EE.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/et_EE.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/et_EE.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/fr_FR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/fr_FR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/fr_FR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/fr_FR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/gd_GB.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/gd_GB.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/gd_GB.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/gd_GB.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/gl.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/gl.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/gl.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/gl.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/gu_IN.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/gu_IN.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/gu_IN.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/gu_IN.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/he_IL.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/he_IL.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/he_IL.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/he_IL.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hi_IN.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hi_IN.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hi_IN.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hi_IN.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hr_HR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hr_HR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hr_HR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hr_HR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hu_HU/dialog.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hu_HU/dialog.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hu_HU/dialog.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hu_HU/dialog.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+dictionaries%2Fhu_HU%2Fdialog.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-12 10:39+0200\n"
+"PO-Revision-Date: 2012-08-26 08:57+0200\n"
"Last-Translator: Faisal \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: hu_HU_en_US.properties#spelling.property.text
@@ -56,8 +56,9 @@
msgstr "الأخطاء الممكنة"
#: hu_HU_en_US.properties#money.property.text
+#, fuzzy
msgid "Consistency of money amounts"
-msgstr ""
+msgstr "تناسق المبالغ المالية"
#: hu_HU_en_US.properties#duplication.property.text
msgctxt "hu_HU_en_US.properties#duplication.property.text"
@@ -70,8 +71,9 @@
msgstr "أزدواجية الكلمة"
#: hu_HU_en_US.properties#dup.property.text
+#, fuzzy
msgid "Duplication within clauses"
-msgstr ""
+msgstr "الازدواجية ضمن شروط"
#: hu_HU_en_US.properties#dup2.property.text
msgid "Duplication within sentences"
@@ -83,7 +85,7 @@
#: hu_HU_en_US.properties#numpart.property.text
msgid "Thousand separation of numbers"
-msgstr ""
+msgstr "فاصلة الألوف بين الأرقام"
#: hu_HU_en_US.properties#typography.property.text
msgid "Typography"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hu_HU.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hu_HU.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/hu_HU.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/hu_HU.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/it_IT.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/it_IT.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/it_IT.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/it_IT.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ku_TR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ku_TR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ku_TR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ku_TR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/lt_LT.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/lt_LT.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/lt_LT.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/lt_LT.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/lv_LV.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/lv_LV.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/lv_LV.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/lv_LV.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ne_NP.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ne_NP.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ne_NP.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ne_NP.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/nl_NL.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/nl_NL.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/nl_NL.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/nl_NL.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/no.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/no.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/no.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/no.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/oc_FR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/oc_FR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/oc_FR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/oc_FR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/pl_PL.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/pl_PL.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/pl_PL.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/pl_PL.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/pt_BR.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/pt_BR.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/pt_BR.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/pt_BR.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/pt_PT.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/pt_PT.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/pt_PT.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/pt_PT.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ro.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ro.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ro.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ro.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ru_RU/dialog.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ru_RU/dialog.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ru_RU/dialog.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ru_RU/dialog.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: ru_RU_en_US.properties#abbreviation.property.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ru_RU.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ru_RU.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/ru_RU.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/ru_RU.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/si_LK.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/si_LK.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/si_LK.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/si_LK.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sk_SK.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sk_SK.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sk_SK.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sk_SK.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sl_SI.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sl_SI.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sl_SI.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sl_SI.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sr.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sr.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sr.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sr.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sv_SE.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sv_SE.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sv_SE.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sv_SE.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sw_TZ.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sw_TZ.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/sw_TZ.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/sw_TZ.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/te_IN.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/te_IN.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/te_IN.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/te_IN.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/th_TH.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/th_TH.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/th_TH.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/th_TH.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/uk_UA.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/uk_UA.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/uk_UA.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/uk_UA.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/vi.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/vi.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/vi.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/vi.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/zu_ZA.po libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/zu_ZA.po
--- libreoffice-3.6.1~rc2/translations/source/ar/dictionaries/zu_ZA.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/dictionaries/zu_ZA.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/extensions/source/abpilot.po libreoffice-3.6.2~rc2/translations/source/ar/extensions/source/abpilot.po
--- libreoffice-3.6.1~rc2/translations/source/ar/extensions/source/abpilot.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/extensions/source/abpilot.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+extensions%2Fsource%2Fabpilot.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-06 18:00+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 07:10+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -72,7 +72,7 @@
#: abspilot.src#RID_PAGE_SELECTABTYPE.RB_THUNDERBIRD.radiobutton.text
msgid "Thunderbird/Icedove"
-msgstr "ثندربرد\\آيسدوف"
+msgstr "ثندربرد/آيسدوف"
#: abspilot.src#RID_PAGE_SELECTABTYPE.RB_KAB.radiobutton.text
msgid "KDE address book"
@@ -92,7 +92,7 @@
#: abspilot.src#RID_PAGE_SELECTABTYPE.RB_OUTLOOKEXPRESS.radiobutton.text
msgid "Windows system address book"
-msgstr "دفتر عناوين نظام Windows"
+msgstr "دفتر عناوين نظام ويندوز"
#: abspilot.src#RID_PAGE_SELECTABTYPE.RB_OTHER.radiobutton.text
msgid "Other external data source"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/extensions/source/propctrlr.po libreoffice-3.6.2~rc2/translations/source/ar/extensions/source/propctrlr.po
--- libreoffice-3.6.1~rc2/translations/source/ar/extensions/source/propctrlr.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/extensions/source/propctrlr.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+extensions%2Fsource%2Fpropctrlr.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-13 14:51+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 07:10+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -1214,7 +1214,7 @@
#: formres.src#RID_RSC_ENUM_LINEEND_FORMAT.2.string.text
msgid "CR+LF (Windows)"
-msgstr "(CR+LF (Windows"
+msgstr "CR+LF (ويندوز)"
#: formres.src#RID_RSC_ENUM_SCROLLBARS.1.string.text
msgctxt "formres.src#RID_RSC_ENUM_SCROLLBARS.1.string.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/extensions/source/update/check.po libreoffice-3.6.2~rc2/translations/source/ar/extensions/source/update/check.po
--- libreoffice-3.6.1~rc2/translations/source/ar/extensions/source/update/check.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/extensions/source/update/check.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+extensions%2Fsource%2Fupdate%2Fcheck.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-08-12 10:48+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-28 16:15+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: updatehdl.src#RID_UPDATE_STR_CHECKING.string.text
@@ -77,11 +77,11 @@
msgstr ""
"التنزيل التلقائي للتحديث غير متوفر حاليًا. \n"
"\n"
-"انقر فوق \"تنزيل...\" لتنزيل %PRODUCTNAME %NEXTVERSION يدويًا من موقع ويب."
+"انقر فوق \"نزّل...\" لتنزيل %PRODUCTNAME %NEXTVERSION يدويًا من موقع ويب."
#: updatehdl.src#RID_UPDATE_STR_DOWNLOADING.string.text
msgid "Downloading %PRODUCTNAME %NEXTVERSION..."
-msgstr "جارٍ تنزيل %PRODUCTNAME %NEXTVERSION ..."
+msgstr "ينزّل %PRODUCTNAME %NEXTVERSION ..."
#: updatehdl.src#RID_UPDATE_STR_READY_INSTALL.string.text
msgid "Download of %PRODUCTNAME %NEXTVERSION completed. Ready for installation."
@@ -93,7 +93,7 @@
#: updatehdl.src#RID_UPDATE_STR_CANCEL_DOWNLOAD.string.text
msgid "Do you really want to cancel the download?"
-msgstr "هل ترريد بالفعل إلغاء التنزيل؟"
+msgstr "هل تريد بالفعل إلغاء التنزيل؟"
#: updatehdl.src#RID_UPDATE_STR_BEGIN_INSTALL.string.text
msgid "To install the update, %PRODUCTNAME %PRODUCTVERSION needs to be closed. Do you want to install the update now?"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/filter/source/config/fragments/filters.po libreoffice-3.6.2~rc2/translations/source/ar/filter/source/config/fragments/filters.po
--- libreoffice-3.6.1~rc2/translations/source/ar/filter/source/config/fragments/filters.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/filter/source/config/fragments/filters.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+filter%2Fsource%2Fconfig%2Ffragments%2Ffilters.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-13 14:18+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 19:12+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@
#: StarDraw_5_0_Vorlage__StarImpress__ui.xcu#StarDraw_5.0_Vorlage__StarImpress_.UIName.value.text
msgid "StarDraw 5.0 Template (Impress)"
-msgstr "قالب StarDraw 5.0 (Impress)"
+msgstr "قالب StarDraw 5.0 (امبريس)"
#: calc_OOXML_ui.xcu#Calc_Office_Open_XML.UIName.value.text
msgid "Office Open XML Spreadsheet"
@@ -33,7 +33,7 @@
#: impress8_draw_ui.xcu#impress8_draw.UIName.value.text
msgid "ODF Drawing (Impress)"
-msgstr "رسم (ODF (Impress"
+msgstr "رسم ODF (امبريس)"
#: writer_web_StarOffice_XML_Writer_Web_Template_ui.xcu#writer_web_StarOffice_XML_Writer_Web_Template.UIName.value.text
msgid "%productname% %formatversion% HTML Template"
@@ -58,7 +58,7 @@
#: calc_MS_Excel_2007_Binary_ui.xcu#Calc_MS_Excel_2007_Binary.UIName.value.text
msgid "Microsoft Excel 2007 Binary"
-msgstr "ثنائي Microsoft Excel 2007"
+msgstr "مايكروسوفت إكسل 2007 ثنائي"
#: impress_OOXML_ui.xcu#Impress_Office_Open_XML.UIName.value.text
msgid "Office Open XML Presentation"
@@ -70,7 +70,7 @@
#: MS_Word_2007_XML_ui.xcu#MS_Word_2007_XML.UIName.value.text
msgid "Microsoft Word 2007/2010 XML"
-msgstr "Microsoft Word 2007/2010 XML"
+msgstr "مايكروسوفت وورد 2007/2010 XML"
#: StarWriter_3_0_Vorlage_Template_ui.xcu#StarWriter_3.0_Vorlage/Template.UIName.value.text
msgid "StarWriter 3.0 Template"
@@ -82,7 +82,7 @@
#: writer_web_StarOffice_XML_Writer_ui.xcu#writer_web_StarOffice_XML_Writer.UIName.value.text
msgid "%productname% %formatversion% Text Document (Writer/Web)"
-msgstr "مستند %productname% %formatversion% نصي (Writer/Web)"
+msgstr "مستند %productname% %formatversion% نصي (رايتر/شبكة)"
#: StarOffice_XML__Calc__ui.xcu#StarOffice_XML__Calc_.UIName.value.text
msgid "%productname% %formatversion% Spreadsheet"
@@ -94,7 +94,7 @@
#: MS_Excel_4_0_Vorlage_Template_ui.xcu#MS_Excel_4.0_Vorlage/Template.UIName.value.text
msgid "Microsoft Excel 4.0 Template"
-msgstr "قالب Microsoft Excel 4.0"
+msgstr "قالب مايكروسوفت إكسل 4.0"
#: writer_StarOffice_XML_Writer_Template_ui.xcu#writer_StarOffice_XML_Writer_Template.UIName.value.text
msgid "%productname% %formatversion% Text Document Template"
@@ -111,15 +111,15 @@
#: impress_MS_PowerPoint_2007_XML_Template_ui.xcu#Impress_MS_PowerPoint_2007_XML_Template.UIName.value.text
msgctxt "impress_MS_PowerPoint_2007_XML_Template_ui.xcu#Impress_MS_PowerPoint_2007_XML_Template.UIName.value.text"
msgid "Microsoft PowerPoint 2007/2010 XML Template"
-msgstr "قالب Microsoft PowerPoint 2007/2010 XML"
+msgstr "قالب مايكروسوفت باوربويت 2007/2010 XML"
#: MS_Excel_5_0_95_Vorlage_Template_ui.xcu#MS_Excel_5.0/95_Vorlage/Template.UIName.value.text
msgid "Microsoft Excel 5.0 Template"
-msgstr "قالب Microsoft Excel 5.0"
+msgstr "قالب مايكروسوفت إكسل 5.0"
#: MS_Word_2003_XML_ui.xcu#MS_Word_2003_XML.UIName.value.text
msgid "Microsoft Word 2003 XML"
-msgstr "Microsoft Word 2003 XML"
+msgstr "مايكروسوفت وورد 2003 XML"
#: writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui.xcu#writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.UIName.value.text
msgid "%productname% %formatversion% Master Document"
@@ -131,20 +131,20 @@
#: MS_Excel_97_Vorlage_Template_ui.xcu#MS_Excel_97_Vorlage/Template.UIName.value.text
msgid "Microsoft Excel 97/2000/XP/2003 Template"
-msgstr "قالب Microsoft Excel 97/2000/XP/2003"
+msgstr "قالب مايكروسوفت إكسل 97/2000/XP/2003"
#: impress_MS_PowerPoint_2007_XML_AutoPlay.xcu#Impress_MS_PowerPoint_2007_XML_AutoPlay.UIName.value.text
msgid "Microsoft PowerPoint 2007/2010 XML AutoPlay"
-msgstr "تشغيل تلقائي Microsoft PowerPoint 2007/2010 XML"
+msgstr "تشغيل تلقائي مايكروسوفت باوربوينت 2007/2010 XML"
#: draw_html_Export_ui.xcu#draw_html_Export.UIName.value.text
msgid "HTML Document (Draw)"
-msgstr "مستند HTML (Draw)"
+msgstr "مستند HTML (درو)"
#: MS_Word_2007_XML_Template.xcu#MS_Word_2007_XML_Template.UIName.value.text
msgctxt "MS_Word_2007_XML_Template.xcu#MS_Word_2007_XML_Template.UIName.value.text"
msgid "Microsoft Word 2007/2010 XML Template"
-msgstr "قالب Microsoft Word 2007/2010 XML"
+msgstr "قالب مايكروسوفت وورد 2007/2010 XML"
#: StarCalc_5_0_Vorlage_Template_ui.xcu#StarCalc_5.0_Vorlage/Template.UIName.value.text
msgid "StarCalc 5.0 Template"
@@ -156,7 +156,7 @@
#: MS_Word_97_Vorlage_ui.xcu#MS_Word_97_Vorlage.UIName.value.text
msgid "Microsoft Word 97/2000/XP/2003 Template"
-msgstr "قالب Microsoft Word 97/2000/XP/2003"
+msgstr "قالب مايكروسوفت وورد 97/2000/XP/2003"
#: StarCalc_4_0_Vorlage_Template_ui.xcu#StarCalc_4.0_Vorlage/Template.UIName.value.text
msgid "StarCalc 4.0 Template"
@@ -164,7 +164,7 @@
#: writerweb8_writer_ui.xcu#writerweb8_writer.UIName.value.text
msgid "%productname% Text (Writer/Web)"
-msgstr "نص %productname% (Writer/Web)"
+msgstr "نص %productname% (رايتر/شبكة)"
#: impress8_template_ui.xcu#impress8_template.UIName.value.text
msgid "ODF Presentation Template"
@@ -195,7 +195,7 @@
#: impress_MS_PowerPoint_2007_XML_ui.xcu#Impress_MS_PowerPoint_2007_XML.UIName.value.text
msgid "Microsoft PowerPoint 2007/2010 XML"
-msgstr "Microsoft PowerPoint 2007/2010 XML"
+msgstr "مايكروسوفت باوربوينت 2007/2010 XML"
#: HTML_MasterDoc_ui.xcu#HTML_MasterDoc.UIName.value.text
msgid "HTML Document (Master Document)"
@@ -227,7 +227,7 @@
#: calc_MS_Excel_2007_XML_ui.xcu#Calc_MS_Excel_2007_XML.UIName.value.text
msgid "Microsoft Excel 2007/2010 XML"
-msgstr "Microsoft Excel 2007/2010 XML"
+msgstr "مايكروسوفت إكسل 2007/2010 XML"
#: StarOffice_XML__Chart__ui.xcu#StarOffice_XML__Chart_.UIName.value.text
msgid "%productname% %formatversion% Chart"
@@ -236,15 +236,15 @@
#: MS_Word_2007_XML_Template_ui.xcu#MS_Word_2007_XML_Template.UIName.value.text
msgctxt "MS_Word_2007_XML_Template_ui.xcu#MS_Word_2007_XML_Template.UIName.value.text"
msgid "Microsoft Word 2007/2010 XML Template"
-msgstr "قالب Microsoft Word 2007/2010 XML"
+msgstr "قالب مايكروسوفت وورد 2007/2010 XML"
#: HTML__StarWriter__ui.xcu#HTML__StarWriter_.UIName.value.text
msgid "HTML Document (Writer)"
-msgstr "مستند HTML (Writer)"
+msgstr "مستند HTML (رايتر)"
#: MS_Excel_2003_XML_ui.xcu#MS_Excel_2003_XML.UIName.value.text
msgid "Microsoft Excel 2003 XML"
-msgstr "Microsoft Excel 2003 XML"
+msgstr "مايكروسوفت إكسل 2003 XML"
#: UOF_spreadsheet_ui.xcu#UOF_spreadsheet.UIName.value.text
msgid "Unified Office Format spreadsheet"
@@ -252,7 +252,7 @@
#: StarDraw_3_0_Vorlage__StarImpress__ui.xcu#StarDraw_3.0_Vorlage__StarImpress_.UIName.value.text
msgid "StarDraw 3.0 Template (Impress)"
-msgstr "قالب StarDraw 3.0 (Impress)"
+msgstr "قالب StarDraw 3.0 (امبريس)"
#: StarImpress_4_0_Vorlage_ui.xcu#StarImpress_4.0_Vorlage.UIName.value.text
msgid "StarImpress 4.0 Template"
@@ -264,12 +264,12 @@
#: calc_MS_Excel_2007_XML_Template_ui.xcu#Calc_MS_Excel_2007_XML_Template.UIName.value.text
msgid "Microsoft Excel 2007/2010 XML Template"
-msgstr "قالب Microsoft Excel 2007/2010 XML"
+msgstr "قالب مايكروسوفت إكسل 2007/2010 XML"
#: impress_MS_PowerPoint_2007_XML_Template.xcu#Impress_MS_PowerPoint_2007_XML_Template.UIName.value.text
msgctxt "impress_MS_PowerPoint_2007_XML_Template.xcu#Impress_MS_PowerPoint_2007_XML_Template.UIName.value.text"
msgid "Microsoft PowerPoint 2007/2010 XML Template"
-msgstr "قالب Microsoft PowerPoint 2007/2010 XML"
+msgstr "قالب مايكروسوفت باوربوينت 2007/2010 XML"
#: HTML_ui.xcu#HTML.UIName.value.text
msgid "HTML Document"
@@ -285,11 +285,11 @@
#: Text__StarWriter_Web__ui.xcu#Text__StarWriter/Web_.UIName.value.text
msgid "Text (Writer/Web)"
-msgstr "نص (Writer/Web)"
+msgstr "نص (رايتر/شبكة)"
#: calc_HTML_WebQuery_ui.xcu#calc_HTML_WebQuery.UIName.value.text
msgid "Web Page Query (Calc)"
-msgstr "استعلام صفحة وب (Calc)"
+msgstr "استعلام صفحة وب (كالك)"
#: StarOffice_XML__Impress__ui.xcu#StarOffice_XML__Impress_.UIName.value.text
msgid "%productname% %formatversion% Presentation"
@@ -297,7 +297,7 @@
#: MS_PowerPoint_97_Vorlage_ui.xcu#MS_PowerPoint_97_Vorlage.UIName.value.text
msgid "Microsoft PowerPoint 97/2000/XP/2003 Template"
-msgstr "قالب Microsoft PowerPoint 97/2000/XP/2003"
+msgstr "قالب مايكروسوفت باوربوينت 97/2000/XP/2003"
#: Text__encoded__ui.xcu#Text__encoded_.UIName.value.text
msgid "Text Encoded"
@@ -313,7 +313,7 @@
#: Text__encoded___StarWriter_Web__ui.xcu#Text__encoded___StarWriter/Web_.UIName.value.text
msgid "Text Encoded (Writer/Web)"
-msgstr "نص مرمّز (Writer/Web)"
+msgstr "نص مرمّز (رايتر/شبكة)"
#: chart8_ui.xcu#chart8.UIName.value.text
msgid "ODF Chart"
@@ -337,7 +337,7 @@
#: impress_StarOffice_XML_Draw_ui.xcu#impress_StarOffice_XML_Draw.UIName.value.text
msgid "%productname% %formatversion% Drawing (Impress)"
-msgstr "رسم %productname% %formatversion% (Impress)"
+msgstr "رسم %productname% %formatversion% (امبريس)"
#: StarCalc_3_0_Vorlage_Template_ui.xcu#StarCalc_3.0_Vorlage/Template.UIName.value.text
msgid "StarCalc 3.0 Template"
@@ -345,11 +345,11 @@
#: MS_Word_95_Vorlage_ui.xcu#MS_Word_95_Vorlage.UIName.value.text
msgid "Microsoft Word 95 Template"
-msgstr "قالب Microsoft Word 95"
+msgstr "قالب مايكروسوفت وورد 95"
#: MS_Excel_95_Vorlage_Template_ui.xcu#MS_Excel_95_Vorlage/Template.UIName.value.text
msgid "Microsoft Excel 95 Template"
-msgstr "قالب Microsoft Excel 95"
+msgstr "قالب مايكروسوفت إكسل 95"
#: calc_StarOffice_XML_Calc_Template_ui.xcu#calc_StarOffice_XML_Calc_Template.UIName.value.text
msgid "%productname% %formatversion% Spreadsheet Template"
@@ -361,7 +361,7 @@
#: impress_html_Export_ui.xcu#impress_html_Export.UIName.value.text
msgid "HTML Document (Impress)"
-msgstr "مستند HTML (Impress)"
+msgstr "مستند HTML (امبريس)"
#: StarImpress_5_0__packed__ui.xcu#StarImpress_5.0__packed_.UIName.value.text
msgid "StarImpress 5.0 Packed"
@@ -377,4 +377,4 @@
#: HTML__StarCalc__ui.xcu#HTML__StarCalc_.UIName.value.text
msgid "HTML Document (Calc)"
-msgstr "مستند HTML (Calc)"
+msgstr "مستند HTML (كالك)"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/filter/source/config/fragments/internalgraphicfilters.po libreoffice-3.6.2~rc2/translations/source/ar/filter/source/config/fragments/internalgraphicfilters.po
--- libreoffice-3.6.1~rc2/translations/source/ar/filter/source/config/fragments/internalgraphicfilters.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/filter/source/config/fragments/internalgraphicfilters.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+filter%2Fsource%2Fconfig%2Ffragments%2Finternalgraphicfilters.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-04-07 12:35+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-27 18:48+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -23,204 +23,204 @@
#: wmf_Import.xcu#wmf_Import.UIName.value.text
msgctxt "wmf_Import.xcu#wmf_Import.UIName.value.text"
msgid "WMF - Windows Metafile"
-msgstr "WMF - Windows Metafile"
+msgstr "WMF - ملف ويندوز أعلى"
#: eps_Import.xcu#eps_Import.UIName.value.text
msgctxt "eps_Import.xcu#eps_Import.UIName.value.text"
msgid "EPS - Encapsulated PostScript"
-msgstr "EPS - Encapsulated PostScript"
+msgstr "EPS - حاشية مغلَّفة"
#: tga_Import.xcu#tga_Import.UIName.value.text
msgid "TGA - Truevision Targa"
-msgstr "TGA - Truevision Targa"
+msgstr "TGA - تروفيرجن تارجا"
#: met_Import.xcu#met_Import.UIName.value.text
msgctxt "met_Import.xcu#met_Import.UIName.value.text"
msgid "MET - OS/2 Metafile"
-msgstr "MET - OS/2 Metafile"
+msgstr "MET - ملف OS/2 أعلى"
#: bmp_Import.xcu#bmp_Import.UIName.value.text
msgctxt "bmp_Import.xcu#bmp_Import.UIName.value.text"
msgid "BMP - Windows Bitmap"
-msgstr "BMP - Windows Bitmap"
+msgstr "BMP - صورة ويندوز نقطية"
#: emf_Import.xcu#emf_Import.UIName.value.text
msgctxt "emf_Import.xcu#emf_Import.UIName.value.text"
msgid "EMF - Enhanced Metafile"
-msgstr "EMF - Enhanced Metafile"
+msgstr "EMF - ملف أعلى معزَّز"
#: ras_Import.xcu#ras_Import.UIName.value.text
msgctxt "ras_Import.xcu#ras_Import.UIName.value.text"
msgid "RAS - Sun Raster Image"
-msgstr "RAS - Sun Raster Image"
+msgstr "RAS - صورة سَنْ نقطية"
#: dxf_Import.xcu#dxf_Import.UIName.value.text
msgid "DXF - AutoCAD Interchange Format"
-msgstr "DXF - AutoCAD Interchange Format"
+msgstr "DXF - هيئة أوتوكاد تبادلية"
#: pcd_Import_Base4.xcu#pcd_Import_Base4.UIName.value.text
msgid "PCD - Kodak Photo CD (384x256)"
-msgstr "PCD - Kodak Photo CD (384x256)"
+msgstr "PCD - سي دي صورة كوداك (384x256)"
#: ppm_Export.xcu#ppm_Export.UIName.value.text
msgctxt "ppm_Export.xcu#ppm_Export.UIName.value.text"
msgid "PPM - Portable Pixelmap"
-msgstr "PPM - Portable Pixelmap"
+msgstr "PPM - خريطة بكسل محمولة"
#: eps_Export.xcu#eps_Export.UIName.value.text
msgctxt "eps_Export.xcu#eps_Export.UIName.value.text"
msgid "EPS - Encapsulated PostScript"
-msgstr "EPS - Encapsulated PostScript"
+msgstr "EPS - حاشية مغلَّفة"
#: pcx_Import.xcu#pcx_Import.UIName.value.text
msgid "PCX - Zsoft Paintbrush"
-msgstr "PCX - Zsoft Paintbrush"
+msgstr "PCX - فرشاة رسم زِدسوفت"
#: svg_Export.xcu#svg_Export.UIName.value.text
msgctxt "svg_Export.xcu#svg_Export.UIName.value.text"
msgid "SVG - Scalable Vector Graphics"
-msgstr "SVG - Scalable Vector Graphics"
+msgstr "SVG - رسوم متجهة قابلة للتمديد"
#: png_Export.xcu#png_Export.UIName.value.text
msgctxt "png_Export.xcu#png_Export.UIName.value.text"
msgid "PNG - Portable Network Graphic"
-msgstr "PNG - Portable Network Graphic"
+msgstr "PNG - رسوم شبكية محمولة"
#: pcd_Import_Base16.xcu#pcd_Import_Base16.UIName.value.text
msgid "PCD - Kodak Photo CD (192x128)"
-msgstr "PCD - Kodak Photo CD (192x128)"
+msgstr "PCD - سي دي صورة كوداك (192x128)"
#: pcd_Import_Base.xcu#pcd_Import_Base.UIName.value.text
msgid "PCD - Kodak Photo CD (768x512)"
-msgstr "PCD - Kodak Photo CD (768x512)"
+msgstr "PCD - سي دي صورة كوداك (768x512)"
#: tif_Export.xcu#tif_Export.UIName.value.text
msgctxt "tif_Export.xcu#tif_Export.UIName.value.text"
msgid "TIFF - Tagged Image File Format"
-msgstr "TIFF - Tagged Image File Format"
+msgstr "TIFF - هيئة ملف صورة مُعلَّمة"
#: svm_Import.xcu#svm_Import.UIName.value.text
msgctxt "svm_Import.xcu#svm_Import.UIName.value.text"
msgid "SVM - StarView Metafile"
-msgstr "SVM - StarView Metafile"
+msgstr "SVM - ملف ستارفيو أعلى"
#: tif_Import.xcu#tif_Import.UIName.value.text
msgctxt "tif_Import.xcu#tif_Import.UIName.value.text"
msgid "TIFF - Tagged Image File Format"
-msgstr "TIFF - Tagged Image File Format"
+msgstr "TIFF - هيئة ملف صورة مُعلَّمة"
#: pbm_Import.xcu#pbm_Import.UIName.value.text
msgctxt "pbm_Import.xcu#pbm_Import.UIName.value.text"
msgid "PBM - Portable Bitmap"
-msgstr "PBM - Portable Bitmap"
+msgstr "PBM - صورة نقطية محمولة"
#: png_Import.xcu#png_Import.UIName.value.text
msgctxt "png_Import.xcu#png_Import.UIName.value.text"
msgid "PNG - Portable Network Graphic"
-msgstr "PNG - Portable Network Graphic"
+msgstr "PNG - رسوم شبكية محمولة"
#: xpm_Export.xcu#xpm_Export.UIName.value.text
msgctxt "xpm_Export.xcu#xpm_Export.UIName.value.text"
msgid "XPM - X PixMap"
-msgstr "XPM - X PixMap"
+msgstr "XPM - رسم اكس نقطي"
#: pct_Export.xcu#pct_Export.UIName.value.text
msgctxt "pct_Export.xcu#pct_Export.UIName.value.text"
msgid "PCT - Mac Pict"
-msgstr "PCT - Mac Pict"
+msgstr "PCT - ماك بيكت"
#: wmf_Export.xcu#wmf_Export.UIName.value.text
msgctxt "wmf_Export.xcu#wmf_Export.UIName.value.text"
msgid "WMF - Windows Metafile"
-msgstr "WMF - Windows Metafile"
+msgstr "WMF - ملف ويندوز أعلى"
#: svg_Import.xcu#svg_Import.UIName.value.text
msgctxt "svg_Import.xcu#svg_Import.UIName.value.text"
msgid "SVG - Scalable Vector Graphics"
-msgstr "رسومات موجهة قابلة للقياس - SVG"
+msgstr "رسوم متجهة قابلة للتمديد - SVG"
#: sgv_Import.xcu#sgv_Import.UIName.value.text
msgid "SGV - StarDraw 2.0"
-msgstr "SGV - StarDraw 2.0"
+msgstr "SGV - ستار درو 2.0"
#: emf_Export.xcu#emf_Export.UIName.value.text
msgctxt "emf_Export.xcu#emf_Export.UIName.value.text"
msgid "EMF - Enhanced Metafile"
-msgstr "EMF - Enhanced Metafile"
+msgstr "EMF - ملف أعلى معزَّز"
#: met_Export.xcu#met_Export.UIName.value.text
msgctxt "met_Export.xcu#met_Export.UIName.value.text"
msgid "MET - OS/2 Metafile"
-msgstr "MET - OS/2 Metafile"
+msgstr "MET - ملف OS/2 أعلى"
#: psd_Import.xcu#psd_Import.UIName.value.text
msgid "PSD - Adobe Photoshop"
-msgstr "PSD - Adobe Photoshop"
+msgstr "PSD - أدوبي فوتوشوب"
#: jpg_Import.xcu#jpg_Import.UIName.value.text
msgctxt "jpg_Import.xcu#jpg_Import.UIName.value.text"
msgid "JPEG - Joint Photographic Experts Group"
-msgstr "JPEG - Joint Photographic Experts Group"
+msgstr "JPEG - هيئة مجموعة خبراء الفوتوغرافية"
#: pct_Import.xcu#pct_Import.UIName.value.text
msgctxt "pct_Import.xcu#pct_Import.UIName.value.text"
msgid "PCT - Mac Pict"
-msgstr "PCT - Mac Pict"
+msgstr "PCT - ماك بيكت"
#: ppm_Import.xcu#ppm_Import.UIName.value.text
msgctxt "ppm_Import.xcu#ppm_Import.UIName.value.text"
msgid "PPM - Portable Pixelmap"
-msgstr "PPM - Portable Pixelmap"
+msgstr "PPM - خريطة بكسل محمولة"
#: ras_Export.xcu#ras_Export.UIName.value.text
msgctxt "ras_Export.xcu#ras_Export.UIName.value.text"
msgid "RAS - Sun Raster Image"
-msgstr "RAS - Sun Raster Image"
+msgstr "RAS - صورة سَنْ نقطية"
#: pgm_Export.xcu#pgm_Export.UIName.value.text
msgctxt "pgm_Export.xcu#pgm_Export.UIName.value.text"
msgid "PGM - Portable Graymap"
-msgstr "PGM - Portable Graymap"
+msgstr "PGM - خريطة رصاصية محمولة"
#: jpg_Export.xcu#jpg_Export.UIName.value.text
msgctxt "jpg_Export.xcu#jpg_Export.UIName.value.text"
msgid "JPEG - Joint Photographic Experts Group"
-msgstr "JPEG - Joint Photographic Experts Group"
+msgstr "JPEG - هيئة مجموعة خبراء الفوتوغرافية"
#: sgf_Import.xcu#sgf_Import.UIName.value.text
msgid "SGF - StarWriter Graphics Format"
-msgstr "SGF - StarWriter Graphics Format"
+msgstr "SGF - هيئة ستاررايتر الرسومية"
#: bmp_Export.xcu#bmp_Export.UIName.value.text
msgctxt "bmp_Export.xcu#bmp_Export.UIName.value.text"
msgid "BMP - Windows Bitmap"
-msgstr "BMP - Windows Bitmap"
+msgstr "BMP - صورة ويندوز نقطية"
#: svm_Export.xcu#svm_Export.UIName.value.text
msgctxt "svm_Export.xcu#svm_Export.UIName.value.text"
msgid "SVM - StarView Metafile"
-msgstr "SVM - StarView Metafile"
+msgstr "SVM - ملف ستارفيو أعلى"
#: xbm_Import.xcu#xbm_Import.UIName.value.text
msgid "XBM - X Bitmap"
-msgstr "XBM - X Bitmap"
+msgstr "XBM - صورة اكس نقطية"
#: gif_Export.xcu#gif_Export.UIName.value.text
msgctxt "gif_Export.xcu#gif_Export.UIName.value.text"
msgid "GIF - Graphics Interchange Format"
-msgstr "GIF - Graphics Interchange Format"
+msgstr "GIF - هيئة رسوم متبادلة"
#: pgm_Import.xcu#pgm_Import.UIName.value.text
msgctxt "pgm_Import.xcu#pgm_Import.UIName.value.text"
msgid "PGM - Portable Graymap"
-msgstr "PGM - Portable Graymap"
+msgstr "PGM - خريطة رصاصية محمولة"
#: pbm_Export.xcu#pbm_Export.UIName.value.text
msgctxt "pbm_Export.xcu#pbm_Export.UIName.value.text"
msgid "PBM - Portable Bitmap"
-msgstr "PBM - Portable Bitmap"
+msgstr "PBM - صورة نقطية محمولة"
#: gif_Import.xcu#gif_Import.UIName.value.text
msgctxt "gif_Import.xcu#gif_Import.UIName.value.text"
msgid "GIF - Graphics Interchange Format"
-msgstr "GIF - Graphics Interchange Format"
+msgstr "GIF - هيئة رسوم متبادلة"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/filter/source/config/fragments/types.po libreoffice-3.6.2~rc2/translations/source/ar/filter/source/config/fragments/types.po
--- libreoffice-3.6.1~rc2/translations/source/ar/filter/source/config/fragments/types.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/filter/source/config/fragments/types.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+filter%2Fsource%2Fconfig%2Ffragments%2Ftypes.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2012-06-13 13:16+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 19:13+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,19 @@
#: MS_PowerPoint_2007_XML_AutoPlay.xcu#MS_PowerPoint_2007_XML_AutoPlay.UIName.value.text
msgctxt "MS_PowerPoint_2007_XML_AutoPlay.xcu#MS_PowerPoint_2007_XML_AutoPlay.UIName.value.text"
msgid "Microsoft PowerPoint 2007/2010 XML"
-msgstr "Microsoft PowerPoint 2007/2010 XML"
+msgstr "مايكروسوفت باوربوينت 2007/2010 XML"
#: MS_Excel_2007_XML_Template.xcu#MS_Excel_2007_XML_Template.UIName.value.text
msgid "Microsoft Excel 2007/2010 XML Template"
-msgstr "قالب Microsoft Excel 2007/2010 XML"
+msgstr "قالب مايكروسوفت إكسل 2007/2010 XML"
#: calc_MS_Excel_2003_XML.xcu#calc_MS_Excel_2003_XML.UIName.value.text
msgid "Microsoft Excel 2003 XML"
-msgstr "Microsoft Excel 2003 XML"
+msgstr "مايكروسوفت إكسل 2003 XML"
#: writer8.xcu#writer8.UIName.value.text
msgid "Writer 8"
-msgstr "Writer 8"
+msgstr "رايتر 8"
#: chart8.xcu#chart8.UIName.value.text
msgid "Chart 8"
@@ -42,69 +42,69 @@
#: writerglobal8.xcu#writerglobal8.UIName.value.text
msgid "Writer 8 Master Document"
-msgstr "مستند Writer 8 رئيسي"
+msgstr "مستند رايتر 8 رئيسي"
#: MS_Excel_2007_XML.xcu#MS_Excel_2007_XML.UIName.value.text
msgid "Microsoft Excel 2007/2010 XML"
-msgstr "Microsoft Excel 2007/2010 XML"
+msgstr "مايكروسوفت إكسل 2007/2010 XML"
#: writer_MS_Word_2007_XML_Template.xcu#writer_MS_Word_2007_Template.UIName.value.text
msgid "Microsoft Word 2007/2010 XML Template"
-msgstr "قالب Microsoft Word 2007/2010 XML"
+msgstr "قالب مايكروسوفت وورد 2007/2010 XML"
#: MS_PowerPoint_2007_XML_Template.xcu#MS_PowerPoint_2007_XML_Template.UIName.value.text
msgid "Microsoft PowerPoint 2007/2010 XML Template"
-msgstr "قالب Microsoft PowerPoint 2007/2010 XML"
+msgstr "قالب مايكروسوفت باوربوينت 2007/2010 XML"
#: impress8.xcu#impress8.UIName.value.text
msgid "Impress 8"
-msgstr "Impress 8"
+msgstr "امبريس 8"
#: writer_MS_Word_2007_XML.xcu#writer_MS_Word_2007.UIName.value.text
msgid "Microsoft Word 2007/2010 XML"
-msgstr "Microsoft Word 2007/2010 XML"
+msgstr "مايكروسوفت وورد 2007/2010 XML"
#: draw8.xcu#draw8.UIName.value.text
msgid "Draw 8"
-msgstr "Draw 8"
+msgstr "درو 8"
#: writerweb8_writer_template.xcu#writerweb8_writer_template.UIName.value.text
msgid "Writer/Web 8 Template"
-msgstr "قالب Writer/Web 8"
+msgstr "قالب رايتر/شبكة 8"
#: impress8_template.xcu#impress8_template.UIName.value.text
msgid "Impress 8 Template"
-msgstr "قالب Impress 8"
+msgstr "قالب امبريس 8"
#: writer_MS_Word_2003_XML.xcu#writer_MS_Word_2003_XML.UIName.value.text
msgid "Microsoft Word 2003 XML"
-msgstr "Microsoft Word 2003 XML"
+msgstr "مايكروسوفت وورد 2003 XML"
#: draw8_template.xcu#draw8_template.UIName.value.text
msgid "Draw 8 Template"
-msgstr "قالب Draw 8"
+msgstr "قالب درو 8"
#: math8.xcu#math8.UIName.value.text
msgid "Math 8"
-msgstr "Math 8"
+msgstr "ماث 8"
#: writer8_template.xcu#writer8_template.UIName.value.text
msgid "Writer 8 Template"
-msgstr "قالب Writer 8"
+msgstr "قالب رايتر 8"
#: MS_Excel_2007_Binary.xcu#MS_Excel_2007_Binary.UIName.value.text
msgid "Microsoft Excel 2007 Binary"
-msgstr "ثنائي Microsoft Excel 2007"
+msgstr "مايكروسوفت إكسل 2007 ثنائي"
#: calc8.xcu#calc8.UIName.value.text
msgid "Calc 8"
-msgstr "Calc 8"
+msgstr "كالك 8"
#: calc8_template.xcu#calc8_template.UIName.value.text
msgid "Calc 8 Template"
-msgstr "قالب Calc 8"
+msgstr "قالب كالك 8"
#: MS_PowerPoint_2007_XML.xcu#MS_PowerPoint_2007_XML.UIName.value.text
msgctxt "MS_PowerPoint_2007_XML.xcu#MS_PowerPoint_2007_XML.UIName.value.text"
msgid "Microsoft PowerPoint 2007/2010 XML"
-msgstr "Microsoft PowerPoint 2007/2010 XML"
+msgstr "مايكروسوفت باوربوينت 2007/2010 XML"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/filter/source/xsltdialog.po libreoffice-3.6.2~rc2/translations/source/ar/filter/source/xsltdialog.po
--- libreoffice-3.6.1~rc2/translations/source/ar/filter/source/xsltdialog.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/filter/source/xsltdialog.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: xmlfilterdialogstrings.src#STR_COLUMN_HEADER_NAME.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-3.6.2~rc2/translations/source/ar/instsetoo_native/inc_openoffice/windows/msi_languages.po
--- libreoffice-3.6.1~rc2/translations/source/ar/instsetoo_native/inc_openoffice/windows/msi_languages.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/instsetoo_native/inc_openoffice/windows/msi_languages.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+instsetoo_native%2Finc_openoffice%2Fwindows%2Fmsi_languages.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2012-08-12 10:56+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-27 18:51+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: CustomAc.ulf#OOO_CUSTOMACTION_1.LngText.text
@@ -102,15 +102,15 @@
#: Error.ulf#OOO_ERROR_19.LngText.text
msgid "Please wait while Windows configures [ProductName]"
-msgstr "الرجاء الانتظار بينما يقوم Windows بتكوين [ProductName]"
+msgstr "الرجاء الانتظار بينما يقوم ويندوز بتكوين [ProductName]"
#: Error.ulf#OOO_ERROR_20.LngText.text
msgid "Gathering required information..."
-msgstr "جارٍ جمع المعلومات المطلوبة..."
+msgstr "يجمع المعلومات المطلوبة..."
#: Error.ulf#OOO_ERROR_21.LngText.text
msgid "Removing older versions of this application"
-msgstr "إزالة الإصدارات القديمة من هذا التطبيق"
+msgstr "يزيل الإصدارات القديمة من هذا التطبيق"
#: Error.ulf#OOO_ERROR_22.LngText.text
msgid "Preparing to remove older versions of this application"
@@ -286,7 +286,7 @@
#: Error.ulf#OOO_ERROR_65.LngText.text
msgid "Error accessing secured data. Please make sure the Windows Installer is configured properly and try the installation again."
-msgstr "حدث خطأ أثناء الوصول إلى البيانات المحمية. الرجاء التأكد من تكوين Windows Installer بشكل صحيح ومحاولة إجراء التثبيت مرة أخرى."
+msgstr "حدث خطأ أثناء الوصول إلى البيانات المحمية. الرجاء التأكد من تكوين ويندوز انستولِر بشكل صحيح ومحاولة إجراء التثبيت مرة أخرى."
#: Error.ulf#OOO_ERROR_66.LngText.text
msgid "User [2] has previously initiated an installation for product [3]. That user will need to run that installation again before using that product. Your current installation will now continue."
@@ -350,7 +350,7 @@
#: Error.ulf#OOO_ERROR_81.LngText.text
msgid "No valid source could be found for product [2]. The Windows Installer cannot continue."
-msgstr "تعذر العثور على مصدر صالح للمنتج [2]. لا يمكن متابعة Windows Installer."
+msgstr "تعذر العثور على مصدر صالح للمنتج [2]. لا يمكن متابعة ويندوز انستولِر."
#: Error.ulf#OOO_ERROR_82.LngText.text
msgid "Installation operation completed successfully."
@@ -535,11 +535,11 @@
#: Error.ulf#OOO_ERROR_127.LngText.text
msgid "The Windows Installer service cannot update the system file [2] because the file is protected by Windows. You may need to update your operating system for this program to work correctly. {{Package version: [3], OS Protected version: [4]}}"
-msgstr "لا تستطيع خدمة Windows Installer تحديث ملف النظام [2] لأن الملف محمي بواسطة Windows. قد تحتاج إلى تحديث نظام التشغيل لكي يعمل هذا البرنامج بشكل صحيح. {{إصدار الحزمة: [3]، الإصدار المحمي بواسطة نظام التشغيل: [4]}}"
+msgstr "لا تستطيع خدمة ويندوز انستولِر تحديث ملف النظام [2] لأن الملف محمي بواسطة ويندوز. قد تحتاج إلى تحديث نظام التشغيل لكي يعمل هذا البرنامج بشكل صحيح. {{إصدار الحزمة: [3]، الإصدار المحمي بواسطة نظام التشغيل: [4]}}"
#: Error.ulf#OOO_ERROR_128.LngText.text
msgid "The Windows Installer service cannot update the protected Windows file [2]. {{Package version: [3], OS Protected version: [4], SFP Error: [5]}}"
-msgstr "لا تستطيع خدمة Windows Installer تحديث ملف Windows المحمي [2]. {{إصدار الحزمة: [3]، الإصدار المحمي بواسطة نظام التشغيل: [4]، خطأ SFP: [5]}}"
+msgstr "لا تستطيع خدمة ويندوز انستولِر تحديث ملف ويندوز المحمي [2]. {{إصدار الحزمة: [3]، الإصدار المحمي بواسطة نظام التشغيل: [4]، خطأ SFP: [5]}}"
#: Error.ulf#OOO_ERROR_129.LngText.text
msgid "This setup requires Internet Information Server 4.0 or higher for configuring IIS Virtual Roots. Please make sure that you have IIS 4.0 or higher."
@@ -599,7 +599,7 @@
#: SIS.ulf#OOO_SIS_APPNAME.LngText.text
msgid "Windows Installer"
-msgstr "Windows Installer"
+msgstr "ويندوز انستولِر"
#: LaunchCo.ulf#OOO_LAUNCH_1.LngText.text
msgid "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system."
@@ -725,7 +725,7 @@
#: UIText.ulf#OOO_UITEXT_30.LngText.text
msgid "Compiling cost for this feature..."
-msgstr "جارٍ حساب تكلفة هذه الميزة..."
+msgstr "يحسب تكلفة هذه الميزة..."
#: UIText.ulf#OOO_UITEXT_31.LngText.text
msgid "This feature will be completely removed."
@@ -833,31 +833,31 @@
#: Property.ulf#OOO_STR_MS_WORD_DOCUMENT.LngText.text
msgid "Microsoft Word Document"
-msgstr "مستند Microsoft Word"
+msgstr "مستند مايكروسوفت وورد"
#: Property.ulf#OOO_STR_MS_WORD_TEMPLATE.LngText.text
msgid "Microsoft Word Template"
-msgstr "قالب Microsoft Word"
+msgstr "قالب مايكروسوفت وورد"
#: Property.ulf#OOO_STR_MS_EXCEL_WORKSHEET.LngText.text
msgid "Microsoft Excel Worksheet"
-msgstr "ورقة عمل Microsoft Excel"
+msgstr "ورقة عمل مايكروسوفت إكسل"
#: Property.ulf#OOO_STR_MS_EXCEL_TEMPLATE.LngText.text
msgid "Microsoft Excel Template"
-msgstr "قالب Microsoft Excel"
+msgstr "قالب مايكروسوفت إكسل"
#: Property.ulf#OOO_STR_MS_POWERPOINT_PRESENTATION.LngText.text
msgid "Microsoft PowerPoint Presentation"
-msgstr "عرض تقديمي لـ Microsoft PowerPoint"
+msgstr "عرض مايكروسوفت باوربوينت تقديمي"
#: Property.ulf#OOO_STR_MS_POWERPOINT_TEMPLATE.LngText.text
msgid "Microsoft PowerPoint Template"
-msgstr "قالب Microsoft PowerPoint"
+msgstr "قالب مايكروسوفت باوربوينت"
#: Property.ulf#OOO_STR_MS_POWERPOINT_SHOW.LngText.text
msgid "Microsoft PowerPoint Show"
-msgstr "عرض Microsoft PowerPoint"
+msgstr "عرض مايكروسوفت باوربوينت"
#: Property.ulf#OOO_STR_INSTALLATION_WIZARD.LngText.text
msgid "Installation Wizard"
@@ -987,7 +987,7 @@
#: Control.ulf#OOO_CONTROL_36.LngText.text
msgid "{\\Tahoma8}{80}"
-msgstr "{\\Tahoma8}\\{80\\}"
+msgstr "{\\Tahoma8}{80}"
#: Control.ulf#OOO_CONTROL_37.LngText.text
msgid "&Organization:"
@@ -1653,11 +1653,11 @@
#: Control.ulf#OOO_CONTROL_234.LngText.text
msgid "The program features you selected are being installed."
-msgstr "جارٍ تثبيت مزايا البرنامج التي قمت بتحديدها."
+msgstr "يثبّت مزايا البرنامج التي قمت بتحديدها."
#: Control.ulf#OOO_CONTROL_235.LngText.text
msgid "The program features you selected are being uninstalled."
-msgstr "جارٍ إزالة تثبيت مزايا البرنامج التي قمت بتحديدها."
+msgstr "يزيل تثبيت مزايا البرنامج التي قمت بتحديدها."
#: Control.ulf#OOO_CONTROL_236.LngText.text
msgid "Please wait while the Installation Wizard installs [ProductName]. This may take several minutes."
@@ -1775,15 +1775,15 @@
#: Control.ulf#OOO_CONTROL_270.LngText.text
msgid "&Microsoft Word Documents"
-msgstr "مس&تندات &Microsoft Word"
+msgstr "مس&تندات مايكروسوفت وورد"
#: Control.ulf#OOO_CONTROL_271.LngText.text
msgid "Microsoft &Excel Spreadsheets"
-msgstr "أورا&ق بيانات Microsoft Excel"
+msgstr "أورا&ق بيانات مايكروسوفت إكسل"
#: Control.ulf#OOO_CONTROL_272.LngText.text
msgid "Microsoft Po&werPoint Presentations"
-msgstr "&عروض Microsoft PowerPoint التقديمية"
+msgstr "&عروض مايكروسوفت باوربوينت التقديمية"
#: Control.ulf#OOO_CONTROL_273.LngText.text
msgid "Microsoft &Visio Documents"
@@ -1791,11 +1791,11 @@
#: Control.ulf#OOO_CONTROL_274.LngText.text
msgid "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office file types."
-msgstr "قم بتعيين [DEFINEDPRODUCT] بحيث يكون التطبيق الافتراضي لأنواع ملفات Microsoft Office."
+msgstr "قم بتعيين [DEFINEDPRODUCT] بحيث يكون التطبيق الافتراضي لأنواع ملفات مايكروسوفت أوفيس."
#: Control.ulf#OOO_CONTROL_275.LngText.text
msgid "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now."
-msgstr "يمكن تعيين [ProductName] على أنه التطبيق الافتراضي لفتح أنواع ملفات Microsoft Office. وهذا يعني، على سبيل المثال، إذا قمت بالنقر نقرًا مزدوجًا فوق أحد هذه الملفات، فسيقوم [ProductName] بفتحها وليس البرنامج الذي يقوم بفتحها الآن."
+msgstr "يمكن تعيين [ProductName] على أنه التطبيق الافتراضي لفتح أنواع ملفات مايكروسوفت أوفيس. وهذا يعني، على سبيل المثال، إذا قمت بالنقر نقرًا مزدوجًا فوق أحد هذه الملفات، فسيقوم [ProductName] بفتحها وليس البرنامج الذي يقوم بفتحها الآن."
#: Control.ulf#OOO_CONTROL_278.LngText.text
msgid "{&MSSansBold8}File Type"
@@ -1893,11 +1893,11 @@
#: ActionTe.ulf#OOO_ACTIONTEXT_8.LngText.text
msgid "Creating IIS Virtual Roots..."
-msgstr "جارٍ إنشاء جذور IIS الظاهرية..."
+msgstr "ينشأ جذور IIS الظاهرية..."
#: ActionTe.ulf#OOO_ACTIONTEXT_9.LngText.text
msgid "Removing IIS Virtual Roots..."
-msgstr "جارٍ إزالة جذور IIS الظاهرية..."
+msgstr "يزيل جذور IIS الظاهرية..."
#: ActionTe.ulf#OOO_ACTIONTEXT_10.LngText.text
msgctxt "ActionTe.ulf#OOO_ACTIONTEXT_10.LngText.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/mysqlc/source.po libreoffice-3.6.2~rc2/translations/source/ar/mysqlc/source.po
--- libreoffice-3.6.1~rc2/translations/source/ar/mysqlc/source.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/mysqlc/source.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po libreoffice-3.6.2~rc2/translations/source/ar/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po
--- libreoffice-3.6.1~rc2/translations/source/ar/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+nlpsolver%2Fhelp%2Fen%2Fcom.sun.star.comp.Calc.NLPSolver.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-12 11:36+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-09-20 15:32+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@
#: Options.xhp#bm_id0503200917110375_scalc.help.text
msgid "Solver for Nonlinear Problems;Options "
-msgstr ""
+msgstr "حلّال مشاكل اللا خطية;خيارات "
#: Options.xhp#hd_id0503200917103593.help.text
msgid "General Options"
@@ -77,15 +77,15 @@
#: Options.xhp#par_id0503200917103790.help.text
msgid "If enabled , the library is simply filled up with randomly chosen points."
-msgstr ""
+msgstr "إن فُعِّل ، المكتبة تملئ ببساطة بنقاط عشوائية مختارة."
#: Options.xhp#par_id0503200917103765.help.text
msgid "If disabled , the currently present values (as given by the user) are inserted in the library as reference point."
-msgstr ""
+msgstr "إن عُطِل ، القيم الموجودة حاليًا (كما أعطيت من المستخدم) مُدرجة في المكتبة كنقطة مرجع."
#: Options.xhp#par_id0504200917103794.help.text
msgid "Stagnation Limit"
-msgstr ""
+msgstr "حدّ الركود"
#: Options.xhp#par_id050320091710377.help.text
msgid "If this number of individuals found solutions within a close range, the iteration is stopped and the best of these values is chosen as optimal."
@@ -173,7 +173,7 @@
#: Options.xhp#par_id0603200910401382.help.text
msgid "Size of Library"
-msgstr ""
+msgstr "حجم المكتبة"
#: Options.xhp#par_id060320091040136.help.text
msgid "… defines the amount of informations to store in the public library. Each individual stores knowledge there and asks for informations."
@@ -182,16 +182,16 @@
#: Usage.xhp#tit.help.text
msgctxt "Usage.xhp#tit.help.text"
msgid "Usage"
-msgstr "الأستخدام"
+msgstr "الإستخدام"
#: Usage.xhp#bm_id0603200910434044_scalc.help.text
msgid "Solver for Nonlinear Problems;Usage "
-msgstr ""
+msgstr "حلّال المشاكل الغير خطية;الإستخدام "
#: Usage.xhp#hd_id0603200910430882.help.text
msgctxt "Usage.xhp#hd_id0603200910430882.help.text"
msgid "Usage"
-msgstr "الأستخدام"
+msgstr "الإستخدام"
#: Usage.xhp#par_id0603200910430845.help.text
msgid "Regardless whether you use DEPS or SCO, you start by going to Tools → Solver and set the Cell to be optimized, the direction to go (minimization, maximization) and the cells to be modified to reach the goal. Then you go to the Options and specify the solver to be used and if necessary adjust the according parameters."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver.po libreoffice-3.6.2~rc2/translations/source/ar/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver.po
--- libreoffice-3.6.1~rc2/translations/source/ar/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,20 +4,21 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+nlpsolver%2Fsrc%2Fcom%2Fsun%2Fstar%2Fcomp%2FCalc%2FNLPSolver.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-09-17 18:30+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
msgid "Solver for Nonlinear Programming"
-msgstr ""
+msgstr "حلّال البرمجة الغير خطية"
#: description.xml#extdesc.extdesc.description.text
msgid "This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models.\n"
-msgstr ""
+msgstr "هذا الامتداد يوحَّد في كالك ويوفّر محركات حل جديدة للاستخدام لتحسين نماذج البرمجة الغير خطية.\n"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/nlpsolver/src/locale.po libreoffice-3.6.2~rc2/translations/source/ar/nlpsolver/src/locale.po
--- libreoffice-3.6.1~rc2/translations/source/ar/nlpsolver/src/locale.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/nlpsolver/src/locale.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+nlpsolver%2Fsrc%2Flocale.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-05-28 12:55+0200\n"
-"Last-Translator: abdulmajeed \n"
+"PO-Revision-Date: 2012-09-18 15:26+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Accelerator-Marker: ~\n"
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.AssumeNonNegative.property.text
@@ -21,7 +21,7 @@
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.SwarmSize.property.text
msgid "Size of Swarm"
-msgstr ""
+msgstr "حجم السرب"
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.LibrarySize.property.text
msgid "Size of Library"
@@ -49,11 +49,11 @@
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.StagnationLimit.property.text
msgid "Stagnation Limit"
-msgstr ""
+msgstr "حدّ الركود"
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.Tolerance.property.text
msgid "Stagnation Tolerance"
-msgstr ""
+msgstr "تحمّل الركود"
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.EnhancedSolverStatus.property.text
msgid "Show enhanced solver status"
@@ -65,7 +65,7 @@
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.DEFactor.property.text
msgid "DE: Scaling Factor (0-1.2)"
-msgstr "عامل تحجيم"
+msgstr ""
#: NLPSolverCommon_en_US.properties#NLPSolverCommon.Properties.DECR.property.text
msgid "DE: Crossover Probability (0-1)"
@@ -89,27 +89,27 @@
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Dialog.Caption.property.text
msgid "Solver Status"
-msgstr ""
+msgstr "تقدم الحلّال"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.lblSolution.property.text
msgid "Current Solution:"
-msgstr "الحل الحالي"
+msgstr "الحل الحالي:"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.lblIteration.property.text
msgid "Iteration:"
-msgstr "تكرار"
+msgstr "التكرار:"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.lblStagnation.property.text
msgid "Stagnation:"
-msgstr ""
+msgstr "الركود:"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.lblRuntime.property.text
msgid "Runtime:"
-msgstr "وقت التشغيل"
+msgstr "وقت التشغيل:"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.btnStop.property.text
msgid "Stop"
-msgstr "إيقاف"
+msgstr "أوقف"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.btnOK.property.text
msgid "OK"
@@ -117,7 +117,7 @@
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Controls.btnContinue.property.text
msgid "Continue"
-msgstr "متابعة"
+msgstr "تابع"
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Message.StopIteration.property.text
msgid "Maximum iterations reached."
@@ -125,15 +125,15 @@
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Message.StopStagnation.property.text
msgid "Process stopped due to stagnation."
-msgstr ""
+msgstr "العملية توقفت بسبب الركود."
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Message.StopUser.property.text
msgid "Process stopped due to user interruption."
-msgstr ""
+msgstr "العملية توقفت بسبب انقطاع المستخدم."
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Message.CurrentIteration.property.text
msgid "Process stopped at iteration %d of %d."
-msgstr ""
+msgstr "العملية توقفت عند التكرار %d من %d."
#: NLPSolverStatusDialog_en_US.properties#NLPSolverStatusDialog.Time.Nanoseconds.property.text
msgid "Nanoseconds"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-3.6.2~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po
--- libreoffice-3.6.1~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office/UI.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+officecfg%2Fregistry%2Fdata%2Forg%2Fopenoffice%2FOffice%2FUI.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2012-08-12 10:06+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-27 06:55+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: WriterReportWindowState.xcu#..WriterReportWindowState.UIElements.States.private_resource/toolbar/standardbar.UIName.value.text
@@ -2773,7 +2773,7 @@
#: DrawImpressCommands.xcu#..DrawImpressCommands.UserInterface.Commands..uno_SendMailDocAsMS.Label.value.text
msgid "E-mail as ~Microsoft PowerPoint Presentation..."
-msgstr "بريد إلكتروني ك~عرض Microsoft PowerPoint تقديمي..."
+msgstr "بريد إلكتروني ك~عرض مايكروسوفت باوربوينت تقديمي..."
#: DrawImpressCommands.xcu#..DrawImpressCommands.UserInterface.Commands..uno_SendMailDocAsOOo.Label.value.text
msgid "E-mail as ~OpenDocument Presentation..."
@@ -4870,7 +4870,7 @@
#: WriterCommands.xcu#..WriterCommands.UserInterface.Commands..uno_SendMailDocAsMS.Label.value.text
msgid "E-mail as ~Microsoft Word..."
-msgstr "بريد إل~كتروني على شكل Microsoft Word..."
+msgstr "بريد إل~كتروني على شكل مايكروسوفت وورد..."
#: WriterCommands.xcu#..WriterCommands.UserInterface.Commands..uno_SendMailDocAsOOo.Label.value.text
msgid "E-mail as ~OpenDocument Text..."
@@ -9003,7 +9003,7 @@
#: GenericCommands.xcu#..GenericCommands.UserInterface.Popups..uno_SendMailDocAsMS.Label.value.text
msgid "E-mail as ~Microsoft Format..."
-msgstr "البريد الإلكتروني ب~تنسيق Microsoft..."
+msgstr "البريد الإلكتروني ب~تنسيق مايكروسوفت..."
#: GenericCommands.xcu#..GenericCommands.UserInterface.Popups..uno_SendMailDocAsOOo.Label.value.text
msgid "E-mail as ~OpenDocument Format..."
@@ -11105,7 +11105,7 @@
#: CalcCommands.xcu#..CalcCommands.UserInterface.Commands..uno_SendMailDocAsMS.Label.value.text
msgid "E-mail as ~Microsoft Excel..."
-msgstr "بريد إل~كتروني على شكل Microsoft Excel..."
+msgstr "بريد إل~كتروني على شكل مايكروسوفت إكسل..."
#: CalcCommands.xcu#..CalcCommands.UserInterface.Commands..uno_SendMailDocAsOOo.Label.value.text
msgid "E-mail as ~OpenDocument Spreadsheet..."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office.po libreoffice-3.6.2~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office.po
--- libreoffice-3.6.1~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/officecfg/registry/data/org/openoffice/Office.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+officecfg%2Fregistry%2Fdata%2Forg%2Fopenoffice%2FOffice.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2011-04-07 12:36+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-27 06:54+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -557,7 +557,7 @@
#: WebWizard.xcu#..WebWizard.WebWizard.Filters.ms_documents.Name.value.text
msgid "Microsoft Office documents"
-msgstr "مستندات Microsoft Office"
+msgstr "مستندات مايكروسوفت أوفيس"
#: WebWizard.xcu#..WebWizard.WebWizard.Filters.graphic_files.Name.value.text
msgid "Graphics files"
@@ -5659,7 +5659,7 @@
#: UI.xcu#..UI.FilterClassification.LocalFilters.Classes.msword956.DisplayName.value.text
msgid "Microsoft Word 6.0 / 95"
-msgstr "Microsoft Word 6.0 / 95"
+msgstr "مايكروسوفت وورد 6.0 / 95"
#: UI.xcu#..UI.FilterClassification.LocalFilters.Classes.sw3to5.DisplayName.value.text
msgid "StarWriter 3.0 - 5.0"
@@ -5671,11 +5671,11 @@
#: UI.xcu#..UI.FilterClassification.LocalFilters.Classes.excel456.DisplayName.value.text
msgid "Microsoft Excel 4.x - 5.0 / 95"
-msgstr "Microsoft Excel 4.x - 5.0 / 95"
+msgstr "مايكروسوفت إكسل 4.x - 5.0 / 95"
#: UI.xcu#..UI.FilterClassification.LocalFilters.Classes.excel456templ.DisplayName.value.text
msgid "Microsoft Excel 4.x - 5.0 / 95 Templates"
-msgstr "قوالب Microsoft Excel 4.x - 5.0 / 95"
+msgstr "قوالب مايكروسوفت إكسل 4.x - 5.0 / 95"
#: UI.xcu#..UI.FilterClassification.LocalFilters.Classes.sc345.DisplayName.value.text
msgid "StarCalc 3.0 - 5.0"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/readlicense_oo/docs/readme.po libreoffice-3.6.2~rc2/translations/source/ar/readlicense_oo/docs/readme.po
--- libreoffice-3.6.1~rc2/translations/source/ar/readlicense_oo/docs/readme.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/readlicense_oo/docs/readme.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+readlicense_oo%2Fdocs%2Freadme.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-08-12 14:26+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-27 18:59+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: readme.xrm#Welcome.Welcome.readmeitem.text
@@ -85,7 +85,7 @@
#: readme.xrm#s2s3sdf2.s2s3sdf2.readmeitem.text
msgid "Microsoft Windows 2000 (Service Pack 4 or higher), XP, Vista, or Windows 7"
-msgstr "Microsoft Windows 2000 (Service Pack 4 أو أحدث) أو XP أوVista أو Windows 7"
+msgstr "مايكروسوفت ويندوز 2000 (الحزمة الخدمية 4 أو أحدث) ، XP، فيستا أو ويندوز 7"
#: readme.xrm#utzu6.utzu6.readmeitem.text
msgid "Pentium compatible PC (Pentium III or Athlon recommended)"
@@ -109,7 +109,7 @@
#: readme.xrm#MSOReg1.MSOReg1.readmeitem.text
msgid "Registration of ${PRODUCTNAME} as default application for Microsoft Office formats can be forced or suppressed by using the following command line switches with the installer:"
-msgstr "يمكن فرض تسجيل ${PRODUCTNAME} كتطبيق افتراضي لتنسيقات Microsoft Office أو إيقاف تسجيله باستخدام تبديلات سطور الأوامر التالية مع المثبت:"
+msgstr "يمكن فرض تسجيل ${PRODUCTNAME} كتطبيق افتراضي لتنسيقات مايكروسوفت أوفيس أو إيقاف تسجيله باستخدام تبديلات سطور الأوامر التالية مع المثبت:"
#: readme.xrm#MSOReg2.MSOReg2.readmeitem.text
msgid "REGISTER_ALL_MSO_TYPES=1 will force registration of ${PRODUCTNAME} as default application for Microsoft Office formats."
@@ -349,7 +349,7 @@
#: readme.xrm#linuxlangpackA.linuxlangpackA.readmeitem.text
msgid "Now start one of the ${PRODUCTNAME} applications - Writer, for instance. Go to the Tools menu and choose Options. In the Options dialog box, click on \"Language Settings\" and then click on \"Languages\". Dropdown the \"User interface\" list and select the language you just installed. If you want, do the same thing for the \"Locale setting\", the \"Default currency\", and the \"Default languages for documents\"."
-msgstr "الآن استخدم واحد من تطبيقات ${PRODUCTNAME} - Writer، على سبيل المثال. إذهب إلى قائمة أدوات واختر خيارات. في صندوق حوار الخيارات، انقر على \"إعدادات اللغة\" ومن ثم انقر على \"لغات\". من القائمة المنسدلة \"واجهة المستخدم\" اختر اللغة التي قمت بتنزيلها للتو. إذا أردت، إفعل نفس الشيء للـ \"إعدادات المحلية\"، الـ \"العملة الإفتراضية\"، والـ \"اللغة الإفتراضية للمستندات\"."
+msgstr "الآن استخدم واحد من تطبيقات ${PRODUCTNAME} - راتر، على سبيل المثال. إذهب إلى قائمة أدوات واختر خيارات. في صندوق حوار الخيارات، انقر على \"إعدادات اللغة\" ومن ثم انقر على \"لغات\". من القائمة المنسدلة \"واجهة المستخدم\" اختر اللغة التي قمت بتنزيلها للتو. إذا أردت، إفعل نفس الشيء للـ \"إعدادات المحلية\"، الـ \"العملة الإفتراضية\"، والـ \"اللغة الإفتراضية للمستندات\"."
#: readme.xrm#linuxlangpackB.linuxlangpackB.readmeitem.text
msgid "After adjusting those settings, click on OK. The dialog box will close, and you will see an information message telling you that your changes will only be activated after you exit ${PRODUCTNAME} and start it again (remember to also exit the QuickStarter if it is started)."
@@ -369,11 +369,11 @@
#: readme.xrm#naso.naso.readmeitem.text
msgid "ALPS/Synaptics notebook touchpads in Windows"
-msgstr "لوحات لمس الحاسوب المحمول ALPS/Synaptics في Windows"
+msgstr "لوحات لمس الحاسوب المحمول ALPS/Synaptics في ويندوز"
#: readme.xrm#naso2.naso2.readmeitem.text
msgid "Due to a Windows driver issue, you cannot scroll through ${PRODUCTNAME} documents when you slide your finger across an ALPS/Synaptics touchpad."
-msgstr "بسبب وجود مشكلة في برنامج تشغيل Windows، لا يمكنك التمرير عبر مستندات ${PRODUCTNAME} عند وضع إصبعك على لوحة لمس ALPS/Synaptics."
+msgstr "بسبب وجود مشكلة في برنامج تشغيل ويندوز، لا يمكنك التمرير عبر مستندات ${PRODUCTNAME} عند وضع إصبعك على لوحة لمس ALPS/Synaptics."
#: readme.xrm#naso6.naso6.readmeitem.text
msgid "To enable touchpad scrolling, add the following lines to the \"C:\\Program Files\\Synaptics\\SynTP\\SynTPEnh.ini \" configuration file, and restart your computer:"
@@ -381,7 +381,7 @@
#: readme.xrm#naso8.naso8.readmeitem.text
msgid "The location of the configuration file might vary on different versions of Windows."
-msgstr "قد يختلف موقع ملف التكوين على الإصدارات المختلفة من Windows."
+msgstr "قد يختلف موقع ملف التكوين على الإصدارات المختلفة من ويندوز."
#: readme.xrm#sdfsd32asrc.sdfsd32asrc.readmeitem.text
msgid "Mozilla Address Book Driver"
@@ -429,7 +429,7 @@
#: readme.xrm#pji76w1.pji76w1.readmeitem.text
msgid "When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file \"Mapi\" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit http://www.microsoft.com to search the Microsoft Knowledge Base for \"mapi dll\"."
-msgstr "عند إرسال مستند عبر \"ملف - إرسال - مستند كبريد إلكتروني\" أو \"مستند كمرفق PDF\"، قد تحدث مشكلات (تعطل البرنامج أو توقفه). ويكون ذلك نتيجة ملف نظام Windows \"Mapi\" (واجهة برمجة تطبيقات الرسائل) والذي يتسبب في حدوث مشكلات في بعض إصدارات الملف. ولسوء الحظ، لا يمكن تقييد المشكلة على رقم إصدار معين. للاطلاع على مزيد من المعلومات قم بزيارة http://www.microsoft.com للبحث في قاعدة معارف Microsoft عن \"mapi dll\"."
+msgstr "عند إرسال مستند عبر \"ملف - إرسال - مستند كبريد إلكتروني\" أو \"مستند كمرفق PDF\"، قد تحدث مشكلات (تعطل البرنامج أو توقفه). ويكون ذلك نتيجة ملف نظام ويندوز \"Mapi\" (واجهة برمجة تطبيقات الرسائل) والذي يتسبب في حدوث مشكلات في بعض إصدارات الملف. ولسوء الحظ، لا يمكن تقييد المشكلة على رقم إصدار معين. للاطلاع على مزيد من المعلومات قم بزيارة http://www.microsoft.com للبحث في قاعدة معارف مايكروسوفت عن \"mapi dll\"."
#: readme.xrm#aw22.aw22.readmeitem.text
msgid "Important Accessibility Notes"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/reportbuilder/java/com/sun/star/report/function/metadata.po libreoffice-3.6.2~rc2/translations/source/ar/reportbuilder/java/com/sun/star/report/function/metadata.po
--- libreoffice-3.6.1~rc2/translations/source/ar/reportbuilder/java/com/sun/star/report/function/metadata.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/reportbuilder/java/com/sun/star/report/function/metadata.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+reportbuilder%2Fjava%2Fcom%2Fsun%2Fstar%2Freport%2Ffunction%2Fmetadata.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2012-06-15 07:54+0200\n"
+"PO-Revision-Date: 2012-09-18 15:34+0200\n"
"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Accelerator-Marker: ~\n"
#: Author_Function_en_US.properties#display_name.property.text
@@ -37,4 +37,4 @@
#: category_en_US.properties#description.property.text
msgid "Contains functions about meta data"
-msgstr ""
+msgstr "يحتوي وظائف عن بيانات تعريفية"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/reportbuilder/registry/data/org/openoffice/Office.po libreoffice-3.6.2~rc2/translations/source/ar/reportbuilder/registry/data/org/openoffice/Office.po
--- libreoffice-3.6.1~rc2/translations/source/ar/reportbuilder/registry/data/org/openoffice/Office.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/reportbuilder/registry/data/org/openoffice/Office.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+reportbuilder%2Fregistry%2Fdata%2Forg%2Fopenoffice%2FOffice.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-04-07 12:37+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-09-03 10:30+0200\n"
+"Last-Translator: Faisal \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@
#: ExtendedColorScheme.xcu#.ExtendedColorScheme.EntryNames.SunReportBuilder.DisplayName.value.text
msgid "Oracle Report Builder"
-msgstr "Oracle Report Builder"
+msgstr "منشئ تقرير Oracle"
#: ExtendedColorScheme.xcu#.ExtendedColorScheme.EntryNames.SunReportBuilder.Entries.ReportHeader.DisplayName.value.text
msgid "Report Header"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/reportbuilder/util.po libreoffice-3.6.2~rc2/translations/source/ar/reportbuilder/util.po
--- libreoffice-3.6.1~rc2/translations/source/ar/reportbuilder/util.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/reportbuilder/util.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,20 +4,21 @@
"Project-Id-Version: LibO 350-l10n\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+reportbuilder%2Futil.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2011-10-07 14:44+0200\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2012-09-18 15:38+0200\n"
+"Last-Translator: safa \n"
"Language-Team: none\n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
msgid "Report Builder"
-msgstr ""
+msgstr "بنّاء التقرير"
#: description.xml#extdesc.extdesc.description.text
msgid "Use the Report Builder to create stylish, smart-looking database reports. The flexible report editor can define group and page headers as well as group and page footers. Additionally, calculation fields are available to accomplish complex database reports.\n"
-msgstr ""
+msgstr "استخدم بنّاء التقرير لإنشاء تقارير قواعد بيانات أنيقة وجذابة. محرر التقرير المرن يمكنه أن يعرّف مجموعة وترويسات صفحة كمجموعة وتذاييل الصفحة. بالإضافة إلى ذلك، حقول الحساب متوفرة لتقارير قواعد البيانات المعقدة المُنجزة.\n"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/dbgui.po libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/dbgui.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/dbgui.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/dbgui.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sc%2Fsource%2Fui%2Fdbgui.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-08 18:19+0200\n"
+"PO-Revision-Date: 2012-09-18 15:39+0200\n"
"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -652,9 +652,8 @@
msgstr "ال~تحديد الحالي"
#: dapitype.src#RID_SCDLG_DAPITYPE.BTN_NAMED_RANGE.radiobutton.text
-#, fuzzy
msgid "~Named range"
-msgstr "~مجال مسمى"
+msgstr "مجال م~سمى"
#: dapitype.src#RID_SCDLG_DAPITYPE.BTN_DATABASE.radiobutton.text
msgid "~Data source registered in %PRODUCTNAME"
@@ -757,7 +756,7 @@
#: imoptdlg.src#RID_SCDLG_IMPORTOPT.CB_FORMULAS.checkbox.text
msgid "Save cell fo~rmulas instead of calculated values"
-msgstr ""
+msgstr "احفظ معادلات الخلية بدل من القيم المحسوبة"
#: imoptdlg.src#RID_SCDLG_IMPORTOPT.CB_QUOTEALL.checkbox.text
msgid "~Quote all text cells"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/navipi.po libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/navipi.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/navipi.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/navipi.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: navipi.src#RID_SCDLG_NAVIGATOR.FT_ROW.fixedtext.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/optdlg.po libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/optdlg.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/optdlg.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/optdlg.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sc%2Fsource%2Fui%2Foptdlg.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-07-11 11:16+0200\n"
-"Last-Translator: abdulmajeed \n"
+"PO-Revision-Date: 2012-09-18 15:41+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
+"X-Generator: Pootle 2.1.6\n"
"X-Accelerator-Marker: ~\n"
#: calcoptionsdlg.src#RID_SCDLG_FORMULA_CALCOPTIONS.FT_OPTION_EDIT_CAPTION.fixedtext.text
@@ -21,7 +21,7 @@
#: calcoptionsdlg.src#RID_SCDLG_FORMULA_CALCOPTIONS.STR_STRING_REF_SYNTAX_CAPTION.string.text
msgid "Reference syntax for string reference"
-msgstr ""
+msgstr "مرجع صياغة لمرجع السلسلة الحرفية"
#: calcoptionsdlg.src#RID_SCDLG_FORMULA_CALCOPTIONS.STR_STRING_REF_SYNTAX_DESC.string.text
msgid "Formula syntax to use when parsing references given in string parameters. This affects built-in functions such as INDIRECT that takes a reference as a string value."
@@ -29,7 +29,7 @@
#: calcoptionsdlg.src#RID_SCDLG_FORMULA_CALCOPTIONS.STR_USE_FORMULA_SYNTAX.string.text
msgid "Use formula syntax"
-msgstr ""
+msgstr "استخدام صياغة الصيغة"
#: calcoptionsdlg.src#RID_SCDLG_FORMULA_CALCOPTIONS.modaldialog.text
msgid "Detailed Calculation Settings"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/src.po libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/src.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/src.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/src.po 2012-09-25 12:13:31.000000000 +0000
@@ -3,9 +3,9 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sc%2Fsource%2Fui%2Fsrc.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-07-24 12:44+0200\n"
-"Last-Translator: abdulmajeed \n"
+"POT-Creation-Date: 2012-07-13 20:41+0200\n"
+"PO-Revision-Date: 2012-09-18 16:03+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@
#: namedlg.src#RID_SCDLG_NAMES.RB_ASSIGN.imagebutton.quickhelptext
msgctxt "namedlg.src#RID_SCDLG_NAMES.RB_ASSIGN.imagebutton.quickhelptext"
msgid "Shrink"
-msgstr "تقلصر"
+msgstr "تقلص"
#: namedlg.src#RID_SCDLG_NAMES.BTN_MORE.checkbox.text
msgctxt "namedlg.src#RID_SCDLG_NAMES.BTN_MORE.checkbox.text"
@@ -228,7 +228,6 @@
msgstr "القيمة 0 متطابقة مع 01/01/19044"
#: optdlg.src#RID_SCPAGE_CALC.GB_DATE.fixedline.text
-#, fuzzy
msgctxt "optdlg.src#RID_SCPAGE_CALC.GB_DATE.fixedline.text"
msgid "Date"
msgstr "التاريخ"
@@ -304,7 +303,7 @@
#: optdlg.src#RID_SCPAGE_FORMULA.BTN_CUSTOM_CALC_CUSTOM.radiobutton.text
msgid "Custom"
-msgstr ""
+msgstr "مخصص"
#: optdlg.src#RID_SCPAGE_FORMULA.BTN_CUSTOM_CALC_DETAILS.pushbutton.text
msgid "Details..."
@@ -418,7 +417,7 @@
#: optdlg.src#RID_SCPAGE_CONTENT.CB_GUIDELINE.checkbox.text
msgid "Helplines ~While Moving"
-msgstr ""
+msgstr "أسطر مساعدة أ~ثناء التحرك"
#: optdlg.src#RID_SCPAGE_CONTENT.GB_DISPLAY.fixedline.text
msgid "Display"
@@ -674,7 +673,7 @@
#: optdlg.src#RID_SCPAGE_DEFAULTS.FT_SHEETPREFIX.fixedtext.text
msgid "Prefix name for new worksheet"
-msgstr ""
+msgstr "اسم بادئة لورقة العمل الجديدة"
#: scerrors.src#RID_ERRHDLSC.SCERR_IMPORT_CONNECT___ERRCODE_RES_MASK.string.text
msgid "Impossible to connect to the file."
@@ -706,11 +705,11 @@
#: scerrors.src#RID_ERRHDLSC.SCERR_IMPORT_UNKNOWN_BIFF___ERRCODE_RES_MASK.string.text
msgid "Unknown or unsupported Excel file format."
-msgstr "تنسيق ملف Excel غير مدعوم أو غير معروف."
+msgstr "تنسيق ملف إكسل غير مدعوم أو غير معروف."
#: scerrors.src#RID_ERRHDLSC.SCERR_IMPORT_NI_BIFF___ERRCODE_RES_MASK.string.text
msgid "Excel file format not yet implemented."
-msgstr "لم يتم تنفيذ تنسيق ملف Excel بعد."
+msgstr "لم يتم تنفيذ تنسيق ملف إكسل بعد."
#: scerrors.src#RID_ERRHDLSC.SCERR_IMPORT_FILEPASSWD___ERRCODE_RES_MASK.string.text
msgid "This file is password-protected."
@@ -775,6 +774,9 @@
"\n"
"Please be warned that re-saving this document will permanently delete those sheets that have not been loaded!"
msgstr ""
+"لم تحمّل كل الأوراق لأن عدد الأوراق الأقصى تجاوز حده.\n"
+"\n"
+"يرجى الحذر عن أن إعادة حفظ هذا المستند ستمحي هذه الأوراق الغير محمّلة باستمرار!"
#: scerrors.src#RID_ERRHDLSC.SCWARN_IMPORT_CELL_OVERFLOW___ERRCODE_RES_MASK.string.text
msgid "The data could not be loaded completely because the maximum number of characters per cell was exceeded."
@@ -805,12 +807,16 @@
"The document contains more columns than supported in the selected format.\n"
"Additional columns were not saved."
msgstr ""
+"المستند يحتوي أعمدة أكثر من المدعومة في الهيئة المختارة.\n"
+"الأعمدة الإضافية لن تحفظ."
#: scerrors.src#RID_ERRHDLSC.SCWARN_EXPORT_MAXTAB___ERRCODE_RES_MASK.string.text
msgid ""
"The document contains more sheets than supported in the selected format.\n"
"Additional sheets were not saved."
msgstr ""
+"المستند يحتوي أوراق أكثر من المدعومة في الهيئة المختارة.\n"
+"الأوراق الإضافية لن تحفظ."
#: scerrors.src#RID_ERRHDLSC.SCWARN_IMPORT_INFOLOST___ERRCODE_RES_MASK.string.text
msgid ""
@@ -965,13 +971,11 @@
msgstr "تحسين نتيجة إلى"
#: optsolver.src#RID_SCDLG_OPTSOLVER.RB_MAX.radiobutton.text
-#, fuzzy
msgctxt "optsolver.src#RID_SCDLG_OPTSOLVER.RB_MAX.radiobutton.text"
msgid "Maximum"
msgstr "الأقصى"
#: optsolver.src#RID_SCDLG_OPTSOLVER.RB_MIN.radiobutton.text
-#, fuzzy
msgctxt "optsolver.src#RID_SCDLG_OPTSOLVER.RB_MIN.radiobutton.text"
msgid "Minimum"
msgstr "الأدنى"
@@ -1277,7 +1281,7 @@
#: optsolver.src#RID_SCDLG_SOLVER_PROGRESS.modelessdialog.text
msgid "Solving..."
-msgstr "جارٍ الحل..."
+msgstr "يحلّ..."
#: optsolver.src#RID_SCDLG_SOLVER_NOSOLUTION.FT_NOSOLUTION.fixedtext.text
msgid "No solution was found."
@@ -1311,10 +1315,6 @@
msgid "Solving Result"
msgstr "نتيجة الحل"
-#: datafdlg.src#RID_SCDLG_DATAFORM.LAB_DATAFORM_RECORDNO.fixedtext.text
-msgid "/"
-msgstr "/"
-
#: datafdlg.src#RID_SCDLG_DATAFORM.BTN_DATAFORM_NEW.pushbutton.text
msgid "New"
msgstr "جديد"
@@ -2011,7 +2011,7 @@
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATEDIF.1.string.text
msgid "Returns the number of whole days, months or years between 'start date' and 'end date'."
-msgstr ""
+msgstr "يرجع عدد الأيام . الشهور أو السنين كاملة بين \"تاريخ البدء\" و \"تاريخ الانتهاء\"."
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATEDIF.2.string.text
msgid "Start date"
@@ -2035,7 +2035,7 @@
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATEDIF.7.string.text
msgid "Interval to be calculated. Can be \"d\", \"m\", \"y\", \"ym\", \"md\" or \"yd\"."
-msgstr ""
+msgstr "فترة للحساب. يمكن أن تكون \"d\" ،\"m\" ،\"y\" ،\"ym\" ،\"md\" أو \"yd\"."
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_WEEK.1.string.text
msgid "Calculates the calendar week corresponding to the given date."
@@ -3612,7 +3612,7 @@
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_ARC_COS_HYP.3.string.text
msgid "A value greater than or equal to 1 for which the inverse hyperbolic cosine is to be returned."
-msgstr ""
+msgstr "قيمة أكبر من أو تساوي 1 التي سيرجعها جيب التمام العكسي لقطع زائد."
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_ARC_SIN_HYP.1.string.text
msgid "Returns the inverse hyperbolic sine of a number."
@@ -3813,9 +3813,8 @@
msgstr "زاوية"
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_COSECANT.3.string.text
-#, fuzzy
msgid "The angle in radians for which the cosecant is to be calculated."
-msgstr "الزاوية بالراديان المراد معرفة جيبها."
+msgstr "الزاوية بالراديان المراد حساب قاطع تمامها."
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_SECANT.1.string.text
msgid "Return the secant of an angle. SEC(x)=1/COS(x)"
@@ -3827,9 +3826,8 @@
msgstr "زاوية"
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_SECANT.3.string.text
-#, fuzzy
msgid "The angle in radians for which the secant is to be calculated."
-msgstr "الزاوية بالراديان المراد معرفة جيبها."
+msgstr "الزاوية بالراديان المراد حساب قاطعها."
#: scfuncs.src#RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_COSECANT_HYP.1.string.text
msgid "Return the hyperbolic cosecant of a hyperbolic angle. CSCH(x)=1/SINH(x)"
@@ -9287,7 +9285,7 @@
"Do you want to accept the correction proposed below?\n"
"\n"
msgstr ""
-"عثر %PRODUCTNAME Calc على خطأ في الصيغة المدخلة. \n"
+"عثر %PRODUCTNAME كالك على خطأ في الصيغة المدخلة. \n"
"هل ترغب في قبول التصحيح المقترح أدناه؟\n"
"\n"
@@ -9529,15 +9527,15 @@
#: scstring.src#SCSTR_FORMULA_SYNTAX_CALC_A1.string.text
msgid "Calc A1"
-msgstr "Calc A1"
+msgstr "كالك A1"
#: scstring.src#SCSTR_FORMULA_SYNTAX_XL_A1.string.text
msgid "Excel A1"
-msgstr "Excel A1"
+msgstr "إكسل A1"
#: scstring.src#SCSTR_FORMULA_SYNTAX_XL_R1C1.string.text
msgid "Excel R1C1"
-msgstr "Excel R1C1"
+msgstr "إكسل R1C1"
#: simpref.src#RID_SCDLG_SIMPLEREF.FT_ASSIGN.fixedtext.text
msgid "Area"
@@ -9942,7 +9940,7 @@
#: sc.src#RID_APPTITLE.string.text
msgctxt "sc.src#RID_APPTITLE.string.text"
msgid "%PRODUCTNAME Calc"
-msgstr "%PRODUCTNAME Calc"
+msgstr "%PRODUCTNAME كالك"
#: scwarngs.src#RID_WRNHDLSC.ERRCODE_SC_EXPORT_WRN_ASCII___SH_MAX.string.text
msgid "Only the active sheet could be saved."
@@ -10534,7 +10532,7 @@
#: globstr.src#RID_GLOBSTR.STR_MSSG_DOSUBTOTALS_0.string.text
msgctxt "globstr.src#RID_GLOBSTR.STR_MSSG_DOSUBTOTALS_0.string.text"
msgid "%PRODUCTNAME Calc"
-msgstr "%PRODUCTNAME Calc"
+msgstr "%PRODUCTNAME كالك"
#: globstr.src#RID_GLOBSTR.STR_MSSG_DOSUBTOTALS_1.string.text
msgid "Delete data?"
@@ -11417,11 +11415,11 @@
#: globstr.src#RID_GLOBSTR.STR_MSSG_SEARCHANDREPLACE_1.string.text
msgid "%PRODUCTNAME Calc has searched to the beginning of the sheet. Do you want to continue at the end?"
-msgstr "قام %PRODUCTNAME Calc بالبحث حتى بداية الورقة. هل تريد متابعة البحث عند نهاية الورقة؟"
+msgstr "قام %PRODUCTNAME كالك بالبحث حتى بداية الورقة. هل تريد متابعة البحث عند نهاية الورقة؟"
#: globstr.src#RID_GLOBSTR.STR_MSSG_SEARCHANDREPLACE_2.string.text
msgid "%PRODUCTNAME Calc has searched to the end of the sheet. Do you want to continue at the beginning?"
-msgstr "قام %PRODUCTNAME Calc بالبحث حتى نهاية الورقة. هل تريد متابعة البحث عند بداية الورقة؟"
+msgstr "قام %PRODUCTNAME كالك بالبحث حتى نهاية الورقة. هل تريد متابعة البحث عند بداية الورقة؟"
#: globstr.src#RID_GLOBSTR.STR_MSSG_SEARCHANDREPLACE_3.string.text
msgid "Find & Replace"
@@ -11429,11 +11427,11 @@
#: globstr.src#RID_GLOBSTR.STR_MSSG_SEARCHANDREPLACE_4.string.text
msgid "%PRODUCTNAME Calc has searched to the beginning of the document. Do you want to continue at the end?"
-msgstr "قام %PRODUCTNAME Calc بالبحث حتى بداية المستند. هل تريد متابعة البحث عند نهاية المستند؟"
+msgstr "قام %PRODUCTNAME كالك بالبحث حتى بداية المستند. هل تريد متابعة البحث عند نهاية المستند؟"
#: globstr.src#RID_GLOBSTR.STR_MSSG_SEARCHANDREPLACE_5.string.text
msgid "%PRODUCTNAME Calc has searched to the end of the document. Do you want to continue at the beginning?"
-msgstr "قام %PRODUCTNAME Calc بالبحث حتى نهاية المستند. هل تريد متابعة البحث عند بداية المستند؟"
+msgstr "قام %PRODUCTNAME كالك بالبحث حتى نهاية المستند. هل تريد متابعة البحث عند بداية المستند؟"
#: globstr.src#RID_GLOBSTR.STR_CREATENAME_REPLACE.string.text
msgid "Replace existing definition of #?"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/styleui.po libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/styleui.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sc/source/ui/styleui.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sc/source/ui/styleui.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: scstyles.src#DLG_STYLE_DESIGNER.Cell_Styles.sfxstylefamilyitem.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scaddins/source/analysis.po libreoffice-3.6.2~rc2/translations/source/ar/scaddins/source/analysis.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scaddins/source/analysis.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scaddins/source/analysis.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: analysis_funcnames.src#RID_ANALYSIS_FUNCTION_NAMES.ANALYSIS_FUNCNAME_Workday.string.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/accessories.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/accessories.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/accessories.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/accessories.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: module_samples_accessories.ulf#STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES.LngText.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/activex.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/activex.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/activex.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/activex.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Factivex.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-04-07 12:38+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-27 06:59+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -21,4 +21,4 @@
#: module_activex.ulf#STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL.LngText.text
msgid "Component to enable Microsoft Internet Explorer to display %PRODUCTNAME documents."
-msgstr "مُحتوى لتمكين Microsoft Internet Explorer من عرض وثائق %PRODUCTNAME."
+msgstr "مُحتوى لتمكين مايكروسوفت إنترنت إكسبلورر من عرض وثائق %PRODUCTNAME."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/calc.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/calc.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/calc.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/calc.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fcalc.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-08-12 06:20+0200\n"
-"Last-Translator: Kareem \n"
+"PO-Revision-Date: 2012-08-27 19:15+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: registryitem_calc.ulf#STR_REG_VAL_NEW.LngText.text
@@ -37,28 +37,27 @@
#: registryitem_calc.ulf#STR_REG_VAL_MS_EXCEL_WORKSHEET_OLD.LngText.text
msgid "Microsoft Excel 97-2003 Worksheet"
-msgstr "ورقة عمل Microsoft Excel 97-2003"
+msgstr "ورقة عمل مايكروسوفت إكسل 97-2003"
#: registryitem_calc.ulf#STR_REG_VAL_MS_EXCEL_WORKSHEET.LngText.text
msgid "Microsoft Excel Worksheet"
-msgstr "ورقة عمل Microsoft Excel"
+msgstr "ورقة عمل مايكروسوفت إكسل"
#: registryitem_calc.ulf#STR_REG_VAL_MS_EXCEL_TEMPLATE_OLD.LngText.text
msgid "Microsoft Excel 97-2003 Template"
-msgstr "قالب Microsoft Excel 97-2003"
+msgstr "قالب مايكروسوفت إكسل 97-2003"
#: registryitem_calc.ulf#STR_REG_VAL_MS_EXCEL_TEMPLATE.LngText.text
msgid "Microsoft Excel Template"
-msgstr "قالب Microsoft Excel"
+msgstr "قالب مايكروسوفت إكسل"
#: module_calc.ulf#STR_NAME_MODULE_PRG_CALC.LngText.text
msgid "%PRODUCTNAME Calc"
-msgstr "%PRODUCTNAME Calc"
+msgstr "%PRODUCTNAME كالك"
#: module_calc.ulf#STR_DESC_MODULE_PRG_CALC.LngText.text
-#, fuzzy
msgid "Perform calculations, analyze information and manage lists in spreadsheets by using %PRODUCTNAME Calc."
-msgstr "إنجاز العمليات الحسابية، وتحليل المعلومات وإدارة القوائم في جداول البيانات باستخدام %PRODUCTNAME Calc."
+msgstr "إنجاز العمليات الحسابية، وتحليل المعلومات وإدارة القوائم في جداول البيانات باستخدام %PRODUCTNAME كالك."
#: module_calc.ulf#STR_NAME_MODULE_PRG_CALC_BIN.LngText.text
msgid "Program Module"
@@ -66,15 +65,15 @@
#: module_calc.ulf#STR_DESC_MODULE_PRG_CALC_BIN.LngText.text
msgid "The application %PRODUCTNAME Calc"
-msgstr "التطبيق %PRODUCTNAME Calc"
+msgstr "التطبيق %PRODUCTNAME كالك"
#: module_calc.ulf#STR_NAME_MODULE_PRG_CALC_HELP.LngText.text
msgid "%PRODUCTNAME Calc Help"
-msgstr "مساعدة %PRODUCTNAME Calc"
+msgstr "مساعدة %PRODUCTNAME كالك"
#: module_calc.ulf#STR_DESC_MODULE_PRG_CALC_HELP.LngText.text
msgid "Help about %PRODUCTNAME Calc"
-msgstr "مساعدة حول %PRODUCTNAME Calc"
+msgstr "مساعدة حول %PRODUCTNAME كالك"
#: module_calc.ulf#STR_NAME_MODULE_OPTIONAL_ADDINS.LngText.text
msgid "Add-in"
@@ -82,13 +81,12 @@
#: module_calc.ulf#STR_DESC_MODULE_OPTIONAL_ADDINS.LngText.text
msgid "Add-ins are additional programs that make new functions available in %PRODUCTNAME Calc."
-msgstr "الأدوات الإضافية هي برامج إضافية توفر وظائف جديدة في %PRODUCTNAME Calc."
+msgstr "الأدوات الإضافية هي برامج إضافية توفر وظائف جديدة في %PRODUCTNAME كالك."
#: folderitem_calc.ulf#STR_FI_NAME_TABELLENDOKUMENT.LngText.text
msgid "Spreadsheet"
msgstr "جدول بيانات"
#: folderitem_calc.ulf#STR_FI_TOOLTIP_CALC.LngText.text
-#, fuzzy
msgid "Perform calculations, analyze information and manage lists in spreadsheets by using Calc."
-msgstr "إنجاز العمليات الحسابية، وتحليل المعلومات وإدارة القوائم في جداول البيانات باستخدام Calc."
+msgstr "إنجاز العمليات الحسابية، وتحليل المعلومات وإدارة القوائم في جداول البيانات باستخدام كالك."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/draw.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/draw.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/draw.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/draw.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fdraw.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-07-02 09:33+0200\n"
+"PO-Revision-Date: 2012-08-27 19:10+0200\n"
"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -21,7 +21,7 @@
#: folderitem_draw.ulf#STR_FI_TOOLTIP_DRAW.LngText.text
msgid "Create and edit drawings, flow charts, and logos by using Draw."
-msgstr "إنشاء الرسوم وتحريرها، ورسوم الدفق البيانية، والشعارات باستخدام Draw."
+msgstr "إنشاء الرسوم وتحريرها، ورسوم الدفق البيانية، والشعارات باستخدام درو."
#: registryitem_draw.ulf#STR_REG_VAL_NEW.LngText.text
msgid "&New"
@@ -53,11 +53,11 @@
#: module_draw.ulf#STR_NAME_MODULE_PRG_DRAW.LngText.text
msgid "%PRODUCTNAME Draw"
-msgstr "%PRODUCTNAME Draw"
+msgstr "%PRODUCTNAME درو"
#: module_draw.ulf#STR_DESC_MODULE_PRG_DRAW.LngText.text
msgid "Create and edit drawings, flow charts, and logos by using %PRODUCTNAME Draw."
-msgstr "إنشاء الرسومات وتحريرها، والمخططات الانسيابية، والشعارات باستخدام %PRODUCTNAME Draw."
+msgstr "إنشاء الرسومات وتحريرها، والمخططات الانسيابية، والشعارات باستخدام %PRODUCTNAME درو."
#: module_draw.ulf#STR_NAME_MODULE_PRG_DRAW_BIN.LngText.text
msgid "Program Module"
@@ -65,12 +65,12 @@
#: module_draw.ulf#STR_DESC_MODULE_PRG_DRAW_BIN.LngText.text
msgid "The application %PRODUCTNAME Draw"
-msgstr "التطبيق %PRODUCTNAME Draw"
+msgstr "التطبيق %PRODUCTNAME درو"
#: module_draw.ulf#STR_NAME_MODULE_PRG_DRAW_HELP.LngText.text
msgid "%PRODUCTNAME Draw Help"
-msgstr "مساعدة %PRODUCTNAME Draw"
+msgstr "مساعدة %PRODUCTNAME درو"
#: module_draw.ulf#STR_DESC_MODULE_PRG_DRAW_HELP.LngText.text
msgid "Help about %PRODUCTNAME Draw"
-msgstr "مساعدة حول %PRODUCTNAME Draw"
+msgstr "مساعدة حول %PRODUCTNAME درو"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/impress.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/impress.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/impress.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/impress.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fimpress.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-13 14:42+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 19:08+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@
#: module_impress.ulf#STR_NAME_MODULE_PRG_IMPRESS.LngText.text
msgid "%PRODUCTNAME Impress"
-msgstr "%PRODUCTNAME Impress"
+msgstr "%PRODUCTNAME امبريس"
#: module_impress.ulf#STR_DESC_MODULE_PRG_IMPRESS.LngText.text
msgid "Create and edit presentations for slideshows, meeting and Web pages by using %PRODUCTNAME Impress."
-msgstr "إنشاء العروض التقديمية لعروض الشرائح، والاجتماعات وصفحات ويب وتحريرها باستخدام %PRODUCTNAME Impress."
+msgstr "إنشاء العروض التقديمية لعروض الشرائح، والاجتماعات وصفحات ويب وتحريرها باستخدام %PRODUCTNAME امبريس."
#: module_impress.ulf#STR_NAME_MODULE_PRG_IMPRESS_BIN.LngText.text
msgid "Program Module"
@@ -29,23 +29,23 @@
#: module_impress.ulf#STR_DESC_MODULE_PRG_IMPRESS_BIN.LngText.text
msgid "The application %PRODUCTNAME Impress"
-msgstr "التطبيق %PRODUCTNAME Impress"
+msgstr "التطبيق %PRODUCTNAME امبريس"
#: module_impress.ulf#STR_NAME_MODULE_PRG_IMPRESS_HELP.LngText.text
msgid "%PRODUCTNAME Impress Help"
-msgstr "مساعدة %PRODUCTNAME Impress"
+msgstr "مساعدة %PRODUCTNAME امبريس"
#: module_impress.ulf#STR_DESC_MODULE_PRG_IMPRESS_HELP.LngText.text
msgid "Help about %PRODUCTNAME Impress"
-msgstr "مساعدة حول %PRODUCTNAME Impress"
+msgstr "مساعدة حول %PRODUCTNAME امبريس"
#: module_ogltrans.ulf#STR_NAME_MODULE_OPTIONAL_OGLTRANS.LngText.text
msgid "OpenGL slide transitions for %PRODUCTNAME Impress"
-msgstr "فترات انتقال شريحة OpenGL لـ %PRODUCTNAME Impress"
+msgstr "فترات انتقال شريحة OpenGL لـ %PRODUCTNAME امبريس"
#: module_ogltrans.ulf#STR_DESC_MODULE_MODULE_OPTIONAL_OGLTRANS.LngText.text
msgid "OpenGL slide transitions for %PRODUCTNAME Impress."
-msgstr "فترات انتقال شريحة OpenGL لـ %PRODUCTNAME Impress."
+msgstr "فترات انتقال شريحة OpenGL لـ %PRODUCTNAME امبريس."
#: folderitem_impress.ulf#STR_FI_NAME_PRAESENTATION.LngText.text
msgid "Presentation"
@@ -53,7 +53,7 @@
#: folderitem_impress.ulf#STR_FI_TOOLTIP_IMPRESS.LngText.text
msgid "Create and edit presentations for slideshows, meeting and Web pages by using Impress."
-msgstr "تحرير العروض التقديمية لعروض الشرائح، والاجتماعات وصفحات ويب وإنشاؤها باستخدام Impress."
+msgstr "تحرير العروض التقديمية لعروض الشرائح، والاجتماعات وصفحات ويب وإنشاؤها باستخدام امبريس."
#: registryitem_impress.ulf#STR_REG_VAL_NEW.LngText.text
msgid "&New"
@@ -81,20 +81,20 @@
#: registryitem_impress.ulf#STR_REG_VAL_MS_POWERPOINT_PRESENTATION_OLD.LngText.text
msgid "Microsoft PowerPoint 97-2003 Presentation"
-msgstr "عرض تقديمي Microsoft PowerPoint 97-2003"
+msgstr "عرض مايكروسوفت باوربوينت 97-2003 تقديمي"
#: registryitem_impress.ulf#STR_REG_VAL_MS_POWERPOINT_SHOW.LngText.text
msgid "Microsoft PowerPoint Show"
-msgstr "عرض Microsoft PowerPoint"
+msgstr "عرض مايكروسوفت باوربوينت"
#: registryitem_impress.ulf#STR_REG_VAL_MS_POWERPOINT_PRESENTATION.LngText.text
msgid "Microsoft PowerPoint Presentation"
-msgstr "عرض تقديمي لـ Microsoft PowerPoint"
+msgstr "عرض مايكروسوفت باوربوينت تقديمي"
#: registryitem_impress.ulf#STR_REG_VAL_MS_POWERPOINT_TEMPLATE_OLD.LngText.text
msgid "Microsoft PowerPoint 97-2003 Template"
-msgstr "قالب Microsoft PowerPoint 97-2003"
+msgstr "قالب مايكروسوفت باوربوينت 97-2003"
#: registryitem_impress.ulf#STR_REG_VAL_MS_POWERPOINT_TEMPLATE.LngText.text
msgid "Microsoft PowerPoint Template"
-msgstr "قالب Microsoft PowerPoint"
+msgstr "قالب مايكروسوفت باوربوينت"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/javafilter.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/javafilter.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/javafilter.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/javafilter.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fjavafilter.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2011-04-07 12:38+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-27 19:16+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -80,19 +80,19 @@
#: registryitem_javafilter.ulf#STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020_.LngText.text
msgid "%PRODUCTNAME Writer"
-msgstr "%PRODUCTNAME Writer"
+msgstr "%PRODUCTNAME رايتر"
#: registryitem_javafilter.ulf#STR_VALUE__BDD611C3_7BAB_460F_8711_5B9AC9EF6020__PEGASUSFILTER_DESCRIPTION.LngText.text
msgid "%PRODUCTNAME Writer XML Document"
-msgstr "مستند %PRODUCTNAME Writer XML"
+msgstr "مستند %PRODUCTNAME رايتر XML"
#: registryitem_javafilter.ulf#STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C_.LngText.text
msgid "%PRODUCTNAME Calc"
-msgstr "%PRODUCTNAME Calc"
+msgstr "%PRODUCTNAME كالك"
#: registryitem_javafilter.ulf#STR_VALUE__C6AB3E74_9F4F_4370_8120_A8A6FABB7A7C__PEGASUSFILTER_DESCRIPTION.LngText.text
msgid "%PRODUCTNAME Calc XML Document"
-msgstr "مستند %PRODUCTNAME Calc XML"
+msgstr "مستند %PRODUCTNAME كالك XML"
#: registryitem_javafilter.ulf#STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439_.LngText.text
msgctxt "registryitem_javafilter.ulf#STR_VALUE__CB43F086_838D_4FA4_B5F6_3406B9A57439_.LngText.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/math.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/math.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/math.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/math.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fmath.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-13 14:42+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 19:04+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -17,11 +17,11 @@
#: module_math.ulf#STR_NAME_MODULE_PRG_MATH.LngText.text
msgid "%PRODUCTNAME Math"
-msgstr "%PRODUCTNAME Math"
+msgstr "%PRODUCTNAME ماث"
#: module_math.ulf#STR_DESC_MODULE_PRG_MATH.LngText.text
msgid "Create and edit scientific formulas and equations by using %PRODUCTNAME Math."
-msgstr "إنشاء الصيغ والمعادلات وتحريرها باستخدام %PRODUCTNAME Math."
+msgstr "إنشاء الصيغ والمعادلات وتحريرها باستخدام %PRODUCTNAME ماث."
#: module_math.ulf#STR_NAME_MODULE_PRG_MATH_BIN.LngText.text
msgid "Program Module"
@@ -29,15 +29,15 @@
#: module_math.ulf#STR_DESC_MODULE_PRG_MATH_BIN.LngText.text
msgid "The application %PRODUCTNAME Math"
-msgstr "التطبيق %PRODUCTNAME Math"
+msgstr "التطبيق %PRODUCTNAME ماث"
#: module_math.ulf#STR_NAME_MODULE_PRG_MATH_HELP.LngText.text
msgid "%PRODUCTNAME Math Help"
-msgstr "مساعدة %PRODUCTNAME Math"
+msgstr "مساعدة %PRODUCTNAME ماث"
#: module_math.ulf#STR_DESC_MODULE_PRG_MATH_HELP.LngText.text
msgid "Help about %PRODUCTNAME Math"
-msgstr "مساعدة حول %PRODUCTNAME Math"
+msgstr "مساعدة حول %PRODUCTNAME ماث"
#: registryitem_math.ulf#STR_REG_VAL_NEW.LngText.text
msgid "&New"
@@ -53,4 +53,4 @@
#: folderitem_math.ulf#STR_FI_TOOLTIP_MATH.LngText.text
msgid "Create and edit scientific formulas and equations by using Math."
-msgstr "إنشاء الصيغ العلمية والمعادلات وتحريرها باستخدام Math."
+msgstr "إنشاء الصيغ العلمية والمعادلات وتحريرها باستخدام ماث."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/ooo.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/ooo.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/ooo.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/ooo.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fooo.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2012-08-12 14:28+0200\n"
+"PO-Revision-Date: 2012-09-07 13:39+0200\n"
"Last-Translator: Faisal \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -1413,11 +1413,11 @@
msgid "Polish spelling dictionary, hyphenation rules, and thesaurus"
msgstr "قاموس التدقيق الإملائي وقواعد الواصلة وقاموس المترادفات للغة البولندية"
-#: module_ooo.ulf#STR_NAME_MODULE_EXTENSION_DICTIONARY_PT.LngText.text
+#: module_ooo.ulf#STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_BR.LngText.text
msgid "Brazilian Portuguese"
msgstr "البرتغالية البرازيلية"
-#: module_ooo.ulf#STR_DESC_MODULE_EXTENSION_DICTIONARY_PT.LngText.text
+#: module_ooo.ulf#STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_BR.LngText.text
msgid "Brazilian Portuguese spelling Dictionary (1990 Spelling Agreement), and hyphenation rules"
msgstr ""
@@ -2476,8 +2476,9 @@
msgstr "الجالية اﻻسكوتلندية"
#: module_langpack.ulf#STR_DESC_MODULE_LANGPACK_GD.LngText.text
+#, fuzzy
msgid "Installs the Scottish Gaelic user interface"
-msgstr ""
+msgstr "يُثبّت واجهة المستخدم السنهالية"
#: module_langpack.ulf#STR_NAME_MODULE_LANGPACK_KK.LngText.text
msgctxt "module_langpack.ulf#STR_NAME_MODULE_LANGPACK_KK.LngText.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/stdlibs.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/stdlibs.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/stdlibs.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/stdlibs.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: module_stdlibs.ulf#STR_NAME_MODULE_OPTIONAL_STDLIBS.LngText.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/winexplorerext.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/winexplorerext.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/winexplorerext.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/winexplorerext.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fwinexplorerext.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2011-04-07 12:38+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-27 18:55+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@
#: module_winexplorerext.ulf#STR_NAME_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS.LngText.text
msgid "Windows Explorer Extension"
-msgstr "امتداد مستكشف Windows"
+msgstr "امتداد ويندوز إكسبلورر"
#: module_winexplorerext.ulf#STR_DESC_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS.LngText.text
msgid "Enables the Microsoft Windows Explorer to show information about %PRODUCTNAME documents, such as thumbnail previews."
-msgstr "لتمكين مستكشف Microsoft Windows من عرض معلومات حول مستندات %PRODUCTNAME، مثل معاينة المصغرات."
+msgstr "لتمكين مايكروسوفت ويندوز إكسبلورر من عرض معلومات حول مستندات %PRODUCTNAME، مثل معاينة المصغرات."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/writer.po libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/writer.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scp2/source/writer.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scp2/source/writer.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scp2%2Fsource%2Fwriter.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-06-13 14:43+0200\n"
-"Last-Translator: Khaled \n"
+"PO-Revision-Date: 2012-08-27 19:00+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -49,19 +49,19 @@
#: registryitem_writer.ulf#STR_REG_VAL_MS_WORD_DOCUMENT_OLD.LngText.text
msgid "Microsoft Word 97-2003 Document"
-msgstr "مستند Microsoft Word 97-2003"
+msgstr "مستند مايكروسوفت وورد 97-2003"
#: registryitem_writer.ulf#STR_REG_VAL_MS_WORD_DOCUMENT.LngText.text
msgid "Microsoft Word Document"
-msgstr "مستند Microsoft Word"
+msgstr "مستند مايكروسوفت وورد"
#: registryitem_writer.ulf#STR_REG_VAL_MS_WORD_TEMPLATE_OLD.LngText.text
msgid "Microsoft Word 97-2003 Template"
-msgstr "قالب Microsoft Word 97-2003"
+msgstr "قالب مايكروسوفت وورد 97-2003"
#: registryitem_writer.ulf#STR_REG_VAL_MS_WORD_TEMPLATE.LngText.text
msgid "Microsoft Word Template"
-msgstr "قالب Microsoft Word"
+msgstr "قالب مايكروسوفت وورد"
#: registryitem_writer.ulf#STR_REG_VAL_MS_RTF_DOCUMENT.LngText.text
msgid "Rich Text Document"
@@ -69,11 +69,11 @@
#: module_writer.ulf#STR_NAME_MODULE_PRG_WRT.LngText.text
msgid "%PRODUCTNAME Writer"
-msgstr "%PRODUCTNAME Writer"
+msgstr "%PRODUCTNAME رايتر"
#: module_writer.ulf#STR_DESC_MODULE_PRG_WRT.LngText.text
msgid "Create and edit text and graphics in letters, reports, documents and Web pages by using %PRODUCTNAME Writer."
-msgstr "إنشاء النصوص والرسومات في الخطابات، والتقارير، والمستندات وصفحات ويب وتحريرها باستخدام %PRODUCTNAME Writer."
+msgstr "إنشاء النصوص والرسومات في الخطابات، والتقارير، والمستندات وصفحات ويب وتحريرها باستخدام %PRODUCTNAME رايتر."
#: module_writer.ulf#STR_NAME_MODULE_PRG_WRT_BIN.LngText.text
msgid "Program Module"
@@ -81,15 +81,15 @@
#: module_writer.ulf#STR_DESC_MODULE_PRG_WRT_BIN.LngText.text
msgid "The application %PRODUCTNAME Writer"
-msgstr "التطبيق %PRODUCTNAME Writer"
+msgstr "التطبيق %PRODUCTNAME رايتر"
#: module_writer.ulf#STR_NAME_MODULE_PRG_WRT_HELP.LngText.text
msgid "%PRODUCTNAME Writer Help"
-msgstr "مساعدة %PRODUCTNAME Writer"
+msgstr "مساعدة %PRODUCTNAME رايتر"
#: module_writer.ulf#STR_DESC_MODULE_PRG_WRT_HELP.LngText.text
msgid "Help about %PRODUCTNAME Writer"
-msgstr "مساعدة حول %PRODUCTNAME Writer"
+msgstr "مساعدة حول %PRODUCTNAME رايتر"
#: module_writer.ulf#STR_NAME_MODULE_PRG_WRT_WRITER2LATEX.LngText.text
msgid "LaTeX Export"
@@ -97,7 +97,7 @@
#: module_writer.ulf#STR_DESC_MODULE_PRG_WRT_WRITER2LATEX.LngText.text
msgid "LaTeX export filter for Writer documents."
-msgstr "عامل تصفية تصدير LaTeX لمستندات Writer."
+msgstr "عامل تصفية تصدير LaTeX لمستندات رايتر."
#: folderitem_writer.ulf#STR_FI_NAME_HTMLDOKUMENT.LngText.text
msgid "HTML Document"
@@ -109,4 +109,4 @@
#: folderitem_writer.ulf#STR_FI_TOOLTIP_WRITER.LngText.text
msgid "Create and edit text and graphics in letters, reports, documents and Web pages by using Writer."
-msgstr "إنشاء النصوص والرسومات في الخطابات، والتقارير، والمستندات وصفحات ويب وتحريرها باستخدام Writer."
+msgstr "إنشاء النصوص والرسومات في الخطابات، والتقارير، والمستندات وصفحات ويب وتحريرها باستخدام رايتر."
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/scripting/source/pyprov.po libreoffice-3.6.2~rc2/translations/source/ar/scripting/source/pyprov.po
--- libreoffice-3.6.1~rc2/translations/source/ar/scripting/source/pyprov.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/scripting/source/pyprov.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: LibO 350-l10n\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+scripting%2Fsource%2Fpyprov.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-08-08 20:29+0200\n"
+"PO-Revision-Date: 2012-09-17 18:11+0200\n"
"Last-Translator: safa \n"
"Language-Team: none\n"
"Language: ar\n"
@@ -21,4 +21,4 @@
#: description.xml#extdesc.extdesc.description.text
msgid "Add support for Python via the Scripting Framework to enable Python scripts in the user and share directories of a LibreOffice installation, and also in loaded documents.\n"
-msgstr ""
+msgstr "أضف مساعدة لبايثون بواسطة هيكل البرمجة لتمكين برامج بايثون النصيّة في المستندات المستخدمة والمشتركة لتركيب ليبر أوفيس، وأيضًا في المستندات المحملة.\n"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sd/source/core.po libreoffice-3.6.2~rc2/translations/source/ar/sd/source/core.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sd/source/core.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sd/source/core.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sd%2Fsource%2Fcore.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-06-13 13:46+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-27 19:17+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -349,7 +349,7 @@
#: glob.src#STR_POWERPOINT_IMPORT.string.text
msgid "PowerPoint Import"
-msgstr "استيراد PowerPoint"
+msgstr "استيراد باوربوينت"
#: glob.src#STR_POOLSHEET_ARROW.string.text
msgid "Arrow"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sd/source/ui/animations.po libreoffice-3.6.2~rc2/translations/source/ar/sd/source/ui/animations.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sd/source/ui/animations.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sd/source/ui/animations.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: CustomAnimationCreateDialog.src#DLG_CUSTOMANIMATION_CREATE.1.RID_TP_CUSTOMANIMATION_ENTRANCE.pageitem.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sd/source/ui/annotations.po libreoffice-3.6.2~rc2/translations/source/ar/sd/source/ui/annotations.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sd/source/ui/annotations.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sd/source/ui/annotations.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sd%2Fsource%2Fui%2Fannotations.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: 2011-04-07 12:39+0200\n"
-"Last-Translator: Andras \n"
+"PO-Revision-Date: 2012-08-27 19:10+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -91,19 +91,19 @@
#: annotations.src#STR_ANNOTATION_WRAP_FORWARD.string.text
msgid "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?"
-msgstr "بلغ %PRODUCTNAME Impress نهاية العرض التقديمي. هل تريد المتابعة من البداية؟"
+msgstr "بلغ %PRODUCTNAME امبريس نهاية العرض التقديمي. هل تريد المتابعة من البداية؟"
#: annotations.src#STR_ANNOTATION_WRAP_BACKWARD.string.text
msgid "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?"
-msgstr "بلغ %PRODUCTNAME Impress بداية العرض التقديمي. هل تريد المتابعة إلى النهاية؟"
+msgstr "بلغ %PRODUCTNAME امبريس بداية العرض التقديمي. هل تريد المتابعة إلى النهاية؟"
#: annotations.src#STR_ANNOTATION_WRAP_FORWARD_DRAW.string.text
msgid "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?"
-msgstr "بلغ %PRODUCTNAME Draw نهاية المستند. هل تريد المتابعة من البداية؟"
+msgstr "بلغ %PRODUCTNAME درو نهاية المستند. هل تريد المتابعة من البداية؟"
#: annotations.src#STR_ANNOTATION_WRAP_BACKWARD_DRAW.string.text
msgid "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?"
-msgstr "بلغ %PRODUCTNAME Draw بداية المستند. هل تريد المتابعة إلى النهاية؟"
+msgstr "بلغ %PRODUCTNAME درو بداية المستند. هل تريد المتابعة إلى النهاية؟"
#: annotations.src#STR_ANNOTATION_UNDO_INSERT.string.text
msgid "Insert Comment"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sd/source/ui/app.po libreoffice-3.6.2~rc2/translations/source/ar/sd/source/ui/app.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sd/source/ui/app.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sd/source/ui/app.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,7 +4,7 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sd%2Fsource%2Fui%2Fapp.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:38+0200\n"
-"PO-Revision-Date: 2012-07-14 08:28+0200\n"
+"PO-Revision-Date: 2012-08-27 19:11+0200\n"
"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: popup.src#RID_DRAW_TABLEOBJ_INSIDE_POPUP.SID_FORMAT_TABLE_DLG.menuitem.text
@@ -240,7 +240,7 @@
#: strings.src#STR_DRAW_OBJ_TOOLBOX.string.text
msgid "Draw Object Bar"
-msgstr "شريط كائنات Draw"
+msgstr "شريط كائنات درو"
#: strings.src#STR_GRAPHIC_OBJ_TOOLBOX.string.text
msgid "Draw object bar/Graphics"
@@ -1182,7 +1182,7 @@
#: strings.src#STR_ISLOADING.string.text
msgid "Loading..."
-msgstr "جارٍ التحميل..."
+msgstr "يحمّل..."
#: strings.src#STR_DRAW_GRAF_TOOLBOX.string.text
msgid "Graphics Object Bar"
@@ -2076,19 +2076,19 @@
#: sdstring.src#STR_SAR_WRAP_FORWARD.string.text
msgid "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?"
-msgstr "بحث %PRODUCTNAME Impress حتى نهاية العرض. هل تريد متابعة البحث من البداية؟"
+msgstr "بحث %PRODUCTNAME امبريس حتى نهاية العرض. هل تريد متابعة البحث من البداية؟"
#: sdstring.src#STR_SAR_WRAP_BACKWARD.string.text
msgid "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?"
-msgstr "بحث %PRODUCTNAME Impress حتى بداية العرض. هل تريد متابعة البحث حتى النهاية؟"
+msgstr "بحث %PRODUCTNAME امبريس حتى بداية العرض. هل تريد متابعة البحث حتى النهاية؟"
#: sdstring.src#STR_SAR_WRAP_FORWARD_DRAW.string.text
msgid "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?"
-msgstr "بحث %PRODUCTNAME Draw حتى نهاية العرض. هل تريد البحث من البداية؟"
+msgstr "بحث %PRODUCTNAME درو حتى نهاية العرض. هل تريد البحث من البداية؟"
#: sdstring.src#STR_SAR_WRAP_BACKWARD_DRAW.string.text
msgid "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?"
-msgstr "بحث %PRODUCTNAME Draw حتى بداية العرض. هل تريد متابعة البحث من النهاية؟"
+msgstr "بحث %PRODUCTNAME درو حتى بداية العرض. هل تريد متابعة البحث من النهاية؟"
#: toolbox.src#RID_DRAW_VIEWER_TOOLBOX.string.text
msgctxt "toolbox.src#RID_DRAW_VIEWER_TOOLBOX.string.text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/minimizer/registry/data/org/openoffice/Office/extension.po libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/minimizer/registry/data/org/openoffice/Office/extension.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/minimizer/registry/data/org/openoffice/Office/extension.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/minimizer/registry/data/org/openoffice/Office/extension.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: SunPresentationMinimizer.xcu#.SunPresentationMinimizer.Strings.STR_SUN_OPTIMIZATION_WIZARD2.value.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/minimizer.po libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/minimizer.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/minimizer.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/minimizer.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/pdfimport.po libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/pdfimport.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/pdfimport.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/pdfimport.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,19 +4,20 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sdext%2Fsource%2Fpdfimport.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-08-28 08:37+0200\n"
+"Last-Translator: Faisal \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: description.xml#dispname.dispname.description.text
msgid "PDF Import"
-msgstr ""
+msgstr "استيراد PDF"
#: description.xml#extdesc.extdesc.description.text
msgid "The PDF Import Extension allows you to import and modify PDF documents. Best results with 100% layout accuracy can be achieved with the \"PDF/ODF hybrid file\" format, which this extension also enables. A hybrid PDF/ODF file is a PDF file that contains an embedded ODF source file. Hybrid PDF/ODF files will be opened in LibreOffice as an ODF file without any layout changes.\n"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/presenter/registry/data/org/openoffice/Office/extension.po libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/presenter/registry/data/org/openoffice/Office/extension.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sdext/source/presenter/registry/data/org/openoffice/Office/extension.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sdext/source/presenter/registry/data/org/openoffice/Office/extension.po 2012-09-25 12:13:31.000000000 +0000
@@ -12,7 +12,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Pootle 2.1.6\n"
+"X-Generator: Translate Toolkit 1.9.0\n"
"X-Accelerator-Marker: ~\n"
#: PresenterScreen.xcu#..PresenterScreen.PresenterScreenSettings.ToolBars.ToolBar.Entries.a.Normal.Text.value.text
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sfx2/source/appl.po libreoffice-3.6.2~rc2/translations/source/ar/sfx2/source/appl.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sfx2/source/appl.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sfx2/source/appl.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,8 +4,8 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fappl.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-07-07 11:14+0200\n"
-"Last-Translator: Faisal \n"
+"PO-Revision-Date: 2012-08-24 08:26+0200\n"
+"Last-Translator: safa \n"
"Language-Team: LANGUAGE \n"
"Language: ar\n"
"MIME-Version: 1.0\n"
@@ -540,7 +540,7 @@
#: newhelp.src#STR_HELP_FIRST_MESSAGE.string.text
msgid "The Help is being started..."
-msgstr "جارٍ بدء المساعدة..."
+msgstr "يبدأ المساعدة..."
#: newhelp.src#STR_HELP_MENU_TEXT_SELECTION_MODE.string.text
msgid "Select Text"
diff -Nru libreoffice-3.6.1~rc2/translations/source/ar/sfx2/source/doc.po libreoffice-3.6.2~rc2/translations/source/ar/sfx2/source/doc.po
--- libreoffice-3.6.1~rc2/translations/source/ar/sfx2/source/doc.po 2012-08-21 14:44:34.000000000 +0000
+++ libreoffice-3.6.2~rc2/translations/source/ar/sfx2/source/doc.po 2012-09-25 12:13:31.000000000 +0000
@@ -4,15 +4,15 @@
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fdoc.oo&subcomponent=ui\n"
"POT-Creation-Date: 2012-07-04 16:39+0200\n"
-"PO-Revision-Date: 2012-07-24 12:51+0200\n"
-"Last-Translator: abdulmajeed \n"
+"PO-Revision-Date: 2012-08-24 08:26+0200\n"
+"Last-Translator: safa