[Libreoffice-commits] core.git: 4 commits - android/experimental vcl/android vcl/README vcl/source

[Tor Lillqvist]

 
android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
 |   48 -
 vcl/README 
|   46 
 vcl/android/androidinst.cxx
|  463 --
 vcl/source/app/svapp.cxx   
|   25 
 vcl/source/window/winproc.cxx  
|   29 
 5 files changed, 138 insertions(+), 473 deletions(-)

New commits:
commit e669502dcf2f825842ba87ee4a14a0be26883e28
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Mar 7 10:15:28 2013 +0200

Start hacking on scrolling

Change-Id: I74f1d7feb935be65629bdbd7464f9882229948e5

diff --git 
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
 
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
index c10df22..ace4efe 100644
--- 
a/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
+++ 
b/android/experimental/desktop/src/org/libreoffice/experimental/desktop/Desktop.java
@@ -50,6 +50,7 @@ public class Desktop
 public static native void key(char c);
 public static native void touch(int action, int x, int y);
 public static native void zoom(float scale, int x, int y);
+public static native void scroll(int x, int y);
 
 /**
  * This class contains the state that is initialized once and never changes
@@ -165,7 +166,8 @@ public class Desktop
 GestureDetector gestureDetector;
 ScaleGestureDetector scaleDetector;
 
-boolean scalingInProgress;
+boolean scrollInProgress, scalingInProgress;
+float translateX = 0, translateY = 0;
 float accumulatedScale = 1;
 float pivotX = 0, pivotY = 0;
 
@@ -179,14 +181,18 @@ public class Desktop
 new 
GestureDetector.SimpleOnGestureListener() {
 @Override public boolean 
onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY)
 {
-Log.i(TAG, onFling: events: + e1 
+ ,  + e2 + , velocity: ( + velocityX + ,  + velocityY + ));
+Log.i(TAG, onFling: ( + 
velocityX + ,  + velocityY + ));
 return false;
 }
 
-@Override public boolean 
onScroll(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY)
+@Override public boolean 
onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY)
 {
-Log.i(TAG, onScroll: events: + 
e1 + ,  + e2 + , velocity: ( + velocityX + ,  + velocityY + ));
-return false;
+Log.i(TAG, onScroll: ( + 
distanceX + ,  + distanceY + ));
+translateX += -distanceX;
+translateY += -distanceY;
+scrollInProgress = true;
+invalidate();
+return true;
 }
 });
 
@@ -202,7 +208,7 @@ public class Desktop
 
  @Override public boolean 
onScale(ScaleGestureDetector detector)
  {
- accumulatedScale *= 
detector.getScaleFactor();;
+ accumulatedScale *= 
detector.getScaleFactor();
  pivotX = detector.getFocusX();
  pivotY = detector.getFocusY();
  invalidate();
@@ -229,10 +235,19 @@ public class Desktop
 setViewSize(getWidth(), getHeight());
 }
 renderVCL(mBitmap);
-canvas.save();
-canvas.scale(accumulatedScale, accumulatedScale, pivotX, pivotY);
-canvas.drawBitmap(mBitmap, 0, 0, null);
-canvas.restore();
+if (scrollInProgress) {
+canvas.save();
+canvas.translate(translateX, translateY);
+canvas.drawBitmap(mBitmap, 0, 0, null);
+canvas.restore();
+} else if (scalingInProgress) {
+canvas.save();
+canvas.scale(accumulatedScale, accumulatedScale, pivotX, 
pivotY);
+canvas.drawBitmap(mBitmap, 0, 0, null);
+canvas.restore();
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch icu/icu4c-CVE-2013-0900_umutex.patch icu/makefile.mk

[Eike Rathke]

 icu/icu4c-CVE-2013-0900_umutex.patch  |   12 
 icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch |  291 ++
 icu/makefile.mk   |2 
 3 files changed, 305 insertions(+)

New commits:
commit 86da16bb0ce4c4f2d0102198159d420bf376aea6
Author: Eike Rathke er...@redhat.com
Date:   Thu Mar 7 01:48:56 2013 +0100

resolved rhbz#918168 ICU: CVE-2013-0900 race condition allows DoS

Upstream changes
https://ssl.icu-project.org/trac/changeset/32865
https://ssl.icu-project.org/trac/changeset/32908

See also
https://bugzilla.redhat.com/show_bug.cgi?id=918167

Plus changed UMutex to UMTX to make these compile in icu49.

Change-Id: Ida28f7c955959565a2133242b826bb5038758407
Reviewed-on: https://gerrit.libreoffice.org/2576
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/icu/icu4c-CVE-2013-0900_umutex.patch 
b/icu/icu4c-CVE-2013-0900_umutex.patch
new file mode 100644
index 000..a705df2
--- /dev/null
+++ b/icu/icu4c-CVE-2013-0900_umutex.patch
@@ -0,0 +1,12 @@
+diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
+--- misc/build/icu.orig/source/common/locid.cpp2013-03-06 
21:27:35.170696967 +0100
 misc/build/icu/source/common/locid.cpp 2013-03-06 21:29:47.711378977 
+0100
+@@ -53,7 +53,7 @@
+ static Locale *gLocaleCache = NULL;
+ 
+ // gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and 
gDefaultLocale.
+-static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
++static UMTX gDefaultLocaleMutex = NULL;
+ static UHashtable *gDefaultLocalesHashT = NULL;
+ static Locale *gDefaultLocale = NULL;
+ 
diff --git a/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch 
b/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
new file mode 100644
index 000..515e2aa
--- /dev/null
+++ b/icu/icu4c.9737.CVE-2013-0900_changesets_32865_32908.patch
@@ -0,0 +1,291 @@
+Squashed into one:
+https://ssl.icu-project.org/trac/changeset/32865
+https://ssl.icu-project.org/trac/changeset/32908
+
+diff -ruN icu.orig/source/common/locid.cpp icu/source/common/locid.cpp
+--- misc/build/icu.orig/source/common/locid.cpp2012-04-05 
22:46:14.0 +0200
 misc/build/icu/source/common/locid.cpp 2013-03-05 21:54:11.974608225 
+0100
+@@ -1,6 +1,6 @@
+ /*
+  **
+- *   Copyright (C) 1997-2011, International Business Machines
++ *   Copyright (C) 1997-2012, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  **
+ *
+@@ -33,6 +33,7 @@
+ #include unicode/locid.h
+ #include unicode/uloc.h
+ #include putilimp.h
++#include mutex.h
+ #include umutex.h
+ #include uassert.h
+ #include cmemory.h
+@@ -43,6 +44,21 @@
+ 
+ #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
+ 
++U_CDECL_BEGIN
++static UBool U_CALLCONV locale_cleanup(void);
++U_CDECL_END
++
++U_NAMESPACE_BEGIN
++
++static Locale *gLocaleCache = NULL;
++
++// gDefaultLocaleMutex protects all access to gDefaultLocalesHashT and 
gDefaultLocale.
++static UMutex gDefaultLocaleMutex = U_MUTEX_INITIALIZER;
++static UHashtable *gDefaultLocalesHashT = NULL;
++static Locale *gDefaultLocale = NULL;
++
++U_NAMESPACE_END
++
+ typedef enum ELocalePos {
+ eENGLISH,
+ eFRENCH,
+@@ -77,10 +93,6 @@
+ UBool valuesToo,
+ UErrorCode *status);
+ 
+-static icu::Locale *gLocaleCache = NULL;
+-static icu::Locale *gDefaultLocale = NULL;
+-static UHashtable *gDefaultLocalesHashT = NULL;
+-
+ U_CDECL_BEGIN
+ //
+ // Deleter function for Locales owned by the default Locale hash table/
+@@ -102,24 +114,19 @@
+ if (gDefaultLocalesHashT) {
+ uhash_close(gDefaultLocalesHashT);   // Automatically deletes all 
elements, using deleter func.
+ gDefaultLocalesHashT = NULL;
++gDefaultLocale = NULL;
+ }
+-else if (gDefaultLocale) {
+-// The cache wasn't created, and only one default locale was created.
+-delete gDefaultLocale;
+-}
+-gDefaultLocale = NULL;
+ 
+ return TRUE;
+ }
+ U_CDECL_END
+ 
+ U_NAMESPACE_BEGIN
+-//
+-//  locale_set_default_internal.
+-//
+-void locale_set_default_internal(const char *id)
+-{
+-UErrorCode   status = U_ZERO_ERROR;
++
++Locale *locale_set_default_internal(const char *id, UErrorCode status) {
++// Synchronize this entire function.
++Mutex lock(gDefaultLocaleMutex);
++
+ UBool canonicalize = FALSE;
+ 
+ // If given a NULL string for the locale id, grab the default
+@@ -127,17 +134,10 @@
+ //   (Different from most other locale APIs, where a null name means use
+ //the current ICU default locale.)
+ if (id == NULL) {
+-umtx_lock(NULL);
+-id = uprv_getDefaultLocaleID();
+-

[PUSHED libreoffice-4-0] resolved rhbz#918168 ICU: CVE-2013-0900 race condition allow...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2576

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2576
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida28f7c955959565a2133242b826bb5038758407
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/fdo59638.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   25 
 sw/qa/extras/rtfimport/data/fdo59638.rtf |   35 +++
 sw/qa/extras/rtfimport/rtfimport.cxx |   25 
 writerfilter/source/dmapper/NumberingManager.cxx |9 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |   25 +++-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |1 
 7 files changed, 118 insertions(+), 2 deletions(-)

New commits:
commit 202d4d32d481ce7e2d1f9933186b30f9ae77497a
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Feb 28 14:20:00 2013 +0100

fdo#59638 import of DOCX w:lvlOverride / RTF_LFOLEVEL

Also handle RTF_F inside RTF_LISTLEVEL. Word typically uses the Symbol
font to describe bullet characters instead of using a sane Unicode
value, the previous can only be handled if we parse the custom font set
for the list.

(cherry picked from commits 521586b328305c4466603438a9931993b92873c6,
2f82a08d3565239c2bfe8d21fbebd89bd4657708 and
58c30a3545a5725d704eabd79071db02f1f2cb23)

Change-Id: I1491f07c40953949e381a035c1596c207cdc4c35
Reviewed-on: https://gerrit.libreoffice.org/2503
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/qa/extras/ooxmlimport/data/fdo59638.docx 
b/sw/qa/extras/ooxmlimport/data/fdo59638.docx
new file mode 100755
index 000..d33e7cc
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo59638.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2c32f13..1ade3ed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -112,6 +112,7 @@ public:
 void testFineTableDash();
 void testN779642();
 void testFdo53985();
+void testFdo59638();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -176,6 +177,7 @@ void Test::run()
 {tableborder-finedash.docx, Test::testFineTableDash},
 {n779642.docx, Test::testN779642},
 {fdo53985.docx, Test::testFdo53985},
+{fdo59638.docx, Test::testFdo59638},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1096,6 +1098,29 @@ void Test::testFdo53985()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xTables-getCount()); // Only 4 tables 
were imported.
 }
 
+void Test::testFdo59638()
+{
+// The problem was that w:lvlOverride inside w:num was ignores by dmapper.
+
+uno::Referencebeans::XPropertySet 
xPropertySet(getStyles(NumberingStyles)-getByName(WWNum1), uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xLevels(xPropertySet-getPropertyValue(NumberingRules), uno::UNO_QUERY);
+uno::Sequencebeans::PropertyValue aProps;
+xLevels-getByIndex(0) = aProps; // 1st level
+
+for (int i = 0; i  aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+
+if (rProp.Name == BulletChar)
+{
+// Was '*', should be 'o'.
+CPPUNIT_ASSERT_EQUAL(OUString(\xEF\x82\xB7, 3, 
RTL_TEXTENCODING_UTF8), rProp.Value.getOUString());
+return;
+}
+}
+CPPUNIT_FAIL(no BulletChar property);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/rtfimport/data/fdo59638.rtf 
b/sw/qa/extras/rtfimport/data/fdo59638.rtf
new file mode 100644
index 000..e2572bf
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo59638.rtf
@@ -0,0 +1,35 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2
+Times New Roman;}
+{\f2\fbidi \fmodern\fcharset238\fprq1
+Courier New;}
+{\f3\fbidi \froman\fcharset2\fprq2
+Symbol;}
+}
+{\*\listtable
+{\list\listtemplateid-178490\listsimple
+{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat0\levelspace0\levelindent0
+{\leveltext\'01*;}
+{\levelnumbers;}
+\hres0\chhres0 }
+{\listname ;}
+\listid-2}
+}
+{\*\listoverridetable
+{\listoverride\listid-2\listoverridecount1
+{\lfolevel\listoverrideformat
+{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat0\levelold\levelspace0
+\levelindent0
+{\leveltext\'01\u-3913 ?;}
+{\levelnumbers;}
+\f3\fbias0 }
+}
+\ls1}
+}
+\pard\plain \ltrpar\ql \fi-360\li720\ri0\nowidctlpar\wrapdefault
+\faauto\ls1\rin0\lin720\itap0\pararsid7241016 \rtlch\fcs1 
\af31507\afs22\alang1025 \ltrch\fcs0 
\fs22\lang1031\langfe1031\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1031\langfenp1031
 
+{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\insrsid15285686 \hich\af37\dbch\af31505\loch\f37 3
+\par }
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/fdo60722.rtf   |   13 
 sw/qa/extras/rtfimport/rtfimport.cxx   |   21 +++
 writerfilter/source/dmapper/GraphicHelpers.cxx |3 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 ++
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +
 writerfilter/source/rtftok/rtfsdrimport.cxx|   27 ++---
 6 files changed, 57 insertions(+), 12 deletions(-)

New commits:
commit a6f8721768eb3318245893eced3b89522fc87383
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Mar 6 11:45:15 2013 +0100

fdo#60722 RTF filter: shape import fixes

- fix line color default
- fix line width default
- fix z-order of shapes

(cherry picked from commits 9c7dbd9e1d2a131402a80e377630fe1ab5381a47,
cf2a1277acd4a29492f056a626b13e903d391027,
1eaab77c718ffa254068ae6032862dfb5a03db67 and
ea66024d4da38a619f44c941b65e6a28b74214b9)

Change-Id: Ib6097c844b2bc929c6ece31bcec62f27bfbf386c
Reviewed-on: https://gerrit.libreoffice.org/2569
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/qa/extras/rtfimport/data/fdo60722.rtf 
b/sw/qa/extras/rtfimport/data/fdo60722.rtf
new file mode 100644
index 000..498df01
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo60722.rtf
@@ -0,0 +1,13 @@
+{\rtf1\ansi\deff0
+{\fonttbl
+{\f0\fnil\fcharset204\fprq0\cpg1251 Arial;}
+{\f1\fnil\fcharset204\fprq0\cpg1251 Times New Roman;}
+{\f2\fnil\fcharset204\fprq0\cpg1251 Courier New;}
+}
+{\*\viewkind1}{\*\viewscale100}\margl0\margr0\margt0\margb0
+\paperw11905\paperh16837
+{\shp{\*\shpinst\shpleft10480\shptop840\shpright11320\shpbottom840\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 20
+{\shp{\*\shpinst\shpleft8900\shptop11940\shpright10360\shpbottom12320\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn wzDescription}{\sv 
smaller
+{\shp{\*\shpinst\shpleft7920\shptop11040\shpright11320\shpbottom13440\shpfhdr0\shpbxpage\shpbypage\shpwr3\shpwrk0\shpfblwtxt1\shpz0{\sp{\sn
 shapeType}{\sv 1}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn wzDescription}{\sv 
larger
+{\par\plain\par
+}}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b55aad9..3d3cbe6 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -140,6 +140,7 @@ public:
 void testFdo58646line();
 void testFdo59953();
 void testFdo59638();
+void testFdo60722();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -230,6 +231,7 @@ void Test::run()
 {fdo58646line.rtf, Test::testFdo58646line},
 {fdo59953.rtf, Test::testFdo59953},
 {fdo59638.rtf, Test::testFdo59638},
+{fdo60722.rtf, Test::testFdo60722},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1110,6 +1112,25 @@ void Test::testFdo59638()
 CPPUNIT_FAIL(no BulletChar property);
 }
 
+void Test::testFdo60722()
+{
+// The problem was that the larger shape was over the smaller one, and not 
the other way around.
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xShape(xDraws-getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(xShape, 
ZOrder));
+CPPUNIT_ASSERT_EQUAL(OUString(larger), getPropertyOUString(xShape, 
Description));
+
+xShape.set(xDraws-getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getPropertysal_Int32(xShape, 
ZOrder));
+CPPUNIT_ASSERT_EQUAL(OUString(smaller), getPropertyOUString(xShape, 
Description));
+
+// Color of the line was blue, and it had zero width.
+xShape.set(xDraws-getByIndex(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(26), getPropertysal_uInt32(xShape, 
LineWidth));
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(0), getPropertysal_uInt32(xShape, 
LineColor));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx 
b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 4d190e5..4564f3a 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -251,7 +251,8 @@ sal_Int32 GraphicZOrderHelper::findZOrder( sal_Int32 
relativeHeight )
 while( it != items.end())
 {
 // std::map is iterated sorted by key
-if( it-first  relativeHeight )
+// if there is an item that has the same z-order, we belong under it
+if( it-first = relativeHeight )
 break; // this is the first one higher, we belong right before it
 else
 ++it;
diff --git 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/qa sw/source

[Miklos Vajna]

 sw/qa/extras/odfimport/data/fdo56272.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx |   11 +++
 sw/source/core/layout/anchoreddrawobject.cxx |7 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 104947d1825b99503d5df59dfd85ad6e603e1407
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Mar 4 17:18:22 2013 +0100

fdo#56272 SwAnchoredDrawObject::_SetPositioningAttr: fix position

This reverts a part of 51cfbf0cfaec395a99a00f2c20fcba96de9a4427, that is
no longer needed, but causes incorrect drawing objects position.

The problem was that a non-zero position doesn't mean the layout in a
later iteration doesn't change the position, but the referred commit
didn't allow later iterations to fine-tune the position.

(cherry picked from commit 4ae71885ec61f87c46285150ef4ca84192627b7a)

Conflicts:
sw/qa/extras/odfimport/odfimport.cxx

Change-Id: Id91a4c6952d1b58e0c5bc0b1a60991a284c29ddc
Reviewed-on: https://gerrit.libreoffice.org/2547
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/qa/extras/odfimport/data/fdo56272.odt 
b/sw/qa/extras/odfimport/data/fdo56272.odt
new file mode 100644
index 000..57241d3
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo56272.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 05584bf..8d86bd5 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -39,6 +39,7 @@ public:
 void testEmptySvgFamilyName();
 void testHideAllSections();
 void testOdtBorders();
+void testFdo56272();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -56,6 +57,7 @@ void Test::run()
 {empty-svg-family-name.odt, Test::testEmptySvgFamilyName},
 {fdo53210.odt, Test::testHideAllSections},
 {borders_ooo33.odt, Test::testOdtBorders},
+{fdo56272.odt, Test::testFdo56272},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -270,6 +272,15 @@ void Test::testOdtBorders()
 } while(xParaEnum-hasMoreElements());
 }
 
+void Test::testFdo56272()
+{
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencedrawing::XShape xShape(xDraws-getByIndex(0), 
uno::UNO_QUERY);
+// Vertical position was incorrect.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape-getPosition().Y); // Was -2371
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index b2c9460..c8843ca 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -812,15 +812,12 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
 // -- #i71182#
 // only change position - do not lose other attributes
 SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
-// If the object is already positioned, leave it alone.
-if (!aHori.GetPos())
-aHori.SetPos( nHoriPos );
+aHori.SetPos( nHoriPos );
 GetFrmFmt().SetFmtAttr( aHori );
 
 SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() );
 
-if (!aVert.GetPos())
-aVert.SetPos( nVertPos );
+aVert.SetPos( nVertPos );
 GetFrmFmt().SetFmtAttr( aVert );
 
 // -- #i36010# - set layout direction of the position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source

[Eike Rathke]

 sc/source/ui/app/inputhdl.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 726767fe5fe006ad5b5f656981ab077088b2db84
Author: Eike Rathke er...@redhat.com
Date:   Mon Mar 4 19:32:42 2013 +0100

resolved rhbz#916936 allow also input line for read-only

Allow activation of input line and cell activation in read-only
documents regardless whether it's part of an array or not.

Change-Id: Id2dc9de9e60b58f4b471fb232e899c9ea75e83f1
(cherry picked from commit 9c5164654184631b00dc6ad2e30cb1c07950)
Reviewed-on: https://gerrit.libreoffice.org/2548
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 727799a..3ec6bcf 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1962,10 +1962,12 @@ bool ScInputHandler::StartTable( sal_Unicode cTyped, 
bool bFromCommand, bool bIn
 if (!aTester.IsEditable())
 {
 bProtected = true;
-// We allow read-only input mode activation when explicit cell
-// activation is requested (double-click or F2) and if it's not
-// part of an array.
-bool bShowError = !bInputActivated || aTester.GetMessageId() != 
STR_PROTECTIONERR;
+// We allow read-only input mode activation regardless
+// whether it's part of an array or not or whether explicit cell
+// activation is requested (double-click or F2) or a click in input
+// line.
+bool bShowError = (!bInputActivated || aTester.GetMessageId() != 
STR_PROTECTIONERR) 
+!pActiveViewSh-GetViewData()-GetDocShell()-IsReadOnly();
 if (bShowError)
 {
 eMode = SC_INPUT_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - crashrep/source desktop/util desktop/win32 desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/

[Andras Timar]

 crashrep/source/win32/rcheader.txt   |   15 ---
 desktop/WinResTarget_sbase.mk|1 +
 desktop/WinResTarget_scalc.mk|1 +
 desktop/WinResTarget_sdraw.mk|1 +
 desktop/WinResTarget_simpress.mk |1 +
 desktop/WinResTarget_smath.mk|1 +
 desktop/WinResTarget_soffice.mk  |1 +
 desktop/WinResTarget_sofficebin.mk   |1 +
 desktop/WinResTarget_sweb.mk |1 +
 desktop/WinResTarget_swriter.mk  |1 +
 desktop/util/officeloader.rc |2 +-
 desktop/win32/source/applauncher/launcher.rc |2 +-
 scp2/source/base/file_base.scp   |5 -
 scp2/source/calc/file_calc.scp   |5 -
 scp2/source/crashrep/file_crashrep.scp   |5 -
 scp2/source/draw/file_draw.scp   |5 -
 scp2/source/impress/file_impress.scp |5 -
 scp2/source/math/file_math.scp   |5 -
 scp2/source/ooo/common_brand.scp |8 
 scp2/source/writer/file_writer.scp   |8 +---
 20 files changed, 20 insertions(+), 54 deletions(-)

New commits:
commit f43decde34577c8340a1abdcdad9a12e8b043068
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 28 13:17:39 2013 +0100

bin PATCH_SO_NAME crack

In VersionInfo of Windows executables the FileDescription property 
originally contained
80 times 'x' character. These executables were marked as PATCH_SO_NAME and 
later the
installer maker perl program replaced the xxx to the actual file 
description
which was defined in scp2. WHy was it good, I have no idea. The problem was 
that it
happened after postprocess, where we signed the binaries, thus diigital 
signature became
corrupted. It is better to give file descriptions via makefiles.

Conflicts:

crashrep/WinResTarget_crashrep.mk

Oh, well, crashrep is a dmake module in 4.0. But it is not built, so patch 
has no
effect in practice.

Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89
Reviewed-on: https://gerrit.libreoffice.org/2463
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/crashrep/source/win32/rcheader.txt 
b/crashrep/source/win32/rcheader.txt
index be3c060..bace84b 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -58,13 +58,14 @@ VS_VERSION_INFO versioninfo
block 040904E4
{
// International StringTable
-   value CompanyName,The Document 
Foundation\0
-   value FileDescription,
\0
-   value FileVersion,PPS(VER_LEVEL) 
\0
-   value ProductVersion, PPS(VER_LEVEL) 
\0
-   value OriginalFilename,   SOREPORT.EXE\0
-   value InternalName,   CrashReport\0
-   value LegalCopyright, S_CRIGHT  
LibreOffice contributors and/or their affiliates. All rights reserved.\0
+VALUE CompanyName,  PPS(RES_APP_VENDOR) \0
+VALUE FileDescription,  PPS(RES_APP_FILEDESC) \0
+VALUE FileVersion,  PPS(VER_LEVEL) \0
+VALUE ProductVersion,   PPS(VER_LEVEL) \0
+VALUE ProductName,  LibreOffice\0
+VALUE OriginalFilename, PPS(RES_APP_NAME) .exe\0
+VALUE InternalName, PPS(RES_APP_NAME) \0
+VALUE LegalCopyright,   S_CRIGHT  LibreOffice contributors 
and/or their affiliates. All rights reserved.\0
}
}
 
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 008e436..f4f49d4 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,sbase/src,\
 -DRES_APP_NAME=sbase \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Base \
 -DRES_APP_ICON=icons/base_app.ico \
 -DVERVARIANT=$(BUILD) \
 -DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 89a2d2d..8781d0d 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,scalc/src,\
 
 $(eval $(call gb_WinResTarget_add_defs,scalc/src,\
 -DRES_APP_NAME=scalc \
+-DRES_APP_FILEDESC=$(PRODUCTNAME) Calc \
 -DRES_APP_ICON=icons/calc_app.ico \
 -DVERVARIANT=$(BUILD) \
 -DRES_APP_VENDOR=$(OOO_VENDOR) \
diff --git 

[PUSHED libreoffice-4-0] fdo#59638 import of DOCX w:lvlOverride / RTF_LFOLEVEL

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2503

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2503
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1491f07c40953949e381a035c1596c207cdc4c35
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com

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

[PUSHED libreoffice-4-0] fdo#60722 RTF filter: shape import fixes

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2569

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2569
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6097c844b2bc929c6ece31bcec62f27bfbf386c
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] fdo#56272 SwAnchoredDrawObject::_SetPositioningAttr: fix pos...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2547

Approvals:
  Muthu Subramanian K: Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2547
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id91a4c6952d1b58e0c5bc0b1a60991a284c29ddc
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com

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

[PUSHED libreoffice-3-6] resolved rhbz#916936 allow also input line for read-only

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2548

Approvals:
  Muthu Subramanian K: Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2548
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id2dc9de9e60b58f4b471fb232e899c9ea75e83f1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com

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

[PUSHED libreoffice-4-0] bin PATCH_SO_NAME crack

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2463

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2463
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Niko Rönkkö ron...@iki.fi

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

[ABANDONED libreoffice-4-0-1] Resolves: fdo#61656 use order and orientation combobox selec...

[Fridrich Strba (via Code Review)]

Fridrich Strba has abandoned this change.

Change subject: Resolves: fdo#61656 use order and orientation combobox select 
pos as index
..


Patch Set 1: Abandoned

branch closed

-- 
To view, visit https://gerrit.libreoffice.org/2495
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I0c73786bca00684cedc4672d0ad5e61d0c1f9bd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-1
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com

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

Re: Fwd: LibreOffice text justification

[Miklos Vajna]

Hi Chris,

On Wed, Mar 06, 2013 at 11:07:27AM -0500, Kohei Yoshida 
kohei.yosh...@gmail.com wrote:
 I manage a wiki which is being used to produce the text for a book
 that is due to be published shortly. We can currently produce an ODT
 document that is about 95% print-ready, but there are a few
 typesetting features missing from LibreOffice which mean we will have
 to use something like InDesign to complete our work flow.
 
 One of these features relates to the justification of text. Word
 processors like Writer tend to produce lines with uneven line-to-line
 inter-word spacing as they do not generally consider reducing the
 spaces and/or micro-spacing the characters themselves. I thought it
 would be worth looking at the code-base of LibreOffice to see if it
 would be possible to add this functionality. This search lead me to
 your blog page at
 http://kohei.us/2010/01/21/distributed-text-justification/.
 
 It seems as if the code you modified when adding the 'Distributed
 Justification' mode would be very similar to what I think is needed.
 Could you please point me to the files / classes that were involved?
 
 Any pointers would be much appreciated! Thank you for your time.

Paragraphs in Writer are adjusted to left/right/center/etc, the
SvxAdjustItem class stores this info in the document model. However, I
think Writer already supports what you want.

Have you tried Format - Paragraph - Alignment - Justified, then
setting Last line to Justified as well?

HTH,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sal/inc

[Chr . Rossmanith]

 sal/inc/rtl/ustrbuf.hxx |   40 
 1 file changed, 40 insertions(+)

New commits:
commit 98645ae6d4bc7b85730a0a9f00bd2de86dd09be9
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Wed Mar 6 22:19:30 2013 +0100

add copy() to OUStringBuffer

Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
Reviewed-on: https://gerrit.libreoffice.org/2125
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Tested-by: Muthu Subramanian K muthus...@gmail.com

diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index a7d5748..8a50946 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -1309,6 +1309,40 @@ public:
 {
 return stripStart(c) + stripEnd(c);
 }
+/**
+  Returns a new string buffer that is a substring of this string.
+
+  The substring begins at the specified beginIndex. If
+  beginIndex is negative or be greater than the length of
+  this string, behaviour is undefined.
+
+  @param beginIndex   the beginning index, inclusive.
+  @returnthe specified substring.
+  @since LibreOffice 4.1
+*/
+OUStringBuffer copy( sal_Int32 beginIndex ) const SAL_THROW(())
+{
+return copy( beginIndex, getLength() - beginIndex );
+}
+/**
+  Returns a new string buffer that is a substring of this string.
+
+  The substring begins at the specified beginIndex and contains count
+  characters.  If either beginIndex or count are negative,
+  or beginIndex + count are greater than the length of this string
+  then behaviour is undefined.
+
+  @param beginIndex   the beginning index, inclusive.
+  @param countthe number of characters.
+  @returnthe specified substring.
+  @since LibreOffice 4.1
+*/
+OUStringBuffer copy( sal_Int32 beginIndex, sal_Int32 count ) const 
SAL_THROW(())
+{
+rtl_uString *pNew = 0;
+rtl_uStringbuffer_newFromStr_WithLength( pNew, getStr() + beginIndex, 
count );
+return OUStringBuffer( pNew, count + 16 );
+}
 
 #ifdef LIBO_INTERNAL_ONLY
 // This is to complement the RTL_FAST_STRING operator+, which allows any 
combination of valid operands,
@@ -1326,6 +1360,12 @@ public:
 #endif
 
 private:
+OUStringBuffer( rtl_uString * value, const sal_Int32 capacity )
+{
+pData = value;
+nCapacity = capacity;
+}
+
 /**
 A pointer to the data structur which contains the data.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add copy() to OUStringBuffer

[Muthu Subramanian K (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2125

Approvals:
  Muthu Subramanian K: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2125
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibac7f624f1a1dcce653dff4bec573be457d70075
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com

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

[PATCH] fdo#61726: rename report-builder package org.libreoffice.ext...

[David Ostrovsky (via Code Review)]

Hello Stephan Bergmann,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/2578

to look at the new patch set (#2).

Change subject: fdo#61726: rename report-builder package 
org.libreoffice.ext.report
..

fdo#61726: rename report-builder package org.libreoffice.ext.report

To prevent future collisions with uno's own territory rename the
com.sun.star.report package to org.libreoffice.ext.report.

Bump version to 1.2.4 and preserv the identifier still to
com.sun.reportdesigner to not to confuse the extension sync manager.

Change-Id: Ia06cb7ad8c1528c1d5b5eeb70f1e4b2aa854b70f
---
M Repository.mk
M connectivity/source/commontools/dbtools2.cxx
M dbaccess/source/ui/app/AppController.cxx
M reportbuilder/Configuration_reportbuilder.mk
M reportbuilder/Extension_reportbuilder.mk
M reportbuilder/Jar_reportbuilder.mk
D reportbuilder/java/com/sun/star/report/pentaho/configuration.properties
D reportbuilder/java/com/sun/star/report/pentaho/parser/selectors.properties
M reportbuilder/java/jfreereport.properties
M reportbuilder/java/libformula.properties
M reportbuilder/java/loader.properties
R reportbuilder/java/org/libreoffice/ext/report/DataRow.java
R reportbuilder/java/org/libreoffice/ext/report/DataSource.java
R reportbuilder/java/org/libreoffice/ext/report/DataSourceException.java
R reportbuilder/java/org/libreoffice/ext/report/DataSourceFactory.java
R reportbuilder/java/org/libreoffice/ext/report/ImageService.java
R reportbuilder/java/org/libreoffice/ext/report/InputRepository.java
R reportbuilder/java/org/libreoffice/ext/report/JobDefinitionException.java
R reportbuilder/java/org/libreoffice/ext/report/JobProgressIndicator.java
R reportbuilder/java/org/libreoffice/ext/report/JobProperties.java
R reportbuilder/java/org/libreoffice/ext/report/OfficeToken.java
R reportbuilder/java/org/libreoffice/ext/report/OutputRepository.java
R reportbuilder/java/org/libreoffice/ext/report/ParameterMap.java
R reportbuilder/java/org/libreoffice/ext/report/ReportAddIn.java
R reportbuilder/java/org/libreoffice/ext/report/ReportEngineMetaData.java
R reportbuilder/java/org/libreoffice/ext/report/ReportEngineParameterNames.java
R reportbuilder/java/org/libreoffice/ext/report/ReportExecutionException.java
R reportbuilder/java/org/libreoffice/ext/report/ReportExpression.java
R reportbuilder/java/org/libreoffice/ext/report/ReportExpressionMetaData.java
R reportbuilder/java/org/libreoffice/ext/report/ReportFunction.java
R reportbuilder/java/org/libreoffice/ext/report/ReportJob.java
R reportbuilder/java/org/libreoffice/ext/report/ReportJobDefinition.java
R reportbuilder/java/org/libreoffice/ext/report/ReportJobFactory.java
R reportbuilder/java/org/libreoffice/ext/report/SDBCReportData.java
R reportbuilder/java/org/libreoffice/ext/report/SDBCReportDataFactory.java
R reportbuilder/java/org/libreoffice/ext/report/SOImageService.java
R reportbuilder/java/org/libreoffice/ext/report/StorageRepository.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Author-Function.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Author-Function_en_US.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/AuthorFunction.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/AuthorFunctionDescription.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/MetaDataFunctionCategory.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Title-Function.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/Title-Function_en_US.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/TitleFunction.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/TitleFunctionDescription.java
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/category.properties
R 
reportbuilder/java/org/libreoffice/ext/report/function/metadata/category_en_US.properties
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/DefaultNameGenerator.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/Manifest.mf
R reportbuilder/java/org/libreoffice/ext/report/pentaho/OfficeNamespaces.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoFormulaContext.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportAddIn.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportEngine.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportEngineMetaData.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/PentahoReportJob.java
R 
reportbuilder/java/org/libreoffice/ext/report/pentaho/SOFormulaOpCodeMapper.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/SOFormulaParser.java
R reportbuilder/java/org/libreoffice/ext/report/pentaho/SOFunctionManager.java
R 

[PATCH] group undo action when hiding sheets

[Laurent Godard (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2579

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/2579/1

group undo action when hiding sheets

- the test if there are enough tabs before hiding is now in HideTabs
- a vector is passed to Undo
- modification of the displayed text
- minor optimization on looping over sheets (exit when condition is fullfilled)

Change-Id: I86196c6bb0f5fd6ba5b44c69efadc16b119a7f11
---
M sc/inc/globstr.hrc
M sc/source/ui/docshell/docfunc.cxx
M sc/source/ui/inc/undotab.hxx
M sc/source/ui/inc/viewfunc.hxx
M sc/source/ui/src/globstr.src
M sc/source/ui/undo/undotab.cxx
M sc/source/ui/view/tabvwshf.cxx
M sc/source/ui/view/viewfun2.cxx
8 files changed, 68 insertions(+), 62 deletions(-)



diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 66da261..772b56a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -381,7 +381,7 @@
 #define STR_MATRIXFRAGMENTERR   310
 
 #define STR_UNDO_SHOWTAB311
-#define STR_UNDO_HIDETAB312
+#define STR_UNDO_HIDETABS   312
 #define STR_UNDO_INSERTAREALINK 313
 
 #define STR_REIMPORT_AFTER_LOAD 314
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 7173a89..28c7af4 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3079,7 +3079,7 @@
 
 sal_uInt16 nVisCount = 0;
 SCTAB nCount = pDoc-GetTableCount();
-for (SCTAB i=0; inCount; i++)
+for (SCTAB i=0; inCount  nVisCount2; i++)
 if (pDoc-IsVisible(i))
 ++nVisCount;
 
@@ -3093,7 +3093,11 @@
 
 pDoc-SetVisible( nTab, bVisible );
 if (bUndo)
-rDocShell.GetUndoManager()-AddUndoAction( new ScUndoShowHideTab( 
rDocShell, nTab, bVisible ) );
+{
+std::vectorSCTAB undoTabs;
+undoTabs.push_back(nTab);
+rDocShell.GetUndoManager()-AddUndoAction( new ScUndoShowHideTab( 
rDocShell, undoTabs, bVisible ) );
+}
 
 //  Views updaten:
 if (!bVisible)
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 5b7d8e6..764a320 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -333,7 +333,8 @@
 TYPEINFO();
 ScUndoShowHideTab(
 ScDocShell* pShell,
-SCTAB nNewTab, sal_Bool bNewShow );
+std::vectorSCTAB newUndoTabs,
+sal_Bool bNewShow );
 virtual ~ScUndoShowHideTab();
 
 virtual voidUndo();
@@ -344,8 +345,8 @@
 virtual rtl::OUString GetComment() const;
 
 private:
-SCTAB   nTab;
-sal_BoolbShow;
+std::vectorSCTAB  undoTabs;
+sal_BoolbShow;
 
 void DoChange( sal_Bool bShow ) const;
 };
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 748a386..dce6830 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -274,7 +274,7 @@
 const String rSource, sal_uLong 
nRefresh );
 
 voidShowTable( const String rName );
-voidHideTable( SCTAB nTabNr );
+voidHideTable( const ScMarkData rMark );
 
 voidMakeScenario( const String rName, const String rComment,
 const Color rColor, sal_uInt16 nFlags );
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 7305950..c0019d3 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1140,9 +1140,9 @@
 {
 Text [ en-US ] = Show Sheet ;
 };
-String STR_UNDO_HIDETAB
+String STR_UNDO_HIDETABS
 {
-Text [ en-US ] = Hide sheet ;
+Text [ en-US ] = Hide sheets ;
 };
 String STR_UNDO_TAB_RTL
 {
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 9732e21..9ac8070 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1117,9 +1117,9 @@
 return false;
 }
 
-ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, SCTAB nNewTab, 
sal_Bool bNewShow ) :
+ScUndoShowHideTab::ScUndoShowHideTab( ScDocShell* pShell, std::vectorSCTAB 
newUndoTabs, sal_Bool bNewShow ) :
 ScSimpleUndo( pShell ),
-nTab( nNewTab ),
+undoTabs( newUndoTabs ),
 bShow( bNewShow )
 {
 }
@@ -1131,11 +1131,17 @@
 void ScUndoShowHideTab::DoChange( sal_Bool bShowP ) const
 {
 ScDocument* pDoc = pDocShell-GetDocument();
-pDoc-SetVisible( nTab, bShowP );
-
 ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
-if (pViewShell)
-pViewShell-SetTabNo(nTab,sal_True);
+
+SCTAB nTab;
+
+for (size_t i = 0; i  undoTabs.size(); ++i)
+{
+nTab = undoTabs[i];
+pDoc-SetVisible( nTab, bShowP );
+if (pViewShell)
+

[Libreoffice-commits] core.git: cui/source framework/inc framework/source officecfg/registry sfx2/inc sfx2/source shell/source unotools/inc unotools/source

[Krisztian Pinter]

 cui/source/options/optsave.cxx   |   31 +-
 cui/source/options/optsave.hrc   |1 
 cui/source/options/optsave.hxx   |1 
 cui/source/options/optsave.src   |   35 --
 framework/inc/services/autorecovery.hxx  |3 
 framework/source/services/autorecovery.cxx   |   20 +++
 officecfg/registry/data/org/openoffice/Office/Recovery.xcu   |4 
 officecfg/registry/schema/org/openoffice/Office/Recovery.xcs |6 +
 sfx2/inc/sfx2/sfxsids.hrc|1 
 sfx2/source/appl/appcfg.cxx  |   15 ++
 shell/source/backends/gconfbe/gconfaccess.cxx|   21 
 shell/source/backends/gconfbe/gconfaccess.hxx|1 
 unotools/inc/unotools/saveopt.hxx|6 -
 unotools/source/config/saveopt.cxx   |   56 ++-
 14 files changed, 181 insertions(+), 20 deletions(-)

New commits:
commit 895898596c72fd14db2abec3aeaab74d583769e5
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Tue Feb 26 16:43:48 2013 +0100

WIP: fdo#47011 autosave feature

Change-Id: Ib2cbcc33e6188c60c183b5f47e9ae9c9d4c91b95

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index d977cac..efced8d 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -55,8 +55,9 @@ using namespace comphelper;
 
 #define CFG_PAGE_AND_GROUP  OUString(General), OUString(LoadSave)
 // !! you have to update these index, if you changed the list of the child 
windows !!
-#define WININDEX_AUTOSAVE   ((sal_uInt16)6)
-#define WININDEX_SAVEURL_RELFSYS((sal_uInt16)9)
+#define WININDEX_AUTOSAVE   ((sal_uInt16) 6)
+#define WININDEX_USERAUTOSAVE   ((sal_uInt16) 9)
+#define WININDEX_SAVEURL_RELFSYS((sal_uInt16)10)
 
 // --
 
@@ -100,6 +101,7 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const 
SfxItemSet rCoreSet ) :
 aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ),
 aAutoSaveEdit   ( this, CUI_RES( ED_AUTOSAVE ) ),
 aMinuteFT   ( this, CUI_RES( FT_MINUTE ) ),
+aUserAutoSaveCB ( this, CUI_RES( BTN_USERAUTOSAVE ) ),
 aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
 aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ),
 
@@ -239,12 +241,23 @@ void SfxSaveTabPage::DetectHiddenControls()
 aAutoSaveEdit.Hide();
 aMinuteFT.Hide();
 // the other controls have to move upwards the height of checkbox + 
space
-nDelta += aRelativeFsysCB.GetPosPixel().Y() - 
aAutoSaveCB.GetPosPixel().Y();
+nDelta += aUserAutoSaveCB.GetPosPixel().Y() - 
aAutoSaveCB.GetPosPixel().Y();
 }
 else if ( nDelta  0 )
 // the AutoSave controls have to move upwards too
 nWinIndex = WININDEX_AUTOSAVE;
 
+if ( aOptionsDlgOpt.IsOptionHidden( UserAutoSave, CFG_PAGE_AND_GROUP ) )
+{
+// hide controls of UserAutoSave
+aUserAutoSaveCB.Hide();
+// the other controls have to move upwards the height of checkbox + 
space
+nDelta += aRelativeFsysCB.GetPosPixel().Y() - 
aUserAutoSaveCB.GetPosPixel().Y();
+}
+else if ( nDelta  0 )
+// the UserAutoSave controls have to move upwards too
+nWinIndex = WININDEX_USERAUTOSAVE;
+
 if ( nDelta  0 )
 {
 sal_uInt16 i, nChildCount = GetChildCount();
@@ -315,6 +328,13 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet rSet )
  (sal_uInt16)aAutoSaveEdit.GetValue() ) );
 bModified |= sal_True;
 }
+
+if ( aUserAutoSaveCB.IsChecked() != aUserAutoSaveCB.GetSavedValue() )
+{
+rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
+   aUserAutoSaveCB.IsChecked() ) );
+bModified |= sal_True;
+}
 // save relatively
 if ( aRelativeFsysCB.IsChecked() != aRelativeFsysCB.GetSavedValue() )
 {
@@ -489,6 +509,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet )
 aBackupFI.Show(bBackupRO);
 
 aAutoSaveCB.Check(aSaveOpt.IsAutoSave());
+aUserAutoSaveCB.Check(aSaveOpt.IsUserAutoSave());
 aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat());
 
aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
 
@@ -515,6 +536,8 @@ void SfxSaveTabPage::Reset( const SfxItemSet )
 aAutoSaveCB.SaveValue();
 aAutoSaveEdit.SaveValue();
 
+aUserAutoSaveCB.SaveValue();
+
 aRelativeFsysCB.SaveValue();
 aRelativeInetCB.SaveValue();
 aODFVersionLB.SaveValue();
@@ -530,11 +553,13 @@ IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, 
pBox )
 {
 aAutoSaveEdit.Enable();
 aMinuteFT.Enable();
+aUserAutoSaveCB.Enable();
   

[PUSHED] WIP: fdo#47011 autosave feature

[Jan Holesovsky (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2506


-- 
To view, visit https://gerrit.libreoffice.org/2506
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2cbcc33e6188c60c183b5f47e9ae9c9d4c91b95
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com
Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz

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

[PATCH libreoffice-4-0] Backport of EMF+ changes from master

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2580

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/2580/1

Backport of EMF+ changes from master

Change-Id: I28553fca4db9fbe14d9fb64f57c8a9bf6e53b7fe
---
M cppcanvas/inc/cppcanvas/canvasgraphic.hxx
M cppcanvas/source/inc/canvasgraphichelper.hxx
M cppcanvas/source/inc/implrenderer.hxx
M cppcanvas/source/mtfrenderer/emfplus.cxx
M cppcanvas/source/mtfrenderer/mtftools.cxx
M cppcanvas/source/mtfrenderer/pointaction.cxx
M cppcanvas/source/mtfrenderer/polypolyaction.cxx
M cppcanvas/source/mtfrenderer/textaction.hxx
M cppcanvas/source/tools/canvasgraphichelper.cxx
9 files changed, 19 insertions(+), 38 deletions(-)



diff --git a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx 
b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
index d423023..e496df6 100644
--- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
+++ b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
@@ -131,13 +131,6 @@
  */
 virtual ::basegfx::B2DPolyPolygon const* getClip() const = 0;
 
-/** Set object color
- */
-virtual void setRGBAColor( Color::IntSRGBA 
) = 0;
-/** Get object color
- */
-virtual Color::IntSRGBA  getRGBAColor() const = 0;
-
 /** Set object composite mode
  */
 virtual void setCompositeOp( CompositeOp 
aOp ) = 0;
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx 
b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 125b1c2..f0ab8bc 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -52,8 +52,6 @@
 virtual void setClip( const 
::basegfx::B2DPolyPolygon rClipPoly );
 virtual void setClip();
 virtual ::basegfx::B2DPolyPolygon const* getClip() const;
-virtual void setRGBAColor( 
Color::IntSRGBA );
-virtual Color::IntSRGBA  getRGBAColor() const;
 virtual void setCompositeOp( 
CompositeOp aOp );
 virtual CompositeOp  getCompositeOp() const;
 
diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index 7f34ad8..7d82ea7 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -259,7 +259,7 @@
ActionVector::const_iterator o_rRangeBegin,
ActionVector::const_iterator o_rRangeEnd ) 
const;
 
-void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_Bool bUseWholeStream = sal_False);
+void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream = sal_False);
 
 /* EMF+ */
 void processEMFPlus( MetaCommentAction* pAct, const 
ActionFactoryParameters rFactoryParms, OutDevState rState, const 
CanvasSharedPtr rCanvas );
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0c9db41..4c79953 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -714,7 +714,7 @@
 Graphic graphic;
 
 
-void Read (SvMemoryStream s, sal_Bool bUseWholeStream)
+void Read (SvMemoryStream s, sal_uInt32 dataSize, sal_Bool 
bUseWholeStream)
 {
 sal_uInt32 header, unknown;
 
@@ -736,11 +736,11 @@
 sal_Int32 mfType, mfSize;
 
 s  mfType  mfSize;
-EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: 
%d\n, mfType, mfSize));
+EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: %d 
real size calculated from record dataSize: %d\n, mfType, mfSize, dataSize - 
16));
 
 GraphicFilter filter;
 // workaround buggy metafiles, which have wrong mfSize set 
(n#705956 for example)
-SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), 
bUseWholeStream ? s.remainingSize() : mfSize, STREAM_READ);
+SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), 
bUseWholeStream ? s.remainingSize() : dataSize - 16, STREAM_READ);
 
 filter.ImportGraphic (graphic, String (), mfStream);
 
@@ -1090,7 +1090,7 @@
 }
 }
 
-void ImplRenderer::processObjectRecord(SvMemoryStream rObjectStream, 
sal_uInt16 flags, sal_Bool bUseWholeStream)
+void ImplRenderer::processObjectRecord(SvMemoryStream rObjectStream, 
sal_uInt16 flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream)
 {
 sal_uInt32 index;
 
@@ -1145,7 +1145,7 @@
 {
 EMFPImage *image;
 

[ABANDONED libreoffice-4-0] Backport of EMF+ changes from master

[Fridrich Strba (via Code Review)]

Fridrich Strba has abandoned this change.

Change subject: Backport of EMF+ changes from master
..


Patch Set 1: Abandoned

Have a smaller patch that I will upload soon

-- 
To view, visit https://gerrit.libreoffice.org/2580
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I28553fca4db9fbe14d9fb64f57c8a9bf6e53b7fe
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org

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

[PATCH libreoffice-4-0] Backport of EMF+ changes from master

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2581

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/2581/1

Backport of EMF+ changes from master

Change-Id: Ibfc5d700a81e661b663dfd3eb1f83e488fd1112f
---
M cppcanvas/source/inc/implrenderer.hxx
M cppcanvas/source/mtfrenderer/emfplus.cxx
M cppcanvas/source/mtfrenderer/mtftools.cxx
M cppcanvas/source/mtfrenderer/pointaction.cxx
M cppcanvas/source/mtfrenderer/polypolyaction.cxx
M cppcanvas/source/mtfrenderer/textaction.hxx
6 files changed, 19 insertions(+), 17 deletions(-)



diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index 7f34ad8..7d82ea7 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -259,7 +259,7 @@
ActionVector::const_iterator o_rRangeBegin,
ActionVector::const_iterator o_rRangeEnd ) 
const;
 
-void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_Bool bUseWholeStream = sal_False);
+void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream = sal_False);
 
 /* EMF+ */
 void processEMFPlus( MetaCommentAction* pAct, const 
ActionFactoryParameters rFactoryParms, OutDevState rState, const 
CanvasSharedPtr rCanvas );
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0c9db41..4c79953 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -714,7 +714,7 @@
 Graphic graphic;
 
 
-void Read (SvMemoryStream s, sal_Bool bUseWholeStream)
+void Read (SvMemoryStream s, sal_uInt32 dataSize, sal_Bool 
bUseWholeStream)
 {
 sal_uInt32 header, unknown;
 
@@ -736,11 +736,11 @@
 sal_Int32 mfType, mfSize;
 
 s  mfType  mfSize;
-EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: 
%d\n, mfType, mfSize));
+EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: %d 
real size calculated from record dataSize: %d\n, mfType, mfSize, dataSize - 
16));
 
 GraphicFilter filter;
 // workaround buggy metafiles, which have wrong mfSize set 
(n#705956 for example)
-SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), 
bUseWholeStream ? s.remainingSize() : mfSize, STREAM_READ);
+SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), 
bUseWholeStream ? s.remainingSize() : dataSize - 16, STREAM_READ);
 
 filter.ImportGraphic (graphic, String (), mfStream);
 
@@ -1090,7 +1090,7 @@
 }
 }
 
-void ImplRenderer::processObjectRecord(SvMemoryStream rObjectStream, 
sal_uInt16 flags, sal_Bool bUseWholeStream)
+void ImplRenderer::processObjectRecord(SvMemoryStream rObjectStream, 
sal_uInt16 flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream)
 {
 sal_uInt32 index;
 
@@ -1145,7 +1145,7 @@
 {
 EMFPImage *image;
 aObjects [index] = image = new EMFPImage ();
-image-Read (rObjectStream, bUseWholeStream);
+image-Read (rObjectStream, dataSize, bUseWholeStream);
 
 break;
 }
@@ -1211,12 +1211,13 @@
 if (mbMultipart) {
 EMFP_DEBUG (printf (EMF+ multipart record flags: 
%04hx\n, mMFlags));
 mMStream.Seek (0);
-processObjectRecord (mMStream, mMFlags, sal_True);
+processObjectRecord (mMStream, mMFlags, dataSize, 
sal_True);
 }
 mbMultipart = false;
 }
 
 if (type != EmfPlusRecordTypeObject || !(flags  0x8000))
+{
 switch (type) {
 case EmfPlusRecordTypeHeader:
 sal_uInt32 header, version;
@@ -1235,7 +1236,7 @@
 EMFP_DEBUG (printf (EMF+\talready used in svtools wmf/emf 
filter parser\n));
 break;
 case EmfPlusRecordTypeObject:
-processObjectRecord (rMF, flags);
+processObjectRecord (rMF, flags, dataSize);
 break;
 case EmfPlusRecordTypeFillPie:
 {
@@ -1476,6 +1477,9 @@
 ReadPoint (rMF, x2, y2, flags);
 ReadPoint (rMF, x3, y3, flags);
 
+EMFP_DEBUG (printf (EMF+ destination 
points: %f,%f %f,%f %f,%f\n, x1, y1, x2, y2, x3, y3));
+EMFP_DEBUG (printf 

[Libreoffice-commits] core.git: 3 commits - sc/CppunitTest_sc_macros_test.mk sc/Module_sc.mk sc/qa

[Noel Power]

 sc/CppunitTest_sc_macros_test.mk   |3 
 sc/Module_sc.mk|   17 
 sc/qa/extras/macros-test.cxx   |   81 -
 sc/qa/extras/testdocuments/AutoFilter.xls  |binary
 sc/qa/extras/testdocuments/CalcFont.xls|binary
 sc/qa/extras/testdocuments/MiscRangeTests.xls  |binary
 sc/qa/extras/testdocuments/PageBreaks.xls  |binary
 sc/qa/extras/testdocuments/Ranges-2.xls|binary
 sc/qa/extras/testdocuments/Ranges-3.xls|binary
 sc/qa/extras/testdocuments/Ranges.xls  |binary
 sc/qa/extras/testdocuments/Shapes.xls  |binary
 sc/qa/extras/testdocuments/TestCalc_Rangetest.xls  |binary
 sc/qa/extras/testdocuments/TestCalc_Rangetest2.xls |binary
 sc/qa/extras/testdocuments/TestIntersection.xls|binary
 sc/qa/extras/testdocuments/TestUnion.xls   |binary
 sc/qa/extras/testdocuments/Window.xls  |binary
 sc/qa/extras/testdocuments/bytearraystring.xls |binary
 sc/qa/extras/testdocuments/pagesetup.xls   |binary
 sc/qa/extras/testdocuments/range-4.xls |binary
 sc/qa/extras/testdocuments/window2.xls |binary
 20 files changed, 83 insertions(+), 18 deletions(-)

New commits:
commit 153621f98ee98e4eacaebcf7d62f74d54755cab6
Author: Noel Power noel.po...@suse.com
Date:   Thu Mar 7 09:17:33 2013 +

disable new vba tests ( vba import for certain files appears broken )

Change-Id: I589ff778383f6e1a5fa910be687787658cb414a0

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 972b009..a4923cd 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -116,6 +116,7 @@ void ScMacrosTest::testVba()
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(vba.)),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.Modul1.Modul1?language=Basiclocation=document)),
 },
+#if VBAIMPORTFIXED// currently master seems to fail to import vba for these 
docs
 {
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MiscRangeTests.)),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document))
@@ -191,6 +192,7 @@ void ScMacrosTest::testVba()
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document))
 },
 #endif
+#endif
 };
 
 for ( sal_uInt32  i=0; iSAL_N_ELEMENTS( testInfo ); ++i )
commit c95e3fb64695cedfa40bfe5472879ee8a692d73f
Author: Noel Power noel.po...@suse.com
Date:   Wed Mar 6 16:52:16 2013 +

disable Ranges-2.xls vba test file

there seems to be some problem ( regression from 3.6 ? ) with dealing with
addresses returned from named ranges where the addressing mode of the named
range is different from the addressing mode of the document itself

Change-Id: Icfcd047819a4d1c89ae9509ea1a2e1b2d5386101

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4a4fc41..b4cfcb5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -59,24 +59,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
 # CppunitTest_sc_annotationshapeobj \
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
-JunitTest_sc_complex \
-JunitTest_sc_unoapi \
-CppunitTest_sc_outlineobj \
-CppunitTest_sc_annotationobj \
-CppunitTest_sc_annotationsobj \
-CppunitTest_sc_cellrangeobj \
-$(if $(filter-out $(OS),IOS), \
-   CppunitTest_sc_databaserangeobj) \
-CppunitTest_sc_datapilottableobj \
-CppunitTest_sc_datapilotfieldobj \
 CppunitTest_sc_macros_test \
-CppunitTest_sc_namedrangeobj \
-CppunitTest_sc_namedrangesobj \
-CppunitTest_sc_tablesheetobj \
-CppunitTest_sc_tablesheetsobj \
-CppunitTest_sc_editfieldobj_cell \
-CppunitTest_sc_editfieldobj_header \
-CppunitTest_sc_modelobj \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 389ddc1..972b009 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -156,10 +156,15 @@ void ScMacrosTest::testVba()
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(TestCalc_Rangetest2.)),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document))
 },
+#if FIXRANGEADDRESSING
+//ScVbaRange::getRangeForName()/getScRangeListForAddress() seems to get 
confused
+//about the addressing mode of the document vs the addressing mode of a named
+//range ( need to fix that )
 {
 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Ranges-2.)),
 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document))
 },
+#endif
 {
 

Re: LibreOffice text justification

[Miklos Vajna]

Hi Chris,

On Thu, Mar 07, 2013 at 09:15:03AM +, Chris Tapp opensou...@keylevel.com 
wrote:
 As far as I can tell, LO only uses the inter-word spaces for justification 
 and it only makes these larger.
 This generally works fairly well in many cases, but it does sometimes lead to 
 output with large gaps between
 words and where the gaps vary significantly between the lines of a paragraph.
 
 A more visually-pleasing result (important for book publication) can be 
 obtained if the gaps are balanced within a paragraph.
 This can be done by defining a range for the inter-word gap (e.g. 80% to 120% 
 of 'normal') and allowing the
 inter-character gaps to be altered as well (say -5% to 10%).
 
 I think adding this to LO would be really nice (possibly as an 'advanced' 
 setting to hide it from 'normal' users) and would give it a 
 major feature advantage over 'standard' word processors ;-)

Hm, I don't think the inter-word gap can be customized ATM. However,
inter-character spacing can be customized using Format - Character -
Position - Spacing. Setting that to a small enough (but positive) value
seems to help here with a simple two-liner paragraph.

If this is not enough, I would look into adding a new paragraph property
to define additional inter-word spacing. The interesting part is to let
the layout take care of that option, Cédric's

https://wiki.documentfoundation.org/User:Cbosdo#From_paragraph_to_lines

has quite some code pointers on where that code is.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: scalc UNO api compilation question about header files

[Caolán McNamara]

On Wed, 2013-03-06 at 15:44 -0500, Neeraj Rai wrote:
 I am trying to build a scalc extension using UNO api on centos 6 .
 This previous built successfully on RHEL 6.

I imagine you built it originally against an older version of the sdk,
so the easiest thing is to rebuild it against the current sdk. You can
grab the prebuilt sdk from
http://download.documentfoundation.org/libreoffice/stable/4.0.0/rpm/x86_64/LibreOffice_4.0.0_Linux_x86-64_rpm_sdk.tar.gz

 It seems the header files are all over the place and I trying to
 figure out how to modify the Makefile to accommodate it.

 1. how is the header XDesktop.hpp generated and should it be in the
 path pointed by any of the standard vars  (OO_SDK_HOME,
 (OO_SDK_URE_HOME, OO_SDK_OUT)

Easiest way to get the sdk out of your install is to let the packaging
step make it for you and then install that, e.g. add --enable-epm to the
configure line and a libreoffice-sdk-VERSION.rpm will be created in a
subdir under instsetoo_native and then install that rpm and point your
extension at that sdk

C.


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

On Mac OSX, configure silently ignores misspelt option --enable-ext-wiki-publishe, no error message produced

[Alexander Thurgood]

Hi all,

My understanding of ./autogen.sh was that if a mistyped switch was input
then an error would be produced by the configure script. However, this
does not seem to be the case, at least for :

--enable-ext-wiki-publishe (note the trailing missing r)

Is this normal default behaviour for ./autogen.sh on OSX, or is there
something I'm missing ?

I'm pretty certain that on my Linux boxes, any mistyped switch gets
flagged as an error and stops configure from proceeding.

If ignoring configure options on OSX is the default behaviour, why ?


Alex

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

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

[Caolán McNamara]

 vcl/source/gdi/impimagetree.cxx |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 4514f9bb1380f980094f2c58c1bc7279a0c8e6ac
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 08:07:44 2013 +

OSL_TRACE-SAL_INFO

Change-Id: I889a32bce4f3c0eab5d3d5ef199dd321755cb177

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 4e68ddd..4b4cc07 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -203,9 +203,9 @@ bool ImplImageTree::loadImage(
 if (found || !loadMissing)
 return found;
 
-OSL_TRACE(
-ImplImageTree::loadImage exception couldn't load \%s\, fetching 
default image,
-rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(vcl, ImplImageTree::loadImage exception couldn't load \
+ name  \, fetching default image);
+
 return loadDefaultImage(style, bitmap);
 }
 
@@ -261,9 +261,7 @@ bool ImplImageTree::doLoadImage(
 } catch (css::uno::RuntimeException ) {
 throw;
 } catch (const css::uno::Exception  e) {
-OSL_TRACE(
-ImplImageTree::loadImage exception \%s\,
-rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(vcl, ImplImageTree::doLoadImage exception   e.Message);
 }
 if (m_cacheIcons  found) {
 m_iconCache[name.intern()] = std::make_pair(localized, bitmap);
@@ -407,10 +405,8 @@ bool ImplImageTree::find(
 } catch (css::uno::RuntimeException ) {
 throw;
 } catch (const css::uno::Exception  e) {
-OSL_TRACE(
-ImplImageTree::find exception \%s\,
-rtl::OUStringToOString(
-e.Message, RTL_TEXTENCODING_UTF8).getStr());
+SAL_INFO(vcl, ImplImageTree::find exception 
+ e.Message   for   i-first);
 i = m_paths.erase(i);
 continue;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b8/d0e88485b86bd6b9344967969347184bd894ef

[Caolán McNamara]

 b8/d0e88485b86bd6b9344967969347184bd894ef |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0834d5149f04ab802b0ad8c68399cad43cad2ff1
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 09:50:53 2013 +

Notes added by 'git notes add'

diff --git a/b8/d0e88485b86bd6b9344967969347184bd894ef 
b/b8/d0e88485b86bd6b9344967969347184bd894ef
new file mode 100644
index 000..f217adf
--- /dev/null
+++ b/b8/d0e88485b86bd6b9344967969347184bd894ef
@@ -0,0 +1 @@
+prefer: 4514f9bb1380f980094f2c58c1bc7279a0c8e6ac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git:

[Chr . Rossmanith]

 0 files changed

New commits:
commit 3e831c601ef02a5770d32593fc9f057b8e3e3dbe
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Mon Mar 4 14:48:06 2013 +0100

Replace XubString with OUString in morebtn.{c,h}xx

Change-Id: I492f93a9ef5244681a28aed16e81c7558e38a875
Reviewed-on: https://gerrit.libreoffice.org/2573
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Replace XubString with OUString in morebtn.{c,h}xx

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2573

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2573
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I492f93a9ef5244681a28aed16e81c7558e38a875
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: libmariadb/my_config.h

[Fridrich Štrba]

 libmariadb/my_config.h |   23 ---
 1 file changed, 23 deletions(-)

New commits:
commit b7e51332a9cbd403703e7da99fe74230447163d9
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 7 11:01:23 2013 +0100

Remove some more defines not needed in current build configuration

Change-Id: Ia05bc5b8d1f9396ed8c1d27d54976308e6df36f4

diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h
index 83ff9cf..2626545 100644
--- a/libmariadb/my_config.h
+++ b/libmariadb/my_config.h
@@ -107,22 +107,6 @@
 #define HAVE_PERROR 1
 #define HAVE_POLL 1
 #define HAVE_PREAD 1
-/* #undef HAVE_PTHREAD_ATTR_CREATE */
-/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */
-/* #undef HAVE_PTHREAD_ATTR_SETPRIO */
-#define HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1
-#define HAVE_PTHREAD_ATTR_SETSCOPE 1
-/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
-/* #undef HAVE_PTHREAD_CONDATTR_CREATE */
-/* #undef HAVE_PTHREAD_INIT */
-/* #undef HAVE_PTHREAD_KEY_DELETE */
-/* #undef HAVE_PTHREAD_KILL */
-/* #undef HAVE_PTHREAD_RWLOCK_RDLOCK */
-/* #undef HAVE_PTHREAD_SETPRIO_NP */
-#define HAVE_PTHREAD_SETSCHEDPARAM 1
-/* #undef HAVE_PTHREAD_SIGMASK */
-/* #undef HAVE_PTHREAD_THREADMASK */
-/* #undef HAVE_PTHREAD_YIELD_NP */
 #define HAVE_READDIR_R 1
 #define HAVE_READLINK 1
 #define HAVE_REALPATH 1
@@ -177,10 +161,3 @@
 
 #define RETSIGTYPE void
 #define RETQSORTTYPE void
-
-/*
- * various other defines
- */
-/* #undef HAVE_THREADS */
-#define SHAREDIR share
-#define DEFAULT_CHARSET_HOME /usr/local
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Herbert Dürr]

 filter/source/msfilter/msdffimp.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 393ca6dde9de8f66ed55dc5d0a7885ad06f22301
Author: Herbert Dürr h...@apache.org
Date:   Wed Jun 6 11:58:45 2012 +

Resolves: #i119513# fix loading of CMYK JPEG in PPT import

Patch By: Lei Debin
Found By: bjduj...@gmail.com
Extended for better Debug Info by: Herbert Duerr

Conflicts:
filter/source/msfilter/msdffimp.cxx

Change-Id: Ibb2e7daae425a711b5b6cadfa81446e9adeb68f1

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index eea3f99..41fe692 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6098,6 +6098,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 break;
 case 0x46A :// One byte tag then JPEG (= JFIF) data
 case 0x6E0 :// One byte tag then PNG data
+case 0x6E2 :// One byte tag then JPEG in CMYK color 
space
 case 0x7A8 :
 nSkip += 1; // One byte tag then DIB data
 break;
@@ -6131,6 +6132,7 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream 
rBLIPStream, Graphic rData,
 case 0x542 : aFileName += .pct; break;
 case 0x46a : aFileName += .jpg; break;
 case 0x6e0 : aFileName += .png; break;
+case 0x6e2 : aFileName += .jpg; break;
 case 0x7a8 : aFileName += .bmp; break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 27/062148c2a016e472f032fba0608ce1d49886db

[Caolán McNamara]

 27/062148c2a016e472f032fba0608ce1d49886db |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ccc653b6e6594b0ee614bf44adb4a0e45ecd9b3c
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 10:10:02 2013 +

Notes added by 'git notes add'

diff --git a/27/062148c2a016e472f032fba0608ce1d49886db 
b/27/062148c2a016e472f032fba0608ce1d49886db
new file mode 100644
index 000..a4de1a3
--- /dev/null
+++ b/27/062148c2a016e472f032fba0608ce1d49886db
@@ -0,0 +1 @@
+merged as: 393ca6dde9de8f66ed55dc5d0a7885ad06f22301
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/Extension_test-passive.mk desktop/Jar_passive_java.mk desktop/Library_passive_native.mk desktop/Module_desktop.mk desktop/Pyuno_passive_python.mk de

[Stephan Bergmann]

 Repository.mk  
 |2 
 desktop/Extension_test-passive.mk  
 |   27 ++
 desktop/Jar_passive_java.mk
 |   30 +++
 desktop/Library_passive_native.mk  
 |   26 ++
 desktop/Module_desktop.mk  
 |   11 +
 desktop/Pyuno_passive_python.mk
 |   18 +
 desktop/Rdb_passive_generic.mk 
 |   17 +
 desktop/Rdb_passive_platform.mk
 |   16 +
 desktop/test/deployment/passive/Dispatch.java  
 |   94 --
 desktop/test/deployment/passive/META-INF/manifest.xml  
 |   31 +++
 desktop/test/deployment/passive/Provider.java  
 |   74 ---
 desktop/test/deployment/passive/Services.java  
 |   42 
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Dispatch.java 
|   94 ++
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Provider.java 
|   74 +++
 
desktop/test/deployment/passive/com/sun/star/comp/test/deployment/Services.java 
|   42 
 desktop/test/deployment/passive/manifest.xml   
 |   31 ---
 mysqlc/Extension_mysql-connector-ooo.mk
 |3 
 nlpsolver/Extension_nlpsolver.mk   
 |3 
 reportbuilder/Extension_reportbuilder.mk   
 |3 
 sdext/Extension_minimizer.mk   
 |3 
 solenv/gbuild/Extension.mk 
 |   12 +
 solenv/gbuild/ExtensionTarget.mk   
 |2 
 swext/Extension_wiki-publisher.mk  
 |3 
 23 files changed, 414 insertions(+), 244 deletions(-)

New commits:
commit ffb1e88afae5b83d58337a84a27f9c6293f6fcd9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 7 11:05:57 2013 +0100

Gbuild'ify desktop/test/deployment/passive/

...to manually build solver/*/bin/test-passive.oxt via make
Extension_test-passive.  There's still room for improvement in gbuild, 
though:

* There should be no need to add the extension's native library and jar UNO
  components (which nothing else links againts) to the central 
Repository.mk.

* There should be no need to move manifest.xml around.

* There should be no need to move .java files around.

* Let make Extension_test-passive.clean clean up again.

Change-Id: Ib44558061c4c0fda6be5943bd02b5a42cd15c52e

diff --git a/Repository.mk b/Repository.mk
index 2e59486..95a69db 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -668,6 +668,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
SunPresentationMinimizer \
 mysqlc \
+passive_native \
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
@@ -784,6 +785,7 @@ $(eval $(call gb_Helper_register_jars,OXT, \
EvolutionarySolver \
mediawiki \
nlpsolver \
+   passive_java \
sun-report-builder \
 ))
 
diff --git a/desktop/Extension_test-passive.mk 
b/desktop/Extension_test-passive.mk
new file mode 100644
index 000..354ce26
--- /dev/null
+++ b/desktop/Extension_test-passive.mk
@@ -0,0 +1,27 @@
+# -*- 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_Extension_Extension,test-passive,desktop/test/deployment/passive))
+
+$(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call 
gb_Rdb_get_target,passive_generic)))
+
+$(eval $(call gb_Extension_add_file,test-passive,platform.components,$(call 
gb_Rdb_get_target,passive_platform)))
+
+$(eval $(call gb_Extension_add_files,test-passive,, \
+$(SRCDIR)/desktop/test/deployment/passive/Addons.xcu \
+$(SRCDIR)/desktop/test/deployment/passive/ProtocolHandler.xcu \
+$(SRCDIR)/desktop/test/deployment/passive/passive_python.py \
+$(call gb_Jar_get_outdir_target,passive_java) \
+))
+
+$(eval $(call gb_Extension_add_libraries,test-passive, \
+passive_native \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Jar_passive_java.mk b/desktop/Jar_passive_java.mk
new file mode 100644
index 000..e1023a5
--- /dev/null
+++ b/desktop/Jar_passive_java.mk
@@ -0,0 +1,30 @@
+# 

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

[Miklos Vajna]

 extensions/source/propctrlr/cellbindinghelper.cxx|4 
 extensions/source/propctrlr/formcomponenthandler.cxx |   18 
 extensions/source/propctrlr/formgeometryhandler.cxx  |2 
 extensions/source/propctrlr/formstrings.hxx  |  506 +--
 extensions/source/propctrlr/pcrstrings.hxx   |4 
 extensions/source/propctrlr/selectlabeldialog.cxx|2 
 extensions/source/propctrlr/stringdefine.hxx |   46 -
 extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx |   46 -
 8 files changed, 289 insertions(+), 339 deletions(-)

New commits:
commit b4f8ab8881785db8e328fbfa84933eadb6bc5dd5
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Mar 7 11:00:46 2013 +0100

extensions: get rid of no longer needed stringdefine.hxx

Change-Id: I53d8a164fe9333c286a04f88a0834feeecacd5ed

diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx 
b/extensions/source/propctrlr/cellbindinghelper.cxx
index 2f7f893..ebaa842 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -168,7 +168,7 @@ namespace pcr
 
 Reference XPropertySet  xConverter(
 createDocumentDependentInstance(
-_bIsRange ? SERVICE_RANGEADDRESS_CONVERSION : 
SERVICE_ADDRESS_CONVERSION,
+_bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : 
OUString(SERVICE_ADDRESS_CONVERSION),
 ::rtl::OUString(),
 Any()
 ),
@@ -213,7 +213,7 @@ namespace pcr
 Reference XValueBinding  
CellBindingHelper::createCellBindingFromAddress( const CellAddress _rAddress, 
bool _bSupportIntegerExchange ) const
 {
 Reference XValueBinding  xBinding( createDocumentDependentInstance(
-_bSupportIntegerExchange ? SERVICE_SHEET_CELL_INT_BINDING : 
SERVICE_SHEET_CELL_BINDING,
+_bSupportIntegerExchange ? 
OUString(SERVICE_SHEET_CELL_INT_BINDING) : OUString(SERVICE_SHEET_CELL_BINDING),
 PROPERTY_BOUND_CELL,
 makeAny( _rAddress )
 ), UNO_QUERY );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx 
b/extensions/source/propctrlr/formcomponenthandler.cxx
index 53a27d7..82e5d92 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1691,7 +1691,7 @@ namespace pcr
 // - TriState -
 case PROPERTY_ID_TRISTATE:
 if ( !_bFirstTimeInit )
-_rxInspectorUI-rebuildPropertyUI( m_eComponentClass == 
eFormControl ? PROPERTY_DEFAULT_STATE : PROPERTY_STATE );
+_rxInspectorUI-rebuildPropertyUI( m_eComponentClass == 
eFormControl ? OUString(PROPERTY_DEFAULT_STATE) : OUString(PROPERTY_STATE) );
 break;  // case PROPERTY_ID_TRISTATE
 
 // - DecimalAccuracy -
@@ -1709,7 +1709,7 @@ namespace pcr
 
 // propagate the changes to the min/max/default fields
 Any aCurrentProp;
-OUString aAffectedProps[] = { PROPERTY_VALUE, 
PROPERTY_DEFAULT_VALUE, PROPERTY_VALUEMIN, PROPERTY_VALUEMAX };
+OUString aAffectedProps[] = { OUString(PROPERTY_VALUE), 
OUString(PROPERTY_DEFAULT_VALUE), OUString(PROPERTY_VALUEMIN), 
OUString(PROPERTY_VALUEMAX) };
 for (sal_uInt16 i=0; iSAL_N_ELEMENTS(aAffectedProps); ++i)
 {
 Reference XPropertyControl  xControl;
@@ -1755,7 +1755,7 @@ namespace pcr
 
 // give each control which has to know this an own copy of the 
description
 OUString aFormattedPropertyControls[] = {
-PROPERTY_EFFECTIVE_MIN, PROPERTY_EFFECTIVE_MAX, 
PROPERTY_EFFECTIVE_DEFAULT, PROPERTY_EFFECTIVE_VALUE
+OUString(PROPERTY_EFFECTIVE_MIN), 
OUString(PROPERTY_EFFECTIVE_MAX), OUString(PROPERTY_EFFECTIVE_DEFAULT), 
OUString(PROPERTY_EFFECTIVE_VALUE)
 };
 for ( sal_uInt16 i=0; 
iSAL_N_ELEMENTS(aFormattedPropertyControls); ++i )
 {
@@ -3073,10 +3073,10 @@ namespace pcr
 OUString* FormSQLCommandUI::getPropertiesToDisable()
 {
 static OUString s_aCommandProps[] = {
-PROPERTY_DATASOURCE,
-PROPERTY_COMMAND,
-PROPERTY_COMMANDTYPE,
-PROPERTY_ESCAPE_PROCESSING,
+OUString(PROPERTY_DATASOURCE),
+OUString(PROPERTY_COMMAND),
+OUString(PROPERTY_COMMANDTYPE),
+OUString(PROPERTY_ESCAPE_PROCESSING),
 OUString()
 };
 return s_aCommandProps;
@@ -3167,8 +3167,8 @@ namespace pcr
 OUString* ValueListCommandUI::getPropertiesToDisable()
 {
 static OUString s_aListSourceProps[] = {
-PROPERTY_LISTSOURCETYPE,
-PROPERTY_LISTSOURCE,
+OUString(PROPERTY_LISTSOURCETYPE),
+   

[Libreoffice-commits] core.git: vcl/generic

[Herbert Dürr]

 vcl/generic/fontmanager/helper.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f9e73b74bc61fcf410d25b9087bf123d5e3e13f6
Author: Herbert Dürr h...@apache.org
Date:   Thu Jun 14 07:16:41 2012 +

c#706171# handle invalid PFB chunk header

Conflicts:
vcl/unx/generic/fontmanager/helper.cxx

Change-Id: I2d58b83c51a2c8b529727be0aeb5ef612f883acc

diff --git a/vcl/generic/fontmanager/helper.cxx 
b/vcl/generic/fontmanager/helper.cxx
index 414c82f..25c1c4f 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -242,7 +242,7 @@ OUString psp::getFontPath()
 
 bool psp::convertPfbToPfa( ::osl::File rInFile, ::osl::File rOutFile )
 {
-static unsigned char hexDigits[] =
+static const unsigned char hexDigits[] =
 {
 '0', '1', '2', '3', '4', '5', '6', '7',
 '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
@@ -258,10 +258,12 @@ bool psp::convertPfbToPfa( ::osl::File rInFile, 
::osl::File rOutFile )
 while( bSuccess  ! bEof )
 {
 // read leading bytes
-bEof = ! rInFile.read( buffer, 6, nRead )  nRead == 6 ? false : true;
+bEof = ((0 != rInFile.read( buffer, 6, nRead)) || (nRead != 6));
+if( bEof )
+break;
 unsigned int nType = buffer[ 1 ];
 unsigned int nBytesToRead = buffer[2] | buffer[3]  8 | buffer[4]  
16 | buffer[5]  24;
-if( buffer[0] != 0x80 ) // test for pfb m_agic number
+if( buffer[0] != 0x80 ) // test for pfb magic number
 {
 // this migt be a pfa font already
 if( ! rInFile.read( buffer+6, 9, nRead )  nRead == 9 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/2abe4d7d1d05ed543804b03628bd26db00e44e

[Caolán McNamara]

 87/2abe4d7d1d05ed543804b03628bd26db00e44e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 166dbc800d495d2a8b8e32fdd9aba25aee28bcbd
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 10:18:57 2013 +

Notes added by 'git notes add'

diff --git a/87/2abe4d7d1d05ed543804b03628bd26db00e44e 
b/87/2abe4d7d1d05ed543804b03628bd26db00e44e
new file mode 100644
index 000..0881f6f
--- /dev/null
+++ b/87/2abe4d7d1d05ed543804b03628bd26db00e44e
@@ -0,0 +1 @@
+merged as: f9e73b74bc61fcf410d25b9087bf123d5e3e13f6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 59405, which changed state.

Bug 59405 Summary: [REGRESSION] Paste special and insert of Visio object: image 
invisible
https://bugs.freedesktop.org/show_bug.cgi?id=59405

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cppcanvas/source

[Fridrich Štrba]

 cppcanvas/source/inc/implrenderer.hxx|2 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx |   26 +++---
 2 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 99f785a595617444e0e69d66d9a2f886d9a5718e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 7 10:16:56 2013 +0100

Backport of EMF+ changes from master

Change-Id: Ibfc5d700a81e661b663dfd3eb1f83e488fd1112f
Reviewed-on: https://gerrit.libreoffice.org/2581
Reviewed-by: Radek Doulík r...@novell.com
Tested-by: Radek Doulík r...@novell.com

diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index 7f34ad8..7d82ea7 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -259,7 +259,7 @@ static float GetSwapFloat( SvStream rSt )
ActionVector::const_iterator o_rRangeBegin,
ActionVector::const_iterator o_rRangeEnd ) 
const;
 
-void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_Bool bUseWholeStream = sal_False);
+void processObjectRecord(SvMemoryStream rObjectStream, sal_uInt16 
flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream = sal_False);
 
 /* EMF+ */
 void processEMFPlus( MetaCommentAction* pAct, const 
ActionFactoryParameters rFactoryParms, OutDevState rState, const 
CanvasSharedPtr rCanvas );
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0c9db41..1dbbd82 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -714,7 +714,7 @@ namespace cppcanvas
 Graphic graphic;
 
 
-void Read (SvMemoryStream s, sal_Bool bUseWholeStream)
+void Read (SvMemoryStream s, sal_uInt32 dataSize, sal_Bool 
bUseWholeStream)
 {
 sal_uInt32 header, unknown;
 
@@ -736,11 +736,11 @@ namespace cppcanvas
 sal_Int32 mfType, mfSize;
 
 s  mfType  mfSize;
-EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: 
%d\n, mfType, mfSize));
+EMFP_DEBUG (printf (EMF+\tmetafile type: %d dataSize: %d 
real size calculated from record dataSize: %d\n, mfType, mfSize, dataSize - 
16));
 
 GraphicFilter filter;
 // workaround buggy metafiles, which have wrong mfSize set 
(n#705956 for example)
-SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), 
bUseWholeStream ? s.remainingSize() : mfSize, STREAM_READ);
+SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), 
bUseWholeStream ? s.remainingSize() : dataSize - 16, STREAM_READ);
 
 filter.ImportGraphic (graphic, String (), mfStream);
 
@@ -1090,7 +1090,7 @@ namespace cppcanvas
 }
 }
 
-void ImplRenderer::processObjectRecord(SvMemoryStream rObjectStream, 
sal_uInt16 flags, sal_Bool bUseWholeStream)
+void ImplRenderer::processObjectRecord(SvMemoryStream rObjectStream, 
sal_uInt16 flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream)
 {
 sal_uInt32 index;
 
@@ -1145,7 +1145,7 @@ namespace cppcanvas
 {
 EMFPImage *image;
 aObjects [index] = image = new EMFPImage ();
-image-Read (rObjectStream, bUseWholeStream);
+image-Read (rObjectStream, dataSize, bUseWholeStream);
 
 break;
 }
@@ -1211,12 +1211,13 @@ namespace cppcanvas
 if (mbMultipart) {
 EMFP_DEBUG (printf (EMF+ multipart record flags: 
%04hx\n, mMFlags));
 mMStream.Seek (0);
-processObjectRecord (mMStream, mMFlags, sal_True);
+processObjectRecord (mMStream, mMFlags, dataSize, 
sal_True);
 }
 mbMultipart = false;
 }
 
 if (type != EmfPlusRecordTypeObject || !(flags  0x8000))
+{
 switch (type) {
 case EmfPlusRecordTypeHeader:
 sal_uInt32 header, version;
@@ -1235,7 +1236,7 @@ namespace cppcanvas
 EMFP_DEBUG (printf (EMF+\talready used in svtools wmf/emf 
filter parser\n));
 break;
 case EmfPlusRecordTypeObject:
-processObjectRecord (rMF, flags);
+processObjectRecord (rMF, flags, dataSize);
 break;
 case EmfPlusRecordTypeFillPie:
 {
@@ -1476,6 +1477,9 @@ namespace cppcanvas
 ReadPoint (rMF, x2, y2, flags);
 ReadPoint (rMF, x3, y3, flags);
 
+

[PUSHED libreoffice-4-0] Backport of EMF+ changes from master

[via Code Review]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2581

Approvals:
  Radek Doulík: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2581
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfc5d700a81e661b663dfd3eb1f83e488fd1112f
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Radek Doulík r...@novell.com

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

Re: On Mac OSX, configure silently ignores misspelt option --enable-ext-wiki-publishe, no error message produced

[Christian Lohmaier]

Hi Alexander, *,

On Thu, Mar 7, 2013 at 10:45 AM, Alexander Thurgood
alex.thurg...@gmail.com wrote:

 My understanding of ./autogen.sh was that if a mistyped switch was input
 then an error would be produced by the configure script.

No - by default it only prints a warning (and as it is a default
configure switch and no custom one, it only prints it during
configure's output at the very top, not in the summary at the end).

 However, this
 does not seem to be the case, at least for :

 --enable-ext-wiki-publishe (note the trailing missing r)

Please double-check whether there really is no code generated in
confiugre for this.

 Is this normal default behaviour for ./autogen.sh on OSX, or is there
 something I'm missing ?

That is no behaviour from autogen or configure.ac, but rather from the
atuoconf tool...

 I'm pretty certain that on my Linux boxes, any mistyped switch gets
 flagged as an error and stops configure from proceeding.

Nope, only an error if you explicitly provide --enable-option-checking=fatal

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

Re: scalc UNO api compilation question about header files

[Stephan Bergmann]

On 03/06/2013 09:44 PM, Neeraj Rai wrote:

1. how is the header XDesktop.hpp generated and should it be in the path
pointed by any of the standard vars
  (OO_SDK_HOME, (OO_SDK_URE_HOME, OO_SDK_OUT)


Those .hpp (and internal .hdl) files corresponding to UNOIDL entities 
(declared in .idl files) are not included in the SDK, but rather need to 
be generated via cppumaker.  The SDK's settings/stdtarget.mk has target 
$(SDKTYPEFLAG) for wholesale generation of those C++ header files 
corresponding to all of LO's .idl files.


See e.g. SDK's examples/cpp/DocumentLoader/Makefile for including std.mk 
and stdtarget.mk and making compilation of C++ sources depend on 
$(SDKTYPEFLAGS).  (This also explains why building your own C++ code 
against the SDK sometimes happens to work and sometimes not---if you 
already built one of the C++ examples, the headers are already 
generated.  All of this is hopelessly ugly.)


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

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

[David Verrier]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |   12 -
 dbaccess/source/ui/tabledesign/TEditControl.cxx|  191 ++---
 2 files changed, 101 insertions(+), 102 deletions(-)

New commits:
commit 8fd81a1119a057dda91462c5572843435a61ce71
Author: David Verrier dverr...@gmail.com
Date:   Tue Mar 5 14:49:05 2013 +0100

fdo#39468: Translate German comments in dbaccess/source/ui

Change-Id: I9eb3c97ffe2dd122960bb4c5f5b0594767ea0fb9
Reviewed-on: https://gerrit.libreoffice.org/2556
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 6fdc8ba..d257769 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -585,7 +585,7 @@ namespace
 else if (SQL_ISRULE(pNode,comparison_predicate))
 {
 // only the comparison of columns is allowed
-OSL_ENSURE(pNode-count() == 
3,OQueryDesignView::InsertJoinConnection: Fehler im Parse Tree);
+OSL_ENSURE(pNode-count() == 
3,OQueryDesignView::InsertJoinConnection: Error in Parse Tree);
 if (!(SQL_ISRULE(pNode-getChild(0),column_ref) 
   SQL_ISRULE(pNode-getChild(2),column_ref) 
pNode-getChild(1)-getNodeType() == SQL_NODE_EQUAL))
@@ -703,7 +703,7 @@ namespace
 
 if  ( pEntryField-isAggreateFunction() )
 {
-
OSL_ENSURE(!pEntryField-GetFunction().isEmpty(),Functionname darf hier nicht 
leer sein! ;-();
+
OSL_ENSURE(!pEntryField-GetFunction().isEmpty(),Function name must not be 
empty! ;-();
 OUStringBuffer aTmpStr2( pEntryField-GetFunction());
 aTmpStr2.appendAscii(();
 aTmpStr2.append(aTmpStr.makeStringAndClear());
@@ -1187,7 +1187,7 @@ namespace
 OTableFieldDescRef  pEntryField = *aIter;
 if ( pEntryField-IsGroupBy() )
 {
-OSL_ENSURE(!pEntryField-GetField().isEmpty(),Kein 
FieldName vorhanden!;-();
+OSL_ENSURE(!pEntryField-GetField().isEmpty(),No Field 
Name available!;-();
 OUString sGroupByPart = 
quoteTableAlias(bMulti,pEntryField-GetAlias(),aQuote);
 
 // only quote the field name when it isn't calculated
@@ -1265,7 +1265,7 @@ namespace
 ::connectivity::OSQLParseNode * pCondition = pNode-getChild(1);
 if ( pCondition ) // no where clause
 {
-// now we have to chech the other conditions
+// now we have to check the other conditions
 // first make the logical easier
 ::connectivity::OSQLParseNode::negateSearchCondition(pCondition);
 ::connectivity::OSQLParseNode *pNodeTmp = pNode-getChild(1);
@@ -1817,7 +1817,7 @@ namespace
 rParseIter.getColumnRange( pColumnRef, aColumnName, aTableRange );
 
 sal_Bool bFound(sal_False);
-OSL_ENSURE(!aColumnName.isEmpty(),Columnname darf nicht leer sein);
+OSL_ENSURE(!aColumnName.isEmpty(),Column name must not be empty);
 if (aTableRange.isEmpty())
 {
 // SELECT column, ...
@@ -1871,7 +1871,7 @@ namespace
 const ::connectivity::OSQLParseNode *pNode)
 {
 OSL_ENSURE( SQL_ISRULE( pNode, qualified_join ) || SQL_ISRULE( pNode, 
joined_table ) || SQL_ISRULE( pNode, cross_union ),
-OQueryDesignView::InsertJoin: Fehler im Parse Tree);
+OQueryDesignView::InsertJoin: Error in the Parse Tree);
 
 if (SQL_ISRULE(pNode,joined_table))
 return InsertJoin(_pView,pNode-getChild(1));
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx 
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index be35644..554442c 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -74,12 +74,12 @@ DBG_NAME(OTableEditorCtrl)
 
 #define HANDLE_ID   0
 
-// default Spaltenbreiten
+// default field widths
 #define FIELDNAME_WIDTH 100
 #define FIELDTYPE_WIDTH 150
 #define FIELDDESCR_WIDTH300
 
-// Maximale Eingabelaenge im Beschreibungsfeld
+// Maximum length in description field
 #define MAX_DESCR_LEN   256
 
 
@@ -129,13 +129,13 @@ void OTableEditorCtrl::Init()
 OTableRowView::Init();
 
 //
-// Soll der Entwurf ReadOnly geoeffnet werden ?
+// Should it be opened ReadOnly ?
 sal_Bool bRead(GetView()-getController().isReadOnly());
 
 SetReadOnly( bRead );
 
 //
-// Spalten einfuegen
+// Insert the columns
 String aColumnName( 

Re: On Mac OSX, configure silently ignores misspelt option --enable-ext-wiki-publishe, no error message produced

[Alexander Thurgood]

Le 07/03/13 11:43, Christian Lohmaier a écrit :

Hi Christian,

 That is no behaviour from autogen or configure.ac, but rather from the
 atuoconf tool...
 
 I'm pretty certain that on my Linux boxes, any mistyped switch gets
 flagged as an error and stops configure from proceeding.
 
 Nope, only an error if you explicitly provide --enable-option-checking=fatal

Ah, ok, thanks for clearing that up.

Alex


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

[Libreoffice-commits] core.git: 5 commits - basic/qa

[Noel Power]

 basic/qa/cppunit/basic_coverage.cxx |   40 +-
 basic/qa/cppunit/basictest.hxx  |  120 +++-
 basic/qa/cppunit/test_append.cxx|   40 ++
 basic/qa/cppunit/test_nested_struct.cxx |  192 +---
 4 files changed, 192 insertions(+), 200 deletions(-)

New commits:
commit fea9b3a99a24366b4dea22ed1b79f34046f7f521
Author: Noel Power noel.po...@suse.com
Date:   Thu Mar 7 10:53:42 2013 +

finally remove no long needed BasicTestBase

Change-Id: Ic1522b0c3a292af061f5777e06e796dd82884fbf

diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 7e74a2a..c828f25 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -22,35 +22,6 @@
 #include basic/sbuno.hxx
 #include osl/file.hxx
 
-class BasicTestBase : public test::BootstrapFixture
-{
-private:
-bool mbError;
-public:
-BasicTestBase() : BootstrapFixture(true, false), mbError(false) {};
-
-
-DECL_LINK( BasicErrorHdl, StarBASIC * );
-bool HasError() { return mbError; }
-void ResetError()
-{
-StarBASIC::SetGlobalErrorHdl( Link() );
-mbError = false;
-}
-BasicDLL basicDLL()
-{
-static BasicDLL maDll; // we need a dll instance for resouce manager 
etc.
-return maDll;
-}
-};
-
-IMPL_LINK( BasicTestBase, BasicErrorHdl, StarBASIC *, /*pBasic*/)
-{
-fprintf(stderr,Got error: \n\t%s!!!\n, rtl::OUStringToOString( 
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
-mbError = true;
-return 0;
-}
-
 class MacroSnippet
 {
 private:
commit 20f12a1d7ad5f9694f901a85e1fa22f46c3953a2
Author: Noel Power noel.po...@suse.com
Date:   Thu Mar 7 10:52:51 2013 +

Nested_Struct should really inherit from test::BootstrapFixture

Change-Id: I06255940f41c32493187d1ec847f7238fef4e9f8

diff --git a/basic/qa/cppunit/test_nested_struct.cxx 
b/basic/qa/cppunit/test_nested_struct.cxx
index 266d11f..8c7fabc 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -19,10 +19,10 @@
 namespace
 {
 using namespace com::sun::star;
-class Nested_Struct : public BasicTestBase
+class Nested_Struct : public test::BootstrapFixture
 {
 public:
-Nested_Struct() {};
+Nested_Struct(): BootstrapFixture(true, false) {};
 void testAssign1();
 void testAssign1Alt(); // result is uno-ised and tested
 void testOldAssign();
commit 8534787f95dfbfff24167b2160cfe07a1b70bcc6
Author: Noel Power noel.po...@suse.com
Date:   Thu Mar 7 10:49:28 2013 +

adapt existing tests to use MacroSnipper helper class

Change-Id: I50980d9510b82277a5da04cc4f6c1d3ec8e7c756

diff --git a/basic/qa/cppunit/basic_coverage.cxx 
b/basic/qa/cppunit/basic_coverage.cxx
index fefdd4e..b406122 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -16,7 +16,7 @@
 namespace
 {
 
-class Coverage : public BasicTestBase
+class Coverage : public test::BootstrapFixture
 {
 private:
 bool m_bError;
@@ -32,8 +32,6 @@ private:
 void test_success(void);
 void print_summary() {};
 
-DECL_LINK( CoverageErrorHdl, StarBASIC * );
-
 public:
 Coverage();
 ~Coverage();
@@ -50,18 +48,9 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-IMPL_LINK( Coverage, CoverageErrorHdl, StarBASIC *, /*pBasic*/)
-{
-fprintf(stderr,%s:(%d:%d)\n,
-rtl::OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 
).getStr(),
-StarBASIC::GetLine(), StarBASIC::GetCol1());
-fprintf(stderr,Basic error: %s\n, rtl::OUStringToOString( 
StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
-m_bError = true;
-return 0;
-}
-
 Coverage::Coverage()
-: m_bError(false)
+: BootstrapFixture(true, false)
+, m_bError(false)
 , m_nb_tests(0)
 , m_nb_tests_ok(0)
 , m_nb_tests_skipped(0)
@@ -94,25 +83,14 @@ void Coverage::test_success()
 void Coverage::run_test(OUString /*sFileName*/, OUString sCode)
 {
 bool result = false;
-CPPUNIT_ASSERT_MESSAGE( No resource manager, basicDLL().GetBasResMgr() 
!= NULL );
-StarBASICRef pBasic = new StarBASIC();
-ResetError();
-StarBASIC::SetGlobalErrorHdl( LINK( this, Coverage, CoverageErrorHdl ) );
-
-SbModule* pMod = pBasic-MakeModule( rtl::OUString( TestModule ), sCode 
);
-pMod-Compile();
-if(!m_bError)
+MacroSnippet testMacro( sCode );
+testMacro.Compile();
+if( !testMacro.HasError() )
 {
-SbMethod* pMeth = static_castSbMethod*(pMod-Find( 
rtl::OUString(doUnitTest),  SbxCLASS_METHOD ));
-if(pMeth)
+SbxVariableRef pResult = testMacro.Run();
+if( pResult  pResult-GetInteger() == 1 )
 {
-SbxVariableRef refTemp = pMeth;
-// forces a broadcast
-SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
-if(pNew-GetInteger() == 1 )
-  

[PUSHED] fdo#39468: Translate German comments in dbaccess/source/ui

[Thomas Arnhold (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2556

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2556
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9eb3c97ffe2dd122960bb4c5f5b0594767ea0fb9
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Verrier dverr...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

[PATCH] fdo#35546, in progress

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2582

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2582/1

fdo#35546, in progress

Created the dialog window (called photoalbum.ui), and started to integrate it.

Change-Id: I14b337187dc5d373fcd28489098fda813b5fd5f6
---
M officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
M sd/AllLangResTarget_sd.mk
M sd/Library_sdui.mk
M sd/UI_simpress.mk
M sd/inc/app.hrc
M sd/inc/sdabstdlg.hxx
M sd/inc/sdcommands.h
M sd/sdi/outlnvsh.sdi
M sd/sdi/sdraw.sdi
A sd/source/ui/dlg/PhotoAlbumDialog.cxx
A sd/source/ui/dlg/PhotoAlbumDialog.hxx
A sd/source/ui/dlg/PhotoAlbumDialog.src
M sd/source/ui/dlg/sddlgfact.cxx
M sd/source/ui/dlg/sddlgfact.hxx
A sd/source/ui/inc/PhotoAlbumDialog.hrc
M sd/source/ui/view/drviews6.cxx
M sd/uiconfig/simpress/menubar/menubar.xml
A sd/uiconfig/simpress/ui/photoalbum/photoalbum.ui
M sd/uiconfig/simpress/ui/printeroptions.ui
19 files changed, 629 insertions(+), 2 deletions(-)



diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index d52bafc..e1fe537 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -60,6 +60,15 @@
   value1/value
 /prop
   /node
+ node oor:name=.uno:PhotoAlbumDialog oor:op=replace
+prop oor:name=Label oor:type=xs:string
+
+  value xml:lang=en-USCreate Photo Album/value
+/prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
+  /node
   node oor:name=.uno:Dia oor:op=replace
 prop oor:name=Label oor:type=xs:string
 
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 4068afc..d736f51 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -97,6 +97,7 @@
 sd/source/ui/dlg/tpaction.src \
 sd/source/ui/dlg/tpoption.src \
 sd/source/ui/dlg/vectdlg.src \
+sd/source/ui/dlg/PhotoAlbumDialog.src \
 sd/source/ui/slideshow/slideshow.src \
 sd/source/ui/table/TableDesignPane.src \
 sd/source/ui/view/DocumentRenderer.src \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 601fb2a..d24dfb1 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -106,6 +106,7 @@
 sd/source/ui/dlg/tpaction \
 sd/source/ui/dlg/tpoption \
 sd/source/ui/dlg/vectdlg \
+sd/source/ui/dlg/PhotoAlbumDialog \
 ))
 
 # $(WORKDIR)/inc/sd/sddll0.hxx :
diff --git a/sd/UI_simpress.mk b/sd/UI_simpress.mk
index 3ddeac9..592251c 100644
--- a/sd/UI_simpress.mk
+++ b/sd/UI_simpress.mk
@@ -11,6 +11,7 @@
 
 $(eval $(call gb_UI_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/printeroptions \
+   sd/uiconfig/simpress/ui/photoalbum/photoalbum \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 950a930..b74d308 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -213,7 +213,6 @@
 #define SID_LINE_ARROW_SQUARE   (SID_SD_START+177)
 #define SID_LINE_SQUARE_ARROW   (SID_SD_START+178)
 // und noch weitere...
-
 #define ID_VAL_ENDINTENS(SID_SD_START+197)
 #define ID_VAL_STARTINTENS  (SID_SD_START+198)
 #define ID_VAL_BORDER   (SID_SD_START+199)
@@ -355,6 +354,7 @@
 #define SID_CUSTOM_ANIMATION_SCHEMES_PANEL  (SID_SD_START+333)
 #define SID_SLIDE_TRANSITIONS_PANEL (SID_SD_START+334)
 // free
+#define SID_PHOTOALBUM  (SID_SD_START+336)
 #define SID_REMOTE_DLG  (SID_SD_START+337)
 #define SID_CONNECTION_DLG  (SID_SD_START+338)
 #define SID_PRESENTATION_DLG(SID_SD_START+339)
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index b3cde08..96be39f 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -213,6 +213,8 @@
 virtual CreateTabPage   GetSdOptionsMiscTabPageCreatorFunc() = 
0;
 virtual CreateTabPage   GetSdOptionsSnapTabPageCreatorFunc() = 
0;
 
+virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow);
+
 protected:
 ~SdAbstractDialogFactory() {}
 };
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 32a065f..daecfe8 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -116,6 +116,7 @@
 #define CMD_SID_TP_SHOW_LARGE_PREVIEW   
.uno:TaskPaneShowLargePreview
 #define CMD_SID_TP_EDIT_MASTER  .uno:TaskPaneEditMaster
 #define CMD_SID_INSERTPAGE_LAYOUT_MENU  .uno:TaskPaneInsertPage
+#define CMD_SID_PHOTOALBUM  .uno:PhotoAlbumDialog
 
 #endif
 
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index dbe34ed..1c8c5b9 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -527,6 +527,10 @@
 

[Libreoffice-commits] core.git: desktop/test

[Stephan Bergmann]

 desktop/test/deployment/passive/makefile.mk |  132 
 1 file changed, 132 deletions(-)

New commits:
commit aadde74084a4813ca2be0e777866d7676e7d6255
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Mar 7 12:05:36 2013 +0100

Remove obsoleted dmake makefile.mk

Change-Id: Iadf57ef1dfb7e108d1c7461e60705304f448ab78

diff --git a/desktop/test/deployment/passive/makefile.mk 
b/desktop/test/deployment/passive/makefile.mk
deleted file mode 100644
index b6a18fa..000
--- a/desktop/test/deployment/passive/makefile.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-PRJ = ../../..
-PRJNAME = desktop
-TARGET = test_deployment_passive
-
-ENABLE_EXCEPTIONS = TRUE
-
-PACKAGE = com/sun/star/comp/test/deployment/passive_java
-JAVAFILES = Dispatch.java Provider.java Services.java
-JARFILES = juh.jar ridl.jar unoil.jar
-
-my_platform_components = passive_native
-my_generic_components = passive_java passive_python
-
-.INCLUDE: settings.mk
-
-
-DLLPRE =
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1TARGET = passive_native.uno
-SHL1OBJS = $(SLO)/passive_native.obj
-SHL1RPATH = OXT
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
-
-.IF $(SOLAR_JAVA) != 
-
-ALLTAR : $(MISC)/passive.oxt
-
-$(MISC)/passive.oxt : manifest.xml description.xml Addons.xcu \
-ProtocolHandler.xcu $(MISC)/$(TARGET)/platform.components \
-$(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
-$(MISC)/$(TARGET)/passive_java.jar passive_python.py
-$(RM) $@
-$(RM) -r $(MISC)/$(TARGET)/passive.oxt-zip
-$(MKDIR) $(MISC)/$(TARGET)/passive.oxt-zip
-$(MKDIRHIER) $(MISC)/$(TARGET)/passive.oxt-zip/META-INF
-$(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g'  manifest.xml \
- $(MISC)/$(TARGET)/passive.oxt-zip/META-INF/manifest.xml
-$(COPY) description.xml Addons.xcu ProtocolHandler.xcu \
-$(MISC)/$(TARGET)/platform.components \
-$(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
-$(MISC)/$(TARGET)/passive_java.jar passive_python.py \
-$(MISC)/$(TARGET)/passive.oxt-zip/
-cd $(MISC)/$(TARGET)/passive.oxt-zip  zip ../../passive.oxt \
-META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
-platform.components generic.components $(SHL1TARGETN:f) \
-passive_java.jar passive_python.py
-
-$(MISC)/$(TARGET)/platform.components : $(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/platform.components.input \
-$(my_platform_components:^$(MISC)/$(TARGET)/:+.component)
-$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/platform.components.input
-
-$(MISC)/$(TARGET)/platform.components.input :
-$(MKDIRHIER) $(@:d)
-echo 'list' \
-'$(my_platform_components:^filename:+.component/filename)' \
-'/list'  $@
-
-$(MISC)/$(TARGET)/generic.components : $(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/generic.components.input \
-$(my_generic_components:^$(MISC)/$(TARGET)/:+.component)
-$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
-$(SOLARENV)/bin/packcomponents.xslt \
-$(MISC)/$(TARGET)/generic.components.input
-
-$(MISC)/$(TARGET)/generic.components.input :
-$(MKDIRHIER) $(@:d)
-echo 'list' \
-'$(my_generic_components:^filename:+.component/filename)' \
-'/list'  $@
-
-$(MISC)/$(TARGET)/passive_native.component : \
-$(SOLARENV)/bin/createcomponent.xslt passive_native.component
-$(MKDIRHIER) $(@:d)
-$(XSLTPROC) --nonet --stringparam uri \
-'$(COMPONENTPREFIX_EXTENSION)$(SHL1TARGETN:f)' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt passive_native.component
-
-$(MISC)/$(TARGET)/passive_java.component : \
-$(SOLARENV)/bin/createcomponent.xslt passive_java.component
-$(MKDIRHIER) $(@:d)
-$(XSLTPROC) --nonet --stringparam uri \
-'$(COMPONENTPREFIX_EXTENSION)passive_java.jar' -o $@ \
-$(SOLARENV)/bin/createcomponent.xslt 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 3 commits - sw/source

[Cédric Bosdonnat]

 sw/source/core/crsr/crsrsh.cxx  |   34 ---
 sw/source/ui/docvw/edtwin.cxx   |  368 +++-
 sw/source/ui/inc/edtwin.hxx |2 
 sw/source/ui/shells/txtcrsr.cxx |   19 ++
 4 files changed, 236 insertions(+), 187 deletions(-)

New commits:
commit 5f62f0d65d89627eea17bffcea5f2821f9869629
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Fri Nov 23 17:51:16 2012 +0100

bnc#80 fdo#52182: Fixed click in frames located in header/footer

Using a distance to click to select the best object to select between
normal text and background object.

(cherry picked from commit e8fbe97900f13305b17015d9044993bde4adab36)

Conflicts:
sw/source/core/layout/trvlfrm.cxx
sw/source/ui/docvw/edtwin.cxx

Change-Id: Ib5b53161c7af2c16f4df379382f2e53fc6d8092b

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 96e3f9c..814f677 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2658,7 +2658,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
 // How many clicks do we need to select a fly frame?
 FrameControlType eControl;
 bool bOverFly = false;
-bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, eControl, 
bOverFly );
+bool bPageAnchored = false;
+bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, eControl, 
bOverFly, bPageAnchored );
 
 sal_Bool bIsDocReadOnly = rView.GetDocShell()-IsReadOnly();
 if (bOverHeaderFooterFly  (!bIsDocReadOnly  rSh.GetCurFld()))
@@ -2667,8 +2668,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
 
 int nNbFlyClicks = 1;
 // !bOverHeaderFooterFly doesn't mean we have a frame to select
-if ( ( rSh.IsHeaderFooterEdit( )  !bOverHeaderFooterFly  bOverFly ) ||
- ( !rSh.IsHeaderFooterEdit( )  bOverHeaderFooterFly ) )
+if ( !bPageAnchored  ( ( rSh.IsHeaderFooterEdit( )  
!bOverHeaderFooterFly  bOverFly ) ||
+ ( !rSh.IsHeaderFooterEdit( )  bOverHeaderFooterFly ) ) )
 {
 nNbFlyClicks = 2;
 if ( _rMEvt.GetClicks( )  nNbFlyClicks )
@@ -4847,9 +4848,10 @@ void SwEditWin::Command( const CommandEvent rCEvt )
 // Don't trigger the command on a frame anchored to header/footer 
is not editing it
 FrameControlType eControl;
 bool bOverFly = false;
-bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, 
eControl, bOverFly );
+bool bPageAnchored = false;
+bool bOverHeaderFooterFly = IsOverHeaderFooterFly( aDocPos, 
eControl, bOverFly, bPageAnchored );
 // !bOverHeaderFooterFly doesn't mean we have a frame to select
-if ( rCEvt.IsMouseEvent( ) 
+if ( !bPageAnchored  rCEvt.IsMouseEvent( ) 
  ( ( rSh.IsHeaderFooterEdit( )  !bOverHeaderFooterFly  
bOverFly ) ||
( !rSh.IsHeaderFooterEdit( )  bOverHeaderFooterFly ) ) )
 {
@@ -5875,13 +5877,13 @@ bool SwEditWin::IsInHeaderFooter( const Point rDocPt, 
FrameControlType rContro
 return false;
 }
 
-bool SwEditWin::IsOverHeaderFooterFly( const Point rDocPos, FrameControlType 
rControl, bool bOverFly ) const
+bool SwEditWin::IsOverHeaderFooterFly( const Point rDocPos, FrameControlType 
rControl, bool bOverFly, bool bPageAnchored ) const
 {
 bool bRet = false;
 Point aPt( rDocPos );
 SwWrtShell rSh = rView.GetWrtShell();
 SwPaM aPam( *rSh.GetCurrentShellCursor().GetPoint() );
-rSh.GetLayout()-GetCrsrOfst( aPam.GetPoint(), aPt );
+rSh.GetLayout()-GetCrsrOfst( aPam.GetPoint(), aPt, NULL, true );
 
 const SwStartNode* pStartFly = 
aPam.GetPoint()-nNode.GetNode().FindFlyStartNode();
 if ( pStartFly )
@@ -5902,6 +5904,8 @@ bool SwEditWin::IsOverHeaderFooterFly( const Point 
rDocPos, FrameControlType r
 else if ( bInFooter )
 rControl = Footer;
 }
+else
+bPageAnchored = pFlyFmt-GetAnchor( ).GetAnchorId( ) == 
FLY_AT_PAGE;
 }
 }
 else
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 22258b5..56cf88f 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -232,7 +232,7 @@ protected:
 /// Returns true if in header/footer area, or in the header/footer control.
 boolIsInHeaderFooter( const Point rDocPt, FrameControlType rControl 
) const;
 
-boolIsOverHeaderFooterFly( const Point rDocPos, FrameControlType 
rControl, bool bOverFly ) const;
+boolIsOverHeaderFooterFly( const Point rDocPos, FrameControlType 
rControl, bool bOverFly, bool bPageAnchored ) const;
 public:
 
 voidUpdatePointer(const Point , sal_uInt16 nButtons = 0);
commit b8f89be03838a046d86f6a1c77e5585140a82d5d
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Nov 22 10:47:17 2012 +0100

bnc#80 Header/Footer: fixed the selection of frames anchored to 

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

[Herbert Dürr]

 vcl/source/fontsubset/cff.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit be5587ce0c13901acffe664d71bf22f0cb60918a
Author: Herbert Dürr h...@apache.org
Date:   Thu Jun 14 08:42:47 2012 +

c#705440# check ftell return value when emitting Type1 subset

Conflicts:
vcl/source/fontsubset/cff.cxx

Change-Id: Idaf328b48a55fbcef13746f74120c13b6b435c93

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index dabc634..43e397c 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1920,10 +1920,11 @@ size_t Type1Emitter::updateLen( int nTellPos, size_t 
nLength)
 cData[1] = static_castU8(nLength   8);
 cData[2] = static_castU8(nLength  16);
 cData[3] = static_castU8(nLength  24);
-const int nCurrPos = ftell( mpFileOut);
+const long nCurrPos = ftell( mpFileOut);
 fseek( mpFileOut, nTellPos, SEEK_SET);
 size_t nWrote = fwrite( cData, 1, sizeof(cData), mpFileOut);
-fseek( mpFileOut, nCurrPos, SEEK_SET);
+if( nCurrPos = 0)
+fseek( mpFileOut, nCurrPos, SEEK_SET);
 return nWrote;
 }
 
commit ce740afe80a3230dd66b820f428467b82b89dee2
Author: Herbert Dürr h...@apache.org
Date:   Thu Jun 14 08:32:39 2012 +

c#705441# handle invalid FDSelect entry while emitting Type1

Change-Id: I1865eec0dcb29c74e98a6f42f7cf37a2851f8e85

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 55e5897..dabc634 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -2257,6 +2257,8 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter 
rEmitter,
 assert( (nGlyphId = 0)  (nGlyphId  mnCharStrCount));
 // get privdict context matching to the glyph
 const int nFDSelect = getFDSelect( nGlyphId);
+if( nFDSelect  0)
+continue;
 mpCffLocal = maCffLocal[ nFDSelect];
 // convert the Type2op charstring to its Type1op counterpart
 const int nT2Len = seekIndexData( mnCharStrBase, nGlyphId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 36/92b4392cfbc05cef4a2073e86d5033589a3aee

[Caolán McNamara]

 36/92b4392cfbc05cef4a2073e86d5033589a3aee |1 +
 1 file changed, 1 insertion(+)

New commits:
commit af5b396aec40aee924e0c2cd11a4cafaa06132b5
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 11:38:13 2013 +

Notes added by 'git notes add'

diff --git a/36/92b4392cfbc05cef4a2073e86d5033589a3aee 
b/36/92b4392cfbc05cef4a2073e86d5033589a3aee
new file mode 100644
index 000..be38108
--- /dev/null
+++ b/36/92b4392cfbc05cef4a2073e86d5033589a3aee
@@ -0,0 +1 @@
+merged as: ce740afe80a3230dd66b820f428467b82b89dee2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8c/0676da012cd4e680e2e2e1c561c29aae12ee01

[Caolán McNamara]

 8c/0676da012cd4e680e2e2e1c561c29aae12ee01 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c0af5ccabebf3d6a302954873a9250753e25b2d1
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 11:38:33 2013 +

Notes added by 'git notes add'

diff --git a/8c/0676da012cd4e680e2e2e1c561c29aae12ee01 
b/8c/0676da012cd4e680e2e2e1c561c29aae12ee01
new file mode 100644
index 000..7e386f8
--- /dev/null
+++ b/8c/0676da012cd4e680e2e2e1c561c29aae12ee01
@@ -0,0 +1 @@
+merged as: be5587ce0c13901acffe664d71bf22f0cb60918a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 41/7ef5a8edbf0177ead8459b4eca12a309f6c053

[Caolán McNamara]

 41/7ef5a8edbf0177ead8459b4eca12a309f6c053 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2c31eba20671b298e275c8df4b00259f4c638d5a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 11:39:00 2013 +

Notes added by 'git notes add'

diff --git a/41/7ef5a8edbf0177ead8459b4eca12a309f6c053 
b/41/7ef5a8edbf0177ead8459b4eca12a309f6c053
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/41/7ef5a8edbf0177ead8459b4eca12a309f6c053
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ee/9d2a5f7b3104376a4c3eb06c0972e8b304cdb8

[Caolán McNamara]

 ee/9d2a5f7b3104376a4c3eb06c0972e8b304cdb8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fef4b32c73d24ab9549c79eee2e052bbd4adfbac
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 11:39:16 2013 +

Notes added by 'git notes add'

diff --git a/ee/9d2a5f7b3104376a4c3eb06c0972e8b304cdb8 
b/ee/9d2a5f7b3104376a4c3eb06c0972e8b304cdb8
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/ee/9d2a5f7b3104376a4c3eb06c0972e8b304cdb8
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7e/025048db88a5b2c9e37d72971436efa437c26b

[Caolán McNamara]

 7e/025048db88a5b2c9e37d72971436efa437c26b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d0fa1df3482b108387a812c48f260591e470c538
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 11:40:15 2013 +

Notes added by 'git notes add'

diff --git a/7e/025048db88a5b2c9e37d72971436efa437c26b 
b/7e/025048db88a5b2c9e37d72971436efa437c26b
new file mode 100644
index 000..e9c27e1
--- /dev/null
+++ b/7e/025048db88a5b2c9e37d72971436efa437c26b
@@ -0,0 +1 @@
+prefer: 23854ea235ef32232f34c6ff121f005310f8c01b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - db/960511eeb40e88eeb6597b9b593c9a739e873c

[Caolán McNamara]

 db/960511eeb40e88eeb6597b9b593c9a739e873c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6091e4201b98fb86871d76f05f3dd822e6eb0620
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 11:47:14 2013 +

Notes added by 'git notes add'

diff --git a/db/960511eeb40e88eeb6597b9b593c9a739e873c 
b/db/960511eeb40e88eeb6597b9b593c9a739e873c
new file mode 100644
index 000..973303c
--- /dev/null
+++ b/db/960511eeb40e88eeb6597b9b593c9a739e873c
@@ -0,0 +1 @@
+prefer: 66dc20ae279e4f913795ff6e959d83eaefed78b4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muthu Subramanian]

 sd/source/ui/view/drtxtob.cxx |   22 +-
 1 file changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 0ed4da1a01e6cdfe44403a0686abe4aacea83dfb
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu Mar 7 18:17:01 2013 +0530

n#657905: Display the scaled fontsize in the toolbar.

Initial set of changes to improve UX for autofit.

diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 5ee3978..d29fc55 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -45,6 +45,7 @@
 #include editeng/outlobj.hxx
 #include editeng/writingmodeitem.hxx
 #include editeng/frmdiritem.hxx
+#include editeng/fhgtitem.hxx
 
 
 #include sfx2/objface.hxx
@@ -155,6 +156,8 @@ void TextObjectBar::GetAttrState( SfxItemSet rSet )
 case SID_ATTR_CHAR_WEIGHT:
 case SID_ATTR_CHAR_POSTURE:
 {
+sal_uInt16 stretchX = 100;
+sal_uInt16 stretchY = 100;
 SvxScriptSetItem aSetItem( nSlotId, GetPool() );
 aSetItem.GetItemSet().Put( aAttrSet, sal_False );
 
@@ -165,6 +168,7 @@ void TextObjectBar::GetAttrState( SfxItemSet rSet )
 // input language should be preferred over
 // current cursor position to detect script type
 OutlinerView* pOLV = mpView-GetTextEditOutlinerView();
+SdrOutliner *pOutliner = mpView-GetTextEditOutliner();
 
 if (mpView-ISA(OutlineView))
 {
@@ -172,6 +176,9 @@ void TextObjectBar::GetAttrState( SfxItemSet rSet )
 mpViewShell-GetActiveWindow());
 }
 
+if( pOutliner )
+pOutliner-GetGlobalCharStretching( stretchX, stretchY 
);
+
 if(pOLV  !pOLV-GetSelection().HasRange())
 {
 if( mpViewShell  mpViewShell-GetViewShell()  
mpViewShell-GetViewShell()-GetWindow() )
@@ -185,9 +192,22 @@ void TextObjectBar::GetAttrState( SfxItemSet rSet )
 
 const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScriptType 
);
 if( pI )
-aAttrSet.Put( *pI, nWhich );
+{
+if( nSlotId == SID_ATTR_CHAR_FONTHEIGHT )
+{
+SvxFontHeightItem aFontItem = *(dynamic_castconst 
SvxFontHeightItem *(pI));
+aFontItem.SetHeight(aFontItem.GetHeight(), stretchX, 
aFontItem.GetPropUnit());
+aAttrSet.Put( aFontItem, nWhich );
+}
+else
+{
+aAttrSet.Put( *pI, nWhich );
+}
+}
 else
+{
 aAttrSet.InvalidateItem( nWhich );
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Chr . Rossmanith]

 vcl/inc/vcl/combobox.hxx|   26 
 vcl/source/control/combobox.cxx |   65 
 2 files changed, 46 insertions(+), 45 deletions(-)

New commits:
commit cd2c3e72a73fd4b91f913d8e19693d4deb35b0c4
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Wed Mar 6 22:03:42 2013 +0100

Replaced XubString with OUString in vcl(combobox)

Change-Id: Ibe80e9837f1c8275d625e942eb75ecc8de897bf5
Reviewed-on: https://gerrit.libreoffice.org/2574
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index 9758281..22ee570 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.hxx
@@ -120,28 +120,28 @@ public:
 sal_uInt16  GetDropDownLineCount() const;
 
 voidEnableAutoSize( sal_Bool bAuto );
-sal_BoolIsAutoSizeEnabled() const   { return 
mbDDAutoSize; }
+sal_BoolIsAutoSizeEnabled() const   { return 
mbDDAutoSize; }
 
 voidEnableDDAutoWidth( sal_Bool b );
 
 virtual voidSetText( const OUString rStr );
 virtual voidSetText( const OUString rStr, const Selection 
rNewSelection );
 
-sal_uInt16  InsertEntry( const XubString rStr, sal_uInt16 nPos = 
COMBOBOX_APPEND );
-sal_uInt16  InsertEntry( const XubString rStr, const Image 
rImage, sal_uInt16 nPos = COMBOBOX_APPEND );
+sal_uInt16  InsertEntry( const OUString rStr, sal_uInt16 nPos = 
COMBOBOX_APPEND );
+sal_uInt16  InsertEntry( const OUString rStr, const Image rImage, 
sal_uInt16 nPos = COMBOBOX_APPEND );
 
-voidRemoveEntry( const XubString rStr );
+voidRemoveEntry( const OUString rStr );
 voidRemoveEntry( sal_uInt16 nPos );
 
 voidClear();
 
-sal_uInt16  GetEntryPos( const XubString rStr ) const;
+sal_uInt16  GetEntryPos( const OUString rStr ) const;
 Image   GetEntryImage( sal_uInt16 nPos ) const;
-XubString   GetEntry( sal_uInt16 nPos ) const;
-sal_uInt16  GetEntryCount() const;
+OUStringGetEntry( sal_uInt16 nPos ) const;
+sal_uInt16  GetEntryCount() const;
 
-sal_BoolIsTravelSelect() const;
-sal_BoolIsInDropDown() const;
+sal_BoolIsTravelSelect() const;
+sal_BoolIsInDropDown() const;
 voidToggleDropDown();
 
 longCalcWindowSizePixel( sal_uInt16 nLines ) const;
@@ -155,10 +155,10 @@ public:
 voidSetSeparatorPos( sal_uInt16 n = LISTBOX_ENTRY_NOTFOUND );
 
 voidEnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase 
= sal_False );
-sal_BoolIsAutocompleteEnabled() const;
+sal_BoolIsAutocompleteEnabled() const;
 
 voidEnableMultiSelection( sal_Bool bMulti );
-sal_BoolIsMultiSelectionEnabled() const;
+sal_BoolIsMultiSelectionEnabled() const;
 voidSetMultiSelectionSeparator( sal_Unicode cSep ) { 
mcMultiSep = cSep; }
 sal_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; }
 
@@ -174,8 +174,8 @@ public:
 SizeCalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
 voidGetMaxVisColumnsAndLines( sal_uInt16 rnCols, sal_uInt16 
rnLines ) const;
 
-voidSetMRUEntries( const XubString rEntries, sal_Unicode cSep 
= ';' );
-XubString   GetMRUEntries( sal_Unicode cSep = ';' ) const;
+voidSetMRUEntries( const OUString rEntries, sal_Unicode cSep 
= ';' );
+OUStringGetMRUEntries( sal_Unicode cSep = ';' ) const;
 voidSetMaxMRUCount( sal_uInt16 n );
 sal_uInt16  GetMaxMRUCount() const;
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 13e3f2e..867e649 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -34,11 +34,11 @@
 
 // ===
 
-static void lcl_GetSelectedEntries( ::std::set sal_uInt16  rSelectedPos, 
const XubString rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
+static void lcl_GetSelectedEntries( ::std::set sal_uInt16  rSelectedPos, 
const OUString rText, sal_Unicode cTokenSep, const ImplEntryList* pEntryList )
 {
-for (xub_StrLen n = comphelper::string::getTokenCount(rText, cTokenSep); 
n;)
+for (sal_Int32 n = comphelper::string::getTokenCount(rText, cTokenSep); n;)
 {
-XubString aToken = rText.GetToken( --n, cTokenSep );
+OUString aToken = rText.getToken( --n, cTokenSep );
 aToken = comphelper::string::strip(aToken, ' ');
 sal_uInt16 nPos = pEntryList-FindEntry( aToken );
 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -324,8 +324,8 @@ IMPL_LINK( 

[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/unx

[Radek Doulik]

 vcl/inc/salbmp.hxx  |2 
 vcl/inc/unx/salbmp.h|3 
 vcl/inc/unx/salgdi.h|5 +
 vcl/source/gdi/gdimtf.cxx   |   10 --
 vcl/unx/generic/gdi/salbmp.cxx  |2 
 vcl/unx/generic/gdi/salgdi2.cxx |  147 ++--
 6 files changed, 97 insertions(+), 72 deletions(-)

New commits:
commit 46e53913e9dcc84ffed8fb5f1b4959c70c7e5649
Author: Radek Doulik r...@novell.com
Date:   Thu Mar 7 13:31:34 2013 +0100

fix canvas bitmap rendering (argb32 pixmaps) fixes color issue in n#780830

Change-Id: I5242bbb171ba21da43e535255b7e9dd73c1d4930

diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 99b5e6a..03f9af9 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -47,6 +47,8 @@ public:
 virtual boolCreate( const ::com::sun::star::uno::Reference 
::com::sun::star::rendering::XBitmapCanvas  xBitmapCanvas,
 Size rSize,
 bool bMask = false ) = 0;
+virtual boolHasAlpha() const { return false; }
+virtual voidSetHasAlpha( bool ) { }
 virtual voidDestroy() = 0;
 virtual SizeGetSize() const = 0;
 virtual sal_uInt16  GetBitCount() const = 0;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 866412d..6973507 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -74,6 +74,7 @@ private:
 BitmapBuffer*   mpDIB;
 ImplSalDDB* mpDDB;
 boolmbGrey;
+boolmbHasAlpha;
 
 public:
 
@@ -148,6 +149,8 @@ public:
 virtual BitmapBuffer*   AcquireBuffer( bool bReadOnly );
 virtual voidReleaseBuffer( BitmapBuffer* pBuffer, bool 
bReadOnly );
 virtual boolGetSystemData( BitmapSystemData rData );
+virtual boolHasAlpha() const { return mbHasAlpha; }
+virtual voidSetHasAlpha( bool bHasAlpha ) { mbHasAlpha = 
bHasAlpha; }
 };
 
 // --
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index f1039e9..3684dd0 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -324,6 +324,11 @@ public:
  const SalBitmap rSourceBitmap,
  const SalBitmap rAlphaBitmap );
 
+booldrawAlphaBitmapOpt( const SalTwoRect,
+const SalBitmap rSourceBitmap,
+const SalBitmap rAlphaBitmap,
+bool bUseAlphaBitmap = true );
+
 virtual booldrawAlphaRect( long nX, long nY, long nWidth,
long nHeight, sal_uInt8 
nTransparency );
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index bf19753..a561d64 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -496,20 +496,16 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* 
pOut, const Point rPos, S
 }
 
 SalBitmap* pSalBmp = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
-SalBitmap* pSalMask = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
+pSalBmp-SetHasAlpha( true );
 
-if( pSalBmp-Create( xBitmapCanvas, aSize )  
pSalMask-Create( xBitmapCanvas, aSize, true ) )
+if( pSalBmp-Create( xBitmapCanvas, aSize ) )
 {
 Bitmap aBitmap( pSalBmp );
-Bitmap aMask( pSalMask );
-AlphaMask aAlphaMask( aMask );
-BitmapEx aBitmapEx( aBitmap, aAlphaMask );
-pOut-DrawBitmapEx( rPos, aBitmapEx );
+pOut-DrawBitmap( rPos, aBitmap );
 return true;
 }
 
 delete pSalBmp;
-delete pSalMask;
 }
 }
 }
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index aee24dd..faa04c7 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -42,6 +42,7 @@
 #include unx/salbmp.h
 #include unx/salinst.h
 #include unx/x11/xlimits.hxx
+#include xrender_peer.hxx
 
 #if defined HAVE_VALGRIND_HEADERS
 #include valgrind/memcheck.h
@@ -65,6 +66,7 @@ X11SalBitmap::X11SalBitmap()
 : mpDIB( NULL )
 , mpDDB( NULL )
 , mbGrey( false )
+, mbHasAlpha( false )
 {
 }
 
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 97d1924..4684842 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -495,7 +495,10 @@ void X11SalGraphics::drawBitmap( const SalTwoRect* 
pPosAry, const SalBitmap rSa
 XChangeGC( pXDisp, aGC, nValues, aNewVal );
 }
 
-static_castconst 

[PUSHED] Replaced XubString with OUString in vcl(combobox)

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2574

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2574
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe80e9837f1c8275d625e942eb75ecc8de897bf5
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

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

[Chr . Rossmanith]

 vcl/inc/vcl/field.hxx |   32 +--
 vcl/source/control/field.cxx  |8 
 vcl/source/control/field2.cxx |  377 --
 3 files changed, 204 insertions(+), 213 deletions(-)

New commits:
commit 3cad6c806e5247ce20b78eb688551aa5d872b934
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Fri Mar 1 21:47:10 2013 +0100

Replace (Xub)String with OUString in vcl(field)

Change-Id: I62fba60a4c6e1db870443a796e6338cddc934352
Reviewed-on: https://gerrit.libreoffice.org/2229
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 0f47d5f..ec661c6 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.hxx
@@ -51,7 +51,7 @@ private:
 sal_BoolmbDefaultLocale;
 
 protected:
-SAL_DLLPRIVATE void ImplSetText( const XubString rText, Selection* 
pNewSel = NULL );
+SAL_DLLPRIVATE void ImplSetText( const OUString rText, Selection* 
pNewSel = NULL );
 SAL_DLLPRIVATE sal_Bool ImplGetEmptyFieldValue() const  { return 
mbEmptyFieldValue; }
 
 voidSetEmptyFieldValueData( sal_Bool bValue ) { 
mbEmptyFieldValue = bValue; }
@@ -103,18 +103,18 @@ public:
 class VCL_DLLPUBLIC PatternFormatter : public FormatterBase
 {
 private:
-rtl::OString m_aEditMask;
-XubString   maFieldString;
-XubString   maLiteralMask;
-sal_uInt16  mnFormatFlags;
-sal_BoolmbSameMask;
-sal_BoolmbInPattKeyInput;
+OStringm_aEditMask;
+OUString   maFieldString;
+OUString   maLiteralMask;
+sal_uInt16 mnFormatFlags;
+sal_Bool   mbSameMask;
+sal_Bool   mbInPattKeyInput;
 
 protected:
 PatternFormatter();
 
-SAL_DLLPRIVATE void ImplSetMask(const rtl::OString rEditMask,
-const XubString rLiteralMask);
+SAL_DLLPRIVATE void ImplSetMask(const OString rEditMask,
+const OUString rLiteralMask);
 SAL_DLLPRIVATE sal_Bool ImplIsSameMask() const { return mbSameMask; }
 SAL_DLLPRIVATE sal_BoolImplGetInPattKeyInput() { return 
mbInPattKeyInput; }
 
@@ -123,16 +123,16 @@ public:
 
 virtual voidReformat();
 
-void SetMask(const rtl::OString rEditMask, const XubString rLiteralMask 
);
-const rtl::OString GetEditMask() const { return m_aEditMask; }
-const XubStringGetLiteralMask() const  { return maLiteralMask; }
+void SetMask(const OString rEditMask, const OUString rLiteralMask );
+const OString GetEditMask() const { return m_aEditMask; }
+const OUStringGetLiteralMask() const  { return maLiteralMask; }
 
 voidSetFormatFlags( sal_uInt16 nFlags ) { 
mnFormatFlags = nFlags; }
 sal_uInt16  GetFormatFlags() const { return mnFormatFlags; 
}
 
-voidSetString( const XubString rStr );
-XubString   GetString() const;
-sal_BoolIsStringModified() const { return 
!(GetString().Equals( maFieldString )); }
+voidSetString( const OUString rStr );
+OUStringGetString() const;
+sal_BoolIsStringModified() const { return !(GetString() == 
maFieldString ); }
 };
 
 // 
@@ -242,7 +242,7 @@ public:
 
 virtual voidSetUnit( FieldUnit meUnit );
 FieldUnit   GetUnit() const { return meUnit; }
-voidSetCustomUnitText( const XubString rStr );
+voidSetCustomUnitText( const OUString rStr );
 const OUString GetCustomUnitText() const { return 
maCustomUnitText; }
 const OUString GetCurUnitText() const { return maCurUnitText; }
 
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 344b106..c0037e9 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -393,7 +393,7 @@ const AllSettings FormatterBase::GetFieldSettings() const
 
 // ---
 
-void FormatterBase::ImplSetText( const XubString rText, Selection* 
pNewSelection )
+void FormatterBase::ImplSetText( const OUString rText, Selection* 
pNewSelection )
 {
 if ( mpField )
 {
@@ -1417,7 +1417,7 @@ double MetricField::ConvertDoubleValue( double nValue, 
sal_uInt16 nDigits,
 
 // ---
 
-static sal_Bool ImplMetricGetValue( const XubString rStr, double rValue, 
sal_Int64 nBaseValue,
+static sal_Bool ImplMetricGetValue( const OUString rStr, double rValue, 
sal_Int64 nBaseValue,
 sal_uInt16 nDecDigits, const 
LocaleDataWrapper rLocaleDataWrapper, FieldUnit eUnit )
 {
 // 

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

[Julien Nabet]

 extensions/source/plugin/base/xplugin.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7146eaf9b3a7ac49604d2400686bc86343468aeb
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Mar 1 18:32:32 2013 +0100

coverity#984440: Use after free

Change-Id: Ia6d62ce5421d51fe4fc0128f60e9b39ab736276b
Reviewed-on: https://gerrit.libreoffice.org/2496
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index ea77d38..a456c63 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -444,9 +444,8 @@ void XPlugin_Impl::modelChanged()
 
 m_nProvidingState = PROVIDING_MODEL_UPDATE;
 
-destroyInstance();
-
 m_aDescription = fitDescription( getCreationURL() );
+destroyInstance();
 if( m_aDescription.Mimetype.isEmpty() )
 {
 m_nProvidingState = PROVIDING_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Replace (Xub)String with OUString in vcl(field)

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2229

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2229
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62fba60a4c6e1db870443a796e6338cddc934352
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com

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

[PUSHED] coverity#984440: Use after free

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2496

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2496
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6d62ce5421d51fe4fc0128f60e9b39ab736276b
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com

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

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

[Julien Nabet]

 svx/source/tbxctrls/tbcontrl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 70a9c8cd09c12ba67071ec14d16d5a5a8add7f2c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Mar 1 20:07:05 2013 +0100

coverity#982283: Resource leak in object

Change-Id: Iedf1c0ec56064dbeaa20bb75114fb86a19c38ed9
Reviewed-on: https://gerrit.libreoffice.org/2500
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5ac2fe3..aac889d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1831,6 +1831,7 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl(
 // ---
 SvxStyleToolBoxControl::~SvxStyleToolBoxControl()
 {
+delete pImpl;
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arnaud Versini]

 sd/source/ui/remotecontrol/Server.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d1273b428e60a3bd20fe57400e21dbb605879fb3
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Sun Feb 10 10:28:08 2013 +0100

sdremote : Remove pointer to deleted RemoteServer on error case

Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
Reviewed-on: https://gerrit.libreoffice.org/2081
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sd/source/ui/remotecontrol/Server.cxx 
b/sd/source/ui/remotecontrol/Server.cxx
index 561dac1..5b53b87 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -81,18 +81,21 @@ void RemoteServer::execute()
 if (!xContext.is() || 
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
 {
 SAL_INFO(sdremote, not in experimental mode, disabling TCP server);
+spServer = NULL;
 return;
 }
 osl::SocketAddr aAddr( 0, PORT );
 if ( !mSocket.bind( aAddr ) )
 {
 SAL_WARN( sdremote, bind failed  mSocket.getErrorAsString() );
+spServer = NULL;
 return;
 }
 
 if ( !mSocket.listen(3) )
 {
 SAL_WARN( sdremote, listen failed  mSocket.getErrorAsString() );
+spServer = NULL;
 return;
 }
 while ( true )
@@ -102,6 +105,7 @@ void RemoteServer::execute()
 if ( mSocket.acceptConnection( aSocket ) == osl_Socket_Error )
 {
 SAL_WARN( sdremote, accept failed  
mSocket.getErrorAsString() );
+spServer = NULL;
 return; // Closed, or other issue.
 }
 BufferedStreamSocket *pSocket = new BufferedStreamSocket( aSocket);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] coverity#982283: Resource leak in object

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2500

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2500
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf1c0ec56064dbeaa20bb75114fb86a19c38ed9
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr

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

[PUSHED] sdremote : Remove pointer to deleted RemoteServer on error c...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/2081

Approvals:
  Thomas Arnhold: Verified; Looks good to me, but someone else must approve
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/2081
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0fcbf46c907b94f1233acfbd84036b85ca388a3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

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

[Fridrich Štrba]

 vcl/source/control/field2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81b3adfcf22f53951f071596e7a0c81b47fb47ea
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 7 14:03:00 2013 +0100

Oops, this is a conflict resolution problem

Change-Id: I809de78066859a6b340ae5382d7f546c2db61f17

diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 1bfcd06..c6cc613 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2748,7 +2748,7 @@ void TimeFormatter::ImplSetUserTime( const Time 
rNewTime, Selection* pNewSelect
 aStr = OUString::number( n );
 aStr+= ImplGetLocaleDataWrapper().getTime100SecSep();
 if ( aNewTime.Get100Sec()  10 )
-aStr += '0';
+aStr += 0;
 aStr += OUString::number( aNewTime.Get100Sec() );
 }
 else if ( mbDuration )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - instsetoo_native/util solenv/inc

[Andras Timar]

 instsetoo_native/util/openoffice.lst |8 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c4b8b59adee566833d4394b21508efdfda6bdcd6
Author: Andras Timar ati...@suse.com
Date:   Thu Mar 7 11:49:47 2013 +0100

Bump for 3.6-14

Change-Id: Ifbf4b9bb339226c42408b6f296f5c65cd2499cf1

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index f41d323..fbc383e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 13
+WINDOWSPATCHLEVEL 14
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-314
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-314
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-314
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 327aa2b..7a101e1 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:313)
-BUILD=313
+RSCREVISION=360m1(Build:314)
+BUILD=314
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
commit 474dc3741db5a2a345939c547935dc760451aceb
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 5 14:34:51 2013 +0100

Bump for 3.6-13

Change-Id: I0ac607dc2cb903e803c13e491af3c7344d521782

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 4847b01..f41d323 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 11
+WINDOWSPATCHLEVEL 13
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-312
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-312
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-312
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index ad5cc96..327aa2b 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:312)
-BUILD=312
+RSCREVISION=360m1(Build:313)
+BUILD=313
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-13'

[Andras Timar]

Tag 'suse-3.6-13' created by Andras Timar ati...@suse.com at 2013-03-06 08:29 
-0800

suse-3.6-13

Changes since suse-3.6-12-18:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-13'

[Libreoffice Gerrit user]

Tag 'suse-3.6-13' created by Andras Timar ati...@suse.com at 2013-03-06 08:29 
-0800

suse-3.6-13

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-13'

[Petr Mladek]

Tag 'suse-3.6-13' created by Andras Timar ati...@suse.com at 2013-03-06 08:29 
-0800

suse-3.6-13

Changes since suse-3.6-12:
Andras Timar (3):
  updated pt-PT spelling dictionary
  fdo#56130 update Galician dictionary pack
  Update pt-PT dictionary

Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Lior Kaplan (1):
  Update Hebrew dictionary to one created with Hspell 1.2 (taken from 
Fedora 17 64bit)

Olivier Hallot (1):
  Fix for fdo#53520, Portuguese spelling files

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 dictionaries/pt_PT/description.xml |2 
 dictionaries/pt_PT/pt_PT.dic   |  257 -
 2 files changed, 144 insertions(+), 115 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-13'

[Petr Mladek]

Tag 'suse-3.6-13' created by Andras Timar ati...@suse.com at 2013-03-06 08:29 
-0800

suse-3.6-13

Changes since suse-3.6-12:
Fridrich Å trba (2):
  Branch libreoffice-3-6-5
  Version 3.6.5.2, tag libreoffice-3.6.5.2

Petr Mladek (1):
  Merge tag 'libreoffice-3.6.5.2' into suse-3.6

---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-13'

[Andras Timar]

Tag 'suse-3.6-13' created by Andras Timar ati...@suse.com at 2013-03-06 08:29 
-0800

suse-3.6-13

Changes since suse-3.6-0-3:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - drawinglayer/source vcl/win

[Herbert Dürr]

 drawinglayer/source/processor3d/zbufferprocessor3d.cxx |8 
 vcl/win/source/gdi/salgdi3.cxx |   12 
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 736a63b25f5744b245edc31061b4105a5e8465e0
Author: Herbert Dürr h...@apache.org
Date:   Fri Jun 15 08:30:03 2012 +

Resolves: #i119997# fix a memory leak by WinGlyphFallbackSubstitution

Patch by: Chao Huang
Found by: Chao Huang
Review by: hdu

Conflicts:
vcl/win/source/gdi/salgdi3.cxx

Change-Id: I6cde84b54a42fd8951d68280fac9dccd2b2e5c4a

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index a410028..3df9f64 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -589,23 +589,27 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( 
FontSelectPattern rFon
 }
 
 // last level fallback, check each font type face one by one
-const ImplGetDevFontList* pTestFontList = pDevFontList-GetDevFontList();
+ImplGetDevFontList* pTestFontList = pDevFontList-GetDevFontList();
 // limit the count of fonts to be checked to prevent hangs
 static const int MAX_GFBFONT_COUNT = 600;
 int nTestFontCount = pTestFontList-Count();
 if( nTestFontCount  MAX_GFBFONT_COUNT )
 nTestFontCount = MAX_GFBFONT_COUNT;
 
+bool bFound = false;
 for( int i = 0; i  nTestFontCount; ++i )
 {
 const PhysicalFontFace* pFace = pTestFontList-Get( i );
-if( !HasMissingChars( pFace, rMissingChars ) )
+bFound = HasMissingChars( pFace, rMissingChars );
+if( !bFound )
 continue;
 rFontSelData.maSearchName = pFace-GetFamilyName();
-return true;
+break;
 }
 
-return false;
+delete pTestFontList;
+
+return bFound;
 }
 
 // ===
commit 2c85769d94a8caaa62be83ce6c94ad31b57f8723
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 12:54:21 2013 +

make sure Release is called if one of two Acquires failed

checking the body of ReleaseAccess in vcl its safe to pass
NULL to them, so keep it simple

Change-Id: I5f057f9c79f0787d670869af4114c989e7f1562a

diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx 
b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 5bdb354..31c96f8 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -56,7 +56,7 @@ namespace
 BitmapWriteAccess* pContent = aContent.AcquireWriteAccess();
 BitmapWriteAccess* pAlpha = aAlpha.AcquireWriteAccess();
 
-if(pContent  pAlpha)
+if (pContent  pAlpha)
 {
 if(mnAntiAlialize)
 {
@@ -117,11 +117,11 @@ namespace
 }
 }
 }
-
-aContent.ReleaseAccess(pContent);
-aAlpha.ReleaseAccess(pAlpha);
 }
 
+aAlpha.ReleaseAccess(pAlpha);
+aContent.ReleaseAccess(pContent);
+
 aRetval = BitmapEx(aContent, aAlpha);
 
 // #i101811# set PrefMapMode and PrefSize at newly created Bitmap
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4d/dba09711e20143d8b2fe97c0391ae62ca521eb

[Caolán McNamara]

 4d/dba09711e20143d8b2fe97c0391ae62ca521eb |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 139047c4a28cd496a8d93cdefb629102d35c065f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:14:06 2013 +

Notes added by 'git notes add'

diff --git a/4d/dba09711e20143d8b2fe97c0391ae62ca521eb 
b/4d/dba09711e20143d8b2fe97c0391ae62ca521eb
new file mode 100644
index 000..86c5275
--- /dev/null
+++ b/4d/dba09711e20143d8b2fe97c0391ae62ca521eb
@@ -0,0 +1 @@
+prefer: 2c85769d94a8caaa62be83ce6c94ad31b57f8723
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c6/4ec7e2c6fcba73442db2a9cb8183ad9ee48930

[Caolán McNamara]

 c6/4ec7e2c6fcba73442db2a9cb8183ad9ee48930 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e77cd02bd614de83fe7403a6055ec1b83a30a5da
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:14:34 2013 +

Notes added by 'git notes add'

diff --git a/c6/4ec7e2c6fcba73442db2a9cb8183ad9ee48930 
b/c6/4ec7e2c6fcba73442db2a9cb8183ad9ee48930
new file mode 100644
index 000..d501627
--- /dev/null
+++ b/c6/4ec7e2c6fcba73442db2a9cb8183ad9ee48930
@@ -0,0 +1 @@
+merged as: 736a63b25f5744b245edc31061b4105a5e8465e0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 95/5ae0c3792e65844935c765144c1bed051a7c49

[Caolán McNamara]

 95/5ae0c3792e65844935c765144c1bed051a7c49 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a273b6137f989be12d49ecbe4da0b1e84ad4600d
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:18:09 2013 +

Notes added by 'git notes add'

diff --git a/95/5ae0c3792e65844935c765144c1bed051a7c49 
b/95/5ae0c3792e65844935c765144c1bed051a7c49
new file mode 100644
index 000..60af737
--- /dev/null
+++ b/95/5ae0c3792e65844935c765144c1bed051a7c49
@@ -0,0 +1 @@
+prefer: 980cf32beb48ef0799794b2bc133fe1adb018bf3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d5/586cce56c28ca02f2888d0db4b22948f06a220

[Caolán McNamara]

 d5/586cce56c28ca02f2888d0db4b22948f06a220 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 08c27ad42b70c104b9f43db4963cddfaab602c0f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:18:36 2013 +

Notes added by 'git notes add'

diff --git a/d5/586cce56c28ca02f2888d0db4b22948f06a220 
b/d5/586cce56c28ca02f2888d0db4b22948f06a220
new file mode 100644
index 000..60af737
--- /dev/null
+++ b/d5/586cce56c28ca02f2888d0db4b22948f06a220
@@ -0,0 +1 @@
+prefer: 980cf32beb48ef0799794b2bc133fe1adb018bf3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Missing service SvgWriter - forgotten when rebasing with AOO

[Michael Meeks]

Hi Fernand,

On Thu, 2013-03-07 at 08:45 +0100, Fernand Vanrie wrote:
 any change the SVG stuff and this repairs happens also for later 3.6 
 releases ?

That seems unlikely; one reason is that I'd expect the SVG code to be
significantly different for 3.6 :-)

HTH,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 98/0cf32beb48ef0799794b2bc133fe1adb018bf3

[Caolán McNamara]

 98/0cf32beb48ef0799794b2bc133fe1adb018bf3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6815ed24f4f2dffed3682fdf3fcaafa30a65aece
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:25:21 2013 +

Notes added by 'git notes add'

diff --git a/98/0cf32beb48ef0799794b2bc133fe1adb018bf3 
b/98/0cf32beb48ef0799794b2bc133fe1adb018bf3
new file mode 100644
index 000..55b156b
--- /dev/null
+++ b/98/0cf32beb48ef0799794b2bc133fe1adb018bf3
@@ -0,0 +1 @@
+prefer: 955ae0c3792e65844935c765144c1bed051a7c49
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9b/ede9d1069c760f1184206b403173695b3a6a00

[Caolán McNamara]

 9b/ede9d1069c760f1184206b403173695b3a6a00 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c6730e138b3687f48a9591949ef261942b6a19be
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:26:27 2013 +

Notes added by 'git notes add'

diff --git a/9b/ede9d1069c760f1184206b403173695b3a6a00 
b/9b/ede9d1069c760f1184206b403173695b3a6a00
new file mode 100644
index 000..55b156b
--- /dev/null
+++ b/9b/ede9d1069c760f1184206b403173695b3a6a00
@@ -0,0 +1 @@
+prefer: 955ae0c3792e65844935c765144c1bed051a7c49
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Impress Remote Android Version

[Michael Meeks]

Hi Samuel,

On Thu, 2013-03-07 at 07:25 +0100, Samuel Mehrbrodt wrote:
 Is there a reason why Impress Remote requires Android 2.3 at least?

Perhaps not ;-) but perhaps so - (ie. no idea). It'd be worth testing
the coverflow-ness with a 2.2 phone, and downgrading the ABI there and
building it to have a play.

 I have an Android 2.2 Phone and I'm not the only one:
 http://developer.android.com/about/dashboards/index.html

Sure sure. We currently build and test against API 10.

 What would be the effort to make it work with 2.2?

It might 'just work' - IIRC there were issues with coverflow, but -
have a build / test and try it out.

It's actually reasonably easy to build the sdremote; you don't need to
build all of LibreOffice. Proceed with the configure / deps as if you're
cross-compiling the whole suite to Android. Then don't run make - just
do:

cd android/sdremote
make

And - you -should- get a small .apk that does it for you; and if not we
should fix that ;-)

How does that sound ?

Thanks !

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d5/586cce56c28ca02f2888d0db4b22948f06a220

[Caolán McNamara]

 d5/586cce56c28ca02f2888d0db4b22948f06a220 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be5953075ca2566c6cef6acb0d85fc0b64973575
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:27:26 2013 +

Notes added by 'git notes add'

diff --git a/d5/586cce56c28ca02f2888d0db4b22948f06a220 
b/d5/586cce56c28ca02f2888d0db4b22948f06a220
index 60af737..55b156b 100644
--- a/d5/586cce56c28ca02f2888d0db4b22948f06a220
+++ b/d5/586cce56c28ca02f2888d0db4b22948f06a220
@@ -1 +1 @@
-prefer: 980cf32beb48ef0799794b2bc133fe1adb018bf3
+prefer: 955ae0c3792e65844935c765144c1bed051a7c49
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#57950: Remove chained appends in codemaker

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2583

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/2583/1

fdo#57950: Remove chained appends in codemaker

And another cleanups like removing RTL_CONST* macros and other simple
things.

Much more can be done inside codemaker.

Change-Id: I338e1c0e88558124741c6202896355533535a129
---
M codemaker/source/codemaker/codemaker.cxx
M codemaker/source/commoncpp/commoncpp.cxx
M codemaker/source/commonjava/commonjava.cxx
M codemaker/source/cppumaker/cpputype.cxx
M codemaker/source/javamaker/javatype.cxx
5 files changed, 44 insertions(+), 108 deletions(-)



diff --git a/codemaker/source/codemaker/codemaker.cxx 
b/codemaker/source/codemaker/codemaker.cxx
index 454f59c..6c203bf 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -66,11 +66,8 @@
 return s;
 }
 
-rtl::OString errorMsg(rtl::OString const  desc, rtl::OString const  type) {
-rtl::OStringBuffer msg(128);
-msg.append(desc);
-msg.append(type);
-return msg.makeStringAndClear();
+OString errorMsg(OString const  desc, OString const  type) {
+return desc + type;
 }
 
 codemaker::UnoType::Sort decomposeAndResolve(
diff --git a/codemaker/source/commoncpp/commoncpp.cxx 
b/codemaker/source/commoncpp/commoncpp.cxx
index 989052d..5db10d4 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -37,7 +37,7 @@
 
 namespace codemaker { namespace cpp {
 
-rtl::OString scopedCppName(rtl::OString const  type, bool ns_alias)
+OString scopedCppName(OString const  type, bool ns_alias)
 {
 char c('/');
 sal_Int32 nPos = type.lastIndexOf( c );
@@ -49,12 +49,11 @@
 c = '.';
 }
 
-rtl::OStringBuffer tmpBuf(type.getLength()*2);
+OStringBuffer tmpBuf(type.getLength()*2);
 nPos = 0;
 do
 {
-tmpBuf.append(::);
-tmpBuf.append(type.getToken(0, c, nPos));
+tmpBuf.append(:: + type.getToken(0, c, nPos));
 } while( nPos != -1 );
 
 rtl::OString s(tmpBuf.makeStringAndClear());
@@ -67,16 +66,16 @@
 }
 
 
-rtl::OString translateUnoToCppType(
+OString translateUnoToCppType(
 codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-rtl::OString const  nucleus, bool shortname)
+OString const  nucleus, bool shortname)
 {
 rtl::OStringBuffer buf;
 if (sort == codemaker::UnoType::SORT_COMPLEX) {
 if (typeClass == RT_TYPE_INTERFACE
  nucleus == rtl::OString(com/sun/star/uno/XInterface))
 {
-
buf.append(RTL_CONSTASCII_STRINGPARAM(::com::sun::star::uno::XInterface));
+buf.append(::com::sun::star::uno::XInterface);
 } else {
 //TODO: check that nucleus is a valid (UTF-8) identifier
 buf.append(nucleus);
@@ -303,10 +302,7 @@
 || unoIdentifier == NDEBUG
 || (forbidden != 0  unoIdentifier == *forbidden) )
 {
-rtl::OStringBuffer buf(prefix);
-buf.append('_');
-buf.append(unoIdentifier);
-return buf.makeStringAndClear();
+return prefix + _ + unoIdentifier;
 } else {
 return unoIdentifier;
 }
diff --git a/codemaker/source/commonjava/commonjava.cxx 
b/codemaker/source/commonjava/commonjava.cxx
index 8c01be9..e5f6eca 100644
--- a/codemaker/source/commonjava/commonjava.cxx
+++ b/codemaker/source/commonjava/commonjava.cxx
@@ -39,16 +39,15 @@
 
 namespace codemaker { namespace java {
 
-rtl::OString translateUnoToJavaType(
+OString translateUnoToJavaType(
 codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-rtl::OString const  nucleus, bool referenceType)
+OString const  nucleus, bool referenceType)
 {
-rtl::OStringBuffer buf;
+OStringBuffer buf;
 if (sort == codemaker::UnoType::SORT_COMPLEX) {
-if (typeClass == RT_TYPE_INTERFACE
- nucleus == rtl::OString(com/sun/star/uno/XInterface))
+if (typeClass == RT_TYPE_INTERFACE  nucleus == 
com/sun/star/uno/XInterface)
 {
-buf.append(RTL_CONSTASCII_STRINGPARAM(java/lang/Object));
+buf.append(java/lang/Object);
 } else {
 //TODO: check that nucleus is a valid (Java-modified UTF-8)
 // identifier
@@ -145,10 +144,7 @@
 || identifier == volatile
 || identifier == while)
 {
-rtl::OStringBuffer buf(prefix);
-buf.append('_');
-buf.append(identifier);
-return buf.makeStringAndClear();
+return prefix + _ + identifier;
 } else {
 return identifier;
 }
diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 29516c8..6ee5f9e 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -403,13 +403,10 @@
 
 OStringBuffer tmpBuf(length);
 
-tmpBuf.append(INCLUDED_);
-tmpBuf.append(m_typeName);
-

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

[Urs Fässler]

 sd/source/ui/app/menuids_tmpl.src  |   24 
 sd/source/ui/app/sddll.cxx |8 
 sd/source/ui/app/sddll2.cxx|4 ++--
 sd/source/ui/app/sdxfer.cxx|4 ++--
 sd/source/ui/app/strings.src   |2 +-
 sd/source/ui/app/tbxids_tmpl.src   |6 +++---
 sd/source/ui/app/toolbox2_tmpl.src |6 +++---
 7 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 32df45aeea30eb93c04e719b2a09e9313b912468
Author: Urs Fässler u...@bitzgi.ch
Date:   Fri Mar 1 15:52:56 2013 +0100

small translations of German comment in directory sd/source/ui/app

Change-Id: Ia24e98a57d2096729abfd1caaab895c689cac0fb

diff --git a/sd/source/ui/app/menuids_tmpl.src 
b/sd/source/ui/app/menuids_tmpl.src
index e71b628..f0d44c1 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -21,10 +21,10 @@
 #include helpids.h
 
 #define SEPARATOR   MenuItem { Separator = TRUE; };
- // DUMMY ist eine ID wo ein SubMenu folgt
- // (muss jeweils immer erhoeht werden!)
+ // DUMMY is a ID where a SubMenu is following
+ // (it has to be increased every time!)
 #define DUMMY 333
- // Nichtobjektbezogen
+ // not object related
 
 #define MN_DISTRIBUTE \
 MenuItem\
@@ -93,7 +93,7 @@
 Text [ en-US ] = ~Delete ; \
 };
 
- // Seiten-Attribute
+ // page attributes
 #define MN_MODIFY_PAGE \
 MenuItem\
 {\
@@ -270,7 +270,7 @@
 Text [ en-US ] = ~Rename Page ; \
 };
 
- // Grafik-Attribute
+ // graphic attributes
 #define MN_LINE \
 MenuItem\
 {\
@@ -343,7 +343,7 @@
 Text [ en-US ] = Edit ~Points ; \
 };
 
- // Anordnung
+ // arrangement
 #define MN_POSITION \
 MenuItem\
 {\
@@ -409,7 +409,7 @@
 };\
 };
 
- // Text-Elemente
+ // text elements
 #define MN_CHAR \
 MenuItem\
 {\
@@ -537,7 +537,7 @@
 Text [ en-US ] = S~pecial Character... ; \
 };
 
- // Text-Ausrichtung
+ // test orientation
 #define MN_TEXT_ALIGN\
 MenuItem\
 {\
@@ -580,7 +580,7 @@
 };\
 };
 
- // Objekt-Ausrichtung
+ // object orientation
 #define MN_OBJECT_ALIGN \
 MenuItem\
 {\
@@ -633,7 +633,7 @@
 };\
 };
 
- // Bezier-Funktionen
+ // Bezier functions
 #define MN_CLOSE_OBJECT \
 MenuItem\
 {\
@@ -714,7 +714,7 @@
 Text [ en-US ] = ~Reduce Points ; \
 };
 
- // Gruppen-/Kombination-Funktionen
+ // group/combination functions
 #define MN_GROUP \
 MenuItem\
 {\
@@ -804,7 +804,7 @@
 Text [ en-US ] = Presentation ~Object... ; \
 };
 
- // Diverse allgemeine Funktionen
+ // diverse common functions
 #define MN_DELETE \
 MenuItem\
 {\
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index ba7bab9..d76fedf 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -102,16 +102,16 @@ void SdDLL::Init()
 // register your controllers here
 RegisterControllers();
 
-// SvDraw-Felder registrieren
+// register SvDraw-Fields
 SdrRegisterFieldClasses();
 
-// 3D-Objekt-Factory eintragen
+// register 3D-Objekt-Factory
 E3dObjFactory();
 
-// ::com::sun::star::form::component::Form-Objekt-Factory eintragen
+// register ::com::sun::star::form::component::Form-Object-Factory
 FmFormObjFactory();
 
-// Objekt-Factory eintragen
+// register Object-Factory
 SdrObjFactory::InsertMakeUserDataHdl(LINK(aSdObjectFactory, 
SdObjectFactory, MakeUserData));
 
 // register your exotic remote controlls here
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 5df0aa7..25d3995 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -157,13 +157,13 @@ void SdDLL::RegisterControllers()
 SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
 SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
 
-// StatusBarControls registrieren
+// register StatusBarControls
 SvxZoomStatusBarControl::RegisterControl( SID_ATTR_ZOOM, pMod );
 SvxPosSizeStatusBarControl::RegisterControl( SID_ATTR_SIZE, pMod );
 SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
 SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
 
-// MenuControls fuer PopupMenu
+// MenuControls for PopupMenu
 SvxFontMenuControl::RegisterControl( SID_ATTR_CHAR_FONT, pMod );
 SvxFontSizeMenuControl::RegisterControl( SID_ATTR_CHAR_FONTHEIGHT, pMod );
 
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 873f56a..0f367f6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -299,7 +299,7 @@ void SdTransferable::CreateData()
 mbOwnDocument = sal_True;
 }
 
-// Groesse der Source-Seite uebernehmen
+// Use dimension of source page
 SdrPageView*pPgView = mpSdView-GetSdrPageView();
 SdPage* pOldPage = (SdPage*) 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0b/26cc15e781f91427952532d2bf1aa05533a2e9

[Caolán McNamara]

 0b/26cc15e781f91427952532d2bf1aa05533a2e9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 91fc1df6c56af849b3b9b0b722b34e2fa931063a
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 13:37:26 2013 +

Notes added by 'git notes add'

diff --git a/0b/26cc15e781f91427952532d2bf1aa05533a2e9 
b/0b/26cc15e781f91427952532d2bf1aa05533a2e9
new file mode 100644
index 000..3f7a0c4
--- /dev/null
+++ b/0b/26cc15e781f91427952532d2bf1aa05533a2e9
@@ -0,0 +1 @@
+prefer: 5d80ddea6888fbe075907ea427105900906b57dd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/liblibo' - desktop/source

[Michael Meeks]

 desktop/source/lib/init.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit e1aefb4d5c2de12ec37e6172733379a8209511a8
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Mar 7 13:43:21 2013 +

liblibo: loads a document, then exits - funky.

Change-Id: I2520e3223e9cb30627ec5691bd5c54ac67c3159e

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fc25403..c26c995 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -91,6 +91,16 @@ initialize_uno( const rtl::OUString aAppURL )
 {
 rtl::Bootstrap::setIniFilename( aAppURL + /fundamentalrc );
 
+OUString aValue;
+rtl::Bootstrap::set( CONFIGURATION_LAYERS,
+ xcsxcu:${BRAND_BASE_DIR}/share/registry 
+ res:${BRAND_BASE_DIR}/share/registry 
+//   
bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
  );
+//   
sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
+//   
userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 
+// 
user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu
+ );
+
 xContext = cppu::defaultBootstrap_InitialComponentContext();
 fprintf( stderr, Uno initialized %d\n, xContext.is() );
 xFactory = xContext-getServiceManager();
@@ -98,8 +108,8 @@ initialize_uno( const rtl::OUString aAppURL )
 comphelper::setProcessServiceFactory(xSFactory);
 
 // set UserInstallation to user profile dir in test/user-template
-rtl::Bootstrap aDefaultVars;
-aDefaultVars.set(rtl::OUString(UserInstallation), aAppURL + 
../registry );
+//rtl::Bootstrap aDefaultVars;
+//aDefaultVars.set(rtl::OUString(UserInstallation), aAppURL + 
../registry );
 // configmgr setup ?
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Urs Fässler]

 sd/source/ui/app/sdmod.cxx |   50 ++---
 1 file changed, 12 insertions(+), 38 deletions(-)

New commits:
commit a09bb5f4c3c34b6d0e196cd737e74f6fed1acdbb
Author: Urs Fässler u...@bitzgi.ch
Date:   Thu Mar 7 14:40:27 2013 +0100

Translation and cleanup of comments in sd/source/ui/app/sdmod.cxx

Change-Id: Icfd5d74f73e0d9d2e4273d8050b7bc2836648aa6

diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 91e7789..da75839 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -65,12 +65,7 @@ SFX_IMPL_INTERFACE(SdModule, SfxModule, 
SdResId(STR_APPLICATIONOBJECTBAR))
 SFX_STATUSBAR_REGISTRATION(SdResId(RID_DRAW_STATUSBAR));
 }
 
-/*
-|*
-|* Ctor
-|*
-\/
-
+// Ctor
 SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 )
 :   SfxModule( SfxApplication::CreateResManager(sd), sal_False,
   pFact1, pFact2, NULL ),
@@ -84,7 +79,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, 
SfxObjectFactory* pFact2 )
 bWaterCan(sal_False),
 mpResourceContainer(new ::sd::SdGlobalResourceContainer())
 {
-SetName( rtl::OUString( StarDraw ) );  // Nicht uebersetzen!
+SetName( rtl::OUString( StarDraw ) );  // Do not translate!
 pSearchItem = new SvxSearchItem(SID_SEARCH_ITEM);
 pSearchItem-SetAppFlag(SVX_SEARCHAPP_DRAW);
 StartListening( *SFX_APP() );
@@ -103,14 +98,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, 
SfxObjectFactory* pFact2 )
 pDevice-SetReferenceDevice ( VirtualDevice::REFDEV_MODE06 );
 }
 
-
-
-/*
-|*
-|* Dtor
-|*
-\/
-
+// Dtor
 SdModule::~SdModule()
 {
 delete pSearchItem;
@@ -140,13 +128,7 @@ SdModule::~SdModule()
 delete static_cast VirtualDevice* ( mpVirtualRefDevice );
 }
 
-
-/*
-|*
-|* get notifications
-|*
-\/
-
+/// get notifications
 void SdModule::Notify( SfxBroadcaster, const SfxHint rHint )
 {
 if( rHint.ISA( SfxSimpleHint ) 
@@ -157,12 +139,7 @@ void SdModule::Notify( SfxBroadcaster, const SfxHint 
rHint )
 }
 }
 
-/*
-|*
-|* Optionen zurueckgeben
-|*
-\/
-
+/// Return options
 SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
 {
 SdOptions* pOptions = NULL;
@@ -197,14 +174,11 @@ SdOptions* SdModule::GetSdOptions(DocumentType eDocType)
 return(pOptions);
 }
 
-/*
-|*
-|* Optionen-Stream fuer interne Options oeffnen und zurueckgeben;
-|* falls der Stream zum Lesen geoeffnet wird, aber noch nicht
-|* angelegt wurde, wird ein 'leeres' RefObject zurueckgegeben
-|*
-\/
-
+/**
+ * Open and return option stream for internal options;
+ * if the stream is opened for reading but does not exist, an 'empty'
+ * RefObject is returned
+ */
 SvStorageStreamRef SdModule::GetOptionStream( const String rOptionName,
   SdOptionStreamMode eMode )
 {
@@ -256,8 +230,8 @@ OutputDevice* SdModule::GetVirtualRefDevice (void)
 }
 
 /** This method is deprecated and only an alias to
-memberGetVirtualRefDevice()/member.  The given argument is ignored.
-*/
+ *   memberGetVirtualRefDevice()/member.  The given argument is ignored.
+ */
 OutputDevice* SdModule::GetRefDevice (::sd::DrawDocShell )
 {
 return GetVirtualRefDevice();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Urs Fässler]

 sd/source/ui/app/sdmod1.cxx |   40 
 1 file changed, 12 insertions(+), 28 deletions(-)

New commits:
commit 5c18df9e69004eeea8f54537468f71c1f726efa1
Author: Urs Fässler u...@bitzgi.ch
Date:   Thu Mar 7 14:48:44 2013 +0100

sd/source/ui/app/sdmod1.cxx comment translation and cleanup

Change-Id: I1839f5352f123616ac3373ca7f3488c8b92ce687

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index e828344..0a2905e 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -95,12 +95,6 @@ private:
 } //end of anonymous namespace
 
 
-/*
-|*
-|* Execute
-|*
-\/
-
 void SdModule::Execute(SfxRequest rReq)
 {
 const SfxItemSet* pSet = rReq.GetArgs();
@@ -116,13 +110,13 @@ void SdModule::Execute(SfxRequest rReq)
 
 case SID_AUTOSPELL_CHECK:
 {
-// automatische Rechtschreibpruefung
+// automatic spell checker
 const SfxPoolItem* pItem;
 if( pSet  SFX_ITEM_SET == pSet-GetItemState(
 SID_AUTOSPELL_CHECK, sal_False, pItem ) )
 {
 sal_Bool bOnlineSpelling = ( (const SfxBoolItem*) pItem 
)-GetValue();
-// am Dokument sichern:
+// save at document:
 ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, 
SfxObjectShell::Current());
 if( pDocSh )
 {
@@ -141,7 +135,7 @@ void SdModule::Execute(SfxRequest rReq)
 FieldUnit eUnit = (FieldUnit)((const 
SfxUInt16Item*)pItem)-GetValue();
 switch( eUnit )
 {
-case FUNIT_MM:  // nur die Einheiten, die auch im 
Dialog stehen
+case FUNIT_MM:  // only the units which are also in 
the dialog
 case FUNIT_CM:
 case FUNIT_INCH:
 case FUNIT_PICA:
@@ -181,7 +175,7 @@ void SdModule::Execute(SfxRequest rReq)
 )
   )
 {
-// am Dokument sichern:
+// save at the document:
 ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, 
SfxObjectShell::Current());
 if ( pDocSh )
 {
@@ -264,8 +258,6 @@ void SdModule::Execute(SfxRequest rReq)
 }
 
 
-
-
 void SdModule::OutlineToImpress (SfxRequest rRequest)
 {
 const SfxItemSet* pSet = rRequest.GetArgs();
@@ -297,7 +289,7 @@ void SdModule::OutlineToImpress (SfxRequest rRequest)
 
 if (pViewSh)
 {
-// AutoLayouts muessen fertig sein
+// AutoLayouts have to be finished
 pDoc-StopWorkStartupDelay();
 
 SfxViewFrame* pViewFrame = pViewSh-GetViewFrame();
@@ -330,19 +322,11 @@ void SdModule::OutlineToImpress (SfxRequest rRequest)
 }
 
 
-
-
-/*
-|*
-|* GetState
-|*
-\/
-
 static bool bOnce = false;
 
 void SdModule::GetState(SfxItemSet rItemSet)
 {
-// Autopilot waehrend der Praesentation disablen
+// disable Autopilot during presentation
 if (rItemSet.GetItemState(SID_SD_AUTOPILOT) != SFX_ITEM_UNKNOWN)
 {
 if (!SvtModuleOptions().IsImpress())
@@ -378,7 +362,7 @@ void SdModule::GetState(SfxItemSet rItemSet)
 }
 }
 
-// der Status von SID_OPENDOC wird von der Basisklasse bestimmt
+// state of SID_OPENDOC is determined by the base class
 if (rItemSet.GetItemState(SID_OPENDOC) != SFX_ITEM_UNKNOWN)
 {
 const SfxPoolItem* pItem = SFX_APP()-GetSlotState(SID_OPENDOC, 
SFX_APP()-GetInterface());
@@ -386,7 +370,7 @@ void SdModule::GetState(SfxItemSet rItemSet)
 rItemSet.Put(*pItem);
 }
 
-// der Status von SID_OPENHYPERLINK wird von der Basisklasse bestimmt
+// state of SID_OPENHYPERLINK is determined by the base class
 if (rItemSet.GetItemState(SID_OPENHYPERLINK) != SFX_ITEM_UNKNOWN)
 {
 const SfxPoolItem* pItem = SFX_APP()-GetSlotState(SID_OPENHYPERLINK, 
SFX_APP()-GetInterface());
@@ -803,20 +787,20 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* 
pDocShell, SfxViewFrame* pViewF
 
 if( pPrinter  pPrinter-IsValid())
 {
-// Der Printer gibt leider kein exaktes
-// Format (z.B. A4) zurueck
+// Unfortunately, the printer does not provide an exact format
+// like A4
 Size aSize(pPrinter-GetPaperSize());
 Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, MAP_100TH_MM, 
sal_True);
 
 if (ePaper != PAPER_USER)
 {
-// Korrekte Size holen
+

[Libreoffice-commits] core.git: libmariadb/mariadb-swap.patch libmariadb/UnpackedTarball_mariadb.mk mysqlcppconn/config.h

[Fridrich Štrba]

 libmariadb/UnpackedTarball_mariadb.mk |1 +
 libmariadb/mariadb-swap.patch |   24 
 mysqlcppconn/config.h |2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 0a8b02ad8c7ce930973ba0ddc782bf06f7a1e335
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Mar 7 14:49:09 2013 +0100

trying to make the whole mariadb sundry on windows

Change-Id: I5d775272ba83752fdafe7b7b702a67e8c76e605a

diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index 499ce70..a68562b 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 libmariadb/mariadb-thread.patch \
+libmariadb/mariadb-swap.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/mariadb-swap.patch b/libmariadb/mariadb-swap.patch
new file mode 100644
index 000..bfada2d
--- /dev/null
+++ b/libmariadb/mariadb-swap.patch
@@ -0,0 +1,24 @@
+--- mariadb/include/global.h   2013-03-06 17:06:42.545906061 +0100
 mariadb/include/global.h   2013-03-07 14:45:03.811128674 +0100
+@@ -247,7 +247,9 @@
+ #endif
+ 
+ #define sgn(a)(((a)  0) ? -1 : ((a)  0) ? 1 : 0)
++#ifndef __cplusplus
+ #define swap(t,a,b)   { register t dummy; dummy = a; a = b; b = dummy; }
++#endif
+ #define test(a)   ((a) ? 1 : 0)
+ #define set_if_bigger(a,b)  { if ((a)  (b)) (a)=(b); }
+ #define set_if_smaller(a,b) { if ((a)  (b)) (a)=(b); }
+--- mariadb/include/my_global.h2013-03-06 17:06:42.546906037 +0100
 mariadb/include/my_global.h2013-03-07 14:44:47.032529753 +0100
+@@ -278,7 +278,9 @@
+ #endif
+ 
+ #define sgn(a)(((a)  0) ? -1 : ((a)  0) ? 1 : 0)
++#ifndef __cplusplus
+ #define swap(t,a,b)   { register t dummy; dummy = a; a = b; b = dummy; }
++#endif
+ #define test(a)   ((a) ? 1 : 0)
+ #define set_if_bigger(a,b)  { if ((a)  (b)) (a)=(b); }
+ #define set_if_smaller(a,b) { if ((a)  (b)) (a)=(b); }
diff --git a/mysqlcppconn/config.h b/mysqlcppconn/config.h
index 7c2d2eb..19cf389 100644
--- a/mysqlcppconn/config.h
+++ b/mysqlcppconn/config.h
@@ -18,7 +18,7 @@
 #include inttypes.h
 #endif
 
-#if !defined(HAVE_STDINT_H)  !defined(HAVE_INTTYPES_H)  !defined(_MSC_VER)
+#if !defined(HAVE_STDINT_H)  !defined(HAVE_INTTYPES_H)
 
 // if we do not have the standard C99 integer types, then define them based on 
the respective SAL types
 #if !defined(_SYS_TYPES_H)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

gcc wrapper for MSVC

[Peter Foley]

All,

I wanted to give you a heads-up that I've decided to take a shot
at creating a gcc wrapper for MSVC. (see
https://wiki.documentfoundation.org/Development/Gsoc/Ideas#Gcc_like_wrapper_for_MSC_on_cygwin_and_autotools_compatibility
)

I'll be using the feature/gccwrapper branch.

Thanks,

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

I'd like to join the mailing list

[Protected Protected]

I'm a C/C++ developer and I'd like to join the mailing list to improve 
the quality of LibreOffice and to expand my experience in programming in
 a team.



Please and thank you. ___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: LibreOffice text justification

[Chris Tapp]

Hi Miklos,

On 7 Mar 2013, at 08:42, Miklos Vajna wrote:

 On Wed, Mar 06, 2013 at 11:07:27AM -0500, Kohei Yoshida 
 kohei.yosh...@gmail.com wrote:
 I manage a wiki which is being used to produce the text for a book
 that is due to be published shortly. We can currently produce an ODT
 document that is about 95% print-ready, but there are a few
 typesetting features missing from LibreOffice which mean we will have
 to use something like InDesign to complete our work flow.
 
 One of these features relates to the justification of text. Word
 processors like Writer tend to produce lines with uneven line-to-line
 inter-word spacing as they do not generally consider reducing the
 spaces and/or micro-spacing the characters themselves. I thought it
 would be worth looking at the code-base of LibreOffice to see if it
 would be possible to add this functionality. This search lead me to
 your blog page at
 http://kohei.us/2010/01/21/distributed-text-justification/.
 
 It seems as if the code you modified when adding the 'Distributed
 Justification' mode would be very similar to what I think is needed.
 Could you please point me to the files / classes that were involved?
 
 Any pointers would be much appreciated! Thank you for your time.
 
 Paragraphs in Writer are adjusted to left/right/center/etc, the
 SvxAdjustItem class stores this info in the document model. However, I
 think Writer already supports what you want.
 
 Have you tried Format - Paragraph - Alignment - Justified, then
 setting Last line to Justified as well?

Thanks, that's what we currently use.

However, this doesn't give the same output as a professional typesetter would 
give.

As far as I can tell, LO only uses the inter-word spaces for justification and 
it only makes these larger.
This generally works fairly well in many cases, but it does sometimes lead to 
output with large gaps between
words and where the gaps vary significantly between the lines of a paragraph.

A more visually-pleasing result (important for book publication) can be 
obtained if the gaps are balanced within a paragraph.
This can be done by defining a range for the inter-word gap (e.g. 80% to 120% 
of 'normal') and allowing the
inter-character gaps to be altered as well (say -5% to 10%).

I think adding this to LO would be really nice (possibly as an 'advanced' 
setting to hide it from 'normal' users) and would give it a 
major feature advantage over 'standard' word processors ;-)

 HTH,
 
 Miklos

Chris Tapp

opensou...@keylevel.com
www.keylevel.com



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

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

[Urs Fässler]

 sd/source/ui/app/sdmod2.cxx  |   52 +++
 sd/source/ui/app/sdpopup.cxx |   40 +
 sd/source/ui/app/tbxww.cxx   |   27 +-
 3 files changed, 45 insertions(+), 74 deletions(-)

New commits:
commit 3acd12a1bbffc9dee9cfdcae92df359a2a8753f0
Author: Urs Fässler u...@bitzgi.ch
Date:   Thu Mar 7 14:54:46 2013 +0100

sd/source/ui/app/tbxww.cxx comment translation and cleanup

Change-Id: Ie7bc4ce47c088feeeaf55fb7b2590c5e44a3480e

diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index 9a12aa3..c668976 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -39,12 +39,9 @@
 
 SFX_IMPL_TOOLBOX_CONTROL( SdTbxControl, TbxImageItem )
 
-/*
-|*
-|* Klasse fuer Toolbox
-|*
-\/
-
+/**
+ * Class for toolbox
+ */
 SdTbxControl::SdTbxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox rTbx 
) :
 SfxToolBoxControl( nSlotId, nId, rTbx )
 {
@@ -59,13 +56,11 @@ SfxPopupWindowType SdTbxControl::GetPopupWindowType() const
 return( SFX_POPUPWINDOW_ONTIMEOUT );
 }
 
-/*
-|*
-|* Hier wird das Fenster erzeugt
-|* Lage der Toolbox mit GetToolBox() abfragbar
-|* rItemRect sind die Screen-Koordinaten
-|*
-\/
+/**
+ * We create the window here
+ * You can get the position of the toolbox with GetToolBox()
+ * rItemRect are screen coordinates
+ */
 
 SfxPopupWindow* SdTbxControl::CreatePopupWindow()
 {
@@ -140,8 +135,8 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
 if( eState == SFX_ITEM_AVAILABLE )
 {
 TbxImageItem* pItem = PTR_CAST( TbxImageItem, pState );
-// Im StarDesktop kann jetzt auch ein anderes Item ankommen,
-// das nicht ausgewertet werden darf
+// StarDesktop can also receive another item,
+// but it is not allowed to evaluate it
 if( pItem )
 {
 ToolBox rTbx = GetToolBox();
@@ -160,7 +155,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId,
  hasBigImages()
);
 
-// !-Operator prueft, ob Image nicht vorhanden ist
+// !-operator checks if image is not present
 if( !!aImage )
 {
 rTbx.SetItemImage( GetId(), aImage );
commit 8d8f62666af44d56339ab3a59b966c61d19075e2
Author: Urs Fässler u...@bitzgi.ch
Date:   Thu Mar 7 14:53:41 2013 +0100

sd/source/ui/app/sdpopup.cxx comment translation and cleanup

Change-Id: Ib01cc26d494598def62b34dba52e3c35e9668d10

diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 6922b79..1102547 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -33,12 +33,9 @@
 #include drawdoc.hxx
 #include DrawDocShell.hxx
 
-/*
-|*
-|* PopupMenu zum Bearbeiten von Feldbefehlen
-|*
-\/
-
+/*
+ * Popup menu for editing of field command
+ */
 SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, LanguageType 
eLanguage ) :
 PopupMenu   (),
 pField  ( pInField )
@@ -46,22 +43,10 @@ SdFieldPopup::SdFieldPopup( const SvxFieldData* pInField, 
LanguageType eLanguage
 Fill( eLanguage );
 }
 
-/*
-|*
-|* Dtor
-|*
-\/
-
 SdFieldPopup::~SdFieldPopup()
 {
 }
 
-/*
-|*
-|* Fill
-|*
-\/
-
 void SdFieldPopup::Fill( LanguageType eLanguage )
 {
 sal_uInt16 nID = 1;
@@ -80,8 +65,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
 else
 CheckItem( 2 );
 
-//SVXDATEFORMAT_APPDEFAULT, // Wird nicht benutzt
-//SVXDATEFORMAT_SYSTEM, // Wird nicht benutzt
+//SVXDATEFORMAT_APPDEFAULT, // is not used
+//SVXDATEFORMAT_SYSTEM, // is not used
 InsertItem( nID++, String( SdResId( STR_STANDARD_SMALL ) ), nStyle );
 InsertItem( nID++, String( SdResId( STR_STANDARD_BIG ) ), nStyle );
 
@@ -112,8 +97,8 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
 else
 CheckItem( 2 );
 
-//SVXTIMEFORMAT_APPDEFAULT, // Wird nicht benutzt
-//SVXTIMEFORMAT_SYSTEM, // Wird nicht benutzt
+//SVXTIMEFORMAT_APPDEFAULT, // is not used
+//SVXTIMEFORMAT_SYSTEM, // is not used
 InsertItem( nID++, 

[Libreoffice-commits] core.git: 3 commits - cui/source sc/inc sc/source sc/uiconfig sc/UI_scalc.mk sw/source vcl/inc vcl/source xmlsecurity/source

[Caolán McNamara]

 cui/source/dialogs/SpellDialog.cxx   |2 
 cui/source/options/fontsubs.cxx  |3 
 cui/source/options/webconninfo.cxx   |4 
 sc/UI_scalc.mk   |1 
 sc/inc/scabstdlg.hxx |2 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   17 --
 sc/source/ui/attrdlg/scdlgfact.hxx   |2 
 sc/source/ui/inc/namedlg.hxx |2 
 sc/source/ui/inc/namemgrtable.hxx|   22 +--
 sc/source/ui/inc/namepast.hxx|   10 -
 sc/source/ui/miscdlgs/anyrefdg.cxx   |4 
 sc/source/ui/namedlg/namedlg.cxx |2 
 sc/source/ui/namedlg/namemgrtable.cxx|   94 +--
 sc/source/ui/namedlg/namepast.cxx|   37 +++---
 sc/source/ui/view/cellsh1.cxx|2 
 sc/source/ui/view/editsh.cxx |2 
 sc/uiconfig/scalc/ui/insertname.ui   |  159 +++
 sw/source/ui/dialog/wordcountdialog.cxx  |2 
 vcl/inc/svids.hrc|1 
 vcl/inc/vcl/dialog.hxx   |4 
 vcl/inc/vcl/layout.hxx   |4 
 vcl/source/src/btntext.src   |7 +
 vcl/source/window/builder.cxx|2 
 vcl/source/window/dialog.cxx |9 +
 vcl/source/window/layout.cxx |8 +
 xmlsecurity/source/dialogs/macrosecurity.cxx |   10 +
 26 files changed, 181 insertions(+), 231 deletions(-)

New commits:
commit 5ecb308bd3e8381d86f57206c0eed5f32d459956
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 7 14:05:33 2013 +

rename setInitialLayoutSize to setOptimalLayoutSize

and add a mechanism to know that we're in true
initial layout mode

Change-Id: I4ff61160ae67a7ccf1cb8b25c41870c195d32b94

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 412a0b8..f098a28 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -371,7 +371,7 @@ void SpellDialog::UpdateBoxes_Impl()
 }
 
 if (bOldShowExplain != (bool) m_pExplainLink-IsVisible() || 
bOldShowGrammar != (bool) m_pCheckGrammarCB-IsVisible())
-setInitialLayoutSize();
+setOptimalLayoutSize();
 }
 // ---
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 2f94e8b..0702c99 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -410,7 +410,8 @@ void SvxFontSubstCheckListBox::setColSizes()
 void SvxFontSubstCheckListBox::Resize()
 {
 SvxSimpleTable::Resize();
-setColSizes();
+if (isInitialLayout(this))
+setColSizes();
 }
 
 void SvxFontSubstCheckListBox::SetTabs()
diff --git a/cui/source/options/webconninfo.cxx 
b/cui/source/options/webconninfo.cxx
index eb59b4e..d56ebb8 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -28,6 +28,7 @@
 #include comphelper/processfactory.hxx
 #include comphelper/docpasswordrequest.hxx
 #include svtools/treelistentry.hxx
+#include vcl/layout.hxx
 
 using namespace ::com::sun::star;
 
@@ -78,7 +79,8 @@ void PasswordTable::Resort( bool bForced )
 void PasswordTable::Resize()
 {
 SvxSimpleTable::Resize();
-setColWidths();
+if (isInitialLayout(this))
+setColWidths();
 }
 
 void PasswordTable::setColWidths()
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index d5b0fed..6af81de 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -401,7 +401,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced )
 Dialog* pResizeDialog = pRefEdit-GetParentDialog();
 pResizeDialog-set_border_width(m_nOldBorderWidth);
 pResizeDialog-get_action_area()-Show();
-pResizeDialog-setInitialLayoutSize();
+pResizeDialog-setOptimalLayoutSize();
 }
 
 pRefEdit = NULL;
@@ -573,7 +573,7 @@ void ScFormulaReferenceHelper::RefInputStart( 
formula::RefEdit* pEdit, formula::
 m_nOldBorderWidth = pResizeDialog-get_border_width();
 pResizeDialog-set_border_width(0);
 pResizeDialog-get_action_area()-Hide();
-pResizeDialog-setInitialLayoutSize();
+pResizeDialog-setOptimalLayoutSize();
 }
 }
 }
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx 
b/sc/source/ui/namedlg/namemgrtable.cxx
index 7c9ee05..163cd84 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -94,7 +94,8 @@ ScRangeManagerTable::ScRangeManagerTable( 
SvxSimpleTableContainer rParent, boos
 void ScRangeManagerTable::Resize()
 {
 SvxSimpleTable::Resize();
-setColWidths();
+if (isInitialLayout(this))
+setColWidths();
 }
 
 void ScRangeManagerTable::setColWidths()
diff --git 

Re: I'd like to join the mailing list

[Simos Xenitellis]

On Thu, Mar 7, 2013 at 8:25 AM, Protected Protected dxiv...@live.com wrote:
 I'm a C/C++ developer and I'd like to join the mailing list to improve the
 quality of LibreOffice and to expand my experience in programming in a team.


Welcome to the development mailing list for LibreOffice!

I suppose you already followed the instructions at
https://wiki.documentfoundation.org/Development (which mentions
joining this mailing list).

The first part is to configure your computer so that it is able to
build LibreOffice.
Then, complete the first build of LibreOffice from source code, where
you can test it out that it works.
Subsequently, you can have a look at the easy hacks at
https://wiki.documentfoundation.org/Development
and attempt to solve at least one of them.
As a member of the mailing list, you can follow discussions and
contribute accordingly.

Hope this helps,
Simos
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice