date:20141018

LibreOffice Gerrit News for core on 2014-10-19

2014-10-18 Thread gerrit

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#85006 Ignore rare fonts with names ending in ")"
  in https://gerrit.libreoffice.org/12022 from Matthew Francis
  about module vcl
 End of freshness 

+ vcl: move mirror from SalGraphics to OutputDevice - part 4: rectangles
  in https://gerrit.libreoffice.org/12029 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 3: lines
  in https://gerrit.libreoffice.org/12028 from Chris Sherlock
  about module include, vcl
+ vcl: move mirror from SalGraphics to OutputDevice - part 2: clipping
  in https://gerrit.libreoffice.org/12027 from Chris Sherlock
  about module vcl
+ vcl: mv mirror from SalGraphics to OutputDevice - part 1 mirror & pixel
  in https://gerrit.libreoffice.org/12026 from Chris Sherlock
  about module include, vcl
+ fdo#84938: replace TIB_ constants with enum
  in https://gerrit.libreoffice.org/12023 from Noel Grandin
  about module accessibility, avmedia, basctl, chart2, cui, dbaccess, forms, 
framework, include, reportdesign, rsc, sc, sd, sfx2, svtools, svx, sw, vcl
+ WIP: fdo#43090: Add an option to disable autoclose brackets
  in https://gerrit.libreoffice.org/12024 from Marcos Paulo de Souza
  about module starmath
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/12019 from Takeshi Abe
  about module sw
+ fdo#78826 HIG: missing colons and capitalization in sc
  in https://gerrit.libreoffice.org/12015 from Adolfo Jayme Barrientos
  about module sc


* Merged changes on master for project core changed in the last 25 hours:

+ convert SV_BMP_ constants to enum
  in https://gerrit.libreoffice.org/12018 from Noel Grandin
+ fdo#39468 Translate German Comments - sc/source/filter/{lotus,rtf}
  in https://gerrit.libreoffice.org/12021 from Christian M. Heller
+ CppunitTest_sw_odfimport: enable all but one asserts on OS X
  in https://gerrit.libreoffice.org/12020 from Miklos Vajna
+ xmerge: use java.nio.ByteBuffer (JDK 1.4+)
  in https://gerrit.libreoffice.org/11998 from Robert Antoni Buj i Gelonch
+ java: loss of precission
  in https://gerrit.libreoffice.org/12000 from Robert Antoni Buj i Gelonch
+ fdo#39468 Translate German comments - sw/source/core/{sw3io|swg|unocore}
  in https://gerrit.libreoffice.org/12011 from Philipp Weissenbacher
+ javaunohelper: remove unused import
  in https://gerrit.libreoffice.org/11997 from Robert Antoni Buj i Gelonch


* Abandoned changes on master for project core changed in the last 25 hours:

+ accessibility: use String.format
  in https://gerrit.libreoffice.org/11999 from Robert Antoni Buj i Gelonch


* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#58194 - export DOCX Automatic indent as firstLine indent
  in https://gerrit.libreoffice.org/10425 from Joren De Cuyper
+ WIP (do not merge): remove custom impl of bidirectional list
  in https://gerrit.libreoffice.org/11001 from Chris Laplante
+ fdo#83003 Startcenter: No method for returnin Recent Docs
  in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ Perftest for loading autocorrect dictionaries (fdo#79761)
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan
+ fdo#81956 : Rendering of vml group shape was wrong.
  in https://gerrit.libreoffice.org/11013 from sushil_shinde
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
+ fdo#79541 :Corrupt: Shape  enclosed within a floating table
  in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


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: external/libmwaw

2014-10-18 Thread Norbert Thiebaud

 external/libmwaw/Library_mwaw.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9cf46f217424921e35aa7458c7cfd6b2a87bd2a9
Author: Norbert Thiebaud 
Date:   Sat Oct 18 23:03:46 2014 -0500

typo in filename, hidden by case insensitivity of windows

Change-Id: I9ec1fefe61f24c005519a2bb4a87fe07f6895ca6

diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index ade8367..9cab326 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -45,7 +45,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/ClarisWksDbaseContent \
UnpackedTarball/libmwaw/src/lib/ClarisWksDocument \
UnpackedTarball/libmwaw/src/lib/ClarisWksGraph \
-   UnpackedTarball/libmwaw/src/lib/ClarisWksPRPArser \
+   UnpackedTarball/libmwaw/src/lib/ClarisWksPRParser \
UnpackedTarball/libmwaw/src/lib/ClarisWksParser \
UnpackedTarball/libmwaw/src/lib/ClarisWksPresentation \
UnpackedTarball/libmwaw/src/lib/ClarisWksSSParser \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libmwaw tools/source

2014-10-18 Thread Norbert Thiebaud

 external/libmwaw/Library_mwaw.mk  |6 ++
 tools/source/generic/rational.cxx |7 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 4b71bb35a7c04fef4ed86591d8892a29c4150c0b
Author: Norbert Thiebaud 
Date:   Sat Oct 18 20:54:45 2014 -0500

work around windows whining

Change-Id: If2922bca25c93edc25e1171001def8ce3011cf4c

diff --git a/tools/source/generic/rational.cxx 
b/tools/source/generic/rational.cxx
index 1f2fc14..f99bdfa 100644
--- a/tools/source/generic/rational.cxx
+++ b/tools/source/generic/rational.cxx
@@ -128,10 +128,11 @@ void 
rational_ReduceInaccurate(boost::rational& rRational, unsigned n
 DBG_ASSERT(nSignificantBits<65, "More than 64 bit of significance is 
overkill!");
 
 // How much bits can we lose?
-const int nMulBitsToLose = std::max( ( impl_NumberOfBits( nMul ) - int( 
nSignificantBits ) ), 0 );
-const int nDivBitsToLose = std::max( ( impl_NumberOfBits( nDiv ) - int( 
nSignificantBits ) ), 0 );
+const int nMulBitsToLose = impl_NumberOfBits( nMul ) - int( 
nSignificantBits );
+const int nDivBitsToLose = impl_NumberOfBits( nDiv ) - int( 
nSignificantBits );
 
-const int nToLose = std::min( nMulBitsToLose, nDivBitsToLose );
+int nToLose = nMulBitsToLose < nDivBitsToLose ? nMulBitsToLose : 
nDivBitsToLose;
+nToLose = nToLose < 0 ? 0 : nToLose;
 
 // Remove the bits
 nMul >>= nToLose;
commit b564162dbdc2c17673e08b4f799e09add190e9ed
Author: Norbert Thiebaud 
Date:   Sat Oct 18 20:53:01 2014 -0500

fix libmwaw build on Windows

Change-Id: I103ba777cc7f38f5df17995d9ef9bfb6d6cf133b

diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 92ab48a..ade8367 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -45,6 +45,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/ClarisWksDbaseContent \
UnpackedTarball/libmwaw/src/lib/ClarisWksDocument \
UnpackedTarball/libmwaw/src/lib/ClarisWksGraph \
+   UnpackedTarball/libmwaw/src/lib/ClarisWksPRPArser \
UnpackedTarball/libmwaw/src/lib/ClarisWksParser \
UnpackedTarball/libmwaw/src/lib/ClarisWksPresentation \
UnpackedTarball/libmwaw/src/lib/ClarisWksSSParser \
@@ -99,6 +100,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWPictBitmap \
UnpackedTarball/libmwaw/src/lib/MWAWPictData \
UnpackedTarball/libmwaw/src/lib/MWAWPictMac \
+   UnpackedTarball/libmwaw/src/lib/MWAWPresentationListener \
UnpackedTarball/libmwaw/src/lib/MWAWPrinter \
UnpackedTarball/libmwaw/src/lib/MWAWPropertyHandler \
UnpackedTarball/libmwaw/src/lib/MWAWRSRCParser \
@@ -111,6 +113,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWTable \
UnpackedTarball/libmwaw/src/lib/MWAWTextListener \
UnpackedTarball/libmwaw/src/lib/MacDocParser \
+   UnpackedTarball/libmwaw/src/lib/MacDrawParser \
+   UnpackedTarball/libmwaw/src/lib/MacDrawProParser \
+   UnpackedTarball/libmwaw/src/lib/MacDrawProStyleManager \
UnpackedTarball/libmwaw/src/lib/MacPaintParser \
UnpackedTarball/libmwaw/src/lib/MacWrtParser \
UnpackedTarball/libmwaw/src/lib/MacWrtProParser \
@@ -142,6 +147,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/NisusWrtText \
UnpackedTarball/libmwaw/src/lib/RagTimeParser \
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
+   UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source

2014-10-18 Thread Kohei Yoshida

 sc/qa/unit/ucalc.hxx  |   14 ---
 sc/qa/unit/ucalc_formula.cxx  |   80 --
 sc/source/core/tool/token.cxx |   47 
 3 files changed, 132 insertions(+), 9 deletions(-)

New commits:
commit 281847613bd3ae472523822f4be9c21cc353867e
Author: Kohei Yoshida 
Date:   Sat Oct 18 20:22:53 2014 -0400

fdo#82047: Correctly adjust references in range names on row deletion.

Change-Id: Iac924b0b6932863f7f9cc088f996e0b07c340d2c

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f3c38ab..cb36699 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -3161,6 +3161,53 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInName(
 if (adjustDoubleRefInName(rRef, rCxt, rPos))
 aRes.mbReferenceModified = true;
 }
+else if (rCxt.mnRowDelta < 0)
+{
+// row(s) deleted.
+if (rRef.Ref1.IsRowRel() || rRef.Ref2.IsRowRel())
+// Don't modify relative references in names.
+break;
+
+if (aAbs.aStart.Col() < rCxt.maRange.aStart.Col() || 
rCxt.maRange.aEnd.Col() < aAbs.aEnd.Col())
+// column range of the reference is not entirely in 
the deleted column range.
+break;
+
+ScRange aDeleted = rCxt.maRange;
+aDeleted.aStart.IncRow(rCxt.mnRowDelta);
+
aDeleted.aEnd.SetRow(aDeleted.aStart.Row()-rCxt.mnRowDelta-1);
+
+if (aAbs.aEnd.Row() < aDeleted.aStart.Row() || 
aDeleted.aEnd.Row() < aAbs.aStart.Row())
+// reference range doesn't intersect with the deleted 
range.
+break;
+
+if (aDeleted.aStart.Row() <= aAbs.aStart.Row() && 
aAbs.aEnd.Row() <= aDeleted.aEnd.Row())
+{
+// This reference is entirely deleted.
+rRef.Ref1.SetRowDeleted(true);
+rRef.Ref2.SetRowDeleted(true);
+aRes.mbReferenceModified = true;
+break;
+}
+
+if (aAbs.aStart.Row() < aDeleted.aStart.Row())
+{
+if (aDeleted.aEnd.Row() < aAbs.aEnd.Row())
+// Deleted in the middle.  Make the reference 
shorter.
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+else
+// Deleted at tail end.  Cut off the lower part.
+rRef.Ref2.SetAbsRow(aDeleted.aStart.Row()-1);
+}
+else
+{
+// Deleted at the top.  Cut the top off and shift up.
+rRef.Ref1.SetAbsRow(aDeleted.aEnd.Row()+1);
+rRef.Ref1.IncRow(rCxt.mnRowDelta);
+rRef.Ref2.IncRow(rCxt.mnRowDelta);
+}
+
+aRes.mbReferenceModified = true;
+}
 else if (rCxt.maRange.Intersects(aAbs))
 {
 if (rCxt.mnColDelta && rCxt.maRange.aStart.Row() <= 
aAbs.aStart.Row() && aAbs.aEnd.Row() <= rCxt.maRange.aEnd.Row())
commit 03075bfac25408d805b6cfecce56fa0c4cb9d88d
Author: Kohei Yoshida 
Date:   Sat Oct 18 20:22:28 2014 -0400

fdo#82047: Write test for this.

Change-Id: I0e5e54b517d3fb3cb28eb133b2cbe5bf5ca6b1d6

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 114ca8d..472779c 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -136,6 +136,7 @@ public:
 void testFormulaRefUpdateName();
 void testFormulaRefUpdateNameMove();
 void testFormulaRefUpdateNameExpandRef();
+void testFormulaRefUpdateNameDeleteRow();
 void testFormulaRefUpdateValidity();
 void testMultipleOperations();
 void testFuncCOLUMN();
@@ -428,6 +429,7 @@ public:
 CPPUNIT_TEST(testFormulaRefUpdateName);
 CPPUNIT_TEST(testFormulaRefUpdateNameMove);
 CPPUNIT_TEST(testFormulaRefUpdateNameExpandRef);
+CPPUNIT_TEST(testFormulaRefUpdateNameDeleteRow);
 CPPUNIT_TEST(testFormulaRefUpdateValidity);
 CPPUNIT_TEST(testMultipleOperations);
 CPPUNIT_TEST(testFuncCOLUMN);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 3ae29cb..5e0018a 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2285,6 +2285,80 @@ void Test::testFormulaRefUpdateNameExpandRef()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testFormulaRefUpdateNameDeleteRow()
+{
+m_pDoc->InsertTab(0, "Test");
+
+// Insert a new name 'MyRange' to reference B2:B4.
+bool bInserted = m_pDoc->InsertNewRangeName("MyRange", ScAddress(0,0,0), 
"$B$2:$B$4");
+CPPUNIT_ASSERT(bIns

[Libreoffice-commits] core.git: libreofficekit/Module_libreofficekit.mk Repository.mk

2014-10-18 Thread Norbert Thiebaud

 Repository.mk   |2 +-
 libreofficekit/Module_libreofficekit.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c68642d535f2ebb7f1cd866ad19b1fd018e7cd6d
Author: Norbert Thiebaud 
Date:   Sat Oct 18 15:44:12 2014 -0500

tilebench depend on linreooficekitgtk so need ENABLE_GTK too

Change-Id: I04b787493115de0190615f42248cc82968907e38

diff --git a/Repository.mk b/Repository.mk
index b521ef6..729c1d3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -85,7 +85,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,ooo, \
 ))
 
 $(eval $(call gb_Helper_register_executables,OOO, \
-   $(if $(filter LINUX,$(OS)), tilebench) \
+   $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
$(call gb_Helper_optional,CRASHREP,crashrep) \
gnome-open-url.bin \
$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
diff --git a/libreofficekit/Module_libreofficekit.mk 
b/libreofficekit/Module_libreofficekit.mk
index 716ff48..fe5ee15 100644
--- a/libreofficekit/Module_libreofficekit.mk
+++ b/libreofficekit/Module_libreofficekit.mk
@@ -20,11 +20,11 @@ $(eval $(call gb_Module_add_targets,libreofficekit,\
 Library_libreofficekitgtk \
 Executable_gtktiledviewer \
 ))
-endif # ($(ENABLE_GTK),)
 
 $(eval $(call gb_Module_add_targets,libreofficekit,\
 Executable_tilebench \
 ))
+endif # ($(ENABLE_GTK),)
 
 endif # ($(OS),LINUX)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38814] Snappier rendering: paint at idle, not on timeout

2014-10-18 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=38814

--- Comment #3 from Michael Meeks  ---
There is work going on on this topic at Munich; with some details in the wiki
here: https://wiki.documentfoundation.org/Development/LHM_LiMux/Main_Loop

-- 
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: 3 commits - configure.ac

2014-10-18 Thread Norbert Thiebaud

 configure.ac |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit e6fe8387788b98b4bae43b466075f3938f3fb50c
Author: Norbert Thiebaud 
Date:   Sat Oct 18 15:07:19 2014 -0500

we should convert to DOS path for other exotic things than spaces too

backslases and other 'special' characters can mess with
later path handling

Change-Id: Ic21b0eb82b60ffb2e286706be00148582ff9ad58

diff --git a/configure.ac b/configure.ac
index 05e8d55..b763b96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,15 +29,14 @@ PathFormat()
 {
 formatted_path="$1"
 if test "$build_os" = "cygwin"; then
-pf_part1=
 pf_conv_to_dos=
-for pf_part in $formatted_path; do
-if test -z "$pf_part1"; then
-pf_part1="$pf_part"
-else
+# spaces,parentheses,brackets,braces are problematic in pathname
+# so are backslashes
+case "$formatted_path" in
+*\ * | *\)* | *\(* | *\{* | *\}* | *\[* | *\]* | *\\* )
 pf_conv_to_dos="yes"
-fi
-done
+;;
+esac
 if test "$pf_conv_to_dos" = "yes"; then
 if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
 formatted_path=`cygpath -sm "$formatted_path"`
commit ebc9ca1d41e84a895a080933b94422d6bddb7ceb
Author: Norbert Thiebaud 
Date:   Sat Oct 18 15:05:23 2014 -0500

fix typo in TARFILE_LOCATION handling in the lode case

Change-Id: I11831583a0288a07fd6279411069d169ab854882

diff --git a/configure.ac b/configure.ac
index adef7d2..05e8d55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4671,7 +4671,7 @@ dnl whether to find & fetch external tarballs?
 dnl ===
 if test -z "$TARFILE_LOCATION" -a -n "$LODE_HOME" ; then
if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
-   TARFILE_LOCATION="`cypath -m $LODE_HOME/ext_tar`"
+   TARFILE_LOCATION="`cygpath -m $LODE_HOME/ext_tar`"
else
TARFILE_LOCATION="$LODE_HOME/ext_tar"
fi
commit d4d85fb9fc5daef5d89a8e42b68ce4a873bcf084
Author: Norbert Thiebaud 
Date:   Sat Oct 18 15:04:43 2014 -0500

format MSBuild path appropriately

Change-Id: I38ed000a0f9c07fe8e1ed26752af8e172998bf2c

diff --git a/configure.ac b/configure.ac
index 25ff959..adef7d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3472,7 +3472,7 @@ if test "$_os" = "WINNT"; then
 # Find the proper version of MSBuild.exe to use based on the VS version
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
 if test -n "$regvalue" ; then
-MSBUILD_PATH="$regvalue"
+MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
 fi
 
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Main-loop / idle handler bits ...

2014-10-18 Thread Michael Meeks

Hi guys,

Just wondering how this is going =) I could really use an UNO method
that essentially processes all 'idle' handlers synchronously to finish
up all pending work - to help with some profiling tasks - but (of
course) to do that, we need some genuine 'idle' vs. 'timeout'
distinction.

How is that coming along? I see lots of nice things in the wiki page
here:

https://wiki.documentfoundation.org/Development/LHM_LiMux#Priority_Main_Loop

On Wed, 2014-10-01 at 17:04 +0100, Michael Meeks wrote:
>   Yep - a very helpful table there. I've asked to have that sorted by
> timeout not source-location; and to have all the UI related timeouts
> split to their own section.

So - I did some thinking and mapped the timeouts to some sort of
descriptive priority names - something like this:

enum IdlePriority {
VCL_IDLE_PRIORITY_HIGHEST, //   -> 0ms
VCL_IDLE_PRIORITY_HIGH, //  -> 1ms
VCL_IDLE_PRIORITY_REPAINT //-> 30ms
VCL_IDLE_PRIORITY_RESIZE  //-> 50ms
VCL_IDLE_PRIORITY_MEDIUM // -> 50ms
VCL_IDLE_PRIORITY_LOW //-> 100ms
VCL_IDLE_PRIORITY_LOWER //  -> 200ms
VCL_IDLE_PRIORITY_LOWEST // -> 400ms
};

we can rip/replace the 'ms' comments later of course. Then we would
need a patch something like the attached. Of course, worked through all
of the instances of idle handlers =) Patch is un-tested to avoid having
to trigger a rather slow re-build here; please do hack it about into
whatever form you like.

Is it possible to extend that suitably ? when we have the code changed
around the place, and the problem isolated; we can start to prioritize
and avoid having these silly timeouts at all (I hope).

Having said that, when we get to 400ms - I imagine this is a UI
interaction timeout - which prolly should stay at 400ms ;-) - it'd be
good to review those to see if they are UI / behaviour related - it'd
suck to suddenly have the double-click time be ~instant ;-)

All the best,

Michael.

-- 
 michael.me...@collabora.com  <><, Pseudo Engineer, itinerant idiot
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index d3ebe1a..e2cbaa7 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -73,6 +73,41 @@ public:
 AutoTimer&  operator=( const AutoTimer& rTimer );
 };
 
+enum IdlePriority {
+	VCL_IDLE_PRIORITY_HIGHEST, // -> 0ms
+	VCL_IDLE_PRIORITY_HIGH,// -> 1ms
+	VCL_IDLE_PRIORITY_REPAINT, // -> 30ms
+	VCL_IDLE_PRIORITY_RESIZE,  // -> 50ms
+	VCL_IDLE_PRIORITY_MEDIUM,  // -> 50ms
+	VCL_IDLE_PRIORITY_LOW, // -> 100ms
+	VCL_IDLE_PRIORITY_LOWER,   // -> 200ms
+	VCL_IDLE_PRIORITY_LOWEST   // -> 400ms
+};
+
+
+// To port from Timer -> Idle switch class name,
+// s/Timeout/DoIdle/ etc. and select priority
+class VCL_DLLPUBLIC Idle : private Timer
+{
+ public:
+Idle( IdlePriority ePriority );
+virtual ~Idle();
+
+void SetPriority( IdlePriority ePriority );
+
+/// Make it possible to associate a callback with this idle handler
+/// of course, you can also sub-class and override 'DoIdle'
+voidSetIdleHdl( const Link& rLink ) { SetTimeoutHdl( rLink ); }
+const Link& GetIdleHdl() const  { return GetTimeoutHdl(); }
+
+voidStart() { Timer::Start(); }
+voidStop()  { Timer::Stop();  }
+
+virtual voidDoIdle() = 0;
+
+virtual voidTimeout() SAL_OVERRIDE { DoIdle(); }
+};
+
 #endif // INCLUDED_VCL_TIMER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 4448c55..9c8cb08 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -127,8 +127,8 @@ struct ImplOverlapData
 
 struct ImplFrameData
 {
-Timer   maPaintTimer;   //< paint timer
-Timer   maResizeTimer;  //< resize timer
+IdlemaPaintIdle;//< paint idle handler
+IdlemaResizeTimer;  //< resize timer
 InputContextmaOldInputContext;  //< last set Input Context
 vcl::Window*mpNextFrame;//< next frame window
 vcl::Window*mpFirstOverlap; //< first overlap vcl::Window
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index ecbfa74..a1b4a18 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -336,4 +336,49 @@ AutoTimer& AutoTimer::operator=( const AutoTimer& rTimer )
 return *this;
 }
 
+Idle::Idle( IdlePriority ePriority )
+: Timer()
+{
+SetPriority( ePriority );
+}
+
+void Idle::SetPriority( IdlePriority ePriority )
+{
+sal_ulong nTimeoutMS = 0;
+
+// Ultimately this will just be a sort key in a work queue.
+switch (ePriority) {
+	case VCL_IDLE_PRIORITY_HIGHEST:
+nTimeoutMS = 0;
+break;
+	case VCL_IDLE_PRIORITY_HIGH:
+nTimeoutMS = 1;
+break;
+	case VCL_IDLE_PRIORITY_REPAINT:
+nTi

Cyrille Ruggero license statement

2014-10-18 Thread Ruggero Cyrille


All of my past & future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac

2014-10-18 Thread Norbert Thiebaud

 configure.ac |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 76397a8b53d2043dd7a6dc94e521bd7958148fae
Author: Norbert Thiebaud 
Date:   Sat Oct 18 13:52:16 2014 -0500

windows: try to locate a good MSBuild.exe based on the version of VS

lcms2 for instance call MSBuild.exe, naked. it relies on what is found
in the PATH, but apparently MSBuild.exe can be found in many places
including for instance the .NET Framework.
This was causing failure with a VS2013

This patch inspect the registry to see if there is a MSBuild of the
same level than VS2013 and use that information to adjust the PATH
so that we invoke the right version.

Note: starting VS2013, Microsoft is numbering the version of MSBuild
with the same version number than VS itself.. so with VS2013 the version
of MSBuild is 12.0 (vs 4.0 before that)

Change-Id: I04c614116d1d365a10c9b9e0e8ce9571d770c065

diff --git a/configure.ac b/configure.ac
index aa9112f..25ff959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3430,6 +3430,7 @@ find_msvc()
 }
 
 SHOWINCLUDES_PREFIX=
+MSBUILD_PATH=
 if test "$_os" = "WINNT"; then
 if test "$WITH_MINGW" != "yes"; then
 AC_MSG_CHECKING([Visual C++])
@@ -3468,6 +3469,12 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([No])
 fi
 
+# Find the proper version of MSBuild.exe to use based on the VS version
+reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
+if test -n "$regvalue" ; then
+MSBUILD_PATH="$regvalue"
+fi
+
 dnl ===
 dnl  Check for the corresponding mspdb*.dll
 dnl ===
@@ -12750,6 +12757,9 @@ else
 pathmunge "$MIDL_PATH" "before"
 pathmunge "$AL_PATH" "before"
 pathmunge "$MSPDB_PATH" "before"
+if test -n "$MSBUILD_PATH" ; then
+pathmunge "$MSBUILD_PATH" "before"
+fi
 if test "$BITNESS_OVERRIDE" = 64; then
 pathmunge "$COMPATH/bin/amd64" "before"
 pathmunge "$WINDOWS_SDK_HOME/bin/x64" "before"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lotuswordpro/source

2014-10-18 Thread Ruggero Cyrille

 lotuswordpro/source/filter/lwp9reader.cxx   |2 
 lotuswordpro/source/filter/lwp9reader.hxx   |1 
 lotuswordpro/source/filter/lwpobj.hxx   |1 
 lotuswordpro/source/filter/lwpsvstream.hxx  |2 
 lotuswordpro/source/filter/lwpunoheader.hxx |   82 
 5 files changed, 2 insertions(+), 86 deletions(-)

New commits:
commit b77ea7496af7a4685c58e1487d7f49162184f290
Author: Ruggero Cyrille 
Date:   Sat Oct 18 11:50:53 2014 +0200

Remove lwpunoheader.hxx.

Change-Id: I41534baa3cb98fc9af2f12605015a5653e552853

diff --git a/lotuswordpro/source/filter/lwp9reader.cxx 
b/lotuswordpro/source/filter/lwp9reader.cxx
index d83b841..b2a91ec 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -53,9 +53,9 @@
  *
  *
  /
+
 #include "lwp9reader.hxx"
 #include "lwpglobalmgr.hxx"
-#include "lwpunoheader.hxx"
 #include "lwparrowstyles.hxx"
 #include "lwpobjhdr.hxx"
 #include "lwpdoc.hxx"
diff --git a/lotuswordpro/source/filter/lwp9reader.hxx 
b/lotuswordpro/source/filter/lwp9reader.hxx
index cb288c1..3058393 100644
--- a/lotuswordpro/source/filter/lwp9reader.hxx
+++ b/lotuswordpro/source/filter/lwp9reader.hxx
@@ -57,7 +57,6 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWP9READER_HXX
 
 #include "lwpheader.hxx"
-#include "lwpunoheader.hxx"
 #include "lwpsvstream.hxx"
 #include "lwpfilehdr.hxx"
 #include "lwpobjfactory.hxx"
diff --git a/lotuswordpro/source/filter/lwpobj.hxx 
b/lotuswordpro/source/filter/lwpobj.hxx
index e1ebad5..942e044 100644
--- a/lotuswordpro/source/filter/lwpobj.hxx
+++ b/lotuswordpro/source/filter/lwpobj.hxx
@@ -73,7 +73,6 @@
 
 #include "lwpobjhdr.hxx"
 #include "lwpobjstrm.hxx"
-#include "lwpunoheader.hxx"
 #include "xfilter/ixfstream.hxx"
 #include "xfilter/xfcontentcontainer.hxx"
 
diff --git a/lotuswordpro/source/filter/lwpsvstream.hxx 
b/lotuswordpro/source/filter/lwpsvstream.hxx
index e521275..b8a4aa6 100644
--- a/lotuswordpro/source/filter/lwpsvstream.hxx
+++ b/lotuswordpro/source/filter/lwpsvstream.hxx
@@ -57,7 +57,7 @@
 #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPSVSTREAM_HXX
 
 #include "lwpheader.hxx"
-#include "lwpunoheader.hxx"
+#include "xfilter/xfglobal.hxx"
 #include 
 
 /**
diff --git a/lotuswordpro/source/filter/lwpunoheader.hxx 
b/lotuswordpro/source/filter/lwpunoheader.hxx
deleted file mode 100644
index 252..000
--- a/lotuswordpro/source/filter/lwpunoheader.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- * - GNU Lesser General Public License Version 2.1
- * - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: IBM Corporation
- *
- *  Copyright: 2008 by IBM Corporation
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): ___
- *
- *
- ***

[Libreoffice-commits] core.git: accessibility/source cui/source include/svtools svtools/source svx/source

2014-10-18 Thread Noel Grandin

 accessibility/source/extended/accessiblelistboxentry.cxx |8 +-
 cui/source/customize/cfg.cxx |   12 +--
 include/svtools/svlbitm.hxx  |   40 +--
 svtools/source/contnr/svlbitm.cxx|   54 +++
 svx/source/dialog/checklbx.cxx   |2 
 5 files changed, 55 insertions(+), 61 deletions(-)

New commits:
commit 06562c678410e425de629109ce92933c2d89a8f6
Author: Noel Grandin 
Date:   Sat Oct 18 10:36:36 2014 +0200

convert SV_BMP_ constants to enum

Change-Id: I46cb7f649fa44d8967e0e7da03583157d2706f05
Reviewed-on: https://gerrit.libreoffice.org/12018
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx 
b/accessibility/source/extended/accessiblelistboxentry.cxx
index 06de24a..31f0947 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -790,9 +790,9 @@ namespace accessibility
 SvTreeListEntry* pEntry = getListBox()->GetEntryFromPath( 
m_aEntryPath );
 SvButtonState state = getListBox()->GetCheckButtonState( 
pEntry );
 if ( state == SV_BUTTON_CHECKED )
-getListBox()->SetCheckButtonState(pEntry, 
(SvButtonState)SV_BMP_UNCHECKED);
-else if (state == SV_BMP_UNCHECKED)
-getListBox()->SetCheckButtonState(pEntry, 
(SvButtonState)SV_BUTTON_CHECKED);
+getListBox()->SetCheckButtonState(pEntry, 
SV_BUTTON_UNCHECKED);
+else if (state == SV_BUTTON_UNCHECKED)
+getListBox()->SetCheckButtonState(pEntry, 
SV_BUTTON_CHECKED);
 }
 }
 else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN) ) || (nIndex == 
0) )
@@ -831,7 +831,7 @@ namespace accessibility
 {
 if ( state == SV_BUTTON_CHECKED )
 return sActionDesc2;
-else if (state == SV_BMP_UNCHECKED)
+else if (state == SV_BUTTON_UNCHECKED)
 return sActionDesc1;
 }
 else
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 038bb0e..8c22f47 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4545,12 +4545,12 @@ void 
SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pDat
 CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT ));
 
 // Fill button data struct with new images
-pData->aBmps[SV_BMP_UNCHECKED]  = aImage;
-pData->aBmps[SV_BMP_CHECKED]= GetSizedImage( aDev, aSize, 
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED ));
-pData->aBmps[SV_BMP_HICHECKED]  = GetSizedImage( aDev, aSize, 
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED 
));
-pData->aBmps[SV_BMP_HIUNCHECKED]= GetSizedImage( aDev, aSize, 
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED));
-pData->aBmps[SV_BMP_TRISTATE]   = GetSizedImage( aDev, aSize, Image() 
); // Use tristate bitmaps to have no checkbox for separator entries
-pData->aBmps[SV_BMP_HITRISTATE] = GetSizedImage( aDev, aSize, Image() 
);
+pData->SetImage(SvBmp::UNCHECKED, aImage);
+pData->SetImage(SvBmp::CHECKED,   GetSizedImage( aDev, aSize, 
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED )) );
+pData->SetImage(SvBmp::HICHECKED, GetSizedImage( aDev, aSize, 
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_CHECKED | BUTTON_DRAW_PRESSED 
)) );
+pData->SetImage(SvBmp::HIUNCHECKED,   GetSizedImage( aDev, aSize, 
CheckBox::GetCheckImage( rSettings, BUTTON_DRAW_DEFAULT | BUTTON_DRAW_PRESSED)) 
);
+pData->SetImage(SvBmp::TRISTATE,  GetSizedImage( aDev, aSize, Image() 
) ); // Use tristate bitmaps to have no checkbox for separator entries
+pData->SetImage(SvBmp::HITRISTATE,GetSizedImage( aDev, aSize, Image() 
) );
 
 // Get image size
 m_aCheckBoxImageSizePixel = aImage.GetSizePixel();
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index ff9c00f..0775129 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -22,22 +22,23 @@
 #define INCLUDED_SVTOOLS_SVLBITM_HXX
 
 #include 
-
 #include 
-
 #include 
 #include 
 
 class SvTreeListEntry;
 
 
-#define SV_BMP_UNCHECKED0
-#define SV_BMP_CHECKED  1
-#define SV_BMP_TRISTATE 2
-#define SV_BMP_HIUNCHECKED  3
-#define SV_BMP_HICHECKED4
-#define SV_BMP_HITRISTATE   5
-#define SV_BMP_STATICIMAGE  6
+enum class SvBmp
+{
+UNCHECKED= 0,
+CHECKED  = 1,
+TRISTATE = 2,
+HIUNCHECKED  = 3,
+HICHECKED= 4,
+HITRISTATE   = 5,
+STATICIMAGE  = 6
+};
 
 struct SvLBoxButtonData_Impl;
 
@@ -50,9 +51,10 @@ private:

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst

2014-10-18 Thread Caolán McNamara

 download.lst |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f9050536650835b776b9aa022ae1b47315cd5e14
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 17 11:32:25 2014 +0100

bump openssl to 1.0.1j

Reviewed-on: https://gerrit.libreoffice.org/12004
Tested-by: LibreOffice gerrit bot 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 39d4fe7aea6b32a6c17c325b2b1c282c2975c02c)

Conflicts:
download.lst

Change-Id: Id2092489723b3f1f643ee0161cb0d8bcbd04a847
Reviewed-on: https://gerrit.libreoffice.org/12006
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 6f26f2e..4a9dc39 100644
--- a/download.lst
+++ b/download.lst
@@ -109,7 +109,8 @@ export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL := 
8d6d684a9430d5cc98a62a5d8fbda8cf-openssl-1.0.1h.tar.gz
+export OPENSSL_MD5SUM := f7175c9cd3c39bb1907ac8bba9df8ed3
+export OPENSSL_TARBALL := openssl-1.0.1j.tar.gz
 export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] Minutes of ESC call: 2014-10-16

2014-10-18 Thread Bjoern Michaelsen

On Fri, Oct 17, 2014 at 11:13:12AM +0200, Jan Holesovsky wrote:
> * LibreOffice 4.4 bibisects repo creation (Bjoern)
> + Bjoern creating, but Robinson should take over
> + but has time for that? - bugzilla migration a priority... (Bjoern)
> + Bjoern can do that at the time of the tag, but then is traveling

Big Bertha is still churning on that, will likely be finished soon. But I wont
find time to finalize that repo for upload (besides there isnt yet a alpha1 tag
anyway). ETA for the alpha bibisect repo will thus be around 2014-10-31.

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - download.lst

2014-10-18 Thread Caolán McNamara

 download.lst |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 50788daf63ace5b19e6e56d4317054ce9cfee4b5
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 17 11:32:25 2014 +0100

bump openssl to 1.0.1j

Reviewed-on: https://gerrit.libreoffice.org/12004
Tested-by: LibreOffice gerrit bot 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 39d4fe7aea6b32a6c17c325b2b1c282c2975c02c)

Conflicts:
download.lst

Change-Id: Id2092489723b3f1f643ee0161cb0d8bcbd04a847

diff --git a/download.lst b/download.lst
index 6f26f2e..4a9dc39 100644
--- a/download.lst
+++ b/download.lst
@@ -109,7 +109,8 @@ export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
 export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL := 
8d6d684a9430d5cc98a62a5d8fbda8cf-openssl-1.0.1h.tar.gz
+export OPENSSL_MD5SUM := f7175c9cd3c39bb1907ac8bba9df8ed3
+export OPENSSL_TARBALL := openssl-1.0.1j.tar.gz
 export ORCUS_TARBALL := 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - icon-themes/sifr

2014-10-18 Thread Yousuf Philips

 dev/null|binary
 icon-themes/sifr/cmd/lc_spacepara15.png |binary
 icon-themes/sifr/cmd/lc_spacepara2.png  |binary
 icon-themes/sifr/cmd/sc_spacepara15.png |binary
 icon-themes/sifr/cmd/sc_spacepara2.png  |binary
 5 files changed

New commits:
commit 090005af993be6aa5dc1375ab1f06d5520014a93
Author: Yousuf Philips 
Date:   Sat Oct 18 12:03:36 2014 +0400

fdo#75359 - SIFR: Line Spacing 1.5 icon missing (4.3)

Change-Id: Id5064943eb430ad9d3b2014ff4482f9bb36cdac3
Reviewed-on: https://gerrit.libreoffice.org/12016
Reviewed-by: Matthew Francis 
Tested-by: Matthew Francis 

diff --git a/icon-themes/sifr/cmd/lc_spacepara15.png 
b/icon-themes/sifr/cmd/lc_spacepara15.png
new file mode 100644
index 000..ba8a88e
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_spacepara15.png differ
diff --git a/icon-themes/sifr/cmd/lc_spacepara2.png 
b/icon-themes/sifr/cmd/lc_spacepara2.png
index ba8a88e..cf93d33 100644
Binary files a/icon-themes/sifr/cmd/lc_spacepara2.png and 
b/icon-themes/sifr/cmd/lc_spacepara2.png differ
diff --git a/icon-themes/sifr/cmd/lc_spacepara3.png 
b/icon-themes/sifr/cmd/lc_spacepara3.png
deleted file mode 100644
index cf93d33..000
Binary files a/icon-themes/sifr/cmd/lc_spacepara3.png and /dev/null differ
diff --git a/icon-themes/sifr/cmd/sc_spacepara15.png 
b/icon-themes/sifr/cmd/sc_spacepara15.png
new file mode 100644
index 000..67840dc
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_spacepara15.png differ
diff --git a/icon-themes/sifr/cmd/sc_spacepara2.png 
b/icon-themes/sifr/cmd/sc_spacepara2.png
index 67840dc..167e511b 100644
Binary files a/icon-themes/sifr/cmd/sc_spacepara2.png and 
b/icon-themes/sifr/cmd/sc_spacepara2.png differ
diff --git a/icon-themes/sifr/cmd/sc_spacepara3.png 
b/icon-themes/sifr/cmd/sc_spacepara3.png
deleted file mode 100644
index 167e511b..000
Binary files a/icon-themes/sifr/cmd/sc_spacepara3.png and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source

2014-10-18 Thread Miklos Vajna

 writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf |8 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |9 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 6118ea49aee18a95ac124bbac695b3bb1b152c1d
Author: Miklos Vajna 
Date:   Sat Oct 18 16:04:49 2014 +0200

i#74153 RTF import: fix track changes vs superscript char prop

Since 9dbf817fe5c5253fba0831aefa17575ae0ba3af1 (handle scope of
w:pPrChange and w:rPrChange properly (bnc#821804), 2014-10-01), this
caused an assertion failure -> crash.

Change-Id: I680edf58854d0c9be6e77c44c1e6beb1e0442a49

diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf 
b/writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf
new file mode 100644
index 000..7e81865
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/i74153.rtf
@@ -0,0 +1,8 @@
+{\rtf1
+{\*\revtbl 
+{Unknown;}
+{TAMUS HSC Mac User;}
+}
+{\revised\super\revauth1\revdttm-1501115711 hello}
+\par
+}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c7a5472..70dae1f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5671,8 +5671,13 @@ int RTFDocumentImpl::popState()
 RTFSprms aTCSprms;
 RTFValue::Pointer_t pValue(new RTFValue(0));
 aTCSprms.set(NS_ooxml::LN_endtrackchange, pValue);
-writerfilter::Reference::Pointer_t const pProperties(new 
RTFReferenceProperties(RTFSprms(), aTCSprms));
-Mapper().props(pProperties);
+if (!m_aStates.top().pCurrentBuffer)
+{
+writerfilter::Reference::Pointer_t const 
pProperties(new RTFReferenceProperties(RTFSprms(), aTCSprms));
+Mapper().props(pProperties);
+}
+else
+m_aStates.top().pCurrentBuffer->push_back(Buf_t(BUFFER_PROPS, 
RTFValue::Pointer_t(new RTFValue(RTFSprms(), aTCSprms;
 }
 
 // This is the end of the doc, see if we need to close the last section.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2014-10-18 Thread Christian M . Heller

 sc/source/filter/lotus/filter.cxx|   19 -
 sc/source/filter/lotus/lotattr.cxx   |8 
 sc/source/filter/lotus/lotfilter.hxx |   10 -
 sc/source/filter/lotus/lotform.cxx   |  348 +--
 sc/source/filter/lotus/lotimpop.cxx  |   24 +-
 sc/source/filter/lotus/memory.cxx|4 
 sc/source/filter/lotus/op.cxx|   40 ++--
 sc/source/filter/lotus/tool.cxx  |   62 +++---
 sc/source/filter/rtf/rtfimp.cxx  |6 
 9 files changed, 260 insertions(+), 261 deletions(-)

New commits:
commit e556657e36f407770e7cb5e1b3e9b76a1eaa85b3
Author: Christian M. Heller 
Date:   Sat Oct 18 07:32:20 2014 -0400

fdo#39468 Translate German Comments - sc/source/filter/{lotus,rtf}

Change-Id: Ib5f1865cfd5d62f45919af8119d4ab691811225b
Reviewed-on: https://gerrit.libreoffice.org/12021
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sc/source/filter/lotus/filter.cxx 
b/sc/source/filter/lotus/filter.cxx
index b4e3cb9..58555d8 100644
--- a/sc/source/filter/lotus/filter.cxx
+++ b/sc/source/filter/lotus/filter.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//  Das geht:   Versionserkennung WKS, WK1 und WK3
-//  ...Rest steht in op.cpp
+//  Discover WKS, WK1 und WK3; s.a op.cpp
 
 #include 
 #include 
@@ -109,11 +108,11 @@ generate_Opcodes(LotusContext &rContext, SvStream& 
aStream,
 
 WKTYP ScanVersion(LotusContext &rContext, SvStream& aStream)
 {
-// PREC:pWKDatei:   Zeiger auf offene Datei
-// POST:return: Typ der Datei
+// PREC:pWKDatei:   pointer to open file
+// POST:return: type of file
 sal_uInt16 nOpcode(0), nVersNr(0), nRecLen(0);
 
-// erstes Byte muss wegen BOF zwingend 0 sein!
+// first byte has to be 0 because of BOF!
 aStream.ReadUInt16( nOpcode );
 if (nOpcode != rContext.nBOF)
 return eWK_UNKNOWN;
@@ -166,21 +165,21 @@ FltError ScImportLotus123old(LotusContext& rContext, 
SvStream& aStream, ScDocume
 {
 aStream.Seek( 0UL );
 
-// Zeiger auf Dokument global machen
+// make document pointer global
 rContext.pDoc = pDocument;
 rContext.bEOF = false;
 rContext.eCharVon = eSrc;
 
-// Speicher besorgen
+// allocate memory
 if( !MemNew(rContext) )
 return eERR_NOMEM;
 
-InitPage(); // Seitenformat initialisieren (nur Tab 0!)
+InitPage(); // initialize page format (only Tab 0!)
 
-// Progressbar starten
+// start progressbar
 ScfStreamProgressBar aPrgrsBar( aStream, pDocument->GetDocumentShell() );
 
-// Datei-Typ ermitteln
+// detect file type
 rContext.eTyp = ScanVersion(rContext, aStream);
 rContext.aLotusPatternPool.clear();
 
diff --git a/sc/source/filter/lotus/lotattr.cxx 
b/sc/source/filter/lotus/lotattr.cxx
index 7254144..ec10712 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -95,7 +95,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const 
LotAttrWK3& rAttr )
 if (iter != aEntries.end())
 return *(iter->pPattAttr);
 
-// neues PatternAttribute erzeugen
+// generate new Pattern Attribute
 ScPatternAttr*  pNewPatt = new ScPatternAttr(pDocPool);
 
 SfxItemSet& rItemSet = pNewPatt->GetItemSet();
@@ -180,7 +180,7 @@ const SvxColorItem& LotAttrCache::GetColorItem( const 
sal_uInt8 nLotIndex ) cons
 
 const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const
 {
-// Farbe <-> Index passt fuer Background, nicht aber fuer Fonts (0 <-> 7)!
+// color <-> index fits background, but not for fonts (0 <-> 7)!
OSL_ENSURE( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7, 
caller hast to check index!" );
 
 return pColTab[ nLotIndex ];
@@ -209,7 +209,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const 
ScPatternAttr& rAttr )
 }
 }
 else
-{   // erster Eintrag
+{   // first entry
 ENTRY *pAkt = new ENTRY;
 pAkt->pPattAttr = &rAttr;
 pAkt->nFirstRow = pAkt->nLastRow = nRow;
@@ -252,7 +252,7 @@ void LotAttrTable::Apply(LOTUS_ROOT* pLotusRoot, const 
SCTAB nTabNum)
 {
 SCCOL nColCnt;
 for( nColCnt = 0 ; nColCnt <= MAXCOL ; nColCnt++ )
-pCols[ nColCnt ].Apply(pLotusRoot, nColCnt, nTabNum); // macht 
auch gleich ein Clear() am Ende
+pCols[ nColCnt ].Apply(pLotusRoot, nColCnt, nTabNum); // does a 
Clear() at end
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/lotus/lotfilter.hxx 
b/sc/source/filter/lotus/lotfilter.hxx
index 047391a..22e55d2 100644
--- a/sc/source/filter/lotus/lotfilter.hxx
+++ b/sc/source/filter/lotus/lotfilter.hxx
@@ -34,16 +34,16 @@ class FormCache;
 struct LotusContext
 {
 const sal_uInt16 nBOF;
-WKTYPeTyp;   // Typ der gerade in bearbeitung befindlichen 
Datei
-bool bEOF;   // zeigt Ende der Datei
+WKTYPeTyp;  // type

[Libreoffice-commits] core.git: sw/qa

2014-10-18 Thread Miklos Vajna

 sw/qa/extras/odfimport/odfimport.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 42f767f49c4d7569b305b3a377197ba263b19c39
Author: Miklos Vajna 
Date:   Sat Oct 18 13:14:49 2014 +0200

CppunitTest_sw_odfimport: enable all but one asserts on OS X

Change-Id: I95421d51a2750507aec5a576e161efe578fef812
Reviewed-on: https://gerrit.libreoffice.org/12020
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 6174dc5..fb4cf65 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -8,7 +8,7 @@
 
 #include 
 
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(WNT)
 
 #include 
 #include 
@@ -450,7 +450,9 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
 // Previously copy&paste failed to copy the table in case it was the 
document-starting one.
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+#ifndef MACOSX // FIXME
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
+#endif
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source unusedcode.easy

2014-10-18 Thread Miklos Vajna

 sw/inc/hintids.hxx |5 ++
 sw/inc/hints.hxx   |7 +++-
 sw/source/core/attr/hints.cxx  |   21 
 sw/source/core/layout/laycache.cxx |   63 -
 sw/source/core/layout/layhelp.hxx  |4 --
 sw/source/core/text/inftxt.cxx |   23 -
 sw/source/core/text/inftxt.hxx |1 
 unusedcode.easy|3 -
 8 files changed, 11 insertions(+), 116 deletions(-)

New commits:
commit fdfc82ff2af11f37a61ae65da061e7e6ef8966a0
Author: Miklos Vajna 
Date:   Sat Oct 18 14:48:48 2014 +0200

move doxygen comments to header

Change-Id: I828f4290c99e750df66548109ef8ae9b496af297

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 76d5202..5774ffb 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -431,6 +431,11 @@ typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - 
POOLATTR_BEGIN  ];
 extern SwDfltAttrTab aAttrTab;
 extern SfxItemInfo   aSlotTab[];
 
+/** Get the default attribute from corresponding default attribute table.
+
+@param[in] nWhich Position in table
+@return Attribute if found, null pointer otherwise
+*/
 SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich );
 
 SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 
nScript );
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index f3af1af..bf6b5f9 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -132,6 +132,11 @@ class SwRefMarkFldUpdate : public SwMsgPoolItem
 {
 public:
 const OutputDevice* pOut; ///< pointer to the current output device
+/** Is sent if reference marks should be updated.
+
+To get the page/chapter number, the frame has to be asked. For that we 
need
+the current OutputDevice.
+*/
 SwRefMarkFldUpdate( const OutputDevice* );
 };
 
@@ -166,6 +171,7 @@ public:
 bool bModified : 1;
 bool bBehindSplitLine : 1;
 
+/** Is sent if a table should be recalculated */
 SwTableFmlUpdate( const SwTable* );
 };
 
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 69eace5..2aed426 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -49,11 +49,6 @@ SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, 
sal_uInt16 nW )
 {
 }
 
-/** Is sent if reference marks should be updated.
-
-To get the page/chapter number, the frame has to be asked. For that we need
-the current OutputDevice.
-*/
 SwRefMarkFldUpdate::SwRefMarkFldUpdate( const OutputDevice* pOutput )
 : SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
 pOut( pOutput )
@@ -66,7 +61,6 @@ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDcPos )
 {
 }
 
-/** Is sent if a table should be recalculated */
 SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
 : SwMsgPoolItem( RES_TABLEFML_UPDATE ),
 pTbl( pNewTbl ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
@@ -117,7 +111,6 @@ SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch )
 {
 }
 
-// "Overhead" of SfxPoolItem
 bool SwMsgPoolItem::operator==( const SfxPoolItem& ) const
 {
 OSL_FAIL( "SwMsgPoolItem knows no ==" );
@@ -131,11 +124,6 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
 }
 
 #if OSL_DEBUG_LEVEL > 0
-/** Get the default attribute from corresponding default attribute table.
-
-@param[in] nWhich Position in table
-@return Attribute if found, null pointer otherwise
-*/
 const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
 {
 OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
@@ -145,10 +133,6 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
 return pHt;
 }
 #else
-/** Get the default attribute from corresponding default attribute table.
-
-@param[in] nWhich Position in table
-*/
 const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
 {
 return aAttrTab[ nWhich - POOLATTR_BEGIN ];
commit e094ac0ff95f82a05810fc98945eb5229d19eadb
Author: Miklos Vajna 
Date:   Sat Oct 18 14:46:09 2014 +0200

sw: remaining unused methods

Change-Id: Ie150d2e497053966c5f75cea50c87888fda98659

diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index a971b15..f3af1af 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -103,7 +103,6 @@ private:
 
 public:
 SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW );
-SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW, 
std::vector aW );
 
 sal_Int32 getStart() const
 {
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 9b0f6a6..69eace5 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -49,11 +49,6 @@ SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, 
sal_uInt16 nW )
 {
 }
 
-SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW, 
std::vector aW )
-: SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( 
nW ), aWhichFmtAttr( aW )
-{
-}
-
 /** Is sent if reference marks should be updated.
 
 To get the page/chapter number, t

[Libreoffice-commits] core.git: xmerge/source

2014-10-18 Thread Robert Antoni Buj i Gelonch

 xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java |   
68 ++
 1 file changed, 16 insertions(+), 52 deletions(-)

New commits:
commit 9e207520a697dd63ee8ef4de5b2b55df2952b34b
Author: Robert Antoni Buj i Gelonch 
Date:   Thu Oct 16 14:39:11 2014 +0200

xmerge: use java.nio.ByteBuffer (JDK 1.4+)

Change-Id: I6072bb4699c9cd361e0cfe0a12b46cfc1abfe368
Reviewed-on: https://gerrit.libreoffice.org/11998
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
index 352be2b..a796806 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/EndianConverter.java
@@ -18,6 +18,9 @@
 
 package org.openoffice.xmerge.util;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
 /**
  * Helper class providing static methods to convert data to/from Network Byte
  * Order (Big Endian).
@@ -38,12 +41,8 @@ public class EndianConverter {
  * @return  Two element {@code byte} array containing the converted value.
  */
 public static byte[] writeShort (short value) {
-byte[] leShort = new byte[2];
-
-leShort[0] = (byte) value;
-leShort[1] = (byte) (value >>> 8);
-
-return leShort;
+return ByteBuffer.allocate(2).order(ByteOrder.LITTLE_ENDIAN)
+.putShort(value).array();
 }
 
 /**
@@ -54,14 +53,8 @@ public class EndianConverter {
  * @return  Four element {@code byte} array containing the converted value.
  */
 public static byte[] writeInt (int value) {
-byte[] leInt = new byte[4];
-
-leInt[0] = (byte) value;
-leInt[1] = (byte) (value >>> 8);
-leInt[2] = (byte) (value >>> 16);
-leInt[3] = (byte) (value >>> 24);
-
-return leInt;
+return ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN)
+.putInt(value).array();
 }
 
 /**
@@ -77,20 +70,8 @@ public class EndianConverter {
  *  IEEE-754 float.
  */
 public static byte[] writeDouble(double value) {
-
-long myDouble = Double.doubleToLongBits(value);
-byte[] leDouble = new byte[8];
-
-leDouble[0] = (byte) (myDouble >>> 0);
-leDouble[1] = (byte) (myDouble >>> 8);
-leDouble[2] = (byte) (myDouble >>> 16);
-leDouble[3] = (byte) (myDouble >>> 24);
-leDouble[4] = (byte) (myDouble >>> 32);
-leDouble[5] = (byte) (myDouble >>> 40);
-leDouble[6] = (byte) (myDouble >>> 48);
-leDouble[7] = (byte) (myDouble >>> 56);
-
-return leDouble;
+return ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).putLong(
+Double.doubleToLongBits(value)).array();
 }
 
 /**
@@ -106,12 +87,8 @@ public class EndianConverter {
  * @return  {@code short} containing the converted value.
  */
 public static short readShort (byte[] value) {
-int high, low;
-
-high = value[1] & 0xFF;
-low  = value[0] & 0xFF;
-
-return (short)(high << 8 | low);
+return ByteBuffer.allocate(2).order(ByteOrder.LITTLE_ENDIAN)
+.put(value).getShort(0);
 }
 
 /**
@@ -127,13 +104,8 @@ public class EndianConverter {
  * @return  {@code int} containing the converted value.
  */
 public static int readInt(byte[] value) {
-int number = 0;
-
-for (int i = 0; i < 4; i++) {
-number |= (value[i] & 0xFF) << ( i * 8);
-}
-
-return number;
+return ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN)
+.put(value).getInt(0);
 }
 
 /**
@@ -149,16 +121,8 @@ public class EndianConverter {
  * @return  {@code double} containing the converted value.
  */
 public static double readDouble(byte[] value) {
-
-long lvalue = ( ((long)(value[7])   << 56)  +
-((long)(value[6]&0xFF)  << 48)  +
-((long)(value[5]&0xFF)  << 40)  +
-((long)(value[4]&0xFF)  << 32)  +
-((long)(value[3]&0xFF)  << 24)  +
-((long)(value[2]&0xFF)  << 16)  +
-((long)(value[1]&0xFF)  << 8)   +
- (value[0]&0xFF));
-
-return Double.longBitsToDouble(lvalue);
+return Double.longBitsToDouble(
+ByteBuffer.allocate(8).order(ByteOrder.LITTLE_ENDIAN).put(value)
+.getLong(0));
 }
 }
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source unusedcode.easy

2014-10-18 Thread Miklos Vajna

 sw/inc/doc.hxx |4 
 sw/source/core/doc/doc.cxx |   15 ---
 unusedcode.easy|3 ---
 3 files changed, 22 deletions(-)

New commits:
commit 7d966b1d68fef9b9e21cf390bb1cf756841797bf
Author: Miklos Vajna 
Date:   Sat Oct 18 13:51:33 2014 +0200

SwDoc: remove unused methods

Change-Id: I073372b74d0362eaffdc1dddfbef8767e58b0fd6

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 60d1ce5..65b533b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -527,7 +527,6 @@ public:
 IDocumentFieldsAccess const & getIDocumentFieldsAccess() const;
 IDocumentFieldsAccess & getIDocumentFieldsAccess();
 
-::sw::DocumentFieldsManager const & GetDocumentFieldsMAnager() const;
 ::sw::DocumentFieldsManager & GetDocumentFieldsManager();
 
 // IDocumentContentOperations
@@ -559,9 +558,6 @@ public:
 IDocumentState const & getIDocumentState() const;
 IDocumentState & getIDocumentState();
 
-::sw::DocumentStateManager const & GetDocumentStateManager() const;
-::sw::DocumentStateManager & GetDocumentStateManager();
-
 // IDocumentDrawModelAccess
 DECL_LINK( AddDrawUndo, SdrUndoAction * );
 IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 4459b55..3b9dc9f 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -402,11 +402,6 @@ IDocumentFieldsAccess & SwDoc::getIDocumentFieldsAccess()
 return *m_pDocumentFieldsManager;
 }
 
-::sw::DocumentFieldsManager const & SwDoc::GetDocumentFieldsMAnager() const
-{
-return *m_pDocumentFieldsManager;
-}
-
 ::sw::DocumentFieldsManager & SwDoc::GetDocumentFieldsManager()
 {
 return *m_pDocumentFieldsManager;
@@ -444,16 +439,6 @@ IDocumentState & SwDoc::getIDocumentState()
 return *m_pDocumentStateManager;
 }
 
-::sw::DocumentStateManager const & SwDoc::GetDocumentStateManager() const
-{
-return *m_pDocumentStateManager;
-}
-
-::sw::DocumentStateManager & SwDoc::GetDocumentStateManager()
-{
-return *m_pDocumentStateManager;
-}
-
 //IDocumentLayoutAccess
 IDocumentLayoutAccess const & SwDoc::getIDocumentLayoutAccess() const
 {
diff --git a/unusedcode.easy b/unusedcode.easy
index 60aee14..3455a33 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -48,9 +48,6 @@ SvtListener::IsListening(SvtBroadcaster&) const
 SvxFontListBox::GetSelectEntry() const
 SvxOpenGLObject::getRenderer()
 SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
-SwDoc::GetDocumentFieldsMAnager() const
-SwDoc::GetDocumentStateManager()
-SwDoc::GetDocumentStateManager() const
 SwLayHelper::CheckPageFlyCache(SwPageFrm*&, SwFlyFrm*)
 SwTxtPaintInfo::DrawSpecial(SwLinePortion const&, unsigned short, Color 
const&) const
 SwUpdateAttr::SwUpdateAttr(int, int, unsigned short, 
std::__debug::vector >)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svgio/source

2014-10-18 Thread Julien Nabet

 svgio/source/svgreader/svgtoken.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25548c57eedcb40f8f9b3e3d6707311cfe0b2a35
Author: Julien Nabet 
Date:   Sat Oct 18 13:01:49 2014 +0200

cppcheck: Prefer prefix ++/-- operators for non-primitive types

Change-Id: I0dd2f1d2efef7995aaf2ab7656c24178a02eb9cd

diff --git a/svgio/source/svgreader/svgtoken.cxx 
b/svgio/source/svgreader/svgtoken.cxx
index 0e3793f..fa5d7ba 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -317,7 +317,7 @@ namespace svgio
 
 if(aCaseLindependentSVGTokenMapperList.empty())
 {
-for(SVGTokenMapper::const_iterator 
aCurrent(aSVGTokenMapperList.begin()); aCurrent != aSVGTokenMapperList.end(); 
aCurrent++)
+for(SVGTokenMapper::const_iterator 
aCurrent(aSVGTokenMapperList.begin()); aCurrent != aSVGTokenMapperList.end(); 
++aCurrent)
 {
 aCaseLindependentSVGTokenMapperList.insert(
 SVGTokenValueType(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - filter/CppunitTest_filter_met_test.mk filter/Module_filter.mk filter/qa filter/source vcl/source vcl/unx

2014-10-18 Thread Caolán McNamara

 filter/CppunitTest_filter_met_test.mk   |   43 +
 filter/Module_filter.mk |1 
 filter/qa/cppunit/data/met/indeterminate/.gitignore |1 
 filter/qa/cppunit/data/met/pass/sample.met  |binary
 filter/qa/cppunit/filters-met-test.cxx  |   71 ++
 filter/source/graphicfilter/ios2met/ios2met.cxx |   16 ++-
 vcl/source/filter/wmf/winwmf.cxx|   95 +++-
 vcl/source/fontsubset/sft.cxx   |8 +
 vcl/unx/generic/dtrans/bmp.cxx  |3 
 9 files changed, 213 insertions(+), 25 deletions(-)

New commits:
commit 6118c11a0c5122169979547e8c27136cf58a54a7
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 17 20:35:12 2014 +0100

coverity#1242582 Untrusted loop bound

Change-Id: I72d2c4979b62a025d212ce5ee3b7141c40376fa7

diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index a23d0cc..abe2eeb 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -1012,6 +1012,8 @@ void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, 
bool bExtra, sal_uInt1
 else
 nLen = nOrderLen-4;
 }
+if (nLen > pOS2MET->remainingSize())
+throw css::uno::Exception("attempt to read past end of input", 0);
 boost::scoped_array pChr(new char[nLen+1]);
 for (i=0; iReadChar( pChr[i] );
@@ -2752,12 +2754,18 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, 
FilterConfigItem* )
 GDIMetaFile aMTF;
 boolbRet = false;
 
-aOS2METReader.ReadOS2MET( rStream, aMTF );
+try
+{
+aOS2METReader.ReadOS2MET( rStream, aMTF );
 
-if ( !rStream.GetError() )
+if ( !rStream.GetError() )
+{
+rGraphic=Graphic( aMTF );
+bRet = true;
+}
+}
+catch (const css::uno::Exception&)
 {
-rGraphic=Graphic( aMTF );
-bRet = true;
 }
 
 return bRet;
commit 0445a0ea1b11c78f03272d42e5a8829b1bd107e2
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 17 16:52:50 2014 +0100

add a regression test for .met files

OS/2 Metafile Format

aka

Presentation Manager Metafile File Format

this format appears to not to have a mime-type

Change-Id: I8b2356fb42272a6e0550abf09f46b051d22b64a5

diff --git a/filter/CppunitTest_filter_met_test.mk 
b/filter/CppunitTest_filter_met_test.mk
new file mode 100644
index 000..a79528c
--- /dev/null
+++ b/filter/CppunitTest_filter_met_test.mk
@@ -0,0 +1,43 @@
+# -*- 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_CppunitTest_CppunitTest,filter_met_test))
+
+$(eval $(call gb_CppunitTest_use_external,filter_met_test,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,filter_met_test, \
+filter/qa/cppunit/filters-met-test \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,filter_met_test, \
+ime \
+   sal \
+   test \
+   tl \
+   unotest \
+   vcl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,filter_met_test,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,filter_met_test))
+$(eval $(call gb_CppunitTest_use_vcl,filter_met_test))
+
+$(eval $(call gb_CppunitTest_use_components,filter_met_test,\
+configmgr/source/configmgr \
+i18npool/util/i18npool \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,filter_met_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 25698b9..a3bddf4 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\
 ifneq ($(DISABLE_CVE_TESTS),TRUE)
 $(eval $(call gb_Module_add_check_targets,filter,\
 CppunitTest_filter_dxf_test \
+CppunitTest_filter_met_test \
 CppunitTest_filter_pcx_test \
 CppunitTest_filter_pict_test \
 CppunitTest_filter_ppm_test \
diff --git a/filter/qa/cppunit/data/met/fail/.gitignore 
b/filter/qa/cppunit/data/met/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/met/indeterminate/.gitignore 
b/filter/qa/cppunit/data/met/indeterminate/.gitignore
new file mode 100644
index 000..583b009c
--- /dev/null
+++ b/filter/qa/cppunit/data/met/indeterminate/.gitignore
@@ -0,0 +1 @@
+*.wmf-*
diff --git a/filter/qa/cppunit/data/met/pass/.gitignore 
b/filter/qa/cppunit/data/met/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/filter/qa/cppunit/data/met/pass/sample.met 
b/filter/qa/cppunit/data/met/pass/sample.met
new file mode

[Libreoffice-commits] core.git: cui/source vcl/ios

2014-10-18 Thread Andras Timar

 cui/source/dialogs/about.cxx |1 -
 vcl/ios/iosinst.cxx  |1 -
 2 files changed, 2 deletions(-)

New commits:
commit d634a61ebd6c3144ff76af4725832207b895adda
Author: Andras Timar 
Date:   Sat Oct 18 11:18:34 2014 +0200

vcl/layout.hxx was included twice

Change-Id: I03a30793e02def731cb6c8f130c48aeb325a2528

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c26ae52..5ad2e66 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index f1d87b8..73092e6 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -22,7 +22,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/runner reportbuilder/java

2014-10-18 Thread Robert Antoni Buj i Gelonch

 qadevOOo/runner/convwatch/BorderRemover.java  |2 +-
 reportbuilder/java/org/libreoffice/report/SOImageService.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d807cba9ee60cb1404b54addf9cd3e54de89f331
Author: Robert Antoni Buj i Gelonch 
Date:   Thu Oct 16 17:50:50 2014 +0200

java: loss of precission

Change-Id: I0563a76b1d2c838e6301bf7a9ed154c77a98c0d9
Reviewed-on: https://gerrit.libreoffice.org/12000
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/qadevOOo/runner/convwatch/BorderRemover.java 
b/qadevOOo/runner/convwatch/BorderRemover.java
index 09cc785..87ba90a 100644
--- a/qadevOOo/runner/convwatch/BorderRemover.java
+++ b/qadevOOo/runner/convwatch/BorderRemover.java
@@ -77,7 +77,7 @@ class BorderRemover
 }
 
 // calculate tolerance halve
-double nTolerable = (_nTolerance * 256 / 100);
+int nTolerable = (int) (_nTolerance * 256.0 / 100.0);
 if (nTolerable < 0)
 {
 nTolerable = 0;
diff --git a/reportbuilder/java/org/libreoffice/report/SOImageService.java 
b/reportbuilder/java/org/libreoffice/report/SOImageService.java
index 1979c4f..7070038 100644
--- a/reportbuilder/java/org/libreoffice/report/SOImageService.java
+++ b/reportbuilder/java/org/libreoffice/report/SOImageService.java
@@ -103,7 +103,7 @@ public class SOImageService implements ImageService
 {
 final Size imageSize = (Size) 
xImage.getPropertyValue("SizePixel");
 final int dpi = 
java.awt.Toolkit.getDefaultToolkit().getScreenResolution();
-final double fac = 2540 / dpi;
+final double fac = 2540.0 / dpi;
 dim.Width = (int) (imageSize.Width * fac);
 dim.Height = (int) (imageSize.Height * fac);
 }
___
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.2' - filter/source include/svx svx/source

2014-10-18 Thread Caolán McNamara

 filter/source/svg/svgexport.cxx|   18 --
 filter/source/svg/svgfilter.hxx|1 +
 include/svx/svdmodel.hxx   |2 ++
 svx/source/inc/svdoutlinercache.hxx|7 +++
 svx/source/svdraw/svdmodel.cxx |   11 +++
 svx/source/svdraw/svdoutlinercache.cxx |2 ++
 6 files changed, 39 insertions(+), 2 deletions(-)

New commits:
commit 9b8cc24d5e6a6a216582c5ddbe80bcbd53d337b0
Author: CaolÃ¡n McNamara 
Date:   Fri Oct 17 15:03:34 2014 +0100

Resolves: fdo#62682 crash on second export of svg

because the first export has left "dangling" CalcFieldValueHdl Links in
Outliners that got created based on the Drawing Outliner while it had a
temporary CalcFieldValueHdl installed, and didn't get the old 
CalcFieldValueHdl
installed when the old Drawing Outliner one was re-installed.

Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index a9cfc01..4265f35 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -598,7 +598,8 @@ sal_Bool SVGFilter::implExport( const Sequence< 
PropertyValue >& rDescriptor )
 SdrOutliner& rOutl = 
mpSdrModel->GetDrawOutliner(NULL);
 
 maOldFieldHdl = 
rOutl.GetCalcFieldValueHdl();
-rOutl.SetCalcFieldValueHdl( LINK( this, 
SVGFilter, CalcFieldHdl) );
+maNewFieldHdl = LINK(this, SVGFilter, 
CalcFieldHdl);
+rOutl.SetCalcFieldValueHdl(maNewFieldHdl);
 }
 }
 bRet = implExportDocument();
@@ -611,7 +612,20 @@ sal_Bool SVGFilter::implExport( const Sequence< 
PropertyValue >& rDescriptor )
 }
 
 if( mpSdrModel )
-mpSdrModel->GetDrawOutliner( NULL 
).SetCalcFieldValueHdl( maOldFieldHdl );
+{
+//fdo#62682 The maNewFieldHdl can end up getting copied
+//into various other outliners which live past this
+//method, so get the full list of outliners and restore
+//the maOldFieldHdl for all that have ended up using
+//maNewFieldHdl
+std::vector 
aOutliners(mpSdrModel->GetActiveOutliners());
+for (auto aIter = aOutliners.begin(); aIter != 
aOutliners.end(); ++aIter)
+{
+SdrOutliner* pOutliner = *aIter;
+if (maNewFieldHdl == 
pOutliner->GetCalcFieldValueHdl())
+pOutliner->SetCalcFieldValueHdl(maOldFieldHdl);
+}
+}
 
 delete mpSVGWriter, mpSVGWriter = NULL;
 mpSVGExport = NULL; // pointed object is released by 
xSVGExport dtor at the end of this scope
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 85fab2b..09c41d2 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -263,6 +263,7 @@ private:
 XDrawPageSequence   mMasterPageTargets;
 
 LinkmaOldFieldHdl;
+LinkmaNewFieldHdl;
 
 sal_BoolimplImport( const Sequence< 
PropertyValue >& rDescriptor ) throw (RuntimeException);
 
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 81df0c4..fa7f18a 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -233,6 +233,8 @@ public:
 sal_uIntPtr nSwapGraphicsMode;
 
 SdrOutlinerCache* mpOutlinerCache;
+//get a vector of all the SdrOutliner belonging to the model
+std::vector GetActiveOutliners() const;
 SdrModelImpl*   mpImpl;
 sal_uInt16  mnCharCompressType;
 sal_uInt16  mnHandoutPageCount;
diff --git a/svx/source/inc/svdoutlinercache.hxx 
b/svx/source/inc/svdoutlinercache.hxx
index 6dbf728..03572fc 100644
--- a/svx/source/inc/svdoutlinercache.hxx
+++ b/svx/source/inc/svdoutlinercache.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX
 
 #include 
+#include 
 
 class SdrModel;
 class SdrOutliner;
@@ -33,12 +34,18 @@ private:
 
 SdrOutliner*mpModeOutline;
 SdrOutliner*mpModeText;
+
+std::vector maActiveOutliners;
 public:
 SdrOutlinerCache( SdrModel* pModel );
 ~SdrOutlinerCache();
 
 SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
 void disposeOutliner( SdrOutliner* pOutliner );
+std::vector GetActiveOutliners() const
+{
+return maActiveOutliners;
+}
 };
 
 #endif
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index b0cf

[Libreoffice-commits] core.git: sw/source

2014-10-18 Thread Philipp Weissenbacher

 sw/source/core/sw3io/sw3convert.cxx |  174 +++-
 sw/source/core/sw3io/swacorr.cxx|   17 ++-
 sw/source/core/swg/SwXMLTextBlocks.cxx  |   12 +-
 sw/source/core/swg/SwXMLTextBlocks1.cxx |   12 --
 sw/source/core/swg/swblocks.cxx |   45 
 sw/source/core/unocore/unochart.cxx |  126 +++
 6 files changed, 197 insertions(+), 189 deletions(-)

New commits:
commit b6c32f3fd330d4297fc448a090d8c95bed11b02d
Author: Philipp Weissenbacher 
Date:   Fri Oct 17 20:59:54 2014 +0200

fdo#39468 Translate German comments - sw/source/core/{sw3io|swg|unocore}

- Convert Deutsche Mark (DM) to Euro (EUR)
- Fix some whitespace

Change-Id: I94e0c9cbf5f5defca2e0d0f59f08592a914a381b
Reviewed-on: https://gerrit.libreoffice.org/12011
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sw/source/core/sw3io/sw3convert.cxx 
b/sw/source/core/sw3io/sw3convert.cxx
index 9056381..3ab1589 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -46,8 +46,8 @@
 #include "ndtxt.hxx"
 
 //really used ids from old sw3ids.hxx
-#define SWG_INETBROWSER 0x000e  // URL-Grf-Nodes, Browse-Flag, Format-Ums.
-#define SWG_NEWFIELDS   0x0200  // Felder mit Numberformatter-Zahlenformat
+#define SWG_INETBROWSER 0x000e  // URL graph nodes, browse flag, formatter
+#define SWG_NEWFIELDS   0x0200  // Fields with Numberformatter numberformat
 
 using namespace nsSwDocInfoSubType;
 
@@ -59,118 +59,114 @@ struct OldFormats
 
 static const OldFormats aOldDateFmt40[] =
 {
-// Datumsfelder:
-{ NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
-{ NF_DATE_SYSTEM_LONG,  DFF_LSYS }, // Langes Systemdatum
-{ NF_DATE_SYS_DDMMYY,   DFF_DMY },// 06.10.64
+// Date fields
+{ NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Short system date
+{ NF_DATE_SYSTEM_LONG,  DFF_LSYS }, // Long system date
+{ NF_DATE_SYS_DDMMYY,   DFF_DMY },  // 06.10.64
 { NF_DATE_SYS_DDMM, DFF_DMYY }, // 06.10.1964
-{ NF_DATE_SYS_DMMMYY,   DFF_DMMY }, // 06. Okt 64
-{ NF_DATE_SYS_DMMM, DFF_DMMYY },// 06. Okt 1964
-{ NF_DATE_DIN_D,DFF_DMMMYY },   // 06. Oktober 1964
-{ NF_DATE_DIN_D,DFF_DMMMY },// 06. Oktober 64
-{ NF_DATE_SYS_NNDMMMYY, DFF_DDMMY },// Di, 06. Okt 64
-{ NF_DATE_SYS_NND,  DFF_DDMMMY },   // Di, 06. Oktober 64
-{ NF_DATE_SYS_NND,  DFF_DDMMMYY },  // Di, 06. Oktober 1964
-{ NF_DATE_SYS_D,DFF_DDDMMMYY }, // Dienstag, 06. 
Oktober 1964
-{ NF_DATE_SYS_D,DFF_DDDMMMY },  // Dienstag, 06. 
Oktober 64
-{ NF_DATE_SYS_MMYY, DFF_MY },   // 10.64
-{ NF_DATE_DIN_MMDD, DFF_MD },   // 10-06
-{ NF_DATE_DIN_YYMMDD,   DFF_YMD },  // 64-10-06
+{ NF_DATE_SYS_DMMMYY,   DFF_DMMY }, // 06. Oct 64
+{ NF_DATE_SYS_DMMM, DFF_DMMYY },// 06. Oct 1964
+{ NF_DATE_DIN_D,DFF_DMMMYY },   // 06. October 1964
+{ NF_DATE_DIN_D,DFF_DMMMY },// 06. October 64
+{ NF_DATE_SYS_NNDMMMYY, DFF_DDMMY },// Tue, 06. Oct 64
+{ NF_DATE_SYS_NND,  DFF_DDMMMY },   // Tue, 06. October 64
+{ NF_DATE_SYS_NND,  DFF_DDMMMYY },  // Tue, 06. October 1964
+{ NF_DATE_SYS_D,DFF_DDDMMMYY }, // Tuesday, 06. October 
1964
+{ NF_DATE_SYS_D,DFF_DDDMMMY },  // Tuesday, 06. October 64
+{ NF_DATE_SYS_MMYY, DFF_MY },   // 10.64
+{ NF_DATE_DIN_MMDD, DFF_MD },   // 10-06
+{ NF_DATE_DIN_YYMMDD,   DFF_YMD },  // 64-10-06
 { NF_DATE_DIN_MMDD, DFF_YYMD }, // 1964-10-06
 
-{ NF_NUMERIC_START, 0  }// Tabellenende
+{ NF_NUMERIC_START, 0  }// End of table
 };
 
 static const OldFormats aOldDateFmt30[] =
 {
-// Datumsfelder:
-{ NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Kurzes Systemdatum
-{ NF_DATE_SYSTEM_LONG,  DFF_LSYS }, // Langes Systemdatum
-{ NF_DATE_SYS_DDMMYY,   DFF_DMY },// 06.10.64
+// Date fields
+{ NF_DATE_SYSTEM_SHORT, DFF_SSYS }, // Short system date
+{ NF_DATE_SYSTEM_LONG,  DFF_LSYS }, // Long system date
+{ NF_DATE_SYS_DDMMYY,   DFF_DMY },  // 06.10.64
 { NF_DATE_SYS_DDMM, DFF_DMYY }, // 06.10.1964
-{ NF_DATE_SYS_DMMMYY,   DFF_DMMY }, // 06. Okt 64
-{ NF_DATE_SYS_DMMM, 4 /*DFF_DMMYY*/ },  // 06. Okt 1964
-{ NF_DATE_DIN_D,5 /*DFF_DMMMYY*/ }, // 06. Oktober 1964
-{ NF_DATE_DIN_D,5

[Libreoffice-commits] core.git: javaunohelper/com

2014-10-18 Thread Robert Antoni Buj i Gelonch

 javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit eb6c538424b2d44f24cbd029c17afbdf19eaf11d
Author: Robert Antoni Buj i Gelonch 
Date:   Thu Oct 16 12:41:50 2014 +0200

javaunohelper: remove unused import

Change-Id: Ibee790a50e35219a8427b7037331943b778292a2
Reviewed-on: https://gerrit.libreoffice.org/11997
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java 
b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index c51475e..a61edc0 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -17,10 +17,11 @@
  */
 
 package com.sun.star.lib.uno.helper;
+
 import java.util.Iterator;
 import java.util.ListIterator;
-import java.util.NoSuchElementException;
 import java.util.Collection;
+
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.XEventListener;
 import com.sun.star.uno.UnoRuntime;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-10-19

[Libreoffice-commits] core.git: external/libmwaw

[Libreoffice-commits] core.git: 2 commits - external/libmwaw tools/source

[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source

[Libreoffice-commits] core.git: libreofficekit/Module_libreofficekit.mk Repository.mk

[Bug 38814] Snappier rendering: paint at idle, not on timeout

[Libreoffice-commits] core.git: 3 commits - configure.ac

Re: Main-loop / idle handler bits ...

Cyrille Ruggero license statement

[Libreoffice-commits] core.git: configure.ac

[Libreoffice-commits] core.git: lotuswordpro/source

[Libreoffice-commits] core.git: accessibility/source cui/source include/svtools svtools/source svx/source

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst

Re: [Libreoffice-qa] Minutes of ESC call: 2014-10-16

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - download.lst

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - icon-themes/sifr

[Libreoffice-commits] core.git: writerfilter/qa writerfilter/source

[Libreoffice-commits] core.git: sc/source

[Libreoffice-commits] core.git: sw/qa

[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source unusedcode.easy

[Libreoffice-commits] core.git: xmerge/source

[Libreoffice-commits] core.git: sw/inc sw/source unusedcode.easy

[Libreoffice-commits] core.git: svgio/source

[Libreoffice-commits] core.git: 6 commits - filter/CppunitTest_filter_met_test.mk filter/Module_filter.mk filter/qa filter/source vcl/source vcl/unx

[Libreoffice-commits] core.git: cui/source vcl/ios

[Libreoffice-commits] core.git: qadevOOo/runner reportbuilder/java

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - filter/source include/svx svx/source

[Libreoffice-commits] core.git: sw/source

[Libreoffice-commits] core.git: javaunohelper/com

29 matches

Site Navigation

Mail list logo

Footer information