[Libreoffice-commits] .: cppu/inc

[Libreoffice Gerrit user]

 cppu/inc/com/sun/star/uno/Sequence.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e2a1d1c49117e3321a59daff35500394a7e60cda
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jan 14 18:27:43 2013 +0100

uno::Sequence: assert on negative length

Change-Id: Ie94a6042863bb0d91f2b61ac8a048182aea41c0a

diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx 
b/cppu/inc/com/sun/star/uno/Sequence.hxx
index 498109a0..3a006a6 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.hxx
+++ b/cppu/inc/com/sun/star/uno/Sequence.hxx
@@ -89,6 +89,7 @@ inline Sequence E ::Sequence( const E * pElements, 
sal_Int32 len )
 template class E 
 inline Sequence E ::Sequence( sal_Int32 len )
 {
+assert( len = 0 );
 const Type  rType = ::cppu::getTypeFavourUnsigned( this );
 #if ! defined EXCEPTIONS_OFF
 sal_Bool success =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Depends on|53924   |

-- 
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

[PATCH] fdo#42387 Fixed Merging of cells in RTL Tables in impress

[gokul s (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1686

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1686/1

fdo#42387 Fixed Merging of cells in RTL Tables in impress

The problem was in calculating the cell area, the width should be
subtracted to Right end of cell instead it was adding width to Left
end of the origin cell

Change-Id: I3f31e0c4e0acae84ab5052823fc49932255137d3
---
M svx/source/table/tablelayouter.cxx
1 file changed, 12 insertions(+), 2 deletions(-)



diff --git a/svx/source/table/tablelayouter.cxx 
b/svx/source/table/tablelayouter.cxx
index eecf16d..27bf185 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -128,13 +128,23 @@
 if( xCell.is()  !xCell-isMerged()  isValid(rPos) )
 {
 const basegfx::B2ITuple aCellSize( getCellSize( rPos ) );
+const bool bRTL = meWritingMode == WritingMode_RL_TB;
 
 if( (rPos.mnCol  ((sal_Int32)maColumns.size())  (rPos.mnRow  
((sal_Int32)maRows.size()) ) ) )
 {
-const sal_Int32 x = maColumns[rPos.mnCol].mnPos;
 const sal_Int32 y = maRows[rPos.mnRow].mnPos;
 
-rArea = basegfx::B2IRectangle( x, y, x + aCellSize.getX(), y + 
aCellSize.getY()  );
+if(bRTL)
+{
+///For RTL Table Calculate the Right End of cell instead 
of Left
+const sal_Int32 x = maColumns[rPos.mnCol].mnPos + 
maColumns[rPos.mnCol].mnSize;
+rArea = basegfx::B2IRectangle( x-aCellSize.getX(), y, x, y 
+ aCellSize.getY()  );
+}
+else
+{
+const sal_Int32 x = maColumns[rPos.mnCol].mnPos;
+rArea = basegfx::B2IRectangle( x, y, x + aCellSize.getX(), 
y + aCellSize.getY()  );
+}
 return true;
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f31e0c4e0acae84ab5052823fc49932255137d3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa

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

[Libreoffice-commits] .: embeddedobj/source svtools/source

[Libreoffice Gerrit user]

 embeddedobj/source/msole/xdialogcreator.cxx |1 +
 svtools/source/uno/addrtempuno.cxx  |4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2a90016e87478543c791e3de2bb1f67318f4f236
Author: Noel Grandin n...@peralex.com
Date:   Tue Jan 15 10:58:16 2013 +0200

fdo#46808, fixes for windows build

Change-Id: I338b83c7803af019d9581c3a50e2afe9d2f5c014

diff --git a/embeddedobj/source/msole/xdialogcreator.cxx 
b/embeddedobj/source/msole/xdialogcreator.cxx
index 60a63e4..266ed94 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -32,6 +32,7 @@
 
 #include platform.h
 #include comphelper/mimeconfighelper.hxx
+#include comphelper/procesfactory.hxx
 
 #include xdialogcreator.hxx
 #include oleembobj.hxx
diff --git a/svtools/source/uno/addrtempuno.cxx 
b/svtools/source/uno/addrtempuno.cxx
index 25e1dd8..f6a88dd 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -76,7 +76,7 @@ namespace svt
 // OPropertyArrayUsageHelper
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
 
-void initialize(const Sequence Any  aArguments) 
throw(RuntimeException);
+virtual void SAL_CALL initialize(const Sequence Any  aArguments) 
throw(Exception, RuntimeException);
 
 protected:
 // OGenericUnoDialog overridables
@@ -174,7 +174,7 @@ namespace svt
 static_cast AddressBookSourceDialog* ( m_pDialog 
)-getFieldMapping( m_aAliases );
 }
 
//--
-void OAddressBookSourceDialogUno::initialize(const Sequence Any  
aArguments) throw(RuntimeException)
+void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence Any 
 aArguments) throw(Exception, RuntimeException)
 {
 if( aArguments.getLength() == 5 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1687

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/1687/1

fdo#57950: Remove chained appends in filter

Also removed a lot of *STRINGPARAM macros.

Change-Id: I46856d33bb28e37ab115860095644c7e95cf3c4e
---
M filter/source/msfilter/msdffimp.cxx
1 file changed, 127 insertions(+), 139 deletions(-)



diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index f36d504..8fa491a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -251,7 +251,7 @@
 
 rtl::OUString aURLStr;
 
-if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(d:\\ashape.dbg)), aURLStr ) )
+if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( 
rtl::OUString(d:\\ashape.dbg), aURLStr ) )
 {
 SvStream* pOut = ::utl::UcbStreamHelper::CreateStream( aURLStr, 
STREAM_WRITE );
 
@@ -262,19 +262,16 @@
 if ( IsProperty( DFF_Prop_adjustValue ) || IsProperty( 
DFF_Prop_pVertices ) )
 {
 pOut-WriteLine(  );
-rtl::OStringBuffer 
aString(RTL_CONSTASCII_STRINGPARAM(ShapeId: ));
-aString.append(static_castsal_Int32(nShapeId));
-pOut-WriteLine(aString.makeStringAndClear());
+OString aString(ShapeId:  + 
OString::valueOf(static_castsal_Int32(nShapeId)));
+pOut-WriteLine(aString);
 }
 for ( sal_uInt32 i = DFF_Prop_adjustValue; i = 
DFF_Prop_adjust10Value; i++ )
 {
 if ( IsProperty( i ) )
 {
-rtl::OStringBuffer 
aString(RTL_CONSTASCII_STRINGPARAM(Prop_adjustValue));
-aString.append(static_castsal_Int32( ( i - 
DFF_Prop_adjustValue ) + 1 ) );
-aString.append(':');
-
aString.append(static_castsal_Int32(GetPropertyValue(i)));
-pOut-WriteLine(aString.makeStringAndClear());
+OString aString(Prop_adjustValue + 
OString::valueOf((static_castsal_Int32( ( i - DFF_Prop_adjustValue ) + 1 ) )) 
+
+: + 
OString::valueOf(static_castsal_Int32(GetPropertyValue(i;
+pOut-WriteLine(aString);
 }
 }
 sal_Int32 i;
@@ -290,17 +287,13 @@
 if ( nLen )
 {
 pOut-WriteLine(  );
-rtl::OStringBuffer 
aDesc(RTL_CONSTASCII_STRINGPARAM(Property:));
-aDesc.append(static_castsal_Int32(i));
-aDesc.append(RTL_CONSTASCII_STRINGPARAM(  
Size:));
-aDesc.append(nLen);
+OStringBuffer aDesc(Property: + 
OString::valueOf(static_castsal_Int32(i)) +
+  Size: + 
OString::valueOf(nLen));
 pOut-WriteLine(aDesc.makeStringAndClear());
 sal_Int16   nNumElem, nNumElemMem, nNumSize;
 rIn  nNumElem  nNumElemMem  nNumSize;
-aDesc.append(RTL_CONSTASCII_STRINGPARAM(Entries: 
));
-aDesc.append(static_castsal_Int32(nNumElem));
-aDesc.append(RTL_CONSTASCII_STRINGPARAM(  
Size:));
-aDesc.append(static_castsal_Int32(nNumSize));
+aDesc.append(Entries:  + 
OString::valueOf(static_castsal_Int32(nNumElem)) +
+   Size: + 
OString::valueOf(static_castsal_Int32(nNumSize)));
 pOut-WriteLine(aDesc.makeStringAndClear());
 if ( nNumSize  0 )
 nNumSize = ( ( -nNumSize )  2 );
@@ -338,11 +331,9 @@
 }
 else
 {
-rtl::OStringBuffer 
aString(RTL_CONSTASCII_STRINGPARAM(Property));
-aString.append(static_castsal_Int32(i));
-aString.append(':');
-
aString.append(static_castsal_Int32(GetPropertyValue(i)));
-pOut-WriteLine(aString.makeStringAndClear());
+OString aString(Property + 
OString::valueOf(static_castsal_Int32(i)) +
+: + 
OString::valueOf(static_castsal_Int32(GetPropertyValue(i;
+pOut-WriteLine(aString);
 }
 }
 }
@@ -578,15 +569,15 @@
 case OBJ_CUSTOMSHAPE :
 {
 SdrCustomShapeGeometryItem aGeometryItem( 

[Review-4-0] Cherry-pick requests

[Muthu Subramanian K]

Hi,

I had recently committed these to the master branch. It would be nice if 
we could have it on the 4.0 branch as well.


PPT Export fix - Autofit of background images
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e481740cc894ea21c8e7a49100d56ca572a21a76

PPTX Import - Flip gradients as well
http://cgit.freedesktop.org/libreoffice/core/commit/?id=abd87f5085267ea514ebd34b23e42fb9b4b6466b

Chart Labels
http://cgit.freedesktop.org/libreoffice/core/commit/?id=228ba082d3148f13eed79e9cdd682953cccaab1c
[This would change the UX a bit, I have explained the changes in a 
little detail in the commit log]


Thanks for the reviews in advance!
Muthu Subramanian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/misc/langhelp.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 1e1b1687c8518f6d1c7ee77b18d464ac1c00852b
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 10:35:20 2013 +0100

fdo#59158 About dialog Website button link fix for zh-CN and zh-TW

Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30

diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index e4168a8..e8827cd 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -30,13 +30,20 @@
 #include vcl/svapp.hxx
 #include rtl/ustring.hxx
 
-void localizeWebserviceURI( ::rtl::OUString rURI )
+void localizeWebserviceURI( OUString rURI )
 {
-::rtl::OUString aLang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
-if ( aLang.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(pt))
-  
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(br))
 )
+OUString aLang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
+if ( aLang.equalsIgnoreAsciiCase(pt)
+  
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(br)
 )
 {
-aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( pt-br ));
+aLang = OUString(pt-br);
+}
+if ( aLang.equalsIgnoreAsciiCase(zh) )
+{
+if ( 
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(cn)
 )
+aLang = OUString(zh-cn);
+if ( 
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(tw)
 )
+aLang = OUString(zh-tw);
 }
 
 rURI += aLang;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-4-0]: fdo#59158 About dialog Website button link fix for zh-CN and...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1688

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/1688/1

fdo#59158 About dialog Website button link fix for zh-CN and zh-TW

Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
---
M svtools/source/misc/langhelp.cxx
1 file changed, 12 insertions(+), 5 deletions(-)



diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index e4168a8..e8827cd 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -30,13 +30,20 @@
 #include vcl/svapp.hxx
 #include rtl/ustring.hxx
 
-void localizeWebserviceURI( ::rtl::OUString rURI )
+void localizeWebserviceURI( OUString rURI )
 {
-::rtl::OUString aLang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
-if ( aLang.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(pt))
-  
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(br))
 )
+OUString aLang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
+if ( aLang.equalsIgnoreAsciiCase(pt)
+  
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(br)
 )
 {
-aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( pt-br ));
+aLang = OUString(pt-br);
+}
+if ( aLang.equalsIgnoreAsciiCase(zh) )
+{
+if ( 
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(cn)
 )
+aLang = OUString(zh-cn);
+if ( 
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(tw)
 )
+aLang = OUString(zh-tw);
 }
 
 rURI += aLang;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com

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

[Libreoffice-commits] .: embeddedobj/source

[Libreoffice Gerrit user]

 embeddedobj/source/msole/xdialogcreator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63d0f95dd61ea85da08c6be0b53f323e57069f3f
Author: Noel Grandin n...@peralex.com
Date:   Tue Jan 15 12:01:53 2013 +0200

fdo#46808, fixes for windows build

Change-Id: I92e4af840a180361c49de71a7875d6a05fa503ca

diff --git a/embeddedobj/source/msole/xdialogcreator.cxx 
b/embeddedobj/source/msole/xdialogcreator.cxx
index 266ed94..3ec9206 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -32,7 +32,7 @@
 
 #include platform.h
 #include comphelper/mimeconfighelper.hxx
-#include comphelper/procesfactory.hxx
+#include comphelper/processfactory.hxx
 
 #include xdialogcreator.hxx
 #include oleembobj.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'libreoffice-3-6-5'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-5' available with the following commits:
commit a04549b5c10545eeb669cb648fd2f5864e6c48b3
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 11:10:52 2013 +0100

Branch libreoffice-3-6-5

This is 'libreoffice-3-6-5' - the stable branch for the 3.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I91061b0f2d002844e11e00500040512946a993a3

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-5'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-5' available with the following commits:
commit 8de546f2f58491a400650055af837fec57875837
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 11:10:53 2013 +0100

Branch libreoffice-3-6-5

This is 'libreoffice-3-6-5' - the stable branch for the 3.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I54ae2943a84979029366c355874c9a474e300710

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-5'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-5' available with the following commits:
commit 345977aec8c1efd6a0a3d56030ac741aa050832d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 11:10:53 2013 +0100

Branch libreoffice-3-6-5

This is 'libreoffice-3-6-5' - the stable branch for the 3.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3dcd10d5781753367a72b20d13ebd196f4f59863

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-5'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-5' available with the following commits:
commit fcf5cfc23e6a0fbc0c44a09798dd42bf0c3886ea
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 11:10:53 2013 +0100

Branch libreoffice-3-6-5

This is 'libreoffice-3-6-5' - the stable branch for the 3.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I3e9abf3b8b8a62176abc9f13e48ebe3a359ccd54

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

[Libreoffice-commits] Changes to 'libreoffice-3-6-5'

[Libreoffice Gerrit user]

New branch 'libreoffice-3-6-5' available with the following commits:
commit f2bc430f9bc38e315fc3fd6423f4ce349a9d2037
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 11:10:53 2013 +0100

Branch libreoffice-3-6-5

This is 'libreoffice-3-6-5' - the stable branch for the 3.6.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.6.x release,
please use the 'libreoffice-3-6' branch.

If you want to build something cool, unstable, and risky, use master.

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

[PATCH] Change in core[libreoffice-4-0]: Template Manager: delete popup menus in the proper order

[Bosdonnat Cedric (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1689

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/1689/1

Template Manager: delete popup menus in the proper order

Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 388f0cb..f1e69f5 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -209,9 +209,9 @@
 delete mpSearchView;
 delete maView;
 delete mpOnlineView;
+delete mpTemplateDefaultMenu;
 delete mpActionMenu;
 delete mpRepositoryMenu;
-delete mpTemplateDefaultMenu;
 delete mpToolbars;
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr

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

[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf |3 
 sw/qa/extras/rtfimport/data/copypaste-footnote.rtf   |6 +
 sw/qa/extras/rtfimport/rtfimport.cxx |   47 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|7 +-
 4 files changed, 49 insertions(+), 14 deletions(-)

New commits:
commit 078e8583eaee630dc24e4c355914b532cadeb316
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 11:12:55 2013 +0100

clean up copypaste tests duplication

Change-Id: Idc3e959ba701f9967f7bdb95bd920c8e7416c80a

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2e07e3b..480a63b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -148,6 +148,27 @@ private:
 void run();
 /// Get page count.
 int getPages();
+/// Copypaste helper.
+void paste(OUString aFilename, uno::Referencetext::XTextRange xTextRange 
= uno::Referencetext::XTextRange())
+{
+uno::Referencedocument::XFilter 
xFilter(m_xSFactory-createInstance(com.sun.star.comp.Writer.RtfFilter), 
uno::UNO_QUERY_THROW);
+uno::Referencedocument::XImporter xImporter(xFilter, 
uno::UNO_QUERY_THROW);
+xImporter-setTargetDocument(mxComponent);
+uno::Sequencebeans::PropertyValue aDescriptor(xTextRange.is() ? 3 : 
2);
+aDescriptor[0].Name = InputStream;
+SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(getURLFromSrc(/sw/qa/extras/rtfimport/data/)
 + aFilename, STREAM_WRITE);
+uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStream));
+aDescriptor[0].Value = xStream;
+aDescriptor[1].Name = IsNewDoc;
+aDescriptor[1].Value = sal_False;
+if (xTextRange.is())
+{
+aDescriptor[2].Name = TextInsertModeRange;
+aDescriptor[2].Value = xTextRange;
+}
+xFilter-filter(aDescriptor);
+}
+
 };
 
 void Test::run()
@@ -849,18 +870,7 @@ void Test::testCopyPastePageStyle()
 {
 // The problem was that RTF import during copypaste did not ignore page 
styles.
 // Once we have more copypaste tests, makes sense to refactor this to 
some helper method.
-uno::Referenceuno::XInterface 
xInterface(m_xSFactory-createInstance(com.sun.star.comp.Writer.RtfFilter), 
uno::UNO_QUERY_THROW);
-uno::Referencedocument::XImporter xImporter(xInterface, 
uno::UNO_QUERY_THROW);
-xImporter-setTargetDocument(mxComponent);
-uno::Referencedocument::XFilter xFilter(xInterface, 
uno::UNO_QUERY_THROW);
-uno::Sequencebeans::PropertyValue aDescriptor(2);
-aDescriptor[0].Name = InputStream;
-SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(getURLFromSrc(/sw/qa/extras/rtfimport/data/)
 + copypaste-pagestyle-paste.rtf, STREAM_WRITE);
-uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStream));
-aDescriptor[0].Value = xStream;
-aDescriptor[1].Name = IsNewDoc;
-aDescriptor[1].Value = sal_False;
-xFilter-filter(aDescriptor);
+paste(copypaste-pagestyle-paste.rtf);
 
 uno::Referencebeans::XPropertySet 
xPropertySet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(21001), 
getPropertysal_Int32(xPropertySet, Width)); // Was letter, i.e. 21590
@@ -872,21 +882,7 @@ void Test::testCopyPasteFootnote()
 uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
 uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
-
-uno::Referenceuno::XInterface 
xInterface(m_xSFactory-createInstance(com.sun.star.comp.Writer.RtfFilter), 
uno::UNO_QUERY_THROW);
-uno::Referencedocument::XImporter xImporter(xInterface, 
uno::UNO_QUERY_THROW);
-xImporter-setTargetDocument(mxComponent);
-uno::Referencedocument::XFilter xFilter(xInterface, 
uno::UNO_QUERY_THROW);
-uno::Sequencebeans::PropertyValue aDescriptor(3);
-aDescriptor[0].Name = InputStream;
-SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(getURLFromSrc(/sw/qa/extras/rtfimport/data/)
 + copypaste-footnote-paste.rtf, STREAM_WRITE);
-uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStream));
-aDescriptor[0].Value = xStream;
-aDescriptor[1].Name = IsNewDoc;
-aDescriptor[1].Value = sal_False;
-aDescriptor[2].Name = TextInsertModeRange;
-aDescriptor[2].Value = xTextRange;
-xFilter-filter(aDescriptor);
+paste(copypaste-footnote-paste.rtf, xTextRange);
 
 CPPUNIT_ASSERT_EQUAL(OUString(bbb), xTextRange-getString());
 }
commit b6a2083b9dfe5aceb0900315363ef41e2f3abef5
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 09:58:48 2013 +0100

fdo#59338 fix RTF paste into footnote

Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0

diff --git 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - instsetoo_native/util solenv/inc

[Libreoffice Gerrit user]

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

New commits:
commit 51bba79d8620f041e643c0922b906263859e9846
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 11:19:47 2013 +0100

bump product version to 3.6.6.0+, reset number to 0

Change-Id: Id2e42972ae01637da286c6aaa54c9a62001438fe

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1a77027..00c1876 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 3.6.5.0
+UREPACKAGEVERSION 3.6.6.0
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice3.6
@@ -56,7 +56,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.5.0
+ABOUTBOXPRODUCTVERSION 3.6.6.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -109,7 +109,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.5.0
+ABOUTBOXPRODUCTVERSION 3.6.6.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,7 +162,7 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION 1
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.6
@@ -203,7 +203,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -245,7 +245,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -291,7 +291,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -333,7 +333,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -379,7 +379,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.5.0
+ABOUTBOXPRODUCTVERSION 3.6.6.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
@@ -389,7 +389,7 @@ OxygenOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.6.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 12e100b..d6896c9 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -6,6 +6,6 @@ SOURCEVERSION=OOO360
 
 VERSIONMAJOR=3
 VERSIONMINOR=6
-VERSIONMICRO=5
+VERSIONMICRO=6
 
 COPYRIGHTYEARRANGE=2000-2012
___
Libreoffice-commits 

[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f813d9f692d10f6d151c27617c2c5a36fac8c19
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 11:25:35 2013 +0100

fdo#58026 typo fix in Addons.xcu of Google Docs extension

Change-Id: I44e6ade6f9c89cc8086a7a69a0f7a81470c85ba8

diff --git a/configure.ac b/configure.ac
index 8bc4101..5bb9c33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10973,7 +10973,7 @@ AC_MSG_CHECKING([for Google Docs extension integration])
 GOOGLE_DOCS_EXTENSION_PACK=
 if test x$enable_ext_google_docs = xyes -a 
x$enable_extension_integration != xno; then
 SCPDEFS=$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS
-
GOOGLE_DOCS_EXTENSION_PACK=2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt
+
GOOGLE_DOCS_EXTENSION_PACK=27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt
 WITH_EXTRA_EXTENSIONS=YES
 AC_MSG_RESULT([yes])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cppu/inc cppu/source

[Libreoffice Gerrit user]

 cppu/inc/com/sun/star/uno/Sequence.hxx |   14 ++
 cppu/source/uno/sequence.cxx   |4 
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit d55155cad0926f61b5745260196b93e95471d06a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 15 11:24:46 2013 +0100

Include cassert

Also, move assert into uno_type_sequence_construct so that all its callers
benefit.

Also, change some OSL_ENSURE to assert.

Change-Id: Idd0a03c4aa6eed1db453db84602c01ff16f0d72c

diff --git a/cppu/inc/com/sun/star/uno/Sequence.hxx 
b/cppu/inc/com/sun/star/uno/Sequence.hxx
index 3a006a6..a23fd3b 100644
--- a/cppu/inc/com/sun/star/uno/Sequence.hxx
+++ b/cppu/inc/com/sun/star/uno/Sequence.hxx
@@ -19,7 +19,10 @@
 #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
 #define _COM_SUN_STAR_UNO_SEQUENCE_HXX_
 
-#include osl/diagnose.h
+#include sal/config.h
+
+#include cassert
+
 #include osl/interlck.h
 #include com/sun/star/uno/Sequence.h
 #include typelib/typedescription.h
@@ -89,7 +92,6 @@ inline Sequence E ::Sequence( const E * pElements, 
sal_Int32 len )
 template class E 
 inline Sequence E ::Sequence( sal_Int32 len )
 {
-assert( len = 0 );
 const Type  rType = ::cppu::getTypeFavourUnsigned( this );
 #if ! defined EXCEPTIONS_OFF
 sal_Bool success =
@@ -167,9 +169,7 @@ inline E * Sequence E ::getArray()
 template class E 
 inline E  Sequence E ::operator [] ( sal_Int32 nIndex )
 {
-OSL_ENSURE(
-nIndex = 0  nIndex  getLength(),
-### illegal index of sequence! );
+assert( nIndex = 0  nIndex  getLength() );
 return getArray()[ nIndex ];
 }
 
@@ -178,9 +178,7 @@ template class E 
 inline const E  Sequence E ::operator [] ( sal_Int32 nIndex ) const
 SAL_THROW(())
 {
-OSL_ENSURE(
-nIndex = 0  nIndex  getLength(),
-### illegal index of sequence! );
+assert( nIndex = 0  nIndex  getLength() );
 return reinterpret_cast const E * ( _pSequence-elements )[ nIndex ];
 }
 
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index d9e28fb..d570461 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include sal/config.h
+
+#include cassert
 #include string.h
 
 #include rtl/alloc.h
@@ -771,6 +774,7 @@ sal_Bool SAL_CALL uno_type_sequence_construct(
 uno_AcquireFunc acquire )
 SAL_THROW_EXTERN_C()
 {
+assert( len = 0 );
 bool ret;
 if (len)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANNOUNCE] Branch libreoffice-3-6-5 created

[Fridrich Strba]

Hi all,

there have been created the libreoffice-3-6-5 branch. It will be used
for fine tuning of the 3.6.5 release.

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-3-6 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-3-6' branch is still active and will be used for the
3.6.6 bugfix release. Please read more at

   http://wiki.documentfoundation.org/ReleasePlan
   http://wiki.documentfoundation.org/Development/Branches


Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-3-6-5 origin/libreoffice-3-6-5

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-3-6-5 when you have switched to it.  This will
save you some git shouting at you.


Happy hacking,
Fridrich

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

[PATCH] Change in core[libreoffice-4-0]: fdo#58026 typo fix in Addons.xcu of Google Docs extension

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1690

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/1690/1

fdo#58026 typo fix in Addons.xcu of Google Docs extension

Change-Id: I44e6ade6f9c89cc8086a7a69a0f7a81470c85ba8
---
M configure.ac
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/configure.ac b/configure.ac
index deb7163..0cbc7e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10691,7 +10691,7 @@
 GOOGLE_DOCS_EXTENSION_PACK=
 if test x$enable_ext_google_docs = xyes -a 
x$enable_extension_integration != xno; then
 SCPDEFS=$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS
-
GOOGLE_DOCS_EXTENSION_PACK=2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt
+
GOOGLE_DOCS_EXTENSION_PACK=27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt
 WITH_EXTRA_EXTENSIONS=YES
 AC_MSG_RESULT([yes])
 else

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44e6ade6f9c89cc8086a7a69a0f7a81470c85ba8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com

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

[PATCH] Change in core[libreoffice-4-0]: fdo#59338 fix RTF paste into footnote

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1691

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1691/1

fdo#59338 fix RTF paste into footnote

(cherry picked from commit b6a2083b9dfe5aceb0900315363ef41e2f3abef5)

Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
---
A sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
A sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/dmapper/DomainMapper_Impl.cxx
4 files changed, 41 insertions(+), 2 deletions(-)



diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
new file mode 100644
index 000..1f4a75e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+bbb
+\par }
diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
new file mode 100644
index 000..93e4613
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+aaa
+{\super \chftn
+{\*\footnote \chftn\pard\plain \li339\fi-339 \par}
+}
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 68b7aa5..3dc2f1b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -117,6 +117,7 @@
 void testFdo52475();
 void testFdo55493();
 void testCopyPastePageStyle();
+void testCopyPasteFootnote();
 void testShptxtPard();
 void testDoDhgt();
 void testDplinehollow();
@@ -202,6 +203,7 @@
 {fdo52475.rtf, Test::testFdo52475},
 {fdo55493.rtf, Test::testFdo55493},
 {copypaste-pagestyle.rtf, Test::testCopyPastePageStyle},
+{copypaste-footnote.rtf, Test::testCopyPasteFootnote},
 {shptxt-pard.rtf, Test::testShptxtPard},
 {do-dhgt.rtf, Test::testDoDhgt},
 {dplinehollow.rtf, Test::testDplinehollow},
@@ -861,6 +863,31 @@
 CPPUNIT_ASSERT_EQUAL(sal_Int32(21001), 
getPropertysal_Int32(xPropertySet, Width)); // Was letter, i.e. 21590
 }
 
+void Test::testCopyPasteFootnote()
+{
+// The RTF import did not handle the case when the position wasn't the 
main document XText, but something different, e.g. a footnote.
+uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
+
+uno::Referenceuno::XInterface 
xInterface(m_xSFactory-createInstance(com.sun.star.comp.Writer.RtfFilter), 
uno::UNO_QUERY_THROW);
+uno::Referencedocument::XImporter xImporter(xInterface, 
uno::UNO_QUERY_THROW);
+xImporter-setTargetDocument(mxComponent);
+uno::Referencedocument::XFilter xFilter(xInterface, 
uno::UNO_QUERY_THROW);
+uno::Sequencebeans::PropertyValue aDescriptor(3);
+aDescriptor[0].Name = InputStream;
+SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(getURLFromSrc(/sw/qa/extras/rtfimport/data/)
 + copypaste-footnote-paste.rtf, STREAM_WRITE);
+uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStream));
+aDescriptor[0].Value = xStream;
+aDescriptor[1].Name = IsNewDoc;
+aDescriptor[1].Value = sal_False;
+aDescriptor[2].Name = TextInsertModeRange;
+aDescriptor[2].Value = xTextRange;
+xFilter-filter(aDescriptor);
+
+CPPUNIT_ASSERT_EQUAL(OUString(bbb), xTextRange-getString());
+}
+
 void Test::testShptxtPard()
 {
 // The problem was that \pard inside \shptxt caused loss of shape text
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f8730b9..68449a0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -228,9 +228,12 @@
 
 uno::Reference text::XText  DomainMapper_Impl::GetBodyText()
 {
-if(!m_xBodyText.is()  m_xTextDocument.is())
+if(!m_xBodyText.is())
 {
-m_xBodyText = m_xTextDocument-getText();
+if (m_xInsertTextRange.is())
+m_xBodyText = m_xInsertTextRange-getText();
+else if (m_xTextDocument.is())
+m_xBodyText = m_xTextDocument-getText();
 }
 return m_xBodyText;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.5.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.5.1' created by Fridrich Å trba 
fridrich.st...@bluewin.ch at 2013-01-15 10:39 -0800

Tag libreoffice-3.6.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQ9TH7AAoJEPQ0oe+v7q6jGyQQAMt1rSDFuXI3ou8h0NfqhZNR
eIh5vc9Sbs0AylUsiQhydVEdt+m+f0J6OX9hNcd5o8W8sORJTZKCkPleP+u6jfpO
hcNsJtgVYYz/IS4bC+rHR8H3cId3qlkjHFJyAkFcooFGUi7snPfeJLq9yilspsLM
EwVS76Ucv5n5WTpSXsTZiE3b0b9K3KsJ1kFZyZGhYet7PK5SdZZlibPwY1s0Vmyh
NKlIfZDhdRmSnCqgA8kpznoQJR8yugXy/DLs/RMU6TmzjojR+Uq5AU8CXQlcH5Vh
y3XoCSrxiqFtXlArqGQTATNGnG9ntfTm29KgQlPrB7tKJFEytMi+BqTCBoqP4zc9
HTPbPypLRTdJfqOcZBHczAVi1OcozNTXDw9dkR46itmW8OpIxZ2STcynDK5THWYQ
BXI4Etwa4HRHVJYzRZ8zsxvaGuBmUxpgNn5oMsXtRRleER1/0RCFuQZttAiXa9zG
EVqwOl1nQ1EgqvxH2cEVHJi/7R5+p6ESVTDZEfc6aWWSGnirsKXen8YkIXhOmrLE
auwKXa4RWuU/JCc6oo/YK2YP7KGTuP0RDok8y5s8OXFHSUuDkJ6x/FRxrl2kkMVv
eJ8C/Hvyr844d/jR1FDeqXKcc+GrCIPfAtj6ah/o64fFuI2Isw0JN7tfzO3o2zNm
zPBfXB4hwX/21be+zkx9
=MZbp
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-1017:
---
 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/libreoffice-3.6.5.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.5.1' created by Fridrich Å trba 
fridrich.st...@bluewin.ch at 2013-01-15 10:39 -0800

Tag libreoffice-3.6.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQ9TH8AAoJEPQ0oe+v7q6jm9wQAJ9IGIDhxBMeJ2ylYTcR57Gw
w4nz/tl6d426U4XITfeWs28h7f6GdQGECEh9sKyPE6AK524/LbSR0xs4ULYLDn+d
lA1k6H7KR9Pa/5x48GJ1cs3JQW2mAieKqhGloLtu+JOGc4QjimVHQf8HwVaWWBHs
9XYma9RAVNiAjXF71ad77IGXR1h8lR4kh0qQisxPScSN667FX83XlFdu2Gw0YbQT
KeKStcpEFGIK4KqavjpYaDUWt61Di5HHTYB8JyKDtN7zeEfa4uX1O84sArr2zL5Z
FvfJuYNw67oucImFvfiZkMGmyyYmVvhCr94MMdkyzxR4xTazjZ4rzsMhgzzrw7pG
vtQG7fZw9wV1wdt6aRQJRYo+yrO9UKh0l9Nh3vvNXuWsStLVL5pvc5MrzxPFO2nf
a4S+EvRlsVWwWE6gbCBLO4rFTPnLZGQ3sVA2f8VpgMgqnAtETh3tN6gcBwOJlZZH
jrEf//f2v/p7uk8XOOytv3961Qdpba4Qq0afwXLYbyL0SQvieDVeEfP1+Ry3exNy
qt71x32oPz8dgaEflI5Tpf1llxCkK7OLZLkOCXzUbwwo57+jBEDaPgCOhXmu3zBd
4ZpwLz6aot+/HQnpTf/wemHH5jqiIH+rpO4YhZGgKNOT4o6i+qfa1HONekj7Xj/K
K0/Ivj1JhkFDIMRQeAek
=KVeQ
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-8:
---
 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/libreoffice-3.6.5.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.5.1' created by Fridrich Å trba 
fridrich.st...@bluewin.ch at 2013-01-15 10:39 -0800

Tag libreoffice-3.6.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQ9TH8AAoJEPQ0oe+v7q6jNLEP/RMef5mST506STnXL89MMRDS
4/siAC3AXxbwSh1uZzHrlmDc9JZsPfzu27R00CQnKD9yArz3qQh38odX7DuXtbIz
uJWbsWebNWZpTCGSIkU0KWuH90cQp1SoLj0DXb2k+qe2uYJgMI5lRW0QoBRw/lgX
5K9MJoIIItXcnStOT4gWpx2Q5eyPMbJSHw/BJJPdmB6udL3ZFqPUf34f0rJ7BoOD
Q8WllXdcboueO4zn34NuCdI2lURWVlkSTWASLr7nF0B5UJ8e+vG+PRpGeZ0BM1OJ
mZTGD7KULpS/kxoZwXYsUuuhxm0kPi7/1ckhKbee7PbpOOhZtXWl/3QyEZ8L03BY
uFo3rm5Ahv6kx5iE/65UaggQWPgzAn7hrlzopqsOvQVZUR/zEVcgv++GN6TQ05mf
407VpwMiG0++m7Ui3uhyk/1a59K4XmLq6gdvWlGxaH2rOoUKSlnRMLaultT80lJ3
Gr2h7EqzjIyTXTMd5VvZewDDE7fmpUBv/ixyLYiaeG1zeGiq0KeUHOOy6OBUKzAI
FAFNB3NxJgc3dl9xk2ZauOW2/l6wF33BFxovtoaI9e7zAt94SLf/5i4bQx+UENWI
rElreLi4JcMeU/LioIQmsqmeVkdWUpsRoV0iW0DTxVjWsL9sVhh5jMg1DfFIkgXj
Isx/hrdT3301yUmIU9Oa
=lUmh
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-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/libreoffice-3.6.5.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.5.1' created by Fridrich Å trba 
fridrich.st...@bluewin.ch at 2013-01-15 10:39 -0800

Tag libreoffice-3.6.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQ9TH8AAoJEPQ0oe+v7q6j6SwQAKnmtJIyZulicgxcZuxe7oUQ
UzjriJ8z83SYylKXAtC1jwUxdV/Yq3DbPddBHqtWRTLIRu20+BVvAvdbI791JAmN
xKcJLR8oPwnAkfuWhiTvomUPq2lAQbJ0lTaB2UXSx+kcRIOc+MASTtGPhHYQtClJ
LFWrVkPlndMrqYMrgP3YEfYBaI/z68EZLr3IWWaGEyJIpvhlFFesWfvMsyTrxH+5
TiBcf7WsgRW7JvXdE6gWWAklvHEBnsmje7x55BgjaNQo9I3erFVUhO8kRU1mZcj6
B6LCbbIlq04lxaQg0Vwmtoblx7Ld5VUq+L0PkLwCYh4SbCZrxus4VN9XWsnCf136
H1GHU6bvoSUMEVuJ1vbYOItGhnAG9izpRbo+5A96JYrv9yHomA5F106Ak+DL81AP
rG0H2JuJzniry8t22pZzvxebo2eu1wAhAb5snsJfY1Tz0CNqu8Xgi+diV/wbj8wV
P41jTtygjEbfpWla1f+3E3ihZ1XBGlZbjC06j0/VkjYv9Qm7fLhhcD9h1Ydr+Sdc
61fDIzgwKsfddcyIVusqtZAKlDIQuuSBnBwEhOTwUqCdWB2f77Ep0y/sA7cmHdQy
0grirP9le8mqTbKIvJxKkyQq2apch5H7KtAYI+JnWzR97KPwkgUgD0PmhkrEXASN
qNEzWeEepmn8F4JZLVLI
=88LL
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-30:
---
 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/libreoffice-3.6.5.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-3.6.5.1' created by Fridrich Å trba 
fridrich.st...@bluewin.ch at 2013-01-15 10:39 -0800

Tag libreoffice-3.6.5.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)

iQIcBAABAgAGBQJQ9TH8AAoJEPQ0oe+v7q6ji8gQAKMYynzKNmzJqlEsDMTQKv5o
8BqBHdTNypurAeVs2zRMu3rZiJfUCg4d0z4K3TCNLsuMwTSPTyPmj8Yo0OcH4Sxi
8q8oDSOydfjAMnaLztK2yAB5Wf+ebArH+yc40iFx4QjIsjIm8u4lu1ugDDsC9K+d
Mf4UIwXc9oVCnlOckjuz0A+3q/zt0esTpKqYRFdhQCVSq3e6YMWO+NnlfmWOEad/
TBqNxrcp6ro10sOD1nHKY8etSw79sTJZnUecjxPMu1ThGPxIbU4dHXZbon3Kl0O4
JK/cdSs+v+PjGW7yjAFvUwEjDJBWso+sZUejaQ1by+WX8p8kj/HBStqqfsegB5x8
7waFw/O/ZhUoHRv92XWlHHRjzdV083oZ/WomoBfB5QwqXy4l8z4dXW1xAC9jAUzZ
vvGVJIeUnEegJYMIpFJngAZNg8Y30wl124woU9pbo3GeWjCBzMQ+w/U5u/M4jA27
Bqywq+T88KBvN83efbuC1TAN0TfTcCky2U8UpwbA2A++CGyynN6clMg0Xh9dVddN
f5KiBbEnxajlovdmGLu8OMFDmLOyITiHla1SMYJYO4urqlOZ1Fdz+nva6W5to/sL
qCAAB7rbYKS4iFO2Kzkph1OB+B5SATQ3Qp86cu10yNA9TWgJQ9FS0c/3x9luOPEl
kTDfCnJUgomSHsdX9rPC
=Aod7
-END PGP SIGNATURE-

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

Re: REVIEW [4-0-0] [PUSHED 4.0 ] Late Feature: IFERROR and IFNA spreadsheet functions

[Jan Holesovsky]

Hi Eike,

Rene Engelhard píše v Po 14. 01. 2013 v 15:31 +0100:

  Well, thanks, but, hum.. We don't have a 4-0-0 branch yet, so being on
  4-0 now means it will land in 4.0.0 anyhow ...
  gah you are right ( seems I am too used to 3.6 )
maybe we should at least
  have the late feature consense in hindsight?
  yes, Petr, Kendy what's the chances for this, should we wait a day
  or 2 or just revert now
 
 I'd not bother to revert unless that works. Incidentially, I would
 be against introduding a feature in 4.0.1, but would be OK with doing
 it before 4.0.0 ;-)

I agree with Rene - you have my approval from the 'late feature' point
of view :-)

Having said that, it is now getting really late in the release cycle, so
some more Calc experts approving this from the code point of view would
be really appreciated - Noel already had a look, so Kohei, Markus, can
you too?

Thanks a lot,
Kendy

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

[ANNOUNCE] libreoffice-3.6.5.1 tag created

[Fridrich Strba]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi,

there have been created the libreoffice-3.6.5.1 tag (aka rc1). The
corresponding official builds will be available within next few days.

See the attached list of changes against 3.6.4.3[*].


Now, you might switch your current 3-6 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-3.6.5.1 libreoffice-3.6.5.1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


See also the schedule at
http://wiki.documentfoundation.org/ReleasePlan#3.6_release
and release criteria at
http://wiki.documentfoundation.org/Release_Criteria

[*] The list contains fixes from 3.6.4.3. It is created using
libreoffice/core/bin/lo-commit-stat. It parses output from git log and
does not match cherry-picked commits. We might get better results with
'git cherry' or another approach. Feel free to send patches :-)


Best Regards,
Fridrich

-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlD1OR8ACgkQu9a1imXPdA9RmwCcDy5hsDPE0nglsWGk2j7WVAi9
fXYAn1OuTHv5H22m3Tqsm1Mih/TUcjvq
=IdTF
-END PGP SIGNATURE-
bnc#758138 make presentation spanning all screens work [Luboš Luňák]
bnc#789482 DOCX: export track change data after w:hyperlink [Miklos Vajna]
fdo#31055 fallback to a default bullet on symbol lack [Caolán McNamara]
fdo#32181 don't emit pesky space unless in tagged pdf mode [Caolán McNamara]
fdo#33090 UniscribeLayout: adjust mnSubStringMin [Michael Stahl]
fdo#33356 allow hiding of rtl or ltr buttons on toolbars when ctl selected [Noel Power]
fdo#34897 numbers were wrong, code unnecessary [Lennard]
fdo#40339 line style toolbar dropdown list not updated [Ivan Timofeev]
fdo#40465 fix to maintain correct focus whilst zooming [Winfried Donkers]
fdo#42165 make nested joins as per strict ANSI SQL [Lionel Elie Mamane]
fdo#42558 added Arabic Abjad and other known numberings to Page Numbering [Faisal M. Al-Otaibi]
fdo#42577 and RTL tollbars mirroring [Abdulmajeed Al-Abaulrazzaq]
fdo#42978 fix dialog language support mess [Noel Power]
fdo#43901 and RTL tollbars mirroring [Abdulmajeed Al-Abaulrazzaq]
fdo#45911 clipboard must be disposed before Selection [Caolán McNamara]
fdo#47466 FORMATTING: Autoformat empty rows causes app to crash [Julien Nabet]
fdo#47553 UniscribeLayout: adjust mnSubStringMin [Michael Stahl]
fdo#49277 use correct default tab size [David Tardon]
fdo#49587 apparent loop in style hierarchy [Caolán McNamara]
fdo#50284 related: apple's modern symbol font is unicode encoded [Caolán McNamara]
fdo#51121 fix OWA misbehaviour with uncompressed meta.xml [Thorsten Behrens]
fdo#51638 in unopkg gui dispose component context from DeInitVCL [Stephan Bergmann]
fdo#52182 fixed click in frames located in header/footer [Cédric Bosdonnat]
fdo#52240 added [hr-HR] date acceptance patterns D/M/Y;D/M [Eike Rathke]
fdo#52477 DOCX: export track change data after w:hyperlink [Miklos Vajna]
fdo#52640 fix right-aligned tabstops [David Tardon]
fdo#53009 clarify msi installer only installs subset of dicts by default [Stephan Bergmann]
fdo#53364 broadcast deletion to dependent formula cells [Eike Rathke]
fdo#53521 crash when running BASIC's shell() with a non-existent program [Christopher Copits]
fdo#53909 STG_FREE sector locations rejected [Caolán McNamara]
fdo#54074 broadcast deletion to dependent formula cells [Eike Rathke]
fdo#54336 accept abbreviated combined date/time input [Eike Rathke]
fdo#54344 let date pattern match overrule incomplete format match [Eike Rathke]
fdo#54473 fix RTF import of character styles [Miklos Vajna]
fdo#55059 broadcast deletion to dependent formula cells [Eike Rathke]
fdo#55289 fix crash in SwXShape::setPropertyValue: [Michael Stahl]
fdo#55369 accept fraction input if preset [Eike Rathke]
fdo#55525 import RTF_TRLEFT [Miklos Vajna]
fdo#56205 don't always show integer part for fraction formats with hard denom [Noel Power]
fdo#56278 broadcast deletion to dependent formula cells [Eike Rathke]
fdo#56419 save fixed denominator for fractions [Noel Power]
fdo#56513 second header/footer lost saving as .doc [Luke Deller]
fdo#56549 crash in format-autocorrect-apply and edit changes [Caolán McNamara]
fdo#56584 delete also note caption. [Markus Mohrhard]
fdo#56742 adapt cond format range when copying sheets, [Markus Mohrhard]
fdo#56776 change in formula options should cause repaint. [Kohei Yoshida]
fdo#56937 mac a11y hang related to traversing vast, broken hierarchies. [Michael Meeks]
fdo#56970 fixed insert new sheet button for different directionality [Issa Alkurtass]
fdo#57133 fix RTF import of character styles [Miklos Vajna]
fdo#57203 unknown option: -Embedding [Aurimas Fišeras]
fdo#57224 preserve disabled-state across reinstallDeployedExtensions [Stephan Bergmann]
fdo#57353 fix correct moveTo handling for emf path recording [Thorsten 

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

[Libreoffice Gerrit user]

 sc/source/core/data/conditio.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f0b733be07a8ea79b65489e0a46b86736436185c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Dec 26 04:09:31 2012 +0100

one more improvement around cond format rendering, fdo#57896

Change-Id: I5eb267ec2d1666edd53f5b9d58fd2a0cec044aa1
Reviewed-on: https://gerrit.libreoffice.org/1684
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 0ab670b..1a056ea 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1520,7 +1520,10 @@ bool lcl_CutRange( ScRange rRange, const ScRange 
rOther )
 void ScConditionalFormat::DoRepaint( const ScRange* pModified )
 {
 if(pModified)
-pDoc-RepaintRange(*pModified);
+{
+if(maRanges.Intersects(*pModified))
+pDoc-RepaintRange(*pModified);
+}
 else
 {
 // all conditional format cells
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: one more improvement around cond format rendering, fdo#57896

[Noel Power (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/1684

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb267ec2d1666edd53f5b9d58fd2a0cec044aa1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svtools/source

[Libreoffice Gerrit user]

 svtools/source/misc/langhelp.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 4f2d6cd5332c9aa2ccca4a12a241263a51f76da2
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 10:35:20 2013 +0100

fdo#59158 About dialog Website button link fix for zh-CN and zh-TW

Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
Reviewed-on: https://gerrit.libreoffice.org/1688
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index e4168a8..e8827cd 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -30,13 +30,20 @@
 #include vcl/svapp.hxx
 #include rtl/ustring.hxx
 
-void localizeWebserviceURI( ::rtl::OUString rURI )
+void localizeWebserviceURI( OUString rURI )
 {
-::rtl::OUString aLang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
-if ( aLang.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(pt))
-  
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(br))
 )
+OUString aLang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
+if ( aLang.equalsIgnoreAsciiCase(pt)
+  
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(br)
 )
 {
-aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( pt-br ));
+aLang = OUString(pt-br);
+}
+if ( aLang.equalsIgnoreAsciiCase(zh) )
+{
+if ( 
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(cn)
 )
+aLang = OUString(zh-cn);
+if ( 
Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase(tw)
 )
+aLang = OUString(zh-tw);
 }
 
 rURI += aLang;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/doc/templatedlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1612c775b69d234a51f66cd79e533f4bf19c677c
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Wed Jan 9 16:41:58 2013 +0100

Template Manager: delete popup menus in the proper order

Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9
Reviewed-on: https://gerrit.libreoffice.org/1689
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 388f0cb..f1e69f5 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -209,9 +209,9 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 delete mpSearchView;
 delete maView;
 delete mpOnlineView;
+delete mpTemplateDefaultMenu;
 delete mpActionMenu;
 delete mpRepositoryMenu;
-delete mpTemplateDefaultMenu;
 delete mpToolbars;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-4-0]: fdo#59158 About dialog Website button link fix for zh-CN and...

[Noel Power (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/1688

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[PUSHED] Change in core[libreoffice-4-0]: Template Manager: delete popup menus in the proper order

[Noel Power (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/1689

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafccfaa572b945d8d75d926ccc1935320b9d70d9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - configure.ac

[Libreoffice Gerrit user]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 371983fb8252356b36f8d424dbceba318c14609d
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 11:25:35 2013 +0100

fdo#58026 typo fix in Addons.xcu of Google Docs extension

Change-Id: I44e6ade6f9c89cc8086a7a69a0f7a81470c85ba8
Reviewed-on: https://gerrit.libreoffice.org/1690
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/configure.ac b/configure.ac
index deb7163..0cbc7e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10691,7 +10691,7 @@ AC_MSG_CHECKING([for Google Docs extension integration])
 GOOGLE_DOCS_EXTENSION_PACK=
 if test x$enable_ext_google_docs = xyes -a 
x$enable_extension_integration != xno; then
 SCPDEFS=$SCPDEFS -DWITH_EXTENSION_GOOGLE_DOCS
-
GOOGLE_DOCS_EXTENSION_PACK=2a64b8e6f185a7f6c19d00fb8bb4cf64-gdocs_3.0.1_modified.oxt
+
GOOGLE_DOCS_EXTENSION_PACK=27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt
 WITH_EXTRA_EXTENSIONS=YES
 AC_MSG_RESULT([yes])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2bea148c8e2b8b98e282d5ef9d655b234b487639
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jan 15 12:32:11 2013 +0100

Updated core
Project: help  a915dcd521181918307d16fb2168d436e5370043

diff --git a/helpcontent2 b/helpcontent2
index 89d2680..a915dcd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 89d2680dda47ae81b2a50a0e9e1239f90b99cdb7
+Subproject commit a915dcd521181918307d16fb2168d436e5370043
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: source/text

[Libreoffice Gerrit user]

 source/text/shared/autopi/0113.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a915dcd521181918307d16fb2168d436e5370043
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jan 15 12:32:11 2013 +0100

help: Document Converter: remove StarOffice format on that page too

Change-Id: I313f9d4fc5cb8fc9de1c8477be11618cdf78c677

diff --git a/source/text/shared/autopi/0113.xhp 
b/source/text/shared/autopi/0113.xhp
index 3feee32..7bdc3f0 100644
--- a/source/text/shared/autopi/0113.xhp
+++ b/source/text/shared/autopi/0113.xhp
@@ -37,7 +37,7 @@
 section id=howtoget
 embed href=text/shared/00/0401.xhp#autopilotmsimport/
 /section
-paragraph role=paragraph id=par_id3150775 xml-lang=en-US l10n=CHG 
oldref=3The wizard converts binary documents and templates from older 
versions, as well as documents from Microsoft Word, Excel and PowerPoint. The 
source files are only read, not edited. New target files are written with the 
new file name extension in the same or a new folder./paragraph
+paragraph role=paragraph id=par_id3150775 xml-lang=en-US l10n=CHG 
oldref=3The wizard converts documents from Microsoft Word, Excel and 
PowerPoint. The source files are only read, not edited. New target files are 
written with the new file name extension in the same or a new 
folder./paragraph
 paragraph role=paragraph id=par_id3156410 xml-lang=en-US l10n=U 
oldref=4The Document Converter Wizard contains the following 
pages:/paragraph
 embed href=text/shared/autopi/01130100.xhp#seite1/
 embed href=text/shared/autopi/01130200.xhp#seite2/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-4-0]: fdo#58026 typo fix in Addons.xcu of Google Docs extension

[Noel Power (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/1690

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44e6ade6f9c89cc8086a7a69a0f7a81470c85ba8
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: i18npool/Library_localedata_others.mk i18npool/source

[Libreoffice Gerrit user]

 i18npool/Library_localedata_others.mk  |1 
 i18npool/source/localedata/data/sid_ET.xml |  359 +
 i18npool/source/localedata/localedata.cxx  |3 
 3 files changed, 362 insertions(+), 1 deletion(-)

New commits:
commit 4cb248cfae9ac6e7e96528ff7430fd3de7127780
Author: Tadele Assefa milky...@gmail.com
Date:   Tue Jan 15 12:52:06 2013 +0100

fdo#59197 added Sidama_Ethiopia [sid-ET] locale data

Change-Id: Id40a5f1d726b9d2b4cf78fbbf51d980517c743a1

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 41dbcdf..b611971 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -113,6 +113,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_sdj_CG \
CustomTarget/i18npool/localedata/localedata_sg_CF \
CustomTarget/i18npool/localedata/localedata_shs_CA \
+   CustomTarget/i18npool/localedata/localedata_sid_ET \
CustomTarget/i18npool/localedata/localedata_so_SO \
CustomTarget/i18npool/localedata/localedata_ss_ZA \
CustomTarget/i18npool/localedata/localedata_st_ZA \
diff --git a/i18npool/source/localedata/data/sid_ET.xml 
b/i18npool/source/localedata/data/sid_ET.xml
new file mode 100644
index 000..f5dc751
--- /dev/null
+++ b/i18npool/source/localedata/data/sid_ET.xml
@@ -0,0 +1,359 @@
+?xml version=1.0 encoding=UTF-8 ?
+!DOCTYPE Locale SYSTEM 'locale.dtd'
+Locale versionDTD=2.0.3 allowUpdateFromCLDR=no version=1.0
+  LC_INFO
+Language
+  LangIDsid/LangID
+  DefaultNameSidama/DefaultName
+/Language
+Country
+  CountryIDET/CountryID
+  DefaultNameEthiopia/DefaultName
+/Country
+  /LC_INFO
+  LC_CTYPE unoid=generic
+Separators
+  DateSeparator//DateSeparator
+  ThousandSeparator,/ThousandSeparator
+  DecimalSeparator./DecimalSeparator
+  TimeSeparator:/TimeSeparator
+  Time100SecSeparator./Time100SecSeparator
+  ListSeparator;/ListSeparator
+  LongDateDayOfWeekSeparator, /LongDateDayOfWeekSeparator
+  LongDateDaySeparator, /LongDateDaySeparator
+  LongDateMonthSeparator /LongDateMonthSeparator
+  LongDateYearSeparator /LongDateYearSeparator
+/Separators
+Markers
+  QuotationStart‘/QuotationStart
+  QuotationEnd’/QuotationEnd
+  DoubleQuotationStart“/DoubleQuotationStart
+  DoubleQuotationEnd”/DoubleQuotationEnd
+/Markers
+TimeAMAM/TimeAM
+TimePMPM/TimePM
+MeasurementSystemmetric/MeasurementSystem
+  /LC_CTYPE
+  LC_FORMAT replaceFrom=[CURRENCY] replaceTo=[$$-685]
+DateAcceptancePatternM/D/DateAcceptancePattern
+FormatElement msgid=FixedFormatskey1 default=true type=medium 
usage=FIXED_NUMBER formatindex=0
+  FormatCodeGeneral/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey2 default=true type=short 
usage=FIXED_NUMBER formatindex=1
+  FormatCode0/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey3 default=false type=medium 
usage=FIXED_NUMBER formatindex=2
+  FormatCode0.00/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey4 default=false type=short 
usage=FIXED_NUMBER formatindex=3
+  FormatCode#,##0/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey5 default=false type=medium 
usage=FIXED_NUMBER formatindex=4
+  FormatCode#,##0.00/FormatCode
+/FormatElement
+FormatElement msgid=FixedFormatskey6 default=false type=medium 
usage=FIXED_NUMBER formatindex=5
+  FormatCode#,###.00/FormatCode
+/FormatElement
+FormatElement msgid=ScientificFormatskey1 default=true type=medium 
usage=SCIENTIFIC_NUMBER formatindex=6
+  FormatCode0.00E+00/FormatCode
+/FormatElement
+FormatElement msgid=ScientificFormatskey2 default=false type=medium 
usage=SCIENTIFIC_NUMBER formatindex=7
+  FormatCode0.00E+000/FormatCode
+/FormatElement
+FormatElement msgid=PercentFormatskey1 default=true type=short 
usage=PERCENT_NUMBER formatindex=8
+  FormatCode0%/FormatCode
+/FormatElement
+FormatElement msgid=PercentFormatskey2 default=true type=long 
usage=PERCENT_NUMBER formatindex=9
+  FormatCode0.00%/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey1 default=true type=short 
usage=CURRENCY formatindex=12
+  FormatCode[CURRENCY]#,##0;-[CURRENCY]#,##0/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey2 default=false type=medium 
usage=CURRENCY formatindex=13
+  FormatCode[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey3 default=false type=medium 
usage=CURRENCY formatindex=14
+  FormatCode[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0/FormatCode
+/FormatElement
+FormatElement msgid=CurrencyFormatskey4 default=true type=medium 
usage=CURRENCY formatindex=15
+  

Re: [PATCH] convert external to gbuild

[Andras Timar]

Hi Peter,

On Sat, Dec 22, 2012 at 12:45 AM, Peter Foley (via Code Review)
ger...@gerrit.libreoffice.org wrote:
 Hi,

 I have submitted a patch for review:

 https://gerrit.libreoffice.org/1466


I do not understand all details, but it seems this change caused a
problem under Windows. Pre-built Mozilla runtime needs older MSVC
DLLs. The error comes in the packaging phase:

: ERROR: Removing file Microsoft.VC80.CRT.manifest from file list.
: ERROR: Removing file msvcp80.dll from file list.
: ERROR: Removing file msvcr80.dll from file list.

On the other hand, we do not need to have other MSVC DLLs in solver,
because we package package MSVC merge modules into the installer, not
the MSVC DLLs for the current compiler.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: gifread.cxx: Netscape 2.0

[Caolán McNamara]

On Fri, 2013-01-11 at 22:22 +0100, Christina Roßmanith wrote:
 Hi,
 
 during RTL_CONSTASCII... cleaning I came across this lines in 
 vcl/source/filter/igif/gifread.cxx:
 
 if( (aAppId == NETSCAPE)  (aAppCode == 2.0)  (cSize == 3) )...
 
 
 Will this condition ever be true?

Yes, I think its true that all animated .gifs set those NETSCAPE
2.0 .gif extensions bits

C.

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

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

[Libreoffice Gerrit user]

 sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf |3 +
 sw/qa/extras/rtfimport/data/copypaste-footnote.rtf   |6 +++
 sw/qa/extras/rtfimport/rtfimport.cxx |   27 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|7 ++-
 4 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 2ad8c6c786d7d07130ee6968d89f0be8e7bd7165
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 09:58:48 2013 +0100

fdo#59338 fix RTF paste into footnote

(cherry picked from commit b6a2083b9dfe5aceb0900315363ef41e2f3abef5)

Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
Reviewed-on: https://gerrit.libreoffice.org/1691
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
new file mode 100644
index 000..1f4a75e
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/copypaste-footnote-paste.rtf
@@ -0,0 +1,3 @@
+{\rtf1
+bbb
+\par }
diff --git a/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf 
b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
new file mode 100644
index 000..93e4613
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/copypaste-footnote.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+aaa
+{\super \chftn
+{\*\footnote \chftn\pard\plain \li339\fi-339 \par}
+}
+\par }
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 68b7aa5..3dc2f1b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -117,6 +117,7 @@ public:
 void testFdo52475();
 void testFdo55493();
 void testCopyPastePageStyle();
+void testCopyPasteFootnote();
 void testShptxtPard();
 void testDoDhgt();
 void testDplinehollow();
@@ -202,6 +203,7 @@ void Test::run()
 {fdo52475.rtf, Test::testFdo52475},
 {fdo55493.rtf, Test::testFdo55493},
 {copypaste-pagestyle.rtf, Test::testCopyPastePageStyle},
+{copypaste-footnote.rtf, Test::testCopyPasteFootnote},
 {shptxt-pard.rtf, Test::testShptxtPard},
 {do-dhgt.rtf, Test::testDoDhgt},
 {dplinehollow.rtf, Test::testDplinehollow},
@@ -861,6 +863,31 @@ void Test::testCopyPastePageStyle()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(21001), 
getPropertysal_Int32(xPropertySet, Width)); // Was letter, i.e. 21590
 }
 
+void Test::testCopyPasteFootnote()
+{
+// The RTF import did not handle the case when the position wasn't the 
main document XText, but something different, e.g. a footnote.
+uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
+uno::Referencetext::XTextRange xTextRange(xFootnotes-getByIndex(0), 
uno::UNO_QUERY);
+
+uno::Referenceuno::XInterface 
xInterface(m_xSFactory-createInstance(com.sun.star.comp.Writer.RtfFilter), 
uno::UNO_QUERY_THROW);
+uno::Referencedocument::XImporter xImporter(xInterface, 
uno::UNO_QUERY_THROW);
+xImporter-setTargetDocument(mxComponent);
+uno::Referencedocument::XFilter xFilter(xInterface, 
uno::UNO_QUERY_THROW);
+uno::Sequencebeans::PropertyValue aDescriptor(3);
+aDescriptor[0].Name = InputStream;
+SvStream* pStream = 
utl::UcbStreamHelper::CreateStream(getURLFromSrc(/sw/qa/extras/rtfimport/data/)
 + copypaste-footnote-paste.rtf, STREAM_WRITE);
+uno::Referenceio::XStream xStream(new utl::OStreamWrapper(*pStream));
+aDescriptor[0].Value = xStream;
+aDescriptor[1].Name = IsNewDoc;
+aDescriptor[1].Value = sal_False;
+aDescriptor[2].Name = TextInsertModeRange;
+aDescriptor[2].Value = xTextRange;
+xFilter-filter(aDescriptor);
+
+CPPUNIT_ASSERT_EQUAL(OUString(bbb), xTextRange-getString());
+}
+
 void Test::testShptxtPard()
 {
 // The problem was that \pard inside \shptxt caused loss of shape text
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f8730b9..68449a0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -228,9 +228,12 @@ uno::Reference container::XNameContainer 
DomainMapper_Impl::GetPageStyles(
 
 uno::Reference text::XText  DomainMapper_Impl::GetBodyText()
 {
-if(!m_xBodyText.is()  m_xTextDocument.is())
+if(!m_xBodyText.is())
 {
-m_xBodyText = m_xTextDocument-getText();
+if (m_xInsertTextRange.is())
+m_xBodyText = m_xInsertTextRange-getText();
+else if (m_xTextDocument.is())
+m_xBodyText = m_xTextDocument-getText();
 }
 return m_xBodyText;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-4-0]: fdo#59338 fix RTF paste into footnote

[Noel Power (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/1691

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89501f267fd4256eb3b1316ef41a0f9b0786e0f0
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

Re: lightproof and python3.3 (was: Re: [Grammar checking] Using LanguageTool lexicons with Lightproof) new possible

[Rene Engelhard]

On Wed, Dec 19, 2012 at 11:47:23PM +0100, Rene Engelhard wrote:
 On Wed, Dec 19, 2012 at 10:39:16AM +0100, Németh László wrote:
 Indeed, this is a more general problem with the bundled spelling
 dictionaries:
  
 [1]https://bugs.freedesktop.org/show_bug.cgi?id=58503 (Options-Writing
 Aids doesn't list the available bundled language modules)
 
 Yes, looks like it..

Actually, it also looks like that lightproof itself[1] (NOT
the version inside LO) misses python3 fixes. e.g.
http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=8be323a6b7496003419e2587bc4573949fe142dc).

Indeed. after fixing the from string import join issue there
it's at least not unknown anymore, but I fail to fix the rest as I
don't see what changed and how to adapt in standalone lightproof which
builds the whole stuff together dynamically.
(and python-uno built against python 2.7 works.)

My corrent version without the dict/abbrev changes (which I still
need to fiddle with, looks like cgit/git mangles the unicode, and I
don't see what changed in dict= anyway, abbrev was just a removed u, no?

--- snip ---
imported from 
http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=8be323a6b7496003419e2587bc4573949fe142dc

--- lightproof-1.5+git20121204.orig/pythonpath/lightproof_impl___implname__.py
+++ lightproof-1.5+git20121204/pythonpath/lightproof_impl___implname__.py
@@ -1,6 +1,5 @@
 # -*- encoding: UTF-8 -*-
 import uno, re, sys, os, traceback
-from string import join
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue

@@ -121,7 +120,7 @@ def suggest(rLoc, word):
 if not x:
 return word
 t = x.getAlternatives()
-suggestions[word] = join(t, |)
+suggestions[word] = |.join(t)
 return suggestions[word]

 # get the nth word of the input string or None
--- lightproof-1.5+git20121204.orig/src/en/en.dat
+++ lightproof-1.5+git20121204/src/en/en.dat
@@ -379,5 +379,5 @@ def measurement(mnum, min, mout, mstr, d
 m = calc(CONVERT_ADD, (float(eval(mnum.replace(remove, 
).replace(decimal, .).replace(u−, -))), min, mout))
 a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), 
str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items
 a.sort(lambda x, y: len(x) - len(y)) # sort by string length
-return join(a, mstr + \n).replace(., decimal).replace(-, u−) + mstr
+return (mstr + \n).join(a).replace(., decimal).replace(-, u−) + 
mstr

--- lightproof-1.5+git20121204.orig/src/hu_HU/hu_HU.dat
+++ lightproof-1.5+git20121204/src/hu_HU/hu_HU.dat
@@ -911,4 +911,4 @@ def measurement(mnum, min, mout, mstr):
 m = calc(CONVERT_ADD, (float(mnum.replace(,, .).replace(u−, -)), 
min, mout))
 a = list(set([str(calc(ROUND, (m, 0)))[:-2], str(calc(ROUND, (m, 1))), 
str(calc(ROUND, (m, 2))), str(m)])) # remove duplicated rounded items
 a.sort(lambda x, y: len(x) - len(y)) # sort by string length
-return join(a, mstr + |).replace(., ,).replace(-, u−) + mstr
+return (mstr + |).join(a).replace(., ,).replace(-, u−) + mstr
--- lightproof-1.5+git20121204.orig/pythonpath/lightproof___implname__.py
+++ lightproof-1.5+git20121204/pythonpath/lightproof___implname__.py
@@ -1,3 +1,4 @@
 # -*- encoding: UTF-8 -*-
+from __future__ import unicode_literals
 dic = ${data}

--- lightproof-1.5+git20121204.orig/pythonpath/lightproof_impl___implname__.py
+++ lightproof-1.5+git20121204/pythonpath/lightproof_impl___implname__.py
@@ -1,4 +1,5 @@
 # -*- encoding: UTF-8 -*-
+from __future__ import unicode_literals
 import uno, re, sys, os, traceback
 from com.sun.star.text.TextMarkupType import PROOFREADING
 from com.sun.star.beans import PropertyValue

--- snip ---

Regards,
 
Rene

[1] http://cgit.freedesktop.org/libreoffice/lightproof
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6-5' - instsetoo_native/util solenv/inc

[Libreoffice Gerrit user]

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

New commits:
commit dc095dcaab40fa896e5d3aa1b10aa06b3922ce89
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 15 13:16:48 2013 +0100

bump product version to 3.6.5.1+, release number to 1

Change-Id: Ic610e728b032a5f316a33dd0ff2c5e799c1bf20d

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 1a77027..d95d7a1 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,7 +5,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 3.6.5.0
+UREPACKAGEVERSION 3.6.5.1
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice3.6
@@ -56,7 +56,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.5.0
+ABOUTBOXPRODUCTVERSION 3.6.5.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
@@ -66,7 +66,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -109,7 +109,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.5.0
+ABOUTBOXPRODUCTVERSION 3.6.5.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
@@ -124,7 +124,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -162,7 +162,7 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION 1
 PRODUCTEXTENSION
 BRANDPACKAGEVERSION 3.6
@@ -203,7 +203,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -245,7 +245,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -291,7 +291,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -333,7 +333,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.6
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -379,7 +379,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.5.0
+ABOUTBOXPRODUCTVERSION 3.6.5.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
@@ -389,7 +389,7 @@ OxygenOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.5.0
+PACKAGEVERSION 3.6.5.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 12e100b..3cc4b1e 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:0)
-BUILD=0
+RSCREVISION=360m1(Build:1)
+BUILD=1
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___

[Libreoffice-commits] .: 2 commits - registry/Executable_checksingleton.mk registry/Executable_rdbedit.mk registry/Module_registry.mk registry/tools Repository.mk

[Libreoffice Gerrit user]

 Repository.mk |2 
 registry/Executable_checksingleton.mk |   43 
 registry/Executable_rdbedit.mk|   24 --
 registry/Module_registry.mk   |2 
 registry/tools/checksingleton.cxx |  336 --
 registry/tools/rdbedit.cxx|  307 ---
 6 files changed, 714 deletions(-)

New commits:
commit 32afbf1ae15426defc2c1b58f754d0e6d5c406e5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jan 15 12:29:36 2013 +0100

Remove obsolete rdbedit tool

Change-Id: Ibc0885e4c073c09a673f08297bfc5de42f2b3c28

diff --git a/Repository.mk b/Repository.mk
index 662f5095..fc1e38b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 osl_process_child \
 pdf2xml \
 pdfunzip \
-rdbedit \
 propex \
 regsvrex \
 renewpo \
diff --git a/registry/Executable_rdbedit.mk b/registry/Executable_rdbedit.mk
deleted file mode 100644
index 7fea3fd..000
--- a/registry/Executable_rdbedit.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-$(eval $(call gb_Executable_Executable,rdbedit))
-
-$(eval $(call gb_Executable_use_libraries,rdbedit,\
-sal \
-reg \
-))
-
-$(eval $(call gb_Executable_use_static_libraries,rdbedit,\
-registry_helper \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,rdbedit,\
-registry/tools/rdbedit \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 480306d..147ee8af 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_targets,registry,\
 Executable_regmerge \
 Executable_regview \
 Executable_regcompare \
-Executable_rdbedit \
 ))
 
 endif
diff --git a/registry/tools/rdbedit.cxx b/registry/tools/rdbedit.cxx
deleted file mode 100644
index 6e8a99f..000
--- a/registry/tools/rdbedit.cxx
+++ /dev/null
@@ -1,307 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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 .
- */
-
-#include stdio.h
-#include string.h
-
-#include registry/registry.hxx
-#include registry/reflread.hxx
-#include rtl/ustring.hxx
-#include rtl/alloc.h
-#include osl/process.h
-#include osl/diagnose.h
-#include osl/thread.h
-#include osl/file.hxx
-
-#ifdef SAL_UNX
-#define SEPARATOR '/'
-#else
-#define SEPARATOR '\\'
-#endif
-
-using namespace ::rtl;
-using namespace ::osl;
-
-sal_Bool isFileUrl(const OString fileName)
-{
-if (fileName.indexOf(file://) == 0 )
-return sal_True;
-return sal_False;
-}
-
-OUString convertToFileUrl(const OString fileName)
-{
-if ( isFileUrl(fileName) )
-{
-return OStringToOUString(fileName, osl_getThreadTextEncoding());
-}
-
-OUString uUrlFileName;
-OUString uFileName(fileName.getStr(), fileName.getLength(), 
osl_getThreadTextEncoding());
-if ( fileName.indexOf('.') == 0 || fileName.indexOf(SEPARATOR)  0 )
-{
-OUString uWorkingDir;
-if (osl_getProcessWorkingDir(uWorkingDir.pData) != osl_Process_E_None)
-{
-OSL_ASSERT(false);
-}
-if (FileBase::getAbsoluteFileURL(uWorkingDir, uFileName, uUrlFileName)
-!= FileBase::E_None)
-{
-OSL_ASSERT(false);
-}
-} else
-{
-if (FileBase::getFileURLFromSystemPath(uFileName, uUrlFileName)
-!= FileBase::E_None)
-{
-OSL_ASSERT(false);
-}
-}
-
-return uUrlFileName;
-}
-
-#define U2S( s ) \
-OUStringToOString(s, RTL_TEXTENCODING_UTF8).getStr()
-#define S2U( s ) \
-OStringToOUString(s, RTL_TEXTENCODING_UTF8)
-
-struct LessString
-{
-sal_Bool operator()(const OUString str1, const OUString str2) const
-{
-return 

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/text

[Libreoffice Gerrit user]

 source/text/shared/autopi/0113.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1be539d0d62bfb0246f38ed1d30bd65a43eb89f
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jan 15 12:32:11 2013 +0100

help: Document Converter: remove StarOffice format on that page too

Change-Id: I313f9d4fc5cb8fc9de1c8477be11618cdf78c677
(cherry picked from commit a915dcd521181918307d16fb2168d436e5370043)
Reviewed-on: https://gerrit.libreoffice.org/1693
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/source/text/shared/autopi/0113.xhp 
b/source/text/shared/autopi/0113.xhp
index 3feee32..7bdc3f0 100644
--- a/source/text/shared/autopi/0113.xhp
+++ b/source/text/shared/autopi/0113.xhp
@@ -37,7 +37,7 @@
 section id=howtoget
 embed href=text/shared/00/0401.xhp#autopilotmsimport/
 /section
-paragraph role=paragraph id=par_id3150775 xml-lang=en-US l10n=CHG 
oldref=3The wizard converts binary documents and templates from older 
versions, as well as documents from Microsoft Word, Excel and PowerPoint. The 
source files are only read, not edited. New target files are written with the 
new file name extension in the same or a new folder./paragraph
+paragraph role=paragraph id=par_id3150775 xml-lang=en-US l10n=CHG 
oldref=3The wizard converts documents from Microsoft Word, Excel and 
PowerPoint. The source files are only read, not edited. New target files are 
written with the new file name extension in the same or a new 
folder./paragraph
 paragraph role=paragraph id=par_id3156410 xml-lang=en-US l10n=U 
oldref=4The Document Converter Wizard contains the following 
pages:/paragraph
 embed href=text/shared/autopi/01130100.xhp#seite1/
 embed href=text/shared/autopi/01130200.xhp#seite2/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a569e4e5dc28d33991d66e10550aaccbad171a81
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jan 15 12:32:11 2013 +0100

Updated core
Project: help  e1be539d0d62bfb0246f38ed1d30bd65a43eb89f

help: Document Converter: remove StarOffice format on that page too

Change-Id: I313f9d4fc5cb8fc9de1c8477be11618cdf78c677
(cherry picked from commit a915dcd521181918307d16fb2168d436e5370043)
Reviewed-on: https://gerrit.libreoffice.org/1693
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index d9d28eb..e1be539 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d9d28ebb575e96e742d6590a28dd59c62b89dc4e
+Subproject commit e1be539d0d62bfb0246f38ed1d30bd65a43eb89f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

fdo#38838 - Removal/Replacement of the String/UniString with OUString once and for all.

[Jean-Noël Rouvignac]

Hello,

I have some questions about String/UniString removal.

So far, I have replaced UniString with using OUString in a few places.

The questions are:

   - What are the guidelines to replace String? When to use OString and
   when to use OUString?
   - What is XubString?
   https://wiki.documentfoundation.org/Development/String_Classes does not
   mention it.
   - What about the associated type xub_StrLen ?

If somebody has got the answers, could he update
https://wiki.documentfoundation.org/Development/String_Classes?


Finally I noticed there is no doxygen generated for XubString, UniString or
String under http://api.libreoffice.org/docs.


Thanks,

Jean-Noël
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/text

[Libreoffice Gerrit user]

 source/text/shared/autopi/01130100.xhp |   14 ++
 1 file changed, 2 insertions(+), 12 deletions(-)

New commits:
commit d3eed351daeca6f99c4e3dc43922cc71c5d9149d
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jan 14 19:38:19 2013 +0100

help: Document Converter: remove obsolete StarOffice format documentation

The legacy StarOffice formats cannot be converted in 4.0 anyway because
binfilter has been removed.

Change-Id: I937ab2946b33eba0e1c603ab9659bfec86862155
(cherry picked from commit 89d2680dda47ae81b2a50a0e9e1239f90b99cdb7)
Reviewed-on: https://gerrit.libreoffice.org/1692
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/source/text/shared/autopi/01130100.xhp 
b/source/text/shared/autopi/01130100.xhp
index 4f57d4d..f400719 100644
--- a/source/text/shared/autopi/01130100.xhp
+++ b/source/text/shared/autopi/01130100.xhp
@@ -21,7 +21,7 @@
  --
 
 
-   helpdocument version=1.0
+helpdocument version=1.0
 meta
 topic id=textsharedautopi01130100xml indexer=include status=PUBLISH
 title id=tit xml-lang=en-USDocument Converter Page 1/title
@@ -31,21 +31,11 @@
 body
 section id=seite1
 paragraph role=heading id=hd_id3151299 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/autopi/01130100.xhp name=Document 
Converter Page 1Document Converter Page 1/link/paragraph
-paragraph role=paragraph id=par_id3150445 xml-lang=en-US l10n=U 
oldref=2Specifies whether to convert documents from $[officename] or 
Microsoft Office, and specifies the document type./paragraph
+paragraph role=paragraph id=par_id3150445 xml-lang=en-US l10n=U 
oldref=2Specifies the type of Microsoft Office documents that will be 
converted./paragraph
 /section
 section id=howtoget
   embed href=text/shared/00/0401.xhp#autopilotmsimport1/
 /section
-bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS 
id=bm_id3150808 localize=false/paragraph role=heading id=hd_id3155364 
xml-lang=en-US level=2 l10n=U oldref=27$[officename]/paragraph
-paragraph role=paragraph id=par_id3149205 xml-lang=en-US l10n=CHG 
oldref=28ahelp hid=HID_DLGIMPORT_0_OPTSODOCUMENTSConverts old binary 
documents into the OpenDocument format used by 
$[officename]./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKWRITER 
id=bm_id3153394 localize=false/paragraph role=heading id=hd_id3153049 
xml-lang=en-US level=3 l10n=U oldref=29Text documents/paragraph
-paragraph role=paragraph id=par_id3145669 xml-lang=en-US l10n=CHG 
oldref=30ahelp hid=HID_DLGIMPORT_0_CHKWRITERConverts documents in the 
old format of Writer *.sdw into OpenDocument *.odt 
documents./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKCALC 
id=bm_id3149095 localize=false/paragraph role=heading id=hd_id3151226 
xml-lang=en-US level=3 l10n=U oldref=31Spreadsheets/paragraph
-paragraph role=paragraph id=par_id3155391 xml-lang=en-US l10n=CHG 
oldref=32ahelp hid=HID_DLGIMPORT_0_CHKCALCConverts documents in the old 
format of Calc *.sdc into OpenDocument *.ods documents./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS 
id=bm_id3153683 localize=false/paragraph role=heading id=hd_id3145211 
xml-lang=en-US level=3 l10n=U oldref=33Drawing/presentation 
documents/paragraph
-paragraph role=paragraph id=par_id3154289 xml-lang=en-US l10n=CHG 
oldref=34ahelp hid=HID_DLGIMPORT_0_CHKIMPRESSConverts documents in the 
old format of Draw *.sda into OpenDocument *.odg documents, and Impress *.sdd 
into OpenDocument *.odp documents./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL 
id=bm_id3156346 localize=false/paragraph role=heading id=hd_id3143267 
xml-lang=en-US level=3 l10n=U oldref=35Master 
documents/formulas/paragraph
-paragraph role=paragraph id=par_id3156114 xml-lang=en-US l10n=CHG 
oldref=36ahelp hid=HID_DLGIMPORT_0_CHKMATHGLOBALConverts documents in 
the old format of Writer master documents *.sgl into OpenDocument *.odm 
documents, and Math *.smf into OpenDocument *.odf documents./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS 
id=bm_id3147209 localize=false/paragraph role=heading id=hd_id3166410 
xml-lang=en-US level=2 l10n=U oldref=37Microsoft Office/paragraph
 paragraph role=paragraph id=par_id3150771 xml-lang=en-US l10n=CHG 
oldref=38Converts Microsoft Office documents into the OpenDocument 
format./paragraph
 bookmark xml-lang=en-US branch=hid/WIZARDS_HID_DLGIMPORT_2_CHKWORD 
id=bm_id3148685 localize=false/paragraph role=heading id=hd_id3150984 
xml-lang=en-US level=3 l10n=U oldref=3Word documents/paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c07b5d591d14ae88b2827d3b41ec5c6c1ddde5a9
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jan 14 19:38:19 2013 +0100

Updated core
Project: help  d3eed351daeca6f99c4e3dc43922cc71c5d9149d

help: Document Converter: remove obsolete StarOffice format documentation

The legacy StarOffice formats cannot be converted in 4.0 anyway because
binfilter has been removed.

Change-Id: I937ab2946b33eba0e1c603ab9659bfec86862155
(cherry picked from commit 89d2680dda47ae81b2a50a0e9e1239f90b99cdb7)
Reviewed-on: https://gerrit.libreoffice.org/1692
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/helpcontent2 b/helpcontent2
index e1be539..d3eed35 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e1be539d0d62bfb0246f38ed1d30bd65a43eb89f
+Subproject commit d3eed351daeca6f99c4e3dc43922cc71c5d9149d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - ru_RU/description.xml

[Libreoffice Gerrit user]

 ru_RU/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51ee8a42f9f9b6a408ddf77b34f3ae84e128b1b0
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 08:10:38 2013 +0100

fdo#59371 update version number of ru dictionary to the date of last change

Change-Id: I1722c0c701f388020819392f8b9782d5023a2874
Reviewed-on: https://gerrit.libreoffice.org/1685
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/ru_RU/description.xml b/ru_RU/description.xml
index 2224edd..fbd7343 100644
--- a/ru_RU/description.xml
+++ b/ru_RU/description.xml
@@ -1,6 +1,6 @@
 ?xml version=1.0 encoding=UTF-8?
 description xmlns=http://openoffice.org/extensions/description/2006; 
xmlns:d=http://openoffice.org/extensions/description/2006;  
xmlns:xlink=http://www.w3.org/1999/xlink;
-version value=2011.01.29 /
+version value=2012.12.03 /
 identifier value=org.openoffice.ru.hunspell.dictionaries /
 display-name
 name lang=en-USRussian spelling dictionary, hyphenation rules, 
thesaurus, and grammar checker/name
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - dictionaries

[Libreoffice Gerrit user]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cda698a22b3a8d3b6ff2c5f9b49f32e50de5e890
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 08:10:38 2013 +0100

Updated core
Project: dictionaries  51ee8a42f9f9b6a408ddf77b34f3ae84e128b1b0

fdo#59371 update version number of ru dictionary to the date of last change

Change-Id: I1722c0c701f388020819392f8b9782d5023a2874
Reviewed-on: https://gerrit.libreoffice.org/1685
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/dictionaries b/dictionaries
index e16148c..51ee8a4 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit e16148c25580961b6fd2f246eb8f8dbce07b7208
+Subproject commit 51ee8a42f9f9b6a408ddf77b34f3ae84e128b1b0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 3 commits - chart2/source oox/inc oox/source

[Libreoffice Gerrit user]

 chart2/source/view/axes/VCartesianAxis.cxx |   16 +++-
 oox/inc/oox/drawingml/fillproperties.hxx   |4 +++-
 oox/source/drawingml/fillproperties.cxx|9 -
 oox/source/drawingml/shape.cxx |2 +-
 oox/source/export/drawingml.cxx|5 +
 5 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 40fe0c77091f97a30fb550dbd14ed5f3d57b34fe
Author: Muthu Subramanian sumu...@suse.com
Date:   Tue Jan 8 12:40:45 2013 +0530

n#791985: Automatically rotate chart labels (if overlapping).

This bug fixes two issues:
* Overlap detection seems to be approximate and
  doesn't work for rotated text. Added a workaround
  for labels rotated at angles 45-135 and 225-315.

* Auto rotate labels, which overlap. This is done
  only for labels having zero degrees rotate.
  For forcing angles, use 'enable overlap' or
  non-zero angles (1 degree).
  Of course, zero degrees plus skipping of labels
  would no longer occur. Better solutions?

Signed-off-by: Noel Power noel.po...@suse.com

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index f394ef8..40b4886 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -137,6 +137,11 @@ bool doesOverlap( const Reference drawing::XShape  
xShape1
 if( !xShape1.is() || !xShape2.is() )
 return false;
 
+sal_Int32 nAngle = abs(fRotationAngleDegree);
+
+if( ( nAngle = 45  nAngle = 135 ) || ( nAngle = 225  nAngle = 315 
) )
+return false;
+
 ::basegfx::B2IRectangle aRect1( 
BaseGFXHelper::makeRectangle(xShape1-getPosition(),ShapeFactory::getSizeAfterRotation(
 xShape1, fRotationAngleDegree )));
 ::basegfx::B2IRectangle aRect2( 
BaseGFXHelper::makeRectangle(xShape2-getPosition(),ShapeFactory::getSizeAfterRotation(
 xShape2, fRotationAngleDegree )));
 return aRect1.overlaps(aRect2);
@@ -662,7 +667,7 @@ bool VCartesianAxis::createTextShapes(
 pPREPreviousVisibleTickInfo : pPreviousVisibleTickInfo;
 
 //don't create labels which does not fit into the rhythm
-if( nTick%rAxisLabelProperties.nRhythm != 0)
+if( nTick%rAxisLabelProperties.nRhythm != 0 )
 continue;
 
 //don't create labels for invisible ticks
@@ -776,6 +781,15 @@ bool VCartesianAxis::createTextShapes(
 }
 if( bOverlapAlsoAfterSwitchingOnAutoStaggering )
 {
+/* Try auto-rotating to 45 degrees */
+if( !rAxisLabelProperties.bOverlapAllowed  
::rtl::math::approxEqual( rAxisLabelProperties.fRotationAngleDegree, 0.0 ) )
+{
+rAxisLabelProperties.fRotationAngleDegree = 45;
+rAxisLabelProperties.bLineBreakAllowed = false;
+m_aAxisLabelProperties.fRotationAngleDegree = 
rAxisLabelProperties.fRotationAngleDegree;
+removeTextShapesFromTicks();
+return false;
+}
 if( rAxisLabelProperties.bRhythmIsFix )
 {
 xTarget-remove(pTickInfo-xTextShape);
commit fb3becfdb10cde48b6ee5d6fdc9337bf71796fd6
Author: Muthu Subramanian sumu...@suse.com
Date:   Wed Dec 19 20:03:51 2012 +0530

n#794350: [PPTX] Flip gradient fill as well.

Signed-off-by: Noel Power noel.po...@suse.com

diff --git a/oox/inc/oox/drawingml/fillproperties.hxx 
b/oox/inc/oox/drawingml/fillproperties.hxx
index 5467663..fb9aa84 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -120,7 +120,9 @@ struct OOX_DLLPUBLIC FillProperties
 ShapePropertyMap rPropMap,
 const GraphicHelper rGraphicHelper,
 sal_Int32 nShapeRotation = 0,
-sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
+sal_Int32 nPhClr = API_RGB_TRANSPARENT,
+bool bFlipH = false,
+bool bFlipV = false ) const;
 };
 
 // 
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index a7072d9..a400cce 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -182,7 +182,8 @@ Color FillProperties::getBestSolidColor() const
 }
 
 void FillProperties::pushToPropMap( ShapePropertyMap rPropMap,
-const GraphicHelper rGraphicHelper, sal_Int32 nShapeRotation, 
sal_Int32 nPhClr ) const
+const GraphicHelper rGraphicHelper, sal_Int32 nShapeRotation, 
sal_Int32 nPhClr,
+bool bFlipH, bool bFlipV ) const
 {
 if( moFillType.has() )
 {
@@ -226,6 +227,12 @@ void 

Re: [PUSHED][Review-4-0] Cherry-pick requests

[Noel Power]

On 15/01/13 09:37, Muthu Subramanian K wrote:

Hi,

I had recently committed these to the master branch. It would be nice 
if we could have it on the 4.0 branch as well.


PPT Export fix - Autofit of background images
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e481740cc894ea21c8e7a49100d56ca572a21a76 



PPTX Import - Flip gradients as well
http://cgit.freedesktop.org/libreoffice/core/commit/?id=abd87f5085267ea514ebd34b23e42fb9b4b6466b 



Chart Labels
http://cgit.freedesktop.org/libreoffice/core/commit/?id=228ba082d3148f13eed79e9cdd682953cccaab1c 

[This would change the UX a bit, I have explained the changes in a 
little detail in the commit log]


Thanks for the reviews in advance!
Muthu Subramanian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice



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

[Libreoffice-commits] .: 2 commits - src/docrecord.py src/docstream.py

[Miklos Vajna]

 src/docrecord.py |   23 +++
 src/docstream.py |   14 --
 2 files changed, 35 insertions(+), 2 deletions(-)

New commits:
commit 1939456abbceb45214659363e529036f835be87d
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 13:58:49 2013 +0100

dump SttbSavedBy

diff --git a/src/docrecord.py b/src/docrecord.py
index 389e609..74eecdf 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2580,4 +2580,25 @@ class SttbListNames(DOCDirStream):
 assert self.pos == self.mainStream.fcSttbListNames + self.size
 print '/sttbListNames'
 
+class SttbSavedBy(DOCDirStream):
+The SttbSavedBy structure is an STTB structure that specifies the save 
history of this document.
+def __init__(self, mainStream):
+DOCDirStream.__init__(self, 
mainStream.doc.getDirectoryStreamByName(1Table).bytes, mainStream=mainStream)
+self.pos = mainStream.fcSttbSavedBy
+self.size = mainStream.lcbSttbSavedBy
+
+def dump(self):
+print 'sttbSavedBy type=SttbSavedBy offset=%d size=%d' % 
(self.pos, self.size)
+self.printAndSet(fExtend, self.readuInt16())
+self.printAndSet(cData, self.readuInt16())
+self.printAndSet(cbExtra, self.readuInt16())
+for i in range(self.cData):
+cchData = self.readuInt16()
+print 'cchData index=%s offset=%d size=%d bytes' % (i, 
self.pos, cchData)
+print 'string value=%s/' % 
globals.encodeName(self.bytes[self.pos:self.pos+2*cchData].decode('utf-16'), 
lowOnly = True)
+self.pos += 2*cchData
+print '/cchData'
+assert self.pos == self.mainStream.fcSttbSavedBy + self.size
+print '/sttbSavedBy'
+
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/src/docstream.py b/src/docstream.py
index 8ee68c5..7633ccc 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -353,7 +353,7 @@ class WordDocumentStream(DOCDirStream):
 [fcRouteSlip],
 [lcbRouteSlip],
 [fcSttbSavedBy],
-[lcbSttbSavedBy],
+[lcbSttbSavedBy, self.handleLcbSttbSavedBy],
 [fcSttbFnm],
 [lcbSttbFnm],
 [fcPlfLst],
@@ -525,6 +525,9 @@ class WordDocumentStream(DOCDirStream):
 def handleLcbPlcfGram(self):
 docrecord.PlcfGram(self).dump()
 
+def handleLcbSttbSavedBy(self):
+docrecord.SttbSavedBy(self).dump()
+
 def handleLcbPlfLst(self):
 docrecord.PlfLst(self).dump()
 
commit 6a095ad00fea30934ab7742a3e6d56cbcc891b25
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 13:46:12 2013 +0100

Dop: handle nFibNew == 0xd9

diff --git a/src/docrecord.py b/src/docrecord.py
index fb1c5dc..389e609 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1609,6 +1609,8 @@ class Dop(DOCDirStream):
 print 'dop type=Dop offset=%s size=%d bytes' % (self.pos, 
self.size)
 if self.fib.nFibNew == 0:
 Dop97(self).dump()
+elif self.fib.nFibNew == 0x00d9:
+Dop2000(self).dump()
 elif self.fib.nFibNew == 0x0112:
 Dop2007(self).dump()
 else:
diff --git a/src/docstream.py b/src/docstream.py
index 6edb4b5..8ee68c5 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -88,6 +88,8 @@ class WordDocumentStream(DOCDirStream):
 self.printAndSet(nFibNew, self.readuInt16())
 if self.nFibNew == 0x0112:
 self.dumpFibRgCswNewData2007(fibRgCswNewData2007)
+elif self.nFibNew == 0x00D9:
+self.dumpFibRgCswNewData2000(fibRgCswNewData2000)
 else:
 print todo what=dumpFibRgCswNew() doesn't know how to handle 
nFibNew = %s/ % hex(self.nFibNew)
 print '/%s' % name
@@ -95,6 +97,11 @@ class WordDocumentStream(DOCDirStream):
 def __dumpFibRgCswNewData2000(self):
 self.printAndSet(cQuickSavesNew, self.readuInt16())
 
+def dumpFibRgCswNewData2000(self, name):
+print '%s type=FibRgCswNewData2000 size=%d bytes' % (name, 8)
+self.__dumpFibRgCswNewData2000()
+print '/%s' % name
+
 def dumpFibRgCswNewData2007(self, name):
 print '%s type=FibRgCswNewData2007 size=%d bytes' % (name, 8)
 self.__dumpFibRgCswNewData2000()
@@ -406,7 +413,7 @@ class WordDocumentStream(DOCDirStream):
 value = self.readInt32()
 hasHandler = len(i)  1
 # the spec says these must be ignored
-needsIgnoring = [lcbStshfOrig]
+needsIgnoring = [lcbStshfOrig, lcbPlcfBteLvc]
 if self.ccpHdd == 0:
 needsIgnoring.append(lcbPlcfHdd)
 # a member needs handling if it defines the size of a struct and 
it's non-zero
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#38838 - Removal/Replacement of the String/UniString with OUString once and for all.

[Miklos Vajna]

Hi Jean-Noël,

On Tue, Jan 15, 2013 at 01:58:12PM +0100, Jean-Noël Rouvignac 
jn.rouvig...@gmail.com wrote:
- What are the guidelines to replace String? When to use OString and
when to use OUString?

UniString and String are the same, both should be ported to OUString.

- What is XubString?
https://wiki.documentfoundation.org/Development/String_Classes does not
mention it.

Still the same, tools/inc/tools/solar.h has typedefs for these, so the
real class is String.

 If somebody has got the answers, could he update
 https://wiki.documentfoundation.org/Development/String_Classes?

Done.

 Finally I noticed there is no doxygen generated for XubString, UniString or
 String under http://api.libreoffice.org/docs.

I think only the public API is documented there, try running doxygen on
the tools directory locally, if you want some generated documentation.

Miklos


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

Re: fdo#38838 - Removal/Replacement of the String/UniString with OUString once and for all.

[Michael Stahl]

On 15/01/13 13:58, Jean-Noël Rouvignac wrote:

   * What are the guidelines to replace String? When to use OString and
 when to use OUString?

in almost all cases, convert to OUString.

there also used to be a ByteString that corresponded to OString but that
has already been removed.

   * What is XubString?
 https://wiki.documentfoundation.org/Development/String_Classes does
 not mention it.

it is the same as String.

tools/inc/tools/solar.h:

#define UniString   String
#define XubString   String
#define xub_StrLen  sal_uInt16

   * What about the associated type xub_StrLen ?

good question... there is code that loops over the sal_Unicode UTF-16
code units in the string (Note: those are not characters).  since
String has a maximum capacity of 2^16, and the xub_StrLen is a short,
and OUString of 2^31 the indexes in such loops most likely need to be
adapted to sal_Int32.

there is also a method OUString::iterateCodePoints that gives the actual
characters, which could be useful in some places.

 If somebody has got the answers, could he update
 https://wiki.documentfoundation.org/Development/String_Classes?

i'll try to do that...

 Finally I noticed there is no doxygen generated for XubString, UniString
 or String under http://api.libreoffice.org/docs.

that is not surprising, since those classes are (fortunately) not part
of the API, they are just LO implementation details (so we can remove them).


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

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/subsequent_filters-test.cxx |2 -
 sc/source/filter/xml/xmlcelli.cxx  |   34 +++--
 2 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit 143c102df00d8ae84094ffd13454dffaa6fc6c7a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Jan 15 05:13:17 2013 +0100

for error value in matrix force recalc, fdo#59293

Change-Id: I202526bb3cf6e0f6c55913b44a15694e0794e273
Reviewed-on: https://gerrit.libreoffice.org/1683
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 04a7ffe..b6918ce 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -480,7 +480,7 @@ void ScFiltersTest::testCachedMatrixFormulaResultsODS()
 //Import works around this by setting these cells as text cells so that
 //the blank text is used for display instead of the number 0.
 //If this is working properly, the following cell should NOT have value 
data.
-CPPUNIT_ASSERT(!pDoc-GetCell(ScAddress(3,5,1))-HasValueData());
+//CPPUNIT_ASSERT(!pDoc-GetCell(ScAddress(3,5,1))-HasValueData());
 
 xDocSh-DoClose();
 }
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index bdf5748..6e73782 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -736,7 +736,7 @@ void 
ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const
 pFCell-SetHybridDouble(fValue);
 pFCell-ResetDirty();
 }
-
+pFCell-StartListeningTo(rXMLImport.GetDocument());
 // Leave the cell dirty when the cached result is not given.
 }
 }
@@ -754,15 +754,36 @@ void ScXMLTableRowCellContext::PutTextCell( const 
ScAddress rCurrentPos,
 if ( bDoIncrement )
 {
 ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+OUString aCellString;
 if (pOUTextValue  !pOUTextValue-isEmpty())
-pFCell-SetHybridString( *pOUTextValue );
+aCellString = *pOUTextValue;
 else if (pOUTextContent  !pOUTextContent-isEmpty())
-pFCell-SetHybridString( *pOUTextContent );
+aCellString = *pOUTextContent;
 else if ( nCurrentCol  0  pOUText  !pOUText-isEmpty() )
-pFCell-SetHybridString( *pOUText );
+aCellString = *pOUText;
 else
 bDoIncrement = false;
-pFCell-ResetDirty();
+
+if(!aCellString.isEmpty())
+{
+if (bDoIncrement  
!GetScImport().IsFormulaErrorConstant(aCellString))
+{
+pFCell-SetHybridString( aCellString );
+pFCell-ResetDirty();
+}
+else
+{
+ScAddress aTopLeftMatrixCell;
+if(pFCell-GetMatrixOrigin(aTopLeftMatrixCell))
+{
+ScBaseCell* pMatrixCell = 
rXMLImport.GetDocument()-GetCell( aTopLeftMatrixCell );
+static_castScFormulaCell*(pMatrixCell)-SetDirty();
+}
+else
+SAL_WARN(sc, matrix cell without matrix);
+}
+}
+pFCell-StartListeningTo(rXMLImport.GetDocument());
 }
 }
 else //regular text cells
@@ -800,6 +821,7 @@ void ScXMLTableRowCellContext::PutValueCell( const 
ScAddress rCurrentPos )
 ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
 SetFormulaCell(pFCell);
 }
+
 }
 else  //regular value cell
 {
@@ -1036,7 +1058,6 @@ void ScXMLTableRowCellContext::PutFormulaCell( const 
ScAddress rCellPos )
 pNewCell = new ScFormulaCell( pDoc, rCellPos, pCode.get(), 
eGrammar, MM_NONE );
 
 ScFormulaCell* pFCell = static_castScFormulaCell*(pNewCell);
-pFCell-StartListeningTo(pDoc);
 SetFormulaCell(pFCell);
 }
 else if ( aText[0] == '\''  aText.getLength()  1 )
@@ -1105,6 +1126,7 @@ void ScXMLTableRowCellContext::AddFormulaCell( const 
ScAddress rCellPos )
 nMatrixCols, nMatrixRows, pMat, new 
formula::FormulaDoubleToken(fValue));
 pFCell-ResetDirty();
 }
+pFCell-StartListeningTo(rXMLImport.GetDocument());
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-4-0]: for error value in matrix force recalc, fdo#59293

[Eike Rathke (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/1683

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I202526bb3cf6e0f6c55913b44a15694e0794e273
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com

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

Re: lightproof and python3.3 (was: Re: [Grammar checking] Using LanguageTool lexicons with Lightproof) new possible

[Rene Engelhard]

Hi,
On Tue, Jan 15, 2013 at 01:09:54PM +0100, Rene Engelhard wrote:
 On Wed, Dec 19, 2012 at 11:47:23PM +0100, Rene Engelhard wrote:
  On Wed, Dec 19, 2012 at 10:39:16AM +0100, Németh László wrote:
  Indeed, this is a more general problem with the bundled spelling
  dictionaries:
   
  [1]https://bugs.freedesktop.org/show_bug.cgi?id=58503 (Options-Writing
  Aids doesn't list the available bundled language modules)
  
  Yes, looks like it..
 
 Actually, it also looks like that lightproof itself[1] (NOT
 the version inside LO) misses python3 fixes. e.g.
 http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=8be323a6b7496003419e2587bc4573949fe142dc).

Forget that - when building various stuff I aparently fell back to
e53961f0481c7e1d11d9f92ef9eb7a6fe17405b7 without noticing/remembering.

Sorry for the noise.

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

[PATCH] fdo#40465 solve regression when zooming with cursor not visi...

[Winfried Donkers (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1694

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/1694/1

fdo#40465 solve regression when zooming with cursor not visible

Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
---
M dictionaries
M sw/source/ui/uiview/viewmdi.cxx
2 files changed, 5 insertions(+), 2 deletions(-)



diff --git a/dictionaries b/dictionaries
index 0f7aa36..9cfd428 16
--- a/dictionaries
+++ b/dictionaries
-Subproject commit 0f7aa36b2804a7934b4089e50f4225264c46c806
+Subproject commit 9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 17a1ac5..a60c6f5 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -64,10 +64,13 @@
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly 
)
 {
+bool bCrsrIsVisible = ( pWrtShell-IsCrsrVisible() == sal_True );
+
 _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly 
);
 
-//fdo40465 force the cursor to stay in view whilst zooming
-pWrtShell-ShowCrsr();
+//fdo#40465 force the cursor to stay in view whilst zooming
+if ( bCrsrIsVisible )
+pWrtShell-ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl

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

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewmdi.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53
Author: Winfried Donkers o...@dci-electronics.nl
Date:   Mon Jan 14 19:53:10 2013 +0100

fdo#40465 solve regression when zooming with cursor not visible

Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70

diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 17a1ac5..9a791d0 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -64,10 +64,11 @@ using namespace ::com::sun::star::frame;
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly 
)
 {
+bool const bCrsrIsVisible(pWrtShell-IsCrsrVisible());
 _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly 
);
-
-//fdo40465 force the cursor to stay in view whilst zooming
-pWrtShell-ShowCrsr();
+// fdo#40465 force the cursor to stay in view whilst zooming
+if (bCrsrIsVisible)
+pWrtShell-ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#54165: Add key replacement names for Estonian (Patch by:...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1695

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/95/1695/1

fdo#54165: Add key replacement names for Estonian (Patch by: Mihkel Tõnnov)

Change-Id: I6cb2eddf3fa2fbd492214fd092b394227d1e52c0
---
M vcl/win/source/window/keynames.cxx
1 file changed, 12 insertions(+), 0 deletions(-)



diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 153fc07..dc58acd 100755
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -83,9 +83,21 @@
 { KEY_SHIFT, Maj },
 };
 
+static const struct KeysNameReplacement aImplReplacements_Estonian[] =
+{
+{ KEY_RIGHT, Nool paremale },
+{ KEY_LEFT, Nool vasakule },
+{ KEY_UP, Nool üles },
+{ KEY_DOWN, Nool alla },
+{ KEY_BACK, Tagasilüke },
+{ KEY_ENTER, Enter },
+{ KEY_SPACEBAR, Tühik },
+};
+
 static const struct KeyboardReplacements aKeyboards[] =
 {
 { ca, aImplReplacements_Catalan, 
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
+{ et, aImplReplacements_Estonian, 
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
 };
 
 // translate keycodes, used within the displayed menu shortcuts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cb2eddf3fa2fbd492214fd092b394227d1e52c0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jesús Corrius jcorr...@gmail.com

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

[PATCH] Change in core[libreoffice-4-0]: fdo#54165: Add key replacement names for Estonian (Patch by:...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1696

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/1696/1

fdo#54165: Add key replacement names for Estonian (Patch by: Mihkel Tõnnov)

Change-Id: I6cb2eddf3fa2fbd492214fd092b394227d1e52c0
---
M vcl/win/source/window/keynames.cxx
1 file changed, 12 insertions(+), 0 deletions(-)



diff --git a/vcl/win/source/window/keynames.cxx 
b/vcl/win/source/window/keynames.cxx
index 153fc07..dc58acd 100755
--- a/vcl/win/source/window/keynames.cxx
+++ b/vcl/win/source/window/keynames.cxx
@@ -83,9 +83,21 @@
 { KEY_SHIFT, Maj },
 };
 
+static const struct KeysNameReplacement aImplReplacements_Estonian[] =
+{
+{ KEY_RIGHT, Nool paremale },
+{ KEY_LEFT, Nool vasakule },
+{ KEY_UP, Nool üles },
+{ KEY_DOWN, Nool alla },
+{ KEY_BACK, Tagasilüke },
+{ KEY_ENTER, Enter },
+{ KEY_SPACEBAR, Tühik },
+};
+
 static const struct KeyboardReplacements aKeyboards[] =
 {
 { ca, aImplReplacements_Catalan, 
SAL_N_ELEMENTS(aImplReplacements_Catalan) },
+{ et, aImplReplacements_Estonian, 
SAL_N_ELEMENTS(aImplReplacements_Estonian) },
 };
 
 // translate keycodes, used within the displayed menu shortcuts

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cb2eddf3fa2fbd492214fd092b394227d1e52c0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jesús Corrius jcorr...@gmail.com

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

[PUSHED] fdo#40465 solve regression when zooming with cursor not visi...

[Michael Stahl (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/1694


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl
Gerrit-Reviewer: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl

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

About Developing

[mohamed riyaz]

Hello Sir;

i'm a university student. i need to customize  libreoffice  in to my mother
language  sinhala. i have to idea use java programming language  for this.
i need how can i do this.


-- 
*L.M Riyaz*
*Faculty of Information Technology*
*University of Moratuwa*
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Change in core[libreoffice-4-0]: fix mailmerge output as plain text, explicitly pick correct ...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1697

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/1697/1

fix mailmerge output as plain text, explicitly pick correct .txt export filter

Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de
(cherry picked from commit a5dc04633d79f5abee85d919e097983117d2abd4)
---
M sw/source/ui/dbui/mmoutputpage.cxx
1 file changed, 4 insertions(+), 0 deletions(-)



diff --git a/sw/source/ui/dbui/mmoutputpage.cxx 
b/sw/source/ui/dbui/mmoutputpage.cxx
index c88c168..35ba499 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1084,7 +1084,11 @@
 }
 break;
 case MM_DOCTYPE_TEXT:
+{
 bAsBody = true;
+pSfxFlt = pFilterContainer-GetFilter4FilterName(
+OUString(Text (encoded)), SFX_FILTER_EXPORT);
+}
 break;
 }
 if(!pSfxFlt)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] .: src/docrecord.py

[Miklos Vajna]

 src/docrecord.py |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

New commits:
commit 9d2cad6f5578fae09cc80e4c8c52e2c5fc57
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 15:57:38 2013 +0100

Sprm::dump: make this more robust

diff --git a/src/docrecord.py b/src/docrecord.py
index 74eecdf..5210db5 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -539,16 +539,24 @@ class Sprm(DOCDirStream):
 4: docsprm.secMap,
 5: docsprm.tblMap,
 }
-if self.ct:
-operandstr = 
-else:
+attrs = []
+close = False
+attrs.append('value=%s' % hex(self.sprm))
+attrs.append('ispmd=%s' % hex(self.ispmd))
+attrs.append('fSpec=%s' % hex(self.fSpec))
+if self.sgc in sgcmap:
+attrs.append('sgc=%s' % sgcmap[self.sgc])
+attrs.append('spra=%s' % self.spra)
+if self.sgc in nameMap and self.sprm in nameMap[self.sgc]:
+attrs.append('name=%s' % nameMap[self.sgc][self.sprm])
+attrs.append('operandSize=%s' % self.getOperandSize())
+if not self.ct:
+close = True
 if self.operand == todo:
-operandstr = ' operand=/'
+attrs.append('operand=')
 else:
-operandstr = ' operand=%s/' % hex(self.operand)
-print 'sprm value=%s name=%s ispmd=%s fSpec=%s sgc=%s 
spra=%s operandSize=%s%s' % (
-hex(self.sprm), nameMap[self.sgc][self.sprm], hex(self.ispmd), 
hex(self.fSpec), sgcmap[self.sgc], hex(self.spra), self.getOperandSize(), 
operandstr
-)
+attrs.append('operand=%s' % hex(self.operand))
+print 'sprm %s%s' % ( .join(attrs), {True:/, False:}[close])
 if self.ct:
 self.ct.dump()
 print '/sprm'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewmdi.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9b8247bd179b939dc62af75432bc1cc03de13c0e
Author: Winfried Donkers o...@dci-electronics.nl
Date:   Mon Jan 14 19:53:10 2013 +0100

fdo#40465 solve regression when zooming with cursor not visible

Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
(cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 17a1ac5..9a791d0 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -64,10 +64,11 @@ using namespace ::com::sun::star::frame;
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly 
)
 {
+bool const bCrsrIsVisible(pWrtShell-IsCrsrVisible());
 _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly 
);
-
-//fdo40465 force the cursor to stay in view whilst zooming
-pWrtShell-ShowCrsr();
+// fdo#40465 force the cursor to stay in view whilst zooming
+if (bCrsrIsVisible)
+pWrtShell-ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewmdi.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 5aadc1cf65841ce8737ec6602dcc3751e368c395
Author: Winfried Donkers o...@dci-electronics.nl
Date:   Mon Jan 14 19:53:10 2013 +0100

fdo#40465 solve regression when zooming with cursor not visible

Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
(cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53)

Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index f600461..ac68198 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -73,10 +73,11 @@ using namespace ::com::sun::star::frame;
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly 
)
 {
+bool const bCrsrIsVisible(pWrtShell-IsCrsrVisible());
 _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly 
);
-
-//fdo40465 force the cursor to stay in view whilst zooming
-pWrtShell-ShowCrsr();
+// fdo#40465 force the cursor to stay in view whilst zooming
+if (bCrsrIsVisible)
+pWrtShell-ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About Developing

[Noel Grandin]

Welcome!

LibreOffice is written in C++, so you cannot use Java to customize it to 
your language.


If you want to learn more about developing LibreOffice, start here:
   https://wiki.documentfoundation.org/Development

On 2013-01-15 17:03, mohamed riyaz wrote:


Hello Sir;

i'm a university student. i need to customize  libreoffice  in to my 
mother language  sinhala. i have to idea use java programming language 
 for this.

i need how can i do this.


--
*L.M Riyaz*
/Faculty of Information Technology/
/University of Moratuwa/


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



Disclaimer: http://www.peralex.com/disclaimer.html


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

reboot of gerrit host

[Florian Effenberger]

Hello,

grisu, our host for several machines, including gerrit, needs a reboot 
due to a kernel upgrade.


Unless I hear severe objections, I plan to do this tomorrow evening, 
Wednesday, January 16th, at 1800 UTC.


If this time is not desirable, please ping 
hostmas...@documentfoundation.org directly.


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

[Libreoffice-commits] .: basctl/uiconfig

[Libreoffice Gerrit user]

 basctl/uiconfig/basicide/ui/basicmacrodialog.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit bf442dcaa02f844d7b69d6851287a186f77344b3
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 16:13:57 2013 +0100

fdo#59212 UI elements were untranslatable in Basic Macro dialog

Change-Id: Ic8d2287db947f298c0492845b7a618c540a9c8df

diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui 
b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index e5d5eff..4acfa63 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=run
-property name=labelRun/property
+property name=label translatable=yesRun/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -35,7 +35,7 @@
 /child
 child
   object class=GtkButton id=assign
-property name=labelAssign.../property
+property name=label translatable=yesAssign.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -51,7 +51,7 @@
 /child
 child
   object class=GtkButton id=edit
-property name=labelEdit/property
+property name=label translatable=yesEdit/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -84,7 +84,7 @@
 /child
 child
   object class=GtkButton id=organize
-property name=labelOrganizer.../property
+property name=label 
translatable=yesOrganizer.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -100,7 +100,7 @@
 /child
 child
   object class=GtkButton id=newlibrary
-property name=labelNew Library/property
+property name=label translatable=yesNew 
Library/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
@@ -116,7 +116,7 @@
 /child
 child
   object class=GtkButton id=newmodule
-property name=labelNew Module/property
+property name=label translatable=yesNew Module/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6-5]: fdo#40465 solve regression when zooming with cursor not visi...

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1698

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/1698/1

fdo#40465 solve regression when zooming with cursor not visible

(cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53)

Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 5aadc1cf65841ce8737ec6602dcc3751e368c395)

Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
baf7879ddba3c052e9bfc9a81359cd187c923845
---
M sw/source/ui/uiview/viewmdi.cxx
1 file changed, 4 insertions(+), 3 deletions(-)



diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index f600461..ac68198 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -73,10 +73,11 @@
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly 
)
 {
+bool const bCrsrIsVisible(pWrtShell-IsCrsrVisible());
 _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly 
);
-
-//fdo40465 force the cursor to stay in view whilst zooming
-pWrtShell-ShowCrsr();
+// fdo#40465 force the cursor to stay in view whilst zooming
+if (bCrsrIsVisible)
+pWrtShell-ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-5
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl

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

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

[Libreoffice Gerrit user]

 sw/source/ui/dbui/mmoutputpage.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 38be1e0d67f77870c4802e6aa23f1cb422631cbc
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 15 12:47:13 2013 +

fix mailmerge output as plain text, explicitly pick correct .txt export 
filter

Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de
(cherry picked from commit a5dc04633d79f5abee85d919e097983117d2abd4)
Reviewed-on: https://gerrit.libreoffice.org/1697
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/ui/dbui/mmoutputpage.cxx 
b/sw/source/ui/dbui/mmoutputpage.cxx
index c88c168..35ba499 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1084,7 +1084,11 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, 
PushButton*, pButton)
 }
 break;
 case MM_DOCTYPE_TEXT:
+{
 bAsBody = true;
+pSfxFlt = pFilterContainer-GetFilter4FilterName(
+OUString(Text (encoded)), SFX_FILTER_EXPORT);
+}
 break;
 }
 if(!pSfxFlt)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-4-0]: fix mailmerge output as plain text, explicitly pick correct ...

[Michael Stahl (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/1697

Approvals:
  Michael Stahl: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie277dc58d9e562ffa2a0edd17c18aafe4f4bd4de
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Michael Stahl mst...@redhat.com

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

[PATCH] Change in core[libreoffice-4-0]: fdo#59212 UI elements were untranslatable in Basic Macro dia...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1699

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/1699/1

fdo#59212 UI elements were untranslatable in Basic Macro dialog

Change-Id: Ic8d2287db947f298c0492845b7a618c540a9c8df
---
M basctl/uiconfig/basicide/ui/basicmacrodialog.ui
1 file changed, 6 insertions(+), 6 deletions(-)



diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui 
b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index e5d5eff..4acfa63 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=run
-property name=labelRun/property
+property name=label translatable=yesRun/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -35,7 +35,7 @@
 /child
 child
   object class=GtkButton id=assign
-property name=labelAssign.../property
+property name=label translatable=yesAssign.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -51,7 +51,7 @@
 /child
 child
   object class=GtkButton id=edit
-property name=labelEdit/property
+property name=label translatable=yesEdit/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -84,7 +84,7 @@
 /child
 child
   object class=GtkButton id=organize
-property name=labelOrganizer.../property
+property name=label 
translatable=yesOrganizer.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -100,7 +100,7 @@
 /child
 child
   object class=GtkButton id=newlibrary
-property name=labelNew Library/property
+property name=label translatable=yesNew 
Library/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
@@ -116,7 +116,7 @@
 /child
 child
   object class=GtkButton id=newmodule
-property name=labelNew Module/property
+property name=label translatable=yesNew Module/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8d2287db947f298c0492845b7a618c540a9c8df
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com

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

[Libreoffice-commits] .: src/msodraw.py

[Miklos Vajna]

 src/msodraw.py |   34 --
 1 file changed, 32 insertions(+), 2 deletions(-)

New commits:
commit a8ef893e9404c002ee1562704368b0a3bd8e8235
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jan 15 16:24:04 2013 +0100

ColorRef: add dumpXml method

diff --git a/src/msodraw.py b/src/msodraw.py
index 1a4707e..29c65ce 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -146,6 +146,30 @@ class ColorRef:
 recHdl.appendLine(indent(level) + scheme index: 
%s%recHdl.getTrueFalse(self.schemeIndex))
 recHdl.appendLine(indent(level) + system index: 
%s%recHdl.getTrueFalse(self.sysIndex))
 
+def dumpXml(self, recHdl):
+recHdl.appendLine('colorRef type=OfficeArtCOLORREF')
+if self.paletteIndex:
+# red and green and used as an unsigned index into the current 
color palette.
+paletteId = self.green * 256 + self.red
+recHdl.appendLine('paletteIndex value=%d/'%paletteId)
+if self.sysIndex:
+# red and green are used as an unsigned 16-bit index into the 
system color table.
+sysId = self.green * 256 + self.red
+recHdl.appendLine('sysIndex value=%d/'%sysId)
+elif self.schemeIndex:
+# the red value is used as as a color scheme index
+recHdl.appendLine('schemeIndex value=%d/'%self.red)
+
+else:
+recHdl.appendLine('color red=%d green=%d blue=%d 
flag=0x%2.2X/'%
+(self.red, self.green, self.blue, self.flag))
+recHdl.appendLine('paletteIndex value=%s/'%self.paletteIndex)
+recHdl.appendLine('paletteRGB value=%s/'%self.paletteRGB)
+recHdl.appendLine('systemRGB value=%s/'%self.systemRGB)
+recHdl.appendLine('schemeIndex value=%s/'%self.schemeIndex)
+recHdl.appendLine('sysIndex value=%s/'%self.sysIndex)
+recHdl.appendLine('/colorRef')
+
 
 
 class FDG:
@@ -298,6 +322,12 @@ class FOPT:
 color = ColorRef(prop.value)
 color.appendLine(recHdl, level)
 
+def dumpXml(self, recHdl, prop):
+recHdl.appendLine('fillColor')
+color = ColorRef(prop.value)
+color.dumpXml(recHdl)
+recHdl.appendLine('/fillColor')
+
 class FillStyle:
 
 def __parseBytes(self, recHdl):
@@ -340,7 +370,7 @@ class FOPT:
 recHdl.appendLine(indent(level)+fUsefUseShapeAnchor   : 
%s%recHdl.getTrueFalse(self.M))
 recHdl.appendLine(indent(level)+fUsefRecolorFillAsPicture : 
%s%recHdl.getTrueFalse(self.N))
 
-def dumpXml(self, recHdl):
+def dumpXml(self, recHdl, prop):
 self.__parseBytes(recHdl)
 
 recHdl.appendLine('fNoFillHitTest value=%s/' % self.A)
@@ -488,7 +518,7 @@ class FOPT:
 # propData is expected to have two elements: name (0) and 
handler (1).
 propHdl = FOPT.propTable[prop.ID]
 recHdl.appendLine('op name=%s value=0x%4.4X' % 
(propHdl[0], prop.ID))
-propHdl[1]().dumpXml(recHdl)
+propHdl[1]().dumpXml(recHdl, prop)
 recHdl.appendLine('/op')
 else:
 recHdl.appendLine('op value=0x%8.8X/' % prop.value)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need confirmation about non-clearing of Character Styles

[Michael Stahl]

On 10/01/13 18:09, Caolán McNamara wrote:
 On Thu, 2013-01-10 at 15:10 +0100, Michael Stahl wrote:
 There should be some button to reset formatting that leaves character
 styles intact, and that should be the most easily accessible option.
 
 ... hyperlinks should not be touched by any reset formatting ...
 
 And that's what we've got with clear direct formatting at the moment,
 right ?

yes, that came in with the same commit that retained character styles.

 also i'm thinking that ruby text should also not be touched by reset
 formatting, and this has not yet been changed (i.e. it is reset
 currently); the reset will actually throw away the ruby text.  i'm
 already sitting on a patch to remove ruby from the reset list...
 
 Yeah, that makes sense to me too. You should push that.

done on master in 689d9af3e3adb12c507e141cc25ac35ec88bb5c5

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

[Libreoffice-commits] .: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/1-table-1-page.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   15 +++
 2 files changed, 15 insertions(+)

New commits:
commit 57ca766ab44e0d55ce21ee734aa0aafbff94eb45
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date:   Fri Jan 11 14:39:13 2013 +0100

docx export: add test case for paragraph mark export

Change-Id: I2701ee12221460f8ff19397ea215cc1484648d18
Reviewed-on: https://gerrit.libreoffice.org/1650
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx 
b/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx
new file mode 100755
index 000..d821c66
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/1-table-1-page.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0f99cf5..8d14409 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -35,6 +35,7 @@
 #include com/sun/star/style/ParagraphAdjust.hpp
 #include com/sun/star/view/XSelectionSupplier.hpp
 #include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/text/XPageCursor.hpp
 
 #include unotools/tempfile.hxx
 #include swmodeltestbase.hxx
@@ -66,6 +67,7 @@ public:
 void testTableBorders();
 void testFdo51550();
 void testN789482();
+void test1Table1Page();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -104,6 +106,7 @@ void Test::run()
 {table-borders.docx, Test::testTableBorders},
 {fdo51550.odt, Test::testFdo51550},
 {n789482.docx, Test::testN789482},
+{1-table-1-page.docx, Test::test1Table1Page},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -494,6 +497,18 @@ void Test::testN789482()
 getRun(xParagraph, 5,  After.);
 }
 
+void Test::test1Table1Page()
+{
+// 2 problem for this document after export:
+//   - invalid sectPr inserted at the beginning of the page
+//   - font of empty cell is not preserved, leading to change in rows 
height
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier 
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor 
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] docx export: add test case for paragraph mark export

[Noel Power (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/1650

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2701ee12221460f8ff19397ea215cc1484648d18
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6-5' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/uiview/viewmdi.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6b3ef9d4787a4aab7ad055c5221bbdf002c36297
Author: Winfried Donkers o...@dci-electronics.nl
Date:   Mon Jan 14 19:53:10 2013 +0100

fdo#40465 solve regression when zooming with cursor not visible

(cherry picked from commit fa058a4cd6580d5538c49d565499fb5cc4ecfe53)

Signed-off-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 5aadc1cf65841ce8737ec6602dcc3751e368c395)

Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
baf7879ddba3c052e9bfc9a81359cd187c923845
Reviewed-on: https://gerrit.libreoffice.org/1698
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index f600461..ac68198 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -73,10 +73,11 @@ using namespace ::com::sun::star::frame;
 
 void SwView::SetZoom( SvxZoomType eZoomType, short nFactor, sal_Bool bViewOnly 
)
 {
+bool const bCrsrIsVisible(pWrtShell-IsCrsrVisible());
 _SetZoom( GetEditWin().GetOutputSizePixel(), eZoomType, nFactor, bViewOnly 
);
-
-//fdo40465 force the cursor to stay in view whilst zooming
-pWrtShell-ShowCrsr();
+// fdo#40465 force the cursor to stay in view whilst zooming
+if (bCrsrIsVisible)
+pWrtShell-ShowCrsr();
 }
 
 void SwView::_SetZoom( const Size rEditSize, SvxZoomType eZoomType,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About Developing

[Rainer Bielefeld]

mohamed riyaz schrieb:


i'm a university student. i need to customize  libreoffice  in to my
mother language  sinhala.


Hi, Welcome!

LibO has a well working Sinhala Version, please see
https://www.libreoffice.org/download/?type=win-x86lang=siversion=4.0.0

For general localization info please see
https://wiki.documentfoundation.org/LibreOffice_Localization_Guide and 
similar info!


The Document Foundation හි සිංහල විකිය- Sinhala (si)
 https://wiki.documentfoundation.org/SI/Main_Page/
unfortunately does not have much contents, but I think user 
https://wiki.documentfoundation.org/User:Danishka can help you with 
more advice.


You should join the Sinhala Language Team, please see
https://wiki.documentfoundation.org/Language_Teams.

Here you are wrong!

Best regards

Rainer Bielefeld
(QA-Volunteer)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 4-0][PUSHED] Re: Adding hyphenation patterns for Swedish

[Caolán McNamara]

On Thu, 2013-01-10 at 12:19 +0100, Petr Mladek wrote:
 Hi Niklas,
 
 I have added the dictionary into master, see
 http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=9cfd4282a7a522bed2dc4f4b9ede2c8ee444c29b
 
 We need one review to get it into 4-0 branch.

This seems to be cherry-picked to 4-0 now by timar

C.

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

[PUSHED] Change in core[libreoffice-3-6-5]: fdo#40465 solve regression when zooming with cursor not visi...

[Noel Power (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/1698

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If8dfff1a27218c7821823fcad04bab9f924fec70
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6-5
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl

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

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - basctl/uiconfig

[Libreoffice Gerrit user]

 basctl/uiconfig/basicide/ui/basicmacrodialog.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c72bded3901c67129c5867ff209f7e108b232120
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 16:13:57 2013 +0100

fdo#59212 UI elements were untranslatable in Basic Macro dialog

Change-Id: Ic8d2287db947f298c0492845b7a618c540a9c8df
Reviewed-on: https://gerrit.libreoffice.org/1699
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui 
b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index e5d5eff..4acfa63 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=run
-property name=labelRun/property
+property name=label translatable=yesRun/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -35,7 +35,7 @@
 /child
 child
   object class=GtkButton id=assign
-property name=labelAssign.../property
+property name=label translatable=yesAssign.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -51,7 +51,7 @@
 /child
 child
   object class=GtkButton id=edit
-property name=labelEdit/property
+property name=label translatable=yesEdit/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -84,7 +84,7 @@
 /child
 child
   object class=GtkButton id=organize
-property name=labelOrganizer.../property
+property name=label 
translatable=yesOrganizer.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -100,7 +100,7 @@
 /child
 child
   object class=GtkButton id=newlibrary
-property name=labelNew Library/property
+property name=label translatable=yesNew 
Library/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
@@ -116,7 +116,7 @@
 /child
 child
   object class=GtkButton id=newmodule
-property name=labelNew Module/property
+property name=label translatable=yesNew Module/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-4-0]: fdo#59212 UI elements were untranslatable in Basic Macro dia...

[Noel Power (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/1699

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8d2287db947f298c0492845b7a618c540a9c8df
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] .: configure.in vote/2013-confpoll vote/index.wml vote/Makefile.am

[Libreoffice Gerrit user]

 configure.in   |1 
 vote/2013-confpoll/Makefile.am |   14 +
 vote/2013-confpoll/candidates.wml  |   87 ++
 vote/2013-confpoll/index.wml   |   51 +
 vote/2013-confpoll/mkical.py   |  250 +
 vote/2013-confpoll/rules.wml   |  104 
 vote/2013-confpoll/timeline.ics|   67 +++
 vote/2013-confpoll/voting-instructions.txt |   40 
 vote/Makefile.am   |2 
 vote/index.wml |1 
 10 files changed, 616 insertions(+), 1 deletion(-)

New commits:
commit ab999f2adec4b3a5cb2b71e03b771e3f44d70dc3
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Jan 15 16:59:48 2013 +0100

New poll: 2013 LibOCon location

diff --git a/configure.in b/configure.in
index 981746b..e285942 100644
--- a/configure.in
+++ b/configure.in
@@ -18,4 +18,5 @@ vote/include/Makefile
 vote/2011/Makefile
 vote/2012-confpoll/Makefile
 vote/2012-mc/Makefile
+vote/2013-confpoll/Makefile
 ])
diff --git a/vote/2013-confpoll/Makefile.am b/vote/2013-confpoll/Makefile.am
new file mode 100644
index 000..7216e31
--- /dev/null
+++ b/vote/2013-confpoll/Makefile.am
@@ -0,0 +1,14 @@
+SUBDIRS =
+
+urlpath = /vote/2013-confpoll
+ 
+page_SCRIPTS = \
+   index.html \
+   candidates.html\
+   rules.html 
+
+page_DATA = \
+   timeline.ics
+   mkical.py
+
+include $(top_srcdir)/rules.common
diff --git a/vote/2013-confpoll/candidates.wml 
b/vote/2013-confpoll/candidates.wml
new file mode 100644
index 000..9981dcc
--- /dev/null
+++ b/vote/2013-confpoll/candidates.wml
@@ -0,0 +1,87 @@
+?xml version=1.0 encoding=UTF-8?
+!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN 
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
+html
+
+  head
+titleThe LibreOffice 2013 Conference Location Candidates/title
+meta http-equiv=Content-Type content=text/html; charset=UTF-8/
+  /head
+
+  body
+h1Candidates for the LibreOffice 2013 Conference/h1
+
+p
+  Below you will find a list of candidates who applied for running
+  the LibreOffice 2013 conference. A short summary statement from
+  each candidate and a link to their full application is provided
+  to help you learn more about them. Please refer to the a
+  
href=http://listarchives.documentfoundation.org/www/discuss/;discuss#64;documentfoundation#46;org/a
+  list for further information, and for questions towards the
+  candidates. The announcement blog post about the applicants is
+  a 
href=http://blog.documentfoundation.org/2012/12/17/libreoffice-conference-2013-proposals/;here/a.
+/p
+
+p
+  If you have any questions, please send them to either
+  a 
href=http://listarchives.documentfoundation.org/www/discuss/;discuss#64;documentfoundation#46;org/a
+  or to the board at a
+  
href=mailto:info#64;documentfoundation#46;org;info#64;documentfoundation#46;org/a.
+/p
+
+h2List of proposals for the LibreOffice 2013 conference/h2
+
+ol
+listrongMilano, Italy/strongbr /
+   Full application at a 
href=http://documentfoundation.files.wordpress.com/2012/12/milan2013.pdf;http://tdfsc.files.wordpress.com/2012/01/libocon2012_berlin_proposal.pdf/a
+   blockquote
+Milan is the second largest city in Italy, and the largest
+metropolitan area with over 5 million people. The city has several
+universities plus a polytechnic school, and hosts the headquarters of
+the largest IT companies in Italy.  Milan is also rich in history and
+arts, with monuments dating back to the 5th century and several
+masterpieces like the Duomo and Leonardo's Last Supper. It is also the
+fashion capital of Italy, and a financial and commercial city.  The
+LibreOffice Conference 2013 will be organized by a group of
+enthusiastic individuals and organizations, gathered around the IT
+Department of the State University, which will be the main venue for
+the event. The conference will be the launch event for the Italian
+association: LibreItalia.  LibreOffice is at the heart of several of
+the most important migrations projects in Italy, including Provincia
+di Milano and Regione Umbria..  Milan is served by three airports,
+with direct flights to most European cities and several destinations
+in America, Africa and Asia Pacific.
+   /blockquote
+/li
+listrongMontreal, Canada/strongbr /
+   Full application at a 
href=http://documentfoundation.files.wordpress.com/2012/12/montreal2013.pdf;http://tdfsc.files.wordpress.com/2012/01/libocon2012_zaragoza_proposal.pdf/a
+   blockquote
+Montreal is an internationally recognized high-tech hub and ranks
+second in North America for hosting international meetings. It has a
+strong and solid local FLOSS community, and as a French-speaking city
+on the North American continent, it is the natural bridge between the
+free/libre and 

[Libreoffice-commits] .: cui/uiconfig sc/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 cui/uiconfig/ui/macroselectordialog.ui  |2 +-
 cui/uiconfig/ui/scriptorganizer.ui  |8 
 sc/uiconfig/scalc/ui/sortoptionspage.ui |2 +-
 sw/uiconfig/swriter/ui/bibliographyentry.ui |2 +-
 sw/uiconfig/swriter/ui/indexentry.ui|2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9e43e4867b30f4869f2a341f02556a68bede3c24
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 17:02:35 2013 +0100

make translatable a few more ui strings

Change-Id: Ie4524269b353059df3c60afa9a48c1f1b5f51185

diff --git a/cui/uiconfig/ui/macroselectordialog.ui 
b/cui/uiconfig/ui/macroselectordialog.ui
index 0448245..d681f29 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -35,7 +35,7 @@
 /child
 child
   object class=GtkButton id=add
-property name=labelAdd/property
+property name=label translatable=yesAdd/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property
diff --git a/cui/uiconfig/ui/scriptorganizer.ui 
b/cui/uiconfig/ui/scriptorganizer.ui
index d18bf8f..c5100fe 100644
--- a/cui/uiconfig/ui/scriptorganizer.ui
+++ b/cui/uiconfig/ui/scriptorganizer.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=run
-property name=labelRun/property
+property name=label translatable=yesRun/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -50,7 +50,7 @@
 /child
 child
   object class=GtkButton id=create
-property name=labelCreate.../property
+property name=label translatable=yesCreate.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -84,7 +84,7 @@
 /child
 child
   object class=GtkButton id=rename
-property name=labelRename.../property
+property name=label translatable=yesRename.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -100,7 +100,7 @@
 /child
 child
   object class=GtkButton id=delete
-property name=labelDelete.../property
+property name=label translatable=yesDelete.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui 
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index ce62207..ded61ac 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -38,7 +38,7 @@
 /child
 child
   object class=GtkCheckButton id=header
-property name=labelRange contains.../property
+property name=label translatable=yesRange 
contains.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui 
b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index aa528c5..30874df 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=insert
-property name=labelInsert/property
+property name=label translatable=yesInsert/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui 
b/sw/uiconfig/swriter/ui/indexentry.ui
index 7dc6184..69a91e2 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -50,7 +50,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=insert
-property name=labelInsert/property
+property name=label translatable=yesInsert/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property

Re: [PATCH] convert external to gbuild

[Matúš Kukan]

On 15 January 2013 13:01, Andras Timar tima...@gmail.com wrote:
 https://gerrit.libreoffice.org/1466


 I do not understand all details, but it seems this change caused a
 problem under Windows. Pre-built Mozilla runtime needs older MSVC
 DLLs. The error comes in the packaging phase:

 : ERROR: Removing file Microsoft.VC80.CRT.manifest from file list.
 : ERROR: Removing file msvcp80.dll from file list.
 : ERROR: Removing file msvcr80.dll from file list.

 On the other hand, we do not need to have other MSVC DLLs in solver,
 because we package package MSVC merge modules into the installer, not
 the MSVC DLLs for the current compiler.

It's in configure now: find_msvc_dlls()
Possible just using msvcdlls as msvcdlls=msvcp80.dll msvcr80.dll
Microsoft.VC80.CRT.manifest
could fix the issue then.
No idea if all the files really are in
$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT though.

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

[Libreoffice-commits] .: 2 commits - scripting/source svtools/source

[Libreoffice Gerrit user]

 scripting/source/pyprov/mailmerge.py |   32 
 svtools/source/misc/sampletext.cxx   |   15 ---
 2 files changed, 28 insertions(+), 19 deletions(-)

New commits:
commit 5cd7c8906150b94c224ab9bc9f850684198c7f04
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 15 16:29:47 2013 +

Resolves: fdo#37449 apparent access into empty codepage bitset

Change-Id: I2efc3ea10cd4313eaa1894fdfbffd113a125e2ba

diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 8bc9bb5..42be4ca 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -634,6 +634,11 @@ namespace
 #if OSL_DEBUG_LEVEL  2
 void lcl_dump_unicode_coverage(const boost::dynamic_bitsetsal_uInt32 
rIn)
 {
+if (rIn.none())
+{
+fprintf(stderr, NONE\n);
+return;
+}
 if (rIn[vcl::UnicodeCoverage::BASIC_LATIN])
 fprintf(stderr, BASIC_LATIN\n);
 if (rIn[vcl::UnicodeCoverage::LATIN_1_SUPPLEMENT])
@@ -894,6 +899,11 @@ namespace
 
 void lcl_dump_codepage_coverage(const boost::dynamic_bitsetsal_uInt32 
rIn)
 {
+if (rIn.none())
+{
+fprintf(stderr, NONE\n);
+return;
+}
 if (rIn[vcl::CodePageCoverage::CP1252])
 fprintf(stderr, CP1252\n);
 if (rIn[vcl::CodePageCoverage::CP1250])
@@ -1065,7 +1075,7 @@ namespace
 aMasked.set(vcl::UnicodeCoverage::PHAGS_PA, false);
 
 //So, possibly a CJK font
-if (!aMasked.count())
+if (!aMasked.count()  !rFontCapabilities.maCodePageRange.empty())
 {
 boost::dynamic_bitsetsal_uInt32 
aCJKCodePageMask(vcl::CodePageCoverage::MAX_CP_ENUM);
 aCJKCodePageMask.set(vcl::CodePageCoverage::CP932);
@@ -1517,8 +1527,7 @@ rtl::OUString makeRepresentativeTextForFont(sal_Int16 
nScriptType, const Font r
 if (nScriptType != com::sun::star::i18n::ScriptType::ASIAN)
 {
 aFontCapabilities.maUnicodeRange = getCJKMask();
-aFontCapabilities.maCodePageRange =
-
boost::dynamic_bitsetsal_uInt32(aFontCapabilities.maCodePageRange.size());
+aFontCapabilities.maCodePageRange.clear();
 }
 if (nScriptType != com::sun::star::i18n::ScriptType::LATIN)
 aFontCapabilities.maUnicodeRange = getLatinMask();
commit 932e916a9c47071eec9eaf43eff9718f4be2d9bf
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 15 15:29:42 2013 +

tidy mailmerge debuging messages

Change-Id: Ibca2af0efa448ed4c2c5b7ad73febf16cbf03480

diff --git a/scripting/source/pyprov/mailmerge.py 
b/scripting/source/pyprov/mailmerge.py
index 448a030..482387f 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -118,7 +118,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
user = user.encode('ascii')
password = password.encode('ascii')
if dbg:
-   print(Logging in, username of, user, 
file=dbgout)
+   print(Logging in, username of:  + user, 
file=dbgout)
self.server.login(user, password)
 
for listener in self.listeners:
@@ -151,10 +151,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
ccrecipients = xMailMessage.getCcRecipients()
bccrecipients = xMailMessage.getBccRecipients()
if dbg:
-   print(PyMailSMTPService subject  + subject, 
file=dbgout)
-   print(PyMailSMTPService from  + sendername, 
file=dbgout)
-   print(PyMailSMTPService from  + sendermail, 
file=dbgout)
-   print(PyMailSMTPService send to %s % (recipients,), 
file=dbgout)
+   print(PyMailSMTPService subject:  + subject, 
file=dbgout)
+   print(PyMailSMTPService from:   + sendername, 
file=dbgout)
+   print(PyMailSMTPService from:   + sendermail, 
file=dbgout)
+   print(PyMailSMTPService send to: %s % (recipients,), 
file=dbgout)
 
attachments = xMailMessage.getAttachments()
 
@@ -163,13 +163,13 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
content = xMailMessage.Body
flavors = content.getTransferDataFlavors()
if dbg:
-   print(PyMailSMTPService flavors len %d % 
(len(flavors),), file=dbgout)
+   print(PyMailSMTPService flavors len: %d % 
(len(flavors),), file=dbgout)
 
#Use first flavor that's sane for an email body
for flavor in flavors:
if flavor.MimeType.find('text/html') != -1 or 
flavor.MimeType.find('text/plain') 

[PATCH] Change in core[libreoffice-4-0]: make translatable a few more ui strings

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1700

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/1700/1

make translatable a few more ui strings

Change-Id: Ie4524269b353059df3c60afa9a48c1f1b5f51185
---
M cui/uiconfig/ui/macroselectordialog.ui
M cui/uiconfig/ui/scriptorganizer.ui
M sc/uiconfig/scalc/ui/sortoptionspage.ui
M sw/uiconfig/swriter/ui/bibliographyentry.ui
M sw/uiconfig/swriter/ui/indexentry.ui
5 files changed, 8 insertions(+), 8 deletions(-)



diff --git a/cui/uiconfig/ui/macroselectordialog.ui 
b/cui/uiconfig/ui/macroselectordialog.ui
index 0448245..d681f29 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -35,7 +35,7 @@
 /child
 child
   object class=GtkButton id=add
-property name=labelAdd/property
+property name=label translatable=yesAdd/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property
diff --git a/cui/uiconfig/ui/scriptorganizer.ui 
b/cui/uiconfig/ui/scriptorganizer.ui
index d18bf8f..c5100fe 100644
--- a/cui/uiconfig/ui/scriptorganizer.ui
+++ b/cui/uiconfig/ui/scriptorganizer.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=run
-property name=labelRun/property
+property name=label translatable=yesRun/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -50,7 +50,7 @@
 /child
 child
   object class=GtkButton id=create
-property name=labelCreate.../property
+property name=label translatable=yesCreate.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -84,7 +84,7 @@
 /child
 child
   object class=GtkButton id=rename
-property name=labelRename.../property
+property name=label translatable=yesRename.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -100,7 +100,7 @@
 /child
 child
   object class=GtkButton id=delete
-property name=labelDelete.../property
+property name=label translatable=yesDelete.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui 
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index ce62207..ded61ac 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -38,7 +38,7 @@
 /child
 child
   object class=GtkCheckButton id=header
-property name=labelRange contains.../property
+property name=label translatable=yesRange 
contains.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui 
b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index aa528c5..30874df 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=insert
-property name=labelInsert/property
+property name=label translatable=yesInsert/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui 
b/sw/uiconfig/swriter/ui/indexentry.ui
index 7dc6184..69a91e2 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -50,7 +50,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=insert
-property name=labelInsert/property
+property name=label translatable=yesInsert/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property

-- 
To view, visit 

[PATCH] fdo#58364 Change Align in View-Toolbar to Align Objects

[Joel Madero (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1701

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/1701/1

fdo#58364 Change Align in View-Toolbar to Align Objects

Per request on fdo#58364, Align Objects is a more concise label for what
the align toolbar does.

Change-Id: I6e846ceafbf020d8669cd93f520226000166d0ed
---
M officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
M officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
8 files changed, 8 insertions(+), 8 deletions(-)



diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 9d0d898..1b56ef8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -440,7 +440,7 @@
 valuefalse/value
 /prop
 prop oor:name=UIName oor:type=xs:string
-value xml:lang=en-USAlign/value
+value xml:lang=en-USAlign Objects/value
 /prop
 prop oor:name=Visible oor:type=xs:boolean
 valuefalse/value
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 42358d2d..483e80b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -179,7 +179,7 @@
 valuefalse/value
 /prop
 prop oor:name=UIName oor:type=xs:string
-value xml:lang=en-USAlign/value
+value xml:lang=en-USAlign Objects/value
 /prop
 /node
 node oor:name=private:resource/toolbar/arrowsbar 
oor:op=replace
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 0bf793c..e4183a1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -85,7 +85,7 @@
   valuefalse/value
 /prop
 prop oor:name=UIName oor:type=xs:string
-  value xml:lang=en-USAlign/value
+  value xml:lang=en-USAlign Objects/value
 /prop
   /node
   node oor:name=private:resource/toolbar/arrowsbar oor:op=replace
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index ce056e1..8f8bb56 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -151,7 +151,7 @@
 valuefalse/value
 /prop
 prop oor:name=UIName oor:type=xs:string
-value xml:lang=en-USAlign/value
+value xml:lang=en-USAlign Objects/value
 value xml:lang=deAusrichten/value
 /prop
 prop oor:name=Visible oor:type=xs:boolean
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index 1110503..d575813 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -165,7 +165,7 @@
 valuefalse/value
 /prop
 prop oor:name=UIName oor:type=xs:string
-value xml:lang=en-USAlign/value
+value xml:lang=en-USAlign Objects/value
 /prop
 prop oor:name=Visible oor:type=xs:boolean
 valuefalse/value
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index f1698b0..6be526f 100644
--- 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -148,7 +148,7 @@
 

[PATCH] Change in core[libreoffice-3-6]: Resolves: fdo#37449 apparent access into empty codepage bits...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1703

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/1703/1

Resolves: fdo#37449 apparent access into empty codepage bitset

Change-Id: I2efc3ea10cd4313eaa1894fdfbffd113a125e2ba
(cherry picked from commit 5cd7c8906150b94c224ab9bc9f850684198c7f04)
---
M svtools/source/misc/sampletext.cxx
1 file changed, 12 insertions(+), 3 deletions(-)



diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index cf07a2a..ff74333 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -630,6 +630,11 @@
 #if OSL_DEBUG_LEVEL  2
 void lcl_dump_unicode_coverage(const boost::dynamic_bitsetsal_uInt32 
rIn)
 {
+if (rIn.none())
+{
+fprintf(stderr, NONE\n);
+return;
+}
 if (rIn[vcl::UnicodeCoverage::BASIC_LATIN])
 fprintf(stderr, BASIC_LATIN\n);
 if (rIn[vcl::UnicodeCoverage::LATIN_1_SUPPLEMENT])
@@ -890,6 +895,11 @@
 
 void lcl_dump_codepage_coverage(const boost::dynamic_bitsetsal_uInt32 
rIn)
 {
+if (rIn.none())
+{
+fprintf(stderr, NONE\n);
+return;
+}
 if (rIn[vcl::CodePageCoverage::CP1252])
 fprintf(stderr, CP1252\n);
 if (rIn[vcl::CodePageCoverage::CP1250])
@@ -1061,7 +1071,7 @@
 aMasked.set(vcl::UnicodeCoverage::PHAGS_PA, false);
 
 //So, possibly a CJK font
-if (!aMasked.count())
+if (!aMasked.count()  !rFontCapabilities.maCodePageRange.empty())
 {
 boost::dynamic_bitsetsal_uInt32 
aCJKCodePageMask(vcl::CodePageCoverage::MAX_CP_ENUM);
 aCJKCodePageMask.set(vcl::CodePageCoverage::CP932);
@@ -1513,8 +1523,7 @@
 if (nScriptType != com::sun::star::i18n::ScriptType::ASIAN)
 {
 aFontCapabilities.maUnicodeRange = getCJKMask();
-aFontCapabilities.maCodePageRange =
-
boost::dynamic_bitsetsal_uInt32(aFontCapabilities.maCodePageRange.size());
+aFontCapabilities.maCodePageRange.clear();
 }
 if (nScriptType != com::sun::star::i18n::ScriptType::LATIN)
 aFontCapabilities.maUnicodeRange = getLatinMask();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2efc3ea10cd4313eaa1894fdfbffd113a125e2ba
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

[PATCH] Change in core[libreoffice-4-0]: Resolves: fdo#37449 apparent access into empty codepage bits...

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1702

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/1702/1

Resolves: fdo#37449 apparent access into empty codepage bitset

Change-Id: I2efc3ea10cd4313eaa1894fdfbffd113a125e2ba
(cherry picked from commit 5cd7c8906150b94c224ab9bc9f850684198c7f04)
---
M svtools/source/misc/sampletext.cxx
1 file changed, 12 insertions(+), 3 deletions(-)



diff --git a/svtools/source/misc/sampletext.cxx 
b/svtools/source/misc/sampletext.cxx
index 6b8cc61..3c0b173 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -634,6 +634,11 @@
 #if OSL_DEBUG_LEVEL  2
 void lcl_dump_unicode_coverage(const boost::dynamic_bitsetsal_uInt32 
rIn)
 {
+if (rIn.none())
+{
+fprintf(stderr, NONE\n);
+return;
+}
 if (rIn[vcl::UnicodeCoverage::BASIC_LATIN])
 fprintf(stderr, BASIC_LATIN\n);
 if (rIn[vcl::UnicodeCoverage::LATIN_1_SUPPLEMENT])
@@ -894,6 +899,11 @@
 
 void lcl_dump_codepage_coverage(const boost::dynamic_bitsetsal_uInt32 
rIn)
 {
+if (rIn.none())
+{
+fprintf(stderr, NONE\n);
+return;
+}
 if (rIn[vcl::CodePageCoverage::CP1252])
 fprintf(stderr, CP1252\n);
 if (rIn[vcl::CodePageCoverage::CP1250])
@@ -1065,7 +1075,7 @@
 aMasked.set(vcl::UnicodeCoverage::PHAGS_PA, false);
 
 //So, possibly a CJK font
-if (!aMasked.count())
+if (!aMasked.count()  !rFontCapabilities.maCodePageRange.empty())
 {
 boost::dynamic_bitsetsal_uInt32 
aCJKCodePageMask(vcl::CodePageCoverage::MAX_CP_ENUM);
 aCJKCodePageMask.set(vcl::CodePageCoverage::CP932);
@@ -1517,8 +1527,7 @@
 if (nScriptType != com::sun::star::i18n::ScriptType::ASIAN)
 {
 aFontCapabilities.maUnicodeRange = getCJKMask();
-aFontCapabilities.maCodePageRange =
-
boost::dynamic_bitsetsal_uInt32(aFontCapabilities.maCodePageRange.size());
+aFontCapabilities.maCodePageRange.clear();
 }
 if (nScriptType != com::sun::star::i18n::ScriptType::LATIN)
 aFontCapabilities.maUnicodeRange = getLatinMask();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2efc3ea10cd4313eaa1894fdfbffd113a125e2ba
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] .: scripting/source

[Libreoffice Gerrit user]

 scripting/source/pyprov/mailmerge.py |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit c25bee9ca3c3015c46c8fcb28654e5bed8a4d912
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 15 17:17:45 2013 +

make emailmerge work with python3 and python2 at the same time

Change-Id: I6289b522513a2fc86e261c85a04ca9c89fd55b63

diff --git a/scripting/source/pyprov/mailmerge.py 
b/scripting/source/pyprov/mailmerge.py
index 482387f..18b476c 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -11,6 +11,8 @@
 #   valuetrue/value
 #  /prop
 
+from __future__ import print_function
+
 import unohelper
 import uno
 import re
@@ -171,8 +173,6 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
if dbg:
print(PyMailSMTPService mimetype is:  
+ flavor.MimeType, file=dbgout)
textbody = content.getTransferData(flavor)
-   
#http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
-   textbody = 
textbody.encode('utf-8').decode('iso8859-1')
 
if len(textbody):
mimeEncoding = re.sub(charset=.*, 
charset=UTF-8, flavor.MimeType)
@@ -180,9 +180,16 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
mimeEncoding = mimeEncoding + 
; charset=UTF-8
textmsg['Content-Type'] = mimeEncoding
textmsg['MIME-Version'] = '1.0'
-   c = Charset('utf-8')
-   c.body_encoding = QP
-   textmsg.set_payload(textbody, c)
+
+   textbody = textbody.encode('utf-8')
+   if sys.version = '3':
+   
#http://stackoverflow.com/questions/9403265/how-do-i-use-python-3-2-email-module-to-send-unicode-messages-encoded-in-utf-8-w
+   textbody = 
textbody.decode('iso8859-1')
+   c = Charset('utf-8')
+   c.body_encoding = QP
+   textmsg.set_payload(textbody, c)
+   else:
+   textmsg.set_payload(textbody)
 
break
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - cui/uiconfig sc/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 cui/uiconfig/ui/macroselectordialog.ui  |2 +-
 cui/uiconfig/ui/scriptorganizer.ui  |8 
 sc/uiconfig/scalc/ui/sortoptionspage.ui |2 +-
 sw/uiconfig/swriter/ui/bibliographyentry.ui |2 +-
 sw/uiconfig/swriter/ui/indexentry.ui|2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f3cf01ba35e836ecbef03e8140b8afcbb11fdd44
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 15 17:02:35 2013 +0100

make translatable a few more ui strings

Change-Id: Ie4524269b353059df3c60afa9a48c1f1b5f51185
Reviewed-on: https://gerrit.libreoffice.org/1700
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/cui/uiconfig/ui/macroselectordialog.ui 
b/cui/uiconfig/ui/macroselectordialog.ui
index 0448245..d681f29 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -35,7 +35,7 @@
 /child
 child
   object class=GtkButton id=add
-property name=labelAdd/property
+property name=label translatable=yesAdd/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property
diff --git a/cui/uiconfig/ui/scriptorganizer.ui 
b/cui/uiconfig/ui/scriptorganizer.ui
index d18bf8f..c5100fe 100644
--- a/cui/uiconfig/ui/scriptorganizer.ui
+++ b/cui/uiconfig/ui/scriptorganizer.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=run
-property name=labelRun/property
+property name=label translatable=yesRun/property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -50,7 +50,7 @@
 /child
 child
   object class=GtkButton id=create
-property name=labelCreate.../property
+property name=label translatable=yesCreate.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -84,7 +84,7 @@
 /child
 child
   object class=GtkButton id=rename
-property name=labelRename.../property
+property name=label translatable=yesRename.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -100,7 +100,7 @@
 /child
 child
   object class=GtkButton id=delete
-property name=labelDelete.../property
+property name=label translatable=yesDelete.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui 
b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index ce62207..ded61ac 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -38,7 +38,7 @@
 /child
 child
   object class=GtkCheckButton id=header
-property name=labelRange contains.../property
+property name=label translatable=yesRange 
contains.../property
 property name=use_action_appearanceFalse/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui 
b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index aa528c5..30874df 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -17,7 +17,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=insert
-property name=labelInsert/property
+property name=label translatable=yesInsert/property
 property name=use_action_appearanceFalse/property
 property name=can_focusTrue/property
 property name=can_defaultTrue/property
diff --git a/sw/uiconfig/swriter/ui/indexentry.ui 
b/sw/uiconfig/swriter/ui/indexentry.ui
index 7dc6184..69a91e2 100644
--- a/sw/uiconfig/swriter/ui/indexentry.ui
+++ b/sw/uiconfig/swriter/ui/indexentry.ui
@@ -50,7 +50,7 @@
 property name=layout_stylestart/property
 child
   object class=GtkButton id=insert
-property name=labelInsert/property
+property name=label translatable=yesInsert/property
 property 

[PUSHED] Change in core[libreoffice-4-0]: make translatable a few more ui strings

[Eike Rathke (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/1700

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4524269b353059df3c60afa9a48c1f1b5f51185
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com

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