LibreOffice Gerrit News for core on 2013-10-29
Moin! * Open changes on master for project core changed in the last 25 hours: + UCB: RepoContent::RepoContent use OUString::startsWith instead copy. in https://gerrit.libreoffice.org/6463 from Arnaud Versini + fdo#69762 Scientific number AutoCorrect as ordinal in https://gerrit.libreoffice.org/6204 from Laurent BP + fdo#60698: Move generic fpicker to svtools in https://gerrit.libreoffice.org/6436 from Marcos Souza + VCL: I18NStatus::setStatusText shouldn't depend on aStr[len] == 0 in https://gerrit.libreoffice.org/6461 from Arnaud Versini + doxygen warnings: explicit link request to ´foo´ could not be resolved in https://gerrit.libreoffice.org/6459 from Christian Lohmaier + fdo#40077 Characters cropped in GTK-based ComboBox in https://gerrit.libreoffice.org/6444 from Samuel Mehrbrodt * Merged changes on master for project core changed in the last 25 hours: + sal_Bool to bool in ScHeaderControl in https://gerrit.libreoffice.org/6471 from Rodolfo Ribeiro Gomes + fdo#68903 Import .tsv and .xls plain text files in Calc by default in https://gerrit.libreoffice.org/6448 from Maxim Monastirsky + Access2Base : Reference to documentation added in every module in https://gerrit.libreoffice.org/6449 from Jean-Pierre Ledure * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Make ./autogen.sh --help work again in https://gerrit.libreoffice.org/6100 from Arnaud Versini + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.cxx | 12 ++--
sw/source/filter/ww8/ww8par5.cxx |2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 78f2f28e94be978786452224befb27f6f965b50b
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Oct 29 07:42:32 2013 +0100
cppcheck: Prefer prefix ++/-- operators for non-primitive types
Change-Id: If9283c4c80ad955cc36ec93ee730927024ff37fa
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 0f03fef..3142d63 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -212,7 +212,7 @@ WW8_WrtBookmarks::WW8_WrtBookmarks()
WW8_WrtBookmarks::~WW8_WrtBookmarks()
{
CPItr aEnd = aSttCps.end();
-for (CPItr aItr = aSttCps.begin();aItr!=aEnd;aItr++)
+for (CPItr aItr = aSttCps.begin();aItr!=aEnd;++aItr)
{
if (aItr-second)
{
@@ -235,7 +235,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const
OUString rNm, const ::sw:
else
{
std::pairCPItr,CPItr aRange =
aSttCps.equal_range(aResult.first-second);
-for (CPItr aItr = aRange.first;aItr != aRange.second;aItr++)
+for (CPItr aItr = aRange.first;aItr != aRange.second;++aItr)
{
if (aItr-second aItr-second-second.second == rNm)
{
@@ -257,7 +257,7 @@ void WW8_WrtBookmarks::Write( WW8Export rWrt)
std::vectorOUString aNames;
SvMemoryStream aTempStrm1(65535,65535);
SvMemoryStream aTempStrm2(65535,65535);
-for (aItr = aSttCps.begin();aItr!=aSttCps.end();aItr++)
+for (aItr = aSttCps.begin();aItr!=aSttCps.end();++aItr)
{
if (aItr-second)
{
@@ -268,7 +268,7 @@ void WW8_WrtBookmarks::Write( WW8Export rWrt)
}
aTempStrm1.Seek(0L);
-for (aItr = aEndCps.begin(), n = 0;aItr != aEndCps.end();aItr++,n++)
+for (aItr = aEndCps.begin(), n = 0;aItr != aEndCps.end();++aItr,++n)
{
if (aItr-second)
{
@@ -283,7 +283,7 @@ void WW8_WrtBookmarks::Write( WW8Export rWrt)
rWrt.pFib-fcPlcfbkf = rStrm.Tell();
rStrmaTempStrm1;
SwWW8Writer::WriteLong(rStrm, rWrt.pFib-ccpText + rWrt.pFib-ccpTxbx);
-for (aItr = aSttCps.begin();aItr!=aSttCps.end();aItr++)
+for (aItr = aSttCps.begin();aItr!=aSttCps.end();++aItr)
{
if (aItr-second)
{
@@ -316,7 +316,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP
nTo)
aItr = aRange.first;
continue;
}
-aItr++;
+++aItr;
}
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index a125d72..7e81e88 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3152,7 +3152,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString rStr )
}
else if ( bShowPage )
{
-for (SwFormTokens::iterator aItr = aPattern.begin();aItr!=
aPattern.end();aItr++)
+for (SwFormTokens::iterator aItr = aPattern.begin();aItr!=
aPattern.end();++aItr)
{
if (aItr-eTokenType == TOKEN_PAGE_NUMS)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source sc/source sw/source
i18npool/source/nativenumber/nativenumbersupplier.cxx |8
sc/source/ui/optdlg/tpusrlst.cxx |2 +-
sw/source/ui/docvw/srcedtw.cxx|2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a3f0eab294df3a48d497c2b985ec9655f2da2357
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Oct 29 07:50:49 2013 +0100
cppcheck: Array index is used before limits check
Change-Id: I51f7408a81a10e2c586cb05b863f20b13bb7b263
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 382d58c..bf2ff11 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -194,7 +194,7 @@ OUString SAL_CALL AsciiToNative( const OUString inStr,
sal_Int32 startPos, sal_
srcStr[len++] = str[i];
} else {
if (len 0) {
-if (isSeparator(str[i]) i nCount-1
isNumber(str[i+1]))
+if (i nCount-1 isSeparator(str[i])
isNumber(str[i+1]))
continue; // skip comma inside number string
sal_Bool notZero = sal_False;
for (sal_Int32 begin = 0, end = len %
number-multiplierExponent[0];
@@ -224,11 +224,11 @@ OUString SAL_CALL AsciiToNative( const OUString inStr,
sal_Int32 startPos, sal_
len = 0;
}
if (i nCount) {
-if ((doDecimal = (!doDecimal isDecimal(str[i]) i
nCount-1 isNumber(str[i+1]))) != sal_False)
+if ((doDecimal = (!doDecimal i nCount-1
isDecimal(str[i]) isNumber(str[i+1]))) != sal_False)
newStr[count] = (DecimalChar[number-number] ?
DecimalChar[number-number] : str[i]);
-else if (isMinus(str[i]) i nCount-1
isNumber(str[i+1]))
+else if (i nCount-1 isMinus(str[i])
isNumber(str[i+1]))
newStr[count] = (MinusChar[number-number] ?
MinusChar[number-number] : str[i]);
-else if (isSeparator(str[i]) i nCount-1
isNumber(str[i+1]))
+else if (i nCount-1 isSeparator(str[i])
isNumber(str[i+1]))
newStr[count] = (SeparatorChar[number-number] ?
SeparatorChar[number-number] : str[i]);
else
newStr[count] = str[i];
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index c19e7bd..5fcb9bf 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -339,7 +339,7 @@ void ScTpUserLists::MakeListStr( OUString rListStr )
{
rListStr += OUString(aStr[c]);
-while ( (aStr[c] == cDelimiter) (c nLen) )
+while ( (c nLen) (aStr[c] == cDelimiter) )
c++;
}
}
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 7d3f42b..46435db 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -82,7 +82,7 @@ static void lcl_Highlight(const OUString rSource,
SwTextPortions aPortionList)
while(nActPos nStrLen)
{
svtools::ColorConfigEntry eFoundType = svtools::HTMLUNKNOWN;
-if(rSource[nActPos] == cOpenBracket nActPos nStrLen - 2 )
+if((nActPos nStrLen - 2) (rSource[nActPos] == cOpenBracket))
{
// insert 'empty' portion
if(nPortEnd nActPos - 1 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source starmath/source
oox/source/drawingml/textbodycontext.cxx |1 -
starmath/source/unomodel.cxx |1 -
2 files changed, 2 deletions(-)
New commits:
commit c5fd63966e689b55b271d2d76860ed471eacdc74
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Oct 29 07:53:45 2013 +0100
cppcheck: duplicate break or break which follows a return
Change-Id: I0985d28289e31969cb9b048b221abfae1572025d
diff --git a/oox/source/drawingml/textbodycontext.cxx
b/oox/source/drawingml/textbodycontext.cxx
index 415bddf..80e5657 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -134,7 +134,6 @@ ContextHandlerRef RegularTextRunContext::onCreateContext(
sal_Int32 aElementToke
{
case A_TOKEN( rPr ):// CT_TextCharPropertyBag The text char
properties of this text run.
return new TextCharacterPropertiesContext( *this, rAttribs,
mpRunPtr-getTextCharacterProperties() );
-break;
case A_TOKEN( t ): // xsd:string minOccurs=1 The actual text
string.
mbIsInText = true;
break;
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index bc802e8..6e5391c 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -949,7 +949,6 @@ void SmModel::_getPropertyValues( const PropertyMapEntry
**ppEntries, Any *pValu
case HANDLE_INTEROP_GRAB_BAG:
getGrabBagItem(*pValue);
break;
-break;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Spam in mailing list
The development mailing list has been spammed a few times during the last half year. Spammers post heaps of links to commercial websites (i.e. buying drugs and watching sexual content) that have nothing at all to do with LibreOffice. (January 2013) http://lists.freedesktop.org/archives/libreoffice/2013-January/043858.html http://lists.freedesktop.org/archives/libreoffice/2013-January/043878.html http://lists.freedesktop.org/archives/libreoffice/2013-January/043913.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044045.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044148.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044194.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044238.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044281.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044309.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044382.html http://lists.freedesktop.org/archives/libreoffice/2013-January/044884.html http://lists.freedesktop.org/archives/libreoffice/2013-January/045000.html http://lists.freedesktop.org/archives/libreoffice/2013-January/045030.html http://lists.freedesktop.org/archives/libreoffice/2013-January/045067.html (February 2013) http://lists.freedesktop.org/archives/libreoffice/2013-February/045764.html http://lists.freedesktop.org/archives/libreoffice/2013-February/046049.html http://lists.freedesktop.org/archives/libreoffice/2013-February/046251.html http://lists.freedesktop.org/archives/libreoffice/2013-February/046359.html http://lists.freedesktop.org/archives/libreoffice/2013-February/046458.html http://lists.freedesktop.org/archives/libreoffice/2013-February/046529.html (August 2013) http://lists.freedesktop.org/archives/libreoffice/2013-August/054897.html http://lists.freedesktop.org/archives/libreoffice/2013-August/055228.html http://lists.freedesktop.org/archives/libreoffice/2013-August/055276.html http://lists.freedesktop.org/archives/libreoffice/2013-August/055354.html http://lists.freedesktop.org/archives/libreoffice/2013-August/055403.html The mailing list moderators need to clean up the LibreOffice development mailing list free of spam. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: build broken
Hi Stephan, On 10/28/2013 05:00 PM, Winfried Donkers wrote: I get a backtrace: cppunittester: /home/winfried/git/libo/include/rtl/ustring.hxx:420: sal_Unicode rtl::OUString::operator[](sal_Int32) const: Assertion `index = 0 index getLength()' failed. Should be fixed now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=b2ad9eecf1cda725b1d7fcabd1ebd06895843d20 Do not access nextCellIndex (nor Text) past the end. Requested backport to libreoffice-4-1 at https://gerrit.libreoffice.org/#/c/6467/. I confirm it fixed now, thank you! Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/linkarea.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit fe6f195f04b801d4dd47068de1493167a3cb0dcc Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Oct 28 10:34:11 2013 +0100 ScLinkedAreaDlg: unused private member Change-Id: I01a64a47e2c0587bb35c609e6658b8fe01301320 diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 03b6ef0..2bf86f0 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -20,7 +20,6 @@ #ifndef SC_LINKAREA_HXX #define SC_LINKAREA_HXX -#include com/sun/star/embed/XEmbeddedObject.hpp #include vcl/dialog.hxx #include vcl/button.hxx @@ -52,7 +51,6 @@ private: sfx2::DocumentInserter* pDocInserter; SfxObjectShellRef aSourceRef; -::com::sun::star::uno::Reference ::com::sun::star::embed::XEmbeddedObject xSourceObject; DECL_LINK(FileHdl, void *); DECL_LINK(BrowseHdl, void *); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - ios/MobileLibreOffice solenv/gbuild
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |2 +-
solenv/gbuild/platform/IOS_ARM_GCC.mk |3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 3b0aa94f1c2d629ec53034973892e0f66a8d5981
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 11:34:22 2013 +0200
Pick up the xslt libs, too
Change-Id: Ic35d071e65759adbdc63d76e45459f151f781cfe
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 48aea55..7663e69 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -453,7 +453,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript =
dest_lib=$LO_BUILDDIR/ios/lib\ndest_resource=resource_link\nproduct_ver=`sed
-ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$LO_BUILDDIR/config_host.mk`\nbuildid=`(cd $LO_SRCDIR git log -1
--format=%H)`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib
$dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a
$LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a
$LO_WORKDIR/UnpackedTarball/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln -f $file
$dest_lib/${file##*/}\ndone\n\n# Populate lo.xcconfig\nflags=-L$dest_lib\nfor
lib in $dest_lib/lib*.a; do\nbase=${lib##*/lib}\nbase=${base%\\.a}\n
flags+=\ -l${base}\\ndone\n\nfile=../lo.xcconfig\nsed -i '' -e
\s|^\\(LINK_LDFLAGS =\\).*$|\\1 $flags|\ $file\n\n# Resources #\nmkdir -p
$dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb
$dest_res
ource\ncp $LO_OUTDIR/bin/udkapi.rdb $dest_resource\ncp
$LO_OUTDIR/bin/oovbaapi.rdb$dest_resource\ncp
$LO_INSTDIR/program/services/services.rdb $dest_resource\ncp
$LO_INSTDIR/ure/share/misc/services.rdb$dest_resource/ure\n\n# copy .res
files\n# program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n#
we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir -p
$dest_resource/program/resource\ncp $LO_INSTDIR/program/resource/*en-US.res
$dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p
$dest_resource/share/config\ncp -R $LO_INSTDIR/share/config/soffice.cfg
$dest_resource/share/config\n\n# \registry\\ncp -R
$LO_INSTDIR/share/registry $dest_resource/share\n\n# Set up rc, the
\inifile\. See getIniFileName_Impl().\nfile=$dest_resource/rc\necho
'[Bootstrap]'$file\necho
'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' $file\necho
'HOME=$APP_DATA_DIR/tmp'
$file\n\n# Set up fundamentalrc, unorc, bootstraprc and
versionrc.\n# Do we really need all
these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'
$file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR'
$file\necho
'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry
res:${BRAND_BASE_DIR}/registry' $file\n\nfile=$dest_resource/unorc\necho
'[Bootstrap]' $file\n\n# bootstraprc must be in
$BRAND_BASE_DIR/program\nmkdir -p
$dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho
'[Bootstrap]'
$file\necho 'InstallMode=installmode'
$file\necho \ProductKey=LibreOffice $product_ver\
$file\necho
'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'
$file\n\n# Is this really needed?\nfile=$dest_resource/progra
m/versionrc\necho '[Version]' $file\necho 'AllLanguages=en-US'
$file\necho 'BuildVersion=' $file\necho \buildid=$buildid\
$file\necho 'ProductMajor=360' $file\necho 'ProductMinor=1'
$file\n ;
+ shellScript =
dest_lib=$LO_BUILDDIR/ios/lib\ndest_resource=resource_link\nproduct_ver=`sed
-ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p'
$LO_BUILDDIR/config_host.mk`\nbuildid=`(cd $LO_SRCDIR git log -1
--format=%H)`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib
$dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a
$LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a
$LO_WORKDIR/UnpackedTarball/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a
$LO_WORKDIR/UnpackedTarball/openssl/*.a
$LO_WORKDIR/UnpackedTarball/xslt/*/.libs/*.a; do\nln -f $file
$dest_lib/${file##*/}\ndone\n\n# Populate lo.xcconfig\nflags=-L$dest_lib\nfor
lib in $dest_lib/lib*.a; do\nbase=${lib##*/lib}\n
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared
ios/shared/ios_sharedlo/cxx/mlo.mm |2 --
1 file changed, 2 deletions(-)
New commits:
commit 4f1ab2f2b95ffafdf46f3c5b00d4819946f70522
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 11:43:05 2013 +0200
fileacc is not a separate component any more
Change-Id: I5adadb725e4792360d542121b2515a405901bc6e
diff --git a/ios/shared/ios_sharedlo/cxx/mlo.mm
b/ios/shared/ios_sharedlo/cxx/mlo.mm
index 478e012..b1436a9 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo.mm
@@ -35,7 +35,6 @@ extern C {
//ADD_LIB(dbaxml); // dbaccess lib
ADD_LIB(evtatt);// basic event handling
-ADD_LIB(fileacc); // Simple file access func
//ADD_LIB(frm); // form control in documents
ADD_LIB(fsstorage); // part of svl required when editing file
ADD_LIB(stocservices);
@@ -140,7 +139,6 @@ lo_get_libmap(void)
//MAP_LIB_LO(xmlfd),
MAP_LIB(xmlsecurity), //MAP_LIB_LO(sc), //MAP_LIB_LO(sd),
MAP_LIB_LO(svx),MAP_LIB_LO(fwl),MAP_LIB_LO(oox),
-MAP_LIB(fileacc), MAP_LIB_LO(svt),MAP_LIB_LO(xof),
MAP_LIB_LO(evtatt), MAP_LIB_LO(fsstorage), MAP_LIB_LO(lng),
MAP_LIB_LO(swd),MAP_LIB_LO(sw), MAP_LIB_LO(lnth),
MAP_LIB_LO(unordf), MAP_LIB_LO(unoxml), MAP_LIB_LO(xo),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx|7 +++
writerfilter/source/dmapper/StyleSheetTable.cxx |4 +++-
writerfilter/source/dmapper/ThemeTable.cxx | 24
writerfilter/source/dmapper/ThemeTable.hxx |1 +
4 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit b103366b92845bde1aff9140c3f6ac2af5597893
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 29 10:54:55 2013 +0100
DOCX import: store table style's rPr in InteropGrabBag
Change-Id: Iadc1831b60c4bd506e34eac42ea693f399973942
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9760403..75fbe65 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -958,6 +958,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
m_pImpl-GetTopContext()-Insert(PROP_CHAR_FONT_NAME_ASIAN,
uno::makeAny( sStringValue ));
break;
case NS_ooxml::LN_CT_Fonts_eastAsiaTheme:
+m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag,
eastAsiaTheme, ThemeTable::getStringForTheme(nIntValue));
if (m_pImpl-GetTopContext())
m_pImpl-GetTopContext()-Insert(PROP_CHAR_FONT_NAME_COMPLEX,
uno::makeAny( m_pImpl-GetThemeTable()-getFontNameForTheme(nIntValue) ) );
break;
@@ -1159,6 +1160,8 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_Language_eastAsia: //90315
case NS_ooxml::LN_CT_Language_bidi: //90316
{
+if (nName == NS_ooxml::LN_CT_Language_eastAsia)
+m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag,
eastAsia, sStringValue);
lang::Locale aLocale( LanguageTag::convertToLocale( sStringValue));
if (m_pImpl-GetTopContext())
m_pImpl-GetTopContext()-Insert(NS_ooxml::LN_CT_Language_val== nName ?
PROP_CHAR_LOCALE :
@@ -2998,6 +3001,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
resolveSprmProps(*this, rSprm);
if (nSprmId == NS_ooxml::LN_CT_PPrBase_spacing)
m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, spacing,
m_pImpl-m_aSubInteropGrabBag);
+else if (nSprmId == NS_ooxml::LN_EG_RPrBase_rFonts)
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, rFonts,
m_pImpl-m_aSubInteropGrabBag);
+else if (nSprmId == NS_ooxml::LN_EG_RPrBase_lang)
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, lang,
m_pImpl-m_aSubInteropGrabBag);
break;
case NS_ooxml::LN_EG_SectPrContents_footnotePr:
case NS_ooxml::LN_EG_SectPrContents_endnotePr:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index ce5c164..45adc73 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -753,11 +753,13 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm)
{
if (nSprmId == NS_ooxml::LN_CT_Style_pPr)
m_pImpl-m_rDMapper.enableInteropGrabBag(pPr);
+else if (nSprmId == NS_ooxml::LN_CT_Style_rPr)
+m_pImpl-m_rDMapper.enableInteropGrabBag(rPr);
}
m_pImpl-m_rDMapper.sprmWithProps( rSprm, pProps );
if (m_pImpl-m_pCurrentEntry-nStyleTypeCode ==
STYLE_TYPE_TABLE)
{
-if (nSprmId == NS_ooxml::LN_CT_Style_pPr)
+if (nSprmId == NS_ooxml::LN_CT_Style_pPr || nSprmId ==
NS_ooxml::LN_CT_Style_rPr)
{
TableStyleSheetEntry* pTableEntry =
static_castTableStyleSheetEntry *(m_pImpl-m_pCurrentEntry.get());
pTableEntry-AppendInteropGrabBag(m_pImpl-m_rDMapper.getInteropGrabBag());
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx
b/writerfilter/source/dmapper/ThemeTable.cxx
index bd89130..06a4923 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -142,6 +142,30 @@ void ThemeTable::lcl_entry(int /*pos*/,
writerfilter::ReferenceProperties::Poi
#endif
}
+OUString ThemeTable::getStringForTheme(const Id id)
+{
+std::mapsal_uInt32, OUString tmpThemeFontMap;
+switch (id)
+{
+case NS_ooxml::LN_Value_ST_Theme_majorEastAsia:
+return OUString(majorEastAsia);
+case NS_ooxml::LN_Value_ST_Theme_majorBidi:
+return OUString(majorBidi);
+case NS_ooxml::LN_Value_ST_Theme_majorAscii:
+return OUString(majorAscii);
+case NS_ooxml::LN_Value_ST_Theme_majorHAnsi:
+return OUString(majorHAnsi);
+case NS_ooxml::LN_Value_ST_Theme_minorEastAsia:
+return OUString(minorEastAsia);
+case
[Libreoffice-commits] core.git: external/jfreereport
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a14d3e0a344ad43825574e8ba7b3b0ba04e8bf80 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 29 11:18:36 2013 +0100 fix misplaced ) parenthesis Change-Id: I6b7869115b159a468553e0aa43e0cb4b63b4c9b3 diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 02ffbad..e93cc0b 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar=$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar) \ + -Dcommons-logging.jar=$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar) \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ -Dliblayout.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)/build/lib/liblayout.jar \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Thu, 2013-10-24 at 21:35 +0100, Michael Meeks wrote: * Pending Action Items: + Include new C* font google replacements into vanilla install (Caolan) Had crappy connection during call. This is done in master. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Spam in mailing list
Hi Tae, On Tuesday, 2013-10-29 16:51:55 +0900, Tae Wong wrote: The development mailing list has been spammed a few times during the last half year. Yes, from time to time a spam mail slips through the filters. Don't worry, be happy you don't receive the other 100 spam mails per day that the filters catch. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpO31oTdTwIQ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |4 +
sw/source/filter/ww8/docxattributeoutput.cxx | 101 ++-
2 files changed, 104 insertions(+), 1 deletion(-)
New commits:
commit ef439702fa80ed8730d885aeded60dbf0bc5d264
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 29 11:38:17 2013 +0100
DOCX export: handle table style's pPr / rPr from InteropGrabBag
Change-Id: I6dfb29db030212e55a207f39e79a1cf01d482e85
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 9db8db8..ffe9c62 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1466,6 +1466,10 @@ void Test::testCalendar1()
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:rsid, val, 00903003);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblPr/w:tblStyleColBandSize,
val, 1);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tcPr/w:shd, val, clear);
+
+// Table style lost its paragraph / run properties.
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:pPr/w:spacing, lineRule,
auto);
+assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:rPr/w:lang, eastAsia, ja-JP);
}
void Test::testSmartart()
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 089f735..9fb6f67 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2737,6 +2737,58 @@ void lcl_TableStyleShd(sax_fastparser::FSHelperPtr
pSerializer, uno::Sequencebe
pSerializer-singleElementNS(XML_w, XML_shd, xAttributeList);
}
+/// Export of w:lang in a table style.
+void lcl_TableStyleRLang(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rLang)
+{
+if (!rLang.hasElements())
+return;
+
+sax_fastparser::FastAttributeList* pAttributeList =
pSerializer-createAttrList();
+for (sal_Int32 i = 0; i rLang.getLength(); ++i)
+{
+if (rLang[i].Name == eastAsia)
+pAttributeList-add(FSNS(XML_w, XML_eastAsia),
OUStringToOString(rLang[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+}
+XFastAttributeListRef xAttributeList(pAttributeList);
+pSerializer-singleElementNS(XML_w, XML_lang, xAttributeList);
+}
+
+/// Export of w:rFonts in a table style.
+void lcl_TableStyleRRFonts(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rRFonts)
+{
+if (!rRFonts.hasElements())
+return;
+
+sax_fastparser::FastAttributeList* pAttributeList =
pSerializer-createAttrList();
+for (sal_Int32 i = 0; i rRFonts.getLength(); ++i)
+{
+if (rRFonts[i].Name == eastAsiaTheme)
+pAttributeList-add(FSNS(XML_w, XML_eastAsiaTheme),
OUStringToOString(rRFonts[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+}
+XFastAttributeListRef xAttributeList(pAttributeList);
+pSerializer-singleElementNS(XML_w, XML_rFonts, xAttributeList);
+}
+
+/// Export of w:spacing in a table style.
+void lcl_TableStylePSpacing(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rSpacing)
+{
+if (!rSpacing.hasElements())
+return;
+
+sax_fastparser::FastAttributeList* pAttributeList =
pSerializer-createAttrList();
+for (sal_Int32 i = 0; i rSpacing.getLength(); ++i)
+{
+if (rSpacing[i].Name == after)
+pAttributeList-add(FSNS(XML_w, XML_after),
OUStringToOString(rSpacing[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+else if (rSpacing[i].Name == line)
+pAttributeList-add(FSNS(XML_w, XML_line),
OUStringToOString(rSpacing[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+else if (rSpacing[i].Name == lineRule)
+pAttributeList-add(FSNS(XML_w, XML_lineRule),
OUStringToOString(rSpacing[i].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr());
+}
+XFastAttributeListRef xAttributeList(pAttributeList);
+pSerializer-singleElementNS(XML_w, XML_spacing, xAttributeList);
+}
+
/// Export of w:tblInd in a table style.
void lcl_TableStyleTblInd(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rTblInd)
{
@@ -2755,6 +2807,47 @@ void lcl_TableStyleTblInd(sax_fastparser::FSHelperPtr
pSerializer, uno::Sequence
pSerializer-singleElementNS(XML_w, XML_tblInd, xAttributeList);
}
+/// Export of w:rPr in a table style.
+void lcl_TableStyleRPr(sax_fastparser::FSHelperPtr pSerializer,
uno::Sequencebeans::PropertyValue rRPr)
+{
+if (!rRPr.hasElements())
+return;
+
+pSerializer-startElementNS(XML_w, XML_rPr, FSEND);
+
+uno::Sequencebeans::PropertyValue aRFonts, aLang;
+for (sal_Int32 i = 0; i rRPr.getLength(); ++i)
+{
+if (rRPr[i].Name == rFonts)
+aRFonts = rRPr[i].Value.get
[Libreoffice-commits] libexttextcat.git: langclass/ShortTexts
langclass/ShortTexts/hu.txt | 354 ++-- 1 file changed, 210 insertions(+), 144 deletions(-) New commits: commit d1e601d794f524da55a51dc879a0d418ff802b6b Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 29 10:46:32 2013 + replace hungarian udhr with utf-8 version diff --git a/langclass/ShortTexts/hu.txt b/langclass/ShortTexts/hu.txt index 7b1b5f6..a75a4ea 100644 --- a/langclass/ShortTexts/hu.txt +++ b/langclass/ShortTexts/hu.txt @@ -1,145 +1,211 @@ Az Emberi Jogok Egyetemes Nyilatkozata -Bevezet¿ - -Tekintettel arra, hogy az emberiség családja minden egyes tagja méltóságának, valamint egyenl¿ és elidegeníthetetlen jogainak elismerése alkotja a szabadság, az igazság és a béke alapját a világon, - -Tekintettel arra, hogy az emberi jogok el nem ismerése és semmibevevése az emberiség lelkiismeretét fellázító barbár cselekményekhez vezetett, és hogy az ember legf¿bb vágya egy olyan világ eljövetele, amelyben az elnyomástól, valamint a nyomortól megszabadult emberi lények szava és meggy¿z¿dése szabad lesz, - -Tekintettel annak fontosságára, hogy az emberi jogokat a jog uralma védelmezze, nehogy az ember végs¿ szükségében a zsarnokság és az elnyomás elleni lázadásra kényszerüljön, - -Tekintettel arra, hogy igen lényeges a nemzetek közötti baráti kapcsolatok kifejez¿désének el¿mozdítása, - -Tekintettel arra, hogy az Alapokmányban az Egyesült Nemzetek népei újból hitet tettek az alapvet¿ emberi jogok, az emberi személyiség méltósága és értéke, a férfiak és n¿k egyenjogúsága mellett, valamint kinyilvánították azt az elhatározásukat, hogy el¿segítik a szociális haladást és nagyobb szabadság mellett jobb életfeltételeket valósítanak meg, - -Tekintettel arra, hogy a tagállamok kötelezték magukat arra, hogy az Egyesült Nemzetek Szervezetével együttm¿ködve biztosítják az emberi jogok és alapvet¿ szabadságok általános és tényleges tiszteletbentartását, - -Tekintettel arra, hogy a jogok és szabadságok mibenléte tekintetében közös felfogás kialakításának a legnagyobb jelent¿sége van az említett kötelezettség maradéktalan teljesítésének szempontjából - -a közgy¿lés kinyilvánítja -az emberi jogok egyetemleges nyilatkozatát - -mint azt a közös eszményt, amelynek elérésére minden népnek és minden nemzetnek törekednie kell abból a célból, hogy minden személy és a társadalom minden szerve, állandóan szem el¿tt tartva a jelen Nyilatkozatot, oktatás és nevelés útján el¿mozdítsa e jogok és szabadságok tiszteletbentartásának kifejlesztését, valamint azoknak fokozatosan megvalósuló hazai és nemzetközi jogszabályok útján történ¿ általános és tényleges alkalmazását és elismerését mind a tagállamok népei között, mind pedig a joghatóságuk alatt álló területek népei között. -1. cikk - -Minden. emberi lény szabadon születik és egyenl¿ méltósága és joga van. Az emberek, ésszel és lelkiismerettel bírván, egymással szemben testvéri szellemben kell hogy viseltessenek. -2. cikk - -Mindenki, bármely megkülönböztetésre, nevezetesen fajra, színre, nemre, nyelvre, vallásra, politikai vagy bármely más véleményre, nemzeti vagy társadalmi eredetre, vagyonra, születésre, vagy bármely más körülményre való tekintet nélkül hivatkozhat a jelen Nyilatkozatban kinyilvánított összes jogokra és szabadságokra. - -Ezenfelül nem lehet semmiféle megkülönböztetést tenni annak az országnak, vagy területnek politikai, jogi vagy nemzetközi helyzete alapján sem, amelynek a személy állampolgára, aszerint, hogy az illet¿ ország vagy terület független, gyámság alatt áll, nem autonóm vagy szuverenitása bármely vonatkozásban korlátozott. -3. cikk - -Minden személynek joga van az élethez, a szabadsághoz és a személyi biztonsághoz. -4. cikk - -Senkit sem lehet rabszolgaságban, vagy szolgaságban tartani, a rabszolgaság és a rabszolgakereskedés minden alakja tilos. -5. cikk - -Senkit sem lehet kínvallatásnak, avagy kegyetlen, embertelen vagy lealacsonyító büntetésnek vagy bánásmódnak alávetni. -6. cikk - -Mindenkinek joga van ahhoz, hogy jogalanyiságát bárhol elismerjék. -7. cikk - -A törvény el¿tt mindenki egyenl¿ és minden megkülönböztetés nélkül joga van a törvény egyenl¿ védelméhez. Mindenkinek joga van egyenl¿ védelemhez a jelen Nyilatkozatot sért¿ minden megkülönböztetéssel és minden ilyen megkülönböztetésre irányuló felbujtással szemben. -8. cikk - -Minden személynek joga van az alkotmányban vagy a törvényben részére biztosított alapvet¿ jogokat sért¿ eljárások ellen a hazai bíróságokhoz tényleges jogorvoslatért folyamodni. -9. cikk - -Senkit sem lehet önkényesen letartóztatni, ¿rizetbe venni vagy szám¿zni. -10. cikk - -Minden személynek teljesen egyenl¿ joga van arra, hogy ügyét független és pártatlan bíróság méltányosan és nyilvánosan tárgyalja, s ez határozzon egyrészt jogai és k¿telezettségei fel¿l, másrészt minden ellene emelt b¿nügyi vád megalapozottsága fel¿l. -11. cikk - -Minden büntetend¿ cselekménnyel vádolt személyt ártatlannak kell vélelmezni
Re: libexttextcat data garbled in Hungarian
On Fri, 2013-10-25 at 12:10 +0100, Mark Robson wrote: Hi, The data files for libexttextcat in this directory: https://github.com/giuliopaci/libexttextcat/tree/master/langclass/ShortTexts Contains a garbled Hungarian version, it's almost in iso-8859-1 but some characters are destroyed because it doesn't contain all Hungarian characters. Replaced now with http://cgit.freedesktop.org/libreoffice/libexttextcat/commit/?id=d1e601d794f524da55a51dc879a0d418ff802b6b C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ATTENTION, creators of mysql-connector-ooo.oxt (--enable-ext-mariadb-connector)
Hi Dan, On Tuesday, 2013-10-22 10:50:21 -0400, Dan Lewis wrote: Top post: I am the one that created the Linux 32 bit and 64 bit version of the extension. However, I no longer have 24/7 access to the Internet so I can not create the updates to either extension. Please advise. You don't need 24/7 internet access to build. An initial hour or two or so should be sufficient, to download the source repository and the external packages needed. Well, this if your internet connection isn't modem speed.. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpm_EhsxXTch.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/portxt.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 47690627565bec866ea2de74b5504160479cff74
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 29 10:58:18 2013 +
Resolves: fdo#69510 don't access beyond end of string
Change-Id: Ib5d60159ad75791371a7805ef8e211a4010d7608
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 01afab6..ff20cc1 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -161,7 +161,8 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo rInf,
const OUString* pStr,
if ( bDoNotAddSpace )
return nCnt;
-for ( ; nPos nEnd; ++nPos )
+sal_Int32 nTxtEnd = std::min(nEnd, pStr-getLength());
+for ( ; nPos nTxtEnd; ++nPos )
{
if( CH_BLANK == (*pStr)[ nPos ] )
++nCnt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/source
i18npool/source/breakiterator/breakiterator_th.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f4586edfbfdceb76b5cbd75239d03b325f67e541 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 28 18:03:47 2013 +0100 Do not access nextCellIndex (nor Text) past the end At least for Winfried CppunitTest_sd_import_tests aborts with triggering the assert in OUString::operator[] at (presumably past-the-end) index 18 from com::sun::star::i18n::BreakIterator_th::makeIndex (this=0x2b775adf9440, Text=..., nStartPos=18) at i18npool/source/breakiterator/breakiterator_th.cxx:122 com::sun::star::i18n::BreakIterator_CTL::previousCharacters (this=0x2b775adf9440, Text=..., nStartPos=18, rLocale=..., nCharacterIteratorMode=1, nCount=1, nDone=@0x7fff9a84a8fc: 0) at i18npool/source/breakiterator/breakiterator_ctl.cxx:62 com::sun::star::i18n::BreakIteratorImpl::previousCharacters (this=0x2b775ae00a98, Text=..., nStartPos=18, rLocale=..., nCharacterIteratorMode=1, nCount=1, nDone=@0x7fff9a84a8fc: 0) at i18npool/source/breakiterator/breakiteratorImpl.cxx:65 ServerFontLayout::setNeedFallback (this=0xfba5d0, rArgs=..., nCharPos=17, bRightToLeft=false) at vcl/generic/glyphs/gcach_layout.cxx:114 HbLayoutEngine::layout (this=0xfba670, rLayout=..., rArgs=...) at vcl/generic/glyphs/gcach_layout.cxx:437 ... and from the preceding if block in BreakIterator_th::makeIndex it indeed looks like the invariant is that nextCellIndex need not be larger than cellIndexSize which needs not be larger than Text (ake cachedText) getLength(). Change-Id: Ib92a76020b2bb3902c5e58aa2e6c4e679e51b94a (cherry picked from commit b2ad9eecf1cda725b1d7fcabd1ebd06895843d20) Reviewed-on: https://gerrit.libreoffice.org/6467 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx index b5683d2..74527f6 100644 --- a/i18npool/source/breakiterator/breakiterator_th.cxx +++ b/i18npool/source/breakiterator/breakiterator_th.cxx @@ -119,7 +119,8 @@ void SAL_CALL BreakIterator_th::makeIndex(const OUString Text, sal_Int32 nStart // reset nextCell for new Text memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32)); } -else if (nextCellIndex[nStartPos] 0 || ! is_Thai(Text[nStartPos])) +else if (nStartPos = Text.getLength() || nextCellIndex[nStartPos] 0 + || !is_Thai(Text[nStartPos])) return; const sal_Unicode* str = cachedText.getStr(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/app/i18n_status.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a9269e410a61d196396fb9c10bb577853adbc9c6
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date: Mon Oct 28 13:14:46 2013 +0100
VCL: I18NStatus::setStatusText shouldn't depend on aStr[len] == 0
Change-Id: Ifa0770eb24df4ae4c7c058b980545a9094bbdf50
Reviewed-on: https://gerrit.libreoffice.org/6461
Reviewed-by: Noel Grandin noelgran...@gmail.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/generic/app/i18n_status.cxx
b/vcl/unx/generic/app/i18n_status.cxx
index f58add5..bc89b6e 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -587,7 +587,7 @@ void I18NStatus::setStatusText( const OUString rText )
/*
* #93614# convert fullwidth ASCII forms to ascii
*/
-int nChars = rText.getLength()+1;
+int nChars = rText.getLength();
sal_Unicode* pBuffer = (sal_Unicode*)alloca( nChars*sizeof(
sal_Unicode ) );
for( int i = 0; i nChars; i++ )
{
@@ -596,7 +596,7 @@ void I18NStatus::setStatusText( const OUString rText )
else
pBuffer[i] = rText[i];
}
-OUString aText( pBuffer );
+OUString aText( pBuffer, nChars );
m_pStatusWindow-setText( aText );
m_pStatusWindow-setPosition( m_pParent );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - vcl/generic
vcl/generic/app/geninst.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b903c2f776b2d2b6fa08c7e017bcf1642ce2b82d
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 13:16:39 2013 +0200
Add a SAL_WARN_IF to get more verbose information when CheckYieldMutex()
fails
Change-Id: Ia9b9e43a25c1d86e3f8c6d9a29d54dd94625bb0d
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 22a3975..4f165e8 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -116,7 +116,10 @@ bool SalGenericInstance::CheckYieldMutex()
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
if ( pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() )
+{
+SAL_WARN_IF( pYieldMutex-GetThreadId() !=
osl::Thread::getCurrentIdentifier(), sw, CheckYieldMutex:
pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() );
bRet = false;
+}
return bRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/jfreereport
external/jfreereport/ExternalProject_jfreereport_liblayout.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cacfaa8bff333c8eb8080a52eb7db80b2f65ed43 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 29 12:19:22 2013 +0100 fix another misplaced ) Change-Id: I53dfad4419390d751088564c162899fdbfa601e4 diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 3a923b3..e6248f0 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -Dbuild.label=build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ - -Dcommons-logging.jar=$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar) \ + -Dcommons-logging.jar=$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar) \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ -Dlibformula.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)/dist/libformula-$(LIBFORMULA_VERSION).jar \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/characterclassification/cclass_unicode.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8f0ecf253531963144d3d1c9ee5c12a6cda99c4e
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 29 11:20:19 2013 +
lets be super sure in the face of falling between surrogates
Change-Id: I6d8259df3d4f2e73f9236b7c0547f87c89801082
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx
b/i18npool/source/characterclassification/cclass_unicode.cxx
index 5655059..a729ca8 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -205,7 +205,7 @@ cclass_Unicode::getStringType( const OUString Text,
sal_Int32 nPos, sal_Int32 n
sal_Int32 result = 0;
-while (nCount nPos Text.getLength())
+while (nCount 0 nPos Text.getLength())
{
sal_Int32 nOrigPos = nPos;
result |= getCharType(Text, nPos, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - vcl/generic
vcl/generic/app/geninst.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f5a9d5cd3bad825aa334ee52843fd9863c54d4f
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 13:23:24 2013 +0200
Typo
Change-Id: I564659c8b05f08d497b778144a04464ba8f9ddd6
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 4f165e8..c2a6c79 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -117,7 +117,7 @@ bool SalGenericInstance::CheckYieldMutex()
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
if ( pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() )
{
-SAL_WARN_IF( pYieldMutex-GetThreadId() !=
osl::Thread::getCurrentIdentifier(), sw, CheckYieldMutex:
pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() );
+SAL_WARN_IF( pYieldMutex-GetThreadId() !=
osl::Thread::getCurrentIdentifier(), vcl, CheckYieldMutex:
pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() );
bRet = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/generic
vcl/generic/app/geninst.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ec70e1cb8c162cd1d8adcd459aefbae44cdcd2f8
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 13:23:24 2013 +0200
Typo
Change-Id: I564659c8b05f08d497b778144a04464ba8f9ddd6
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 4f165e8..c2a6c79 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -117,7 +117,7 @@ bool SalGenericInstance::CheckYieldMutex()
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
if ( pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() )
{
-SAL_WARN_IF( pYieldMutex-GetThreadId() !=
osl::Thread::getCurrentIdentifier(), sw, CheckYieldMutex:
pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() );
+SAL_WARN_IF( pYieldMutex-GetThreadId() !=
osl::Thread::getCurrentIdentifier(), vcl, CheckYieldMutex:
pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() );
bRet = false;
}
commit b67b93bf5b81b8717f80f03ef8dba8b06d7abb54
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 13:16:39 2013 +0200
Add a SAL_WARN_IF to get more verbose information when CheckYieldMutex()
fails
Change-Id: Ia9b9e43a25c1d86e3f8c6d9a29d54dd94625bb0d
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index 22a3975..4f165e8 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -116,7 +116,10 @@ bool SalGenericInstance::CheckYieldMutex()
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
if ( pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() )
+{
+SAL_WARN_IF( pYieldMutex-GetThreadId() !=
osl::Thread::getCurrentIdentifier(), sw, CheckYieldMutex:
pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() );
bRet = false;
+}
return bRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sot/qa sot/source
sot/qa/cppunit/data/fail/fdo70483-1.compound |binary sot/source/sdstor/stgstrms.cxx |5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 203d3e63762bb269f9a111279d9e800f20adaf33 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 29 11:37:46 2013 + Related: fdo#70483 add regression test Change-Id: I390cb550e050dc49ab6adee4f7ec57ef6744e57f diff --git a/sot/qa/cppunit/data/fail/fdo70483-1.compound b/sot/qa/cppunit/data/fail/fdo70483-1.compound new file mode 100644 index 000..4f6e4f1 Binary files /dev/null and b/sot/qa/cppunit/data/fail/fdo70483-1.compound differ commit 789507906d51f347b1785a3dc908dda6573b22e2 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 29 11:37:22 2013 + micro optimize this a bit Change-Id: Ie7c36f95b9e594d6cda4c4371d51e79e6d387fd1 diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index fd9d1d1..d4115e5 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -352,10 +352,9 @@ void StgStrm::scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize) m_aPagesCache.push_back(nBgn); nBgn = pFat-GetNextPage( nBgn ); -if( nUsedPageNumbers.find(nBgn) != nUsedPageNumbers.end() ) +//returned second is false if it already exists +if (!nUsedPageNumbers.insert(nBgn).second) bError = true; -else -nUsedPageNumbers.insert(nBgn); nOptSize += nPageSize; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eae6ac5550d28379a5523af022da7f1f936d Author: László Németh nem...@numbertext.org Date: Mon Oct 28 14:03:46 2013 +0100 fdo#70951 librelogo: fix parsing problem of functions (almost cherry picked from commit 850871e04e247262242836180d8a5cf59b2f95ef) Change-Id: I6cbe99d405cf45c0d7b04f0ad76a555096024f65 Reviewed-on: https://gerrit.libreoffice.org/6462 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index bfe5686..1367f3b 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1509,7 +1509,7 @@ def __compil__(s): (?:[^\n]*(?!\b(%(END)s))\n)* # 0 or more lines (not END) [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT) (?:[^\n]*(?!\b(?:%(END)s))\n)* # 0 or more lines (not END) -(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) +[ \t]*\b(?:%(END)s)\b % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of END doesn't supported) # add line breaks before procedure calls procedures = set(subnames) - set(functions) if len(procedures) 0: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/inspection/XPropertyHandler.idl|2 +- offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl |4 ++-- offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl |4 ++-- offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl |2 +- offapi/com/sun/star/ui/XUIConfigurationManager.idl |8 offapi/com/sun/star/xml/dom/XNode.idl |2 +- 6 files changed, 11 insertions(+), 11 deletions(-) New commits: commit 511bbec1c5b6111f17ef5357ca7a6041555e571b Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Mon Oct 28 11:08:10 2013 +0100 doxygen warnings: explicit link request to ´foo´ could not be resolved as #foo doesn't work to link to parameters described in the block, use \p foo instead to format it. Change-Id: Ic9bd59936f872c8f87aba50e87ba788265149832 Reviewed-on: https://gerrit.libreoffice.org/6459 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/offapi/com/sun/star/inspection/XPropertyHandler.idl b/offapi/com/sun/star/inspection/XPropertyHandler.idl index ffc4656..c942bf5 100644 --- a/offapi/com/sun/star/inspection/XPropertyHandler.idl +++ b/offapi/com/sun/star/inspection/XPropertyHandler.idl @@ -137,7 +137,7 @@ interface XPropertyHandler The name of the conversion's target property. @param ControlValue The to-be-converted control value. This value has been obtained from an XPropertyControl, -using its #Value attribute. +using its XPropertyControl::Value attribute. @throws com::sun::star::beans::UnknownPropertyException if the given property is not supported by the property handler diff --git a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl index 18a47c0..e566f33 100644 --- a/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl +++ b/offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl @@ -194,8 +194,8 @@ interface XSingleSelectQueryAnalyzer : com::sun::star::uno::XInterface is the command which should be executed, the type of command depends on the CommandType. -pIn case of a #CommandType of com::sun::star::sdb::CommandType::COMMAND, -means in case the #Command specifies an SQL statement, the inherited +pIn case of a \p CommandType of com::sun::star::sdb::CommandType::COMMAND, +means in case the \p Command specifies an SQL statement, the inherited com::sun::star::sdbc::RowSet::EscapeProcessing becomes relevant:br/ It then can be to used to specify whether the SQL statement should be analyzed on the diff --git a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl index 5517c95..ab31a08 100644 --- a/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl +++ b/offapi/com/sun/star/ucb/XCachedDynamicResultSetStubFactory.idl @@ -80,10 +80,10 @@ published interface XCachedDynamicResultSetStubFactory: com::sun::star::uno::XIn properties that are involved in sorting. @throws ListenerAlreadySetException -if #Source is already in use. +if \p Source is already in use. @throws AlreadyInitializedException -if #TargetCache already has been initialized. +if \p TargetCache already has been initialized. */ void connectToCache( [in] com::sun::star::ucb::XDynamicResultSet Source diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl index 8c04e25..7134e6c 100644 --- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl +++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl @@ -38,7 +38,7 @@ interface XWebDAVCommandEnvironment : XCommandEnvironment @param aURI The request URI. -@param aMethod +@param eMethod The WebDAV/HTTP method (GET,PUT,MKCOL,...) as defined in WebDAVHTTPMethod. @return diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl index b963dc4..cf18387 100644 --- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl +++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl @@ -123,7 +123,7 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface implements UIElementSettings. If the settings data cannot be found a com::sun::star::container::NoSuchElementException -is thrown. If the #ResourceURL is not valid or +is thrown. If the \p ResourceURL is not valid or describes an unknown type a com::sun::star::lang::IllegalArgumentException is thrown. @@
[Libreoffice-commits] core.git: cui/source
cui/source/options/optaboutconfig.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit f87f5c829e612d333ddff892752693b2835cec19
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date: Mon Oct 28 01:33:41 2013 +0200
fdo#70049 Expert Config page cannot save boolean
This patch fixes unsaveable booleans. Also fix the problem occurs when
there is
multiple changes on page. Page was commiting only last added one, now
commits all.
Change-Id: Id1a15634e95d5ca9d54e7a90fa1bbbaf874e3f08
Reviewed-on: https://gerrit.libreoffice.org/6457
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 753edb2..21b96c4b 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -191,20 +191,18 @@ sal_Bool CuiAboutConfigTabPage::FillItemSet( SfxItemSet )
sal_Bool bModified = sal_False;
Reference XNameAccess xUpdateAccess = getConfigAccess( /, sal_True );
-for( size_t nInd = 0; nInd m_vectorOfModified.size(); ++nInd )
+std::vector boost::shared_ptr Prop_Impl ::iterator pIter;
+for( pIter = m_vectorOfModified.begin() ; pIter !=
m_vectorOfModified.end(); ++pIter )
{
-boost::shared_ptr Prop_Impl aNamedValue = m_vectorOfModified[ nInd
];
-
-xUpdateAccess = getConfigAccess( aNamedValue-Name , sal_True );
+xUpdateAccess = getConfigAccess( (*pIter)-Name , sal_True );
Reference XNameReplace xNameReplace( xUpdateAccess, UNO_QUERY_THROW
);
-xNameReplace-replaceByName( aNamedValue-Property, aNamedValue-Value
);
+xNameReplace-replaceByName( (*pIter)-Property, (*pIter)-Value );
bModified = sal_True;
-}
-Reference util::XChangesBatch xChangesBatch( xUpdateAccess,
UNO_QUERY_THROW );
-
-xChangesBatch-commitChanges();
+Reference util::XChangesBatch xChangesBatch( xUpdateAccess,
UNO_QUERY_THROW );
+xChangesBatch-commitChanges();
+}
return bModified;
}
@@ -638,10 +636,10 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
throw uno::Exception();
-AddToModifiedVector( pProperty );
sDialogValue = sNewValue;
}
}
+AddToModifiedVector( pProperty );
//update listbox value.
m_pPrefBox-SetEntryText( sDialogValue, pEntry, 3 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9d6bc2c63360632edf871e5cbf74e96d8d2c2d76 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Fri Oct 25 21:27:23 2013 -0200 Updated core Project: dictionaries c6f4f79b596756f5d45c5264a49232e491b9cd78 Update pt_BR dictionariy Vero's new version is 3.2 Change-Id: I42961d828f0068591d83fd2c949a51128504d0a3 Reviewed-on: https://gerrit.libreoffice.org/6440 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/dictionaries b/dictionaries index 8106a55..c6f4f79 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 8106a55e4469c5d2bbdfac8a6816153843ee6b83 +Subproject commit c6f4f79b596756f5d45c5264a49232e491b9cd78 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/qa i18npool/source sc/source
i18npool/qa/cppunit/test_characterclassification.cxx | 26 +
i18npool/source/characterclassification/cclass_unicode.cxx | 12 --
sc/source/core/tool/interpr1.cxx |4 +-
3 files changed, 37 insertions(+), 5 deletions(-)
New commits:
commit f1ade1468f26d70c49bd3697f10497e914dd8121
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 28 15:39:20 2013 +
Related: fdo#69641 double iterateCodePoints doesn't make sense to me
This came in with 04212c3015cd4ab118a0aec2bb04bc153a64af41 but
the bug number of #i86439# appears to be the wrong id. It doesn't
make sense to me. Rework cclass_Unicode::getStringType to iterate
safely over the codepoints of the requested range. Perhaps that
was the reason for the original commit.
Change-Id: Ice4287eb6f9fc6a9705845c0cf995263815de2e7
(cherry picked from commit 507e627d83dbfb6a35677450a3fc42d10c79a82e)
Related: fdo#69641 check index against length before iterateCodePoints
Change-Id: I71346b12fcfe3e02015038c3c78db574ada873d6
(cherry picked from commit 08b7af126e546bdbd175023429f544baa9861dba)
Related: fdo#69641 add a regression test
Change-Id: Icf3324a224d02425acd679a286f3c4a0b7e3ed1c
(cherry picked from commit 9d5b07b9085f97edfff5d4ac474e9711036bb0c4)
lets be super sure in the face of falling between surrogates
Change-Id: I6d8259df3d4f2e73f9236b7c0547f87c89801082
(cherry picked from commit 8f0ecf253531963144d3d1c9ee5c12a6cda99c4e)
Reviewed-on: https://gerrit.libreoffice.org/6473
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx
b/i18npool/qa/cppunit/test_characterclassification.cxx
index a683c3a..92066c7 100644
--- a/i18npool/qa/cppunit/test_characterclassification.cxx
+++ b/i18npool/qa/cppunit/test_characterclassification.cxx
@@ -27,9 +27,11 @@ public:
virtual void tearDown();
void testTitleCase();
+void testStringType();
CPPUNIT_TEST_SUITE(TestCharacterClassification);
CPPUNIT_TEST(testTitleCase);
+CPPUNIT_TEST(testStringType);
CPPUNIT_TEST_SUITE_END();
private:
uno::Referencei18n::XCharacterClassification m_xCC;
@@ -68,6 +70,30 @@ void TestCharacterClassification::testTitleCase()
}
}
+//https://bugs.freedesktop.org/show_bug.cgi?id=69641
+void TestCharacterClassification::testStringType()
+{
+lang::Locale aLocale;
+aLocale.Language = OUString(en);
+aLocale.Country = OUString(US);
+
+{
+//simple case
+OUString sTest(Some text);
+sal_Int32 nResult = m_xCC-getStringType(sTest, 0, sTest.getLength(),
aLocale);
+CPPUNIT_ASSERT_EQUAL(nResult, sal_Int32(230));
+}
+
+{
+//tricky case
+const sal_Unicode MATHEMATICAL_ITALIC_SMALL_THETA[] = { 0xD835, 0xDF03
};
+OUString sTest(MATHEMATICAL_ITALIC_SMALL_THETA,
SAL_N_ELEMENTS(MATHEMATICAL_ITALIC_SMALL_THETA));
+sal_Int32 nResult = m_xCC-getStringType(sTest, 0, sTest.getLength(),
aLocale);
+CPPUNIT_ASSERT_EQUAL(nResult, sal_Int32(228));
+}
+
+}
+
void TestCharacterClassification::setUp()
{
BootstrapFixtureBase::setUp();
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx
b/i18npool/source/characterclassification/cclass_unicode.cxx
index 045de39..a729ca8 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -132,7 +132,6 @@ cclass_Unicode::getCharType( const OUString Text,
sal_Int32* nPos, sal_Int32 in
using namespace ::com::sun::star::i18n::KCharacterType;
sal_uInt32 ch = Text.iterateCodePoints(nPos, increment);
-if (increment 0) ch = Text.iterateCodePoints(nPos, 0);
switch ( u_charType(ch) ) {
// Upper
case U_UPPERCASE_LETTER :
@@ -204,9 +203,16 @@ sal_Int32 SAL_CALL
cclass_Unicode::getStringType( const OUString Text, sal_Int32 nPos, sal_Int32
nCount, const Locale /*rLocale*/ ) throw(RuntimeException) {
if ( nPos 0 || Text.getLength() = nPos ) return 0;
-sal_Int32 result = getCharType(Text, nPos, 0);
-for (sal_Int32 i = 1; i nCount nPos Text.getLength(); i++)
+sal_Int32 result = 0;
+
+while (nCount 0 nPos Text.getLength())
+{
+sal_Int32 nOrigPos = nPos;
result |= getCharType(Text, nPos, 1);
+sal_Int32 nUtf16Units = nPos - nOrigPos;
+nCount -= nUtf16Units;
+}
+
return result;
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 29050bb..a03b13a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3467,11 +3467,11 @@ void ScInterpreter::ScNumberValue()
{
OUString aTemporary( nDecSep = 0 ? aInputString.copy( 0, nDecSep ) :
aInputString );
sal_Int32 nIndex = 0;
-do
+while
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py | 36 ++--
1 file changed, 30 insertions(+), 6 deletions(-)
New commits:
commit 1d0c9f7d6bca4aedfc791681efdcf60c97654204
Author: László Németh nem...@numbertext.org
Date: Fri Oct 25 11:46:45 2013 +0200
fdo#70858 librelogo: fix Logo program halt at font settings (Windows)
Change-Id: I3c51ba693caa80c8b530a9eee932a48a125e2eca
(cherry picked from commit 317d255aa7f1497cdfb929b884066202f721672c)
Reviewed-on: https://gerrit.libreoffice.org/6431
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index 1367f3b..c0c6447 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1313,6 +1313,30 @@ def __float__(x): # handle eg. float(10,5cm)
x = eval(x)
return float(x)
+def fontheight(n = -1):
+if n != -1:
+_.fontheight = n
+else:
+return _.fontheight
+
+def fontweight(n = -1):
+if n != -1:
+_.fontweight = n
+else:
+return _.fontweight
+
+def fontfamily(s = -1):
+if s != -1:
+_.fontfamily = s
+else:
+return _.fontfamily
+
+def fontstyle(n = -1):
+if n != -1:
+_.fontstyle = n
+else:
+return _.fontstyle
+
def __loadlang__(lang, a):
global comp, __colors__
__colors__[lang] = {}
@@ -1383,13 +1407,13 @@ def __loadlang__(lang, a):
[r(?!:)\b(?:%s)(\s+|$) % a['FILLCOLOR'], \n)fillcolor(],
[r(?!:)\b(?:%s)(\s+|$) % a['FILLSTYLE'], \n)fillstyle(],
[r(?!:)\b(?:%s)(\s+|$) % a['FONTCOLOR'], \n)fontcolor(],
-[r(?!:)\b(?:%s)(\s+|$) % a['FONTFAMILY'], \nglobal _\n_.fontfamily=],
-[r(?!:)\b(?:%s)(\s+|$) % a['FONTHEIGHT'], \nglobal _\n_.fontheight=],
-[r(?!:)\b(?:%s)(\s+|$) % a['FONTWEIGHT'], \nglobal _\n_.fontweight=],
-[r(?!:)\b(?:%s)(\s+|$) % a['FONTSTYLE'], \nglobal _\n_.fontstyle=],
+[r(?!:)\b(?:%s)(\s+|$) % a['FONTFAMILY'], \n)fontfamily(],
+[r(?!:)\b(?:%s)(\s+|$) % a['FONTHEIGHT'], \n)fontheight(],
+[r(?!:)\b(?:%s)(\s+|$) % a['FONTWEIGHT'], \n)fontweight(],
+[r(?!:)\b(?:%s)(\s+|$) % a['FONTSTYLE'], \n)fontstyle(],
[r(?!:)\b(?:%s)(\s+|$) % a['PENWIDTH'], \n)pensize(],
-[r(?!:)\b(?:%s)\b % a['PENDOWN'], \nglobal _\n__pen__(1)],
-[r(?!:)\b(?:%s)\b % a['PENUP'], \nglobal _\n__pen__(0)],
+[r(?!:)\b(?:%s)\b % a['PENDOWN'], \n__pen__(1)],
+[r(?!:)\b(?:%s)\b % a['PENUP'], \n__pen__(0)],
[r(?!:)\b(?:%s)\b % a['HIDETURTLE'], \nhideturtle()],
[r(?!:)\b(?:%s)\b % a['SHOWTURTLE'], \nshowturtle()],
[r(?!:)\b(?:%s)\b\[ % a['POSITION'], position()[],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/LibreLogo/LibreLogo.py | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit c24493db0d4b4d2685ef5b8fcca51f163531394d
Author: László Németh nem...@numbertext.org
Date: Thu Oct 24 16:11:33 2013 +0200
librelogo: fix Writer/Draw synchronization in cropped SVG export
Change-Id: Id7dc7a2853a8c56ee56eab55c078650e16c278fd
(cherry picked from commit d0af3045c3ff850387385599fdcef7f9ecf407cb)
Reviewed-on: https://gerrit.libreoffice.org/6420
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index c0c6447..913ae6b 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1255,7 +1255,7 @@ def create_valid_svg_file(filename):
f.write(s)
def __groupend__(name = ):
-global __group__, __grouplefthang__, __groupstack__
+global __group__, __grouplefthang__, __groupstack__, __halt__
g = 0
if __group__.getCount() 1:
if __grouplefthang__ 0:
@@ -1283,19 +1283,26 @@ def __groupend__(name = ):
d =
ctx.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop, ctx)
draw = d.loadComponentFromURL(private:factory/sdraw, _blank, 0, ())
drawpage = draw.getDrawPages().getByIndex(0)
+ while XSCRIPTCONTEXT.getDocument() != draw:
+if XSCRIPTCONTEXT.getDocument() not in [draw, _.doc, None]:
+ __halt__ = True
+ return
+__time__.sleep(0.1)
__dispatcher__(.uno:Paste, (), draw)
__dispatcher__(.uno:FormatGroup, (), draw)
pic = drawpage.getByIndex(0)
pic.setPosition(__Point__((g.BoundRect.Width - g.Size.Width)//2,
(g.BoundRect.Height - g.Size.Height)//2))
drawpage.Height, drawpage.Width = g.BoundRect.Height, g.BoundRect.Width
- __time__.sleep(1) # avoid writing problem
if not os.path.isabs(name):
name = os.path.expanduser('~') + os.path.sep + name
__dispatcher__(.uno:ExportTo, (__getprop__(URL,
unohelper.systemPathToFileUrl(name)), __getprop__(FilterName,
draw_svg_Export)), draw)
- __time__.sleep(1)
- create_valid_svg_file(name)
draw.close(True)
-
+ while XSCRIPTCONTEXT.getDocument() != _.doc:
+if XSCRIPTCONTEXT.getDocument() not in [draw, _.doc, None]:
+ __halt__ = True
+ return
+__time__.sleep(0.1)
+ create_valid_svg_file(name)
__group__ = __groupstack__.pop()
if __group__ and g:
__group__.add(g)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/svx svx/source
include/svx/gallery1.hxx |4 +++-
svx/source/gallery2/gallery1.cxx | 29 ++---
svx/source/gallery2/galtheme.cxx |2 +-
3 files changed, 30 insertions(+), 5 deletions(-)
New commits:
commit 41102212d49fd18643bba375d65963bd41008bc7
Author: Michael Meeks michael.me...@collabora.com
Date: Wed Oct 23 19:49:06 2013 +0100
fdo#69079 - fix multiple user gallery creations.
Conflicts:
include/svx/gallery1.hxx
svx/source/gallery2/gallery1.cxx
Change-Id: I0539e2708b973b8bea7bd63488277f00201c6c46
Reviewed-on: https://gerrit.libreoffice.org/6417
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 4a7a9d3..5610c0f 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -53,7 +53,9 @@ private:
public:
-GalleryThemeEntry( const INetURLObject rBaseURL,
const String rName,
+GalleryThemeEntry( bool bCreateUniqueURL,
+ const INetURLObject rBaseURL,
+ const String rName,
sal_Bool bReadOnly, sal_Bool
bNewFile,
sal_uInt32 nId, sal_Bool
bThemeNameFromResource );
~GalleryThemeEntry() {};
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 3d2f9dc..b6ec5e9 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -45,7 +45,16 @@ using namespace ::com::sun::star;
// - GalleryThemeEntry -
// -
-GalleryThemeEntry::GalleryThemeEntry( const INetURLObject rBaseURL, const
String rName,
+static bool FileExists( const INetURLObject rURL, const rtl::OUString rExt )
+{
+INetURLObject aURL( rURL );
+aURL.setExtension( rExt );
+return FileExists( aURL );
+}
+
+GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
+ const INetURLObject rBaseURL,
+ const String rName,
sal_Bool _bReadOnly, sal_Bool _bNewFile,
sal_uInt32 _nId, sal_Bool
_bThemeNameFromResource ) :
nId ( _nId ),
@@ -55,6 +64,19 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject
rBaseURL, const Strin
INetURLObject aURL( rBaseURL );
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, invalid URL );
+if (bCreateUniqueURL)
+{
+INetURLObject aBaseNoCase( ImplGetURLIgnoreCase( rBaseURL ) );
+aURL = aBaseNoCase;
+static sal_Int32 nIdx = 0;
+while( FileExists( aURL, thm ) )
+{ // create new URLs
+nIdx++;
+aURL = aBaseNoCase;
+aURL.setName( aURL.getName() + OUString::number(nIdx));
+}
+}
+
aURL.setExtension( thm );
aThmURL = ImplGetURLIgnoreCase( aURL );
@@ -520,8 +542,9 @@ sal_Bool Gallery::CreateTheme( const String rThemeName )
{
INetURLObject aURL( GetUserURL() );
aURL.Append( rThemeName );
-GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( aURL, rThemeName,
- sal_False,
sal_True, 0, sal_False );
+GalleryThemeEntry* pNewEntry = new GalleryThemeEntry(
+true, aURL, rThemeName,
+sal_False, sal_True, 0, sal_False );
aThemeList.push_back( pNewEntry );
delete( new GalleryTheme( this, pNewEntry ) );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 54c7067..cc77541 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -751,7 +751,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const
INetURLObject rURL, sa
}
INetURLObject aPathURL( rURL );
-pRet = new GalleryThemeEntry( aPathURL, aThemeName,
+pRet = new GalleryThemeEntry( false, aPathURL, aThemeName,
bReadOnly, sal_False, nThemeId,
bThemeNameFromResource );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - unoidl/source
unoidl/source/unoidl.cxx | 112 ---
1 file changed, 78 insertions(+), 34 deletions(-)
New commits:
commit cfa141a67592ae5eda7ccf9cc8dbfbe78c7b1959
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Oct 24 09:48:13 2013 +0200
fdo#67725 unoidl::AggregatingCursor must wrap modules for aggregation, too
Otherwise cppuhelper::TypeManager::createTypeDescriptionEnumeration,
sitting on
top such an AggregatingCursor, will miss any entities from provider P' in
module
M if any previous provider P contains the same module M.
That happened when climaker generates cli_oootypes.dll, where the
enumeration
missed everything from offapi in top-level module com because it had
already
seen udkapi's com, and only reported the handful of entities under
offapi's
other top-level module org (which does not appear in udkapi).
Change-Id: If538391bde22bcc346417b5988cf12023f0d4172
(cherry picked from commit bdd55e28fc7788c2968daaf87b782f8e6189ee2d)
Reviewed-on: https://gerrit.libreoffice.org/6415
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/unoidl/source/unoidl.cxx b/unoidl/source/unoidl.cxx
index a9939e4..c55e02b 100644
--- a/unoidl/source/unoidl.cxx
+++ b/unoidl/source/unoidl.cxx
@@ -23,41 +23,101 @@ namespace unoidl {
namespace {
+class AggregatingModule: public ModuleEntity {
+public:
+AggregatingModule(
+std::vector rtl::Reference Provider const providers,
+OUString const name):
+providers_(providers), name_(name)
+{}
+
+private:
+virtual ~AggregatingModule() throw () {}
+
+virtual std::vector OUString getMemberNames() const;
+
+virtual rtl::Reference MapCursor createCursor() const;
+
+std::vector rtl::Reference Provider providers_;
+OUString name_;
+};
+
+std::vector OUString AggregatingModule::getMemberNames() const {
+std::set OUString names;
+for (std::vector rtl::Reference Provider ::const_iterator i(
+ providers_.begin());
+ i != providers_.end(); ++i)
+{
+rtl::Reference Entity ent((*i)-findEntity(name_));
+if (ent.is() ent-getSort() == Entity::SORT_MODULE) {
+std::vector OUString ns(
+static_cast ModuleEntity * (ent.get())-getMemberNames());
+names.insert(ns.begin(), ns.end());
+}
+}
+return std::vector OUString (names.begin(), names.end());
+}
+
class AggregatingCursor: public MapCursor {
public:
AggregatingCursor(
-std::vector rtl::Reference MapCursor const cursors):
-cursors_(cursors), iterator_(cursors_.begin())
-{}
+std::vector rtl::Reference Provider const providers,
+OUString const name):
+providers_(providers), name_(name), iterator_(providers_.begin())
+{ findCursor(); }
private:
virtual ~AggregatingCursor() throw () {}
-virtual rtl::Reference Entity getNext(rtl::OUString * name);
+virtual rtl::Reference Entity getNext(OUString * name);
-std::vector rtl::Reference MapCursor cursors_;
-std::vector rtl::Reference MapCursor ::iterator iterator_;
-std::set rtl::OUString seenMembers;
+void findCursor();
+
+std::vector rtl::Reference Provider providers_;
+OUString name_;
+std::vector rtl::Reference Provider ::iterator iterator_;
+rtl::Reference MapCursor cursor_;
+std::set OUString seen_;
};
-rtl::Reference Entity AggregatingCursor::getNext(rtl::OUString * name) {
-for (;;) {
-if (iterator_ == cursors_.end()) {
-return rtl::Reference Entity ();
-}
-rtl::OUString n;
-rtl::Reference Entity ent((*iterator_)-getNext(n));
+rtl::Reference Entity AggregatingCursor::getNext(OUString * name) {
+while (cursor_.is()) {
+OUString n;
+rtl::Reference Entity ent(cursor_-getNext(n));
if (ent.is()) {
-if (seenMembers.insert(n).second) {
+if (seen_.insert(n).second) {
if (name != 0) {
*name = n;
}
-return ent;
+return ent-getSort() == Entity::SORT_MODULE
+? new AggregatingModule(
+providers_, (name_.isEmpty() ? name_ : name_ + .) +
n)
+: ent;
}
} else {
-++iterator_;
+cursor_.clear();
+findCursor();
}
}
+return rtl::Reference Entity ();
+}
+
+void AggregatingCursor::findCursor() {
+for (; !cursor_.is() iterator_ != providers_.end(); ++iterator_) {
+if (name_.isEmpty()) {
+cursor_ = (*iterator_)-createRootCursor();
+} else {
+rtl::Reference Entity ent((*iterator_)-findEntity(name_));
+if (ent.is() ent-getSort() == Entity::SORT_MODULE) {
+cursor_ =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/bin
solenv/bin/modules/installer/windows/feature.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit 5f4fa9754f6bb55204d4381cdfea1606d61b13b5
Author: Andras Timar andras.ti...@collabora.com
Date: Sat Oct 12 10:00:51 2013 -0700
fdo#33798 msidbFeatureAttributesUIDisallowAbsent for hidden feat.
Change-Id: I0c8788f88b3c219e789af7f8bfa79e5dd31c5b3a
Reviewed-on: https://gerrit.libreoffice.org/6233
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index 602beaf..f360337 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -179,6 +179,7 @@ sub get_feature_attributes
if ( $onefeature-{'ParentID'} ) { $parentgid = $onefeature-{'ParentID'};
}
if (( $parentgid eq ) || ( $parentgid eq
$installer::globals::rootmodulegid )) { $attributes = 8; }
+elsif ( get_feature_display($onefeature) eq 0 ) { $attributes = 26; }
# fdo#33798
else { $attributes = 10; }
return $attributes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - solenv/bin sot/source
solenv/bin/modules/installer/windows/feature.pm |1 +
sot/source/sdstor/stgstrms.cxx | 15 +++
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit e09cdbcf83cb71de5f59f4609b244b104a584089
Author: Armin Le Grand a...@apache.org
Date: Wed Oct 16 16:47:38 2013 +0100
i123485 secured file import scanning existing pages
(cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036
and adapted to the rewritten scanBuildPageChainCache)
Reviewed-on: https://gerrit.libreoffice.org/6272
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
(cherry picked from commit dfa1afd0e8b7ae9c706c4a3171a04752e24230b0)
Conflicts:
sot/source/sdstor/stgstrms.cxx
Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162
Reviewed-on: https://gerrit.libreoffice.org/6375
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index b2c94ef..dae953f 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.cxx
@@ -23,6 +23,7 @@
#include sal/log.hxx
#include osl/file.hxx
#include tools/tempfile.hxx
+#include set
#include sot/stg.hxx
#include stgelem.hxx
@@ -341,16 +342,22 @@ void StgStrm::scanBuildPageChainCache(sal_Int32
*pOptionalCalcSize)
bool bError = false;
sal_Int32 nBgn = nStart;
-sal_Int32 nOldBgn = -1;
sal_Int32 nOptSize = 0;
-while( nBgn = 0 nBgn != nOldBgn )
+
+// Track already scanned PageNumbers here and use them to
+// see if an already counted page is re-visited
+std::set sal_Int32 nUsedPageNumbers;
+
+while( nBgn = 0 !bError )
{
if( nBgn = 0 )
m_aPagesCache.push_back(nBgn);
-nOldBgn = nBgn;
nBgn = pFat-GetNextPage( nBgn );
-if( nBgn == nOldBgn )
+
+//returned second is false if it already exists
+if (!nUsedPageNumbers.insert(nBgn).second)
bError = true;
+
nOptSize += nPageSize;
}
if (bError)
commit 9404457a19178b42ea40ebd710725520a83c85ef
Author: Andras Timar andras.ti...@collabora.com
Date: Sat Oct 12 10:00:51 2013 -0700
fdo#33798 msidbFeatureAttributesUIDisallowAbsent for hidden feat.
Change-Id: I0c8788f88b3c219e789af7f8bfa79e5dd31c5b3a
Reviewed-on: https://gerrit.libreoffice.org/6234
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/solenv/bin/modules/installer/windows/feature.pm
b/solenv/bin/modules/installer/windows/feature.pm
index c22b864..ddc458a 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -189,6 +189,7 @@ sub get_feature_attributes
if ( $onefeature-{'ParentID'} ) { $parentgid = $onefeature-{'ParentID'};
}
if (( $parentgid eq ) || ( $parentgid eq
$installer::globals::rootmodulegid )) { $attributes = 8; }
+elsif ( get_feature_display($onefeature) eq 0 ) { $attributes = 26; }
# fdo#33798
else { $attributes = 10; }
return $attributes
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - vcl/source
vcl/source/filter/jpeg/Exif.cxx | 55 ++--
vcl/source/filter/jpeg/Exif.hxx |3 +-
2 files changed, 49 insertions(+), 9 deletions(-)
New commits:
commit 69f026fc37cc5be080c02497e8fe3e0b88efa913
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 15 10:21:35 2013 +0100
swap if the host endianness doesn't match the file formats
Change-Id: I0b4c2ba6679c8d2754f2a7cd8b8f693db335e004
Reviewed-on: https://gerrit.libreoffice.org/6408
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 3a4b2d3..cf64f9b 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -156,7 +156,7 @@ bool Exif::processJpeg(SvStream rStream, bool bSetValue)
return false;
}
-bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bMoto)
+bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue, bool bSwap)
{
ExifIFD* ifd = NULL;
@@ -164,7 +164,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
{
ifd = (ExifIFD*) pExifData[aOffset];
sal_uInt16 tag = ifd-tag;
-if (bMoto)
+if (bSwap)
{
tag = OSL_SWAPWORD(ifd-tag);
}
@@ -177,7 +177,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
ifd-type = 3;
ifd-count = 1;
ifd-offset = maOrientation;
-if (bMoto)
+if (bSwap)
{
ifd-tag = OSL_SWAPWORD(ifd-tag);
ifd-offset = OSL_SWAPWORD(ifd-offset);
@@ -186,7 +186,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16
aLength, sal_uInt16 aOffs
else
{
sal_uInt32 nIfdOffset = ifd-offset;
-if (bMoto)
+if (bSwap)
nIfdOffset = OSL_SWAPWORD(ifd-offset);
maOrientation = convertToOrientation(nIfdOffset);
}
@@ -224,37 +224,46 @@ bool Exif::processExif(SvStream rStream, sal_uInt16
aSectionLength, bool bSetVa
TiffHeader* aTiffHeader = (TiffHeader*) aExifData[0];
-if(!(
-(0x4949 == aTiffHeader-byteOrder 0x2A00 != aTiffHeader-tagAlign )
|| // Intel format
-( 0x4D4D == aTiffHeader-byteOrder 0x002A != aTiffHeader-tagAlign
) // Motorola format
-)
- )
+bool bIntel = aTiffHeader-byteOrder == 0x4949; //big-endian
+bool bMotorola = aTiffHeader-byteOrder == 0x4D4D; //little-endian
+
+if (!bIntel !bMotorola)
{
delete[] aExifData;
return false;
}
-bool bMoto = true; // Motorola, big-endian by default
+bool bSwap = false;
+
+#ifdef OSL_BIGENDIAN
+if (bIntel)
+bSwap = true;
+#else
+if (bMotorola)
+bSwap = true;
+#endif
-if (aTiffHeader-byteOrder == 0x4949)
+if (bSwap)
{
-bMoto = false; // little-endian
+aTiffHeader-tagAlign = OSL_SWAPWORD(aTiffHeader-tagAlign);
+aTiffHeader-offset = OSL_SWAPDWORD(aTiffHeader-offset);
}
-sal_uInt16 aOffset = 0;
-aOffset = aTiffHeader-offset;
-if (bMoto)
+if (aTiffHeader-tagAlign != 0x002A) // TIFF tag
{
-aOffset = OSL_SWAPDWORD(aTiffHeader-offset);
+delete[] aExifData;
+return false;
}
+sal_uInt16 aOffset = aTiffHeader-offset;
+
sal_uInt16 aNumberOfTags = aExifData[aOffset];
-if (bMoto)
+if (bSwap)
{
aNumberOfTags = ((aExifData[aOffset] 8) | aExifData[aOffset+1]);
}
-processIFD(aExifData, aLength, aOffset+2, aNumberOfTags, bSetValue, bMoto);
+processIFD(aExifData, aLength, aOffset+2, aNumberOfTags, bSetValue, bSwap);
if (bSetValue)
{
commit fc7b83af9865bfd937cf45242781a8d7677f6204
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Oct 15 07:57:52 2013 +0200
fdo#57659: fix exif processing
Change-Id: I93bd132b1d536843d4d8627230bfa9ef22cd623b
Reviewed-on: https://gerrit.libreoffice.org/6245
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/6407
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index f44b54f..3a4b2d3 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -156,15 +156,20 @@ bool Exif::processJpeg(SvStream rStream, bool bSetValue)
return false;
}
-bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16 aNumberOfTags, bool bSetValue)
+bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16
aOffset, sal_uInt16
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/cmis/cmis_repo_content.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 118116a67fb80863ebf3981a164d725b19c61e2e Author: Arnaud Versini arnaud.vers...@libreoffice.org Date: Mon Oct 28 14:20:55 2013 +0100 UCB: RepoContent::RepoContent use OUString::startsWith instead copy. Change-Id: Ib504585572ae9bada60076828ade8197331d5fda Reviewed-on: https://gerrit.libreoffice.org/6463 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 44ef278..c3e6059 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -54,9 +54,7 @@ namespace cmis SAL_INFO( ucb.ucp.cmis, RepoContent::RepoContent() sURL ); m_sRepositoryId = m_aURL.getObjectPath( ); -if ( m_sRepositoryId[0] == '/' ) -m_sRepositoryId = m_sRepositoryId.copy( 1 ); - +m_sRepositoryId.startsWith(/, m_sRepositoryId); } RepoContent::~RepoContent() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - scp2/source setup_native/Package_misc.mk setup_native/source solenv/bin
scp2/source/base/folderitem_base.scp |3 scp2/source/calc/folderitem_calc.scp |3 scp2/source/draw/folderitem_draw.scp |3 scp2/source/impress/folderitem_impress.scp|3 scp2/source/math/folderitem_math.scp |3 scp2/source/ooo/common_brand.scp | 11 +++ scp2/source/ooo/folderitem_ooo.scp| 13 ++-- scp2/source/writer/folderitem_writer.scp |3 setup_native/Package_misc.mk |1 setup_native/source/win32/desktophelper.txt |1 solenv/bin/modules/installer.pm |2 solenv/bin/modules/installer/globals.pm |2 solenv/bin/modules/installer/setupscript.pm | 31 + solenv/bin/modules/installer/windows/component.pm |7 ++ solenv/bin/modules/installer/windows/file.pm | 24 +++ solenv/bin/modules/installer/windows/property.pm |3 solenv/bin/modules/installer/windows/registry.pm | 38 solenv/bin/modules/installer/windows/shortcut.pm | 69 +- solenv/bin/modules/t/installer-setupscript.t |1 19 files changed, 205 insertions(+), 16 deletions(-) New commits: commit d8e049d4e3971632eb08692905c60130731d9980 Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 25 06:38:06 2013 -0700 fdo#65102 respect user's choice not to install desktop icon Using advertised shortcuts -- inspired by Intel AppUp Centre's requirement -- was not a good idea after all. I revert this, and I also revert the commit that actually disabled it in default Windows builds. This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e. This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6. Change-Id: I5b465574f7a178fadcdca03a0fe0d68d76621341 Reviewed-on: https://gerrit.libreoffice.org/6437 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 2da4321..51a940b 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sbase Name = %PRODUCTNAME Base; -ModuleID = gid_Module_Brand_Prg_Base; +ModuleID = gid_Module_Prg_Base_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; IconFile = gid_File_Exe_Sbase; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE); End diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 83dd82b..05db68f 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Scalc Name = %PRODUCTNAME Calc; -ModuleID = gid_Module_Brand_Prg_Calc; +ModuleID = gid_Module_Prg_Calc_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; IconFile = gid_File_Exe_Scalc; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC); End diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index ba59ea7..f692707 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Sdraw Name = %PRODUCTNAME Draw; -ModuleID = gid_Module_Brand_Prg_Draw; +ModuleID = gid_Module_Prg_Draw_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; IconFile = gid_File_Exe_Sdraw; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW); End diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index fb5c136..44adbbe 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -21,13 +21,14 @@ #ifndef ENABLE_SILENT_MSI FolderItem gid_Folderitem_Simpress Name = %PRODUCTNAME Impress; -ModuleID = gid_Module_Brand_Prg_Impress; +ModuleID = gid_Module_Prg_Impress_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; IconFile = gid_File_Exe_Simpress; IconID = 0; WkDir = gid_Brand_Dir_Program; Parameter = ; +Styles = (NON_ADVERTISED); ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS); End diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 127773f..fb8bbcd 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -21,13 +21,14 @@ #ifndef
[Bug 69079] Creating a new themes in the gallery the files are always created as file new theme.* instead of sdxxx.* - existing files will be overwritten and leads to data loss.
https://bugs.freedesktop.org/show_bug.cgi?id=69079 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup |target:4.2.0|target:4.2.0 target:4.1.4 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Meeks committed a patch related to this issue. It has been pushed to libreoffice-4-1: http://cgit.freedesktop.org/libreoffice/core/commit/?id=41102212d49fd18643bba375d65963bd41008bc7h=libreoffice-4-1 fdo#69079 - fix multiple user gallery creations. It will be available in LibreOffice 4.1.4. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/core/text/portxt.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 66edf3c164176180c15dc768ce2b4518a9178183
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 29 10:58:18 2013 +
Resolves: fdo#69510 don't access beyond end of string
Change-Id: Ib5d60159ad75791371a7805ef8e211a4010d7608
(cherry picked from commit 47690627565bec866ea2de74b5504160479cff74)
Reviewed-on: https://gerrit.libreoffice.org/6472
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 7dff0bd..fd04016 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -160,7 +160,8 @@ static sal_Int32 lcl_AddSpace( const SwTxtSizeInfo rInf,
const OUString* pStr,
if ( bDoNotAddSpace )
return nCnt;
-for ( ; nPos nEnd; ++nPos )
+sal_Int32 nTxtEnd = std::min(nEnd, pStr-getLength());
+for ( ; nPos nTxtEnd; ++nPos )
{
if( CH_BLANK == (*pStr)[ nPos ] )
++nCnt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/ui/docvw/edtwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 46d4789bdf14208d927d58e7a871cb14c8c7f917
Author: Caolán McNamara caol...@redhat.com
Date: Thu Oct 24 10:19:36 2013 +0100
Resolves: fdo#70571 don't crash when clicking link in toc
when link is in a toc, and Cursor in protected areas is
disabled, causing the cursor to leap before the toc
before trying to see what's under the cursor in order
to jump to it
Change-Id: Iaf348e3621df02628b4d2ac8c1165df7082237ed
(cherry picked from commit e9ce405103036b2fa0ae26d331a6cfc3465de10b)
Reviewed-on: https://gerrit.libreoffice.org/6416
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 6e208f0..3dd87c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4368,7 +4368,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
}
else
{
-if ( bExecHyperlinks )
+if ( bExecHyperlinks aCntntAtPos.aFnd.pAttr
)
rSh.ClickToINetAttr(
*(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr
icon-themes/sifr/cmd/sc_arrowshapes.chevron.png |binary icon-themes/sifr/cmd/sc_arrowshapes.circular-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.corner-right-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.down-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.down-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.left-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.left-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.left-right-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.left-right-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.notched-right-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.pentagon-right.png |binary icon-themes/sifr/cmd/sc_arrowshapes.png |binary icon-themes/sifr/cmd/sc_arrowshapes.quad-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.quad-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.right-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.right-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.s-sharped-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.split-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.split-round-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.striped-right-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-down-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-down-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-right-arrow-callout.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-right-arrow.png |binary icon-themes/sifr/cmd/sc_arrowshapes.up-right-down-arrow.png |binary icon-themes/sifr/cmd/sc_basicshapes.block-arc.png |binary icon-themes/sifr/cmd/sc_basicshapes.can.png |binary icon-themes/sifr/cmd/sc_basicshapes.circle-pie.png |binary icon-themes/sifr/cmd/sc_basicshapes.circle.png |binary icon-themes/sifr/cmd/sc_basicshapes.cross.png |binary icon-themes/sifr/cmd/sc_basicshapes.cube.png |binary icon-themes/sifr/cmd/sc_basicshapes.diamond.png |binary icon-themes/sifr/cmd/sc_basicshapes.ellipse.png |binary icon-themes/sifr/cmd/sc_basicshapes.frame.png |binary icon-themes/sifr/cmd/sc_basicshapes.hexagon.png |binary icon-themes/sifr/cmd/sc_basicshapes.isosceles-triangle.png |binary icon-themes/sifr/cmd/sc_basicshapes.octagon.png |binary icon-themes/sifr/cmd/sc_basicshapes.paper.png |binary icon-themes/sifr/cmd/sc_basicshapes.parallelogram.png |binary icon-themes/sifr/cmd/sc_basicshapes.pentagon.png |binary icon-themes/sifr/cmd/sc_basicshapes.png |binary icon-themes/sifr/cmd/sc_basicshapes.quadrat.png |binary icon-themes/sifr/cmd/sc_basicshapes.rectangle.png |binary icon-themes/sifr/cmd/sc_basicshapes.right-triangle.png |binary icon-themes/sifr/cmd/sc_basicshapes.ring.png |binary icon-themes/sifr/cmd/sc_basicshapes.round-quadrat.png |binary icon-themes/sifr/cmd/sc_basicshapes.round-rectangle.png |binary icon-themes/sifr/cmd/sc_basicshapes.trapezoid.png |binary icon-themes/sifr/cmd/sc_bezier_unfilled.png |binary icon-themes/sifr/cmd/sc_bezierfill.png |binary icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png |binary icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png |binary icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png |binary icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png |binary icon-themes/sifr/cmd/sc_calloutshapes.png |binary icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png |binary
Re: Serious problems with Arabic text rendering
On Tue, Oct 29, 2013 at 03:48:01PM +0330, Hossein Noorikhah wrote: Hi, Starting with version LibreOffice 3.6, we had some issues with Arabic text rendering in LibreOffice. These issues got worse starting LO 4.0. I hoped that patches which some developers provided [1], may fix the bugs. But right now I'm using LO v4.1.2.3 and nearly most of the problems that have been fixed in OpenOffice versions prior to 3.0 are now visible again. For example these are serious and were all fixed prior to OpenOffice 3.0: 1. Text rendering cuts and continues out of the border. (attached picture 1) On what OS is that? Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Serious problems with Arabic text rendering
Salaam, I'm using Microsoft Windows 7, but other users using Ubuntu Linux reported similar problems. Hossein 2013/10/29 Khaled Hosny khaledho...@eglug.org On Tue, Oct 29, 2013 at 03:48:01PM +0330, Hossein Noorikhah wrote: Hi, Starting with version LibreOffice 3.6, we had some issues with Arabic text rendering in LibreOffice. These issues got worse starting LO 4.0. I hoped that patches which some developers provided [1], may fix the bugs. But right now I'm using LO v4.1.2.3 and nearly most of the problems that have been fixed in OpenOffice versions prior to 3.0 are now visible again. For example these are serious and were all fixed prior to OpenOffice 3.0: 1. Text rendering cuts and continues out of the border. (attached picture 1) On what OS is that? Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76343810f6d11fc9b380f0d91503ff6c83475ca2 Author: László Németh nem...@numbertext.org Date: Tue Oct 29 13:50:22 2013 +0100 Updated core Project: help 095662e815939e3819e055fc48e5853355671788 diff --git a/helpcontent2 b/helpcontent2 index 27623e8..095662e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 27623e809f6dc1f7e5aea9484cff1c294b2673b7 +Subproject commit 095662e815939e3819e055fc48e5853355671788 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/swriter/librelogo/LibreLogo.xhp | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 095662e815939e3819e055fc48e5853355671788 Author: László Németh nem...@numbertext.org Date: Tue Oct 29 13:50:22 2013 +0100 update librelogo (SVG/SMIL animations, PENCAP...) Change-Id: I659b0d8881f338b11a2acd1cbf1ad3e0a6dde26f diff --git a/source/text/swriter/librelogo/LibreLogo.xhp b/source/text/swriter/librelogo/LibreLogo.xhp index ea92171..1aed424 100644 --- a/source/text/swriter/librelogo/LibreLogo.xhp +++ b/source/text/swriter/librelogo/LibreLogo.xhp @@ -44,6 +44,8 @@ paragraph role=paragraph xml-lang=en-US id=par_390To reset the command line click triple in it or press Ctrl-A to select the previous commands, and type the new commands./paragraph paragraph role=heading level=2 xml-lang=en-US id=hd_400Syntax highlighting/Translating/paragraph paragraph role=paragraph xml-lang=en-US id=par_410It expands and upper case Logo commands in the Writer document. Change the language of the document (Tools » Options » Language Settings » Languages » Western) and click on this icon to translate the Logo program to the selected language./paragraph +paragraph role=heading level=2 xml-lang=en-US id=hd_413Graphical user interface of basic turtle settings/paragraph +paragraph role=paragraph xml-lang=en-US id=par_415Turtle shape of LibreLogo is a normal fixed size drawing object. You can positionate and rotate it on standard way, too, using the mouse and the Rotate icon of the Drawing Object Properties toolbar. Modify Line Width, Line Color and Area Color settings of the turtle shape to set PENSIZE, PENCOLOR and FILLCOLOR attributes of LibreLogo./paragraph paragraph role=heading level=2 xml-lang=en-US id=hd_420Program editing/paragraph paragraph role=paragraph xml-lang=en-US id=par_430LibreLogo drawings and programs use the same Writer document. The LibreLogo canvas is on the first page of the Writer document. You can insert a page break before the LibreLogo programs and set the zoom/font size for a comfortable two page layout for LibreLogo programming: left (first) page is the canvas, right (second) page is for the LibreLogo programs./paragraph paragraph role=heading level=1 xml-lang=en-US id=hd_440LibreLogo programming language/paragraph @@ -150,6 +152,8 @@ paragraph role=logocode xml-lang=en-US id=par_1130 PENSIZE 100 ; line width is 100 pointsbr/ PENSIZE ANY ; equivalent of PENSIZE RANDOM 10br//paragraph paragraph role=heading level=3 xml-lang=en-US id=hd_1140PENCOLOR/PENCOLOUR (pc)/paragraph paragraph role=logocode xml-lang=en-US id=par_1150 PENCOLOR âredâ ; set red pen color (by color name, see color constants)br/ PENCOLOR [255, 255, 0] ; set yellow color (RGB list)br/ PENCOLOR 0x00 ; set yellow color (hexa code)br/ PENCOLOR 0 ; set black color (0x00)br/ PENCOLOR ANY ; random colorbr/ PENCOLOR [5] ; set red color (by color identifier, see color constants)br/ PENCOLOR âinvisibleâ ; invisible pen color for shapes without visible outlinebr/ PENCOLOR â~redâ ; set random red colorbr//paragraph +paragraph role=heading level=3 xml-lang=en-US id=hd_1153PENCAP/LINECAP/paragraph +paragraph role=logocode xml-lang=en-US id=par_1155 PENCAP ânoneâ ; without extra line end (default)br/ PENCAP âroundâ ; rounded line endbr/ PENCAP âsquareâ ; square line endbr//paragraph paragraph role=heading level=3 xml-lang=en-US id=hd_1160PENJOINT/LINEJOINT/paragraph paragraph role=logocode xml-lang=en-US id=par_1170 PENJOINT âroundedâ ; rounded line joint (default)br/ PENJOINT âmiterâ ; sharp line jointbr/ PENJOINT âbevelâ ; bevel line jointbr/ PENJOINT ânoneâ ; without line jointbr//paragraph paragraph role=heading level=3 xml-lang=en-US id=hd_1180PENSTYLE/paragraph @@ -195,7 +199,7 @@ paragraph role=listitem xml-lang=en-US id=par_1540starting new line shapes;/paragraph /listitem listitem -paragraph role=listitem xml-lang=en-US id=par_1545file saving;/paragraph +paragraph role=listitem xml-lang=en-US id=par_1545saving SVG images and SVG/SMIL animations;/paragraph /listitem listitem paragraph role=listitem xml-lang=en-US id=par_1550keeping the consistency of positions and line shapes at the left border./paragraph @@ -207,8 +211,10 @@ paragraph role=logocode xml-lang=en-US id=par_1590 TO tree locationbr/ PENUP POSITION location HEADING 0 PENDOWNbr/ PICTURE [ FORWARD 100 CIRCLE 100 ] ; tree-like grouped shapebr/ ENDbr/ br/ PICTURE [ tree [30, 50] tree [100, 50] ] ; grouped shapes in a grouped shapebr//paragraph paragraph role=heading level=3 xml-lang=en-US id=hd_1600Starting new line shapes/paragraph paragraph role=logocode xml-lang=en-US id=par_1610 PICTURE ; start a new line shapebr/ FORWARD 10 PICTURE FORWARD 10 ; two line shapesbr//paragraph -paragraph role=heading level=3 xml-lang=en-US id=hd_1614File saving
[Libreoffice-commits] core.git: sd/sdi sd/source
sd/sdi/SlideSorterController.sdi |6 --
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |4
2 files changed, 10 deletions(-)
New commits:
commit 637033d67c11582abaef43b1d16d3ba4e5653a0d
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Sat Oct 5 13:47:45 2013 +0200
fdo#33848 Show zoom Slider when the focus is on the Slides Sidebar
Inspired by this patch from Ariel
Constenla-Haile:https://issues.apache.org/ooo/attachment.cgi?id=80653action=diff
Change-Id: I8e482d9829eeb81a1f7cc89a4de781ae768f
Reviewed-on: https://gerrit.libreoffice.org/6141
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 36ddbd8..4c5787a 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -186,12 +186,6 @@ interface SlideSorterView
ExecMethod = ExecStatusBar ;
StateMethod = GetStatusBarState ;
]
-SID_ATTR_ZOOMSLIDER // status()
-[
-ExecMethod = ExecStatusBar ;
-StateMethod = GetStatusBarState ;
-]
-
SID_RELOAD // ole : no, status : ?
[
GroupId = GID_DOCUMENT ;
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 7e31285..715ecef 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -876,10 +876,6 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
aLayoutStr = aLayoutStr.copy(0, nIndex);
rSet.Put( SfxStringItem( SID_STATUS_LAYOUT, aLayoutStr ) );
}
-if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_ZOOMSLIDER ) )
-{
-rSet.Put( SfxVoidItem( SID_ATTR_ZOOMSLIDER ) );
-}
}
void SlotManager::ShowSlideShow( SfxRequest rReq)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 33848] UI – Zoom slider should not hide when Slides sidebar is in use
https://bugs.freedesktop.org/show_bug.cgi?id=33848 Samuel M. s.mehrbr...@gmail.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 33848] UI – Zoom slider should not hide when Slides sidebar is in use
https://bugs.freedesktop.org/show_bug.cgi?id=33848 --- Comment #16 from Samuel M. s.mehrbr...@gmail.com --- Fixed. You might test a daily build to verify it (should be a build from tomorrow): http://dev-builds.libreoffice.org/daily/master/Win-x86@42/current/ -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 33848] UI – Zoom slider should not hide when Slides sidebar is in use
https://bugs.freedesktop.org/show_bug.cgi?id=33848 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack|EasyHack |DifficultyInteresting |DifficultyInteresting |SkillCpp|SkillCpp target:4.2.0 --- Comment #17 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Samuel Mehrbrodt committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=637033d67c11582abaef43b1d16d3ba4e5653a0d fdo#33848 Show zoom Slider when the focus is on the Slides Sidebar The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx | 41
1 file changed, 21 insertions(+), 20 deletions(-)
New commits:
commit 6bd50778ae8427dce7bd87f404cbaa9b6634ef1f
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date: Fri Sep 13 16:35:08 2013 +0200
fdo#67461 add multiple selection support to hide/show multiple styles
With commit 439ac45925039aa7a537feedab3e731e8a60a8e5 I only add support
to delete multiple styles.
Hereby I add the possibility to hide and show multiple styles too.
Change-Id: I46a8400c281c87b2881367f89ee92db2ba77bfb2
Reviewed-on: https://gerrit.libreoffice.org/5935
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 0c0869c..9a71b55 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2135,8 +2135,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
{
if ( IsInitialized() HasSelectedStyle() )
{
-bool bUsedStyle = 0; // one of the selected styles are used in the
document?
-OUString aRet;
+bool bUsedStyle = false; // one of the selected styles are used in
the document?
std::vectorSvTreeListEntry* aList;
SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
@@ -2148,13 +2147,10 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
while (pEntry)
{
aList.push_back( pEntry );
+
// check the style is used or not
-if (pTreeBox)
-aRet = pTreeBox-GetEntryText( pEntry );
-else
-aRet = aFmtLb.GetEntryText( pEntry );
-const OUString aTemplName( aRet );
+OUString aTemplName = aFmtLb.GetEntryText( pEntry );
SfxStyleSheetBase* pStyle = pStyleSheetPool-Find( aTemplName,
pItem-GetFamily(), SFXSTYLEBIT_ALL );
@@ -2163,13 +2159,13 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
if (bUsedStyle) // add a separator for the second and later
styles
aMsg += , ;
aMsg += aTemplName;
-bUsedStyle = 1;
+bUsedStyle = true;
}
pEntry = aFmtLb.NextSelected( pEntry );
}
-bool aApproved = 0;
+bool aApproved = false;
// we only want to show the dialog once and if we want to delete a
style in use (UX-advice)
if ( bUsedStyle )
@@ -2189,12 +2185,8 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
for (; it != itEnd; ++it)
{
-if (pTreeBox)
-aRet = pTreeBox-GetEntryText( *it );
-else
-aRet = aFmtLb.GetEntryText( *it );
+OUString aTemplName = aFmtLb.GetEntryText( *it );
-const OUString aTemplName( aRet );
PrepareDeleteAction();
bDontUpdate = sal_True; // To prevent the Treelistbox to shut
down while deleting
Execute_Impl( SID_STYLE_DELETE, aTemplName,
@@ -2216,26 +2208,35 @@ void SfxCommonTemplateDialog_Impl::HideHdl(void *)
{
if ( IsInitialized() HasSelectedStyle() )
{
-const OUString aTemplName( GetSelectedEntry() );
-SfxStyleSheetBase* pStyle = GetSelectedStyle();
-if ( pStyle )
+SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
+
+while (pEntry)
{
+OUString aTemplName = aFmtLb.GetEntryText( pEntry );
+
Execute_Impl( SID_STYLE_HIDE, aTemplName,
OUString(),
(sal_uInt16)GetFamilyItem_Impl()-GetFamily() );
+
+pEntry = aFmtLb.NextSelected( pEntry );
}
}
}
void SfxCommonTemplateDialog_Impl::ShowHdl(void *)
{
+
if ( IsInitialized() HasSelectedStyle() )
{
-const OUString aTemplName( GetSelectedEntry() );
-SfxStyleSheetBase* pStyle = GetSelectedStyle();
-if ( pStyle )
+SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
+
+while (pEntry)
{
+OUString aTemplName = aFmtLb.GetEntryText( pEntry );
+
Execute_Impl( SID_STYLE_SHOW, aTemplName,
OUString(),
(sal_uInt16)GetFamilyItem_Impl()-GetFamily() );
+
+pEntry = aFmtLb.NextSelected( pEntry );
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/dialog/templdlg.cxx | 41 ++--
1 file changed, 19 insertions(+), 22 deletions(-)
New commits:
commit 38b8e742872b2cbdba93f4d1b84c8f09b5ab38ff
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 29 13:42:31 2013 +
Related: fdo#67461 consider hierarchical view
check for pTreeBox in the show/hide cases.
assume pTreeBox means single-select hierarchical mode
(select a few things in list mode, then switch to
hierarchical view, it doesn't make sense then to
care what is selected in the hidden list view)
Change-Id: I8ee08e578e66e14d8dea6cd7a66c1dbbbedcd6d1
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 9a71b55..b970622 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1183,7 +1183,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const
OUString rStr)
aFmtLb.MakeVisible( pEntry );
aFmtLb.SelectAll(false);
aFmtLb.Select( pEntry );
-bWaterDisabled = (aFmtLb.GetSelectionCount() =1 ?
sal_False : sal_True);
+bWaterDisabled = (pTreeBox || aFmtLb.GetSelectionCount()
= 1) ? sal_False : sal_True;
FmtSelectHdl( NULL );
}
}
@@ -1455,7 +1455,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const
SfxBoolItem *pItem)
if(!bWaterDisabled)
//make sure the watercan is only activated when there is (only) one
selection
-bWaterDisabled = (aFmtLb.GetSelectionCount() =1 ? sal_False :
sal_True);
+bWaterDisabled = (pTreeBox || aFmtLb.GetSelectionCount() = 1) ?
sal_False : sal_True;
if(pItem !bWaterDisabled)
{
@@ -1802,7 +1802,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
if ( !pItem || aDeleted )
return sal_False;
-if ( (nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId)
(aFmtLb.GetSelectionCount() = 1) )
+if ( (nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId) (pTreeBox ||
aFmtLb.GetSelectionCount() = 1) )
{
SfxUInt16Item *pFilterItem = PTR_CAST(SfxUInt16Item, pItem);
OSL_ENSURE(pFilterItem, SfxUINT16Item expected);
@@ -1919,7 +1919,7 @@ void
SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
sal_Bool bCheck;
SfxBoolItem aBool;
// when a template is chosen.
-if(!bState aFmtLb.GetSelectionCount())
+if (!bState HasSelectedStyle())
{
const OUString aTemplName(
GetSelectedEntry());
@@ -2071,7 +2071,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl,
StyleTreeListBox_Impl *, pBox
void SfxCommonTemplateDialog_Impl::NewHdl(void *)
{
OUString aEmpty;
-if ( nActFamily != 0x (aFmtLb.GetSelectionCount() = 1))
+if ( nActFamily != 0x (pTreeBox || aFmtLb.GetSelectionCount() = 1))
{
Window* pTmp;
pTmp = Application::GetDefDialogParent();
@@ -2138,7 +2138,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
bool bUsedStyle = false; // one of the selected styles are used in
the document?
std::vectorSvTreeListEntry* aList;
-SvTreeListEntry* pEntry = aFmtLb.FirstSelected();
+SvTreeListEntry* pEntry = pTreeBox ? pTreeBox-FirstSelected() :
aFmtLb.FirstSelected();
const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
OUString aMsg = SfxResId(STR_DELETE_STYLE_USED).toString();
@@ -2147,10 +2147,8 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
while (pEntry)
{
aList.push_back( pEntry );
-
// check the style is used or not
-
-OUString aTemplName = aFmtLb.GetEntryText( pEntry );
+const OUString aTemplName(pTreeBox ?
pTreeBox-GetEntryText(pEntry) : aFmtLb.GetEntryText(pEntry));
SfxStyleSheetBase* pStyle = pStyleSheetPool-Find( aTemplName,
pItem-GetFamily(), SFXSTYLEBIT_ALL );
@@ -2162,7 +2160,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
bUsedStyle = true;
}
-pEntry = aFmtLb.NextSelected( pEntry );
+pEntry = pTreeBox ? pTreeBox-NextSelected(pEntry) :
aFmtLb.NextSelected(pEntry);
}
bool aApproved = false;
@@ -2185,8 +2183,7 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
for (; it != itEnd; ++it)
{
-OUString aTemplName = aFmtLb.GetEntryText( *it );
-
+const OUString aTemplName(pTreeBox ?
pTreeBox-GetEntryText(*it) : aFmtLb.GetEntryText(*it));
PrepareDeleteAction();
bDontUpdate = sal_True; // To prevent the Treelistbox to shut
down while deleting
Execute_Impl( SID_STYLE_DELETE, aTemplName,
@@ -2208,16 +2205,16 @@ void SfxCommonTemplateDialog_Impl::HideHdl(void *)
{
if
Re: Serious problems with Arabic text rendering
On Tue, Oct 29, 2013 at 04:15:08PM +0330, Hossein Noorikhah wrote: Salaam, I'm using Microsoft Windows 7, but other users using Ubuntu Linux reported similar problems. I'd be interested in Linux reports of issue 1 (issue 2 is hopeless, I have a vague idea how to fix the root of it, instead of band-aiding it allover the place, but it is too much work than I can afford). Regards, Khaled Hossein 2013/10/29 Khaled Hosny khaledho...@eglug.org On Tue, Oct 29, 2013 at 03:48:01PM +0330, Hossein Noorikhah wrote: Hi, Starting with version LibreOffice 3.6, we had some issues with Arabic text rendering in LibreOffice. These issues got worse starting LO 4.0. I hoped that patches which some developers provided [1], may fix the bugs. But right now I'm using LO v4.1.2.3 and nearly most of the problems that have been fixed in OpenOffice versions prior to 3.0 are now visible again. For example these are serious and were all fixed prior to OpenOffice 3.0: 1. Text rendering cuts and continues out of the border. (attached picture 1) On what OS is that? Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/startcenter.ui | 178 +++- 1 file changed, 105 insertions(+), 73 deletions(-) New commits: commit 298305d2c0f7ad4166345814633060b26dec3976 Author: Krisztian Pinter pin.termina...@gmail.com Date: Fri Oct 18 10:43:02 2013 +0200 startcenter: Tweak StartCenter buttons and hotkeys Change-Id: Ica8bf110c3a76c47417a77488657e08ee2456ac7 Reviewed-on: https://gerrit.libreoffice.org/6312 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui index d58a03b..fd3acad 100644 --- a/sfx2/uiconfig/ui/startcenter.ui +++ b/sfx2/uiconfig/ui/startcenter.ui @@ -22,72 +22,21 @@ property name=can_focusFalse/property property name=pixbufres/odb_16_8.png/property /object - object class=GtkImage id=draw_all_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufres/odg_16_8.png/property - /object object class=GtkImage id=draw_image property name=visibleTrue/property property name=can_focusFalse/property property name=pixbufres/odg_16_8.png/property /object - object class=GtkImage id=impress_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufres/odp_16_8.png/property - /object - object class=GtkImage id=impress_all_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=tooltip_text translatable=yesNew Presentation/property -property name=pixbufres/odp_16_8.png/property - /object - object class=GtkImage id=math_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufres/odf_16_8.png/property - /object - object class=GtkImage id=math_all_image + object class=GtkImage id=draw_all_image property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufres/odf_16_8.png/property +property name=pixbufres/odg_16_8.png/property /object object class=GtkImage id=open_image5 property name=visibleTrue/property property name=can_focusFalse/property property name=pixbufcmd/sc_open.png/property /object - object class=GtkImage id=open_image6 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufcmd/sc_open.png/property - /object - object class=GtkImage id=open_image10 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufcmd/sc_open.png/property - /object - object class=GtkImage id=open_image7 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufcmd/sc_open.png/property - /object - object class=GtkImage id=open_image -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufcmd/sc_open.png/property - /object - object class=GtkImage id=open_image8 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufcmd/sc_open.png/property - /object - object class=GtkImage id=open_image9 -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixbufcmd/sc_open.png/property - /object object class=GtkBox id=StartCenter property name=can_focusFalse/property child @@ -132,12 +81,14 @@ property name=column_spacing6/property child object class=GtkButton id=writer_all +property name=label translatable=yesText _Document/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property property name=tooltip_text translatable=yesNew Document/property property name=imagewriter_all_image/property property name=reliefnone/property +property name=use_underlineTrue/property /object packing property name=left_attach2/property @@ -148,12 +99,14 @@ /child child object class=GtkButton id=calc_all +property name=label translatable=yes_Spreadsheet/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property property name=tooltip_text translatable=yesNew Spreadsheet/property property name=imagecalc_all_image/property
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/swabstdlg.hxx |3 ++-
sw/source/ui/dialog/swdlgfact.cxx |5 +
sw/source/ui/dialog/swdlgfact.hxx |1 +
sw/source/ui/wrtsh/wrtsh2.cxx | 38 --
4 files changed, 44 insertions(+), 3 deletions(-)
New commits:
commit eb42610c43b1011cde0af8b03d20ec70e4e789b5
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Wed Oct 16 10:07:08 2013 +0200
sw: clone InputField dialog on input-field removal
Setup a listener on RES_FIELD_DELETED event, and cancel dialog if
a field is deleted. Add Cancellable capability to Input dialog too.
Fixes a crasher that occurs when fields are removed (e.g: by an
extension) while the InputField dialog is running.
Change-Id: I9e132a109cba3127b934a3baecbf445a2bde1377
Reviewed-on: https://gerrit.libreoffice.org/6261
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 32d1d37..e1f5d7c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -99,12 +99,13 @@ public:
virtual OUStringGetCurrShortName() const = 0;
};
-class AbstractFldInputDlg : public VclAbstractDialog
+class AbstractFldInputDlg : public VclAbstractTerminatedDialog
{
public:
//from class SalFrame
virtual void SetWindowState( const OString rStr ) = 0;
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL )
const = 0;
+virtual void EndDialog(long ) = 0;
};
class AbstractInsFootNoteDlg : public VclAbstractDialog
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index bfd44dd..e337589 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -414,6 +414,11 @@ OString AbstractFldInputDlg_Impl::GetWindowState(
sal_uLong nMask ) const
return pDlg-GetWindowState( nMask );
}
+void AbstractFldInputDlg_Impl::EndDialog(long n)
+{
+pDlg-EndDialog(n);
+}
+
OUString AbstractInsFootNoteDlg_Impl::GetFontName()
{
return pDlg-GetFontName();
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index fc80b86..09d5963 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -245,6 +245,7 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
//from class SalFrame
virtual void SetWindowState( const OString rStr ) ;
virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL )
const ;
+virtual void EndDialog(long);
};
class SwInsFootNoteDlg;
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 0e034e8..5604647 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -124,8 +124,11 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst,
sal_Bool bOnlyInSel )
else
bCancel = StartInputFldDlg( pField, sal_True, 0, aDlgPos);
-// Otherwise update error at multi-selection:
-pTmp-GetField( i )-GetTyp()-UpdateFlds();
+if (!bCancel)
+{
+// Otherwise update error at multi-selection:
+pTmp-GetField( i )-GetTyp()-UpdateFlds();
+}
}
pTmp-PopCrsr();
}
@@ -134,6 +137,28 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst,
sal_Bool bOnlyInSel )
delete pTmp;
}
+// Listener class: will close InputField dialog if input field(s)
+// is(are) deleted (for instance, by an extension) after the dialog shows up.
+// Otherwise, the for loop in SwWrtShell::UpdateInputFlds will crash when
doing:
+// 'pTmp-GetField( i )-GetTyp()-UpdateFlds();'
+// on a deleted field.
+class FieldDeletionModify : public SwModify
+{
+public:
+FieldDeletionModify(AbstractFldInputDlg* pInputFieldDlg) :
mpInputFieldDlg(pInputFieldDlg) {}
+
+void Modify( const SfxPoolItem* pOld, const SfxPoolItem *)
+{
+// Input fields have been deleted: better to close the dialog
+if (pOld-Which() == RES_FIELD_DELETED)
+{
+mpInputFieldDlg-EndDialog(RET_CANCEL);
+}
+}
+private:
+AbstractFldInputDlg* mpInputFieldDlg;
+};
+
// Start input dialog for a specific field
sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
@@ -146,7 +171,16 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld,
sal_Bool bNextButton,
OSL_ENSURE(pDlg, Dialogdiet fail!);
if(pWindowState !pWindowState-isEmpty())
pDlg-SetWindowState(*pWindowState);
+
+// Register for possible input field deletion while dialog is open
+FieldDeletionModify aModify(pDlg);
+GetDoc()-GetUnoCallBack()-Add(aModify);
+
sal_Bool bRet = RET_CANCEL == pDlg-Execute();
+
+// Dialog closed, remove modification listener
+
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24e5614da671f6809e8c9c2ced550e89ba0bca0a Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Sun Oct 27 01:19:54 2013 +0200 fdo#40077 Characters cropped in GTK-based ComboBox Change-Id: I589ddfee1f69f5e8ba74dcc6abf9afb97cdf367d Reviewed-on: https://gerrit.libreoffice.org/6444 Reviewed-by: Adolfo Jayme Barrientos f...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index a80112d..9821dee 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -2609,7 +2609,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, gint adjust_x = GTK_CONTAINER(gWidgetData[nScreen].gComboWidget)-border_width + nFocusWidth + nFocusPad; -gint adjust_y = adjust_x + gWidgetData[nScreen].gComboWidget-style-ythickness; +gint adjust_y = gWidgetData[nScreen].gComboWidget-style-ythickness; adjust_x += gWidgetData[nScreen].gComboWidget-style-xthickness; aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - 2 * adjust_x, aAreaRect.GetHeight() - 2 * adjust_y ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - include/touch sw/source
include/touch/touch.h |1 +
sw/source/core/view/viewsh.cxx | 10 ++
2 files changed, 11 insertions(+)
New commits:
commit 1d8592059259a3ccc5088516c3f14fc34e49c160
Author: Ptyl Dragon p...@cloudon.com
Date: Tue Oct 29 16:11:58 2013 +0200
added the touch_lo_get_content_size to touch.h
Change-Id: I53287cbc84f99b56f575479860c3e8f890c49a35
diff --git a/include/touch/touch.h b/include/touch/touch.h
index 979a8de..a480fb6 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -111,6 +111,7 @@ context, contextHeight, contextWidth specify where to draw.
*/
void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight,
int tilePosX, int tilePosY, int tileWidth, int tileHeight);
void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t
sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth,
size_t targetHeight);
+Size touch_lo_get_content_size();
void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
// Move the start of the selection to (x,y)
commit ae6ef002d3b4c5eef98a4751d3a6e04e6f1a7d9b
Author: Ptyl Dragon p...@cloudon.com
Date: Tue Oct 29 16:11:29 2013 +0200
added Size touch_lo_get_content_size()
Change-Id: I0874f511e217713ba695e55d07133378a33fced9
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index d64e1fa..9427b3d 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1815,6 +1815,16 @@ void touch_lo_draw_tile(void * context, int
contextWidth, int contextHeight, int
}
}
+extern C
+Size touch_lo_get_content_size()
+{
+SwWrtShell *pViewShell = GetActiveWrtShell();
+Size contentSize(0,0);
+if (pViewShell)
+{
+}
+return contentSize;
+}
#endif
extern C void touch_ui_selection_none() {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||66988 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #103 from Joel Madero jmadero@gmail.com --- Nominated bug 66988 Regression which makes LibreOffice lose the ability to print some borders. Also seems to affect performance. Simple test document available and bibisect is completed -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - include/touch sw/source vcl/ios
include/touch/touch.h |2 +-
sw/source/core/view/viewsh.cxx | 12
vcl/ios/iosinst.cxx| 11 +++
3 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit 8e22438b560121b74f588cef19891b4e2c3e45a6
Author: Ptyl Dragon p...@cloudon.com
Date: Tue Oct 29 16:22:06 2013 +0200
changed to CGSize
Change-Id: Ic84fcadf4332210693586825cdd8e32ef0f2a727
diff --git a/include/touch/touch.h b/include/touch/touch.h
index a480fb6..ae4f491 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -111,7 +111,7 @@ context, contextHeight, contextWidth specify where to draw.
*/
void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight,
int tilePosX, int tilePosY, int tileWidth, int tileHeight);
void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t
sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth,
size_t targetHeight);
-Size touch_lo_get_content_size();
+CGSize touch_lo_get_content_size();
void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
// Move the start of the selection to (x,y)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 9427b3d..c4a8dd8 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1772,7 +1772,6 @@ void ViewShell::PaintTile(OutputDevice *pOut, const
Rectangle rRect)
}
#if !HAVE_FEATURE_DESKTOP
-
extern C
void touch_lo_draw_tile(void * context, int contextWidth, int contextHeight,
int tilePosX, int tilePosY, int tileWidth, int tileHeight)
{
@@ -1814,17 +1813,6 @@ void touch_lo_draw_tile(void * context, int
contextWidth, int contextHeight, int
contextHeight);
}
}
-
-extern C
-Size touch_lo_get_content_size()
-{
-SwWrtShell *pViewShell = GetActiveWrtShell();
-Size contentSize(0,0);
-if (pViewShell)
-{
-}
-return contentSize;
-}
#endif
extern C void touch_ui_selection_none() {}
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 39208f5..d6e580a 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -415,6 +415,17 @@ touch_lo_copy_buffer(const void * source, size_t
sourceWidth, size_t sourceHeigh
}
extern C
+CGSize touch_lo_get_content_size()
+{
+CGSize contentSize = CGSizeMake(0,0);
+SalFrame *pFocus = IosSalInstance::getInstance()-getFocusFrame();
+if (pFocus)
+{
+}
+return contentSize;
+}
+
+extern C
void touch_lo_render_windows(void *context, int minX, int minY, int width, int
height)
{
CGContextRef cgContext = (CGContextRef) context;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source
sw/source/core/view/viewsh.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 43846931cbd1fa569e1bd463ddd63f3f5fd59ac2
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 18:00:39 2013 +0200
Need to acquire SolarMutex while using a VirtualDevice
Change-Id: I1f3b86a45bb26d07a0b738c7c2b264dc4a4013c8
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c4a8dd8..68ba9bb 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1782,6 +1782,9 @@ void touch_lo_draw_tile(void * context, int contextWidth,
int contextHeight, int
// parameter.
SwWrtShell *pViewShell = GetActiveWrtShell();
+// Creation, use and destruction of a VirtualDevice needs to be
+// protected by the SolarMutex, it seems.
+Application::AcquireSolarMutex(1);
if (pViewShell)
{
// TODO create a VirtualDevice based on SystemGraphicsData instead so
@@ -1812,6 +1815,7 @@ void touch_lo_draw_tile(void * context, int contextWidth,
int contextHeight, int
contextWidth,
contextHeight);
}
+Application::ReleaseSolarMutex();
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - include/touch sw/source vcl/ios
include/touch/touch.h | 15 ++-
sw/source/core/view/viewsh.cxx |9 +
vcl/ios/iosinst.cxx| 11 ---
3 files changed, 23 insertions(+), 12 deletions(-)
New commits:
commit 02cf93393fc0c0af8673008dee159a976acaeb3a
Author: Ptyl Dragon p...@cloudon.com
Date: Tue Oct 29 18:12:00 2013 +0200
created a long long unit for MLOContentSize
Change-Id: I41910058088161119d3cae8ca625d456652d890f
diff --git a/include/touch/touch.h b/include/touch/touch.h
index ae4f491..6ba2fab 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -69,6 +69,19 @@ typedef CGRect MLORect;
typedef basegfx::B2IBox MLORect;
#endif
+typedef long long MLOContentSizeDimension;
+struct MLOContentSize {
+MLOContentSizeDimension width;
+MLOContentSizeDimension height;
+};
+typedef struct MLOContentSize MLOContentSize;
+
+CG_INLINE MLOContentSize
+MLOContentSizeMake(MLOContentSizeDimension width, MLOContentSizeDimension
height)
+{
+MLOContentSize size; size.width = width; size.height = height; return size;
+}
+
void touch_ui_selection_start(MLOSelectionKind kind,
const void *documentHandle,
MLORect *rectangles,
@@ -111,7 +124,7 @@ context, contextHeight, contextWidth specify where to draw.
*/
void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight,
int tilePosX, int tilePosY, int tileWidth, int tileHeight);
void touch_lo_copy_buffer(const void * source, size_t sourceWidth, size_t
sourceHeight, size_t sourceBytesPerRow, void * target, size_t targetWidth,
size_t targetHeight);
-CGSize touch_lo_get_content_size();
+MLOContentSize touch_lo_get_content_size();
void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
// Move the start of the selection to (x,y)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 68ba9bb..1df00fed 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1817,6 +1817,15 @@ void touch_lo_draw_tile(void * context, int
contextWidth, int contextHeight, int
}
Application::ReleaseSolarMutex();
}
+extern C
+MLOContentSize touch_lo_get_content_size()
+{
+SwWrtShell *pViewShell = GetActiveWrtShell();
+if (pViewShell)
+{
+}
+return MLOContentSizeMake(0,0);
+}
#endif
extern C void touch_ui_selection_none() {}
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index d6e580a..39208f5 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -415,17 +415,6 @@ touch_lo_copy_buffer(const void * source, size_t
sourceWidth, size_t sourceHeigh
}
extern C
-CGSize touch_lo_get_content_size()
-{
-CGSize contentSize = CGSizeMake(0,0);
-SalFrame *pFocus = IosSalInstance::getInstance()-getFocusFrame();
-if (pFocus)
-{
-}
-return contentSize;
-}
-
-extern C
void touch_lo_render_windows(void *context, int minX, int minY, int width, int
height)
{
CGContextRef cgContext = (CGContextRef) context;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/floatwin.hxx |1 +
include/vcl/menu.hxx | 17 +++--
vcl/source/window/menu.cxx | 34 --
3 files changed, 40 insertions(+), 12 deletions(-)
New commits:
commit 0881ae68b0d7f977003e0798e52548caa2556f44
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 29 16:10:18 2013 +
Resolves: rhbz#1021915 force menubar menus to be up/down only
If a menu won't fit in the desired location the default mode is to place it
somewhere it will fit. e.g. above, left, right. For some cases, e.g.
menubars,
it's desirable to limit the options to above/below and force the menu to
scroll
if it won't fit
Change-Id: I1998a842d25752389ec9032e54673408d1ed6cb5
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 4e2f97c..9a9dbdc 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -48,6 +48,7 @@ class ToolBox;
#define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x8000)
#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ((sal_uLong)0x0001)
#define FLOATWIN_POPUPMODE_GRABFOCUS((sal_uLong)0x0002)
+#define FLOATWIN_POPUPMODE_NOHORZPLACEMENT ((sal_uLong)0x0004)
#define FLOATWIN_POPUPMODEEND_CANCEL((sal_uInt16)0x0001)
#define FLOATWIN_POPUPMODEEND_TEAROFF ((sal_uInt16)0x0002)
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 5579149..637c701 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -62,12 +62,17 @@ namespace vcl { struct MenuLayoutData; }
#define MENU_APPEND ((sal_uInt16)0x)
#define MENU_ITEM_NOTFOUND ((sal_uInt16)0x)
-#define POPUPMENU_EXECUTE_DOWN ((sal_uInt16)0x0001)
-#define POPUPMENU_EXECUTE_UP((sal_uInt16)0x0002)
-#define POPUPMENU_EXECUTE_LEFT ((sal_uInt16)0x0004)
-#define POPUPMENU_EXECUTE_RIGHT ((sal_uInt16)0x0008)
-
-#define POPUPMENU_NOMOUSEUPCLOSE ((sal_uInt16)0x0010)
+#define POPUPMENU_EXECUTE_DOWN ((sal_uInt16)0x0001)
+#define POPUPMENU_EXECUTE_UP ((sal_uInt16)0x0002)
+#define POPUPMENU_EXECUTE_LEFT ((sal_uInt16)0x0004)
+#define POPUPMENU_EXECUTE_RIGHT((sal_uInt16)0x0008)
+#define POPUPMENU_NOMOUSEUPCLOSE ((sal_uInt16)0x0010)
+//If there isn't enough space to put the menu where it wants
+//to go, then they will be autoplaced. Toggle this bit
+//on to force menus to be placed either above or below
+//the starting rectangle and shrunk to fit and then scroll rather than place
+//the menu beside that rectangle
+#define POPUPMENU_NOHORZ_PLACEMENT ((sal_uInt16)0x0020)
#define MENU_FLAG_NOAUTOMNEMONICS 0x0001
#define MENU_FLAG_HIDEDISABLEDENTRIES 0x0002
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index f567ba3..6083554 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3562,7 +3562,6 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const
Rectangle rRect, sal_
{
ENSURE_OR_RETURN( pExecWindow, PopupMenu::Execute: need a non-NULL
window!, 0 );
-
sal_uLong nPopupModeFlags = 0;
if ( nFlags POPUPMENU_EXECUTE_DOWN )
nPopupModeFlags = FLOATWIN_POPUPMODE_DOWN;
@@ -3578,6 +3577,9 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const
Rectangle rRect, sal_
if (nFlags POPUPMENU_NOMOUSEUPCLOSE ) // allow
popup menus to stay open on mouse button up
nPopupModeFlags |= FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE;// useful if
the menu was opened on mousebutton down (eg toolbox configuration)
+if (nFlags POPUPMENU_NOHORZ_PLACEMENT)
+nPopupModeFlags |= FLOATWIN_POPUPMODE_NOHORZPLACEMENT;
+
return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, sal_False );
}
@@ -3681,17 +3683,37 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const
Rectangle rRect, sal_uLong
Size aSz = ImplCalcSize( pWin );
-long nMaxHeight = pWin-GetDesktopRectPixel().GetHeight();
+Rectangle aDesktopRect(pWin-GetDesktopRectPixel());
if( Application::GetScreenCount() 1 Application::IsUnifiedDisplay() )
{
Window* pDeskW = pWindow-GetWindow( WINDOW_REALPARENT );
if( ! pDeskW )
pDeskW = pWindow;
Point aDesktopTL( pDeskW-OutputToAbsoluteScreenPixel( aRect.TopLeft()
) );
-nMaxHeight = Application::GetScreenPosSizePixel(
-Application::GetBestScreen( Rectangle( aDesktopTL, aRect.GetSize()
) )
-).GetHeight();
+aDesktopRect = Application::GetScreenPosSizePixel(
+Application::GetBestScreen( Rectangle( aDesktopTL, aRect.GetSize()
) ));
}
+
+long nMaxHeight = aDesktopRect.GetHeight();
+
+//rhbz#1021915. If a menu won't fit in the desired location the default
+//mode is to place it somewhere it will fit. e.g. above, left, right. For
+//some cases, e.g. menubars, it's desirable to limit the options to
+//above/below and force the menu to scroll if it won't fit
+if
Re: Development wiki spring (autumn) cleanup
On Tue, 2013-10-15 at 10:56 +0200, bjoern wrote: On Mon, Oct 14, 2013 at 09:55:31PM +0200, Philipp Weissenbacher wrote: On 9 okt. 2013, at 12:00, bjoern bjoern.michael...@canonical.com wrote: 26964 Development/Code Overview I tried to turn this into more than just a redirect to the code README page by adding some presentations from Mmeeks' blog. I'd love to also provide some talks/presentations (especially some LibOCon'13) but I was not successful in finding them. :( Maybe someone can show me where we put them? AFAIK slides are still being collected for the 2013 conference and will be published RSN. That said, Michael published his slides on him already IIRC. Right - I guess: https://people.gnome.org/~michael/blog/2013-07-26.html Is prolly what you want ... thanks for fixing up the documentation to make that more prominent :-) HTH, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 13 +
writerfilter/source/dmapper/StyleSheetTable.cxx |2 ++
writerfilter/source/dmapper/TblStylePrHandler.cxx | 21 +
3 files changed, 36 insertions(+)
New commits:
commit 97e9eda0cec15e4d8e8d86010b98f303cbf4fd02
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 29 16:40:51 2013 +0100
DOCX import: read tblStylePr into InteropGrabBag
Change-Id: I0217b76c8e2447c9053611f7d187251bf76c58e4
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 75fbe65..1139671 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -58,6 +58,7 @@
#include com/sun/star/text/XFootnote.hpp
#include comphelper/types.hxx
#include comphelper/storagehelper.hxx
+#include filter/msfilter/util.hxx
#include CellColorHandler.hxx
#include SectionColumnHandler.hxx
@@ -914,6 +915,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_Color_val:
if (m_pImpl-GetTopContext())
m_pImpl-GetTopContext()-Insert(PROP_CHAR_COLOR,
uno::makeAny( nIntValue ) );
+m_pImpl-appendGrabBag(m_pImpl-m_aSubInteropGrabBag, val,
OStringToOUString(msfilter::util::ConvertColor(nIntValue),
RTL_TEXTENCODING_UTF8));
break;
case NS_ooxml::LN_CT_Underline_color:
if (m_pImpl-GetTopContext())
@@ -2152,6 +2154,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
uno::Referencebeans::XPropertySet
xCharStyle(m_pImpl-GetCurrentNumberingCharStyle());
if (xCharStyle.is())
xCharStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_WEIGHT),
aBold);
+if (nSprmId == NS_sprm::LN_CFBold)
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag,
b, OUString::number(nIntValue));
}
break;
case 61: /*sprmCFItalic*/
@@ -2162,6 +2166,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
rContext-Insert( ePropertyId, aPosture );
if( nSprmId != NS_sprm::LN_CFItalicBi ) //
sprmCFItalicBi
rContext-Insert(PROP_CHAR_POSTURE_ASIAN, aPosture
);
+if (nSprmId == NS_sprm::LN_CFItalic)
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag,
i, OUString::number(nIntValue));
}
break;
case NS_sprm::LN_CFStrike: /*sprmCFStrike*/
@@ -2239,6 +2245,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
// Make sure char sizes defined in the stylesheets don't affect
char props from direct formatting.
if (!m_pImpl-IsStyleSheetImport())
m_pImpl-deferCharacterProperty( nSprmId, uno::makeAny(
nIntValue ));
+if (nSprmId == NS_sprm::LN_CHps)
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, sz,
OUString::number(nIntValue));
}
break;
case NS_sprm::LN_CHpsInc:
@@ -3005,6 +3013,11 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, rFonts,
m_pImpl-m_aSubInteropGrabBag);
else if (nSprmId == NS_ooxml::LN_EG_RPrBase_lang)
m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, lang,
m_pImpl-m_aSubInteropGrabBag);
+else if (nSprmId == NS_ooxml::LN_EG_RPrBase_color)
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, color,
m_pImpl-m_aSubInteropGrabBag);
+break;
+case NS_ooxml::LN_CT_PPrBase_wordWrap:
+m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, wordWrap, );
break;
case NS_ooxml::LN_EG_SectPrContents_footnotePr:
case NS_ooxml::LN_EG_SectPrContents_endnotePr:
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 45adc73..4506b69 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -663,6 +663,8 @@ void StyleSheetTable::lcl_sprm(Sprm rSprm)
{
pTableEntry-AppendInteropGrabBag(pTblStylePrHandler-getInteropGrabBag(tblPr));
}
+else if (nSprmId == NS_ooxml::LN_CT_Style_tblStylePr)
+
pTableEntry-AppendInteropGrabBag(pTblStylePrHandler-getInteropGrabBag(tblStylePr));
}
break;
}
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 7884cbc..faedeba 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xecontent.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit dd7f23bf0d37a33c04c4f752492b012567cdaa90
Author: Tor Lillqvist t...@collabora.com
Date: Tue Oct 29 13:25:50 2013 +0200
WaE: unused variable 'sTmp' [loplugin]
Change-Id: I6a1ae44e4959a8aa37f4d5efd88993d74b2ed64a
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 7278763..138ffa8 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -502,7 +502,6 @@ void XclExpHyperlink::WriteEmbeddedData( XclExpStream
rStrm )
void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm )
{
-OString sTmp = XclXmlUtils::ToOString( maScPos );
OUString sId = !msTarget.isEmpty() ? rStrm.addRelation(
rStrm.GetCurrentStream()-getOutputStream(),
XclXmlUtils::ToOUString(
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink;
),
msTarget, true ) : OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-group-interpreter-4-dynamic-kernels-reviewed' - 3 commits - sc/inc sc/qa sc/source
sc/inc/formulagroup.hxx |3
sc/qa/unit/opencl-test.cxx | 216 ++-
sc/source/core/tool/formulagroup.cxx | 29 +++-
3 files changed, 161 insertions(+), 87 deletions(-)
New commits:
commit aa8fa1a1160d14c979be4470aec946da8028b0e0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 12:56:46 2013 -0400
Temporarily disable failing OpenCL tests for now.
Change-Id: I13562c365a2064ee17a45d33688ce9c730fae2af
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index f33a42b..d65c835 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -107,8 +107,8 @@ public:
void testFinacialYIELDDISCFormula();
void testFinacialYIELDMATFormula();
CPPUNIT_TEST_SUITE(ScOpenclTest);
-CPPUNIT_TEST(testSharedFormulaXLS);
-CPPUNIT_TEST(testFinacialFormula);
+// CPPUNIT_TEST(testSharedFormulaXLS);
+// CPPUNIT_TEST(testFinacialFormula);
CPPUNIT_TEST(testStatisticalFormulaFisher);
CPPUNIT_TEST(testStatisticalFormulaFisherInv);
CPPUNIT_TEST(testStatisticalFormulaGamma);
@@ -451,10 +451,12 @@ void ScOpenclTest::testFinacialFormula()
return;
ScDocShellRef xDocSh = loadDoc(FinancialFormulaTest., XLS);
+CPPUNIT_ASSERT_MESSAGE(Failed to load document., xDocSh.Is());
ScDocument* pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT(pDoc);
xDocSh-DoHardRecalc(true);
ScDocShellRef xDocShRes = loadDoc(FinancialFormulaTest., XLS);
+CPPUNIT_ASSERT_MESSAGE(Failed to load document., xDocShRes.Is());
ScDocument* pDocRes = xDocShRes-GetDocument();
CPPUNIT_ASSERT(pDocRes);
// Check the results of formula cells in the shared formula range.
commit 067194aff882e6a19e61a6c6313cfb11ccc1b6b3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 12:43:49 2013 -0400
Correct way to try to enable OpenCL in unit test.
Change-Id: Idc4014cc760207a723c5af88fc348a1881e8b1e1
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 1691e8d..24e26d9 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -90,8 +90,9 @@ class SC_DLLPUBLIC FormulaGroupInterpreter
public:
static FormulaGroupInterpreter *getStatic();
static void fillOpenCLInfo(std::vectorOpenclPlatformInfo rPlatforms);
-static void switchOpenCLDevice(const OUString rDeviceId, bool
bAutoSelect);
+static bool switchOpenCLDevice(const OUString rDeviceId, bool
bAutoSelect);
static void compileOpenCLKernels();
+static void enableOpenCL(bool bEnable);
virtual ScMatrixRef inverseMatrix(const ScMatrix rMat) = 0;
virtual bool interpret(ScDocument rDoc, const ScAddress rTopPos, const
ScFormulaCellGroupRef xGroup, ScTokenArray rCode) = 0;
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index eec7690..f33a42b 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -32,6 +32,8 @@
#include drwlayer.hxx
#include userdat.hxx
#include formulacell.hxx
+#include platforminfo.hxx
+#include formulagroup.hxx
#include svx/svdpage.hxx
@@ -46,7 +48,7 @@ class ScOpenclTest
{
public:
ScOpenclTest();
-void enableOpenCL(ScDocShell* pShell);
+bool enableOpenCL();
void SetEnv();
virtual void setUp();
virtual void tearDown();
@@ -179,22 +181,19 @@ void ScOpenclTest::SetEnv()
return;
#endif
}
-void ScOpenclTest::enableOpenCL(ScDocShell* pShell)
+
+bool ScOpenclTest::enableOpenCL()
{
-ScModule* pScMod = SC_MOD();
-ScFormulaOptions rOpt = pScMod-GetFormulaOptions();
-ScCalcConfig maSavedConfig = rOpt.GetCalcConfig();
-maSavedConfig.mbOpenCLEnabled = true;
-rOpt.SetCalcConfig(maSavedConfig);
-pShell-SetFormulaOptions(rOpt);
+sc::FormulaGroupInterpreter::enableOpenCL(true);
+return sc::FormulaGroupInterpreter::switchOpenCLDevice(OUString(),true);
}
void ScOpenclTest::testCompilerNested()
{
-ScDocShellRef xDocSh = loadDoc(OpenCLTests/Compiler/nested., ODS);
-
-enableOpenCL(xDocSh);
+if (!enableOpenCL())
+return;
+ScDocShellRef xDocSh = loadDoc(OpenCLTests/Compiler/nested., ODS);
ScDocument* pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT(pDoc);
xDocSh-DoHardRecalc(true);
@@ -215,10 +214,10 @@ void ScOpenclTest::testCompilerNested()
void ScOpenclTest::testCompilerString()
{
-ScDocShellRef xDocSh = loadDoc(OpenCLTests/Compiler/string., ODS);
-
-enableOpenCL(xDocSh);
+if (!enableOpenCL())
+return;
+ScDocShellRef xDocSh = loadDoc(OpenCLTests/Compiler/string., ODS);
ScDocument* pDoc = xDocSh-GetDocument();
CPPUNIT_ASSERT(pDoc);
xDocSh-DoHardRecalc(true);
@@ -242,10 +241,10 @@ void ScOpenclTest::testCompilerString()
void ScOpenclTest::testCompilerInEq()
{
-ScDocShellRef xDocSh = loadDoc(OpenCLTests/Compiler/ineq., ODS);
-
-enableOpenCL(xDocSh);
+if (!enableOpenCL())
+return;
+ScDocShellRef xDocSh
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 20 -
writerfilter/source/dmapper/TblStylePrHandler.cxx | 12 --
2 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit c2b8170cbdac557bdd63a467be8bf4f124e74702
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 29 17:40:06 2013 +0100
DOCX import: also read tblPr/tcPr inside tblStylePr into InteropGrabBag
Change-Id: I1670e5c51d19aa17188c5707856ab61874fab6c2
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index e2b5c3b..255547c 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -133,7 +133,7 @@ namespace dmapper {
case NS_ooxml::LN_CT_TcPrBase_vAlign://90694
{
sal_Int16 nVertOrient = text::VertOrientation::NONE;
-switch( nIntValue ) //0 - top 1 - center 3 - bottom
+switch( nIntValue ) //0 - top 1 - center 3 - bottom
(ST_VerticalJc)
{
case 1: nVertOrient = text::VertOrientation::CENTER; break;
case 3: nVertOrient = text::VertOrientation::BOTTOM; break;
@@ -143,6 +143,24 @@ namespace dmapper {
pCellPropMap-Insert( PROP_VERT_ORIENT, uno::makeAny(
nVertOrient ) );
//todo: in ooxml import the value of m_ncell is wrong
cellProps( pCellPropMap );
+if (m_pCurrentInteropGrabBag)
+{
+OUString aVertOrient;
+switch( nIntValue )
+{
+case 0: aVertOrient = top; break;
+case 1: aVertOrient = center; break;
+case 2: aVertOrient = both; break;
+case 3: aVertOrient = bottom; break;
+};
+if (!aVertOrient.isEmpty())
+{
+beans::PropertyValue aValue;
+aValue.Name = vAlign;
+aValue.Value = uno::makeAny(aVertOrient);
+m_pCurrentInteropGrabBag-push_back(aValue);
+}
+}
}
break;
case NS_ooxml::LN_CT_TblPrBase_tblBorders: //table borders, might
be defined in table style
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index faedeba..194aceb 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -80,18 +80,26 @@ void TblStylePrHandler::lcl_sprm(Sprm rSprm)
case NS_ooxml::LN_CT_TcPrBase:
{
std::vectorbeans::PropertyValue aSavedGrabBag;
-if (rSprm.getId() == NS_ooxml::LN_CT_PPrBase || rSprm.getId() ==
NS_ooxml::LN_EG_RPrBase)
+bool bGrabBag = rSprm.getId() == NS_ooxml::LN_CT_PPrBase ||
+rSprm.getId() == NS_ooxml::LN_EG_RPrBase ||
+rSprm.getId() == NS_ooxml::LN_CT_TblPrBase ||
+rSprm.getId() == NS_ooxml::LN_CT_TcPrBase;
+if (bGrabBag)
{
aSavedGrabBag = m_aInteropGrabBag;
m_aInteropGrabBag.clear();
}
resolveSprmProps( rSprm );
-if (rSprm.getId() == NS_ooxml::LN_CT_PPrBase || rSprm.getId() ==
NS_ooxml::LN_EG_RPrBase)
+if (bGrabBag)
{
if (rSprm.getId() == NS_ooxml::LN_CT_PPrBase)
aSavedGrabBag.push_back(getInteropGrabBag(pPr));
else if (rSprm.getId() == NS_ooxml::LN_EG_RPrBase)
aSavedGrabBag.push_back(getInteropGrabBag(rPr));
+else if (rSprm.getId() == NS_ooxml::LN_CT_TblPrBase)
+aSavedGrabBag.push_back(getInteropGrabBag(tblPr));
+else if (rSprm.getId() == NS_ooxml::LN_CT_TcPrBase)
+aSavedGrabBag.push_back(getInteropGrabBag(tcPr));
m_aInteropGrabBag = aSavedGrabBag;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/d64ff0a59f4860554e439b59d37b934af632dc
ef/d64ff0a59f4860554e439b59d37b934af632dc |1 + 1 file changed, 1 insertion(+) New commits: commit 99e7132d6a0df0c26f686adf2e9d99283fc30068 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 29 17:10:08 2013 + Notes added by 'git notes add' diff --git a/ef/d64ff0a59f4860554e439b59d37b934af632dc b/ef/d64ff0a59f4860554e439b59d37b934af632dc new file mode 100644 index 000..9297782 --- /dev/null +++ b/ef/d64ff0a59f4860554e439b59d37b934af632dc @@ -0,0 +1 @@ +ignore: UOF, worthy but needs excessive merge rework ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Spam in mailing list
Here's a post in Brazilian Portuguese. It uses the acute accent for apostrophe. http://lists.freedesktop.org/archives/libreoffice/2013-October/056978.html http://lists.freedesktop.org/archives/libreoffice/2013-October/056980.html And there's another post for film investments! http://lists.freedesktop.org/archives/libreoffice/2013-October/056615.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/globstr.hrc |3 --
sc/source/ui/src/globstr.src |8 -
sc/source/ui/view/formatsh.cxx | 59 -
3 files changed, 70 deletions(-)
New commits:
commit 955281e50e2728932edc3b688ce3cf235bdfd0c9
Author: Eike Rathke er...@redhat.com
Date: Tue Oct 29 19:10:21 2013 +0100
Revert fix fdo#63546 : set appropriate alignment when writing direction is
changed.
This reverts commit 16f508686c29bfa244ca6f81b5ab3bbaf5fef2a7.
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 39d8fc6..ef45387 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2607,29 +2607,6 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest
rReq )
SvxFrameDirection eDirection = ( nSlot ==
SID_ATTR_PARA_LEFT_TO_RIGHT ) ?
FRMDIR_HORI_LEFT_TOP :
FRMDIR_HORI_RIGHT_TOP;
pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection,
ATTR_WRITINGDIR ) );
-
-const SfxItemSet rAttrSet =
pTabViewShell-GetSelectionPattern()-GetItemSet();
-const SfxPoolItem* pItem = NULL;
-const SvxHorJustifyItem* pHorJustify = NULL;
-SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
-
-if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) ==
SFX_ITEM_SET )
-{
-pHorJustify = (const SvxHorJustifyItem*)pItem;
-eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
-}
-
-if( eHorJustify != SVX_HOR_JUSTIFY_CENTER eHorJustify !=
SVX_HOR_JUSTIFY_BLOCK )
-{
-if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
- rReq.AppendItem( SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT,
SID_H_ALIGNCELL ) );
-else
- rReq.AppendItem( SvxHorJustifyItem(
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
-
-rReq.SetSlot( SID_H_ALIGNCELL );
-ExecuteSlot( rReq, GetInterface() );
-}
-
}
break;
}
commit 8276cc057a1caf2e282093fcd90ac7b5a2c1c844
Author: Eike Rathke er...@redhat.com
Date: Tue Oct 29 19:03:24 2013 +0100
Revert Related: fdo#63546 bundle both changes together as one undo
This reverts commit c4da31d33bcd00230153929bba3165f5257aabde.
Conflicts:
sc/inc/globstr.hrc
sc/source/ui/view/formatsh.cxx
Change-Id: If74872b89dff88f1f1fc7fac1a7b6224f3763d26
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 9c064fb..688d589 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -668,9 +668,6 @@
#define STR_INVALIDINPUT542
#define STR_INVALIDCONDITION543
-#define STR_UNDO_L2R544
-#define STR_UNDO_R2L545
-
#define STR_FUN_TEXT_SELECTION_COUNT546
#define STR_QUERYREMOVE 547
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index acab6b0..a19f2c8 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1784,14 +1784,6 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = Insert Current Time;
};
-String STR_UNDO_L2R
-{
-Text [ en-US ] = Left-to-right ;
-};
-String STR_UNDO_R2L
-{
-Text [ en-US ] = Right-to-left ;
-};
String STR_MANAGE_NAMES
{
Text [ en-US ] = Manage Names...;
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index b211617..39d8fc6 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2606,12 +2606,6 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest
rReq )
{
SvxFrameDirection eDirection = ( nSlot ==
SID_ATTR_PARA_LEFT_TO_RIGHT ) ?
FRMDIR_HORI_LEFT_TOP :
FRMDIR_HORI_RIGHT_TOP;
-
-OUString aUndo = ScGlobal::GetRscString( nSlot ==
SID_ATTR_PARA_LEFT_TO_RIGHT ?
-STR_UNDO_L2R :
STR_UNDO_R2L );
-ScDocShell* pDocSh = GetViewData()-GetDocShell();
-pDocSh-GetUndoManager()-EnterListAction( aUndo, aUndo );
-
pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection,
ATTR_WRITINGDIR ) );
const SfxItemSet rAttrSet =
pTabViewShell-GetSelectionPattern()-GetItemSet();
@@ -2636,7 +2630,6 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest
rReq )
ExecuteSlot( rReq, GetInterface() );
}
-pDocSh-GetUndoManager()-LeaveListAction();
}
break;
}
commit 2f29e544932633a01162ecb80e50872eabdd2bc1
Author: Eike Rathke er...@redhat.com
Date: Tue Oct 29 18:17:18 2013 +0100
Revert fdo#63546: set appropriate alignment when wrt direction of cells is
changed.
This reverts commit 706e3b8e43df94310b2fe8458da67875073a046c.
Related
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/doctok/WW8LFOTable.cxx | 26 --
writerfilter/source/doctok/resources.xmi |9 -
2 files changed, 35 deletions(-)
New commits:
commit aeb29afa11b7be87153f048044a2d4af9a87b50c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Oct 29 19:10:07 2013 +0100
writerfilter: remove unused WW8LFOTable in doctok
Change-Id: Ib83b87d5e4cc42fadc56cb830bca377ffc6f42d2
diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx
b/writerfilter/source/doctok/WW8LFOTable.cxx
index aef1639..ec481d4 100644
--- a/writerfilter/source/doctok/WW8LFOTable.cxx
+++ b/writerfilter/source/doctok/WW8LFOTable.cxx
@@ -22,32 +22,6 @@
namespace writerfilter {
namespace doctok {
-sal_uInt32 WW8LFOTable::getEntryCount()
-{
-return getU32(0);
-}
-
-writerfilter::ReferenceProperties::Pointer_t
-WW8LFOTable::getEntry(sal_uInt32 nIndex)
-{
-WW8LFO * pLFO = new WW8LFO(this, entryOffsets[nIndex]);
-
-pLFO-setIndex(nIndex);
-
-return writerfilter::ReferenceProperties::Pointer_t(pLFO);
-}
-
-writerfilter::ReferenceProperties::Pointer_t
-WW8LFO::get_LFOData()
-{
-WW8LFOTable * pLFOTable = dynamic_castWW8LFOTable *(mpParent);
-sal_uInt32 nPayloadOffset = pLFOTable-getPayloadOffset(mnIndex);
-sal_uInt32 nPayloadSize = pLFOTable-getPayloadSize(mnIndex);
-
-return writerfilter::ReferenceProperties::Pointer_t
-(new WW8LFOData(mpParent, nPayloadOffset, nPayloadSize));
-}
-
void WW8LFOLevel::resolveNoAuto(Properties /*rHandler*/)
{
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index f6d7e1d..9f3f8a6 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -3110,15 +3110,6 @@
!--Class LFOData--
!--Class LFOTable--
UML:Class xmi.id=LFOTable name=LFOTable
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8resource/
- /UML:ModelElement.stereotype
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=plcf/
- /UML:ModelElement.stereotype
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8nopayloadoffset/
- /UML:ModelElement.stereotype
UML:ModelElement.taggedValue
UML:TaggedValue
UML:TaggedValue.dataValuertf:LFOTABLE/UML:TaggedValue.dataValue
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - icon-themes/galaxy
icon-themes/galaxy/brand_cp/backing_left.png |binary icon-themes/galaxy/brand_cp/backing_right.png |binary icon-themes/galaxy/brand_cp/backing_rtl_left.png |binary icon-themes/galaxy/brand_cp/backing_rtl_right.png |binary icon-themes/galaxy/brand_cp/backing_space.png |binary 5 files changed New commits: commit 7fa9194f4030902b34a3a81f7ca27a80507d5c37 Author: Andras Timar andras.ti...@collabora.com Date: Tue Oct 29 20:05:11 2013 +0100 fix transparency of Collabora branded start screen Change-Id: I893d50316e51e4f8dd6f050071f44e4f0d5ab038 diff --git a/icon-themes/galaxy/brand_cp/backing_left.png b/icon-themes/galaxy/brand_cp/backing_left.png index 7aa3272..86d9b51 100644 Binary files a/icon-themes/galaxy/brand_cp/backing_left.png and b/icon-themes/galaxy/brand_cp/backing_left.png differ diff --git a/icon-themes/galaxy/brand_cp/backing_right.png b/icon-themes/galaxy/brand_cp/backing_right.png index 7c760c7..42fca6d 100644 Binary files a/icon-themes/galaxy/brand_cp/backing_right.png and b/icon-themes/galaxy/brand_cp/backing_right.png differ diff --git a/icon-themes/galaxy/brand_cp/backing_rtl_left.png b/icon-themes/galaxy/brand_cp/backing_rtl_left.png index 7aa3272..86d9b51 100644 Binary files a/icon-themes/galaxy/brand_cp/backing_rtl_left.png and b/icon-themes/galaxy/brand_cp/backing_rtl_left.png differ diff --git a/icon-themes/galaxy/brand_cp/backing_rtl_right.png b/icon-themes/galaxy/brand_cp/backing_rtl_right.png index 7c760c7..42fca6d 100644 Binary files a/icon-themes/galaxy/brand_cp/backing_rtl_right.png and b/icon-themes/galaxy/brand_cp/backing_rtl_right.png differ diff --git a/icon-themes/galaxy/brand_cp/backing_space.png b/icon-themes/galaxy/brand_cp/backing_space.png index a20f8bf..dad9584 100644 Binary files a/icon-themes/galaxy/brand_cp/backing_space.png and b/icon-themes/galaxy/brand_cp/backing_space.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - icon-themes/galaxy
icon-themes/galaxy/brand_cp/shell/backing_left.png |binary icon-themes/galaxy/brand_cp/shell/backing_right.png |binary icon-themes/galaxy/brand_cp/shell/backing_space.png |binary 3 files changed New commits: commit 488648ba759d8a417ece3817b5607e4100c517b6 Author: Andras Timar andras.ti...@collabora.com Date: Tue Oct 29 20:13:39 2013 +0100 fix transparency of Collabora branded start screen Change-Id: Ib1c28a50da7cb1def5d5475f0ac688a8726daa0f diff --git a/icon-themes/galaxy/brand_cp/shell/backing_left.png b/icon-themes/galaxy/brand_cp/shell/backing_left.png index 7aa3272..86d9b51 100644 Binary files a/icon-themes/galaxy/brand_cp/shell/backing_left.png and b/icon-themes/galaxy/brand_cp/shell/backing_left.png differ diff --git a/icon-themes/galaxy/brand_cp/shell/backing_right.png b/icon-themes/galaxy/brand_cp/shell/backing_right.png index 7c760c7..42fca6d 100644 Binary files a/icon-themes/galaxy/brand_cp/shell/backing_right.png and b/icon-themes/galaxy/brand_cp/shell/backing_right.png differ diff --git a/icon-themes/galaxy/brand_cp/shell/backing_space.png b/icon-themes/galaxy/brand_cp/shell/backing_space.png index a20f8bf..dad9584 100644 Binary files a/icon-themes/galaxy/brand_cp/shell/backing_space.png and b/icon-themes/galaxy/brand_cp/shell/backing_space.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_MobileLibreOffice_app.mk ios/MobileLibreOffice ios/Module_ios.mk ios/shared
ios/CustomTarget_MobileLibreOffice_app.mk| 136
++
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj| 29 --
ios/MobileLibreOffice/MobileLibreOffice/MobileLibreOffice-Info.plist |2
ios/Module_ios.mk|1
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj|5
5 files changed, 145 insertions(+), 28 deletions(-)
New commits:
commit 84cfb9b9926e88f75deffc6742a07a4390203bfb
Author: Roi Illouz roi.ill...@cloudon.com
Date: Tue Oct 29 18:25:25 2013 +0200
New CustomTarget, move Xcode setup to Makefile
Change-Id: Id03bf8002902f1adec57356601b28ab2c743df2a
Reviewed-on: https://gerrit.libreoffice.org/6476
Reviewed-by: Tor Lillqvist t...@collabora.com
Tested-by: Tor Lillqvist t...@collabora.com
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
new file mode 100644
index 000..e3e95c1
--- /dev/null
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -0,0 +1,136 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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/.
+
+#- Env
+
+LO_XCCONFIG:= lo.xcconfig
+DEST_RESOURCE := MobileLibreOffice/resource_link
+BUILDID:=$(shell cd $(SRCDIR) git log -1
--format=%H)
+
+#- Macros -
+
+define MobileLibreOfficeXcodeBuild
+ CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj
-scheme MobileLibreOffice -arch armv7 -configuration $(if
$(ENABLE_DEBUG),Debug,Release) $(1) /dev/null
+endef
+#- Targets
+
+.PHONY: MobileLibreOffice_setup
+
+#==
+# Register target
+$(eval $(call gb_CustomTarget_CustomTarget,ios/MobileLibreOffice))
+#==
+
+#==
+# Build
+$(call gb_CustomTarget_get_target,ios/MobileLibreOffice):
MobileLibreOffice_setup
+#==
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
+ $(call MobileLibreOfficeXcodeBuild, clean build)
+
+#==
+# Setup
+MobileLibreOffice_setup:
+#==
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
+
+ # Put xcconfig in source dir for Xcode projects
+ if test $(SRCDIR) != $(BUILDDIR); then \
+ cp $(BUILDDIR)/ios/$(LO_XCCONFIG) $(SRCDIR)/ios; \
+ fi
+
+ # Libs #
+ # Create the link flags in the xcconfig for Xcode linkage
+ for path in $(OUTDIR)/lib \
+ $(INSTDIR)/program \
+ $(WORKDIR)/LinkTarget/StaticLibrary \
+ $(WORKDIR)/UnpackedTarball/*/.libs/ \
+ $(WORKDIR)/UnpackedTarball/*/src/.libs \
+ $(WORKDIR)/UnpackedTarball/*/src/*/.libs \
+ $(WORKDIR)/UnpackedTarball/openssl; do \
+ flags+= -L$$path; \
+ for lib in $$path/lib*.a; do \
+ if [ ! -r $$lib ]; then \
+ continue; \
+ fi; \
+ base=$${lib##*/lib}; \
+ base=$${base%\.a}; \
+ flags+= -l$${base}; \
+ done; \
+ done; \
+ file=$(LO_XCCONFIG); \
+ sed -i '' -e s|^\(LINK_LDFLAGS =\).*$$|\1 $$flags| $$file;
+
+ # Resources #
+ rm -rf $(DEST_RESOURCE) 2/dev/null
+ mkdir -p $(DEST_RESOURCE)
+ mkdir -p $(DEST_RESOURCE)/ure
+
+ # copy rdb files
+ cp $(OUTDIR)/bin/offapi.rdb $(DEST_RESOURCE)
+ cp $(OUTDIR)/bin/udkapi.rdb $(DEST_RESOURCE)
+ cp $(OUTDIR)/bin/oovbaapi.rdb $(DEST_RESOURCE)
+ cp $(INSTDIR)/program/services/services.rdb $(DEST_RESOURCE)
+ cp $(INSTDIR)/ure/share/misc/services.rdb $(DEST_RESOURCE)/ure
+
+ # copy .res files
+ # program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,
+ # we could set STAR_RESOURCE_PATH instead. sigh...
+ mkdir -p $(DEST_RESOURCE)/program/resource
+ cp $(INSTDIR)/program/resource/*en-US.res
$(DEST_RESOURCE)/program/resource
+
+ # soffice.cfg
+
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ad44c41234aaa29af8d900f9dc4dc4e131d1453
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Oct 29 20:44:23 2013 +0100
cppcheck: fix Possible inefficient checking for emptiness
Change-Id: I4d98c7feb71daafeba95a493c71f3f5d520b3058
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 3142d63..24ab7c4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -250,7 +250,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const
OUString rNm, const ::sw:
void WW8_WrtBookmarks::Write( WW8Export rWrt)
{
-if (!aSttCps.size())
+if (aSttCps.empty())
return;
CPItr aItr;
long n;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - configure.ac instsetoo_native/util readlicense_oo/odt readlicense_oo/Package_files.mk scp2/source solenv/bin
configure.ac |2 +-
instsetoo_native/util/openoffice.lst.in | 14 +++---
readlicense_oo/Package_files.mk |3 +++
readlicense_oo/odt/EULA.odt |binary
scp2/source/ooo/common_brand.scp | 22 +-
solenv/bin/modules/installer/windows/idtglobal.pm |3 +--
6 files changed, 29 insertions(+), 15 deletions(-)
New commits:
commit 34f6b1233a996886ca2cc15ab0d66146ca5b4c96
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Oct 29 13:12:32 2013 -0700
Collabora EULA integration to 4.1 build system
Change-Id: I0c5bf15762a67dc629b35c7d07a90c87e722a20d
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index b084634..466b6fb 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -23,4 +23,6 @@ $(eval $(call
gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDI
$(eval $(call
gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html))
+$(eval $(call
gb_Package_add_file,readlicense_oo_files,bin/EULA_en-US.rtf,eula/EULA_en-US.rtf))
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm
b/solenv/bin/modules/installer/windows/idtglobal.pm
index 8cbfcb2..d3f3251 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -813,10 +813,9 @@ sub get_rtflicensefilesource
{
my ($language, $includepatharrayref) = @_;
-my $licensefilename = license_ . $language . .rtf;
+my $licensefilename = EULA_en-US.rtf;
my $sourcefileref =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename,
$includepatharrayref, 1);
-
if ($$sourcefileref eq ) { installer::exiter::exit_program(ERROR: Could
not find $licensefilename!, get_rtflicensefilesource); }
my $infoline = Using licensefile: $$sourcefileref\n;
commit 7fea21dc92e9c187c83850b8da1470c164813dbd
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Oct 29 08:31:22 2013 -0700
Collabora versioning
Change-Id: I4cb50e83084ecf5a8322260dd64650510bd286c4
major: 4, minor: 1, obviously
micro: 10, higher than any TDF builds, so we rule
patch: 1, it will be bumped for PTF releases
diff --git a/configure.ac b/configure.ac
index 4084f3a..5670c1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.1.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.10.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
save_CC=$CC
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index e750e97..8083d56 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
WINDOWSBASISROOTNAME LibreOffice @LIBO_VERSION_MAJOR@
@@ -29,7 +29,7 @@ Globals
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 1
+WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -46,13 +46,13 @@ LibreOffice
{
PRODUCTNAME LibreOffice
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
-PRODUCTEXTENSION
.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
+PRODUCTEXTENSION -@LIBO_VERSION_PATCH@
POSTVERSIONEXTENSION
BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@
BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
USERDIRPRODUCTVERSION @LIBO_VERSION_MAJOR@
-ABOUTBOXPRODUCTVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
-ABOUTBOXPRODUCTVERSIONSUFFIX @LIBO_VERSION_SUFFIX_SUFFIX@
+ABOUTBOXPRODUCTVERSION
@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@-@LIBO_VERSION_PATCH@
+ABOUTBOXPRODUCTVERSIONSUFFIX
BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -61,7 +61,7 @@
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-group-interpreter-4-dynamic-kernels-reviewed' - 3 commits - sc/Library_scopencl.mk sc/source
sc/Library_scopencl.mk |1
sc/source/core/opencl/formulagroupcl.cxx | 44 -
sc/source/core/opencl/op_financial.cxx |5 -
sc/source/core/opencl/op_math.cxx|5 -
sc/source/core/opencl/op_statistical.cxx |5 -
sc/source/core/opencl/opbase.cxx | 107 +++
sc/source/core/opencl/opbase.hxx | 141 ---
7 files changed, 173 insertions(+), 135 deletions(-)
New commits:
commit 27de26f8bec9c6106fa92e4c50e05af6b1baa6e7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 16:54:30 2013 -0400
We don't need these headers.
Change-Id: I8411b605edd27105bdc6cfc04acbd5cde886
diff --git a/sc/source/core/opencl/op_financial.cxx
b/sc/source/core/opencl/op_financial.cxx
index 04d505a..5ae04ff 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -16,12 +16,8 @@
#include compiler.hxx
#include interpre.hxx
#include formula/vectortoken.hxx
-#include list
-#include iostream
#include sstream
-#include algorithm
-#include memory
using namespace formula;
namespace sc { namespace opencl {
diff --git a/sc/source/core/opencl/op_math.cxx
b/sc/source/core/opencl/op_math.cxx
index 83f780a..33ca0e5 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -16,12 +16,8 @@
#include compiler.hxx
#include interpre.hxx
#include formula/vectortoken.hxx
-#include list
-#include iostream
#include sstream
-#include algorithm
-#include memory
using namespace formula;
namespace sc { namespace opencl {
diff --git a/sc/source/core/opencl/op_statistical.cxx
b/sc/source/core/opencl/op_statistical.cxx
index ec816c2..134a0ca 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -16,11 +16,7 @@
#include compiler.hxx
#include interpre.hxx
#include formula/vectortoken.hxx
-#include list
-#include iostream
#include sstream
-#include algorithm
-#include memory
using namespace formula;
commit 4ab0aa496709bf4386caf0d3a6f0d7fd160b198d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 16:52:01 2013 -0400
std::shared_ptr is C++11 specific. Use boost::shared_ptr instead.
Change-Id: I8e6780ae5b5042a0521687f3a3535e74d7a35d23
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 665f822..1dd7c89 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -93,7 +93,7 @@ class ConstStringArgument: public DynamicKernelArgument
{
public:
ConstStringArgument(const std::string s,
-std::shared_ptrFormulaTreeNode ft):
+boost::shared_ptrFormulaTreeNode ft):
DynamicKernelArgument(s, ft) {}
/// Generate declaration
virtual void GenDecl(std::stringstream ss) const
@@ -151,7 +151,7 @@ class DynamicKernelConstantArgument: public
DynamicKernelArgument
{
public:
DynamicKernelConstantArgument(const std::string s,
-std::shared_ptrFormulaTreeNode ft):
+boost::shared_ptrFormulaTreeNode ft):
DynamicKernelArgument(s, ft) {}
/// Generate declaration
virtual void GenDecl(std::stringstream ss) const
@@ -195,7 +195,7 @@ class DynamicKernelStringArgument: public
DynamicKernelArgument
{
public:
DynamicKernelStringArgument(const std::string s,
-std::shared_ptrFormulaTreeNode ft):
+boost::shared_ptrFormulaTreeNode ft):
DynamicKernelArgument(s, ft) {}
virtual void GenSlidingWindowFunction(std::stringstream ) {}
@@ -268,7 +268,7 @@ class DynamicKernelSlidingArgument: public Base
{
public:
DynamicKernelSlidingArgument(const std::string s,
-std::shared_ptrFormulaTreeNode ft):
+boost::shared_ptrFormulaTreeNode ft):
Base(s, ft)
{
FormulaToken *t = ft-GetFormulaToken();
@@ -664,7 +664,7 @@ public:
typedef std::unique_ptrDynamicKernelArgument SubArgument;
DynamicKernelSoPArguments(const std::string s,
-std::shared_ptrFormulaTreeNode ft);
+boost::shared_ptrFormulaTreeNode ft);
/// Create buffer and pass the buffer to a given kernel
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
@@ -763,7 +763,7 @@ private:
template class Op
std::unique_ptrDynamicKernelArgument SoPHelper(const std::string ts,
-std::shared_ptrFormulaTreeNode ft)
+boost::shared_ptrFormulaTreeNode ft)
{
return std::unique_ptrDynamicKernelArgument(
new DynamicKernelSoPArgumentsOp(ts, ft));
@@ -771,7 +771,7 @@ std::unique_ptrDynamicKernelArgument SoPHelper(const
std::string ts,
template class Op
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
-std::shared_ptrFormulaTreeNode ft):
+boost::shared_ptrFormulaTreeNode ft):
DynamicKernelArgument(s, ft) {
size_t nChildren = ft-Children.size();
@@ -1100,12
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/opbase.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0783ed47e223b7216766286c2c553970a1fd82d9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 17:17:48 2013 -0400
std::unique_ptr is C++11 specific. Let's use boost::shared_ptr for now.
Change-Id: I549dd62bfb5c14993a3f600a388cd716b3ff7401
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index a982533..93f6820 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -106,7 +106,7 @@ protected:
class SlidingFunctionBase
{
public:
-typedef std::unique_ptrDynamicKernelArgument SubArgument;
+typedef boost::shared_ptrDynamicKernelArgument SubArgument;
typedef std::vectorSubArgument SubArguments;
virtual void GenSlidingWindowFunction(std::stringstream ,
const std::string, SubArguments ) = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/opbase.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 050f342234e4e321d73d6c0630696ce71080ee26
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 17:17:48 2013 -0400
std::unique_ptr is C++11 specific. Let's use boost::shared_ptr for now.
Change-Id: I549dd62bfb5c14993a3f600a388cd716b3ff7401
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index a982533..93f6820 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -106,7 +106,7 @@ protected:
class SlidingFunctionBase
{
public:
-typedef std::unique_ptrDynamicKernelArgument SubArgument;
+typedef boost::shared_ptrDynamicKernelArgument SubArgument;
typedef std::vectorSubArgument SubArguments;
virtual void GenSlidingWindowFunction(std::stringstream ,
const std::string, SubArguments ) = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 87bdefaa8773a52487fe8da9f2a09ee322c2fe71 Author: Andras Timar andras.ti...@collabora.com Date: Tue Oct 29 22:35:37 2013 +0100 Multilingual Mac OS X DMG for Collabora Change-Id: Ib10e1df35ac0e12abd0e75261fc7f2fa92eee2e5 diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index c8317dc..2558fe2 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -119,7 +119,7 @@ ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk endif else # LIBO_DEV_INSTALL - $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) + $(call instsetoo_native_install_command,openoffice,$(if $(filter WNT MACOSX,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT)) ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT)) endif @@ -130,7 +130,7 @@ ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS))) $(foreach lang,$(gb_HELP_LANGS),\ $(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT))) endif -ifneq (WNT,$(OS)) +ifeq (,$(filter WNT MACOSX,$(OS))) $(foreach lang,$(instsetoo_native_WITH_LANG),\ $(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT))) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
tinderbox - gerrit-buildbot integration: passing build specific configuration options
On Mon Oct 28 08:44:27 CET 2013 David Ostrovsky wrote: I wonder how hard would it be to accept configure options during build scheduling? With new upcoming major Gerrit release 2.8 the Plugin API was extended, so we could add a Schedule button and even a popup dialog and gather additional user input, like optional platforms to build and optional configuration option to activate during the build. In example above, the following option could be passed: --enable-extension-integration --enable-ext-wiki-publisher So gerrit-buildbot plugin was extended. New Gerrit change screen has now Schedule button. When activated, a popup dialog appears, where custom build options and even optional platforms can be specified [1]. The build scheduled in this way exposes the passed option(s) to engaged tinderboxes: davido@wizball:~ssh gerrit buildbot get -p test_project [...] GERRIT_TICKET=3667585db_Linux [...] GERRIT_OPT='--enable-extension-integration --enable-ext-wiki-publisher' The only missing part is on tinderbox side to pick up the options and pass them to the build. [1] http://imgur.com/3CKw0H4 --David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 17 commits - cli_ure/Module_cli_ure.mk cli_ure/Package_version.mk config_host.mk.in configure.ac connectivity/source desktop/win32 desktop/WinResTarget_quickstart.mk de
Makefile.in |6 -
RepositoryExternal.mk|6 -
cli_ure/Module_cli_ure.mk|4
cli_ure/Package_version.mk | 16 ---
config_host.mk.in|1
configure.ac | 10 --
connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h |1
desktop/WinResTarget_quickstart.mk |2
desktop/WinResTarget_soffice.mk |4
desktop/WinResTarget_sofficebin.mk | 28 +
desktop/win32/source/QuickStart/QuickStart.rc|2
dev/null |binary
external/moz/ExternalPackage_moz_lib.mk | 21
external/moz/Module_moz.mk |1
external/msc-externals/Makefile |7 +
external/msc-externals/Module_msc-externals.mk |3
external/msc-externals/Package_dbghelp.mk|4
external/msc-externals/Package_msms.mk | 18 ---
external/msc-externals/Package_msvc80_dlls.mk|4
external/msc-externals/README|1
instsetoo_native/util/openoffice.lst.in |4
l10ntools/Module_l10ntools.mk|4
l10ntools/Package_ulfconv.mk | 16 ---
scp2/source/ooo/vc_redist.scp| 39 ---
solenv/CustomTarget_gdb.mk | 22
solenv/Module_solenv.mk |8 -
solenv/Package_gdb.mk| 38 ---
solenv/bin/install-gdb-printers | 10 +-
solenv/bin/modules/installer/control.pm |7 -
solenv/bin/modules/installer/globals.pm |2
solenv/bin/modules/installer/windows/mergemodule.pm |6 -
solenv/bin/modules/installer/windows/shortcut.pm | 10 +-
solenv/bin/modules/installer/worker.pm |8 -
sysui/Module_sysui.mk|5 -
sysui/Package_icons.mk | 55 ---
sysui/desktop/icons/soffice.ico |binary
unoil/Module_unoil.mk|4
unoil/Package_clioootypesversion.mk | 16 ---
vcl/Library_vcl.mk |4
39 files changed, 78 insertions(+), 319 deletions(-)
New commits:
commit 8817dcb8f43051d352c0caed6eebf29c6b0192b8
Author: Michael Stahl mst...@redhat.com
Date: Tue Oct 29 23:18:50 2013 +0100
l10ntools: remove Package_ulfconv
Change-Id: I7a8c3fdf34951e00fca8c0a2543f33817fa874fa
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 771e717..9797252 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -25,8 +25,4 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\
StaticLibrary_transex \
))
-$(eval $(call gb_Module_add_targets,l10ntools,\
-Package_ulfconv \
-))
-
# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Package_ulfconv.mk b/l10ntools/Package_ulfconv.mk
deleted file mode 100644
index 18be8b4..000
--- a/l10ntools/Package_ulfconv.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# 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/.
-#
-
-$(eval $(call
gb_Package_Package,l10ntools_ulfconv,$(SRCDIR)/l10ntools/source/ulfconv))
-
-$(eval $(call gb_Package_set_outdir,l10ntools_ulfconv,$(OUTDIR)))
-
-$(eval $(call
gb_Package_add_file,l10ntools_ulfconv,bin/msi-encodinglist.txt,msi-encodinglist.txt))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 955158d..6e81431 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -408,14 +408,13 @@ sub check_logfile
sub read_lcidlist
{
my ($patharrayref) = @_;
-my $fileref =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::lcidlistname,
$patharrayref , 0);
-if ( $$fileref eq ) { installer::exiter::exit_program(ERROR: Did not
find Windows LCID list $installer::globals::lcidlistname!, read_lcidlist); }
+if ( ! -f $installer::globals::lcidlistname ) {
installer::exiter::exit_program(ERROR:
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 15 +--
sc/source/core/opencl/opbase.cxx | 11 +++
2 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit bb1a1054fae950f7cc164251b5ca61b63b5817f5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:09:46 2013 -0400
More C++11 specific features we aren't supposed to be using...
* No 'auto'.
* No std::unique_ptr.
Change-Id: Iaceab28b9ad0b515bf77db2767018573c8de61de
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 1dd7c89..fb37ed6 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -661,7 +661,8 @@ templateclass Op
class DynamicKernelSoPArguments: public DynamicKernelArgument
{
public:
-typedef std::unique_ptrDynamicKernelArgument SubArgument;
+typedef boost::shared_ptrDynamicKernelArgument SubArgument;
+typedef std::vectorSubArgument SubArgumentsType;
DynamicKernelSoPArguments(const std::string s,
boost::shared_ptrFormulaTreeNode ft);
@@ -670,8 +671,9 @@ public:
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
{
unsigned i = 0;
-for(auto it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e;
-++it) {
+for (SubArgumentsType::iterator it = mvSubArguments.begin(), e=
mvSubArguments.end(); it!=e;
+++it)
+{
i += (*it)-Marshal(k, argno + i, nVectorWidth);
}
return i;
@@ -716,8 +718,9 @@ public:
/// When declared as input to a sliding window function
virtual void GenSlidingWindowDecl(std::stringstream ss) const
{
-for(auto it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e;
-++it) {
+for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e=
mvSubArguments.end(); it!=e;
+++it)
+{
if (it != mvSubArguments.begin())
ss , ;
(*it)-GenSlidingWindowDecl(ss);
@@ -757,7 +760,7 @@ public:
return t;
}
private:
-std::vectorSubArgument mvSubArguments;
+SubArgumentsType mvSubArguments;
Op CodeGen;
};
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index e7eae13..ec59e7a 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -65,15 +65,18 @@ size_t DynamicKernelArgument::GetWindowSize(void) const
{
FormulaToken *pCur = mFormulaTree-GetFormulaToken();
assert(pCur);
-if (auto *pCurDVR =
-dynamic_castconst formula::DoubleVectorRefToken *(pCur))
+if (const formula::DoubleVectorRefToken* pCurDVR =
+dynamic_castconst formula::DoubleVectorRefToken *(pCur))
{
return pCurDVR-GetRefRowSize();
-} else if (dynamic_castconst formula::SingleVectorRefToken *(pCur))
+}
+else if (dynamic_castconst formula::SingleVectorRefToken *(pCur))
{
// Prepare intermediate results (on CPU for now)
return 1;
-} else {
+}
+else
+{
throw Unhandled();
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 15 +--
sc/source/core/opencl/opbase.cxx | 11 +++
2 files changed, 16 insertions(+), 10 deletions(-)
New commits:
commit 64e00faba5faefc50ae25dd410d0313026dea720
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:09:46 2013 -0400
More C++11 specific features we aren't supposed to be using...
* No 'auto'.
* No std::unique_ptr.
Change-Id: Iaceab28b9ad0b515bf77db2767018573c8de61de
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 1dd7c89..fb37ed6 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -661,7 +661,8 @@ templateclass Op
class DynamicKernelSoPArguments: public DynamicKernelArgument
{
public:
-typedef std::unique_ptrDynamicKernelArgument SubArgument;
+typedef boost::shared_ptrDynamicKernelArgument SubArgument;
+typedef std::vectorSubArgument SubArgumentsType;
DynamicKernelSoPArguments(const std::string s,
boost::shared_ptrFormulaTreeNode ft);
@@ -670,8 +671,9 @@ public:
virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth)
{
unsigned i = 0;
-for(auto it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e;
-++it) {
+for (SubArgumentsType::iterator it = mvSubArguments.begin(), e=
mvSubArguments.end(); it!=e;
+++it)
+{
i += (*it)-Marshal(k, argno + i, nVectorWidth);
}
return i;
@@ -716,8 +718,9 @@ public:
/// When declared as input to a sliding window function
virtual void GenSlidingWindowDecl(std::stringstream ss) const
{
-for(auto it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e;
-++it) {
+for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e=
mvSubArguments.end(); it!=e;
+++it)
+{
if (it != mvSubArguments.begin())
ss , ;
(*it)-GenSlidingWindowDecl(ss);
@@ -757,7 +760,7 @@ public:
return t;
}
private:
-std::vectorSubArgument mvSubArguments;
+SubArgumentsType mvSubArguments;
Op CodeGen;
};
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index e7eae13..ec59e7a 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -65,15 +65,18 @@ size_t DynamicKernelArgument::GetWindowSize(void) const
{
FormulaToken *pCur = mFormulaTree-GetFormulaToken();
assert(pCur);
-if (auto *pCurDVR =
-dynamic_castconst formula::DoubleVectorRefToken *(pCur))
+if (const formula::DoubleVectorRefToken* pCurDVR =
+dynamic_castconst formula::DoubleVectorRefToken *(pCur))
{
return pCurDVR-GetRefRowSize();
-} else if (dynamic_castconst formula::SingleVectorRefToken *(pCur))
+}
+else if (dynamic_castconst formula::SingleVectorRefToken *(pCur))
{
// Prepare intermediate results (on CPU for now)
return 1;
-} else {
+}
+else
+{
throw Unhandled();
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2bf7232a981ec009335562a799183055d2933f67
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:16:21 2013 -0400
Catch exception always as const reference.
Change-Id: I7526a8724b66bbf23c5b38b76dcd6497ec409979
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index fb37ed6..875a259 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1414,7 +1414,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
return true;
}
#undef NO_FALLBACK_TO_SWINTERP /* undef this for non-TDD runs */
-catch (UnhandledToken ut) {
+catch (const UnhandledToken) {
std::cerr Dynamic formual compiler: unhandled token\n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
@@ -1422,7 +1422,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
return false;
#endif
}
-catch (OpenCLError oce) {
+catch (const OpenCLError oce) {
std::cerr Dynamic formula compiler: OpenCL error: ;
std::cerr oce.mError \n;
#ifdef NO_FALLBACK_TO_SWINTERP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7490d80c05d20e837cc11672ac58fa3cf1f61207
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:16:21 2013 -0400
Catch exception always as const reference.
Change-Id: I7526a8724b66bbf23c5b38b76dcd6497ec409979
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index fb37ed6..875a259 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1414,7 +1414,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
return true;
}
#undef NO_FALLBACK_TO_SWINTERP /* undef this for non-TDD runs */
-catch (UnhandledToken ut) {
+catch (const UnhandledToken) {
std::cerr Dynamic formual compiler: unhandled token\n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
@@ -1422,7 +1422,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
return false;
#endif
}
-catch (OpenCLError oce) {
+catch (const OpenCLError oce) {
std::cerr Dynamic formula compiler: OpenCL error: ;
std::cerr oce.mError \n;
#ifdef NO_FALLBACK_TO_SWINTERP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6877f54d9c4680fcbc9a6d3bf1037738e8b93224
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:26:15 2013 -0400
DIE auto DIE!!!
Change-Id: Ia4df8ac18a4b213a6c82a8faff0a4c08d53b6d08
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 875a259..8dc5779 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -695,7 +695,7 @@ public:
}
virtual void GenDecl(std::stringstream ss) const
{
-for(auto it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e;
+for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e=
mvSubArguments.end(); it!=e;
++it) {
if (it != mvSubArguments.begin())
ss , ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6cfc9e0dc68abf2a35b9958d80d1ca27df6239da
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:26:15 2013 -0400
DIE auto DIE!!!
Change-Id: Ia4df8ac18a4b213a6c82a8faff0a4c08d53b6d08
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 875a259..8dc5779 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -695,7 +695,7 @@ public:
}
virtual void GenDecl(std::stringstream ss) const
{
-for(auto it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e;
+for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e=
mvSubArguments.end(); it!=e;
++it) {
if (it != mvSubArguments.begin())
ss , ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/opencl-test.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit c2bb1a1fe7b2a258d404a29833d6fb0c1ce1013d Author: Michael Stahl mst...@redhat.com Date: Wed Oct 30 00:38:10 2013 +0100 opencl-test.cxx: -Werror=unused-macros Change-Id: I762673fd315e2f37da18a7739acd2b71240418bf diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index d65c835..48548ab 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -16,8 +16,6 @@ #include sfx2/sfxmodelfactory.hxx #include svl/stritem.hxx -#define TEST_BUG_FILES 0 - #include helper/qahelper.hxx #include calcconfig.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4ade490f992c84d5f2335528f1f286fa93180329
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:44:16 2013 -0400
Hopefull this is the last of std::unique_ptr.
Again, this is C++11 specific which we can't use.
Change-Id: I766cdf56cd49ba1611cf0172a52a5c0d950d33a0
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 8dc5779..229b639 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -765,10 +765,10 @@ private:
};
template class Op
-std::unique_ptrDynamicKernelArgument SoPHelper(const std::string ts,
+boost::shared_ptrDynamicKernelArgument SoPHelper(const std::string ts,
boost::shared_ptrFormulaTreeNode ft)
{
-return std::unique_ptrDynamicKernelArgument(
+return boost::shared_ptrDynamicKernelArgument(
new DynamicKernelSoPArgumentsOp(ts, ft));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b3aadaa58c7a5c28132da3d085ce39378fe69ce8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 19:44:16 2013 -0400
Hopefull this is the last of std::unique_ptr.
Again, this is C++11 specific which we can't use.
Change-Id: I766cdf56cd49ba1611cf0172a52a5c0d950d33a0
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 8dc5779..229b639 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -765,10 +765,10 @@ private:
};
template class Op
-std::unique_ptrDynamicKernelArgument SoPHelper(const std::string ts,
+boost::shared_ptrDynamicKernelArgument SoPHelper(const std::string ts,
boost::shared_ptrFormulaTreeNode ft)
{
-return std::unique_ptrDynamicKernelArgument(
+return boost::shared_ptrDynamicKernelArgument(
new DynamicKernelSoPArgumentsOp(ts, ft));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 18 --
sc/source/core/opencl/opbase.hxx |4 +++-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 5ebecfc110f2c31e7bcef1c6e0a8fb2f6f1d56d5
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date: Tue Oct 29 17:06:53 2013 -0500
Include a message for unhandled-token in OCL group interpreter.
Also added sanity checks for unhandled cases; i.e. mixed string/numeric
in SingleVectorRefs
Change-Id: I448536f45ec6cf9bc870671646c5ed4ee83ac9f8
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 229b639..c83715e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -807,14 +807,19 @@
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
const formula::SingleVectorRefToken* pSVR =
dynamic_cast const formula::SingleVectorRefToken*
(pChild);
assert(pSVR);
-if (pSVR-GetArray().mpNumericArray)
+if (pSVR-GetArray().mpNumericArray
+!pSVR-GetArray().mpStringArray)
mvSubArguments.push_back(
SubArgument(new DynamicKernelArgument(ts,
ft-Children[i])));
-else
+else if (!pSVR-GetArray().mpNumericArray
+pSVR-GetArray().mpStringArray)
mvSubArguments.push_back(
SubArgument(new DynamicKernelStringArgument(
ts, ft-Children[i])));
+else
+throw UnhandledToken(pChild,
+Got both numeric and string vector);
} else if (pChild-GetType() == formula::svDouble) {
mvSubArguments.push_back(
SubArgument(new DynamicKernelConstantArgument(ts,
@@ -824,7 +829,7 @@
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
SubArgument(new ConstStringArgument(ts,
ft-Children[i])));
} else {
-throw UnhandledToken(pChild);
+throw UnhandledToken(pChild, unknown operand for ocPush);
}
break;
case ocDiv:
@@ -1095,7 +1100,7 @@
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
}
break;
default:
-throw UnhandledToken(pChild);
+throw UnhandledToken(pChild, unhandled opcode);
};
}
}
@@ -1414,8 +1419,9 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
return true;
}
#undef NO_FALLBACK_TO_SWINTERP /* undef this for non-TDD runs */
-catch (const UnhandledToken) {
-std::cerr Dynamic formual compiler: unhandled token\n;
+catch (const UnhandledToken ut) {
+std::cerr \nDynamic formual compiler: unhandled token: ;
+std::cerr ut.mMessage \n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
#else
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index 93f6820..a858ede 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -25,8 +25,10 @@ namespace sc { namespace opencl {
class UnhandledToken
{
public:
-UnhandledToken(formula::FormulaToken *t): mToken(t) {}
+UnhandledToken(formula::FormulaToken *t,
+const char *const m): mToken(t), mMessage(m) {}
formula::FormulaToken *mToken;
+std::string mMessage;
};
/// Failed in marshaling
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 18 --
sc/source/core/opencl/opbase.hxx |4 +++-
2 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 43a61b3dd74c059a690b9cf46d294c2908212557
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date: Tue Oct 29 17:06:53 2013 -0500
Include a message for unhandled-token in OCL group interpreter.
Also added sanity checks for unhandled cases; i.e. mixed string/numeric
in SingleVectorRefs
Change-Id: I448536f45ec6cf9bc870671646c5ed4ee83ac9f8
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 229b639..c83715e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -807,14 +807,19 @@
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
const formula::SingleVectorRefToken* pSVR =
dynamic_cast const formula::SingleVectorRefToken*
(pChild);
assert(pSVR);
-if (pSVR-GetArray().mpNumericArray)
+if (pSVR-GetArray().mpNumericArray
+!pSVR-GetArray().mpStringArray)
mvSubArguments.push_back(
SubArgument(new DynamicKernelArgument(ts,
ft-Children[i])));
-else
+else if (!pSVR-GetArray().mpNumericArray
+pSVR-GetArray().mpStringArray)
mvSubArguments.push_back(
SubArgument(new DynamicKernelStringArgument(
ts, ft-Children[i])));
+else
+throw UnhandledToken(pChild,
+Got both numeric and string vector);
} else if (pChild-GetType() == formula::svDouble) {
mvSubArguments.push_back(
SubArgument(new DynamicKernelConstantArgument(ts,
@@ -824,7 +829,7 @@
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
SubArgument(new ConstStringArgument(ts,
ft-Children[i])));
} else {
-throw UnhandledToken(pChild);
+throw UnhandledToken(pChild, unknown operand for ocPush);
}
break;
case ocDiv:
@@ -1095,7 +1100,7 @@
DynamicKernelSoPArgumentsOp::DynamicKernelSoPArguments(const std::string s,
}
break;
default:
-throw UnhandledToken(pChild);
+throw UnhandledToken(pChild, unhandled opcode);
};
}
}
@@ -1414,8 +1419,9 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
return true;
}
#undef NO_FALLBACK_TO_SWINTERP /* undef this for non-TDD runs */
-catch (const UnhandledToken) {
-std::cerr Dynamic formual compiler: unhandled token\n;
+catch (const UnhandledToken ut) {
+std::cerr \nDynamic formual compiler: unhandled token: ;
+std::cerr ut.mMessage \n;
#ifdef NO_FALLBACK_TO_SWINTERP
assert(false);
#else
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index 93f6820..a858ede 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -25,8 +25,10 @@ namespace sc { namespace opencl {
class UnhandledToken
{
public:
-UnhandledToken(formula::FormulaToken *t): mToken(t) {}
+UnhandledToken(formula::FormulaToken *t,
+const char *const m): mToken(t), mMessage(m) {}
formula::FormulaToken *mToken;
+std::string mMessage;
};
/// Failed in marshaling
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 8 commits - sc/AllLangResTarget_sc.mk sc/inc sc/source
sc/AllLangResTarget_sc.mk |7
sc/inc/globstr.hrc | 62 ---
sc/inc/sc.hrc |5
sc/inc/strload.hxx |1
sc/source/core/data/global.cxx | 14
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx|7
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.src| 19 -
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx |7
sc/source/ui/StatisticsDialogs/CorrelationDialog.src | 19 -
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx|7
sc/source/ui/StatisticsDialogs/CovarianceDialog.src| 19 -
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx | 33 -
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.src | 83
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 49 +-
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.src | 90
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx |7
sc/source/ui/StatisticsDialogs/SamplingDialog.src | 19 -
sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc | 55 +++
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src | 183
++
sc/source/ui/cctrl/checklistmenu.cxx |6
sc/source/ui/miscdlgs/filldlg.cxx |2
sc/source/ui/src/globstr.src |5
sc/source/ui/src/scstring.src |6
sc/source/ui/view/gridwin.cxx |4
sc/source/ui/view/gridwin2.cxx |6
25 files changed, 330 insertions(+), 385 deletions(-)
New commits:
commit 19bae2d3e36052cd902d6f127128c8aa91b937bb
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 30 01:04:44 2013 +0100
renamed STR_COUNT to SC_GLOBSTR_STR_COUNT to clarify ...
... that it is not an ID of a string but indeed the count of global
strings.
Change-Id: Ia4ebc389bad86333bae6a3ce761399b9248f2696
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 275f7b9..25a5a01 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -688,7 +688,7 @@
#define STR_CTRLCLICKHYPERLINK 551
#define STR_CLICKHYPERLINK 552
-#define STR_COUNT 553
+#define SC_GLOBSTR_STR_COUNT553 /** the count of permanently
resident strings */
#endif
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index fed00ee..f6a376b 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -346,7 +346,7 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
const OUString ScGlobal::GetRscString( sal_uInt16 nIndex )
{
-OSL_ENSURE( nIndex STR_COUNT, ScGlobal::GetRscString - invalid string
index);
+OSL_ENSURE( nIndex SC_GLOBSTR_STR_COUNT, ScGlobal::GetRscString -
invalid string index);
if( !ppRscString[ nIndex ] )
{
OpCode eOp = ocNone;
@@ -539,8 +539,8 @@ void ScGlobal::Init()
pCharClass = pSysLocale-GetCharClassPtr();
pLocaleData = pSysLocale-GetLocaleDataPtr();
-ppRscString = new OUString *[ STR_COUNT ];
-for( sal_uInt16 nC = 0 ; nC STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
+ppRscString = new OUString *[ SC_GLOBSTR_STR_COUNT ];
+for( sal_uInt16 nC = 0 ; nC SC_GLOBSTR_STR_COUNT ; nC++ ) ppRscString[
nC ] = NULL;
pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ),
ATTR_BACKGROUND );
pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND );
@@ -645,7 +645,7 @@ void ScGlobal::Clear()
DELETEZ(pAddInCollection);
DELETEZ(pUserList);
-for( sal_uInt16 nC = 0 ; nC STR_COUNT ; nC++ )
+for( sal_uInt16 nC = 0 ; nC SC_GLOBSTR_STR_COUNT ; nC++ )
if( ppRscString ) delete ppRscString[ nC ];
delete[] ppRscString;
ppRscString = NULL;
commit bc131959ad0cd58262859a11af1977e47d62cb32
Author: Eike Rathke er...@redhat.com
Date: Wed Oct 30 00:49:37 2013 +0100
STR_VALERR had no place in globstr, moved to scstring SCSTR_VALERR
Change-Id: I311918aaacc8b0de32af5bd7fd7e5be146d977e2
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 2f64f3f..275f7b9 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -690,11 +690,6 @@
#define STR_COUNT 553
-
-// Row fillers
-#define STR_VALERR 591
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 3b18b95..73d9a15 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -954,7 +954,9 @@
#define SCSTR_FIELDSEP_TAB (STR_START + 412)
#define SCSTR_FIELDSEP_SPACE(STR_START + 413)
-#define STR_END (SCSTR_FIELDSEP_SPACE)
+#define SCSTR_VALERR
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c88576e424d7e6827edf2d9894b16fe22675b333
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 20:31:51 2013 -0400
Believe or not, '' in this context is also C++11 specific.
For those compilers that don't support C++11, we need to put a space
in between.
Change-Id: I2b67225047de3cc97f8bcec8d75d360cbbefd988
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c83715e..a3b21a9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1351,7 +1351,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
// Constructing AST
FormulaTokenIterator aCode = rCode;
std::listFormulaToken * list;
-std::mapFormulaToken *, boost::shared_ptrFormulaTreeNode m_hash_map;
+std::mapFormulaToken *, boost::shared_ptrFormulaTreeNode m_hash_map;
FormulaToken* pCur;
while( (pCur = (FormulaToken*)(aCode.Next()) ) != NULL)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9e7e21cd532f04a1b1c7c7288bc439848963b748
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Oct 29 20:31:51 2013 -0400
Believe or not, '' in this context is also C++11 specific.
For those compilers that don't support C++11, we need to put a space
in between.
Change-Id: I2b67225047de3cc97f8bcec8d75d360cbbefd988
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index c83715e..a3b21a9 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1351,7 +1351,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(
ScDocument rDoc,
// Constructing AST
FormulaTokenIterator aCode = rCode;
std::listFormulaToken * list;
-std::mapFormulaToken *, boost::shared_ptrFormulaTreeNode m_hash_map;
+std::mapFormulaToken *, boost::shared_ptrFormulaTreeNode m_hash_map;
FormulaToken* pCur;
while( (pCur = (FormulaToken*)(aCode.Next()) ) != NULL)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/presenter/PresenterBitmapContainer.cxx |1 -
sdext/source/presenter/PresenterBitmapContainer.hxx |2 --
sdext/source/presenter/PresenterController.hxx|3 ---
sdext/source/presenter/PresenterHelpView.hxx |1 +
sdext/source/presenter/PresenterNotesView.cxx |1 -
sdext/source/presenter/PresenterPane.hxx |1 -
sdext/source/presenter/PresenterPaneBorderManager.cxx |1 -
sdext/source/presenter/PresenterPaneBorderManager.hxx |1 -
sdext/source/presenter/PresenterPaneContainer.cxx |1 -
sdext/source/presenter/PresenterProtocolHandler.hxx |2 --
sdext/source/presenter/PresenterScreen.hxx|2 --
sdext/source/presenter/PresenterScrollBar.hxx |1 +
sdext/source/presenter/PresenterSpritePane.hxx|1 -
sdext/source/presenter/PresenterTimer.hxx |1 -
sdext/source/presenter/PresenterToolBar.cxx |3 ---
sdext/source/presenter/PresenterToolBar.hxx |2 --
16 files changed, 2 insertions(+), 22 deletions(-)
New commits:
commit d502ddff205f381807bda16aee8469bcdf354a18
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Oct 30 09:32:01 2013 +0900
Remove unnecessary #includes
and add them to a couple of appropriate headers
Change-Id: I500765df767319a0a75ea2446f4fec591a34da58
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx
b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 37e2f08..020d1d5 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -26,7 +26,6 @@
#include com/sun/star/rendering/CompositeOperation.hpp
#include com/sun/star/rendering/XIntegerBitmap.hpp
#include boost/bind.hpp
-#include map
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx
b/sdext/source/presenter/PresenterBitmapContainer.hxx
index c88dfb5..8d0dbfa 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -29,9 +29,7 @@
#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/util/Color.hpp
#include boost/noncopyable.hpp
-#include boost/scoped_ptr.hpp
#include map
-#include vector
#include boost/shared_ptr.hpp
namespace sdext { namespace presenter {
diff --git a/sdext/source/presenter/PresenterController.hxx
b/sdext/source/presenter/PresenterController.hxx
index 8f7a713..4cc00b5 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -45,10 +45,7 @@
#include com/sun/star/util/XURLTransformer.hpp
#include rtl/ref.hxx
#include map
-#include vector
-#include boost/function.hpp
#include boost/shared_ptr.hpp
-#include boost/scoped_ptr.hpp
namespace sdext { namespace presenter {
diff --git a/sdext/source/presenter/PresenterHelpView.hxx
b/sdext/source/presenter/PresenterHelpView.hxx
index 4d74270..dd51818 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -29,6 +29,7 @@
#include com/sun/star/drawing/framework/XResourceId.hpp
#include com/sun/star/frame/XController.hpp
#include com/sun/star/rendering/XSpriteCanvas.hpp
+#include boost/scoped_ptr.hpp
namespace {
typedef cppu::WeakComponentImplHelper3
diff --git a/sdext/source/presenter/PresenterNotesView.cxx
b/sdext/source/presenter/PresenterNotesView.cxx
index 685cc20..6fd964b 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -40,7 +40,6 @@
#include com/sun/star/util/XChangesBatch.hpp
#include com/sun/star/container/XChild.hpp
#include boost/bind.hpp
-#include set
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sdext/source/presenter/PresenterPane.hxx
b/sdext/source/presenter/PresenterPane.hxx
index 61ec241..9e225f2 100644
--- a/sdext/source/presenter/PresenterPane.hxx
+++ b/sdext/source/presenter/PresenterPane.hxx
@@ -32,7 +32,6 @@
#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/rendering/XCanvas.hpp
#include rtl/ref.hxx
-#include boost/noncopyable.hpp
namespace sdext { namespace presenter {
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx
b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index 0e63720..7285849 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -35,7 +35,6 @@
#include com/sun/star/lang/XMultiComponentFactory.hpp
#include cppuhelper/compbase1.hxx
#include osl/mutex.hxx
-#include boost/weak_ptr.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx
b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index e95147a..c70bf0b 100644
---
