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

2013-05-19 Thread ricardobotto
 vcl/generic/fontmanager/fontsubst.cxx |8 
 vcl/source/gdi/outdev3.cxx|8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 3384f229a4a3812f57bd8864e9c916e6443a4899
Author: ricardobotto andarilho.bo...@gmail.com
Date:   Sat May 18 16:24:19 2013 -0300

Changed compareTo to startsWith

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

diff --git a/vcl/generic/fontmanager/fontsubst.cxx 
b/vcl/generic/fontmanager/fontsubst.cxx
index 94dcda1..36c683d 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -160,8 +160,8 @@ bool FcPreMatchSubstititution::FindFontSubstitute( 
FontSelectPattern rFontSelDa
 if( rFontSelData.IsSymbolFont() )
 return false;
 // StarSymbol is a unicode font, but it still deserves the symbol flag
-if( 0 == rFontSelData.maSearchName.compareTo( starsymbol, 10)
-||  0 == rFontSelData.maSearchName.compareTo( opensymbol, 10) )
+if(rFontSelData.maSearchName.startsWith( starsymbol )
+|| rFontSelData.maSearchName.startsWith( opensymbol ) )
 return false;
 
 //see fdo#41556 and fdo#47636
@@ -229,8 +229,8 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( 
FontSelectPattern rFont
 if( rFontSelData.IsSymbolFont() )
 return false;
 // StarSymbol is a unicode font, but it still deserves the symbol flag
-if( 0 == rFontSelData.maSearchName.compareTo( starsymbol, 10)
-||  0 == rFontSelData.maSearchName.compareTo( opensymbol, 10) )
+if(rFontSelData.maSearchName.startsWith( starsymbol )
+|| rFontSelData.maSearchName.startsWith( opensymbol ) )
 return false;
 
 const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, 
rMissingCodes );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 573b472..5274634 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -695,8 +695,8 @@ PhysicalFontFace::PhysicalFontFace( const 
ImplDevFontAttributes rDFA, int nMagi
 {
 // StarSymbol is a unicode font, but it still deserves the symbol flag
 if( !IsSymbolFont() )
-if( 0 == GetFamilyName().compareTo( starsymbol, 10)
-||  0 == GetFamilyName().compareTo( opensymbol, 10) )
+if( GetFamilyName().startsWith( starsymbol)
+||  GetFamilyName().startsWith( opensymbol) )
 SetSymbolFlag( true );
 }
 
@@ -755,11 +755,11 @@ bool PhysicalFontFace::IsBetterMatch( const 
FontSelectPattern rFSD, FontMatchSt
 int nMatch = 0;
 
 const OUString rFontName = rFSD.maTargetName;
-if( (rFontName == GetFamilyName()) || rFontName.compareTo( GetFamilyName() 
) )
+if( (rFontName == GetFamilyName()) || rFontName == GetFamilyName() )
 nMatch += 24;
 
 if( rStatus.mpTargetStyleName
-  GetStyleName().compareTo( rStatus.mpTargetStyleName ) )
+  GetStyleName() == rStatus.mpTargetStyleName )
 nMatch += 12;
 
 if( (rFSD.GetPitch() != PITCH_DONTKNOW)  (rFSD.GetPitch() == GetPitch()) 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-05-19 Thread Thomas Arnhold
 vcl/source/gdi/outdev3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 754fee5d1b6adcc04b58a834c84568585afd728a
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sun May 19 09:08:07 2013 +0200

don't check the same twice

Change-Id: Ic97f8066e88d7e05abd20d4978533ab91dd7c1ed

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 5274634..6a0bbc2 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -755,7 +755,7 @@ bool PhysicalFontFace::IsBetterMatch( const 
FontSelectPattern rFSD, FontMatchSt
 int nMatch = 0;
 
 const OUString rFontName = rFSD.maTargetName;
-if( (rFontName == GetFamilyName()) || rFontName == GetFamilyName() )
+if( rFontName == GetFamilyName() )
 nMatch += 24;
 
 if( rStatus.mpTargetStyleName
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PUSHED] Changed compareTo to startsWith

2013-05-19 Thread Thomas Arnhold (via Code Review)
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3956

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia72e220f29c26bdf789bd3f1102b850aafcf525d
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Botto andarilho.bo...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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


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

2013-05-19 Thread Christian M . Heller
 vcl/source/filter/graphicfilter.cxx  |5 --
 vcl/source/filter/graphicfilter2.cxx |   84 ---
 2 files changed, 41 insertions(+), 48 deletions(-)

New commits:
commit 791b4eedfba1e913037d88a3c185dc01c9ea24be
Author: Christian M. Heller christian.helle...@gmail.com
Date:   Sat May 18 07:18:25 2013 -0400

fdo#39468 Translate German comments - graphicfilter

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

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index f6d1a9f..204fe2e 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -770,8 +770,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream rStream, 
String rFormatExtensio
 
 sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const String rPath, SvStream 
rStream, sal_uInt16 rFormat )
 {
-// ggf. Filter bzw. Format durch anlesen ermitteln,
-// oder durch anlesen zusichern, dass das Format stimmt:
+// determine or check the filter/format by reading into it
 if( rFormat == GRFILTER_FORMAT_DONTKNOW )
 {
 String aFormatExt;
@@ -781,7 +780,7 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const 
String rPath, SvStream rS
 if( rFormat != GRFILTER_FORMAT_DONTKNOW )
 return GRFILTER_OK;
 }
-// ggf. Filter anhand der Datei-Endung raussuchen:
+// determine filter by file extension
 if( rPath.Len() )
 {
 String aExt( ImpGetExtension( rPath ) );
diff --git a/vcl/source/filter/graphicfilter2.cxx 
b/vcl/source/filter/graphicfilter2.cxx
index 24a182d..8e28214 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -130,42 +130,41 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream rStm, 
sal_Bool bExtendedInfo
 sal_uInt32  nTemp32;
 sal_uInt32  nCompression;
 
-// bis zur ersten Information
+// up to first info
 rStm.SeekRel( 0x10 );
 
-// PixelBreite auslesen
+// Pixel width
 rStm  nTemp32;
 aPixSize.Width() = nTemp32;
 
-// PixelHoehe auslesen
+// Pixel height
 rStm  nTemp32;
 aPixSize.Height() = nTemp32;
 
-// Planes auslesen
+// Planes
 rStm  nTemp16;
 nPlanes = nTemp16;
 
-// BitCount auslesen
+// BitCount
 rStm  nTemp16;
 nBitsPerPixel = nTemp16;
 
-// Compression auslesen
+// Compression
 rStm  nTemp32;
 bCompressed = ( ( nCompression = nTemp32 )  0 );
 
-// logische Breite
+// logical width
 rStm.SeekRel( 4 );
 rStm  nTemp32;
 if ( nTemp32 )
 aLogSize.Width() = ( aPixSize.Width() * 10 ) / nTemp32;
 
-// logische Hoehe
+// logical height
 rStm  nTemp32;
 if ( nTemp32 )
 aLogSize.Height() = ( aPixSize.Height() * 10 ) / nTemp32;
 
-// Wir wollen noch etwas feiner differenzieren und
-// auf sinnvolle Werte ueberpruefen ( Bug-Id #29001 )
+// further validation, check for rational values
 if ( ( nBitsPerPixel  24 ) || ( nCompression  3 ) )
 {
 nFormat = GFF_NOT;
@@ -200,15 +199,15 @@ sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream rStm, 
sal_Bool bExtendedInfo
 {
 sal_uInt16 nTemp16;
 
-// PixelBreite auslesen
+// Pixel width
 rStm  nTemp16;
 aPixSize.Width() = nTemp16;
 
-// PixelHoehe auslesen
+// Pixel height
 rStm  nTemp16;
 aPixSize.Height() = nTemp16;
 
-// Bits/Pixel auslesen
+// Bits/Pixel
 rStm  cByte;
 nBitsPerPixel = ( ( cByte  112 )  4 ) + 1;
 }
@@ -461,17 +460,17 @@ sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream rStm, 
sal_Bool bExtendedInfo
 
 rStm.SeekRel( 1 );
 
-// Kompression lesen
+// compression
 rStm  cByte;
 bCompressed = ( cByte  0 );
 
 bRet = (cByte==0 || cByte ==1);
 
-// Bits/Pixel lesen
+// Bits/Pixel
 rStm  cByte;
 nBitsPerPixel = cByte;
 
-// Bildabmessungen
+// image dimensions
 rStm  nTemp16;
 nXmin = nTemp16;
 rStm  nTemp16;
@@ -484,20 +483,20 @@ sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream rStm, 
sal_Bool bExtendedInfo
 aPixSize.Width() = nXmax - nXmin + 1;
 

[PUSHED] fdo#39468 Translate German comments - graphicfilter

2013-05-19 Thread Thomas Arnhold (via Code Review)
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3955

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4e64c2d9ca8d85251a4cde5d3ab68f0956a4f0d1
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian M. Heller christian.helle...@gmail.com
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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


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

2013-05-19 Thread Matthias Freund
 sw/source/ui/ribbar/workctrl.cxx |   18 ++
 sw/source/ui/ribbar/workctrl.hrc |4 ++--
 sw/source/ui/ribbar/workctrl.src |6 +++---
 3 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 89001143ea5aeecf8af1b62748431dc785369f44
Author: Matthias Freund matti...@yahoo.de
Date:   Thu May 16 22:52:17 2013 +0200

fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/ (Part2)

cleanups, translations and correction :-)

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

diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 11a6fe8..b7d959c 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -45,10 +45,10 @@
 
 #include vcl/svapp.hxx
 
-// Size Abpruefung
+// Size check
 #define NAVI_ENTRIES 20
 #if NAVI_ENTRIES != NID_COUNT
-#error SwScrollNaviPopup-CTOR static Array falsche Size. Wurden neue IDs 
zugefuegt ??
+#error SwScrollNaviPopup-CTOR static array wrong size. Are new IDs added?
 #endif
 
 using namespace ::com::sun::star;
@@ -205,13 +205,13 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 sal_uInt16 nGroupCount = pGlossaryList-GetGroupCount();
 for(sal_uInt16 i = 1; i = nGroupCount; i++)
 {
-// Gruppenname mit Pfad-Extension besorgen
+// Acquire group name with path extension
 String sTitle;
 sal_uInt16 nBlockCount = pGlossaryList-GetBlockCount(i 
-1);
 if(nBlockCount)
 {
 sal_uInt16 nIndex = 100 * (i);
-// aber ohne extension einfuegen
+// but insert without extension
 pPopup-InsertItem( i, sTitle);
 PopupMenu* pSub = new PopupMenu;
 pSub-SetSelectHdl(aLnk);
@@ -244,7 +244,6 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 
 }
 
-
 SfxPopupWindowType SwTbxAutoTextCtrl::GetPopupWindowType() const
 {
 return SFX_POPUPWINDOW_ONTIMEOUT;
@@ -334,7 +333,7 @@ void SwTbxAutoTextCtrl::DelPopup()
 }
 }
 
-/* Navigations-Popup */
+// Navigation-Popup
 // determine the order of the toolbox items
 static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
 {
@@ -487,7 +486,7 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 aToolBox.SetItemText(NID_NEXT, sQuickHelp[nSet - NID_START]);
 aToolBox.SetItemText(NID_PREV, sQuickHelp[nSet - NID_START + 
NID_COUNT]);
 aInfoField.SetText(aToolBox.GetItemText(nSet));
-//check the current button only
+// check the current button only
 for(sal_uInt16 i = 0; i  NID_COUNT; i++)
 {
 sal_uInt16 nItemId = aToolBox.GetItemId( i );
@@ -544,8 +543,6 @@ void SwNaviImageButton::Click()
 pPopup-StartPopupMode(aRect, 
FLOATWIN_POPUPMODE_LEFT|FLOATWIN_POPUPMODE_ALLOWTEAROFF);
 }
 
-//
-
 void SwNaviImageButton::SetPopupWindow( SfxPopupWindow* pWindow )
 {
 pPopupWindow = pWindow;
@@ -553,8 +550,6 @@ void SwNaviImageButton::SetPopupWindow( SfxPopupWindow* 
pWindow )
 pPopupWindow-SetDeleteLink_Impl( LINK( this, SwNaviImageButton, 
ClosePopupWindow ));
 }
 
-//
-
 IMPL_LINK_NOARG(SwNaviImageButton, PopupModeEndHdl)
 {
 if ( pPopupWindow-IsVisible() )
@@ -575,7 +570,6 @@ IMPL_LINK_NOARG(SwNaviImageButton, PopupModeEndHdl)
 return 1;
 }
 
-//
 IMPL_LINK( SwNaviImageButton, ClosePopupWindow, SfxPopupWindow *, pWindow )
 {
 if ( pWindow == pFloatingWindow )
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/ui/ribbar/workctrl.hrc
index 471b1ee..cee389b 100644
--- a/sw/source/ui/ribbar/workctrl.hrc
+++ b/sw/source/ui/ribbar/workctrl.hrc
@@ -45,8 +45,8 @@
 #define ST_TABLE_FORMULA  28
 #define ST_TABLE_FORMULA_ERROR  29
 
-// doppelter Eintrag! hrc und hxx
-// diese Ids bestimmen, was die Buttons unter dem Scrollbar tun
+// duplicate entry! hrc and hxx
+// these Ids specifiy the action of the buttons below the scroll bar
 #define NID_START   2
 #define NID_NEXT2
 #define NID_PREV20001
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 2522a5e..23e60ad 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -205,9 +205,9 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
 };
 Text [ en-US ] = Navigation ;
 };
-/***
-Strings fuer die Quickhelp der View-PgUp/Down-Buttons

[PUSHED] fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar...

2013-05-19 Thread Thomas Arnhold (via Code Review)
Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3924

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2eccf057fecf6151c4604656464f3d8d1f6a7788
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com

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


Build failure of Gallery on Mac OSX in gengal.bin on master

2013-05-19 Thread Alexander Thurgood
Hi all,

Since yesterday, I have been geting a build failure on OSX 10.8 in
gengal.bin with the following, even after a make clean and fresh pull
from master :

[build GAL] arrows
[build GAL] computers
2013-05-18 15:08:21.331 gengal.bin(89486:707) No Info.plist file in
application bundle or no NSPrincipalClass in the Info.plist file, exiting
2013-05-18 15:08:21.331 gengal.bin(89486:707) *** -[NSAutoreleasePool
release]: This pool has already been released, do not drain it (double
release)
make [1]: ***
[/Users/Shared/Repos/LO/core/workdir/unxmacxi.pro/Gallery/arrows.done]
Error 1


This appears to be a direct result of Matus' commit :

bae52ee3ef48d58deb6d7ff312b3f3db20c9c0f2





Alex

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


Re: Fwd: libreoffice + liborcus build problem

2013-05-19 Thread Arkadiusz Miśkiewicz
On Saturday 18 of May 2013, Kohei Yoshida wrote:
  Trying to build libreoffice 4.0.3.3 with liborcus 0.5.1 and that
  unfortunately
 
  fails with:
 You can't build the 4.0 branch with 0.5.1. You need to use 0.3.0.

Or use these backport patches:
http://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=libreoffice-liborcus.patch;hb=HEAD
http://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=libreoffice-liborcus-build.patch;hb=HEAD

 Kohei

Thanks,
-- 
Arkadiusz Miśkiewicz, arekm / maven.pl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1

2013-05-19 Thread Xisco Fauli
 aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 27f66e7996bd48bfd37f9a22885ae65c50844274
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun May 19 12:37:33 2013 +0200

Notes added by 'git notes add'

diff --git a/aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1 
b/aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1
new file mode 100644
index 000..7272fdb
--- /dev/null
+++ b/aa/7c18447225dae9de5dc9fcce27c3116fc0ecb1
@@ -0,0 +1 @@
+merged as: 0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH libreoffice-4-0] fdo#47951 work around underlying cause

2013-05-19 Thread Lionel Elie Mamane (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3959

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/3959/1

fdo#47951 work around underlying cause

The true cause is that the flat text file database driver mishandles
the case of two ResultSets being open on the same table: the moving
commands of one impact the other.

Since in this case:

 - one ResultSet is open by the dispatch of
   .component:DB/DataSourceBrowser, that is the grid UI shown to the
   user, and that ResultSet is kept open to serve requests by the user
   to scroll;

 - the second ResultSet is opened by the call to
   pNewDBMgr-GetColumnNames
   and that ResultSet is closed by the time GetColumnNames returns

We just swap the order of these calls to work around the underlying
driver bug.

Change-Id: I628d9b870df2bbc402637818f987637d3bd62897
---
M sw/source/ui/envelp/mailmrge.cxx
1 file changed, 8 insertions(+), 8 deletions(-)



diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 4a675dc..d2a1d49 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -210,6 +210,14 @@
 aAttachED.Show(sal_False);
 aAttachPB.Show(sal_False);
 
+SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
+if(_xConnection.is())
+pNewDBMgr-GetColumnNames(aAddressFldLB, _xConnection, rTableName);
+else
+pNewDBMgr-GetColumnNames(aAddressFldLB, rDBName, rTableName);
+for(sal_uInt16 nEntry = 0; nEntry  aAddressFldLB.GetEntryCount(); 
nEntry++)
+aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
+
 Point aMailPos = aMailingRB.GetPosPixel();
 Point aFilePos = aFileRB.GetPosPixel();
 aFilePos.X() -= (aFilePos.X() - aMailPos.X()) /2;
@@ -360,14 +368,6 @@
 aToNF.SetModifyHdl(aLk);
 aFromNF.SetMax(SAL_MAX_INT32);
 aToNF.SetMax(SAL_MAX_INT32);
-
-SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
-if(_xConnection.is())
-pNewDBMgr-GetColumnNames(aAddressFldLB, _xConnection, rTableName);
-else
-pNewDBMgr-GetColumnNames(aAddressFldLB, rDBName, rTableName);
-for(sal_uInt16 nEntry = 0; nEntry  aAddressFldLB.GetEntryCount(); 
nEntry++)
-aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
 
 aAddressFldLB.SelectEntry(rtl::OUString(EMAIL));
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I628d9b870df2bbc402637818f987637d3bd62897
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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


[PATCH] Multi threaded version of osl_getGlobalTime on Unix

2013-05-19 Thread Arnaud Versini (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3960

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3960/1

Multi threaded version of osl_getGlobalTime on Unix

Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d
---
M sal/osl/unx/salinit.cxx
M sal/osl/unx/time.c
2 files changed, 27 insertions(+), 8 deletions(-)



diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index 327ca0e..b33e5f3 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -38,6 +38,8 @@
 
 extern C {
 
+void sal_initGlobalTimer();
+
 void sal_detail_initialize(int argc, char ** argv) {
 #if defined MACOSX
 // On Mac OS X, soffice can restart itself via exec (see restartOnMac in
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index c99036b..1516cd9 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -253,22 +253,37 @@
 return sal_False;
 }
 
+#if defined(LINUX)
 
+void sal_initGlobalTimer() {}
+
+sal_uInt32 SAL_CALL osl_getGlobalTimer()
+{
+struct timespec currentTime;
+int res;
+
+res = clock_gettime(CLOCK_PROCESS_CPUTIME_ID , NULL);
+if (res != 0)
+{
+   return 0;
+}
+
+return currentTime.tv_sec + (currentTime.tv_nsec / 1000);
+}
+
+#else
 
 static struct timeval startTime;
-static sal_Bool bGlobalTimer = sal_False;
+
+void sal_initGlobalTimer()
+{
+gettimeofday( startTime, NULL );
+}
 
 sal_uInt32 SAL_CALL osl_getGlobalTimer()
 {
   struct timeval currentTime;
   sal_uInt32 nSeconds;
-
-  // FIXME: not thread safe !!
-  if ( bGlobalTimer == sal_False )
-  {
-  gettimeofday( startTime, NULL );
-  bGlobalTimer=sal_True;
-  }
 
   gettimeofday( currentTime, NULL );
 
@@ -277,4 +292,6 @@
   return ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - 
startTime.tv_usec) / 1000 );
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com

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


[PATCH libreoffice-4-0] fdo#47951 flat text table: update m_nRowPos when moving by b...

2013-05-19 Thread Lionel Elie Mamane (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3961

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3961/1

fdo#47951 flat text table: update m_nRowPos when moving by bookmark

Change-Id: Iac154020b4b6309f92b1f68fa5bf79611dfcc91b
---
M connectivity/source/drivers/flat/ETable.cxx
1 file changed, 14 insertions(+), 0 deletions(-)



diff --git a/connectivity/source/drivers/flat/ETable.cxx 
b/connectivity/source/drivers/flat/ETable.cxx
index 9fe48f0..8ae7935 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -869,15 +869,29 @@
 break;
 case IResultSetHelper::BOOKMARK:
 {
+m_nRowPos = 0;
 TRowPositionsInFile::const_iterator aFind = 
m_aFilePosToEndLinePos.find(nOffset);
 m_bNeedToReadLine = aFind != m_aFilePosToEndLinePos.end();
 if ( m_bNeedToReadLine )
 {
 m_nFilePos  = aFind-first;
 nCurPos = aFind-second;
+for(::std::mapsal_Int32, 
TRowPositionsInFile::iterator::const_iterator p = m_aRowPosToFilePos.begin();
+p != m_aRowPosToFilePos.end();
+++p)
+{
+assert(p-second-first = nOffset);
+if(p-second-first == nOffset)
+{
+m_nRowPos = p-first;
+break;
+}
+}
+assert(m_nRowPos  0);
 }
 else
 {
+assert(false);
 m_nFilePos = nOffset;
 m_pFileStream-Seek(nOffset);
 if (m_pFileStream-IsEof() || !readLine(nCurPos) )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac154020b4b6309f92b1f68fa5bf79611dfcc91b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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


[PATCH libreoffice-3-6] fdo#47951 flat text table: update m_nRowPos when moving by b...

2013-05-19 Thread Lionel Elie Mamane (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3962

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/3962/1

fdo#47951 flat text table: update m_nRowPos when moving by bookmark

Change-Id: Iac154020b4b6309f92b1f68fa5bf79611dfcc91b
---
M connectivity/source/drivers/flat/ETable.cxx
1 file changed, 14 insertions(+), 0 deletions(-)



diff --git a/connectivity/source/drivers/flat/ETable.cxx 
b/connectivity/source/drivers/flat/ETable.cxx
index b7f61ed..fc1124e 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -873,15 +873,29 @@
 break;
 case IResultSetHelper::BOOKMARK:
 {
+m_nRowPos = 0;
 TRowPositionsInFile::const_iterator aFind = 
m_aFilePosToEndLinePos.find(nOffset);
 m_bNeedToReadLine = aFind != m_aFilePosToEndLinePos.end();
 if ( m_bNeedToReadLine )
 {
 m_nFilePos  = aFind-first;
 nCurPos = aFind-second;
+for(::std::mapsal_Int32, 
TRowPositionsInFile::iterator::const_iterator p = m_aRowPosToFilePos.begin();
+p != m_aRowPosToFilePos.end();
+++p)
+{
+assert(p-second-first = nOffset);
+if(p-second-first == nOffset)
+{
+m_nRowPos = p-first;
+break;
+}
+}
+assert(m_nRowPos  0);
 }
 else
 {
+assert(false);
 m_nFilePos = nOffset;
 m_pFileStream-Seek(nOffset);
 if (m_pFileStream-IsEof() || !readLine(nCurPos) )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac154020b4b6309f92b1f68fa5bf79611dfcc91b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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


[PATCH libreoffice-3-6] fdo#47951 work around underlying cause

2013-05-19 Thread Lionel Elie Mamane (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3963

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/3963/1

fdo#47951 work around underlying cause

The true cause is that the flat text file database driver mishandles
the case of two ResultSets being open on the same table: the moving
commands of one impact the other.

Since in this case:

 - one ResultSet is open by the dispatch of
   .component:DB/DataSourceBrowser, that is the grid UI shown to the
   user, and that ResultSet is kept open to serve requests by the user
   to scroll;

 - the second ResultSet is opened by the call to
   pNewDBMgr-GetColumnNames
   and that ResultSet is closed by the time GetColumnNames returns

We just swap the order of these calls to work around the underlying
driver bug.

Change-Id: I628d9b870df2bbc402637818f987637d3bd62897
---
M sw/source/ui/envelp/mailmrge.cxx
1 file changed, 8 insertions(+), 8 deletions(-)



diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 14cc5b2..2c04b06 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -224,6 +224,14 @@
 aAttachED.Show(sal_False);
 aAttachPB.Show(sal_False);
 
+SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
+if(_xConnection.is())
+pNewDBMgr-GetColumnNames(aAddressFldLB, _xConnection, rTableName);
+else
+pNewDBMgr-GetColumnNames(aAddressFldLB, rDBName, rTableName);
+for(sal_uInt16 nEntry = 0; nEntry  aAddressFldLB.GetEntryCount(); 
nEntry++)
+aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
+
 Point aMailPos = aMailingRB.GetPosPixel();
 Point aFilePos = aFileRB.GetPosPixel();
 aFilePos.X() -= (aFilePos.X() - aMailPos.X()) /2;
@@ -374,14 +382,6 @@
 aToNF.SetModifyHdl(aLk);
 aFromNF.SetMax(SAL_MAX_INT32);
 aToNF.SetMax(SAL_MAX_INT32);
-
-SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr();
-if(_xConnection.is())
-pNewDBMgr-GetColumnNames(aAddressFldLB, _xConnection, rTableName);
-else
-pNewDBMgr-GetColumnNames(aAddressFldLB, rDBName, rTableName);
-for(sal_uInt16 nEntry = 0; nEntry  aAddressFldLB.GetEntryCount(); 
nEntry++)
-aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
 
 aAddressFldLB.SelectEntry(C2S(EMAIL));
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I628d9b870df2bbc402637818f987637d3bd62897
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu

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


Re: [PATCH] Multi threaded version of osl_getGlobalTime on Unix

2013-05-19 Thread Francois Tigeot
On Sun, May 19, 2013 at 11:25:36AM +, Arnaud Versini (via Code Review) 
wrote:
 
 https://gerrit.libreoffice.org/3960
 
 +#if defined(LINUX)
[...]
 +res = clock_gettime(CLOCK_PROCESS_CPUTIME_ID , NULL);

Why is this hardcoded on LINUX ?

At least FreeBSD also has CLOCK_PROCESS_CPUTIME_ID if I'm not mistaken.

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



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

2013-05-19 Thread Sun Ying
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |   60 ++--
 sw/source/filter/ww8/ww8graf.cxx|   24 --
 2 files changed, 69 insertions(+), 15 deletions(-)

New commits:
commit 73d23a54b8b930520788c891ddb12562198e94e8
Author: Sun Ying suny...@apache.org
Date:   Mon Aug 20 02:29:52 2012 +

#119881# fix theRingInside fontwork display incorrectly when open .ppt 
file

Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li(cherry picked from commit 
4904b17b657750e565e30d56810da513057fba39)

diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx 
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 3eb6308..e823edc 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6438,7 +6438,47 @@ static const mso_CustomShape msoTextChevronInverted =
 NULL, 0,
 (SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, SAL_N_ELEMENTS( 
mso_sptTextChevronInvertedHandle )
 };
-
+//V 0 0 21600 ?f2 0 ?f0 21600 ?f0
+//W 0 0 21600 ?f2 21600 ?f0 0 ?f0 N
+//V 0 ?f3 21600 21600 0 ?f1 21600 ?f1
+//W 0 ?f3 21600 21600 21600 ?f1 0 ?f1 N
+//mso_sptTextRingInside
+static const SvxMSDffVertPair mso_sptTextRingInsideVert[] =
+{
+{ 0, 0 }, { 21600, 2 MSO_I }, { 0, 0 MSO_I },{ 21600, 0 MSO_I },//V
+{ 0, 0 }, { 21600, 2 MSO_I }, { 21600, 0 MSO_I },{ 0, 0 MSO_I },//W
+{ 0, 3 MSO_I }, { 21600, 21600 }, { 0, 1 MSO_I },{ 21600, 1 MSO_I },//V
+{ 0, 3 MSO_I }, { 21600, 21600 }, { 21600, 1 MSO_I },{ 0, 1 MSO_I }//W
+};
+static const SvxMSDffCalculationData mso_sptTextRingInsideCalc[] =  // 
adjustment1 : 6629 - 14971
+{
+{ 0x2001, { DFF_Prop_adjustValue, 1, 2 } },
+{ 0x8000, { 21600, 0, 0x400 } },
+{ 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, //$0
+{ 0x8000, { 21600, 0, DFF_Prop_adjustValue } }//21600-$0
+};
+static const sal_uInt16 mso_sptTextRingInsideSegm[] =
+{
+0xa604, 0xa504,0x8000,
+0xa604, 0xa504,0x8000
+};
+static const SvxMSDffHandle mso_sptTextRingInsideHandle[] =
+{
+{   MSDFF_HANDLE_FLAGS_RANGE| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | 
MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+10800, 0x100, 10800, 10800, 0x8000, 0x7fff, 10800, 21600 }
+};
+static const mso_CustomShape msoTextRingInside =
+{
+(SvxMSDffVertPair*)mso_sptTextRingInsideVert, sizeof( 
mso_sptTextRingInsideVert ) / sizeof( SvxMSDffVertPair ),
+(sal_uInt16*)mso_sptTextRingInsideSegm, sizeof( mso_sptTextRingInsideSegm 
)  1,
+(SvxMSDffCalculationData*)mso_sptTextRingInsideCalc, sizeof( 
mso_sptTextRingInsideCalc ) / sizeof( SvxMSDffCalculationData ),
+(sal_Int32*)mso_sptDefault13500,
+(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( 
mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+21600, 21600,
+0x8000, 0x8000,
+NULL, 0,
+(SvxMSDffHandle*)mso_sptTextRingInsideHandle, sizeof( 
mso_sptTextRingInsideHandle ) / sizeof( SvxMSDffHandle )
+};
 //mso_sptTextRingOutside
 //path = U 10800 ?f0 21600 ?f2 180 539 N U 10800 ?f1 21600 ?f2 180 539 N
 static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
@@ -8400,7 +8440,7 @@ const mso_CustomShape* GetCustomShapeContent( MSO_SPT 
eSpType )
 case mso_sptTextTriangleInverted :  pCustomShape = 
msoTextTriangleInverted; break;
 case mso_sptTextChevron :   pCustomShape = 
msoTextChevron; break;
 case mso_sptTextChevronInverted :   pCustomShape = 
msoTextChevronInverted; break;
-case mso_sptTextRingInside :pCustomShape = 
msoTextRingOutside; break;  // SJ: TODO-the orientation of the ellipse needs 
to be changed
+case mso_sptTextRingInside :pCustomShape = 
msoTextRingInside; break;   // SJ: TODO-the orientation of the ellipse needs 
to be changed
 case mso_sptTextRingOutside :   pCustomShape = 
msoTextRingOutside; break;
 case mso_sptTextFadeRight : pCustomShape = 
msoTextFadeRight; break;
 case mso_sptTextFadeLeft :  pCustomShape = 
msoTextFadeLeft; break;
commit e820522037ff95818b9a40dfd77671f84c714cd5
Author: Sun Ying suny...@apache.org
Date:   Thu Aug 16 04:25:06 2012 +

Related: #120556# fix the RingOutside fontwork display incorrectly...

when open .ppt file

Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li

(cherry picked from commit 3473dbf606f525d95b898a08072259018eb4056f)

Conflicts:
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx

Change-Id: I356bf0b5af720765e8ca60ae79bd04e449ff6e18

diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx 
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 2c3cdd7..3eb6308 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6439,15 +6439,21 @@ 

Re: [PATCH] Multi threaded version of osl_getGlobalTime on Unix

2013-05-19 Thread Arnaud Versini
In fact I wasn't sure about CLOCK_PROCESS_CPUTIME_ID if it is available on
BSD, so for now I'm using defined(LINUX), but I would like to add detection
on the configure to use the right code on LINUX/BSD/SOLARIS and also MAC OS
X (use MACH specific functions) for this one and my previous one.


2013/5/19 Francois Tigeot ftig...@wolfpond.org

 On Sun, May 19, 2013 at 11:25:36AM +, Arnaud Versini (via Code Review)
 wrote:
 
  https://gerrit.libreoffice.org/3960
 
  +#if defined(LINUX)
 [...]
  +res = clock_gettime(CLOCK_PROCESS_CPUTIME_ID , NULL);

 Why is this hardcoded on LINUX ?

 At least FreeBSD also has CLOCK_PROCESS_CPUTIME_ID if I'm not mistaken.

 --
 Francois Tigeot




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


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

2013-05-19 Thread Caolán McNamara
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da99d73abfefd704f40ad6bc46172e267407a5ab
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 13:54:27 2013 +0100

WaE: 0x8000 - MIN_INT32

Change-Id: Ifc892a5c0e436cce345a329bcef10b875eeb839f

diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx 
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index e823edc..abdc77b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6465,7 +6465,7 @@ static const sal_uInt16 mso_sptTextRingInsideSegm[] =
 static const SvxMSDffHandle mso_sptTextRingInsideHandle[] =
 {
 {   MSDFF_HANDLE_FLAGS_RANGE| MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | 
MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
-10800, 0x100, 10800, 10800, 0x8000, 0x7fff, 10800, 21600 }
+10800, 0x100, 10800, 10800, MIN_INT32, 0x7fff, 10800, 21600 }
 };
 static const mso_CustomShape msoTextRingInside =
 {
@@ -6475,7 +6475,7 @@ static const mso_CustomShape msoTextRingInside =
 (sal_Int32*)mso_sptDefault13500,
 (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( 
mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
 21600, 21600,
-0x8000, 0x8000,
+MIN_INT32, MIN_INT32,
 NULL, 0,
 (SvxMSDffHandle*)mso_sptTextRingInsideHandle, sizeof( 
mso_sptTextRingInsideHandle ) / sizeof( SvxMSDffHandle )
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-05-19 Thread Armin Le Grand
 filter/source/msfilter/eschesdo.cxx |  134 ++--
 1 file changed, 128 insertions(+), 6 deletions(-)

New commits:
commit 38109d24ab5261959b316b7dacc99521858f0749
Author: Armin Le Grand a...@apache.org
Date:   Fri Sep 7 12:22:12 2012 +

Resolves: #i119703# Corrected bound rect for ms graphic object...

export for grouped objects to reflect rotated sub-objects better

(cherry picked from commit 6b30b279363793da14e320e7c0dc9bf8409da23c)

Conflicts:
filter/source/msfilter/eschesdo.cxx

Change-Id: I39289c271bc13b1edd5922f53db968312a345fad

diff --git a/filter/source/msfilter/eschesdo.cxx 
b/filter/source/msfilter/eschesdo.cxx
index 2a6d7f4..d0f3c2b 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -44,6 +44,10 @@
 #include comphelper/extract.hxx
 #include vcl/fltcall.hxx
 #include vcl/cvtgrf.hxx
+#include com/sun/star/drawing/HomogenMatrix3.hpp
+#include basegfx/matrix/b2dhommatrix.hxx
+#include basegfx/polygon/b2dpolygontools.hxx
+#include basegfx/polygon/b2dpolygon.hxx
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
@@ -1024,6 +1028,109 @@ ImplEESdrObject::~ImplEESdrObject()
 {
 }
 
+basegfx::B2DRange getUnrotatedGroupBoundRange(const Reference XShape  
rxShape)
+{
+basegfx::B2DRange aRetval;
+
+try
+{
+if(rxShape.is())
+{
+
if(rxShape-getShapeType().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.drawing.GroupShape)))
+{
+// it's a group shape, iterate over children
+const Reference XIndexAccess  xXIndexAccess(rxShape, 
UNO_QUERY);
+
+if(xXIndexAccess.is())
+{
+for(sal_uInt32 n(0), nCnt = xXIndexAccess-getCount(); n  
nCnt; ++n)
+{
+const Reference XShape  
axShape(xXIndexAccess-getByIndex(n), UNO_QUERY);
+
+if(axShape.is())
+{
+// we are calculating the bound for a group, 
correct rotation for sub-objects
+// to get the unrotated bounds for the group
+const basegfx::B2DRange 
aExtend(getUnrotatedGroupBoundRange(axShape));
+
+aRetval.expand(aExtend);
+}
+}
+}
+}
+else
+{
+// iT#s a xShape, get it's transformation
+const Reference XPropertySet  mXPropSet(rxShape, UNO_QUERY);
+
+if(mXPropSet.is())
+{
+const Any aAny = 
mXPropSet-getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(Transformation)));
+
+if(aAny.hasValue())
+{
+HomogenMatrix3 aMatrix;
+
+if(aAny = aMatrix)
+{
+basegfx::B2DHomMatrix aHomogenMatrix;
+
+aHomogenMatrix.set(0, 0, aMatrix.Line1.Column1);
+aHomogenMatrix.set(0, 1, aMatrix.Line1.Column2);
+aHomogenMatrix.set(0, 2, aMatrix.Line1.Column3);
+aHomogenMatrix.set(1, 0, aMatrix.Line2.Column1);
+aHomogenMatrix.set(1, 1, aMatrix.Line2.Column2);
+aHomogenMatrix.set(1, 2, aMatrix.Line2.Column3);
+aHomogenMatrix.set(2, 0, aMatrix.Line3.Column1);
+aHomogenMatrix.set(2, 1, aMatrix.Line3.Column2);
+aHomogenMatrix.set(2, 2, aMatrix.Line3.Column3);
+
+basegfx::B2DVector aScale, aTranslate;
+double fRotate, fShearX;
+
+// decopose transformation
+aHomogenMatrix.decompose(aScale, aTranslate, 
fRotate, fShearX);
+
+// check if rotation needs to be corrected
+if(!basegfx::fTools::equalZero(fRotate))
+{
+// to correct, keep in mind that ppt graphics 
are rotated around their center
+const basegfx::B2DPoint aCenter(aHomogenMatrix 
* basegfx::B2DPoint(0.5, 0.5));
+
+aHomogenMatrix.translate(-aCenter.getX(), 
-aCenter.getY());
+aHomogenMatrix.rotate(-fRotate);
+aHomogenMatrix.translate(aCenter.getX(), 
aCenter.getY());
+}
+
+
+// check if shear needs to be corrected (always 
correct shear,
+// ppt does not know about it)
+if(!basegfx::fTools::equalZero(fShearX))
+{
+  

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6b/30b279363793da14e320e7c0dc9bf8409da23c

2013-05-19 Thread Caolán McNamara
 6b/30b279363793da14e320e7c0dc9bf8409da23c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f054316e8b1167b5635da1dc178c7f8b69b0fbf9
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 14:01:41 2013 +0100

Notes added by 'git notes add'

diff --git a/6b/30b279363793da14e320e7c0dc9bf8409da23c 
b/6b/30b279363793da14e320e7c0dc9bf8409da23c
new file mode 100644
index 000..ef88d30
--- /dev/null
+++ b/6b/30b279363793da14e320e7c0dc9bf8409da23c
@@ -0,0 +1 @@
+merged as: 38109d24ab5261959b316b7dacc99521858f0749
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 18/1d41280b2dcf97654b252a9edd7c6a65ad7c7f

2013-05-19 Thread Caolán McNamara
 18/1d41280b2dcf97654b252a9edd7c6a65ad7c7f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5968e7f369514079b08a1c4f3e60251784d29a08
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 14:50:49 2013 +0100

Notes added by 'git notes add'

diff --git a/18/1d41280b2dcf97654b252a9edd7c6a65ad7c7f 
b/18/1d41280b2dcf97654b252a9edd7c6a65ad7c7f
new file mode 100644
index 000..69dd9da
--- /dev/null
+++ b/18/1d41280b2dcf97654b252a9edd7c6a65ad7c7f
@@ -0,0 +1 @@
+prefer: 0752c18df9a975ffa182a4a7bc86e0bcadd58aec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f0/bc9c2e992d3751f7d6c11bf11dfce4257580e4

2013-05-19 Thread Caolán McNamara
 f0/bc9c2e992d3751f7d6c11bf11dfce4257580e4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8c65d83eca9e559344068a162937c40c00ed8268
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 15:06:02 2013 +0100

Notes added by 'git notes add'

diff --git a/f0/bc9c2e992d3751f7d6c11bf11dfce4257580e4 
b/f0/bc9c2e992d3751f7d6c11bf11dfce4257580e4
new file mode 100644
index 000..e784a96
--- /dev/null
+++ b/f0/bc9c2e992d3751f7d6c11bf11dfce4257580e4
@@ -0,0 +1 @@
+prefer: b61dd408981b4dc8a3e97edd806694e43da882e4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: 5 commits - filter/source include/svx include/tools svx/source tools/source vcl/source

2013-05-19 Thread Armin Le Grand
 filter/source/msfilter/msdffimp.cxx |   11 +
 include/svx/sdr/primitive2d/sdrattributecreator.hxx |5 
 include/tools/poly.hxx  |2 
 svx/source/customshapes/EnhancedCustomShape3d.cxx   |  103 ++--
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |1 
 tools/source/generic/poly2.cxx  |   17 --
 vcl/source/filter/wmf/enhwmf.cxx|   31 +++-
 vcl/source/filter/wmf/winwmf.cxx|   80 ++--
 8 files changed, 174 insertions(+), 76 deletions(-)

New commits:
commit d0a956f1d80aaf4be6d19d339bd46addc8c16861
Author: Armin Le Grand a...@apache.org
Date:   Wed Aug 15 13:18:59 2012 +

Resolves: #i119496# Correct flags AutoGrowWidth/Height for WordArt

Patch by: SunYing
Review by: Jianyuan Li, alg(cherry picked from commit 
3048c821bb664f39c7b5e2533af4568fbcd22f73)

Change-Id: Ib0ea2de7699e94bda81768e210ad7d921aefce48

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index b8b92db..bc6f9a9 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4233,6 +4233,10 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader rHd, SvStream r
 }
 if ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 
)  0x1000 ) // SJ: Font Kerning On ?
 aSet.Put( SvxKerningItem( 1, EE_CHAR_KERNING ) );
+
+// #i119496# the resize autoshape to fit text attr of 
word art in MS PPT is always false
+aSet.Put(SdrTextAutoGrowHeightItem(false));
+aSet.Put(SdrTextAutoGrowWidthItem(false));
 }
 pRet-SetMergedItemSet( aSet );
 
commit 42b4dc4f8cad68ebd1386c5b8ea76ffaf59fdeb4
Author: Armin Le Grand a...@apache.org
Date:   Wed Aug 22 13:17:43 2012 +

Related: #i120569# Corrected 3D object creations

(cherry picked from commit 753dd9ee0c8101ce613cdc7e1a68141e0f8561d3)

Change-Id: Ic7534a310b8d8c526b2639243c9d734e26b55560

diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx 
b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index a879ddc..010b037 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -372,7 +372,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const 
SdrObject* pShape2d, con
 }
 
 Rectangle aBoundRect2d;
-SdrObjListIter aIter( *pShape2d, IM_DEEPWITHGROUPS );
+SdrObjListIter aIter( *pShape2d, IM_DEEPNOGROUPS );
+const bool bMultipleSubObjects(aIter.Count()  1);
+
 while( aIter.IsMore() )
 {
 const SdrObject* pNext = aIter.Next();
@@ -385,19 +387,34 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const 
SdrObject* pShape2d, con
 if ( pNext-ISA( SdrPathObj ) )
 {
 const SfxItemSet rSet = pNext-GetMergedItemSet();
-const drawinglayer::attribute::SdrLineAttribute aLine(
-
drawinglayer::primitive2d::createNewSdrLineAttribute(rSet));
-bool bNeedToConvertToContour(0.0 = aLine.getWidth() || 0.0 != 
aLine.getFullDotDashLen());
+bool bNeedToConvertToContour(false);
 
-if(!bNeedToConvertToContour  !aLine.isDefault())
+// do conversion only for single line objects; for all others 
a fill and a
+// line object get created. When we have fill, we want no 
line. That line has
+// always been there, but since it was never converted to 
contour, it kept
+// invisible (all this 'hidden' logic should be migrated to 
primitives).
+if(!bMultipleSubObjects)
 {
-const drawinglayer::attribute::SdrLineStartEndAttribute 
aLineStartEnd(
-
drawinglayer::primitive2d::createNewSdrLineStartEndAttribute(rSet, 
aLine.getWidth()));
+const XFillStyle 
eStyle(((XFillStyleItem)(rSet.Get(XATTR_FILLSTYLE))).GetValue());
 
-if((aLineStartEnd.getStartWidth()  
aLineStartEnd.isStartActive())
-|| (aLineStartEnd.getEndWidth()  
aLineStartEnd.isEndActive()))
+if(XFILL_NONE == eStyle)
 {
-bNeedToConvertToContour = true;
+const drawinglayer::attribute::SdrLineAttribute aLine(
+
drawinglayer::primitive2d::createNewSdrLineAttribute(rSet));
+
+bNeedToConvertToContour = (0.0  aLine.getWidth() || 
0.0 != aLine.getFullDotDashLen());
+
+if(!bNeedToConvertToContour  !aLine.isDefault())
+{
+const 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ac/d62709ad0d1d54764f00aabbd6c59ccb41a409

2013-05-19 Thread Caolán McNamara
 ac/d62709ad0d1d54764f00aabbd6c59ccb41a409 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a940d7a05283ad0a9ef17eaceaa2a3738a2da93e
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:33:12 2013 +0100

Notes added by 'git notes add'

diff --git a/ac/d62709ad0d1d54764f00aabbd6c59ccb41a409 
b/ac/d62709ad0d1d54764f00aabbd6c59ccb41a409
new file mode 100644
index 000..313aea3
--- /dev/null
+++ b/ac/d62709ad0d1d54764f00aabbd6c59ccb41a409
@@ -0,0 +1 @@
+merged as: 8feb5a20b8d7c4c4484153215b2dd688a52cf50c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8e/e49906f04106317997e9ca3bb890870816e274

2013-05-19 Thread Caolán McNamara
 8e/e49906f04106317997e9ca3bb890870816e274 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4284ec785886270eb1549d08e480142d248b2c6e
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:33:30 2013 +0100

Notes added by 'git notes add'

diff --git a/8e/e49906f04106317997e9ca3bb890870816e274 
b/8e/e49906f04106317997e9ca3bb890870816e274
new file mode 100644
index 000..2b7040c
--- /dev/null
+++ b/8e/e49906f04106317997e9ca3bb890870816e274
@@ -0,0 +1 @@
+merged as: abb6f47bd3941ec63a41a9b9fa4c7de620b5177d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 75/3dd9ee0c8101ce613cdc7e1a68141e0f8561d3 aa/4649b8feb28c250cbbab65c749ae01524726fe

2013-05-19 Thread Caolán McNamara
 75/3dd9ee0c8101ce613cdc7e1a68141e0f8561d3 |1 +
 aa/4649b8feb28c250cbbab65c749ae01524726fe |1 +
 2 files changed, 2 insertions(+)

New commits:
commit c88b2167923c6c5f4f0dd672c5cb3fb42ff32ec0
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:34:31 2013 +0100

Notes added by 'git notes add'

diff --git a/75/3dd9ee0c8101ce613cdc7e1a68141e0f8561d3 
b/75/3dd9ee0c8101ce613cdc7e1a68141e0f8561d3
new file mode 100644
index 000..46c4991
--- /dev/null
+++ b/75/3dd9ee0c8101ce613cdc7e1a68141e0f8561d3
@@ -0,0 +1 @@
+merged as: 42b4dc4f8cad68ebd1386c5b8ea76ffaf59fdeb4
commit 13aa1e56e0fb6c7c81349a7891d419c71ed059ef
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:34:18 2013 +0100

Notes added by 'git notes add'

diff --git a/aa/4649b8feb28c250cbbab65c749ae01524726fe 
b/aa/4649b8feb28c250cbbab65c749ae01524726fe
new file mode 100644
index 000..7874e7b
--- /dev/null
+++ b/aa/4649b8feb28c250cbbab65c749ae01524726fe
@@ -0,0 +1 @@
+merged as: 118a8ad8c6287e7a4cc81ec46504f6cdffdf826d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] Use clock_gettime when available on *nix

2013-05-19 Thread Arnaud Versini (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3964

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/3964/1

Use clock_gettime when available on *nix

Change-Id: I65df2b119dbda274749ab2b4d0825fbdf44eb4e8
---
M sal/osl/unx/time.c
1 file changed, 11 insertions(+), 6 deletions(-)



diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index 4294cd2..796e882 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -24,6 +24,7 @@
 #include osl/time.h
 #include time.h
 #include assert.h
+#include unistd
 
 /* FIXME: detection should be done in configure script */
 #if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
@@ -34,7 +35,11 @@
 #define HAS_ALTZONE 1
 #endif
 
-#if defined(LINUX)
+#if defined(_POSIX_TIMERS)  (_POSIX_TIMERS  0)
+#define USE_CLOCK_GETTIME 1
+#endif
+
+#if USE_CLOCK_GETTIME
 typedef struct timespec osl_time_t;
 #else
 typedef struct timeval osl_time_t;
@@ -48,7 +53,7 @@
 {
 int res;
 osl_time_t tp;
-#if defined(LINUX)
+#if defined(USE_CLOCK_GETTIME)
 res = clock_gettime(CLOCK_REALTIME, tp);
 #else
 res = gettimeofday(tp, NULL);
@@ -60,7 +65,7 @@
 }
 
 tv-Seconds = tp.tv_sec;
-#if defined(LINUX)
+#if defined(USE_CLOCK_GETTIME)
 tv-Nanosec = tp.tv_nsec;
 #else
 tv-Nanosec = tp.tv_usec * 1000;
@@ -262,7 +267,7 @@
 void sal_initGlobalTimer()
 {
   int res;
-  #if defined(LINUX)
+  #if defined(USE_CLOCK_GETTIME)
   res = clock_gettime(CLOCK_REALTIME, startTime);
   #else
   res = gettimeofday( startTime, NULL );
@@ -277,7 +282,7 @@
   int res;
   sal_uInt32 nSeconds;
 
-  #if defined(LINUX)
+  #if defined(USE_CLOCK_GETTIME)
   res = clock_gettime(CLOCK_REALTIME, startTime);
   #else
   res = gettimeofday( startTime, NULL );
@@ -289,7 +294,7 @@
 return 0;
 
   nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
-  #if defined(LINUX)
+  #if defined(USE_CLOCK_GETTIME)
   nSeconds = ( nSeconds * 1000 ) + (long) (( currentTime.tv_nsec - 
startTime.tv_nsec) / 100 );
   #else
   nSeconds = ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - 
startTime.tv_usec) / 1000 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65df2b119dbda274749ab2b4d0825fbdf44eb4e8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com

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


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 30/48c821bb664f39c7b5e2533af4568fbcd22f73

2013-05-19 Thread Caolán McNamara
 30/48c821bb664f39c7b5e2533af4568fbcd22f73 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7754fa5fdefd415fe79503607b55e97672a813b0
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:35:32 2013 +0100

Notes added by 'git notes add'

diff --git a/30/48c821bb664f39c7b5e2533af4568fbcd22f73 
b/30/48c821bb664f39c7b5e2533af4568fbcd22f73
new file mode 100644
index 000..d330453
--- /dev/null
+++ b/30/48c821bb664f39c7b5e2533af4568fbcd22f73
@@ -0,0 +1 @@
+merged as: d0a956f1d80aaf4be6d19d339bd46addc8c16861
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-05-19 Thread Oliver-Rainer Wittmann
 sot/source/sdstor/stgelem.cxx |   10 +-
 sot/source/sdstor/stgelem.hxx |   26 ++
 2 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit b751e3915ef527c9af07b995c95fb353c3c81a42
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Aug 14 12:40:36 2012 +

some refactoring on StgHeader

(cherry picked from commit 9c3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549)

Conflicts:
sot/source/sdstor/stgelem.cxx

Change-Id: I3f826dc98af5ad5cee5c2566006ab405f0730c3c

diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index 265381e..e34f068 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -110,7 +110,7 @@ void StgHeader::Init()
 
 SetTOCStart( STG_EOF );
 SetDataFATStart( STG_EOF );
-for( short i = 0; i  109; i++ )
+for( short i = 0; i  cFATPagesInHeader; i++ )
 SetFATPage( i, STG_FREE );
 }
 
@@ -145,7 +145,7 @@ sal_Bool StgHeader::Load( SvStream r )
nDataFATSize   // 40 # of data FATpages
nMasterChain   // 44 chain to the next master block
nMaster;   // 48 # of additional master blocks
-for( short i = 0; i  109; i++ )
+for( short i = 0; i  cFATPagesInHeader; i++ )
 r  nMasterFAT[ i ];
 
 return ( r.GetErrorCode() == ERRCODE_NONE  Check() );
@@ -172,7 +172,7 @@ sal_Bool StgHeader::Store( StgIo rIo )
nDataFATSize   // 40 # of data FAT pages
nMasterChain   // 44 chain to the next master block
nMaster;   // 48 # of additional master blocks
-for( short i = 0; i  109; i++ )
+for( short i = 0; i  cFATPagesInHeader; i++ )
 r  nMasterFAT[ i ];
 bDirty = !rIo.Good();
 return sal_Bool( !bDirty );
@@ -209,7 +209,7 @@ sal_Bool StgHeader::Check()
 
 sal_Int32 StgHeader::GetFATPage( short n ) const
 {
-if( n = 0  n  109 )
+if( n = 0  n  cFATPagesInHeader )
 return nMasterFAT[ n ];
 else
 return STG_EOF;
@@ -217,7 +217,7 @@ sal_Int32 StgHeader::GetFATPage( short n ) const
 
 void StgHeader::SetFATPage( short n, sal_Int32 nb )
 {
-if( n = 0  n  109 )
+if( n = 0  n  cFATPagesInHeader )
 {
 if( nMasterFAT[ n ] != nb )
 bDirty = sal_True, nMasterFAT[ n ] = nb;
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index e2bfad3..5e7b6c4 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -36,8 +36,10 @@ SvStream operator( SvStream, const ClsId );
 
 class StgHeader
 {
+static const sal_uInt8 cFATPagesInHeader = 109;
+
 sal_uInt8   cSignature[ 8 ];// 00 signature (see below)
-ClsId   aClsId; // 08 Class ID
+ClsId   aClsId; // 08 Class ID
 sal_Int32   nVersion;   // 18 version number
 sal_uInt16  nByteOrder; // 1C Unicode byte order indicator
 sal_Int16   nPageSize;  // 1E 1  nPageSize = block size
@@ -52,7 +54,7 @@ class StgHeader
 sal_Int32   nDataFATSize;   // 40 # of data fat blocks
 sal_Int32   nMasterChain;   // 44 chain to the next master 
block
 sal_Int32   nMaster;// 48 # of additional master blocks
-sal_Int32   nMasterFAT[ 109 ];  // 4C first 109 master FAT pages
+sal_Int32   nMasterFAT[ cFATPagesInHeader ];// 4C first 
[cFATPagesInHeader] master FAT pages
 public:
 StgHeader();
 
@@ -61,23 +63,23 @@ public:
 sal_Bool  Load( SvStream );
 sal_Bool  Store( StgIo );
 sal_Bool  Check();  // check the signature and version
-short GetByteOrder() const  { return nByteOrder;}
-sal_Int32 GetTOCStart() const   { return nTOCstrm;  }
+short GetByteOrder() const  { return nByteOrder; }
+sal_Int32 GetTOCStart() const   { return nTOCstrm; }
 void  SetTOCStart( sal_Int32 n );
-sal_Int32 GetDataFATStart() const   { return nDataFAT;  }
+sal_Int32 GetDataFATStart() const   { return nDataFAT; }
 void  SetDataFATStart( sal_Int32 n );
-sal_Int32 GetDataFATSize() const{ return nDataFATSize;  }
+sal_Int32 GetDataFATSize() const{ return nDataFATSize; }
 void  SetDataFATSize( sal_Int32 n );
-sal_Int32 GetThreshold() const  { return nThreshold;}
-short GetPageSize() const   { return nPageSize; }
+sal_Int32 GetThreshold() const  { return nThreshold; }
+short GetPageSize() const   { return nPageSize; }
 short GetDataPageSize() const   { return nDataPageSize; }
-sal_Int32 GetFATSize() const{ return nFATSize;  }
+sal_Int32 GetFATSize() const{ return nFATSize; }
 void  SetFATSize( sal_Int32 n );
-sal_Int32 GetFATChain() const   { return 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9c/3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549

2013-05-19 Thread Caolán McNamara
 9c/3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a698fcddfd7ceed9f4bf5a6cad27af02d1933c8e
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:40:51 2013 +0100

Notes added by 'git notes add'

diff --git a/9c/3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549 
b/9c/3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549
new file mode 100644
index 000..7f6c9f1
--- /dev/null
+++ b/9c/3ef4ee67c1d3f416c02b9db6d1adbc7ca6d549
@@ -0,0 +1 @@
+merged as: b751e3915ef527c9af07b995c95fb353c3c81a42
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 95/262e18ef21658a8a5d7801e580e826733c2c6d

2013-05-19 Thread Caolán McNamara
 95/262e18ef21658a8a5d7801e580e826733c2c6d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d1c2d800678feaae492774777c7a32812210eb50
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:41:42 2013 +0100

Notes added by 'git notes add'

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


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

2013-05-19 Thread Caolán McNamara
 26/0a75acc104a7d6b12c798998b721fff2e1b204 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4ae9410a954d617810b8b65c291782ceb0ca5554
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:43:18 2013 +0100

Notes added by 'git notes add'

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


Build libreoffice error for xml2 on windows7.

2013-05-19 Thread leo2013
These days, I'm trying to build the libreoffice on windows7(sp1,x64).
I referenced to the wiki:
https://wiki.documentfoundation.org/Development/BuildingOnWindows
I download some software accoring to the wiki site:
https://wiki.documentfoundation.org/Development/Windows_Build_Dependencies
1.windows sdk
2.vs2012
3.DirectX sdk
4.GDI+ Redistributable (but not used according to the note)
5.Dot NET SDK v2.0 (Important: x86, not x64!!!)
6.Java Development Kit (use a 32bit SDK)
7.Microsoft Visual C++ 2010 SP1 Redistributable Package (x86) (but not used
cause I used vs2012)
8.Apache ANT
9.Junit 4
10.Mozilla build tooling (only for stable LibreOffice versions 4.1) (but
not used)
11.LO patched GNU make 3.82: install it at the cygwin path /opt/lo/bin/make
12.LO patched ccache: install it at the cygwin path /opt/lo/bin/ccache
13.Cygwin's setup.exe
After installing and configuring them, I began to build source codes from
site:
http://cgit.freedesktop.org/libreoffice/core/log/?h=feature/formula-core-rework
I used:
--with-parallelism=4
--disable-odk
--with-junit=/opt/lo/misc/junit-4.10.jar 
--with-ant-home=/opt/lo/misc/apache-ant-1.9.0
--with-jdk-home=D:/x86/Java/jdk1.7.0_21
--enable-pch
--enable-ccache
--disable-activex
--enable-symbols
--disable-cve-tests
--disable-atl
--without-myspell-dicts
as configure arguments in autogen.input file.
$ ./autogen.sh   (not work because the format isn't UNIX. and after
transferred it to UNIX it works but failed again)
need copy the two files from
(xx\cygwin\usr\x86_64-pc-cygwin\sys-root\usr\share\libtool\config\config.guess)
and
(xx\cygwin\usr\x86_64-pc-cygwin\sys-root\usr\share\libtool\config\config.sub)
into current path which is the same
as auogen.sh; and then, try $ ./autogen.sh
...
To build, issue:
/opt/lo/bin/make

run: /opt/lo/bin/make help
for details

*
* WARNING : ccache's cache size is less than 1GB using it is
counter-producive: auto-ccache detection disabled
...
$ /opt/lo/bin/make  (begin to download something automatically and after
long time, failed)
This time need notice the file named 'g', the format of g isn't all UNIX
too, so that need transferred it to UNIX and 
$/opt/lo/bin/make clean
$/opt/lo/bin/make
It looks everything is stopping there but it's working now indeed.
After a long time, it begins to scroll up by printing the build information.
...
[build DEP]...xx
...
[build CXX]...xx
...
[build C  ]...xx
...

Now, the error comes as below:
E:/core/workdir/wntmsci14.pro/UnpackedTarball/zlib/x64/zutil.c(137) :  
warning C4131: ??zError??: ??
E:/core/workdir/wntmsci14.pro/UnpackedTarball/zlib/x64/zutil.c(305) :  
warning C4131: ??zcalloc??: ??
E:/core/workdir/wntmsci14.pro/UnpackedTarball/zlib/x64/zutil.c(315) :   
warning C4131: ??zcfree??: ??
[build LNK] Executable/gcc-wrapper.exe
[build LNK] Executable/g++-wrapper.exe
Microsoft (R) Windows Script Host Version 5.8
???(C) Microsoft Corporation 1996-2001???

libxml2 version: 2.7.6
Created Makefile.
Created config.h.

XML processor configuration
---
  Trio: no
 Thread safety: native
FTP client: yes
   HTTP client: yes
HTML processor: yes
  C14N support: yes
   Catalog support: yes
   DocBook support: yes
 XPath support: yes
  XPointer support: yes
  XInclude support: yes
 iconv support: no
  iso8859x support: no
  zlib support: no
  Debugging module: yes
  Memory debugging: no
 Runtime debugging: no
Regexp support: yes
Module support: yes
  Tree support: yes
Reader support: yes
Writer support: yes
Walker support: yes
   Pattern support: yes
  Push support: yes
Validation support: yes
  SAX1 support: yes
Legacy support: yes
Output support: yes
XML Schema support: yes
Schematron support: yes
   Python bindings: no

Win32 build configuration
-
  Compiler: msvc
  C-Runtime option: /MD
Embed Manifest: no
 Debug symbols: no
Static xmllint: no
Install prefix: .
  Put tools in: $(PREFIX)\bin
Put headers in: $(PREFIX)\include
Put static libs in: $(PREFIX)\lib
Put shared libs in: $(PREFIX)\lib
  Include path: .
  Lib path: .


Microsoft (R) ?ù??? 11.00.50727.1 ??
??? (C) Microsoft Corporation???

if not exist bin.msvc mkdir bin.msvc
if not exist int.msvc mkdir int.msvc
cl.exe /EP /nologo /I..\include /D _REENTRANT libxml2.def.src 
int.ms  
 
vc\libxml2.def
libxml2.def.src
cl.exe /nologo /D WIN32 /D _WINDOWS /D _MBCS /W1 /MD /I..
/I..\inc
c14n.c
catalog.c
chvalid.c
debugXML.c
dict.c
DOCBparser.c
encoding.c
entities.c
error.c
globals.c
hash.c
HTMLparser.c
HTMLtree.c
legacy.c
list.c
nanoftp.c
nanohttp.c
parser.c
parserInternals.c
pattern.c
???...
???...
relaxng.c

[Libreoffice-commits] core.git: 3 commits - chart2/qa configure.ac oox/source vcl/Library_vcl.mk

2013-05-19 Thread Norbert Thiebaud
 chart2/qa/extras/chart2export.cxx |2 +-
 chart2/qa/extras/chart2import.cxx |2 +-
 configure.ac  |6 +++---
 oox/source/export/chartexport.cxx |2 +-
 vcl/Library_vcl.mk|6 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 2d55b2e5ae0d4f1a05e1ce5b20a7b342d6ea8b1d
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 10:45:21 2013 -0500

enable coretext by default on Mac

use --disable-coretext explicitely to turn it off (and revert to ATSUI)

Change-Id: I86685482a08cd62665a94eb6e241b59a217d0b52

diff --git a/configure.ac b/configure.ac
index 05a44fb..337af8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10663,7 +10663,7 @@ dnl 
===
 ENABLE_CORETEXT=NO
 if test $_os = Darwin; then
 AC_MSG_CHECKING([whether to use CoreText framework])
-if test $enable_coretext = yes -o $BITNESS_OVERRIDE = 64; then
+if test $enable_coretext != no -o $BITNESS_OVERRIDE = 64; then
 AC_MSG_RESULT([yes])
 ENABLE_CORETEXT=YES
 else
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a4a6957..dfaecc7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -381,10 +381,16 @@ $(eval $(call 
gb_Library_use_system_darwin_frameworks,vcl,\
ApplicationServices \
 ))
 else
+ifeq ($(MACOSX_SDK_VERSION),1060)
+$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
+   ApplicationServices \
+))
+else
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
CoreText \
 ))
 endif
+endif
 
 else # ATSUI
 
commit 123c226af5b529e5b4fdb9d930eac089706049c5
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 08:38:40 2013 -0500

build gallery does not work on Mac, disable it by default

Change-Id: I94bf2aea81dfdeb5e70672092e89acc1e4ceabf7

diff --git a/configure.ac b/configure.ac
index 7174b9c..05a44fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2226,12 +2226,12 @@ if test -n ${with_galleries}; then
 AC_MSG_ERROR([unknown value --with-galleries=$with_galleries])
 fi
 else
-   if test $_os != iOS -a $_os != Android; then
+   if test $_os != iOS -a $_os != Android -a $_os != Darwin; then
 WITH_GALLERY_BUILD=YES
 AC_MSG_RESULT([internal src images for desktop])
else
 WITH_GALLERY_BUILD=
-AC_MSG_RESULT([disable src imgage build for non-desktop])
+AC_MSG_RESULT([disable src imgage build])
fi
 fi
 AC_SUBST(WITH_GALLERY_BUILD)
commit e84a04273b08bf4527155d348f2aebe840696b4e
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Wed May 15 14:40:01 2013 -0500

WaE on mac osx build

Change-Id: Ief28d2563b66754d00fdc09d6d68ea3a73aff22a

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 3e645ab..3a6cd81 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -49,7 +49,7 @@ void testErrorBar( Reference XPropertySet  xErrorBar )
 CPPUNIT_ASSERT(
 xErrorBar-getPropertyValue(ShowNegativeError) = bShowNegative);
 CPPUNIT_ASSERT(bShowNegative);
-double nVal;
+double nVal = 0.0;
 CPPUNIT_ASSERT(xErrorBar-getPropertyValue(PositiveError) = nVal);
 CPPUNIT_ASSERT_DOUBLES_EQUAL(nVal, 10.0, 1e-10);
 }
diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index decd18e..074b232 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -56,7 +56,7 @@ void Chart2ImportTest::Fdo60083()
 static_castsal_Int32(chart::ErrorBarStyle::RELATIVE),
 nErrorBarStyle);
 
-double nVal;
+double nVal = 0.0;
 CPPUNIT_ASSERT(
 xErrorBarYProps-getPropertyValue(PositiveError) = nVal);
 CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, nVal, 1e-8);
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 0921156..c52a3b1 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2684,7 +2684,7 @@ void ChartExport::exportErrorBar(Reference XPropertySet 
xErrorBarProps, bool b
 }
 else
 {
-double nVal;
+double nVal = 0.0;
 if(nErrorBarStyle == cssc::ErrorBarStyle::STANDARD_DEVIATION)
 {
 xErrorBarProps-getPropertyValue(Weight) = nVal;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Build failure of Gallery on Mac OSX in gengal.bin on master

2013-05-19 Thread Norbert Thiebaud
On Sun, May 19, 2013 at 3:58 AM, Alexander Thurgood
alex.thurg...@gmail.com wrote:
 Hi all,

 Since yesterday, I have been geting a build failure on OSX 10.8 in
 gengal.bin with the following, even after a make clean and fresh pull
 from master :

yes gengal does not work on Mac
I pushed a patch to disable it by default

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


[Libreoffice-commits] core.git: basegfx/source drawinglayer/source include/basegfx

2013-05-19 Thread Armin Le Grand
 basegfx/source/numeric/ftools.cxx   |   77 +
 drawinglayer/source/primitive2d/gridprimitive2d.cxx |  166 
 include/basegfx/numeric/ftools.hxx  |   30 +++
 3 files changed, 212 insertions(+), 61 deletions(-)

New commits:
commit 5a6ed660ec74e445a827c7aa41e4793c64a46271
Author: Armin Le Grand a...@apache.org
Date:   Thu Aug 23 14:03:21 2012 +

Resolves: #i120596# Optimized grid primitive

added some tooling to basegfx

(cherry picked from commit 97fa4faaa0b09724cf98dbf22390b283ba57b41c)

Conflicts:
basegfx/inc/basegfx/numeric/ftools.hxx

Change-Id: Ib15c43cf4d5b50605ec596dab498e3a678f3734a

diff --git a/basegfx/source/numeric/ftools.cxx 
b/basegfx/source/numeric/ftools.cxx
index 0c9a173..1cbbe5c 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.cxx
@@ -18,11 +18,88 @@
  */
 
 #include basegfx/numeric/ftools.hxx
+#include algorithm
 
 namespace basegfx
 {
 // init static member of class fTools
 double ::basegfx::fTools::mfSmallValue = 0.1;
+
+double snapToNearestMultiple(double v, const double fStep)
+{
+if(fTools::equalZero(fStep))
+{
+// with a zero step, all snaps to 0.0
+return 0.0;
+}
+else
+{
+const double fHalfStep(fStep * 0.5);
+const double fChange(fHalfStep - fmod(v + fHalfStep, fStep));
+
+if(basegfx::fTools::equal(fabs(v), fabs(fChange)))
+{
+return 0.0;
+}
+else
+{
+return v + fChange;
+}
+}
+}
+
+double snapToZeroRange(double v, double fWidth)
+{
+if(fTools::equalZero(fWidth))
+{
+// with no range all snaps to range bound
+return 0.0;
+}
+else
+{
+if(v  0.0 || v  fWidth)
+{
+double fRetval(fmod(v, fWidth));
+
+if(fRetval  0.0)
+{
+fRetval += fWidth;
+}
+
+return fRetval;
+}
+else
+{
+return v;
+}
+}
+}
+
+double snapToRange(double v, double fLow, double fHigh)
+{
+if(fTools::equal(fLow, fHigh))
+{
+// with no range all snaps to range bound
+return 0.0;
+}
+else
+{
+if(fLow  fHigh)
+{
+// correct range order. Evtl. assert this (?)
+std::swap(fLow, fHigh);
+}
+
+if(v  fLow || v  fHigh)
+{
+return snapToZeroRange(v - fLow, fHigh - fLow) + fLow;
+}
+else
+{
+return v;
+}
+}
+}
 } // end of namespace basegfx
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx 
b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index c241738..1f7dcb1 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -122,95 +122,139 @@ namespace drawinglayer
 nSmallStepsY = (sal_uInt32)(fStepY / fSmallStepY);
 }
 
-// prepare point vectors for point and cross markers
-std::vector basegfx::B2DPoint  aPositionsPoint;
-std::vector basegfx::B2DPoint  aPositionsCross;
+// calculate extended viewport in which grid points may lie at 
all
+basegfx::B2DRange aExtendedViewport;
 
-for(double fX(0.0); fX  aScale.getX(); fX += fStepX)
+if(rViewInformation.getDiscreteViewport().isEmpty())
 {
-const bool bXZero(basegfx::fTools::equalZero(fX));
+// not set, use logic size to travel over all potentioal 
grid points
+aExtendedViewport = basegfx::B2DRange(0.0, 0.0, 
aScale.getX(), aScale.getY());
+}
+else
+{
+// transform unit range to discrete view
+aExtendedViewport = basegfx::B2DRange(0.0, 0.0, 1.0, 1.0);
+basegfx::B2DHomMatrix 
aTrans(rViewInformation.getObjectToViewTransformation() * getTransform());
+aExtendedViewport.transform(aTrans);
+
+// intersect with visible part
+
aExtendedViewport.intersect(rViewInformation.getDiscreteViewport());
 
-for(double fY(0.0); fY  aScale.getY(); fY += fStepY)
+if(!aExtendedViewport.isEmpty())
 {
-const bool bYZero(basegfx::fTools::equalZero(fY));
+// convert back and apply scale
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 97/fa4faaa0b09724cf98dbf22390b283ba57b41c

2013-05-19 Thread Caolán McNamara
 97/fa4faaa0b09724cf98dbf22390b283ba57b41c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 417430552aff4cc9860b57c88e7e10079b164275
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:50:50 2013 +0100

Notes added by 'git notes add'

diff --git a/97/fa4faaa0b09724cf98dbf22390b283ba57b41c 
b/97/fa4faaa0b09724cf98dbf22390b283ba57b41c
new file mode 100644
index 000..5bac7a8
--- /dev/null
+++ b/97/fa4faaa0b09724cf98dbf22390b283ba57b41c
@@ -0,0 +1 @@
+merged as: 5a6ed660ec74e445a827c7aa41e4793c64a46271
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5f/ee43d8a7c55070d95ee9b5027949c0b27d1267

2013-05-19 Thread Caolán McNamara
 5f/ee43d8a7c55070d95ee9b5027949c0b27d1267 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d2deb0f40f0453abc83f8cc3ea160689ed3e159
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 16:55:38 2013 +0100

Notes added by 'git notes add'

diff --git a/5f/ee43d8a7c55070d95ee9b5027949c0b27d1267 
b/5f/ee43d8a7c55070d95ee9b5027949c0b27d1267
new file mode 100644
index 000..9bc5830
--- /dev/null
+++ b/5f/ee43d8a7c55070d95ee9b5027949c0b27d1267
@@ -0,0 +1 @@
+prefer: b480f91968a3df16a655585fba494425aea725dc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-05-19 Thread Thomas Arnhold
 vcl/generic/fontmanager/fontsubst.cxx |8 
 vcl/source/gdi/outdev3.cxx|8 
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 43c234b0481fe63b8c4823affad066c6362f5068
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sun May 19 18:00:39 2013 +0200

fix OUString conversion

Both were CompareIgnoreCaseToAscii( starsymbol, 10) which is
startsWithIgnoreCaseAscii.

Fixes 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10

Change-Id: I21e2eb8c578b65d5f0e4181ed64af02ec480463e

diff --git a/vcl/generic/fontmanager/fontsubst.cxx 
b/vcl/generic/fontmanager/fontsubst.cxx
index 36c683d..900125b 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -160,8 +160,8 @@ bool FcPreMatchSubstititution::FindFontSubstitute( 
FontSelectPattern rFontSelDa
 if( rFontSelData.IsSymbolFont() )
 return false;
 // StarSymbol is a unicode font, but it still deserves the symbol flag
-if(rFontSelData.maSearchName.startsWith( starsymbol )
-|| rFontSelData.maSearchName.startsWith( opensymbol ) )
+if(rFontSelData.maSearchName.startsWithIgnoreAsciiCase( starsymbol )
+|| rFontSelData.maSearchName.startsWithIgnoreAsciiCase( opensymbol ) )
 return false;
 
 //see fdo#41556 and fdo#47636
@@ -229,8 +229,8 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( 
FontSelectPattern rFont
 if( rFontSelData.IsSymbolFont() )
 return false;
 // StarSymbol is a unicode font, but it still deserves the symbol flag
-if(rFontSelData.maSearchName.startsWith( starsymbol )
-|| rFontSelData.maSearchName.startsWith( opensymbol ) )
+if(rFontSelData.maSearchName.startsWithIgnoreAsciiCase( starsymbol )
+|| rFontSelData.maSearchName.startsWithIgnoreAsciiCase( opensymbol ) )
 return false;
 
 const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, 
rMissingCodes );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6744597..87dfec7 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -695,8 +695,8 @@ PhysicalFontFace::PhysicalFontFace( const 
ImplDevFontAttributes rDFA, int nMagi
 {
 // StarSymbol is a unicode font, but it still deserves the symbol flag
 if( !IsSymbolFont() )
-if( GetFamilyName().startsWith( starsymbol)
-||  GetFamilyName().startsWith( opensymbol) )
+if( GetFamilyName().startsWithIgnoreAsciiCase( starsymbol )
+||  GetFamilyName().startsWithIgnoreAsciiCase( opensymbol ) )
 SetSymbolFlag( true );
 }
 
commit 79e5615fa103a52ce41ed682b624c13fd9a9d1eb
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sun May 19 17:49:37 2013 +0200

fix OUString conversion

Both were EqualsIgnoreCaseAscii before.

Fixes 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 and
754fee5d1b6adcc04b58a834c84568585afd728a.

Thanks to Julien pointing this out :)

Change-Id: I1a1983b642ca5b49a76f4e238a9eeb78e8234e9e

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 6a0bbc2..6744597 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -755,11 +755,11 @@ bool PhysicalFontFace::IsBetterMatch( const 
FontSelectPattern rFSD, FontMatchSt
 int nMatch = 0;
 
 const OUString rFontName = rFSD.maTargetName;
-if( rFontName == GetFamilyName() )
+if( rFontName == GetFamilyName() || rFontName.equalsIgnoreAsciiCase( 
GetFamilyName() ) )
 nMatch += 24;
 
 if( rStatus.mpTargetStyleName
-  GetStyleName() == rStatus.mpTargetStyleName )
+  GetStyleName().equalsIgnoreAsciiCase( rStatus.mpTargetStyleName ) )
 nMatch += 12;
 
 if( (rFSD.GetPitch() != PITCH_DONTKNOW)  (rFSD.GetPitch() == GetPitch()) 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 46/43c17c129612512b49328c1046c2b5ae148a4c

2013-05-19 Thread Caolán McNamara
 46/43c17c129612512b49328c1046c2b5ae148a4c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0845f18041db71d2f954a31941a8190c020bdce6
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 17:14:57 2013 +0100

Notes added by 'git notes add'

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


Font family case-sensitiveness

2013-05-19 Thread Thomas Arnhold

Hi,

A quick grep on the source reveals that there case-sensitive and 
case-insensitive comparisons for the font family name. This looks pretty 
suspicious.


git grep -i \starsymbol\ -- *.cxx

Should we always check case-insensitive or convert all lower-case ones 
to StarSymbol (most/all? definitions of this string are mixed case).


The same holds for opensymbol. Maybe more...

And maybe there is more work with GetFamilyName()..., see 
79e5615fa103a52ce41ed682b624c13fd9a9d1eb.


Ideas?

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


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5

2013-05-19 Thread Xisco Fauli
 5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 322a99ae9c3ea0ef00085d89772f19d829e16f43
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun May 19 18:53:32 2013 +0200

Notes added by 'git notes add'

diff --git a/5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5 
b/5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5
new file mode 100644
index 000..dc6b334
--- /dev/null
+++ b/5c/413ad6d8c2b2e16c19ff007e5315b383b73eb5
@@ -0,0 +1 @@
+merged as: b4d1fd3cca027ceecc1230e35c15b5363a591906
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 34/73dbf606f525d95b898a08072259018eb4056f

2013-05-19 Thread Xisco Fauli
 34/73dbf606f525d95b898a08072259018eb4056f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 04512f92f5ea1a41eebda7ac0a4e33410a0cc111
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun May 19 18:55:06 2013 +0200

Notes added by 'git notes add'

diff --git a/34/73dbf606f525d95b898a08072259018eb4056f 
b/34/73dbf606f525d95b898a08072259018eb4056f
new file mode 100644
index 000..32de729
--- /dev/null
+++ b/34/73dbf606f525d95b898a08072259018eb4056f
@@ -0,0 +1 @@
+merged as: e820522037ff95818b9a40dfd77671f84c714cd5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 49/04b17b657750e565e30d56810da513057fba39

2013-05-19 Thread Xisco Fauli
 49/04b17b657750e565e30d56810da513057fba39 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cb417f23f20ee53468cf47432360504acefa972b
Author: Xisco Fauli aniste...@gmail.com
Date:   Sun May 19 18:56:49 2013 +0200

Notes added by 'git notes add'

diff --git a/49/04b17b657750e565e30d56810da513057fba39 
b/49/04b17b657750e565e30d56810da513057fba39
new file mode 100644
index 000..39eba5d
--- /dev/null
+++ b/49/04b17b657750e565e30d56810da513057fba39
@@ -0,0 +1 @@
+merged as: 73d23a54b8b930520788c891ddb12562198e94e8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/sidebaroptr' - sd/source

2013-05-19 Thread Jan Holesovsky
 sd/source/ui/animations/CustomAnimationPane.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8325c88428dc199ddd6b58b6b8c938e5925e1385
Author: Jan Holesovsky ke...@suse.cz
Date:   Sun May 19 15:39:17 2013 +0200

Seperator - Separator to fix build.

Change-Id: Id86c0e6132f6f11bd6f9cb3d84746f750b8bccf4

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index e8392ee..9578918 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1092,10 +1092,10 @@ void CustomAnimationPane::UpdateLook (void)
 mpFTSpeed-SetBackground(aBackground);
 if (mpFTChangeOrder != NULL)
 mpFTChangeOrder-SetBackground(aBackground);
-if (mpFLSeperator1 != NULL)
-mpFLSeperator1-SetBackground(aBackground);
-if (mpFLSeperator2 != NULL)
-mpFLSeperator2-SetBackground(aBackground);
+if (mpFLSeparator1 != NULL)
+mpFLSeparator1-SetBackground(aBackground);
+if (mpFLSeparator2 != NULL)
+mpFLSeparator2-SetBackground(aBackground);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[ABANDONED] Use clock_gettime when available on *nix

2013-05-19 Thread Arnaud Versini (via Code Review)
Arnaud Versini has abandoned this change.

Change subject: Use clock_gettime when available on *nix
..


Patch Set 2: Abandoned

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I65df2b119dbda274749ab2b4d0825fbdf44eb4e8
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - readlicense_oo/docs

2013-05-19 Thread Andrea Pescetti
 readlicense_oo/docs/readme/readme.xrm |   39 --
 1 file changed, 14 insertions(+), 25 deletions(-)

New commits:
commit 3fd31812d4ce3e50566da1aa9ac6813fcfc87b9d
Author: Andrea Pescetti pesce...@apache.org
Date:   Sun May 19 16:13:12 2013 +

Update the English README file as per i#122300, proofreading still needed.

diff --git a/readlicense_oo/docs/readme/readme.xrm 
b/readlicense_oo/docs/readme/readme.xrm
index 0ce60b7..4616b793 100644
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -39,13 +39,13 @@
h1 id=Welcome xml:lang=en-US${PRODUCTNAME} 
${PRODUCTVERSION} ReadMe/h1
p id=LatestUpdates xml:lang=en-USFor latest 
updates to this readme file, see a 
href=http://www.openoffice.org/welcome/readme.html;http://www.openoffice.org/welcome/readme.html/a/p
p id=A6 xml:lang=en-USThis file contains 
important information about this program. Please read this information very 
carefully before starting work./p
-   p id=A7 xml:lang=en-USThe Apache OpenOffice 
Community, responsible for the development of this product, would like to 
invite you to participate as a community member. As a new user, you can check 
out the ${PRODUCTNAME} site with helpful user information at a 
href=http://www.openoffice.org/about_us/introduction.html;http://www.openoffice.org/about_us/introduction.html/a/p
+   p id=A7 xml:lang=en-USThe Apache OpenOffice 
Community, responsible for the development of this product, would like to 
invite you to participate as a community member. As a new user, you can check 
out the ${PRODUCTNAME} community site with helpful information at a 
href=http://openoffice.apache.org;http://openoffice.apache.org/a/p
p id=A9 xml:lang=en-USAlso read the sections 
below about getting involved in the Apache OpenOffice project./p
h3 id=A10 xml:lang=en-USIs ${PRODUCTNAME} really 
free for any user? /h3
p id=A11 xml:lang=en-US${PRODUCTNAME} is free for 
use by everybody. You may take this copy of ${PRODUCTNAME} and install it on as 
many computers as you like, and use it for any purpose you like (including 
commercial, government, public administration and educational use). For further 
details see the license text delivered together with ${PRODUCTNAME} or a 
href=http://www.openoffice.org/license.html;http://www.openoffice.org/license.html/a/p
h3 id=A12 xml:lang=en-USWhy is ${PRODUCTNAME} 
free for any user?/h3
p id=A13 xml:lang=en-USYou can use this copy of 
${PRODUCTNAME} today free of charge because individual contributors and 
corporate sponsors have designed, developed, tested, translated, documented, 
supported, marketed, and helped in many other ways to make ${PRODUCTNAME} what 
it is today - the world's leading open-source office software./p
-   p id=A13b xml:lang=en-USIf you appreciate their 
efforts, and would like to ensure Apache OpenOffice continues into the future, 
please consider contributing to the project - see a 
href=http://contributing.openoffice.org;http://contributing.openoffice.org/a
 for details. Everyone has a contribution to make./p
+   p id=A13b xml:lang=en-USIf you appreciate their 
efforts, and would like to ensure Apache OpenOffice continues into the future, 
please consider contributing to the project - see a 
href=http://openoffice.apache.org/get-involved.html;http://openoffice.apache.org/get-involved.html/a
 for details on contributing time and a 
href=http://www.apache.org/foundation/contributing.html;http://www.apache.org/foundation/contributing.html/a
 for details on donations. Everyone has a contribution to make./p
/div
 
div id=Installation
@@ -78,11 +78,11 @@
div class=WIN id=SystemRequirements_WIN
ul
li
-   p id=s2s3sdf2 
xml:lang=en-USMicrosoft Windows 2000 (Service Pack 4 or higher), XP, Vista, 
or Windows 7/p
+   p id=s2s3sdf2 
xml:lang=en-USMicrosoft Windows XP, Vista, Windows 7 or Windows 8/p
/li
 
li
-   p id=utzu6 
xml:lang=en-USPentium compatible PC (Pentium III or Athlon recommended)/p
+   p id=utzu6 
xml:lang=en-USPentium III or later processor/p
/li
 
li
@@ -108,7 +108,7 @@
p id=MSOReg3 
xml:lang=en-UStt/msoreg=0/tt will suppress registration of 
${PRODUCTNAME} as default application for Microsoft Office formats./p
 

[Libreoffice-commits] core.git: 4 commits - basegfx/source editeng/source filter/source sd/qa svx/source

2013-05-19 Thread Armin Le Grand
 basegfx/source/tools/gradienttools.cxx |9 +--
 editeng/source/editeng/impedit.cxx |   88 +
 filter/source/msfilter/svdfppt.cxx |8 ++-
 sd/qa/unit/data/xml/fdo64586_0.xml |8 +--
 sd/qa/unit/data/xml/n758621_0.xml  |8 +--
 sd/qa/unit/data/xml/n758621_1.xml  |8 +--
 svx/source/svdraw/svdedxv.cxx  |1 
 svx/source/svdraw/svdotext.cxx |   11 
 svx/source/svdraw/svdotxed.cxx |   30 ++-
 9 files changed, 98 insertions(+), 73 deletions(-)

New commits:
commit b9bea009ac27ffe822b43911a5c7a30d36c43c50
Author: Armin Le Grand a...@apache.org
Date:   Mon Oct 8 15:13:37 2012 +

Related: #119885# Made EditMode work with text boxes...

where text is reaching over the TextBox's bounds

(cherry picked from commit fbbef010986ea359b5209e6d3884bdf4e4ac86a6)

Conflicts:
editeng/source/editeng/impedit.cxx

Change-Id: I00020a33faf86c8671259e71179932cddf54cfe1

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index bbdaca3..c0d98e9 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -44,7 +44,6 @@
 #include sot/exchange.hxx
 #include sot/formats.hxx
 
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::linguistic2;
@@ -433,65 +432,52 @@ void ImpEditView::SetOutputArea( const Rectangle rRect )
 
 void ImpEditView::ResetOutputArea( const Rectangle rRect )
 {
-Rectangle aCurArea( aOutArea );
-SetOutputArea( rRect );
-// Invalidate surrounding areas if in update mode of the engine on sal_True
-if ( !aCurArea.IsEmpty()  pEditEngine-pImpEditEngine-GetUpdateMode() )
+// remember old out area
+const Rectangle aOldArea(aOutArea);
+
+// apply new one
+SetOutputArea(rRect);
+
+// invalidate surrounding areas if update is true
+if(!aOldArea.IsEmpty()  pEditEngine-pImpEditEngine-GetUpdateMode())
 {
-long nMore = 0;
-if ( DoInvalidateMore() )
-nMore = GetWindow()-PixelToLogic( Size( nInvMore, 0 ) ).Width();
-if ( aCurArea.Left()  aOutArea.Left() )
+// #i119885# use grown area if needed; do when getting bigger OR 
smaller
+const sal_Int32 nMore(DoInvalidateMore() ? 
GetWindow()-PixelToLogic(Size(nInvMore, 0)).Width() : 0);
+
+if(aOldArea.Left()  aOutArea.Left())
 {
-Rectangle aRect( aCurArea.TopLeft(),
-Size( aOutArea.Left()-aCurArea.Left(), aCurArea.GetHeight() ) 
);
-if ( nMore )
-{
-aRect.Left() -= nMore;
-aRect.Top() -= nMore;
-aRect.Bottom() += nMore;
-}
-GetWindow()-Invalidate( aRect );
+GetWindow()-Invalidate(Rectangle(aOutArea.Left() - nMore, 
aOldArea.Top() - nMore, aOldArea.Left(), aOldArea.Bottom() + nMore));
 }
-if ( aCurArea.Right()  aOutArea.Right() )
+else if(aOldArea.Left()  aOutArea.Left())
 {
-long nW = aCurArea.Right() - aOutArea.Right();
-Point aPos( aCurArea.TopRight() );
-aPos.X() -= nW;
-Rectangle aRect( aPos, Size( nW, aCurArea.GetHeight() ) );
-if ( nMore )
-{
-aRect.Right() += nMore;
-aRect.Top() -= nMore;
-aRect.Bottom() += nMore;
-}
-GetWindow()-Invalidate( aRect );
+GetWindow()-Invalidate(Rectangle(aOldArea.Left() - nMore, 
aOldArea.Top() - nMore, aOutArea.Left(), aOldArea.Bottom() + nMore));
 }
-if ( aCurArea.Top()  aOutArea.Top() )
+
+if(aOldArea.Right()  aOutArea.Right())
 {
-Rectangle aRect( aCurArea.TopLeft(), Size( aCurArea.GetWidth(), 
aOutArea.Top() - aCurArea.Top() ) );
-if ( nMore )
-{
-aRect.Top() -= nMore;
-aRect.Left() -= nMore;
-aRect.Right() += nMore;
-}
-GetWindow()-Invalidate( aRect );
+GetWindow()-Invalidate(Rectangle(aOutArea.Right(), aOldArea.Top() 
- nMore, aOldArea.Right() + nMore, aOldArea.Bottom() + nMore));
 }
-if ( aCurArea.Bottom()  aOutArea.Bottom() )
+else if(aOldArea.Right()  aOutArea.Right())
 {
-long nH = aCurArea.Bottom() - aOutArea.Bottom();
-Point aPos( aCurArea.BottomLeft() );
-aPos.Y() -= nH;
-Rectangle aRect( aPos, Size( aCurArea.GetWidth(), nH ) );
-if ( nMore )
-{
-aRect.Bottom() += nMore;
-aRect.Left() -= nMore;
-aRect.Right() += nMore;
-}
+GetWindow()-Invalidate(Rectangle(aOldArea.Right(), aOldArea.Top() 
- nMore, aOutArea.Right() + nMore, aOldArea.Bottom() + nMore));
+}
 
-GetWindow()-Invalidate( aRect );
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 88/7c740e39ec1d00366228aae49ef62087a6feb2 fb/bef010986ea359b5209e6d3884bdf4e4ac86a6

2013-05-19 Thread Caolán McNamara
 88/7c740e39ec1d00366228aae49ef62087a6feb2 |1 +
 fb/bef010986ea359b5209e6d3884bdf4e4ac86a6 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6f61cc01f20bd10ce57a935a79d08b97e8aee496
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:08:13 2013 +0100

Notes added by 'git notes add'

diff --git a/88/7c740e39ec1d00366228aae49ef62087a6feb2 
b/88/7c740e39ec1d00366228aae49ef62087a6feb2
new file mode 100644
index 000..7351228
--- /dev/null
+++ b/88/7c740e39ec1d00366228aae49ef62087a6feb2
@@ -0,0 +1 @@
+merged as: acccf7a13fd0f87e5aecdc7d5412726a76dba275
commit 9fe7fc7c5256875a4aecaad3ca085513ffe4af3d
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:07:58 2013 +0100

Notes added by 'git notes add'

diff --git a/fb/bef010986ea359b5209e6d3884bdf4e4ac86a6 
b/fb/bef010986ea359b5209e6d3884bdf4e4ac86a6
new file mode 100644
index 000..7116a15
--- /dev/null
+++ b/fb/bef010986ea359b5209e6d3884bdf4e4ac86a6
@@ -0,0 +1 @@
+merged as: b9bea009ac27ffe822b43911a5c7a30d36c43c50
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 2e/1700bf4f7cf913c23d35f325a50d3aa25426cc d3/3d09be15d01ae74a9b895e6c17cba63f1f84ed

2013-05-19 Thread Caolán McNamara
 2e/1700bf4f7cf913c23d35f325a50d3aa25426cc |1 +
 d3/3d09be15d01ae74a9b895e6c17cba63f1f84ed |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 7efac936a46d77c053e020da20d8c4f5db44ca3d
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:08:42 2013 +0100

Notes added by 'git notes add'

diff --git a/2e/1700bf4f7cf913c23d35f325a50d3aa25426cc 
b/2e/1700bf4f7cf913c23d35f325a50d3aa25426cc
new file mode 100644
index 000..fed4552
--- /dev/null
+++ b/2e/1700bf4f7cf913c23d35f325a50d3aa25426cc
@@ -0,0 +1 @@
+merged as: d3dde5d940d69d6b859fef3ff722e349d7d89c54
commit dc147f6c8ea0d43a984bc77cbdd1e71c0bcb931e
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:08:27 2013 +0100

Notes added by 'git notes add'

diff --git a/d3/3d09be15d01ae74a9b895e6c17cba63f1f84ed 
b/d3/3d09be15d01ae74a9b895e6c17cba63f1f84ed
new file mode 100644
index 000..018f50d
--- /dev/null
+++ b/d3/3d09be15d01ae74a9b895e6c17cba63f1f84ed
@@ -0,0 +1 @@
+merged as: 38d02291f32d0f605a4046a96fd6c90abd935f6b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 12/a5ff4149599b88991445299e8934c8066dceb0

2013-05-19 Thread Caolán McNamara
 12/a5ff4149599b88991445299e8934c8066dceb0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b8b32c97bb2869609a84edf8f8667b3d52ee8128
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:16:10 2013 +0100

Notes added by 'git notes add'

diff --git a/12/a5ff4149599b88991445299e8934c8066dceb0 
b/12/a5ff4149599b88991445299e8934c8066dceb0
new file mode 100644
index 000..9b1e6a2
--- /dev/null
+++ b/12/a5ff4149599b88991445299e8934c8066dceb0
@@ -0,0 +1 @@
+prefer: 8d691a2d94d2b2be3ad3fc0a44d2abc387d7b6c2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7a/45b16be0c9442be4dbc7851c0b74b45e384536

2013-05-19 Thread Caolán McNamara
 7a/45b16be0c9442be4dbc7851c0b74b45e384536 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e7cb279a914e638cb4c1db8209cb5b18f978d94a
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:16:24 2013 +0100

Notes added by 'git notes add'

diff --git a/7a/45b16be0c9442be4dbc7851c0b74b45e384536 
b/7a/45b16be0c9442be4dbc7851c0b74b45e384536
new file mode 100644
index 000..9b1e6a2
--- /dev/null
+++ b/7a/45b16be0c9442be4dbc7851c0b74b45e384536
@@ -0,0 +1 @@
+prefer: 8d691a2d94d2b2be3ad3fc0a44d2abc387d7b6c2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 38/0ad1c63d7e2eaa9a189ec10f803c24ec0e2fc9

2013-05-19 Thread Caolán McNamara
 38/0ad1c63d7e2eaa9a189ec10f803c24ec0e2fc9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 759ed68f8fbb5d50fde44a455d21a81a65aa4c88
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:20:16 2013 +0100

Notes added by 'git notes add'

diff --git a/38/0ad1c63d7e2eaa9a189ec10f803c24ec0e2fc9 
b/38/0ad1c63d7e2eaa9a189ec10f803c24ec0e2fc9
new file mode 100644
index 000..a7b884b
--- /dev/null
+++ b/38/0ad1c63d7e2eaa9a189ec10f803c24ec0e2fc9
@@ -0,0 +1 @@
+prefer: 0c79562bde6645fb955ce0d79744ac306dcb82a4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c4/0a9701b458ce28bde6f8338e144dffa71c50d9

2013-05-19 Thread Caolán McNamara
 c4/0a9701b458ce28bde6f8338e144dffa71c50d9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 81764a45d620465fc239586db3ac5e2774e80627
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:22:32 2013 +0100

Notes added by 'git notes add'

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


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

2013-05-19 Thread Julien Nabet
 filter/source/msfilter/svdfppt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96a7c619659ec153a8a9ad319c02c7182224801f
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun May 19 21:24:45 2013 +0200

typo

Change-Id: Ia0d96771a6ae97922b3ceedc1529829eb85d1fa2

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index f69d0dc..c82dbfd 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1053,7 +1053,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream rSt, 
DffObjData rObjData, voi
 bAutoGrowWidth = sal_False;
 
 // #119885# re-activationg bFitShapeToText here, could 
not find deeper explanations
-// for it (it was from 2005). Keeping the old commeht 
here for reference
+// for it (it was from 2005). Keeping the old comment 
here for reference
 // old comment: // bFitShapeToText; can't be used, 
because we cut the text if it is too height,
 bAutoGrowHeight = bFitShapeToText;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-05-19 Thread Armin Le Grand
 svx/source/xoutdev/_xoutbmp.cxx |   77 
 1 file changed, 54 insertions(+), 23 deletions(-)

New commits:
commit c0b8dd85d4b49e8800e69e614c567ce272ac9780
Author: Armin Le Grand a...@apache.org
Date:   Thu Sep 27 15:31:38 2012 +

Resolves: #i121128# added missing original data export for SVG...

in XOutBitmap::WriteGraphic

(cherry picked from commit 04f10de02296b9bff1e022daabf0b8ff59234e38)

Conflicts:
svx/source/xoutdev/_xoutbmp.cxx

Change-Id: I774557451c924d6e5b2beb22a83de0ce95a429f1

diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 62a6137..33e36ee 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -141,40 +141,71 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic 
rGraphic, String rFileName,
 aURL.setBase( aName );
 }
 
-if( ( nFlags  XOUTBMP_USE_NATIVE_IF_POSSIBLE ) 
-!( nFlags  XOUTBMP_MIRROR_HORZ ) 
-!( nFlags  XOUTBMP_MIRROR_VERT ) 
-( rGraphic.GetType() != GRAPHIC_GDIMETAFILE )  rGraphic.IsLink() 
)
+// #i121128# use shortcut to write SVG data in original form (if 
possible)
+const SvgDataPtr aSvgDataPtr(rGraphic.getSvgData());
+
+if(aSvgDataPtr.get()
+ aSvgDataPtr-getSvgDataArrayLength()
+ rFilterName.EqualsIgnoreCaseAscii(svg))
 {
-// try to write native link
-const GfxLink aGfxLink( ( (Graphic) rGraphic ).GetLink() );
+if(!(nFlags  XOUTBMP_DONT_ADD_EXTENSION))
+{
+aURL.setExtension(rFilterName);
+}
 
-switch( aGfxLink.GetType() )
+rFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
+SfxMedium aMedium(aURL.GetMainURL(INetURLObject::NO_DECODE), 
STREAM_WRITE|STREAM_SHARE_DENYNONE|STREAM_TRUNC);
+SvStream* pOStm = aMedium.GetOutStream();
+
+if(pOStm)
 {
-case( GFX_LINK_TYPE_NATIVE_GIF ): aExt = FORMAT_GIF; break;
-case( GFX_LINK_TYPE_NATIVE_JPG ): aExt = FORMAT_JPG; break;
-case( GFX_LINK_TYPE_NATIVE_PNG ): aExt = FORMAT_PNG; break;
+pOStm-Write(aSvgDataPtr-getSvgDataArray().get(), 
aSvgDataPtr-getSvgDataArrayLength());
+aMedium.Commit();
 
-default:
-break;
+if(!aMedium.GetError())
+{
+nErr = GRFILTER_OK;
+}
 }
+}
 
-if( aExt.Len() )
+if( GRFILTER_OK != nErr )
+{
+if( ( nFlags  XOUTBMP_USE_NATIVE_IF_POSSIBLE ) 
+!( nFlags  XOUTBMP_MIRROR_HORZ ) 
+!( nFlags  XOUTBMP_MIRROR_VERT ) 
+( rGraphic.GetType() != GRAPHIC_GDIMETAFILE )  
rGraphic.IsLink() )
 {
-if( 0 == (nFlags  XOUTBMP_DONT_ADD_EXTENSION))
-aURL.setExtension( aExt );
-rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
+// try to write native link
+const GfxLink aGfxLink( ( (Graphic) rGraphic ).GetLink() );
 
-SfxMedium   aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE 
), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC );
-SvStream*   pOStm = aMedium.GetOutStream();
+switch( aGfxLink.GetType() )
+{
+case( GFX_LINK_TYPE_NATIVE_GIF ): aExt = FORMAT_GIF; break;
+case( GFX_LINK_TYPE_NATIVE_JPG ): aExt = FORMAT_JPG; break;
+case( GFX_LINK_TYPE_NATIVE_PNG ): aExt = FORMAT_PNG; break;
 
-if( pOStm  aGfxLink.GetDataSize()  aGfxLink.GetData() )
+default:
+break;
+}
+
+if( aExt.Len() )
 {
-pOStm-Write( aGfxLink.GetData(), aGfxLink.GetDataSize() );
-aMedium.Commit();
+if( 0 == (nFlags  XOUTBMP_DONT_ADD_EXTENSION))
+aURL.setExtension( aExt );
+rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
 
-if( !aMedium.GetError() )
-nErr = GRFILTER_OK;
+SfxMedium   
aMedium(aURL.GetMainURL(INetURLObject::NO_DECODE), STREAM_WRITE | 
STREAM_SHARE_DENYNONE | STREAM_TRUNC);
+SvStream*   pOStm = aMedium.GetOutStream();
+
+if( pOStm  aGfxLink.GetDataSize()  aGfxLink.GetData() )
+{
+pOStm-Write( aGfxLink.GetData(), 
aGfxLink.GetDataSize() );
+aMedium.Commit();
+
+if( !aMedium.GetError() )
+nErr = GRFILTER_OK;
+}
 }
 }
 }

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 04/f10de02296b9bff1e022daabf0b8ff59234e38

2013-05-19 Thread Caolán McNamara
 04/f10de02296b9bff1e022daabf0b8ff59234e38 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c1f8801cc93f4b859fb6c3e4f0af4c49e5d1fbe9
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:34:55 2013 +0100

Notes added by 'git notes add'

diff --git a/04/f10de02296b9bff1e022daabf0b8ff59234e38 
b/04/f10de02296b9bff1e022daabf0b8ff59234e38
new file mode 100644
index 000..83126a5
--- /dev/null
+++ b/04/f10de02296b9bff1e022daabf0b8ff59234e38
@@ -0,0 +1 @@
+merged as: c0b8dd85d4b49e8800e69e614c567ce272ac9780
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3f/d31812d4ce3e50566da1aa9ac6813fcfc87b9d

2013-05-19 Thread Caolán McNamara
 3f/d31812d4ce3e50566da1aa9ac6813fcfc87b9d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4d6e2d5d13b774a780d1c5a61ba88e51cf232ff4
Author: Caolán McNamara caol...@redhat.com
Date:   Sun May 19 20:36:50 2013 +0100

Notes added by 'git notes add'

diff --git a/3f/d31812d4ce3e50566da1aa9ac6813fcfc87b9d 
b/3f/d31812d4ce3e50566da1aa9ac6813fcfc87b9d
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/3f/d31812d4ce3e50566da1aa9ac6813fcfc87b9d
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Add logging to libreoffice

2013-05-19 Thread Slimane OULAD NAOUI
hi, everybody,
i am a new linux and libreoffice user. I want to add extension to
libreoffice to allow logging ( save trace of whole actions performed on a
session in a document).
i have the idea to exploit the UndoManager to save trace on undo and Redo
of actions.
But i don't know by what start.
any ideas are welcome.
Thanks in advance.


-- 
Slimane OULAD NAOUI, MA, Université de Ghardaia, Route de l'Aéroport.
Mobile : (+213)(0)558627002
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: Branch 'aoo/trunk' - readlicense_oo/docs

2013-05-19 Thread Andrea Pescetti
 readlicense_oo/docs/readme/readme.xrm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4fb092c42ced76bf8b9bc427b5e6216dcb96b2d5
Author: Andrea Pescetti pesce...@apache.org
Date:   Sun May 19 18:58:24 2013 +

Further fixes to the README file (i#122300), including using 'projects' 
correctly.

Patch-By: jza

diff --git a/readlicense_oo/docs/readme/readme.xrm 
b/readlicense_oo/docs/readme/readme.xrm
index 4616b793..2757068 100644
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -275,7 +275,7 @@
h3 id=howtostart xml:lang=en-USHow to Start/h3
p id=howtostart1 xml:lang=en-USThe best way to 
start contributing is to subscribe to one or more of the mailing lists, lurk 
for a while, and gradually use the mail archives to familiarize yourself with 
many of the topics covered since the ${PRODUCTNAME} source code was released 
back in October 2000. When you're comfortable, all you need to do is send an 
email self-introduction and jump right in./p
h3 id=subscribe xml:lang=en-USSubscribe/h3
-   p id=subscribe1 xml:lang=en-USHere are a few of 
the Project mailing lists to which you can subscribe at a 
href=http://openoffice.apache.org/mailing-lists.html;http://openoffice.apache.org/mailing-lists.html/a/p
+   p id=subscribe1 xml:lang=en-USHere are a few of 
the ${PRODUCTNAME} mailing lists to which you can subscribe at a 
href=http://openoffice.apache.org/mailing-lists.html;http://openoffice.apache.org/mailing-lists.html/a/p
ul
li
p id=subscribelist1 
xml:lang=en-USNews: annou...@openoffice.apache.org *recommended to all 
users* (light traffic)/p
@@ -291,7 +291,7 @@
/ul
h3 xml:lang=en-USJoining the Project/h3
p id=joining xml:lang=en-USYou can make major 
contributions to this important open source project even if you have limited 
software design or coding experience. Yes, you!/p
-   p id=joining1 url=ahead xml:lang=en-USAt a 
href=http://openoffice.apache.org/get-involved.html;http://openoffice.apache.org/get-involved.html/a
 you will find a first overview where you can start with, ranging from 
Localization, QA, user support to some real core coding projects. If you are 
not a developer, try the Documentation or the Marketing Project. The Apache 
OpenOffice Marketing Project is applying both guerilla and traditional 
commercial techniques to marketing open source software, and we are doing it 
across language and cultural barriers, so you can help just by spreading the 
word and telling a friend about this office suite./p
+   p id=joining1 url=ahead xml:lang=en-USAt a 
href=http://openoffice.apache.org/get-involved.html;http://openoffice.apache.org/get-involved.html/a
 you will find a first overview where you can start with, ranging from 
Localization, QA, user support to some real core coding projects. If you are 
not a developer, you can help with Documentation or Marketing, for example. The 
${PRODUCTNAME} marketing is applying both guerrilla and traditional commercial 
techniques to marketing open source software, and we are doing it across 
language and cultural barriers, so you can help just by spreading the word and 
telling a friend about this office suite./p
p id=joining3 xml:lang=en-USYou can help by 
joining the marketing mailing list market...@openoffice.apache.org where you 
can provide point communication contact with press, media, government agencies, 
consultants, schools, Linux Users Groups and developers in your country and 
local community./p
/div
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fdo#39468 Comment translation GER-ENG

2013-05-19 Thread Matthias Freund (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3965

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/3965/1

fdo#39468 Comment translation GER-ENG

modified:   sw/source/ui/vba/vbafield.cxx
modified:   sw/source/ui/wrtsh/wrtsh1.cxx

Change-Id: I503a12e22d03b2b57a818701cdfbe4ecc94d89a1
---
M sw/source/ui/vba/vbafield.cxx
M sw/source/ui/wrtsh/wrtsh1.cxx
2 files changed, 28 insertions(+), 33 deletions(-)



diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index df729ad..02fce66 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -32,8 +32,6 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-// *** SwVbaField ***
-
 SwVbaField::SwVbaField(  const uno::Reference ooo::vba::XHelperInterface  
rParent, const uno::Reference uno::XComponentContext  rContext, const 
css::uno::Reference css::text::XTextDocument  rDocument, const  
uno::Reference css::text::XTextField  xTextField) throw ( 
uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ), mxTextDocument( 
rDocument )
 {
 mxTextField.set( xTextField, uno::UNO_QUERY_THROW );
@@ -69,7 +67,7 @@
 return aServiceNames;
 }
 
-// *** SwVbaReadFieldParams ***
+// SwVbaReadFieldParams
 // the codes are copied from ww8par5.cxx
 class SwVbaReadFieldParams
 {
@@ -90,15 +88,15 @@
 String GetFieldName()const { return aFieldName; }
 };
 
-
 SwVbaReadFieldParams::SwVbaReadFieldParams( const String _rData )
 : aData( _rData ), nLen( _rData.Len() ), nNext( 0 )
 {
-/*
+// First search for an opening parenthesis or a space or a quotation mark
+// or a backslash, so that the field command
+// (thus INCLUDEPICTURE or INSERTGRAPHIC or ...) is ignored.
 erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem
 Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl
 (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird
-*/
 while( (nLen  nNext)  (aData.GetChar( nNext ) == ' ') )
 ++nNext;
 
@@ -116,7 +114,6 @@
 aFieldName = aData.Copy( 0, nFnd );
 }
 
-
 SwVbaReadFieldParams::~SwVbaReadFieldParams()
 {
 }
@@ -129,11 +126,10 @@
 : aData.Copy( nFnd, (nSavPtr - nFnd) );
 }
 
-
 // ret: -2: NOT a '\' parameter but normal Text
 long SwVbaReadFieldParams::SkipToNextToken()
 {
-long nRet = -1; // Ende
+long nRet = -1; // end
 if (
  (STRING_NOTFOUND != nNext)  (nLen  nNext) 
  STRING_NOTFOUND != (nFnd = FindNextStringPiece(nNext))
@@ -144,7 +140,7 @@
 if ('\\' == aData.GetChar(nFnd)  '\\' != aData.GetChar(nFnd + 1))
 {
 nRet = aData.GetChar(++nFnd);
-nNext = ++nFnd; // und dahinter setzen
+nNext = ++nFnd; // and set behind
 }
 else
 {
@@ -164,21 +160,20 @@
 return nRet;
 }
 
-// FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette
-// bis zum Blank oder naechsten \ oder zum schliessenden Anfuehrungszeichen
-// oder zum String-Ende von pStr.
+// FindNextPara is searching for the next Backslash-Parameter or the next 
string
+// until blank or the next \ or until the closing quotation mark
+// or until the string end of pStr.
 //
-// Ausgabe ppNext (falls ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
+// Output ppNext (if ppNext != 0) beginning of the search for the next 
parameter or 0
 //
-// Returnwert: 0 falls String-Ende erreicht,
-// ansonsten Anfang des Paramters bzw. der Zeichenkette
-//
+// Return value: 0 if String-End reached, otherwise begin of the paramater or 
the string
+
 xub_StrLen SwVbaReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
 {
-xub_StrLen  n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart;  // Anfang
-xub_StrLen n2;  // Ende
+xub_StrLen  n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart;  // Start
+xub_StrLen n2;  // End
 
-nNext = STRING_NOTFOUND;// Default fuer nicht gefunden
+nNext = STRING_NOTFOUND;// Default for not found
 
 while( (nLen  n)  (aData.GetChar( n ) == ' ') )
 ++n;
@@ -186,36 +181,36 @@
 if( nLen == n )
 return STRING_NOTFOUND; // String End reached!
 
-if( (aData.GetChar( n ) == '') // Anfuehrungszeichen vor Para?
+if( (aData.GetChar( n ) == '') // quotation marks are in front of 
paranthesis?
 ||  (aData.GetChar( n ) == 0x201c)
 ||  (aData.GetChar( n ) == 132) )
 {
-n++;// Anfuehrungszeichen ueberlesen
-n2 = n; // ab hier nach Ende suchen
+n++;// ignore quotation marks
+n2 = n; // From here search for the end
 while( 

[PATCH] valgrind support is useful independent from DBGUTIL support.

2013-05-19 Thread Mark Wielaard (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3966

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/3966/1

valgrind support is useful independent from DBGUTIL support.

Especially when valgrinding an optimized libreoffice build.

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



diff --git a/configure.ac b/configure.ac
index 7174b9c..a1e4723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5223,7 +5223,7 @@
 dnl ===
 dnl Check if valgrind headers are available
 dnl ===
-if test $cross_compiling = yes -o $ENABLE_DBGUTIL != TRUE; then
+if test $cross_compiling = yes; then
 ENABLE_VALGRIND=FALSE
 else
 prev_cppflags=$CPPFLAGS

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d2ac5476ba8561ce6afbf8c9472550fbe959c76
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

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


[Libreoffice-commits] core.git: officecfg/registry starmath/inc starmath/Library_sm.mk starmath/sdi starmath/source starmath/uiconfig

2013-05-19 Thread Tomaž Vajngerl
 officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu |5 
 starmath/Library_sm.mk|1 
 starmath/inc/ElementsDockingWindow.hxx|  142 ++
 starmath/inc/starmath.hrc |   48 
 starmath/sdi/smath.sdi|   52 
 starmath/sdi/smslots.sdi  |   11 
 starmath/source/ElementsDockingWindow.cxx |  530 
++
 starmath/source/commands.src  |   42 
 starmath/source/document.cxx  |4 
 starmath/source/smdll.cxx |3 
 starmath/source/smres.src |   57 -
 starmath/source/view.cxx  |   78 +
 starmath/uiconfig/smath/menubar/menubar.xml   |1 
 13 files changed, 935 insertions(+), 39 deletions(-)

New commits:
commit 2d3baccf0249f8c68dcf8f9b453d0bc82d8f
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Mon May 20 00:13:10 2013 +0200

Math: new rendered Elements docking window added

Added a docking window with elements that are rendered using the
math renderer insted of static pictures. Currently this is an
alternative to the existing elements floating window which will
be removed when the new one is ready. This is an initial but
fully functional version.

Change-Id: I7678d09d643c532c672447026b0f12b7b70fc91d

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index 0c6e2ab..fc99e06 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -156,6 +156,11 @@
   value xml:lang=en-USElements/value
 /prop
   /node
+  node oor:name=.uno:ElementsDockingWindow oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-USElements Dock/value
+/prop
+  /node
   node oor:name=.uno:FormelCursor oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USFormula Cursor/value
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 342190b..a56e439 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,sm,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,sm,\
+starmath/source/ElementsDockingWindow \
 starmath/source/accessibility \
 starmath/source/action \
 starmath/source/caret \
diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
new file mode 100644
index 000..48fc51b
--- /dev/null
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -0,0 +1,142 @@
+/* -*- 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 .
+ */
+#ifndef _ELEMENTSDOCKINGWINDOW_HXX_
+#define _ELEMENTSDOCKINGWINDOW_HXX_
+
+#include sfx2/ctrlitem.hxx
+#include sfx2/dockwin.hxx
+#include vcl/toolbox.hxx
+#include vcl/fixed.hxx
+#include vcl/group.hxx
+#include vcl/graph.hxx
+
+#include svx/dlgctrl.hxx
+#include document.hxx
+
+class SmElement
+{
+SmNode* mpNode;
+OUString maText;
+public:
+SmElement(SmNode* pNode, OUString aText);
+virtual ~SmElement();
+SmNode* getNode();
+
+OUString getText() { return maText; }
+
+virtual bool isSeparator()
+{
+return false;
+}
+
+Point mBoxLocation;
+Size  mBoxSize;
+};
+
+class SmElementSeparator : public SmElement
+{
+public:
+SmElementSeparator();
+
+virtual bool isSeparator()
+{
+return true;
+}
+};
+
+class SmElementsControl : public Control
+{
+
+static const sal_uInt16 aUnaryBinaryOperatorsList[];
+static const sal_uInt16 aRelationsList[];
+static const sal_uInt16 aSetOperations[];
+static const sal_uInt16 aFunctions[];
+static const sal_uInt16 aOperators[];
+

[PATCH] Fix memory leak in mapToFontConfigLangTag.

2013-05-19 Thread Mark Wielaard (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3967

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/3967/1

Fix memory leak in mapToFontConfigLangTag.

FcGetLangs() will return a new FCStrSet that needs to be freed after usage.

Change-Id: Ie7fe0dd160fa59077d6a90878e70d0e034680812
---
M vcl/generic/fontmanager/fontconfig.cxx
1 file changed, 12 insertions(+), 0 deletions(-)



diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index dc8dfa7..3e23fc9 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -811,11 +811,17 @@
 
 sLangAttrib = OUStringToOString(rLangTag.getBcp47(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
 if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+{
+FcStrSetDestroy(pLangSet);
 return sLangAttrib;
+}
 
 sLangAttrib = OUStringToOString(rLangTag.getLanguageAndScript(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
 if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+{
+FcStrSetDestroy(pLangSet);
 return sLangAttrib;
+}
 
 OString sLang = OUStringToOString(rLangTag.getLanguage(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
 OString sRegion = OUStringToOString(rLangTag.getCountry(), 
RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
@@ -824,11 +830,17 @@
 {
 sLangAttrib = sLang + OString('-') + sRegion;
 if (FcStrSetMember(pLangSet, (const FcChar8*)sLangAttrib.getStr()))
+{
+FcStrSetDestroy(pLangSet);
 return sLangAttrib;
+}
 }
 
 if (FcStrSetMember(pLangSet, (const FcChar8*)sLang.getStr()))
+{
+FcStrSetDestroy(pLangSet);
 return sLang;
+}
 
 return OString();
 #else

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7fe0dd160fa59077d6a90878e70d0e034680812
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

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


[PATCH] Thread-safe version of osl_getGlobalTime

2013-05-19 Thread Norbert Thiebaud (via Code Review)
Hello LibreOffice gerrit bot,

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

https://gerrit.libreoffice.org/3960

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

Change subject: Thread-safe version of osl_getGlobalTime
..

Thread-safe version of osl_getGlobalTime

Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d
---
M sal/osl/unx/salinit.cxx
M sal/osl/unx/time.c
M sal/osl/w32/salinit.cxx
M sal/osl/w32/time.c
4 files changed, 83 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3960/10
-- 
To view, visit https://gerrit.libreoffice.org/3960
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ibb9d23780600437f607d866ff3d396b96879245d
Gerrit-PatchSet: 10
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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


[Libreoffice-commits] buildbot.git: tb/tb_internals.sh

2013-05-19 Thread Norbert Thiebaud
 tb/tb_internals.sh |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 888d7cd30bba85d8ba0d93ef0b7310d0590a66d2
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 20:43:26 2013 -0500

tb: set the default value for TB_GERRIT_PLATFORM when we can

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 242df2a..fa89fab 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -450,6 +450,23 @@ profile_gerrit_defaults()
 if [ ${TB_GERRIT_TEST} = 1 -o ${TB_TEST} = 1 ] ; then
 tb_GERRIT_TEST=-t
 fi
+if [ -z ${TB_GERRIT_PLATFORM} ] ; then
+os=$(uname)
+case $os in
+*Linux*)
+TB_GERRIT_PLATFORM=Linux
+;;
+Darwin)
+TB_GERRIT_PLATFORM=MacOSX
+;;
+CYGWIN*)
+TB_GERRIT_PLATFORM=Windows
+;;
+esac
+if [ -z ${TB_GERRIT_PLATFORM} ] ; then
+die Could not determine gerrit platform for ${os}
+fi
+fi
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] buildbot.git: tb/tb_internals.sh

2013-05-19 Thread Norbert Thiebaud
 tb/tb_internals.sh |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 34805ae3569dbb783a87cbb3391d5319f5227521
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 20:50:45 2013 -0500

tb: use TB_BRANCH to configure the branch a gerrit profile should query

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index fa89fab..f6d87f9 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -467,7 +467,6 @@ profile_gerrit_defaults()
 die Could not determine gerrit platform for ${os}
 fi
 fi
-
 }
 
 profile_tb_defaults()
@@ -993,7 +992,7 @@ select_next_gerrit_task()
 GERRIT_TASK_BRANCH=
 GERRIT_TASK_REF=
 GERRIT_TASK_FEATURE=
-result=$(ssh ${TB_GERRIT_HOST?} buildbot get -p core -a 
${TB_GERRIT_PLATFORM?} --format BASH ${TB_GERRIT_BRANCH?} ${tb_GERRIT_TEST})
+result=$(ssh ${TB_GERRIT_HOST?} buildbot get -p core -a 
${TB_GERRIT_PLATFORM?} --format BASH ${TB_BRANCH?} ${tb_GERRIT_TEST})
 [ $V ]  echo Get task result:${result}
 
 has_task=$(echo $result | grep ^GERRIT_TASK_)
@@ -1281,6 +1280,9 @@ validate_gerrit_profile()
 if [ -z ${TB_NAME} ] ; then
 die TB_NAME is required to be configured
 fi
+if [ -z ${TB_BRANCH} ] ; then
+die TB_BRANCH is required to be configured
+fi
 if [ -z ${TB_GIT_DIR} ] ; then
 die TB_GIT_DIR is required to be configured
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] buildbot.git: tb/tb_internals.sh

2013-05-19 Thread Norbert Thiebaud
 tb/tb_internals.sh |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3ea78127d61c6e8e24f04cdff6b0bd0fd7e8e856
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 20:53:42 2013 -0500

tb: gerrit buildbot platform names are weird

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index f6d87f9..84a82ea 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -454,13 +454,13 @@ profile_gerrit_defaults()
 os=$(uname)
 case $os in
 *Linux*)
-TB_GERRIT_PLATFORM=Linux
+TB_GERRIT_PLATFORM=LINUX
 ;;
 Darwin)
-TB_GERRIT_PLATFORM=MacOSX
+TB_GERRIT_PLATFORM=MAC
 ;;
 CYGWIN*)
-TB_GERRIT_PLATFORM=Windows
+TB_GERRIT_PLATFORM=WINDOWS
 ;;
 esac
 if [ -z ${TB_GERRIT_PLATFORM} ] ; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fdo#38838 Replacement of the String with OUString

2013-05-19 Thread Norbert Thiebaud (via Code Review)
Norbert Thiebaud has created a new patch set by issuing a rebase in Gerrit (#2).

Change subject: fdo#38838 Replacement of the String with OUString
..

fdo#38838 Replacement of the String with OUString

Change-Id: I1feaa0bee39868aedd768202b584cabc1010f4d6
---
M cui/source/tabpages/tabarea.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3958/2
-- 
To view, visit https://gerrit.libreoffice.org/3958
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1feaa0bee39868aedd768202b584cabc1010f4d6
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Paulo dos Santos marcospdss@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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


[PATCH] fdo#38838 Replacement of the String with OUString

2013-05-19 Thread Norbert Thiebaud (via Code Review)
Norbert Thiebaud has created a new patch set by issuing a rebase in Gerrit (#3).

Change subject: fdo#38838 Replacement of the String with OUString
..

fdo#38838 Replacement of the String with OUString

Change-Id: I1feaa0bee39868aedd768202b584cabc1010f4d6
---
M cui/source/tabpages/tabarea.cxx
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3958/3
-- 
To view, visit https://gerrit.libreoffice.org/3958
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I1feaa0bee39868aedd768202b584cabc1010f4d6
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Paulo dos Santos marcospdss@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org

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


[Libreoffice-commits] buildbot.git: 2 commits - tb/tb_internals.sh tb/tb_phases.sh

2013-05-19 Thread Norbert Thiebaud
 tb/tb_internals.sh |2 +-
 tb/tb_phases.sh|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eaf6632b02a636ce3b3b18f0ec17fe312d2c057c
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 22:30:50 2013 -0500

tb: add MAKE_RESTARTS=1 to clean phase to avoid make bug with shell trap

diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index 00b9fd0..34c4e14 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -57,7 +57,7 @@ pre_clean()
 canonical_do_clean()
 {
 if [ ${R} = 0 ] ; then
-if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} -sr clean  
tb_${P?}_clean.log 21 ; then
+if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} MAKE_RESTARTS=1 -sr clean  
tb_${P?}_clean.log 21 ; then
 tb_REPORT_LOG=tb_${P?}_clean.log
 tb_REPORT_MSGS=cleaning up failed - error is:
 R=1
commit c3890c664b90d8b31c82647cda4e832b65309dbc
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Sun May 19 21:10:03 2013 -0500

tb: confusion with TB_MODE, used to deal with priority, renamed

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 84a82ea..9f08379 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -871,7 +871,7 @@ run_next_task()
 fi
 P=
 done
-if [ ${TB_MODE} = fair ] ; then
+if [ ${TB_SCHEDULING} = fair ] ; then
 if [ -n $P -a ${R} = 0 ] ; then
 rotate_active_profiles ${P?}
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: editeng/source include/editeng

2013-05-19 Thread Ricardo Montania
 editeng/source/misc/svxacorr.cxx   |   20 
 editeng/source/outliner/outlvw.cxx |   10 --
 include/editeng/svxacorr.hxx   |2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

New commits:
commit c9c2fbe485de2bb831bd2e58faef87a19ceff622
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Thu May 16 13:08:34 2013 -0300

Drop String.AppendAscii in editeng

Change-Id: I25df0e20e2da50e91139cefba74af2741e5fffb5
Reviewed-on: https://gerrit.libreoffice.org/3923
Tested-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index eebf87c..bb8f089 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1604,9 +1604,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType 
eLang, sal_Bool bNewFi
 {
 OSL_ENSURE(pLangTable-find(eLang) == pLangTable-end(), Language already 
exists );
 
-String sUserDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
-String sShareDirFile( sUserDirFile );
-
+OUString sShareDirFile( GetAutoCorrFileName( eLang, sal_True, sal_False ));
 SvxAutoCorrectLanguageListsPtr pLists = 0;
 
 Time nMinTime( 0, 2 ), nAktTime( Time::SYSTEM ), nLastCheckTime( 
Time::EMPTY );
@@ -1620,18 +1618,17 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( 
LanguageType eLang, sal_Bool bNewFi
 // 2 minutes.
 if( bNewFile )
 {
-sShareDirFile = sUserDirFile;
-pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
+pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sShareDirFile );
 pLangTable-insert(eLang, pLists);
 aLastFileTable.erase(nFndPos);
 }
 }
-else if( ( FStatHelper::IsDocument( sUserDirFile ) ||
+else if( ( FStatHelper::IsDocument( sShareDirFile ) ||
 FStatHelper::IsDocument( sShareDirFile =
   GetAutoCorrFileName( eLang, sal_False, sal_False 
) ) ) ||
-( sShareDirFile = sUserDirFile, bNewFile ))
+( sShareDirFile = sShareDirFile, bNewFile ))
 {
-pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sUserDirFile );
+pLists = new SvxAutoCorrectLanguageLists( *this, sShareDirFile, 
sShareDirFile );
 pLangTable-insert(eLang, pLists);
 if (nFndPos != aLastFileTable.end())
 aLastFileTable.erase(nFndPos);
@@ -1909,13 +1906,12 @@ sal_Bool 
SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
 return sal_False;
 }
 
-String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
+OUString SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
 sal_Bool bNewFile, sal_Bool bTst ) 
const
 {
-String sRet, sExt( LanguageTag( eLang ).getBcp47() );
+OUString sRet, sExt( LanguageTag( eLang ).getBcp47() );
 
-sExt.Insert('_', 0);
-sExt.AppendAscii( .dat );
+sExt = _ + sExt + .dat;
 if( bNewFile )
 ( sRet = sUserAutoCorrFile )  += sExt;
 else if( !bTst )
diff --git a/editeng/source/outliner/outlvw.cxx 
b/editeng/source/outliner/outlvw.cxx
index a76419e..2229857 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1312,7 +1312,7 @@ bool EDITENG_DLLPUBLIC 
GetStatusValueForThesaurusFromContext(
 const EditView rEditView )
 {
 // get text and locale for thesaurus look up
-String aText;
+OUString aText;
 EditEngine *pEditEngine = rEditView.GetEditEngine();
 ESelection aTextSel( rEditView.GetSelection() );
 if (!aTextSel.HasRange())
@@ -1320,17 +1320,15 @@ bool EDITENG_DLLPUBLIC 
GetStatusValueForThesaurusFromContext(
 aText = pEditEngine-GetText( aTextSel );
 aTextSel.Adjust();
 LanguageType nLang = pEditEngine-GetLanguage( aTextSel.nStartPara, 
aTextSel.nStartPos );
-String aLangText( LanguageTag( nLang ).getBcp47() );
+OUString aLangText( LanguageTag( nLang ).getBcp47() );
 
 // set word and locale to look up as status value
-String aStatusVal( aText );
-aStatusVal.AppendAscii( # );
-aStatusVal += aLangText;
+OUString aStatusVal= aText + # + aLangText;
 
 rStatusVal  = aStatusVal;
 rLang   = nLang;
 
-return aText.Len()  0;
+return aText.getLength()  0;
 }
 
 
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 4f54d8f..9d5774a 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -327,7 +327,7 @@ public:
 
 // Query/Set the name of the AutoCorrect file
 // the default is autocorr.dat
-String GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM,
+OUString GetAutoCorrFileName( LanguageType eLang = LANGUAGE_SYSTEM,
 sal_Bool bNewFile = sal_False,
 sal_Bool 

[PUSHED] Drop String.AppendAscii in editeng

2013-05-19 Thread Norbert Thiebaud (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/3923

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25df0e20e2da50e91139cefba74af2741e5fffb5
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br

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


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

2013-05-19 Thread Marcos Paulo
 cui/source/tabpages/tabarea.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ef0015704ca67a8f9ffd8f4ae207be355da7f3e
Author: Marcos Paulo marcospdss@gmail.com
Date:   Sat May 18 19:31:56 2013 -0300

fdo#38838 Replacement of the String with OUString

Change-Id: I1feaa0bee39868aedd768202b584cabc1010f4d6
Reviewed-on: https://gerrit.libreoffice.org/3958
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 236333d..a5b6772 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -135,7 +135,7 @@ void SvxAreaTabDialog::SavePalettes()
 
 // save the tables when they have been changed
 
-const String aPath( SvtPathOptions().GetPalettePath() );
+const OUString aPath( SvtPathOptions().GetPalettePath() );
 
 if( mnHatchingListState  CT_MODIFIED )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PUSHED] fdo#38838 Replacement of the String with OUString

2013-05-19 Thread Norbert Thiebaud (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/3958

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1feaa0bee39868aedd768202b584cabc1010f4d6
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Paulo dos Santos marcospdss@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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


[PATCH] fdo#38838 Replacement of the String with OUString

2013-05-19 Thread Marcos Paulo dos Santos (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3968

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/3968/1

fdo#38838 Replacement of the String with OUString

Change-Id: Ib6fda987be15525d939cfe5c3e65f881aff83131
---
M cui/source/tabpages/tpline.cxx
1 file changed, 19 insertions(+), 19 deletions(-)



diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8f80f91..1747eba 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -127,8 +127,8 @@
 pXPool  ( (XOutdevItemPool*) rInAttrs.GetPool() ),
 aXLStyle( XLINE_DASH ),
 aXWidth ( 1 ),
-aXDash  ( String(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
-aXColor ( String(), COL_LIGHTRED ),
+aXDash  ( OUString(), XDash( XDASH_RECT, 3, 7, 2, 40, 15 ) ),
+aXColor ( OUString(), COL_LIGHTRED ),
 aXLineAttr  ( pXPool ),
 rXLSet  ( aXLineAttr.GetItemSet() ),
  pnLineEndListState( 0 ),
@@ -136,17 +136,17 @@
 pnColorListState( 0 ),
nPageType   ( 0 )
 {
-aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE)));
-aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) );
-aMtrStartWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_START_WIDTH ) 
) );
-aLbEndStyle.SetAccessibleName(String(CUI_RES( STR_LB_END_STYLE ) ) );
-aMtrEndWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) );
-aTsbCenterStart.SetAccessibleName(String(CUI_RES( STR_CENTER_START ) ) );
-aTsbCenterEnd.SetAccessibleName(String(CUI_RES( STR_CENTER_END ) ) );
+aLbEndStyle.SetAccessibleName(OUString(CUI_RES(STR_STYLE)));
+aLbStartStyle.SetAccessibleName(OUString(CUI_RES( STR_LB_START_STYLE ) ) );
+aMtrStartWidth.SetAccessibleName(OUString(CUI_RES( STR_MTR_FLD_START_WIDTH 
) ) );
+aLbEndStyle.SetAccessibleName(OUString(CUI_RES( STR_LB_END_STYLE ) ) );
+aMtrEndWidth.SetAccessibleName(OUString(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) 
);
+aTsbCenterStart.SetAccessibleName(OUString(CUI_RES( STR_CENTER_START ) ) );
+aTsbCenterEnd.SetAccessibleName(OUString(CUI_RES( STR_CENTER_END ) ) );
 
 FreeResource();
 
-aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+aCtlPreview.SetAccessibleName(OUString(CUI_RES(STR_EXAMPLE)));
 
 // This Page requires ExchangeSupport
 SetExchangeSupport();
@@ -518,7 +518,7 @@
 aLbLineStyle.SelectEntryPos( nOldSelect );
 
 // Line end style
-String sNone( SVX_RES( RID_SVXSTR_NONE ) );
+OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
 nOldSelect = aLbStartStyle.GetSelectEntryPos();
 aLbStartStyle.Clear();
 aLbStartStyle.InsertEntry( sNone );
@@ -586,7 +586,7 @@
 *pnLineEndListState = CT_NONE;
 
 nPos = aLbLineStyle.GetSelectEntryPos();
-String sNone( SVX_RES( RID_SVXSTR_NONE ) );
+OUString sNone( SVX_RES( RID_SVXSTR_NONE ) );
 aLbStartStyle.Clear();
 aLbStartStyle.InsertEntry( sNone );
 
@@ -1293,7 +1293,7 @@
 Get( XATTR_LINEWIDTH ) ).GetValue(), ePoolUnit );
 }
 else
-aMtrLineWidth.SetText( String() );
+aMtrLineWidth.SetText( OUString() );
 
 // Line color
 aLbColor.SetNoSelection();
@@ -1304,7 +1304,7 @@
 aLbColor.SelectEntry( aCol );
 if( aLbColor.GetSelectEntryCount() == 0 )
 {
-aLbColor.InsertEntry( aCol, String() );
+aLbColor.InsertEntry( aCol, OUString() );
 aLbColor.SelectEntry( aCol );
 }
 }
@@ -1387,7 +1387,7 @@
 Get( XATTR_LINESTARTWIDTH ) ).GetValue(), 
ePoolUnit );
 }
 else
-aMtrStartWidth.SetText( String() );
+aMtrStartWidth.SetText( OUString() );
 
 // Line end strength
 if( bObjSelected 
@@ -1401,7 +1401,7 @@
 Get( XATTR_LINEENDWIDTH ) ).GetValue(), ePoolUnit 
);
 }
 else
-aMtrEndWidth.SetText( String() );
+aMtrEndWidth.SetText( OUString() );
 
 // Centered line end (start)
 if( bObjSelected 
@@ -1452,7 +1452,7 @@
 ChangeTransparentHdl_Impl( NULL );
 }
 else
-aMtrTransparent.SetText( String() );
+aMtrTransparent.SetText( OUString() );
 
 if( !aLbStartStyle.IsEnabled()  
 !aLbEndStyle.IsEnabled()
@@ -1469,8 +1469,8 @@
 
 // Synchronize
 // We get the value from the INI file now
-String aStr = GetUserData();
-aCbxSynchronize.Check( (sal_Bool)aStr.ToInt32() );
+OUString aStr = GetUserData();
+aCbxSynchronize.Check( (sal_Bool)aStr.toInt32() );
 
 // #116827#
 if(bObjSelected  SFX_ITEM_DEFAULT == 
rAttrs.GetItemState(XATTR_LINEJOINT))

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


[Libreoffice-qa] Fwd: User Ideas page to collect and vote on ideas

2013-05-19 Thread Joren

Forwarded message:

Hi all,

I'm noticing many duplicates and invalid bugs in the bug tracker and 
keep thinking how we can get a grip on that. Having better organization 
would be essential to keep the bug tracker clean. So for user 
suggestions about new features I am suggesting to create an ideas page 
similar to


* Sibelius: http://sibelius.ideascale.com/
* Path Finder: http://feedback.cocoatech.com/forums/275-path-finder-ideas

That would be a good way to let users participate in a voting process 
and have them contribute the craziest ideas without cluttering the bug 
tracker.


Every 2 months or so QA could go over that ideas page and see what get's 
the most votes (let's not digress into the votes discussion ;) ) or 
delete invalid ideas with a short comment.


I think that could improve the bug tracker situation and prevent us from 
wasting precious time. Also the users are challenged more to present 
their ideas in a nice fashion so they gather more votes.


What do you think?

Best, steve




signature.asc
Description: PGP signature
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Fwd: User Ideas page to collect and vote on ideas

2013-05-19 Thread Pedro
Hi Steve, all


JorenDC wrote
 That would be a good way to let users participate in a voting process 
 and have them contribute the craziest ideas without cluttering the bug 
 tracker.
 
 Every 2 months or so QA could go over that ideas page and see what get's 
 the most votes (let's not digress into the votes discussion ;) ) or 
 delete invalid ideas with a short comment.
 
 I think that could improve the bug tracker situation and prevent us from 
 wasting precious time. Also the users are challenged more to present 
 their ideas in a nice fashion so they gather more votes.

I think that a separate Feature Request tracker would be a nice idea. But
you would have to convince Developers (and not QA)  to take a look at
another tracker (which is not very likely...)

In any case, voting creates expectations (even if users are warned that
there is no obligation...)

Just my 2 cents...



--
View this message in context: 
http://nabble.documentfoundation.org/Libreoffice-qa-Fwd-User-Ideas-page-to-collect-and-vote-on-ideas-tp4056863p4056868.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] Fwd: User Ideas page to collect and vote on ideas

2013-05-19 Thread Mirosław Zalewski
Hi

It sounds great, but (there are always buts...).

First, we already have a way for users to vote on ideas. It's on the wiki:
https://wiki.documentfoundation.org/Vote_for_Enhancement
There are two problems with it:
1. Most users don't really know such page exists.
2. Ideas are put on page, voted for and then... nothing. No one takes care of 
them (maybe it means that developers are unaware of such page?).

Are these problems unsolvable in wiki? Do we need to setup another site to 
overcome these obstacles? Will these problems cease to exist on another 
platform?

Second. I have some KDE SC background. On their forums, they have great 
Brainstorm section. Users may put their ideas, vote for them and discuss. 
The problems is, there are great ideas with hundreds of votes that just rot 
there for years. There is huge demand for them by users, but no one is 
interested in implementing them.
Yes, I know how open source software works. You can't really force anybody to 
code anything. But what is a use of ideas page if they are never implemented 
by developers?
BTW: could developers agree that one feature from top ten on such page will be 
implemented for each major release? Or maybe should we go into crowdfunding?

While I fully support the idea to involve users and make them more part of 
community, I wanted to point out some issues that must be solved before. 
Technical work (putting project page together) is really the easiest in all 
process.
-- 
Best regards
Mirosław Zalewski
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Portable vs Parallel: which one is better?

2013-05-19 Thread Pedro
Hi Tommy, all


Tommy wrote
 you should check X-LibreOffice which is an alternative portable package  
  from winPenPack.com
 
 IMHO X-LibreOffice is much better than the PortableApps package.

Thank you for the suggestion. Just downloaded and unpacked version 4.0.2
(for comparison)

It does have some nice touches like the language selection at first run.
Curiously it seems to be running faster than the installed version.


Tommy wrote
 moreover the guys from wPP.com keep updated every branch minor release.
 
 you can download here the X-LibO 3.6.5
 http://www.winpenpack.com/main/download.php?view.1338

That shows that they have missed 3.6.6 (which was launched back in April...
one month before 4.0.3)
But they do have 3.5.7 which is a good thing (as I mentioned PortableApps
ignored all versions after 3.5.5)

It is a shame that they (wPP.com) only started doing Portable versions for
the 3.5 branch. It would be great to have a Portable version 3.4.6.2
(PortableApps stopped at 3.4.5.2)

Regarding the package size, the download is larger than any other option
(it's just a zip file) but the unpacked folder is around 340Mb so it's quite
similar to the PortableApps space requirements (and nearly a third of the
parallel install)

Again, thank you for the suggestion 



--
View this message in context: 
http://nabble.documentfoundation.org/Portable-vs-Parallel-which-one-is-better-tp4056781p4056914.html
Sent from the QA mailing list archive at Nabble.com.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


[Libreoffice-bugs] [Bug 64751] New: Header footer blue tags empty (no visible text)

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64751

  Priority: medium
Bug ID: 64751
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Header  footer blue tags empty (no visible text)
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: jbf.fa...@sud-ouest.org
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.1.0.0.alpha0+ Master
 Component: Writer
   Product: LibreOffice

Created attachment 79511
  -- https://bugs.freedesktop.org/attachment.cgi?id=79511action=edit
headerfooter blue tags without labels

In current master (Version: 4.1.0.0.alpha1+ Build ID:
977118753c3b4a05701866586136b78a669925c) the blue tags that show up when you
click in the header or footer area, does not shows its label anymore. See the
attached screen copy; same problem with footer.
The problem appeared several days ago. Labels were visible at least at commit
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6c648e3dca9b3f8beceb877a461d2118d473c20d
Bisect in progress.

Best regards. JBF

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


[Libreoffice-bugs] [Bug 56112] FORMATTING: fonts are not displayed correctly

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=56112

ign_christian ign_christ...@yahoo.com changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

--- Comment #12 from ign_christian ign_christ...@yahoo.com ---
Hope I didn't misunderstand...still can't see anything wrong on both odt files
you attached. I tried testing on Impress, also saw nothing strange. Using MS
Gothic  Liberation Serif, changing on both  vice versa, saw that all behave
as expected.

Tested on LO 4.0.3.3 standard/English (Win7 32bit)
Maybe issue(s) with Japanese languange pack or portable version used?

PS: lets focus only on Presentation (Impress) in this bug. If you think there
is another issue on Writer, you should file a new bug.

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


[Libreoffice-bugs] [Bug 39468] translate German comments, removing redundant ones

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=39468

--- Comment #70 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Christian M. Heller committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=791b4eedfba1e913037d88a3c185dc01c9ea24be

fdo#39468 Translate German comments - graphicfilter



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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


[Libreoffice-bugs] [Bug 39468] translate German comments, removing redundant ones

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=39468

--- Comment #71 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Matthias Freund committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=89001143ea5aeecf8af1b62748431dc785369f44

fdo#39468 Comment translation GER-ENG in sw/source/ui/ribbar/ (Part2)



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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


[Libreoffice-bugs] [Bug 64753] New: FILESAVE: Document Protection removed from XLSX after saving reopening file

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64753

  Priority: medium
Bug ID: 64753
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILESAVE: Document Protection removed from XLSX after
saving  reopening file
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: ign_christ...@yahoo.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.0.3.3 release
 Component: Spreadsheet
   Product: LibreOffice

Steps to reproduce:
1. Create new blank spreadsheet
2. Tools  Protect Document  Sheet/Document  OK (check to see that
sheet/document protected)
3. Save as MSO XML (*.xlsx)
4. Close  reopen that file (see that protection removed)

That problem happens either with password  no password. But that's not happen
if saving as .xls  .ods

LO 4.0.3.3 (Win7 32bit)

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


[Libreoffice-bugs] [Bug 62315] FILESAVE: Rows get doubled and reappear after deleting, saving and reopening (.ods)

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=62315

--- Comment #1 from ign_christian ign_christ...@yahoo.com ---
not reproducible on LO 4.0.3.3 (Win7 32bit)

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


[Libreoffice-bugs] [Bug 64743] Insert Hyperlink

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64743

--- Comment #5 from Cor Nouws c...@nouenoff.nl ---
(In reply to comment #3)

 I've tested with .ods  .xls, nothing wrong using Ctrl-click to open


Ah, maybe that's it:
  https://plus.google.com/107646708505179576030/posts/9gvEjEb3Gc2

Ctrl+Click is new for Calc.

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


[Libreoffice-bugs] [Bug 64740] PRINTING Dirty state isn't activated when printing with changed settings

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64740

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

Version|4.0.2.2 release |3.3.0 Beta2

--- Comment #3 from Cor Nouws c...@nouenoff.nl ---
(In reply to comment #2)
 I have those load options activated.

Apologies - I should have understood that from your first description, 4th
paragraph.

I can confirm this. Even in 3.3.0 it was like that, so an older issue.

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


[Libreoffice-bugs] [Bug 64743] Insert Hyperlink

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64743

--- Comment #6 from ign_christian ign_christ...@yahoo.com ---
Ah..it has not been well socialized :)
But problem still exist on XLSX after saving  reopening.

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


[Libreoffice-bugs] [Bug 64751] Header footer blue tags empty (no visible text)

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64751

Arnaud Versini arnaud.vers...@gmail.com changed:

   What|Removed |Added

  Attachment #79511|0   |1
is obsolete||

--- Comment #1 from Arnaud Versini arnaud.vers...@gmail.com ---
Created attachment 79513
  -- https://bugs.freedesktop.org/attachment.cgi?id=79513action=edit
headerfooter blue tags without labels

Replace the attachment with the same with the right MIME type.

Confirmed on Ubuntu 13.04 Master

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


[Libreoffice-bugs] [Bug 64751] Header footer blue tags empty (no visible text)

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64751

Arnaud Versini arnaud.vers...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1

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


[Libreoffice-bugs] [Bug 56112] FORMATTING: fonts are not displayed correctly

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=56112

Urmas davian...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |NOTABUG

--- Comment #13 from Urmas davian...@gmail.com ---
The font displayed when nothing is selected is corresponding to the input
language (Japanese or normal one). I don't see that as a bug.

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


[Libreoffice-bugs] [Bug 55361] RTL text appears reversed during animation

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=55361

--- Comment #5 from Lior Kaplan kaplanl...@gmail.com ---
I don't think they're related.

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


[Libreoffice-bugs] [Bug 64754] New: CONDITIONAL FORMATTING [Icon set] localization setting for decimal separator is ignored

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64754

  Priority: medium
Bug ID: 64754
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: CONDITIONAL FORMATTING [Icon set] localization setting
for decimal separator is ignored
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: mchl.r...@gmail.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.0.3.3 release
 Component: Spreadsheet
   Product: LibreOffice

Created attachment 79514
  -- https://bugs.freedesktop.org/attachment.cgi?id=79514action=edit
3 screen shots showing the lost of the decimal value

Steps to reproduce, using Locale setting: French (France):
(The attached screen shot shows the described sequence)

1/ Select any cell range
2/ Format  Conditional Formatting  All Cells  Icon set
3/ Select Value for both thresholds and enter:
a decimal number in the 1st
an integer in the 2nd
Correct at this stage = in French locale, decimal separator is a comma (screen
shot 1)

4/ Click Ok
5/ Format  Conditional Formatting  Manage  Select previous range  Edit
Incorrect display = decimal separator changed for a point (screen shot 2)

6/ Click Ok
7/ Again: Select previous range  Edit
The decimal value is lost (changed to 0) while the integer is still preserved
(screen shot 3)

Version 4.0.3.3 (Build ID: 0eaa50a932c8f2199a615e1eb30f7ac74279539) – Vista 32b

This behaviour is the same as described for bug 60574 related to Color Scale
and which is now fixed (what I can confirm)

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


[Libreoffice-bugs] [Bug 59177] undefined: calc hangup after 'store at'

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=59177

--- Comment #6 from arndtele sa...@arndt-electronic.de ---
it is difficult at this time because i am not
in my office for the next four month.
kind regards
klaus arndt

Am Freitag, den 17.05.2013, 02:08 + schrieb
bugzilla-dae...@freedesktop.org:
 Comment # 5 on bug 59177 from ign_christian 
 Could you test using Ubuntu 12.04 standard kernel (3.2.0-41-generic-pae) ?
 
 __
 You are receiving this mail because: 
   * You reported the bug.

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


[Libreoffice-bugs] [Bug 64754] CONDITIONAL FORMATTING [Icon set] localization setting for decimal separator is ignored

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64754

Michel Rudelle mchl.r...@gmail.com changed:

   What|Removed |Added

  Attachment #79514|text/plain  |image/jpeg
  mime type||

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


[Libreoffice-bugs] [Bug 64755] New: [Regression since 4.0] Images aren't shown when preview in web browser

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64755

  Priority: medium
Bug ID: 64755
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: [Regression since 4.0] Images aren't shown when
preview in web browser
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: aniste...@gmail.com
  Hardware: x86 (IA32)
Status: UNCONFIRMED
   Version: 4.1.0.0.alpha0+ Master
 Component: Writer
   Product: LibreOffice

Created attachment 79515
  -- https://bugs.freedesktop.org/attachment.cgi?id=79515action=edit
file

Open attached file in master ( 7d2c9ac5c12232c15d21ee83387c31847553de80 in my
case) and preview it in the internet browser, File - Preview in Web Browser.
compare it with Libreoffice 4.0.
Master build doesn't render the file's pictures. Libreoffice 4.0 does.

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


[Libreoffice-bugs] [Bug 64756] New: : Drag and drop doesn't work well in calc

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64756

  Priority: medium
Bug ID: 64756
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: : Drag and drop doesn't work well in calc
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: jmpsuperhor...@gmail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.0.3.3 release
 Component: Libreoffice
   Product: LibreOffice

Problem description: Drag and drop graph in calc is opened in draw

Steps to reproduce:
1.  Open a LibreOffice calc
2.  try to drag and drop any image file from any folder to the spreadsheet
3.  The image is opened in draw and it isn't embeded in the spreadsheet.
(sorry by my english)

Current behavior:imposible drag and drop a graph in calc from an external
folder

Expected behavior: It can be done, just like in writer.


Operating System: Windows 7
Version: 4.0.3.3 release

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


[Libreoffice-bugs] [Bug 64756] : Drag and drop doesn't work well in calc

2013-05-19 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=64756

Juan Moreno jmpsuperhor...@gmail.com changed:

   What|Removed |Added

   Priority|medium  |low
  Component|Libreoffice |Spreadsheet

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


  1   2   3   >