[Libreoffice-commits] .: sc/source
sc/source/filter/starcalc/scflt.cxx | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 9042c4d0740c5b222b27d189e526b74fbd740b6f Author: Mariusz Dykierek Date: Mon Jan 23 13:41:19 2012 +0530 Redundant condition and Comment Translations. diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 1d30ea2..51e9e0a 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -1708,7 +1708,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) sal_uInt16 nValue1; Sc10ColData *pColData; -// Font (Name, Groesse) +// Font (Name, Size) nStart = 0; nEnd = 0; nLimit = aFont.Count; @@ -1739,7 +1739,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) nStart = nEnd + 1; } -// Fontfarbe +// Font color nStart = 0; nEnd = 0; nLimit = aColor.Count; @@ -1758,7 +1758,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) nStart = nEnd + 1; } -// Fontattribute (Fett, Kursiv...) +// Font attributes (Bold, Italic...) nStart = 0; nEnd = 0; nLimit = aAttr.Count; @@ -1783,7 +1783,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) nStart = nEnd + 1; } -// Zellausrichtung +// Cell alignment nStart = 0; nEnd = 0; nLimit = aJustify.Count; @@ -1834,15 +1834,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) aScPattern.GetItemSet().Put(SfxInt32Item(ATTR_ROTATE_VALUE,27000)); sal_Int16 Margin = Max((sal_uInt16)20, (sal_uInt16)(EJustify * 20)); -if (((OJustify & ojBottomTop) == ojBottomTop) || ((OJustify & ojBottomTop) == ojBottomTop)) +if (OJustify & ojBottomTop) aScPattern.GetItemSet().Put(SvxMarginItem(20, Margin, 20, Margin, ATTR_MARGIN)); else aScPattern.GetItemSet().Put(SvxMarginItem(Margin, 20, Margin, 20, ATTR_MARGIN)); pDoc->ApplyPatternAreaTab(Col, nStart, Col, nEnd, Tab, aScPattern); } -nStart = nEnd + 1; +nStart = nEnd + 1; } -// Umrandung +// Border sal_BoolbEnd = false; sal_uInt16 nColorIndex = 0; sal_uInt16 nFrameIndex = 0; @@ -1966,9 +1966,9 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) pColData++; } -// ACHTUNG: Code bis hier ueberarbeitet ... jetzt hab' ich keinen Bock mehr! (GT) +// ATTENTION: Code up to here works more or less ... from here I've had enough ! (GT) -// Hintergrund (Farbe, Raster) +// Background (Color, Raster) sal_uInt16 nRasterIndex = 0; bEnd= false; nColorIndex = 0; @@ -2056,7 +2056,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) nHelpMe--; } -// Zahlenformate +// Number format nStart = 0; nEnd = 0; nLimit = aValue.Count; @@ -2078,7 +2078,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) nStart = nEnd + 1; } -// Zellattribute (Schutz, Versteckt...) +// Cell attributes (Protected, hidden...) nStart = 0; nEnd = 0; for (i=0; iGetStyleSheetPool(); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/ANDROID_ARM_GCC.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit a76ab71b8b4582cde28e6937afe960e8737efea1 Author: Tor Lillqvist Date: Mon Jan 23 00:20:26 2012 +0200 Use -z defs to catch undefineds at build time diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index 1a7e56e..e10907a 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -49,6 +49,9 @@ gb_CppunitTest_CPPTESTPRECOMMAND := : # eventually enable this to be done this in some more elegant and less # redundant fashion. +gb_LinkTarget_LDFLAGS += \ +-Wl,-z,defs \ + define gb_LinkTarget__command_dynamiclink $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/html/htmlexp.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit d180de79b82d1a73cfd914dd9a1524109c5e78ee
Author: Eike Rathke
Date: Sun Jan 22 20:13:36 2012 +0100
resolved fdo#45032 Calc export to HTML with graphics failed
Fixed a misconception in transition from List to to ptr_vector of commit
db599f64e63a3141159b7f0e59783197c39b3e02, List::Next() returned NULL when at
end of list, mimic that.
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index af34e40..d66cb0d 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -876,11 +876,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow,
SCTAB nTab )
size_t ListSize = aGraphList.size();
for ( size_t i = 0; i < ListSize; ++i )
{
-pGraphEntry = &aGraphList[ i ];
-if ( pGraphEntry->bInCell && pGraphEntry->aRange.In( aPos ) )
+ScHTMLGraphEntry* pE = &aGraphList[ i ];
+if ( pE->bInCell && pE->aRange.In( aPos ) )
{
-if ( pGraphEntry->aRange.aStart == aPos )
+if ( pE->aRange.aStart == aPos )
+{
+pGraphEntry = pE;
break; // for
+}
else
return ;// ist ein Col/RowSpan, Overlapped
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7afa76599cf0c9256e2dc85709f8cb2f1ac76282 Merge: 1684f1c... 799f2de... Author: Thomas Klausner Date: Sun Jan 22 12:29:04 2012 +0100 Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/core commit 1684f1cb1a7ca155e613d3da4e2c168e9618e62a Author: Thomas Klausner Date: Sun Jan 22 12:28:08 2012 +0100 Use more portable `=' comparison operator instead of `=='. diff --git a/configure.in b/configure.in index 3be6798..84beec3 100644 --- a/configure.in +++ b/configure.in @@ -9696,7 +9696,7 @@ dnlthis should be unified into using only one version for both AC_MSG_CHECKING([whether to use the system libjpeg]) -if test "$SYSTEM_JPEG" == "YES"; then +if test "$SYSTEM_JPEG" = "YES"; then SYSTEM_LIBJPEG=YES AC_MSG_RESULT([yes]) else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 799f2de5d1085d845ec498af0a7932965c42ed68
Author: Ivan Timofeev
Date: Sun Jan 22 14:53:11 2012 +0400
fdo#43705: fix incomplete updating of the page preview pane in Draw
This regression was introduced in f215333002882872129066828228d3343a903331.
As stated in PageObjectPainter::PaintPageObject:
"The page object layouter is quite volatile."
The rest of usages of mpPageObjectLayouter looks sane, but who knows...
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index c376e45..8a2ae0b 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -167,6 +167,7 @@ void PageObjectPainter::PaintPageObject (
void PageObjectPainter::NotifyResize (const bool bForce)
{
+mpPageObjectLayouter = mrLayouter.GetPageObjectLayouter();
if (bForce || ! mpPageObjectLayouter)
InvalidateBitmaps();
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.Android
README.Android |2 -- 1 file changed, 2 deletions(-) New commits: commit a865eee6e74b3de779f282bb276492239fed2abb Author: Tor Lillqvist Date: Sun Jan 22 10:20:15 2012 +0200 Wash my hands diff --git a/README.Android b/README.Android index 16f3b54..dd1a639 100644 --- a/README.Android +++ b/README.Android @@ -101,5 +101,3 @@ functions in liblo-bootstrap it calls a named function in that This Android-specific native code (the lo-bootstrap library) is for now in sal/android, and the Java code in the android "module" (subdirectory right here). - ---Tor Lillqvist ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in README.cross
README.cross | 68 --- configure.in |2 - 2 files changed, 29 insertions(+), 41 deletions(-) New commits: commit c4feba9af53831a7bb1ff4765b4294ce0b6ea613 Author: Tor Lillqvist Date: Sun Jan 22 10:18:47 2012 +0200 Wash my hands diff --git a/README.cross b/README.cross index 67fb1d4..f3c62b2 100644 --- a/README.cross +++ b/README.cross @@ -1,20 +1,16 @@ Cross-compiling LibreOffice === -Notes on cross-compiling LibreOffice, originally written by Tor -Lillqvist in May, 2011, for later -history see git log. - -My cross-compilation experimentation is going on for four platforms: -Windows, iOS, Android and PowerPC Mac OS X. I work on the master -branch of LibreOffice. Some other people have talked about setting up -a separate branch for Android work, or even separate clones at -github. I am not interested in that. +The cross-compilation experimentation is going on for four platforms: +Windows, iOS, Android and PowerPC Mac OS X. It happens in the master +branch of LibreOffice. Some people have talked about setting up a +separate branch for Android work, or even separate clones at github, +but that is not necessary. Cross-compilation of LibreOffice completely is not possible yet. Much work has been done, "baby steps" for some platforms, much more for others, but a lot remains. For iOS and Android this work is highly -experimental, originally done in my spare time just for the hacking +experimental, originally done in spare time just for the hacking pleasure. No promise, explicit or implied, is given that it will ever be finished. @@ -64,27 +60,27 @@ Windows --- There is some support in LibreOffice already (from OpenOffice.org) for -building it locally on Windows with the GNU tool-chain (MinGW). But as -far as I know, that work has never attempted cross-compilation. +building it locally on Windows with the GNU tool-chain +(MinGW). Apparently, that work has never attempted cross-compilation. This OOo-originated MinGW support attempts to support both running Cygwin gcc in its -mno-cygwin mode, and a native MinGW compiler. The -mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if -it isn't already, and I have not attempted to try to keep it working; -in fact I have activly cleaned out mechanisms related to this. Ditto +it isn't already, and we have not attempted to try to keep it working; +in fact we have activly cleaned out mechanisms related to this. Ditto for native MinGW. If one compiles natively on Windows, just use Microsoft's compiler. OOo/LO has been built for Windows all the time using that. -In my opinion, the only case where it makes sense to use MinGW is for +The only case where it makes sense to use MinGW is for cross-compilation. There is just too much crack on Windows anyway, and it is a semi-miracle (well, make that the result of years of work) that the MSVC build under Cygwin works as nicely as it does. MinGW is available as cross-build toolchains pre-packaged in more or -less official packages for many Linux distros including Debian, Fedora, -openSUSE and SLE. Personally I use the mingw32 packages in the Open -Build Service, running on openSUSE: +less official packages for many Linux distros including Debian, +Fedora, openSUSE and SLE. For instance the mingw32 packages in the +Open Build Service, running on openSUSE: http://download.opensuse.org/repositories/windows:/mingw:/win32/ @@ -119,8 +115,8 @@ that's likely to be fixed in the openSUSE project. It is somewhat unclear how well thought-out the conditionals and code for MinGW inside the OOo-originated code in LibreOffice actually -are. What I have noticed of it seems a bit randomish, with -copy-pasting having been preferred to factoring out differences. +are. It often seems a bit randomish, with copy-pasting having been +preferred to factoring out differences. Most of the configuration settings are maintained in the distro-configs/LibreOfficeMinGW.conf file, so in your autogen.lastrun, @@ -239,7 +235,7 @@ TODO: - much of the stuff currently relies on --with-system-*, and consequently on the mingw32-* openSUSE packages; might be good to be able to build with as few dependencies as possible - but that is low -prio I think +prio - profiling - when all the above is sorted out, we should look at the speed of @@ -273,9 +269,9 @@ how UNO is implemented and used. None of that has been spared much thought yet. The Apple tool-chain for iOS cross-building is available only for -Mac OS X, so that is where I have been doing it. +Mac OS X. -Here is my autogen.lastrun for iOS (device): +Here is an autogen.lastrun for iOS (device): CXX=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++ -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk CC=ccache /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc -
