[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on||51832

--- Comment #57 from Rainer Bielefeld  
2012-07-27 05:17:34 UTC ---
Add "Bug 51832 - EDITING: CRASH in special case when 'Edit > Changes > Accept
or reject > Reject'"

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - framework/inc sc/source

[Kohei Yoshida]

 framework/inc/services/frameloaderfactory.hxx |  382 --
 sc/source/ui/app/transobj.cxx |1 
 2 files changed, 383 deletions(-)

New commits:
commit a5ab280160976eed1c4d26402745c3a1f9ebd063
Author: Kohei Yoshida 
Date:   Thu Jul 26 23:14:20 2012 -0400

Unused local variable.

Change-Id: I27b653dd4c3f84342f0cdb90b6aa4989aa6ce016

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index f0a609c..cd32171 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -634,7 +634,6 @@ void ScTransferObj::InitDocShell()
 
 for (SCROW nRow = nStartY; nRow <= nEndY; ++nRow)
 {
-sal_uInt8 nSourceFlags = pDoc->GetRowFlags(nRow, nSrcTab);
 if ( pDoc->RowHidden(nRow, nSrcTab) )
 pDestDoc->ShowRow( nRow, 0, false );
 else
commit d95274209468ee90a53c8975100c1202faa30f33
Author: Kohei Yoshida 
Date:   Thu Jul 26 23:13:20 2012 -0400

Header file without implementation. Not to mention nobody uses it.

Change-Id: I7522121059b53269a120a4f68a9038edd17944cf

diff --git a/framework/inc/services/frameloaderfactory.hxx 
b/framework/inc/services/frameloaderfactory.hxx
deleted file mode 100644
index 8fb3d80..000
--- a/framework/inc/services/frameloaderfactory.hxx
+++ /dev/null
@@ -1,382 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __FRAMEWORK_SERVICES_FRAMELOADERFACTORY_HXX_
-#define __FRAMEWORK_SERVICES_FRAMELOADERFACTORY_HXX_
-
-//_
-//  my own includes
-//_
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-//_
-//  interface includes
-//_
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-//_
-//  other includes
-//_
-#include 
-
-//_
-//  namespace
-//_
-
-namespace framework{
-
-//_
-//  exported const
-//_
-
-//_
-//  exported definitions
-//_
-
-struct tIMPLExtractedArguments
-{
-::rtl::OUString sMimeType   ;
-sal_Int32   nFlags  ;
-::rtl::OUString sFilterName ;
-sal_Int32   nClipboardFormat;
-::rtl::OUString sDetectService  ;
-css::uno::Reference< css::io::XInputStream >xInputStream;
-
-sal_Int32   nValidMask  ;
-};
-
-/*-//**
-@short  factory to create frameloader-objects
-@descr  These class can be used to create new loader for specified 
contents.
-We use cached values of t

[Libreoffice-commits] Changes to 'feature/orcus-integration'

[Kohei Yoshida]

New branch 'feature/orcus-integration' available with the following commits:
commit 8b86c9f02791c31cab85e5d644c45b7a76741a0c
Author: Kohei Yoshida 
Date:   Thu Jul 26 10:02:33 2012 -0400

Fix excessive indentation.

Change-Id: Id96c7693a53981d69820aa45e97fb34c64cb787a

commit 90eb7eaa081ba14ed82cb2d73bf7070d132eb0f7
Author: Kohei Yoshida 
Date:   Thu Jul 26 10:01:26 2012 -0400

Remove unnecessary fluffy comment partitions.

Change-Id: I8fad1d7e4bb9827266b6b1f1d90fe1dd2b401b44

commit 310073eaaff9e744877d18fa3a79b66eb0059ab1
Author: Kohei Yoshida 
Date:   Wed Jul 25 21:29:36 2012 -0400

Pass by const reference.

Change-Id: Iead2319a5283af69bf0edd12c639f14ddeb402ad

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

[Libreoffice-commits] .: basctl/source

[Takeshi Abe]

 basctl/source/basicide/baside2b.cxx|8 ++--
 basctl/source/basicide/baside3.cxx |4 +-
 basctl/source/basicide/basides1.cxx|   55 ++---
 basctl/source/basicide/basides2.cxx|8 ++--
 basctl/source/basicide/basides3.cxx|6 +--
 basctl/source/basicide/basidesh.cxx|   26 ++---
 basctl/source/basicide/basobj3.cxx |   12 +++---
 basctl/source/basicide/localizationmgr.cxx |2 -
 basctl/source/inc/basidesh.hxx |6 +--
 basctl/source/inc/basobj.hxx   |2 -
 10 files changed, 65 insertions(+), 64 deletions(-)

New commits:
commit 992e5296d76b42212e6ef674bd3f4ac5cb6828d5
Author: Takeshi Abe 
Date:   Fri Jul 27 10:35:28 2012 +0900

sal_Bool -> bool

Change-Id: I97618ffb138f292665edb634a29c39ab5a332ab1

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index c5b09d7..bf82724 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -266,7 +266,7 @@ String EditorWindow::GetWordAtCursor()
 
 void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 {
-sal_Bool bDone = sal_False;
+bool bDone = false;
 
 // Should have been activated at some point
 if ( pEditEngine )
@@ -275,7 +275,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 {
 String aKeyword = GetWordAtCursor();
 Application::GetHelp()->SearchKeyword( aKeyword );
-bDone = sal_True;
+bDone = true;
 }
 else if ( rHEvt.GetMode() & HELPMODE_QUICK )
 {
@@ -325,7 +325,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 }
 }
 Help::ShowQuickHelp( this, Rectangle( aTopLeft, Size( 1, 1 ) ), 
aHelpText, QUICKHELP_TOP|QUICKHELP_LEFT);
-bDone = sal_True;
+bDone = true;
 }
 }
 
@@ -1954,7 +1954,7 @@ sal_Bool WatchTreeListBox::EditedEntry( SvLBoxEntry* 
pEntry, const rtl::OUString
 if( cFirst == '\"' && cLast == '\"' )
 aResult = aResult.Copy( 1, nResultLen - 2 );
 
-sal_Bool bResModified = ( aResult != aEditingRes ) ? sal_True : sal_False;
+bool bResModified = ( aResult != aEditingRes );
 sal_Bool bRet = sal_False;
 
 if ( bResModified )
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 0cee74b..5038740 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1199,7 +1199,7 @@ bool implImportDialog( Window* pWin, const 
::rtl::OUString& rCurPath, const Scri
 {
 if ( BasicIDE::RemoveDialog( rDocument, aLibName, aNewDlgName 
) )
 {
-IDEBaseWindow* pDlgWin = pIDEShell->FindDlgWin( rDocument, 
aLibName, aNewDlgName, sal_False, sal_True );
+IDEBaseWindow* pDlgWin = pIDEShell->FindDlgWin( rDocument, 
aLibName, aNewDlgName, false, true );
 if( pDlgWin != NULL )
 pIDEShell->RemoveWindow( pDlgWin, sal_True );
 BasicIDE::MarkDocumentModified( rDocument );
@@ -1244,7 +1244,7 @@ bool implImportDialog( Window* pWin, const 
::rtl::OUString& rCurPath, const Scri
 if( bSuccess )
 {
 DialogWindow* pNewDlgWin = pIDEShell->CreateDlgWin( rDocument, 
aLibName, aNewDlgName );
-pIDEShell->SetCurWindow( pNewDlgWin, sal_True );
+pIDEShell->SetCurWindow( pNewDlgWin, true );
 }
 
 bDone = true;
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 96f0b65..f4eb16d 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1,3 +1,4 @@
+
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
@@ -148,7 +149,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
 // memorize item because of the adjustments...
 BasicIDEGlobals::GetExtraData()->SetSearchItem( (const 
SvxSearchItem&)rItem );
 sal_Int32 nFound = 0;
-sal_Bool bCanceled = sal_False;
+bool bCanceled = false;
 if ( ((const SvxSearchItem&)rItem).GetCommand() == 
SVX_SEARCHCMD_REPLACE_ALL )
 {
 sal_uInt16 nActModWindows = 0;
@@ -181,7 +182,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
 if ( !nFound && !((const 
SvxSearchItem&)rItem).GetSelection() )
 {
 // search other modules...
-sal_Bool bChangeCurWindow = sal_False;
+bool bChangeCurWindow = false;
 for( it = aIDEWindowTable.begin(); it != 
aIDEWindowTable.en

Re: [ANN] LibreOffice 3.6.0 RC3 test builds available

[Fridrich Strba]

There was a problem with windows build, rebuilding now.

F.

On 26/07/12 21:18, Fridrich Strba wrote:
> Hi *,
> 
> for the upcoming new version 3.6.0, the RC3 builds now start to be
> available on pre-releases. This build is slated to be third release
> candidate build on the way towards 3.6.0, please refer to our release
> plan timings here:
> 
>  http://wiki.documentfoundation.org/ReleasePlan#3.6_release
> 
> Builds are now being uploaded to a public (but non-mirrored - so don't
> spread news too widely!) place, as soon as they're available. Grab
> them here:
> 
>  http://dev-builds.libreoffice.org/pre-releases/
> 
> If you've a bit of time, please give them a try & report *critical*
> bugs not yet in bugzilla here, so we can incorporate them into the
> release notes. Please note that it takes approximately 24 hours to
> populate the mirrors, so that's about the time we have to collect
> feedback.
> 
> NOTE: This build is in a release configuration and _will_ replace your
> existing LibreOffice install on Windows.
> 
> The list of fixed bugs relative to 3.6.0 RC2 is here:
> 
>  
> http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-0-release-3.6.0.3.log
> 
> So playing with the areas touched there also greatly appreciated - and
> validation that those bugs are really fixed.
> 
> Thanks a lot for your help,
> 
> Fridrich
> 

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

Re: [REVIEW-3-6 3-6-0] [PUSHED 3-6] fix for fdo#52393, calc does not import manual row heights

[Kohei Yoshida]

On 07/26/2012 06:20 PM, Markus Mohrhard wrote:

Hey,

[1] fixes the problem that calc does not import manual row heights in
3-6. We need to mark the rows as manual row height in the row flags to
prevent overriding them with automatic row height calculation. You
won't see this problem in master because we are not updating the row
heights there at the moment.

IMHO this is a fix for 3-6-0 because it is a quite serious issue.


I agree.  Pushed to the 3-6 branch with my sign-off.

I hope we can gather 2 more sign-offs on this.  IMO we shouldn't release 
3.6.0 without this fix.


Kohei


--
Kohei Yoshida, LibreOffice hacker, Calc
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida]

 sc/source/ui/unoobj/docuno.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit a7f82f201e1b2653ac03e1833e273c6752868641
Author: Markus Mohrhard 
Date:   Thu Jul 26 23:00:58 2012 +0200

mark manual row heights correctly during import, fdo#52393

Change-Id: Id8a1658dbe6d9a89c89d1a0633392b0fa1104c4e
Signed-off-by: Kohei Yoshida 

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 41f10ea..c43047c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3224,10 +3224,13 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
 if ( aValue >>= nNewHeight )
 {
 if (pDoc->IsImportingXML())
+{
 // TODO: This is a band-aid fix.  Eventually we need to
 // re-work ods' style import to get it to set styles to
 // ScDocument directly.
 pDoc->SetRowHeightOnly( nStartRow, nEndRow, nTab, 
(sal_uInt16)HMMToTwips(nNewHeight) );
+pDoc->SetManualHeight( nStartRow, nEndRow, nTab, true );
+}
 else
 rFunc.SetWidthOrHeight( false, 1, nRowArr, nTab, 
SC_SIZE_ORIGINAL,
 (sal_uInt16)HMMToTwips(nNewHeight), 
sal_True, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/document.hxx  |1 -
 sc/inc/table.hxx |1 -
 sc/source/core/data/document.cxx |8 
 sc/source/core/data/table5.cxx   |8 
 sc/source/ui/app/transobj.cxx|2 +-
 5 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit 261f56fa90796686709f5ae7de3fba96121c0709
Author: Kohei Yoshida 
Date:   Thu Jul 26 20:46:40 2012 -0400

Actually this method is totally redundant. Remove it.

There is already an existing method that does the same thing.

Change-Id: I627fa73cca8da35d703000bd27d33168612b4126

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 39fce78..9893e7a 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1371,7 +1371,6 @@ public:
 SCROW   CountNonFilteredRows(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab);
 
 bool IsManualRowHeight(SCROW nRow, SCTAB nTab) const;
-void SetRowHeightManual(SCROW nRow, SCTAB nTab, bool bManual);
 
 /**
  * Write all column row flags to table's flag data, because not all column
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 0f32c31..bb365db 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -747,7 +747,6 @@ public:
 SCROW   CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow) const;
 
 bool IsManualRowHeight(SCROW nRow) const;
-void SetRowHeightManual(SCROW nRow, bool bManual);
 
 voidSyncColRowFlags();
 
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index df18748..de977d8 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3994,14 +3994,6 @@ bool ScDocument::IsManualRowHeight(SCROW nRow, SCTAB 
nTab) const
 return maTabs[nTab]->IsManualRowHeight(nRow);
 }
 
-void ScDocument::SetRowHeightManual(SCROW nRow, SCTAB nTab, bool bManual)
-{
-if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || 
!maTabs[nTab])
-return;
-
-maTabs[nTab]->SetRowHeightManual(nRow, bManual);
-}
-
 void ScDocument::SyncColRowFlags()
 {
 TableContainer::iterator it = maTabs.begin();
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 8356dc5..3e244c2 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -959,14 +959,6 @@ bool ScTable::IsManualRowHeight(SCROW nRow) const
 return (pRowFlags->GetValue(nRow) & CR_MANUALSIZE) != 0;
 }
 
-void ScTable::SetRowHeightManual(SCROW nRow, bool bManual)
-{
-if (bManual)
-pRowFlags->OrValue(nRow, CR_MANUALSIZE);
-else
-pRowFlags->AndValue(nRow, 
sal::static_int_cast(~CR_MANUALSIZE));
-}
-
 namespace {
 
 void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& 
rRowSegments,
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 9d53c7d..f0a609c 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -643,7 +643,7 @@ void ScTransferObj::InitDocShell()
 
 //  if height was set manually, that flag has to be copied, too
 bool bManual = pDoc->IsManualRowHeight(nRow, nSrcTab);
-pDestDoc->SetRowHeightManual(nRow, 0, bManual);
+pDestDoc->SetManualHeight(nRow, nRow, 0, bManual);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sfx2/inc/sfx2/docfile.hxx   |2 +-
 sfx2/source/doc/docfile.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f16362fb7bf2d7823e8663ff56bcea235adfa513
Author: Kohei Yoshida 
Date:   Wed Jul 25 21:29:36 2012 -0400

Pass by const reference.

Change-Id: Iead2319a5283af69bf0edd12c639f14ddeb402ad

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 563fd0f..9a134b6 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -191,7 +191,7 @@ public:
 voidCreateTempFile( sal_Bool bReplace = sal_True );
 voidCreateTempFileNoCopy();
 ::rtl::OUString SwitchDocumentToTempFile();
-sal_BoolSwitchDocumentToFile( ::rtl::OUString aURL );
+sal_BoolSwitchDocumentToFile( const rtl::OUString& aURL );
 
 ::rtl::OUString GetBaseURL( bool bForSaving=false );
 
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 9924243..0996676 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3646,7 +3646,7 @@ sal_Bool SfxMedium::CallApproveHandler( const 
uno::Reference< task::XInteraction
 return aResult;
 }
 
-sal_Bool SfxMedium::SwitchDocumentToFile( ::rtl::OUString aURL )
+sal_Bool SfxMedium::SwitchDocumentToFile( const rtl::OUString& aURL )
 {
 // the method is only for storage based documents
 bool bResult = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6 3-6-0] fix for fdo#52393, calc does not import manual row heights

[Markus Mohrhard]

Hey,

[1] fixes the problem that calc does not import manual row heights in
3-6. We need to mark the rows as manual row height in the row flags to
prevent overriding them with automatic row height calculation. You
won't see this problem in master because we are not updating the row
heights there at the moment.

IMHO this is a fix for 3-6-0 because it is a quite serious issue.

Regards,
Markus

[1] 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c55cfd273cf1d4666b91fc9a00c71b049c34adec
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida]

 sc/inc/document.hxx  |4 +++-
 sc/inc/table.hxx |3 +++
 sc/source/core/data/document.cxx |   23 ---
 sc/source/core/data/table5.cxx   |   13 +
 sc/source/ui/app/transobj.cxx|7 ++-
 5 files changed, 37 insertions(+), 13 deletions(-)

New commits:
commit 03720cfb47870d5bf1619cae8c6ed66204b6415b
Author: Kohei Yoshida 
Date:   Thu Jul 26 17:55:18 2012 -0400

Try to encapsulate the row flag array.

Eventually this flag array will go. The manual row height flag is
the last one standing...

Change-Id: I3f6be511eba50836d785ddf20ef08878797f6fe0

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6d4a02e..39fce78 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1341,7 +1341,6 @@ public:
 SC_DLLPUBLIC sal_uInt8  GetRowFlags( SCROW nRow, SCTAB nTab ) 
const;
 
 SC_DLLPUBLIC const ScBitMaskCompressedArray< SCROW, sal_uInt8> & 
GetRowFlagsArray( SCTAB nTab ) const;
-SC_DLLPUBLIC   ScBitMaskCompressedArray< SCROW, sal_uInt8> & 
GetRowFlagsArrayModifiable( SCTAB nTab );
 
 SC_DLLPUBLIC void   GetAllRowBreaks(::std::set& rBreaks, 
SCTAB nTab, bool bPage, bool bManual) const;
 SC_DLLPUBLIC void   GetAllColBreaks(::std::set& rBreaks, 
SCTAB nTab, bool bPage, bool bManual) const;
@@ -1371,6 +1370,9 @@ public:
 SCROW   LastNonFilteredRow(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab);
 SCROW   CountNonFilteredRows(SCROW nStartRow, SCROW 
nEndRow, SCTAB nTab);
 
+bool IsManualRowHeight(SCROW nRow, SCTAB nTab) const;
+void SetRowHeightManual(SCROW nRow, SCTAB nTab, bool bManual);
+
 /**
  * Write all column row flags to table's flag data, because not all column
  * row attributes are stored in the flag data members.  This is necessary
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 966c458..0f32c31 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -746,6 +746,9 @@ public:
 SCROW   LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow) const;
 SCROW   CountNonFilteredRows(SCROW nStartRow, SCROW nEndRow) const;
 
+bool IsManualRowHeight(SCROW nRow) const;
+void SetRowHeightManual(SCROW nRow, bool bManual);
+
 voidSyncColRowFlags();
 
 voidStripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index f3724d5..df18748 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3754,13 +3754,6 @@ sal_uInt8 ScDocument::GetRowFlags( SCROW nRow, SCTAB 
nTab ) const
 return 0;
 }
 
-ScBitMaskCompressedArray< SCROW, sal_uInt8> & 
ScDocument::GetRowFlagsArrayModifiable(
-SCTAB nTab )
-{
-return const_cast< ScBitMaskCompressedArray< SCROW, sal_uInt8> & >(
-GetRowFlagsArray( nTab));
-}
-
 const ScBitMaskCompressedArray< SCROW, sal_uInt8> & 
ScDocument::GetRowFlagsArray(
 SCTAB nTab ) const
 {
@@ -3993,6 +3986,22 @@ SCROW ScDocument::CountNonFilteredRows(SCROW nStartRow, 
SCROW nEndRow, SCTAB nTa
 return maTabs[nTab]->CountNonFilteredRows(nStartRow, nEndRow);
 }
 
+bool ScDocument::IsManualRowHeight(SCROW nRow, SCTAB nTab) const
+{
+if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || 
!maTabs[nTab])
+return false;
+
+return maTabs[nTab]->IsManualRowHeight(nRow);
+}
+
+void ScDocument::SetRowHeightManual(SCROW nRow, SCTAB nTab, bool bManual)
+{
+if (!ValidTab(nTab) || nTab >= static_cast(maTabs.size()) || 
!maTabs[nTab])
+return;
+
+maTabs[nTab]->SetRowHeightManual(nRow, bManual);
+}
+
 void ScDocument::SyncColRowFlags()
 {
 TableContainer::iterator it = maTabs.begin();
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 77939a2..8356dc5 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -954,6 +954,19 @@ SCROW ScTable::CountNonFilteredRows(SCROW nStartRow, SCROW 
nEndRow) const
 return nCount;
 }
 
+bool ScTable::IsManualRowHeight(SCROW nRow) const
+{
+return (pRowFlags->GetValue(nRow) & CR_MANUALSIZE) != 0;
+}
+
+void ScTable::SetRowHeightManual(SCROW nRow, bool bManual)
+{
+if (bManual)
+pRowFlags->OrValue(nRow, CR_MANUALSIZE);
+else
+pRowFlags->AndValue(nRow, 
sal::static_int_cast(~CR_MANUALSIZE));
+}
+
 namespace {
 
 void lcl_syncFlags(ScFlatBoolColSegments& rColSegments, ScFlatBoolRowSegments& 
rRowSegments,
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 0d35c45..9d53c7d 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -632,9 +632,6 @@ void ScTransferObj::InitDocShell()
 else
 pDestDoc->SetColWidth( nCol, 0, pDoc->GetColWidth( nCol, 
nSrcTab ) );
 
-ScBitMaskCompressedArray< SCROW, sal_uInt8> & rDestRowFlags =
-pDestDoc->GetRowFlagsArrayM

[Libreoffice-commits] .: sc/source

[Markus Mohrhard]

 sc/source/ui/unoobj/docuno.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c55cfd273cf1d4666b91fc9a00c71b049c34adec
Author: Markus Mohrhard 
Date:   Thu Jul 26 23:00:58 2012 +0200

mark manual row heights correctly during import, fdo#52393

Change-Id: Id8a1658dbe6d9a89c89d1a0633392b0fa1104c4e

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 41f10ea..c43047c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3224,10 +3224,13 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
 if ( aValue >>= nNewHeight )
 {
 if (pDoc->IsImportingXML())
+{
 // TODO: This is a band-aid fix.  Eventually we need to
 // re-work ods' style import to get it to set styles to
 // ScDocument directly.
 pDoc->SetRowHeightOnly( nStartRow, nEndRow, nTab, 
(sal_uInt16)HMMToTwips(nNewHeight) );
+pDoc->SetManualHeight( nStartRow, nEndRow, nTab, true );
+}
 else
 rFunc.SetWidthOrHeight( false, 1, nRowArr, nTab, 
SC_SIZE_ORIGINAL,
 (sal_uInt16)HMMToTwips(nNewHeight), 
sal_True, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License statement

[zolniatamas]

All my contributions, past and future, to LibreOffice are licensed
under the terms of the MPL / LGPLv3+.

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

Re: [PATCH] Fix for sw_filter_test crash due to ambiguous FieldEntry destructor

[Stephan Bergmann]

On 07/25/2012 04:12 PM, Michael Stahl wrote:

it appears that at least GCC supports a weak attribute; perhaps somebody
could try out what happens with clang when it is added to the definition
of SAL_DLLPUBLIC_TEMPLATE.

diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 3db8cf4..28a908d 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -273,7 +273,7 @@ typedef void *   sal_Handle;
  # define SAL_DLLPUBLIC_EXPORT  __attribute__ ((visibility("default")))
  # define SAL_DLLPUBLIC_IMPORT  __attribute__ ((visibility("default")))
  # define SAL_DLLPRIVATE__attribute__ ((visibility("hidden")))
-# define SAL_DLLPUBLIC_TEMPLATE __attribute__ ((visibility("default")))
+# define SAL_DLLPUBLIC_TEMPLATE __attribute__
((visibility("default"),weak))
  #   else
  # define SAL_DLLPUBLIC_EXPORT
  # define SAL_DLLPUBLIC_IMPORT


no, doesn't help

Stephan

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

[Libreoffice-commits] .: 2 commits - sc/source tubes/inc tubes/qa tubes/source

[Matus Kukan]

 sc/source/ui/collab/contacts.cxx |6 +-
 sc/source/ui/collab/sendfunc.cxx |8 
 sc/source/ui/collab/sendfunc.hxx |3 ++-
 tubes/inc/tubes/conference.hxx   |2 +-
 tubes/qa/test_manager.cxx|2 +-
 tubes/source/conference.cxx  |4 ++--
 tubes/source/manager.cxx |3 ++-
 7 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit df2369657ebe36c3888bb032e693bf1fcb49bb51
Author: Matúš Kukan 
Date:   Thu Jul 26 17:56:12 2012 +0200

tubes: send file when inviting contact to MUC collaboration

- add UUID info to TeleConference
- let SendFile function take argument for contact instead of getting
  contact from the channel info, what couldn't work for MUC channel

Change-Id: I4dc45c084966a030ff4b503e192d452797f0bfdd

diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx
index 72c29a0..e6e2239 100644
--- a/sc/source/ui/collab/contacts.cxx
+++ b/sc/source/ui/collab/contacts.cxx
@@ -107,6 +107,8 @@ class TubeContacts : public ModelessDialog
 {
 TpContact* pContact = pAC->mpContact;
 pSender->GetConference()->invite( pContact );
+pSender->SendFile( pContact, OStringToOUString(
+pSender->GetConference()->getUuid(), 
RTL_TEXTENCODING_UTF8 ) );
 }
 }
 }
@@ -135,7 +137,7 @@ class TubeContacts : public ModelessDialog
 {
 ScDocFuncSend* pSender = 
EnsureScDocFuncSendInCurrentSfxObjectShell();
 pSender->SetCollaboration( pConference );
-pSender->SendFile( OStringToOUString(
+pSender->SendFile( pContact, OStringToOUString(
 pConference->getUuid(), RTL_TEXTENCODING_UTF8 ) );
 }
 }
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index b78d34c..58af1ba 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -156,7 +156,7 @@ void ScDocFuncSend::SendMessage( ScChangeOpWriter &rOp )
 mpDirect->RecvMessage( rOp.toString() );
 }
 
-void ScDocFuncSend::SendFile( const rtl::OUString &sUuid )
+void ScDocFuncSend::SendFile( TpContact* pContact, const rtl::OUString &sUuid )
 {
 String aTmpPath = utl::TempFile::CreateTempName();
 aTmpPath.Append( OUString("_") );
@@ -182,8 +182,8 @@ void ScDocFuncSend::SendFile( const rtl::OUString &sUuid )
 fprintf( stderr, "Temp file is '%s'\n",
  rtl::OUStringToOString( aFileURL, RTL_TEXTENCODING_UTF8 
).getStr() );
 
-if (mpConference)
-mpConference->sendFile( aFileURL, file_sent_cb, NULL );
+if (pContact)
+mpConference->sendFile( pContact, aFileURL, file_sent_cb, NULL );
 else
 TeleManager_fileReceived( aFileURL );
 
@@ -249,7 +249,7 @@ sal_Bool ScDocFuncSend::SetNormalString( bool& 
o_rbNumFmtSet, const ScAddress& r
 o_rbNumFmtSet = false;
 
 if ( rtl::OUString( rText ) == "saveme" )
-SendFile( rText );
+SendFile( NULL, rText );
 
 if ( rtl::OUString( rText ) == "contacts" )
 tubes::createContacts();
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index 7299983..16f6e88 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -15,6 +15,7 @@
 #include "cell.hxx"
 #include "docfunc.hxx"
 class TeleConference;
+typedef struct _TpContact TpContact;
 
 namespace {
 
@@ -236,7 +237,7 @@ public:
 voidSetCollaboration( TeleConference* pConference );
 TeleConference* GetConference();
 // TODO: I think this could be moved to TeleManager later.
-voidSendFile( const rtl::OUString &rURL );
+voidSendFile( TpContact* pContact, const rtl::OUString 
&rURL );
 
 virtual voidEnterListAction( sal_uInt16 nNameResId );
 virtual voidEndListAction();
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index fc495e5..e5c5d37 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -66,7 +66,7 @@ public:
 boost::signals2::signal sigPacketReceived;
 
 typedef void  (*FileSentCallback)( bool aSuccess, void* pUserData);
-TUBES_DLLPUBLIC voidsendFile( rtl::OUString &localUri, 
FileSentCallback pCallback, void* pUserData);
+TUBES_DLLPUBLIC voidsendFile( TpContact* pContact, rtl::OUString 
&localUri, FileSentCallback pCallback, void* pUserData);
 TUBES_DLLPUBLIC const OString& getUuid() const { return msUuid; }
 
 // --- following only to be called only by manager's callbacks ---
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index f914b33..ca03bae 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -264,7 +264,7 @@ void TestTeleTubes::testSendFile()
 /* This has to run after testContactList has run successfully. */
 C

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 51659, which changed state.

Bug 51659 Summary: File >> Wizards >> Letter Yields No UI
https://bugs.freedesktop.org/show_bug.cgi?id=51659

   What|Old Value   |New Value

 Resolution||FIXED
 Status|REOPENED|RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 51659, which changed state.

Bug 51659 Summary: File >> Wizards >> Letter Yields No UI
https://bugs.freedesktop.org/show_bug.cgi?id=51659

   What|Old Value   |New Value

 Resolution|FIXED   |
 Status|RESOLVED|REOPENED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: offapi/com officecfg/registry sd/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source

[Thorsten Behrens]

 offapi/com/sun/star/drawing/framework/XConfigurationController.idl |6 
 officecfg/registry/data/org/openoffice/Office/Impress.xcu  |   22 
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs|   44 
 sd/source/ui/framework/configuration/ConfigurationController.cxx   |   10 
 sd/source/ui/framework/module/ResourceManager.cxx  |   24 
 sd/source/ui/framework/module/ResourceManager.hxx  |3 
 sd/source/ui/framework/module/SlideSorterModule.cxx|   31 
 sd/source/ui/framework/module/SlideSorterModule.hxx|2 
 sd/source/ui/inc/framework/ConfigurationController.hxx |3 
 svtools/Library_svt.mk |1 
 svtools/Package_inc.mk |1 
 svtools/inc/svtools/slidesorterbaropt.hxx  |   83 +
 svtools/source/config/slidesorterbaropt.cxx|  496 
++
 13 files changed, 711 insertions(+), 15 deletions(-)

New commits:
commit 61679f9b7afa2f585d47bf08a3317ddc02f2fbca
Author: Rob Snelders 
Date:   Fri May 25 17:31:11 2012 +0200

fd0#35973 - [EasyHack] Remember the state of the sidebar pane in Impress

Change-Id: Ie287bc1c545bd8986ee3509181c878bdcd0d1942

diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl 
b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index 4c0fd46..1e7cdb2 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -154,6 +154,12 @@ interface XConfigurationController
 interface XConfigurationControllerBroadcaster;
 interface XResourceFactoryManager;
 
+/** Check if the ConfigurationController is disposing
+@return
+When the ConfigurationController is disposing then true else false
+*/
+boolean IsDisposing ();
+
 /** Request the activation of a resource.
 The request is processed asynchronously.  Notifications about
 configuration changes are sent after this call returns.
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu 
b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
index 6101cef..ff44549 100644
--- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu
@@ -28,6 +28,28 @@
 
 http://openoffice.org/2004/installation"; 
xmlns:oor="http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
   
+
+  
+
+  true
+
+
+  true
+
+
+  true
+
+
+  false
+
+
+  false
+
+
+  true
+
+ 
+
 
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 094cee5..cb8c31a 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -1402,11 +1402,53 @@
   
 
   
-  
+  
 
   Values related to the slide sorter.
   Slide Sorter Options
 
+
+  
+Options that control the visibility of the slide 
sorter.
+Slide Sorter Visibility
+  
+  
+
+  Visibility of the Slide Sorter in the Impress view.
+  Slide Sorter Visibility ImpressView
+
+  
+  
+
+  Visibility of the Slide Sorter in the Outline view.
+  Slide Sorter Visibility OutlineView
+
+  
+  
+
+  Visibility of the Slide Sorter in the Notes view.
+  Slide Sorter Visibility NotesView
+
+  
+  
+
+  Visibility of the Slide Sorter in the HandOut view.
+  Slide Sorter Visibility HandOutView
+
+  
+  
+
+  Visibility of the Slide Sorter in the SlideSorter 
view.
+  Slide Sorter Visibility SlideSorterView
+
+  
+  
+
+  Visibility of the Slide Sorter in the Draw view.
+  Slide Sorter Visibility DrawView
+
+  
+
 
   
 Values for tuning the preview cache of the slide 
sorter.
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx 
b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 0f49bae..6eb4299 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cx

Re: [PATCH][REJECTED] Broken check for Boost::Date_Time in configure.in

[Francois Tigeot]

On Thu, Jul 26, 2012 at 02:56:39PM +0200, David Tardon wrote:
> 
> If the test causes problems for you, fix it.

I have neither the knowledge nor the time to do it; I've filled bug
report #52558 instead.

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

[ANN] LibreOffice 3.6.0 RC3 test builds available

[Fridrich Strba]

Hi *,

for the upcoming new version 3.6.0, the RC3 builds now start to be
available on pre-releases. This build is slated to be third release
candidate build on the way towards 3.6.0, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#3.6_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try & report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 3.6.0 RC2 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugfixes-libreoffice-3-6-0-release-3.6.0.3.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.

Thanks a lot for your help,

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

Re: patches to clean up cppunit warnings (fdo#51154)

[Markus Mohrhard]

Hey,

2012/7/26 Robinson Tryon :
> https://bugs.freedesktop.org/show_bug.cgi?id=51154
>
> Here are a few patches that make cppunit compile warning-free when
> configured with "-Weffc++" (and continue to be warning-free with
> "-Wall -Wextra -Werror", too!)
>
> The .gitignore patches are pretty straightforward. The other commits
> clean up a few odds and ends, order constructor initialization lists
> properly, etc. Later commits are to fix warnings revealed by 'make
> check'.
>
> When gcc complained about classes with pointer data members not
> overriding the default copy constructors and assignment operators, I
> first added private methods to prevent the use of these methods (being
> as conservative as possible); for any class that actually required
> working implementations, I added simple methods that implement the
> default (shallow-copy, etc.) behavior. I assume that some of these
> classes may need more than just stubs for these methods, but I figured
> that I'd get some feedback :-)
>

Great work. I'll have a look at them. This is a great step into
updating the source code to modern design principles.

Thanks a lot for this work.

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

[Libreoffice-commits] .: 3 commits - configure.in offapi/type_reference solenv/gbuild

[Michael Stahl]

 configure.in|3 ++-
 offapi/type_reference/types.rdb |binary
 solenv/gbuild/UnoApi.mk |2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e7dec2887e511a18a5f9927884c1a1df45fc35f0
Author: David Ostrovsky 
Date:   Thu Jul 26 19:36:35 2012 +0200

set WINEGCC only when cross compiling

Change-Id: I598490aa71b658844d912008c0cf14e225bda0db

diff --git a/configure.in b/configure.in
index 1a0a72a..5b0aa38 100644
--- a/configure.in
+++ b/configure.in
@@ -6106,8 +6106,8 @@ AC_SUBST(BUILD_EPM)
 dnl ===
 dnl We need winegcc when building MinGW build to be able to cross-build msi 
tools
 dnl ===
-AC_PATH_PROG(WINEGCC, winegcc)
 if test "$WITH_MINGW" = "yes" -a "$PKGFORMAT" = "msi" ; then
+AC_PATH_PROG(WINEGCC, winegcc)
 if test "$WINEGCC" = ""; then
 AC_MSG_ERROR([winegcc was not found, please install wine-devel, or 
wine-devel-32bit])
 fi
@@ -6122,6 +6122,7 @@ printf ("hello world\n");
 )
 CC="$CC_save"
 fi
+AC_SUBST(WINEGCC)
 
 dnl ===
 dnl Check for gperf
commit b391778d81ea0f67264e09c70c85a0bff9647f99
Author: Michael Stahl 
Date:   Thu Jul 26 20:56:11 2012 +0200

offapi: update types.rdb to what is shipping in LO 3.6.0.3

Also fixes annying warnings about removed types:
WARNING: could not open key "/UCR/com/sun/star/oooimprovement/XCore"
WARNING: could not open key
"/UCR/com/sun/star/oooimprovement/XCoreController"
WARNING: could not open key "/UCR/com/sun/star/oooimprovement/Core"
WARNING: could not open key
"/UCR/com/sun/star/oooimprovement/CoreController"

Change-Id: I1c09f1de42ed558bc22cc8a90d2c0fee2ca3a1da

diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 936c5c6..be001df 100644
Binary files a/offapi/type_reference/types.rdb and 
b/offapi/type_reference/types.rdb differ
commit 3348b3825706c47c1d6b0a06c382ad070357c1e7
Author: Michael Stahl 
Date:   Thu Jul 26 20:30:23 2012 +0200

gbuild: UnoApi: fix spurious re-delivery of RDBs

similar to 3378c2d3b88a8413deeb8365ce40d4ee0716eff6 but for
gb_UnoApi__use_api.

Change-Id: I20c1e3bc63caa5ead695d142d8ef39effe54fdab

diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 18f1128..da9a4af 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -131,7 +131,7 @@ endef
 
 define gb_UnoApi__use_api
 $(call gb_UnoApiHeadersTarget_use_api,$(1),$(2))
-$(call gb_UnoApi_get_target,$(1)) : $(call gb_UnoApi_get_target,$(2))
+$(call gb_UnoApi_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - vcl/source

[Tomaž Vajngerl]

 vcl/source/gdi/bitmap3.cxx  |   64 -
 vcl/source/gdi/bitmapex.cxx |   97 ++--
 2 files changed, 5 insertions(+), 156 deletions(-)

New commits:
commit 47ab19faef29f0d6ec163c417c1f38ed06078e36
Author: Tomaž Vajngerl 
Date:   Thu Jul 26 20:58:31 2012 +0200

Only make transparent mask when the angle is not 0, 90, 180 or 270.

Change-Id: I46798192d019967f74e4d118b1dd322072cd3997

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index d4fea95..e7df476 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -393,11 +393,13 @@ sal_Bool BitmapEx::ScaleCropRotate(
 {
 bool bRet = false;
 
-const bool bTransparentRotate = ( Color( COL_TRANSPARENT ) == rFillColor );
-
 if( !!aBitmap )
 {
-if( bTransparentRotate )
+const bool bTransparentRotate = ( Color( COL_TRANSPARENT ) == 
rFillColor );
+
+bool bRightAngleRotation = (nAngle10 == 0 || nAngle10 == 900 || 
nAngle10 == 1800 || nAngle10 == 2700);
+
+if( !bRightAngleRotation && bTransparentRotate )
 {
 if( eTransparent == TRANSPARENT_COLOR )
 {
commit d37ea5bc4b3370f9181de2f74a6c27c02c77bb5d
Author: Tomaž Vajngerl 
Date:   Thu Jul 26 20:41:59 2012 +0200

Remove useless code separaion comments in bitmapex.cxx

Change-Id: Ic77244abfc68da4b5e64d2159d5700e8ac03a999

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index beba5d5..d4fea95 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -48,18 +48,12 @@
 #include 
 #include 
 
-// 
-// - BitmapEx -
-// 
-
 BitmapEx::BitmapEx() :
 eTransparent( TRANSPARENT_NONE ),
 bAlpha  ( sal_False )
 {
 }
 
-// --
-
 BitmapEx::BitmapEx( const BitmapEx& rBitmapEx ) :
 aBitmap ( rBitmapEx.aBitmap ),
 aMask   ( rBitmapEx.aMask ),
@@ -92,8 +86,6 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, 
Size aSize ) :
 CopyPixel( aDestRect, aSrcRect, &rBitmapEx );
 }
 
-// --
-
 BitmapEx::BitmapEx( const ResId& rResId ) :
 eTransparent( TRANSPARENT_NONE ),
 bAlpha  ( sal_False )
@@ -119,8 +111,6 @@ BitmapEx::BitmapEx( const ResId& rResId ) :
 }
 }
 
-// --
-
 BitmapEx::BitmapEx( const Bitmap& rBmp ) :
 aBitmap ( rBmp ),
 aBitmapSize ( aBitmap.GetSizePixel() ),
@@ -129,8 +119,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp ) :
 {
 }
 
-// --
-
 BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) :
 aBitmap ( rBmp ),
 aMask   ( rMask ),
@@ -149,8 +137,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask 
) :
 }
 }
 
-// --
-
 BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) :
 aBitmap ( rBmp ),
 aMask   ( rAlphaMask.ImplGetBitmap() ),
@@ -168,8 +154,6 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& 
rAlphaMask ) :
 aBitmap.Convert( BMP_CONVERSION_24BIT );
 }
 
-// --
-
 BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) :
 aBitmap ( rBmp ),
 aBitmapSize ( aBitmap.GetSizePixel() ),
@@ -183,16 +167,10 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& 
rTransparentColor ) :
 "BitmapEx::BitmapEx(): size mismatch for bitmap and alpha 
mask." );
 }
 
-// --
-
 BitmapEx::~BitmapEx()
 {
 }
 
-// --
-
-// --
-
 BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx )
 {
 if( &rBitmapEx != this )
@@ -208,8 +186,6 @@ BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx )
 return *this;
 }
 
-// --
-
 sal_Bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
 {
 if( eTransparent != rBitmapEx.eTransparent )
@@ -230,8 +206,6 @@ sal_Bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) 
const
 return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) );
 }
 
-// --
-
 sal_Bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const
 {
 return( rBmpEx.eTransparent == eTransparent &&
@@ -240,15 +214,11 @@ sal_Bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const
 rBmpEx.aMask.IsEqual( aMask ) );
 }
 
-// -

Re: [PUSHED 3-6][REVIEW 3-6-0 2/3] fdo#51252 LO cannot start (reports runtime error with Visual C++ Runtime Library)

[Eike Rathke]

Hi,

On Thursday, 2012-07-26 17:08:50 +0100, Caolán McNamara wrote:

> On Thu, 2012-07-26 at 13:28 +0200, Stephan Bergmann wrote:
> > See , comment 35 
> > to "LO cannot start (reports runtime error with Visual C++ Runtime 
> > Library)," on why I think it would be a good idea to backport 
> > 
> >  
> > "fdo#51252 Disable copying share/prereg/bundled to avoid startup 
> > crashes" to libreoffice-3-6 and libreoffice-3-6-0 and do a LO 3.6.0 rc4.

Gee, much detailed explanation on why things fail as they do.. thanks
Stephan.

> Pushed to 3-6.

Marked thread as such.

> +1 for 3-6-0. And lets remove, rather than fix, that
> bundled foo seeing as that's twice now its tripped us up :-)

So here my vote for 3-6-0, another last one to cherry-pick is needed.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpnuKxv7LZ3c.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW-3-5][REVIEW-3-6] Fix for fdo#50990 - Visio document imported as empty page

[Fridrich Strba]

Hello, good people,

During a part of the hackweek, I worked on refactoring the libvisio VSD
parser to be able to handle documents that are generated by Visio SDK,
most probably the document attached to fdo#50990 was generated like that.

The commit in master is
http://cgit.freedesktop.org/libreoffice/core/commit/?id=46f61ff87098dad62e32aa162c4ccfa71850550a

The refactoring passed our regression tests and I tested it with some of
the documents attached to fixed bugs in bugzilla that concerned Visio.
It would be good to have it in both 3.5.6 and 3.6.1 at least.

Cheers

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

Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#51252 LO cannot start (reports runtime error with Visual C++ Runtime Library)

[Fridrich Strba]

My +1 for 3-6-0

On 26/07/12 13:28, Stephan Bergmann wrote:
> See , comment 35
> to "LO cannot start (reports runtime error with Visual C++ Runtime
> Library)," on why I think it would be a good idea to backport
> 
> "fdo#51252 Disable copying share/prereg/bundled to avoid startup
> crashes" to libreoffice-3-6 and libreoffice-3-6-0 and do a LO 3.6.0 rc4.
> 
> Sorry for the trouble,
> Stephan
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[PATCH] set WINEGCC only when cross compiling

[Gerrit]

>From David Ostrovsky :

David Ostrovsky has uploaded a new change for review.

Change subject: set WINEGCC only when cross compiling
..

set WINEGCC only when cross compiling

Change-Id: I598490aa71b658844d912008c0cf14e225bda0db
---
M configure.in
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/346/1
--
To view, visit https://gerrit.libreoffice.org/346
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I598490aa71b658844d912008c0cf14e225bda0db
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky 

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

patches to clean up cppunit warnings (fdo#51154)

[Robinson Tryon]

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

Here are a few patches that make cppunit compile warning-free when
configured with "-Weffc++" (and continue to be warning-free with
"-Wall -Wextra -Werror", too!)

The .gitignore patches are pretty straightforward. The other commits
clean up a few odds and ends, order constructor initialization lists
properly, etc. Later commits are to fix warnings revealed by 'make
check'.

When gcc complained about classes with pointer data members not
overriding the default copy constructors and assignment operators, I
first added private methods to prevent the use of these methods (being
as conservative as possible); for any class that actually required
working implementations, I added simple methods that implement the
default (shallow-copy, etc.) behavior. I assume that some of these
classes may need more than just stubs for these methods, but I figured
that I'd get some feedback :-)


Cheers,
-- Robinson


cppunit-warning-cleanup.tar.gz
Description: GNU Zip compressed data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: libvisio/libvisio-0.0.18.patch libvisio/makefile.mk ooo.lst.in

[Fridrich Strba]

 libvisio/libvisio-0.0.18.patch |   10 --
 libvisio/makefile.mk   |7 ++-
 ooo.lst.in |2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

New commits:
commit 46f61ff87098dad62e32aa162c4ccfa71850550a
Author: Fridrich Å trba 
Date:   Thu Jul 26 19:31:43 2012 +0200

Uploading libvisio 0.0.19, fixes fdo#50990

Change-Id: Iafd39d5aa3f3922d84518a3d808aac25dbae0e06

diff --git a/libvisio/libvisio-0.0.18.patch b/libvisio/libvisio-0.0.18.patch
deleted file mode 100644
index 7260eed..000
--- a/libvisio/libvisio-0.0.18.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 misc/libvisio-0.0.18/src/lib/VSDXContentCollector.cpp  2012-06-22 
08:48:16.0 +0200
-+++ misc/build/libvisio-0.0.18/src/lib/VSDXContentCollector.cpp
2012-07-24 09:47:01.195105586 +0200
-@@ -2648,6 +2648,7 @@
- text.append(m_fields[m_fieldIndex++].cstr());
-   else
- m_fieldIndex++;
-+++iter;
- }
- else if (*iter < 0x20)
- {
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index a19c394..ab69692 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -54,11 +54,8 @@ INCPRE+=$(WPG_CFLAGS)
 INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 .ENDIF
 
-TARFILE_NAME=libvisio-0.0.18
-TARFILE_MD5=a9a1db27688bad49418667b434d29c1f
-
-PATCH_FILES=\
-   $(TARFILE_NAME).patch
+TARFILE_NAME=libvisio-0.0.19
+TARFILE_MD5=94e7f271e38c976462558b4278590178
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
diff --git a/ooo.lst.in b/ooo.lst.in
index 86f470a..7197b18 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -87,7 +87,7 @@ d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
-a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
+94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
 ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - rsc/inc rsc/source svtools/inc svtools/source vcl/inc vcl/source

[Ivan Timofeev]

 rsc/inc/vclrsc.hxx |2 -
 rsc/source/parser/rscicpx.cxx  |2 -
 svtools/inc/svtools/svtreebx.hxx   |1 
 svtools/source/contnr/svimpbox.cxx |   55 +-
 svtools/source/inc/svimpbox.hxx|2 -
 vcl/inc/vcl/window.hxx |2 -
 vcl/source/window/brdwin.cxx   |   59 ++---
 7 files changed, 31 insertions(+), 92 deletions(-)

New commits:
commit 09cc3a1b65dbf40717c4b41f24e86450f6fb4a99
Author: Ivan Timofeev 
Date:   Thu Jul 26 20:20:38 2012 +0400

pTabBar is always NULL

Change-Id: I0f40a54c02c0231f75fcfcae7676f529984ee0f2

diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index b656bdb..02c223e 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -36,7 +36,6 @@
 // forward and defines ---
 
 class SvImpLBox;
-class TabBar;
 
 #define SV_TAB_BORDER 8
 
diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 21a0e4a..d828661 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -54,7 +53,6 @@ sal_Int32 SvImpLBox::s_nImageRefCount   = 0;
 
 SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits 
nWinStyle) :
 
-pTabBar( NULL ),
 aVerSBar( pLBView, WB_DRAG | WB_VSCROLL ),
 aHorSBar( pLBView, WB_DRAG | WB_HSCROLL ),
 aScrBarBox( pLBView ),
@@ -281,13 +279,7 @@ void SvImpLBox::Clear()
 aVerSBar.SetRange( aRange );
 aOutputSize = pView->Control::GetOutputSizePixel();
 nFlags &= ~(F_VER_SBARSIZE_WITH_HBAR | F_HOR_SBARSIZE_WITH_VBAR );
-if( pTabBar )
-{
-aOutputSize.Height() -= nHorSBarHeight;
-nFlags |= F_VER_SBARSIZE_WITH_HBAR;
-}
-if( !pTabBar )
-aHorSBar.Hide();
+aHorSBar.Hide();
 aHorSBar.SetThumbPos( 0 );
 MapMode aMapMode( pView->GetMapMode());
 aMapMode.SetOrigin( Point(0,0) );
@@ -1154,39 +1146,13 @@ void SvImpLBox::DrawNet()
 pView->SetLineColor( aOldLineColor );
 }
 
-
-static long GetOptSize( TabBar* pTabBar )
-{
-return pTabBar->CalcWindowSizePixel().Width();
-}
-
 void SvImpLBox::PositionScrollBars( Size& rSize, sal_uInt16 nMask )
 {
 long nOverlap = 0;
 
 Size aVerSize( nVerSBarWidth, rSize.Height() );
 Size aHorSize( rSize.Width(), nHorSBarHeight );
-long nTabBarWidth = 0;
-if( pTabBar )
-{
-nTabBarWidth = GetOptSize( pTabBar );
-long nMaxWidth = (rSize.Width() * 700) / 1000;
-if( nTabBarWidth > nMaxWidth )
-{
-nTabBarWidth = nMaxWidth;
-pTabBar->SetStyle( pTabBar->GetStyle() | WB_MINSCROLL );
-}
-else
-{
-WinBits nStyle = pTabBar->GetStyle();
-nStyle &= ~(WB_MINSCROLL);
-pTabBar->SetStyle( nStyle );
-}
-aHorSize.Width() -= nTabBarWidth;
-Size aTabSize( pTabBar->GetSizePixel() );
-aTabSize.Width() = nTabBarWidth;
-pTabBar->SetSizePixel( aTabSize );
-}
+
 if( nMask & 0x0001 )
 aHorSize.Width() -= nVerSBarWidth;
 if( nMask & 0x0002 )
@@ -1198,23 +1164,18 @@ void SvImpLBox::PositionScrollBars( Size& rSize, 
sal_uInt16 nMask )
 
 aHorSize.Width() += 2 * nOverlap;
 Point aHorPos( -nOverlap, rSize.Height() - aHorSize.Height() + nOverlap );
-if( pTabBar )
-pTabBar->SetPosPixel( aHorPos );
-aHorPos.X() += nTabBarWidth;
+
 aHorSBar.SetPosSizePixel( aHorPos, aHorSize );
 
 if( nMask & 0x0001 )
 rSize.Width() = aVerPos.X();
 if( nMask & 0x0002 )
 rSize.Height() = aHorPos.Y();
-if( pTabBar )
-pTabBar->Show();
 
 if( (nMask & (0x0001|0x0002)) == (0x0001|0x0002) )
 aScrBarBox.Show();
 else
 aScrBarBox.Hide();
-
 }
 
 // nResult: Bit0 == VerSBar Bit1 == HorSBar
@@ -1236,10 +1197,11 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
 aOrigin.X() *= -1;
 nMaxRight += aOrigin.X() - 1;
 long nVis = nMostRight - aOrigin.X();
-if( pTabBar || (
-(nWindowStyle & WB_HSCROLL) &&
-(nVis < nMostRight || nMaxRight < nMostRight) ))
+if( (nWindowStyle & WB_HSCROLL) &&
+(nVis < nMostRight || nMaxRight < nMostRight) )
+{
 bHorBar = sal_True;
+}
 
 // number of entries that are not collapsed
 sal_uLong nTotalCount = pView->GetVisibleCount();
@@ -1335,8 +1297,7 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize )
 aHorSBar.Show();
 else
 {
-if( !pTabBar )
-aHorSBar.Hide();
+aHorSBar.Hide();
 }
 rSize = aOSize;
 return nResult;
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index b12e3b9..e8c6a59 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -44,7 +44,6 @@ 

Re: [REVIEW 3-6][REVIEW 3-6-0 1/3] fdo#51252 LO cannot start (reports runtime error with Visual C++ Runtime Library)

[Stephan Bergmann]

On 07/26/2012 06:08 PM, Caolán McNamara wrote:

And lets remove, rather than fix, that bundled foo seeing as that's
twice now its tripped us up :-)


Indeed.  It was a nice attempt at speeding up firststart, but I am 
convinced that it is broken by design.  Also, removing it saves us from 
the hassle of calling "unopkg sync" at instset creation time and/or 
during installation (and why do we do the latter anyway---if we indeed 
still do it, that is).


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

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

[Caolán McNamara]

 desktop/source/app/app.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3cd9756c036a23468e19582bc7aa2519ab1a0bd
Author: Stephan Bergmann 
Date:   Thu Jul 26 13:20:31 2012 +0200

fdo#51252  Disable copying share/prereg/bundled to avoid startup crashes

...see , comment 35 
to
"LO cannot start (reports runtime error with Visual C++ Runtime Library)" 
for
all the details.  This commit is intended as a band aid, to be backported to
libreoffice-3-6-0.  It can be cleaned up later on.

Change-Id: I2984cdd7efc279e3ef482a762b614e1d625a697f
(cherry picked from commit 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4)

Signed-off-by: Caolán McNamara 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8ebccdd..f8036cd 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -641,7 +641,7 @@ void Desktop::Init()
 // copy bundled folder to the user directory
 osl::FileBase::RC rc = osl::Directory::createPath(aUserPath);
 (void) rc;
-copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 );
+if (false) copy_bundled_recursive( aPreregBundledPath, aUserPath, 
+1 );
 }
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6][REVIEW 3-6-0 1/3] fdo#51252 LO cannot start (reports runtime error with Visual C++ Runtime Library)

[Caolán McNamara]

On Thu, 2012-07-26 at 13:28 +0200, Stephan Bergmann wrote:
> See , comment 35 
> to "LO cannot start (reports runtime error with Visual C++ Runtime 
> Library)," on why I think it would be a good idea to backport 
> 
>  
> "fdo#51252 Disable copying share/prereg/bundled to avoid startup 
> crashes" to libreoffice-3-6 and libreoffice-3-6-0 and do a LO 3.6.0 rc4.

Pushed to 3-6. +1 for 3-6-0. And lets remove, rather than fix, that
bundled foo seeing as that's twice now its tripped us up :-)

C.

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

[ACTION NEEDED] Declare what you want to make incompatible [was Re: Changes needed for "LibreOffice 4"]

[Jan Holesovsky]

Hi,

On 2012-07-20 at 17:20 +0200, Lubos Lunak wrote:

>  So, as long as we decide to do c) when switching to LO4 (which AFAIK we plan 
> to do, even if c) alone is not the reason), the page first needs to be 
> cleaned up to contain only items that actually do have something to do with 
> LibreOffice4.

Lubos - thank you a lot for this great writeup!

During the call, a combination of 3) [break, until we are confident
again] + 4) [break, and provide compatibility wrappers] seemed to me as
closest to the general attitude of "declare the 4.0 incompatible, but
try hard not to break things" that was mentioned few times.

So - until the next ESC (2012-08-02), let's collect things that are
incompatible _and_ people will be able to actually work on, so that we
filter out those "nice to have, but nobody will do them anyway".

Please, everyone who wants to do an incompatible change, and will work
on it, move it in the 'LibreOffice4' wiki page to the following section,
together with your name:

https://wiki.documentfoundation.org/Development/LibreOffice4#Stuff_that_people_actually_will_do

That will make it possible at the next ESC meeting to discuss point by
point, and agree if we can do it, and how to do it with the least
impact.

Thank you a lot,
Kendy

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

[Libreoffice-commits] .: 6 commits - lotuswordpro/qa sfx2/inc sfx2/source solenv/bin svtools/source sw/inc sw/qa sw/source unotest/inc unotest/source unusedcode.easy

[Caolán McNamara]

 lotuswordpro/qa/cppunit/data/fail/CVE-2012-1770-1.lwp |binary
 sfx2/inc/sfx2/docfile.hxx |9 ---
 sfx2/source/doc/docfile.cxx   |   29 
 solenv/bin/make_installer.pl  |2 
 svtools/source/misc/embedhlp.cxx  |   25 +++---
 sw/inc/modeltoviewhelper.hxx  |   33 +++---
 sw/inc/ndtxt.hxx  |3 -
 sw/inc/swscanner.hxx  |4 -
 sw/inc/unoflatpara.hxx|2 
 sw/inc/unotextmarkup.hxx  |7 +--
 sw/qa/core/swdoc-test.cxx |2 
 sw/source/core/doc/docedt.cxx |   22 -
 sw/source/core/edit/edlingu.cxx   |   19 +++-
 sw/source/core/text/porlay.cxx|2 
 sw/source/core/txtnode/modeltoviewhelper.cxx  |   21 ++---
 sw/source/core/txtnode/ndtxt.cxx  |   28 +++-
 sw/source/core/txtnode/txtedt.cxx |   41 --
 sw/source/core/unocore/unoflatpara.cxx|   25 --
 sw/source/core/unocore/unotextmarkup.cxx  |   29 ++--
 unotest/inc/unotest/filters-test.hxx  |5 +-
 unotest/source/cpp/filters-test.cxx   |   15 --
 unusedcode.easy   |   15 --
 22 files changed, 138 insertions(+), 200 deletions(-)

New commits:
commit 97e3a9a3a62e52821f5f3389931d109a9070ec40
Author: Caolán McNamara 
Date:   Thu Jul 26 16:36:47 2012 +0100

callcatcher: update used code post-stlification

Change-Id: Ife742cfbb5295fafe36ba608744a3b3e356cc061

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 044ae4b..563fd0f 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -100,13 +100,7 @@ public:
 
 SfxMedium( const ::com::sun::star::uno::Reference< 
::com::sun::star::embed::XStorage >& xStorage,
 const String& rBaseURL,
-const SfxItemSet* pSet=0,
-sal_Bool bRoot = sal_False );
-SfxMedium( const ::com::sun::star::uno::Reference< 
::com::sun::star::embed::XStorage >& xStorage,
-const String& rBaseURL,
-   const 
String& rTypeName,
-const SfxItemSet* pSet=0,
-sal_Bool bRoot = sal_False );
+const SfxItemSet* pSet=0 );
 SfxMedium( const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& aArgs );
 
 ~SfxMedium();
@@ -158,7 +152,6 @@ public:
 voidCloseInStream();
 sal_BoolCloseOutStream();
 
-sal_BoolIsRoot() const;
 voidCloseStorage();
 
 StreamMode  GetOpenMode() const;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b0e0640..9924243 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -260,7 +260,6 @@ public:
 bool m_bGotDateTime:1;
 bool m_bRemoveBackup:1;
 bool m_bOriginallyReadOnly:1;
-bool m_bRoot:1;
 bool m_bTriedStorage:1;
 bool m_bRemote:1;
 bool m_bInputStreamIsReadOnly:1;
@@ -334,7 +333,6 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
 m_bGotDateTime( false ),
 m_bRemoveBackup( false ),
 m_bOriginallyReadOnly(false),
-m_bRoot(false),
 m_bTriedStorage(false),
 m_bRemote(false),
 m_bInputStreamIsReadOnly(false),
@@ -1436,11 +1434,6 @@ void SfxMedium::CloseZipStorage_Impl()
 }
 }
 
-sal_Bool SfxMedium::IsRoot() const
-{
-return pImp->m_bRoot;
-}
-
 void SfxMedium::CloseStorage()
 {
 if ( pImp->xStorage.is() )
@@ -2904,11 +2897,9 @@ SfxMedium::SfxMedium( const 
::com::sun::star::uno::Sequence< ::com::sun::star::b
 
 //--
 
-SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const 
String& rBaseURL, const SfxItemSet* p, sal_Bool bRootP ) :
+SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const 
String& rBaseURL, const SfxItemSet* p ) :
 pImp(new SfxMedium_Impl(this))
 {
-pImp->m_bRoot = bRootP;
-
 String aType = SfxFilter::GetTypeFromStorage( rStor );
 pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( aType );
 DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
@@ -2923,24 +2914,6 @@ SfxMedium::SfxMedium( const uno::Reference < 
embed::XStorage >& rStor, const Str
 GetItemSet()->Put( *p );
 }
 
-SfxMedium::SfxMedium( const

Re: [PUSHED-3-6] [REVIEW-3-6-0] Revised "Document as Email" icon

[Ivan Timofeev]

On 26.07.2012 18:45, Eike Rathke wrote:

Hi,

On Thursday, 2012-07-26 15:51:26 +0200, Stefan Knorr wrote:


some people (everyone who commented on that issue so far) found the new
paper plane icon for Send Document as Email confusing.

Thus, I've pushed a more conventional icon to master. Please review for
3.6 and (if it isn't too late for 3.6.0).


These look much more identifiable.. cherry-picked to 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=dd3eb2e32156e71103f2c96f0dadac30e7cffdc6


+1 for 3-6-0, I even did not understand that it was a paper plane (on 
the small icon). %-|


Ivan

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

Re: [PUSHED-3-6] [REVIEW-3-6-0] Revised "Document as Email" icon

[Eike Rathke]

Hi,

On Thursday, 2012-07-26 15:51:26 +0200, Stefan Knorr wrote:

> some people (everyone who commented on that issue so far) found the new
> paper plane icon for Send Document as Email confusing.
> 
> Thus, I've pushed a more conventional icon to master. Please review for
> 3.6 and (if it isn't too late for 3.6.0).

These look much more identifiable.. cherry-picked to 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6&id=dd3eb2e32156e71103f2c96f0dadac30e7cffdc6

Btw, I wondered about all the (old?) *.xcf.bz2 files in
icon-themes/tango/cmd, what's up with those?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpH2XniwgkuV.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - icon-themes/tango

[Eike Rathke]

 icon-themes/tango/cmd/lc_sendmail.png |binary
 icon-themes/tango/cmd/sc_sendmail.png |binary
 2 files changed

New commits:
commit dd3eb2e32156e71103f2c96f0dadac30e7cffdc6
Author: Stefan Knorr 
Date:   Wed Jul 25 14:54:06 2012 +0200

Use safer icon for "Send E-Mail" [Used under CC-BY-SA]

Not everyone finds the paper plane icon understandable.

Authors:
Lapo Calamandrei 
Jakub Steiner 
[the Gnome project]

Used under Creative Commons Attribution-Share Alike 3.0
United States license

Change-Id: Ifd888a6f851250fd5c5c8b1e642dbd1c5c42b4e1
(cherry picked from commit 9b773bfd59d3717d85ff14fd04123f3ea66fc3bf)

Signed-off-by: Eike Rathke 

diff --git a/icon-themes/tango/cmd/lc_sendmail.png 
b/icon-themes/tango/cmd/lc_sendmail.png
index a2a37c7..015b978 100644
Binary files a/icon-themes/tango/cmd/lc_sendmail.png and 
b/icon-themes/tango/cmd/lc_sendmail.png differ
diff --git a/icon-themes/tango/cmd/sc_sendmail.png 
b/icon-themes/tango/cmd/sc_sendmail.png
index 4a065e7..a96bdfb 100644
Binary files a/icon-themes/tango/cmd/sc_sendmail.png and 
b/icon-themes/tango/cmd/sc_sendmail.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/math-escaping.rtf |   12 
 sw/qa/extras/rtfexport/rtfexport.cxx  |   16 +---
 2 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit e5e85f2987a27db7efb2b24039b5c1ddf3f5d90e
Author: Miklos Vajna 
Date:   Thu Jul 26 16:16:38 2012 +0200

test RTF math export escaping

Change-Id: Ib1303ddc8ea31cfea2d438eaf5986ea71aa32f15

diff --git a/sw/qa/extras/rtfexport/data/math-escaping.rtf 
b/sw/qa/extras/rtfexport/data/math-escaping.rtf
new file mode 100644
index 000..fc7dadb
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/math-escaping.rtf
@@ -0,0 +1,12 @@
+{\rtf1
+{\mmath
+{\*\moMathPara 
+{\*\moMath 
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid15614577 
\loch\af34\dbch\af42\hich\f34 
+{\mr\mscr0\msty2 \'e1\{}
+}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 2a9c7a1..f09de2b 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -51,12 +51,10 @@ public:
 void testFdo50831();
 void testFdo48335();
 void testFdo38244();
-// No idea why does this fail with gcc-4.4, probably independent.
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || 
defined(__clang__))
 void testMathAccents();
 void testMathEqarray();
 void testMathD();
-#endif
+void testMathEscaping();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -68,9 +66,13 @@ public:
 CPPUNIT_TEST(testFdo50831);
 CPPUNIT_TEST(testFdo48335);
 CPPUNIT_TEST(testFdo38244);
+// No idea why does this fail with gcc-4.4, probably independent.
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || 
defined(__clang__))
 CPPUNIT_TEST(testMathAccents);
 CPPUNIT_TEST(testMathEqarray);
 CPPUNIT_TEST(testMathD);
+CPPUNIT_TEST(testMathEscaping);
+#endif
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -235,6 +237,14 @@ void Test::testMathD()
 CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
 }
 
+void Test::testMathEscaping()
+{
+roundtrip("math-escaping.rtf");
+OUString aActual = getFormula(getRun(getParagraph(1), 1));
+OUString aExpected("á \\{", 5, RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/math-d.rtf |  170 +
 sw/qa/extras/rtfexport/rtfexport.cxx   |   13 ++
 2 files changed, 183 insertions(+)

New commits:
commit a2453c22abb7f63921922cc6da198fc94e093c9b
Author: Miklos Vajna 
Date:   Thu Jul 26 16:07:47 2012 +0200

test RTF_MD

Change-Id: Ib41b2599d843a5a0840f05e79a310afab42cd7cd

diff --git a/sw/qa/extras/rtfexport/data/math-d.rtf 
b/sw/qa/extras/rtfexport/data/math-d.rtf
new file mode 100644
index 000..e1e67f4
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/math-d.rtf
@@ -0,0 +1,170 @@
+{\rtf1
+{\mmath
+{\*\moMathPara 
+{\*\moMath 
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid1140831 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 x}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 y}
+}
+{\rtlch\fcs1 \af1 
+\ltrch\fcs0 \f34\insrsid1140831 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 z}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 1}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mbegChr [}
+{\mendChr ]}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 2}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mbegChr \u10214 ?}
+{\mendChr \u10215 ?}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 3}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mbegChr |}
+{\mendChr |}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 4}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 
+\ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mbegChr \u8741 ?}
+{\mendChr \u8741 ?}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 5}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mbegChr \u9001 <}
+{\mendChr \u9002 >}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 6}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mbegChr \u9001 <}
+{\mendChr \u9002 >}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{
+\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 b}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\f34\insrsid1140831 }
+{\md
+{\mdPr
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+{\mf
+{\mfPr
+{\mctrlPr\f34 }
+}
+{\mnum
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 x}
+}
+{\rtlch\fcs1 \af1 
+\ltrch\fcs0 \f34\insrsid1140831 }
+}
+{\mden
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid1140831 
\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 y}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid1140831 }
+}
+}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 64950a6..2a9c7a1 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -51,8 +51,12 @@ public:
 void testFdo50831();
 void testFdo48335();
 void testFdo38244();
+// No idea why does this fail with gcc-4.4, probably independent.
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || 
defined(__clang__))
 void testMathAccents();
 void testMathEqarray();
+void testMathD();
+#endif
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -66,6 +70,7 @@ public:
 CPPUNIT_TEST(testFdo38244);
 CPPUNIT_TEST(testMathAccents);
 CPPUNIT_TEST(testMathEqarray);
+CPPUNIT_TEST(testMathD);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -222,6 +227,14 @@ void Test::testMathEqarray()
 CPPUNIT_ASSERT_EQUAL(aExpected, aA

Re: [REVIEW-3-6] [REVIEW-3-6-0] Revised "Document as Email" icon

[Michael Stahl]

On 26/07/12 15:51, Stefan Knorr wrote:
> Hi there,
> 
> some people (everyone who commented on that issue so far) found the new
> paper plane icon for Send Document as Email confusing.

what? who? the heretics! the paper plane is super awesome!!!11!one!

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

[Libreoffice-commits] .: 6 commits - desktop/inc desktop/source Makefile Makefile.top sc/source tubes/inc tubes/qa tubes/source

[Matus Kukan]

 Makefile |6 +-
 Makefile.top |   10 ---
 desktop/inc/app.hxx  |3 -
 desktop/source/app/app.cxx   |9 ++-
 sc/source/ui/collab/contacts.cxx |4 -
 sc/source/ui/collab/sendfunc.cxx |4 -
 tubes/inc/tubes/manager.hxx  |   41 ++-
 tubes/qa/test_manager.cxx|5 -
 tubes/source/manager.cxx |  105 +--
 9 files changed, 52 insertions(+), 135 deletions(-)

New commits:
commit a236141e4aec1046dab191abcdea226522127242
Author: Matúš Kukan 
Date:   Thu Jul 26 15:49:10 2012 +0200

move help target to Makefile; it doesn't need config_host.mk

Change-Id: Ib627bb0a12b5b055f8d6077c00cc8099473fa176

diff --git a/Makefile b/Makefile
index 8b27545..4d97e71 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword 
$(MAKEFILE_LIST)
 .PHONY : $(filter-out $(SRCDIR)/config_host.mk,$(MAKECMDGOALS))
 
 # recursively invoke Makefile.top, which includes config_host.mk
-$(firstword $(MAKECMDGOALS)) : $(SRCDIR)/config_host.mk
+$(filter-out help,$(firstword $(MAKECMDGOALS))) : $(SRCDIR)/config_host.mk
$(MAKE) -r -f $(SRCDIR)/Makefile.top $(MAKECMDGOALS)
 
 # run configure in an environment not polluted by config_host.mk
@@ -34,4 +34,8 @@ $(SRCDIR)/config_host.mk : \
 $(SRCDIR)/autogen.lastrun:
@true
 
+help:
+   @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
+   @true
+
 # vim: set noet sw=4 ts=4:
diff --git a/Makefile.top b/Makefile.top
index 11468c5..4aaf832 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -527,14 +527,4 @@ debugrun:
 
 endif # not clean or distclean
 
-
-#
-# help
-#
-.PHONY: help
-help:
-   @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
-   @true
-
-
 # vim: set noet sw=4 ts=4:
commit 7f77377850537194ea634f0d2c81e8cc5cb90a1b
Author: Matúš Kukan 
Date:   Thu Jul 26 12:56:19 2012 +0200

tubes: clean this out

Change-Id: I7d4cafbe51695c0ff36480311858b9167344c119

diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 9938f6f..b5a68b2 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -30,13 +30,8 @@
 #define INCLUDED_TUBES_MANAGER_HXX
 
 #include 
-#include "tubes/tubesdllapi.h"
-#include "tubes/conference.hxx"
-#include "tubes/contact-list.hxx"
+#include 
 #include 
-#include 
-#include 
-#include 
 
 // For testing purposes, we might need more in future.
 #define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc"
@@ -44,11 +39,11 @@
 #define LIBO_TUBES_DBUS_PATH "/org/libreoffice/calc"
 
 namespace osl { class Mutex; }
+class ContactList;
+class TeleConference;
 class TeleManagerImpl;
 typedef struct _TpAccount TpAccount;
 typedef struct _TpContact TpContact;
-typedef struct _GMainLoop GMainLoop;
-typedef struct _GMainContext GMainContext;
 
 /** Interface to Telepathy DBus Tubes.
 
@@ -193,8 +188,6 @@ private:
 static sal_uInt32   nRefCount;
 static rtl::OString aNameSuffix;
 
-friend class TeleManagerImpl;   // access to mutex
-
 static ::osl::Mutex&GetMutex();
 };
 
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 9fe6d4f..9df5468 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -26,9 +26,11 @@
  * instead of those above.
  */
 
-#include "tubes/manager.hxx"
-#include "tubes/constants.h"
-#include "tubes/file-transfer-helper.h"
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
commit b70c2d352ddb6350ec366b055b28b3d892b54b1c
Author: Matúš Kukan 
Date:   Thu Jul 26 12:17:09 2012 +0200

tubes: avoid unnecessary re-building; move the include into source file

Change-Id: Ib45a5fab8d4dc118ac0ae5282d47f46f9f86edc2

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 09f0a4d..c31b953 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -41,8 +41,9 @@
 #include 
 #include 
 #include 
+
 #ifdef ENABLE_TELEPATHY
-#include 
+class TeleManager;
 #endif
 
 using namespace com::sun::star::task;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6d5ea30..4e76579 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,6 +102,10 @@
 
 #include "langselect.hxx"
 
+#ifdef ENABLE_TELEPATHY
+#include 
+#endif
+
 #if defined MACOSX
 #include 
 #include 
commit f86cc45d8795073e61d39edc469a4876085941b8
Author: Matúš Kukan 
Date:   Thu Jul 26 12:12:42 2012 +0200

tubes: move mbChannelReadyHandlerInvoked to pImpl

Change-Id: If2ddd8bdcb11727be719e8966aa689fbabd94f44

diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 163b58e..9938f6f 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -141,8 +141,8 @@ public:
 
 // Only for callbacks.
 voidaddConference( TeleConference* pConference );
-voidsetChannelReadyHandlerInvoked( boo

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

[Michael Stahl]

 svx/inc/svx/srchdlg.hxx   |2 +-
 svx/source/dialog/srchdlg.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 27d3fc221d042decbd84b72719107547562d2e12
Author: Michael Stahl 
Date:   Thu Jul 26 15:53:28 2012 +0200

warning C4018: '>': signed/unsigned mismatch

Change-Id: I25607ce79111b2c2933ab5e2c165df0594ed4363

diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 6d032e6..2868e03 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -85,7 +85,7 @@ public:
 void Insert( const SearchAttrItem& rItem )
 { SrchAttrItemList::push_back( rItem ); }
 // deletes the pointer to the items
-void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
+void Remove(size_t nPos, size_t nLen = 1);
 };
 
 #ifndef SV_NODIALOG
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 70af258..8dd903e 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -245,7 +245,7 @@ void SearchAttrItemList::Clear()
 // ---
 
 // Deletes the pointer to the items
-void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
+void SearchAttrItemList::Remove(size_t nPos, size_t nLen)
 {
 if ( nPos + nLen > size() )
 nLen = size() - nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in oox/source

[David Tardon]

 config_host.mk.in|4 ++--
 oox/source/drawingml/table/tablecell.cxx |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 772699ac1f2375c33f0819ebb127555d3178c4e5
Author: David Tardon 
Date:   Thu Jul 26 14:17:09 2012 +0200

rhbz#842552 always create text content

The following line in oox::drawingml::table::TableCell::pushToXCell
suggests that it is assumed that the cell always contains text:

Reference< text::XText > xText( rxCell, UNO_QUERY_THROW );

So TableCell should always hold a valid TextBody too.

Change-Id: Ic2db7b535c98dd5f2b18941846709a781df4585c

diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index 96fa5b7..c89a4f9 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -44,7 +44,8 @@ using ::com::sun::star::drawing::LineStyle;
 namespace oox { namespace drawingml { namespace table {
 
 TableCell::TableCell()
-: mnRowSpan ( 1 )
+: mpTextBody( new TextBody() )
+, mnRowSpan ( 1 )
 , mnGridSpan( 1 )
 , mbhMerge( sal_False )
 , mbvMerge( sal_False )
commit 6eda57693398486d5c887cfcc2a60cd133d110ee
Author: David Tardon 
Date:   Thu Jul 26 09:07:13 2012 +0200

i do not see any reason for using ?= here

Change-Id: I39acbfcae047829bed68186917bbb4e851d2ac20

diff --git a/config_host.mk.in b/config_host.mk.in
index b335325..52ec1fc 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -110,7 +110,7 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_GCONF=@ENABLE_GCONF@
 export ENABLE_GIO=@ENABLE_GIO@
 export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
-export ENABLE_CORETEXT?=@ENABLE_CORETEXT@
+export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
 export ENABLE_GTK3=@ENABLE_GTK3@
@@ -169,7 +169,7 @@ export GIT_REPO_NAMES=@GIT_REPO_NAMES@
 export GLIB_CFLAGS=@GLIB_CFLAGS@
 export GLIB_LIBS=@GLIB_LIBS@
 export GMAKE_MODULE_PARALLELISM=@GMAKE_MODULE_PARALLELISM@
-export GMAKE_PARALLELISM?=@GMAKE_PARALLELISM@
+export GMAKE_PARALLELISM=@GMAKE_PARALLELISM@
 export GNOMEVFS_CFLAGS=@GNOMEVFS_CFLAGS@
 export GNOMEVFS_LIBS=@GNOMEVFS_LIBS@
 @x_GNUCP@ export GNUCOPY=@GNUCP@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW-3-6] [REVIEW-3-6-0] Revised "Document as Email" icon

[Stefan Knorr]

Hi there,

some people (everyone who commented on that issue so far) found the new
paper plane icon for Send Document as Email confusing.

Thus, I've pushed a more conventional icon to master. Please review for
3.6 and (if it isn't too late for 3.6.0).

The relevant commit is here:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9b773bfd59d3717d85ff14fd04123f3ea66fc3bf

Thanks!

Astron.

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

[Libreoffice-commits] .: icon-themes/tango

[Stefan Knorr]

 icon-themes/tango/cmd/lc_sendmail.png |binary
 icon-themes/tango/cmd/sc_sendmail.png |binary
 2 files changed

New commits:
commit 9b773bfd59d3717d85ff14fd04123f3ea66fc3bf
Author: Stefan Knorr 
Date:   Wed Jul 25 14:54:06 2012 +0200

Use safer icon for "Send E-Mail" [Used under CC-BY-SA]

Not everyone finds the paper plane icon understandable.

Authors:
Lapo Calamandrei 
Jakub Steiner 
[the Gnome project]

Used under Creative Commons Attribution-Share Alike 3.0
United States license

Change-Id: Ifd888a6f851250fd5c5c8b1e642dbd1c5c42b4e1

diff --git a/icon-themes/tango/cmd/lc_sendmail.png 
b/icon-themes/tango/cmd/lc_sendmail.png
index a2a37c7..015b978 100644
Binary files a/icon-themes/tango/cmd/lc_sendmail.png and 
b/icon-themes/tango/cmd/lc_sendmail.png differ
diff --git a/icon-themes/tango/cmd/sc_sendmail.png 
b/icon-themes/tango/cmd/sc_sendmail.png
index 4a065e7..a96bdfb 100644
Binary files a/icon-themes/tango/cmd/sc_sendmail.png and 
b/icon-themes/tango/cmd/sc_sendmail.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need help to locate HSQLDB in Base

[Sohair Butt]

Hi,

Found the configuration file, just as you said, inside
"connectivity/source/drivers". The codebase we are on is indeed 3.5. We
will switch to master before starting work. Thanks for the heads up!

On Thu, Jul 26, 2012 at 5:52 PM, David Tardon  wrote:

> Hi,
>
> On Thu, Jul 26, 2012 at 04:17:05PM +0500, Sohair Butt wrote:
> > Hi everyone,
> >
> > I'm one of the people working with Waqas. First off, thank you for
> helpful
> > and encouraging replies!
> >
> > @David:
> >
> > Thanks for the tip. We had a look at the directories you mentioned and
> > found the files except for the configuration file. The "registry" folder
> is
> > not present inside the connectivity module. We've tried searching
> elsewhere
> > as well. Are we missing something?
>
> Are you looking at either master or 3.6? The configuration files were
> placed in connectivity/source/drivers' subdirs formerly, e.g.,
> connectivity/source/drivers/hsqldb/hsqldb.xcu .
>
> Note that if you are indeed on 3.5 codebase, you should switch to master
> before you really start working, because patch against 3.5 would be much
> harder to integrate due to conversion of connectivity module to gbuild
> in 3.6.
>
> D.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fixed Replace all message in Basic IDE

[Stephan Bergmann]

On 07/25/2012 07:28 PM, Eike Rathke wrote:

On Wednesday, 2012-07-25 16:11:24 +0200, János Uray wrote:

In Basic IDE, "Replace all" said "Search key replaced  times", so without
the number.


Hmm.. actually it should be a character corresponding to the value of
nFound, not just a blank..


...but sal_uInt16 = sal_Unicode, at least for non-MSVC, so 
rtl::OUString::valueOf(nFound) does not do what one would expect...


-Stephan


This patch fixes it. (The nFound was treated as a character instead of an
integer.)



--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
-sal_uInt16 nFound = 0;
+int nFound = 0;


valueOf() is defined for sal_... types, so instead of using int here it
should be sal_Int32.

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

Re: Changes needed for "LibreOffice 4"

[Stephan Bergmann]

On 07/20/2012 05:20 PM, Lubos Lunak wrote:

  Option c) can mean either stopping supporting some file formats, or breaking
API/ABI compatibility. For file formats we want to do this with binfilter
AFAIK, nothing else, and this is a lot like b) as well in that it's just done
and that's it. Breaking API/ABI compatibility for LibreOffice means breaking
(only) extensions, which depending on the changes may need recompiling,
adjusting or complete overhaul.


Breaking API compatibility is not only about breaking extensions.  It 
also affects scripting (aka macros, that "Tools - Macros" stuff, which 
can also be embedded in documents) and external code interfacing with LO 
(like unoconv).



  And after all this is done, it should be easier to actually talk about LO4,
because we'll know what the talk is actually about. As for the technical
details (i.e. c) ), we'll need to decide how to handle the breakages it'll
cause for extensions. Note that as extensions use only URE (right?), affected
code is actually relatively small (AFAIK sal/, salhelper/, cppu/,
cppuhelper/, udkapi/ and offapi/, not sure about the last one). I see roughly
several ways:


Yes, all the above (incl. offapi), plus more: Java, Python, CLI language 
bindings; URP; officecfg/registry/schema; ...



4) We do 2), but we smooth it out with a transition period (backwards
compatibility wrappers). I believe that a number of the LO4 changes can be
done in a compatible way with just a little more work (I have quite some
experience there from the KDE times too). For example, the
com::sun::star::* -> uno:: change is probably doable in 3.x by introducing
the new names that would map to old ones. This would allow us to test this
already in LO core without affecting extensions. Another example, if we
change rtl::OUString, we may rename and change it for LO4 and keep the old
one for backwards compatibility. In short, this is 3) where we put more work
into not breaking extensions.
+ extensions will need to be updated once, or possibly even not at all
- may need some extra work (although it's a question of how much)
- possibly some code duplication (although the old code may be later removed,
so this may be just having a time overlap with the new/old code)
- if LO4 needs to be out soon for whatever reason, we may not have the time


Having old and new coexist side by side has a lot of merit, indeed. 
This also includes bridging, where UNO could detect that two components 
are incompatible with each other and place a (manually or automatically 
implemented) bridge in between that can map between the two worlds. 
However, this is not without drawbacks:
- Even if some mechanism was initially only intended as a temporary, 
removing it again can easily be delayed for quite a while (cf. 
binfilter), leading to increased overall complexity for practically 
unlimited amounts of time.
- Bridge code can be poorly tested, making it useless in practice. 
(Like for an old extension that uses some obscure feature, for which 
bridging has never been tested by the developers.  The old extension 
would be discovered to be dysfunctional in new LO by users, just as if 
there had been no special bridge code available, but at the increased 
cost overall of having to write the bridge code in the first place.)


A few thoughts on "the com::sun::star::* -> uno:: change":  The 
com-sun-star prefix is used in at least two places:


1  As a namespace for UNOIDL definitions in udkapi/offapi (which leads 
to like-named namespaces, packages, etc. in the various language 
bindings; and to usage of string literals for service/singleton access, 
at least for old-style ones).


2  As a namespace (C++), package (Java), etc. for language-binding 
specific entities (like C++ com::sun::star::uno::Reference and Java 
com.sun.star.uno.UnoRuntime).


Whether renaming can be done compatibly is highly variable:  For 
example, many C++ entities could be renamed with typedefs, while some 
could not (templates, at least with C++98 with which we are stuck for 
now).  What could work better for C++ is a namespace alias (but maybe 
not "namespace uno = com::sun::star" as it could cause confusion in 
existing code that also uses "namespace com::sun::star::uno;").  On the 
other hand, no such tricks are available in Java.


My personal take is that such a rename causes way too much deliberate 
breakage to be worth it.  (After all, a name is just a name.  Lots of 
projects are stuck with outdated naming, like the NextStep "ns" prefix 
in Mac OS X.)


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

Re: Tinderbox failure, Linux-Gentoo-x86_64@2-no-moz_no-binfilter, MASTER, last success: 2012-07-26 09:42:56

[Miklos Vajna]

Hi,

On Thu, Jul 26, 2012 at 12:09:46PM +, "nthieb...@gmail.com" 
 wrote:
>   a572af0  add tests for RTF_MACC and RTF_MEQARR

This is me, but I did not manage to reproduce the failure locally, so
far...

> ##Failure Location unknown## : Error
> Test name: Test::testMathAccents
> An uncaught exception of type com.sun.star.container.NoSuchElementException
> - 
> 
> ##Failure Location unknown## : Error
> Test name: Test::testMathEqarray
> An uncaught exception of type com.sun.star.container.NoSuchElementException
> - 

I *guess* that the problem is that SwModelTestBase::getFormula() can't
find the formula, due to some missing component file. But my
--with-max-jobs=4 --with-num-cpus=4 build doesn't fail, so I don't have
an idea how to debug at the moment.

(Note that the clang --with-num-cpus=2 --with-max-jobs=30 tinderbox
doesn't fail, either...)

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

Re: [PATCH][REJECTED] Broken check for Boost::Date_Time in configure.in

[David Tardon]

Hi,

On Thu, Jul 26, 2012 at 09:31:06AM +0200, Francois Tigeot wrote:
> Hi,
> 
> Recent versions of LibreOffice-3.6 (since June) fail to build on some of
> my systems. The error message indicates a problem with Boost::Date_time
> 
> checking whether the Boost::Date_Time library is available... yes
> configure: error: Could not find a version of the library!
> 
> It turns out Boost::Date_time is in fact perfectly functional and the
> configure script reports a non-existing error.
> 
> Removing the check is enough to make LibreOffice-3.6 build again (see
> attached patch).
> 
> -- 
> Francois Tigeot

> From 080bbbc053c415d07c4d4ae74e68effb6898024e Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= 
> Date: Thu, 26 Jul 2012 09:13:17 +0200
> Subject: [PATCH] configure: remove broken Boost::Date_Time check
> 
> On some systems, AX_BOOST_DATE_TIME fails to detect the presence of a
> perfectly functional Boost::Date_Time library, preventing LibreOffice
> to build for no reason.
> 
> The Boost autotools macros have been unmaintained since 2009; removing
> the check seems to be the best course of action.

That would mean that the build fails in the middle for "no reason" if
the lib is really missing. Really, checking that all prerequisites of
the build are in place is what configure is for. If the test causes
problems for you, fix it.

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

Re: Need help to locate HSQLDB in Base

[David Tardon]

Hi,

On Thu, Jul 26, 2012 at 04:17:05PM +0500, Sohair Butt wrote:
> Hi everyone,
> 
> I'm one of the people working with Waqas. First off, thank you for helpful
> and encouraging replies!
> 
> @David:
> 
> Thanks for the tip. We had a look at the directories you mentioned and
> found the files except for the configuration file. The "registry" folder is
> not present inside the connectivity module. We've tried searching elsewhere
> as well. Are we missing something?

Are you looking at either master or 3.6? The configuration files were
placed in connectivity/source/drivers' subdirs formerly, e.g.,
connectivity/source/drivers/hsqldb/hsqldb.xcu .

Note that if you are indeed on 3.5 codebase, you should switch to master
before you really start working, because patch against 3.5 would be much
harder to integrate due to conversion of connectivity module to gbuild
in 3.6.

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

[Libreoffice-commits] .: Branch 'opengrok' - patches/remote-attribute.diff patches/toadd

[Thorsten Behrens]

 patches/remote-attribute.diff   |   14 --
 patches/toadd/libreoffice/style.css |3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 821f927e6842e8be1d624fad3b21de0f52bb842c
Author: Andrew Higginson 
Date:   Thu Jul 26 14:43:04 2012 +0200

Fix remote opengrok search, add padding.

This patch fixes a bug where if you click on a different search
result page, the page doesn't behave remotely (as it doesn't have
remote=true in the link).

It also adds some padding to the top of the remote page

diff --git a/patches/remote-attribute.diff b/patches/remote-attribute.diff
index b1ae393..beabf46 100644
--- a/patches/remote-attribute.diff
+++ b/patches/remote-attribute.diff
@@ -1,6 +1,6 @@
 --- a/web/search.jsp   2012-04-17 17:18:14.147097100 +0100
 +++ b/web/search.jsp   2012-04-17 17:12:42.679094963 +0100
-@@ -46,11 +46,12 @@
+@@ -48,11 +48,12 @@
  org.apache.lucene.queryParser.*"
  %><%@ page session="false" %><%@ page errorPage="error.jsp" %><%
  Date starttime = new Date();
@@ -18,7 +18,7 @@
  
  %><%@ include file="projects.jspf" %><%
  String sort = null;
-@@ -266,7 +267,7 @@
+@@ -269,7 +270,7 @@
   RuntimeEnvironment environment = RuntimeEnvironment.getInstance();
   environment.register();
%><%@ include file="httpheader.jspf" %>
@@ -27,3 +27,13 @@
  
  <%@ include file="pageheader.jspf" %>
  
+@@ -425,7 +426,8 @@
+ (refs == null ? "" : "&refs=" + 
Util.URIEncode(refs)) +
+ (path == null ? "" : "&path=" + 
Util.URIEncode(path)) +
+ (hist == null ? "" : "&hist=" + 
Util.URIEncode(hist)) +
+-(sort == null ? "" : "&sort=" + 
Util.URIEncode(sort));
++(sort == null ? "" : "&sort=" + 
Util.URIEncode(sort)) +
++(remote == null ? "" : "&remote=" + 
Util.URIEncode(remote));
+ if (hasProjects) {
+ urlp = urlp + "&project=";
+ for (Iterator it = project.iterator(); it.hasNext();) 
{
diff --git a/patches/toadd/libreoffice/style.css 
b/patches/toadd/libreoffice/style.css
index 712c0ed..a42b7a7 100644
--- a/patches/toadd/libreoffice/style.css
+++ b/patches/toadd/libreoffice/style.css
@@ -224,7 +224,8 @@ body#remote {
 }
 
 body#remote #page {
-width:100% !important
+width:100% !important;
+margin-top:8px
 }
 
 body#remote #header, body#remote #Masthead, body#remote #menu, body#remote 
#Footer {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Re: [PATCH] Final stretch of converting SV_DECL_PTRARR to STL containers stage 2/3

[Michael Stahl]

On 23/07/12 09:31, Noel Grandin wrote:
> Hi
> 
> These patches convert various places from SV_DECL_PTRARR to STL containers.
> 
> They have passed a full make check.

thanks, pushed to master.

#9 converts the unsorted  SwSelBoxes_SAR base class of the sorted
SvArray also to sorted_vector, which is wrong

patch #15 has a dereference of iterator not cheeked for end()

the ScHTMLColOffset and SvxTabStopArr have 2 actual non-const member
accesses; the ScHTML one looks entirely safe, i don't know about the RTF
tabstop one; i currently think that using const_cast in these very few
cases is better than exposing non-const accessors in sorted_vector for
everyone.

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

Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52240 add uncontroversial date acceptance patterns

[David Tardon]

Hi,

On Thu, Jul 26, 2012 at 12:23:49PM +0200, Eike Rathke wrote:
> Hi David,
> 
> On Thursday, 2012-07-26 09:52:14 +0200, David Tardon wrote:
> 
> > > that enable abbreviated date input for locales that use '/' date
> > > separator, which, contrary to '.' and '-', are uncontroversial
> > 
> > Hm, are they? What if I want to insert a fraction? Or am I missing
> > something (very probable)?
> 
> For fraction input you need an integer part as well,
> so "1 2/3" or "0 23/42".

Thanks for clarification. Since there are rumors of rc4, you have my +1
for 3-6-0.

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

Re: Adding Extension for Experimental Thai Spelling

[Martin Hosken]

Dear All,

> > An automatic word and line breaker is very necessary for Khmer and
> > Thai because traditionally they have no spaces between words, and so
> > line-breaking and spell checking require the use of a zero-width space
> > between words which is counterintuitive for most native speakers, and
> > so spell checking goes widely unused.

I agree that automatic word breaking is a good thing and I am relieved to see 
that libreoffice does it based on language selection and not on automatic 
language guessing based on scripts. There are more languages that use Thai 
script and Khmer script than just Thai and Khmer. So one of my fears is already 
alleviated :)

> > But now with the ICU code you implemented, Thai and Khmer can be
> > automatically broken, and the results are quite good. But with its
> > implementation in the real world, I have found some issues that I
> > wanted to raise and also suggest possible solutions. I write this as
> > an end-user, not so much as a programmer, nor do I claim to fully
> > understand the inner-workings of ICU and LibreOffice (because I don't!
> > ).
> > 
> > First, I will do my best to explain the current results of the ICU
> > break iterator with Khmer:
> > 
> > Input sentence: មានប្រាជ្ញាឈ្លាសវៃឈ្មោះសិវកឥវលិយៈ
> > 
> > Current ICU line-breaking: មាន|ប្រាជ្ញាឈ្លាស|វៃ|ឈ្មោះ|សិវ|កឥ|វលិ|យៈ
> > 
> > Compared with the sentence manually broken: មាន|ប្រាជ្ញា|ឈ្លាសវៃ|
> > ឈ្មោះ|សិវកឥវលិយៈ
> > 
> > The differences should be clear – the ICU break iterator does not
> > break the words with 100% accuracy.
> > 
> > One possible solution to this issue is by how the ICU Break Iterator
> > interacts with zero-width spaces (U+200B) in LibreOffice. Before ICU
> > code was enabled to automatically break Khmer, if an end-user wanted
> > to spell check Khmer, they had to manually place U+200B characters to
> > separate words. This solution worked quite well, but was
> > counterintuitive to most native speakers, because Khmer has no spaces
> > (as stated before). But with this solution, an end-user could be sure
> > that their document was broken with 100% accuracy, if there was no
> > human error (something automatic solutions cannot do – it is more
> > along the lines of 80% accurate). What I propose, is that the break
> > iterator code in LibreOffice looks for U+200B characters in a given
> > string and considers them as a sign to NOT automatically break, but to
> > allow the end-user full control to manually break words. Let me
> > explain:
> > 
> >  1. The code starts processing the text and automatically breaking
> > it until it comes across a U+200B character. If one is found,
> > it searches to see if there are any additional U+200B or U
> > +0020 characters in the following 20 characters (or so), and
> > if there are, the break iterator skips over those characters
> > and starts again from the second U+200B character (or U+0020,
> > but a U+0020 character would only signify the “close” of the
> > manual break because sometimes a phrase will end and there
> > will be an actual space – so if the word that the user wants
> > to manually break has a “real” U+0020 space at the end of it,
> > then the user does not need to put an additional U+200B
> > character to close it) which then repeats, looking for U+200B
> > characters etc.
> > 
> >  2. This would allow end-users to choose to manually break their
> > whole document so they can have precise control, as well as
> > allow end-users to place U+200B characters around names of
> > people, places or transliterations in order to tell the break
> > iterator to not try to break those words.

In principle I like this approach. I like the idea of being able to force 
breaks and non-breaks. But I don't think we are quite there with this solution 
yet. Here are my difficulties with it:

1. use of U+2060 makes string searching and spell checking harder (unless WJ 
chars are stripped for searching and spell checking). They are not part of the 
spelling of a word, so their introduction in the underlying text stream is 
problematic for other text processing processes (like searching as mentioned). 
This is less of an issue for U+200B ZWSP because that occurs between words and 
searching across word boundaries is a rarer activity. Likewise spell checking 
across word boundaries isn't really needed.

2. How do we come up with the range of what is considered a word between two 
zwsp chars as opposed to two words? How close to the end of a string must a 
zwsp occur to disable all breaking before the end of the string? does 
"abcdefuvwxyz" block all breaks in the string? I think we need to think 
harder (deeper) about the use of zwsp in this way and see if we can come up 
with something with a little less ambiguity. Having said that, I think we are 
going to have to think really hard, because I don't think

[PATCH] Broken check for Boost::Date_Time in configure.in

[Francois Tigeot]

Hi,

Recent versions of LibreOffice-3.6 (since June) fail to build on some of
my systems. The error message indicates a problem with Boost::Date_time

checking whether the Boost::Date_Time library is available... yes
configure: error: Could not find a version of the library!

It turns out Boost::Date_time is in fact perfectly functional and the
configure script reports a non-existing error.

Removing the check is enough to make LibreOffice-3.6 build again (see
attached patch).

-- 
Francois Tigeot
>From 080bbbc053c415d07c4d4ae74e68effb6898024e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Tigeot?= 
Date: Thu, 26 Jul 2012 09:13:17 +0200
Subject: [PATCH] configure: remove broken Boost::Date_Time check

On some systems, AX_BOOST_DATE_TIME fails to detect the presence of a
perfectly functional Boost::Date_Time library, preventing LibreOffice
to build for no reason.

The Boost autotools macros have been unmaintained since 2009; removing
the check seems to be the best course of action.

Change-Id: Ic9b2d02c5726030c8f0bb06c322383960f933080
---
 configure.in |1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.in b/configure.in
index 1a0a72a..2de88b3 100644
--- a/configure.in
+++ b/configure.in
@@ -7433,7 +7433,6 @@ if test "$with_system_boost" = "yes"; then
 AC_LANG_POP([C++])
 
 AX_BOOST_BASE
-AX_BOOST_DATE_TIME
 mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 
's/\.dll$//'`
 libo_MINGW_TRY_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
 if test -z "$MINGW_BOOST_DATE_TIME_DLL"; then
-- 
1.7.10.5

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

need help for Android build.

[Yifan Jiang]

Dear kind developers,

I met a problem when trying to build LO Android libraries from the latest
master, it stuck in early autogen.sh phase which looks something wrong with
testing the cross compiler. I spent many time trying to see what happened but
didn't figure out what's wrong :( I'd appreciate if any one can some give
suggestions to resolve it, thank you in advance!

---

ndk: android-ndk-r8b
sdk: android-sdk_r20.0.1
gcc: 4.3.4

---

> ./autogen.sh

running ./configure with 'CC_FOR_BUILD=gcc' 'CXX_FOR_BUILD=g++' 
'--with-android-ndk=/home/bench/android-ndk-r8b' 
'--with-android-sdk=/home/bench/android-sdk-linux' 
'--build=x86-unknown-linux-gnu' '--with-ant-home=/usr/share/ant' 
'--disable-zenity' '--disable-python' '--with-num-cpus=1' '--with-max-jobs=1' 
'--without-helppack-integration' '--without-myspell-dicts'

*
*   Running LibreOffice build configuration.
*


checking build system type... x86-unknown-linux-gnu
checking host system type... x86-unknown-linux-gnu
checking for grep that handles long lines and -e... /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking for grep... (cached) /usr/bin/grep
checking for sed... /usr/bin/sed
checking for gawk... gawk
checking for gawk... /usr/bin/gawk
checking for bash... /bin/sh
checking for GNU or BSD tar... tar
checking for tar's option to strip components... --strip-components
checking for ccache... /usr/bin/ccache
configure: WARNING: ccache's cache size is less than 1GB using it is 
counter-producive: Disabling auto-ccache detection
checking gcc home... /usr
checking for gcc... 
/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
 
/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot 
/home/bench/android-ndk-r8b/platforms/android-9/arch-arm 
-L/home/bench/android-ndk-r8b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a
checking for C compiler default output file name... 
configure: error: in `/windows/home/yifan/libo_solo':
configure: error: C compiler cannot create executables
See `config.log' for more details.
Error running configure at ./autogen.sh line 187.

---

Also, I tried to run the error section manually, which is failed as:


/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot 
/home/bench/android-ndk-r8b/platforms/android-9/arch-arm 
-L/home/bench/android-ndk-r8b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a

/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google/../../../../arm-linux-androideabi/bin/ld:
 /lib/libz.so.1: no version information available (required by 
/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/../lib/gcc/arm-linux-androideabi/4.6.x-google/../../../../arm-linux-androideabi/bin/ld)

/home/bench/android-ndk-r8b/platforms/android-9/arch-arm/usr/lib/crtbegin_dynamic.o:
 In function `atexit':
crtbrand.c:(.text+0x44): undefined reference to `main'
collect2: ld returned 1 exit status

Best wishes,
Yifan

-- 
  Yifan Jiang
  Libreoffice / SuSE
  Contact: yifan - irc.freenode.net/libreoffice
  =  
  http://www.libreoffice.org/
  http://www.documentfoundation.org/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REVIEW 3-6][REVIEW 3-6-0] fdo#51252 LO cannot start (reports runtime error with Visual C++ Runtime Library)

[Stephan Bergmann]

See , comment 35 
to "LO cannot start (reports runtime error with Visual C++ Runtime 
Library)," on why I think it would be a good idea to backport 
 
"fdo#51252 Disable copying share/prereg/bundled to avoid startup 
crashes" to libreoffice-3-6 and libreoffice-3-6-0 and do a LO 3.6.0 rc4.


Sorry for the trouble,
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: desktop/source

[Stephan Bergmann]

 desktop/source/app/app.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4
Author: Stephan Bergmann 
Date:   Thu Jul 26 13:20:31 2012 +0200

fdo#51252  Disable copying share/prereg/bundled to avoid startup crashes

...see , comment 35 
to
"LO cannot start (reports runtime error with Visual C++ Runtime Library)" 
for
all the details.  This commit is intended as a band aid, to be backported to
libreoffice-3-6-0.  It can be cleaned up later on.

Change-Id: I2984cdd7efc279e3ef482a762b614e1d625a697f

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 65dd453..8582af5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -649,7 +649,7 @@ void Desktop::Init()
 // copy bundled folder to the user directory
 osl::FileBase::RC rc = osl::Directory::createPath(aUserPath);
 (void) rc;
-copy_bundled_recursive( aPreregBundledPath, aUserPath, +1 );
+if (false) copy_bundled_recursive( aPreregBundledPath, aUserPath, 
+1 );
 }
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - starmath/qa starmath/source sw/CppunitTest_sw_subsequent_rtfexport.mk sw/qa writerfilter/source

[Miklos Vajna]

 starmath/qa/testdocuments/README   |2 
 starmath/source/rtfexport.cxx  |   25 ++-
 sw/CppunitTest_sw_subsequent_rtfexport.mk  |3 
 sw/qa/extras/rtfexport/data/math-accents.rtf   |  189 +
 sw/qa/extras/rtfexport/data/math-eqarray.rtf   |   96 
 sw/qa/extras/rtfexport/rtfexport.cxx   |   24 ++-
 sw/qa/extras/swmodeltestbase.hxx   |   23 ++-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   16 +-
 8 files changed, 364 insertions(+), 14 deletions(-)

New commits:
commit a572af02752164a62478052113707c5f9bc705da
Author: Miklos Vajna 
Date:   Thu Jul 26 12:54:37 2012 +0200

add tests for RTF_MACC and RTF_MEQARR

Change-Id: Id33672d0acef4d79239e0ee8a86d5a244ac736e7

diff --git a/starmath/qa/testdocuments/README b/starmath/qa/testdocuments/README
new file mode 100644
index 000..416e082
--- /dev/null
+++ b/starmath/qa/testdocuments/README
@@ -0,0 +1,2 @@
+You can find test documents here for DOCX. RTF test documents are at
+sw/qa/extras/rtfexport/data/math-*.rtf.
diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk 
b/sw/CppunitTest_sw_subsequent_rtfexport.mk
index bdc47cd..a0dd451 100644
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfexport))
 $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
 comphelper/util/comphelp \
 configmgr/source/configmgr \
+embeddedobj/util/embobj \
 fileaccess/source/fileacc \
 filter/source/config/cache/filterconfig1 \
 framework/util/fwk \
@@ -73,6 +74,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
 package/util/package2 \
 sax/source/expatwrap/expwrap \
 sfx2/util/sfx \
+starmath/util/sm \
 svl/source/fsstor/fsstorage \
 svtools/util/svt \
 sw/util/msword \
@@ -81,6 +83,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
 toolkit/util/tk \
 ucb/source/core/ucb1 \
 ucb/source/ucp/file/ucpfile1 \
+unotools/util/utl \
 unoxml/source/service/unoxml \
 writerfilter/util/writerfilter \
 ))
diff --git a/sw/qa/extras/rtfexport/data/math-accents.rtf 
b/sw/qa/extras/rtfexport/data/math-accents.rtf
new file mode 100644
index 000..2dcaf70
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/math-accents.rtf
@@ -0,0 +1,189 @@
+{\rtf1
+{\mmath
+{\*\moMathPara 
+{\*\moMath 
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u769 \'b4}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u768 `}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u780 ?}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u774 ?}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u778 \'b0}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u8407 ?}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u771 ~}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 
+\i\f34\insrsid26133 \hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid26133 
+\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+{\macc
+{\maccPr
+{\mchr \u729 ?}
+{\mctrlPr\f34 }
+}
+{\me
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \i\f34\insrsid26133 
+\hich\af34\dbch\af42\loch\f34 
+{\mr\mscr0\msty2 a}
+}
+{\rtlch\fcs1 \af1 \ltrch\fcs0 \f34\insrsid26133 }
+}
+}
+{\rtlch\fcs

Re: Need help to locate HSQLDB in Base

[Sohair Butt]

Hi everyone,

I'm one of the people working with Waqas. First off, thank you for helpful
and encouraging replies!

@David:

Thanks for the tip. We had a look at the directories you mentioned and
found the files except for the configuration file. The "registry" folder is
not present inside the connectivity module. We've tried searching elsewhere
as well. Are we missing something?

@Lionel and Michael:

Sounds interesting! We've read the discussion on the links you've posted.
We're currently reading the links Lionel posted in the bug discussions that
link to the OpenOffice Dev Guide and the FireBird website. Will get back to
you guys once we are done reading those.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Proposal/Prototype support for "fill in character" in Calc Number Format Strings

[Noel Power]

Hi Johann,

On 24/07/12 10:32, Noel Power wrote:

Hi Johann,

firstly apologies for the late replying, I have only just got back 
from vacation and am catching up with email.

On 06/07/12 18:10, Kohei Yoshida wrote:

Hi Johann,

I hope you don't mind me forwarding this nice work of yours to our 
main development mailing list, to let other interested developers 
know of your work.  Let me also CC Noel since he's done a very 
similar work for 3.6.  There may be some overlap between his work and 
yours...

//
Hopefuily I didn't blind you with too many details with the last email. 
Put more simply what I would really love is if you could look to see if 
we need to amend  the width calculation that is located here

http://opengrok.libreoffice.org/xref/core/sc/source/ui/view/output2.cxx#554
and see if we need to include the work you already did. it would be 
brilliant to get your input on that and even some patch/code from you to 
improve it.
Also if you wish you could help with is the patch for enabling 
persisting to odf needs updating to use "" 
instead of "number:repeated", of course any other general testing. bug 
reporting & patches in this area wildly appreciated also. Are you 
interested or have any time for any of that?


Noel
>From 8a2f12168cb450de589853285871874231ec130f Mon Sep 17 00:00:00 2001
From: Noel Power 
Date: Tue, 17 Apr 2012 20:37:02 +0100
Subject: [PATCH 2/3] support new xml number:repeated elem for number-style 
namespace

this is used to define the char to be repeated in a number format

e.g  repeat ' ' 0 or more times to fill available space

  
 $
-->  
---
 xmloff/inc/xmloff/xmlnumfe.hxx   |1 +
 xmloff/source/style/xmlnumfe.cxx |   12 
 xmloff/source/style/xmlnumfi.cxx |   10 ++
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/xmloff/inc/xmloff/xmlnumfe.hxx b/xmloff/inc/xmloff/xmlnumfe.hxx
index b1f00e7..9998cad 100644
--- a/xmloff/inc/xmloff/xmlnumfe.hxx
+++ b/xmloff/inc/xmloff/xmlnumfe.hxx
@@ -95,6 +95,7 @@ private:
 SAL_DLLPRIVATE void WriteMapElement_Impl( sal_Int32 nOp, double fLimit,
 sal_Int32 nKey, sal_Int32 nPart );
 
+SAL_DLLPRIVATE void  WriteRepeatedElement_Impl( sal_Unicode ch );
 SAL_DLLPRIVATE sal_Bool WriteTextWithCurrency_Impl( const ::rtl::OUString& 
rString,
 const ::com::sun::star::lang::Locale& rLocale );
 SAL_DLLPRIVATE void ExportPart_Impl( const SvNumberformat& rFormat, 
sal_uInt32 nKey,
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 714dcda..71aa5ef 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -537,6 +537,14 @@ void SvXMLNumFmtExport::WriteMinutesElement_Impl( sal_Bool 
bLong )
   sal_True, sal_False );
 }
 
+void SvXMLNumFmtExport::WriteRepeatedElement_Impl( sal_Unicode nChar )
+{
+FinishTextElement_Impl();
+SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, XML_REPEATED,
+  sal_True, sal_False );
+rExport.Characters( OUString::valueOf( nChar ) );
+}
+
 void SvXMLNumFmtExport::WriteSecondsElement_Impl( sal_Bool bLong, sal_uInt16 
nDecimals )
 {
 FinishTextElement_Impl();
@@ -1567,6 +1575,10 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 WriteAMPMElement_Impl();// short/long?
 bAnyContent = sal_True;
 break;
+case NF_SYMBOLTYPE_STAR :
+if ( pElemStr && pElemStr->Len() > 1 )
+WriteRepeatedElement_Impl( pElemStr->GetChar( 1 ) );
+break;
 }
 nPrevType = nElemType;
 ++nPos;
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index bd953a3..ecd33b9 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -246,6 +246,7 @@ public:
 enum SvXMLStyleTokens
 {
 XML_TOK_STYLE_TEXT,
+XML_TOK_STYLE_REPEATED,
 XML_TOK_STYLE_NUMBER,
 XML_TOK_STYLE_SCIENTIFIC_NUMBER,
 XML_TOK_STYLE_FRACTION,
@@ -521,6 +522,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap()
 {
 //  elements in a style
 { XML_NAMESPACE_NUMBER, XML_TEXT,   XML_TOK_STYLE_TEXT 
 },
+{ XML_NAMESPACE_NUMBER, XML_REPEATED,   
XML_TOK_STYLE_REPEATED   },
 { XML_NAMESPACE_NUMBER, XML_NUMBER, 
XML_TOK_STYLE_NUMBER},
 { XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER,  
XML_TOK_STYLE_SCIENTIFIC_NUMBER },
 { XML_NAMESPACE_NUMBER, XML_FRACTION,   
XML_TOK_STYLE_FRACTION  },
@@ -1104,6 +1106,13 @@ void SvXMLNumFmtElementContext::EndElement()
 case XML_TOK_STYLE_TEXT_CONTENT:
 rParent.AddToCode( OUString::valueOf((sal_Unicode)'@') );
 break;

Re: [GSoC 2012][Collaboration] unit test story

[Eike Rathke]

Hi Matúš,

On Thursday, 2012-07-26 12:04:03 +0200, Matúš Kukan wrote:

> > There's one reason why to keep this or a similar mechanism: the build
> > would fail in the unit test when you have a Telepathy enabled office
> > running. Which in future might be the default case ;-)
> 
> That's unfortunate ;-(
> Then how can we test something we are currently using ?
> I guess I will keep it's functionality but not use it for now, I am
> not sure what's best now.

I think we can get away with keeping the functionality but adding
a suffix in the test only if a suffix define is passed to the test, that
could depend on the presence of an installed liboapprover or
org.freedesktop.Telepathy.Client.LibreOffice.service file.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpF8AO10sOE8.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52240 add uncontroversial date acceptance patterns

[Eike Rathke]

Hi David,

On Thursday, 2012-07-26 09:52:14 +0200, David Tardon wrote:

> > that enable abbreviated date input for locales that use '/' date
> > separator, which, contrary to '.' and '-', are uncontroversial
> 
> Hm, are they? What if I want to insert a fraction? Or am I missing
> something (very probable)?

For fraction input you need an integer part as well,
so "1 2/3" or "0 23/42".

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpJAYgJkGkWa.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GSoC 2012][Collaboration] unit test story

[Matúš Kukan]

On 26 July 2012 11:23, Eike Rathke  wrote:
>> > I am not sure what for was that.. to be able to run unit test while
>> > real LibO is running ?
>>
>> Yes, shouldn't be used in any other case.
>>
>> > Would we want that ?
>>
>> Well, apparently I needed it somehow during that time.. problem is you
>> can't register two instances for the same DBus name
>
> There's one reason why to keep this or a similar mechanism: the build
> would fail in the unit test when you have a Telepathy enabled office
> running. Which in future might be the default case ;-)

That's unfortunate ;-(
Then how can we test something we are currently using ?
I guess I will keep it's functionality but not use it for now, I am
not sure what's best now.

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

[Libreoffice-commits] .: sysui/desktop

[Caolán McNamara]

 sysui/desktop/share/makefile.mk  |4 
 sysui/desktop/share/translate.pl |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 947b3986d1f45c3e5432d57a48d8052db197f012
Author: Caolán McNamara 
Date:   Thu Jul 26 10:05:50 2012 +0100

fix "No template found for item" warning and make it an error

Change-Id: I75985c3f8821b3506e46eaf572c54828db97c964

diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 0a7c549..84bf995 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -72,12 +72,16 @@ MIMELIST = \
 master-document \
 oasis-text \
 oasis-text-template \
+oasis-text-flat-xml \
 oasis-spreadsheet \
 oasis-spreadsheet-template \
+oasis-spreadsheet-flat-xml \
 oasis-drawing \
 oasis-drawing-template \
+oasis-drawing-flat-xml \
 oasis-presentation \
 oasis-presentation-template \
+oasis-presentation-flat-xml \
 oasis-formula \
 oasis-master-document \
 oasis-database \
diff --git a/sysui/desktop/share/translate.pl b/sysui/desktop/share/translate.pl
index c55ee25..d32f996 100755
--- a/sysui/desktop/share/translate.pl
+++ b/sysui/desktop/share/translate.pl
@@ -119,7 +119,7 @@ foreach $template (keys %templates) {
 # templates exist
 unless(open(TEMPLATE, $outfile)) {
 print STDERR "Warning: No template found for item $_: $outfile: $!\n";
-next;
+exit -1;
 }
 
 # open output file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC 2012][Collaboration] unit test story

[Eike Rathke]

Hi Matúš,

On Thursday, 2012-07-26 11:17:41 +0200, Eike Rathke wrote:

> > I am not sure what for was that.. to be able to run unit test while
> > real LibO is running ?
> 
> Yes, shouldn't be used in any other case.
> 
> > Would we want that ?
> 
> Well, apparently I needed it somehow during that time.. problem is you
> can't register two instances for the same DBus name

There's one reason why to keep this or a similar mechanism: the build
would fail in the unit test when you have a Telepathy enabled office
running. Which in future might be the default case ;-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpfO2qd0L6kO.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] [PATCH] fdo#50632 IDE: update Object Catalog when closing a document

[Noel Power]

On 25/07/12 17:04, János Uray wrote:
This patch fixed this bug: 
https://bugs.freedesktop.org/show_bug.cgi?id=50632


The Object Catalog was not updated, because at the point when
onDocumentClosed() event was generated in BasicTreeListBox, the 
to-be-closed
document is still alive, so UpdateEntries() doesn't remove the entry. 
I removed

this entry manually in onDocumentClosed().

pushed, thanks for another nice fix !

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

Re: [GSoC 2012][Collaboration] unit test story

[Eike Rathke]

Hi Matúš,

On Thursday, 2012-07-26 09:39:43 +0200, Matúš Kukan wrote:

> I thought that 1-1 collaboration works quite like expected (you get a
> file on start.. now also you see contacts dialog updated when someone
> goes on/offline (both does not seem to work for gmail accounts
> though!)),
> So I was going to work on MUC collaboration but found out that it does
> not work at all.
> Then found out it's the same for 1-1.

Huh, it looked like it worked but didn't? ;-)

> I have tried to install .service and .client files at some time and
> they broke it, I need to investigate why.
> In unit test we use different service name.
> So - I'd like to change this and revert
> 5edcd7fa12c69c5b27d6b317f380f266f292008d
> Eike, would that be fine ?
> I am not sure what for was that.. to be able to run unit test while
> real LibO is running ?

Yes, shouldn't be used in any other case.

> Would we want that ?

Well, apparently I needed it somehow during that time.. problem is you
can't register two instances for the same DBus name, so I had to shut
down real instance to run test, fire up again, ... probably was tired of
that ;-)

So yes, you can revert that commit, but check the LIBO_DTUBE_SERVICE
name definition, after reverting instead of "org.libreoffice.calc" it
would be something ending in "LibreOfficeTeleTest" that surely is not
correct :)  And we may need TeleManager::getFullObjectPath() that would
be removed as well when reverting.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgprx9epzKIxN.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: basctl/source

[Noel Power]

 basctl/source/basicide/bastype2.cxx |   34 +++---
 basctl/source/basicide/bastype2.hxx |2 ++
 2 files changed, 29 insertions(+), 7 deletions(-)

New commits:
commit bb66a2c3ee9807e79ba437c770559787abe61b9b
Author: Uray M. János 
Date:   Tue Jul 24 19:27:25 2012 +0200

fdo#50632 IDE: update Object Catalog when closing a document

Change-Id: Ia635aee1611eaff663906e2238bf23a5013242a3

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index ce4d0a3..d8ccb8b 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -559,9 +559,12 @@ void BasicTreeListBox::onDocumentSaveAsDone( const 
ScriptDocument& /*_rDocument*
 UpdateEntries();
 }
 
-void BasicTreeListBox::onDocumentClosed( const ScriptDocument& /*_rDocument*/ )
+void BasicTreeListBox::onDocumentClosed( const ScriptDocument& rDocument )
 {
 UpdateEntries();
+// The document is not yet actually deleted, so we need to remove its entry
+// manually.
+RemoveEntry(rDocument);
 }
 
 void BasicTreeListBox::onDocumentTitleChanged( const ScriptDocument& 
/*_rDocument*/ )
@@ -578,7 +581,7 @@ void BasicTreeListBox::UpdateEntries()
 {
 BasicEntryDescriptor aCurDesc( GetEntryDescriptor( FirstSelected() ) );
 
-
+// removing the invalid entries
 SvLBoxEntry* pLastValid = 0;
 SvLBoxEntry* pEntry = First();
 while ( pEntry )
@@ -586,19 +589,36 @@ void BasicTreeListBox::UpdateEntries()
 if ( IsValidEntry( pEntry ) )
 pLastValid = pEntry;
 else
-{
-delete (BasicEntry*)pEntry->GetUserData();
-GetModel()->Remove( pEntry );
-}
+RemoveEntry(pEntry);
 pEntry = pLastValid ? Next( pLastValid ) : First();
 }
 
-
 ScanAllEntries();
 
 SetCurrentEntry( aCurDesc );
 }
 
+// Removes the entry from the tree.
+void BasicTreeListBox::RemoveEntry (SvLBoxEntry* pEntry)
+{
+// removing the associated user data
+delete (BasicEntry*)pEntry->GetUserData();
+// removing the entry
+GetModel()->Remove( pEntry );
+}
+
+// Removes the entry of rDocument.
+void BasicTreeListBox::RemoveEntry (ScriptDocument const& rDocument)
+{
+// finding the entry of rDocument
+for (SvLBoxEntry* pEntry = First(); pEntry; pEntry = Next(pEntry))
+if (rDocument == GetEntryDescriptor(pEntry).GetDocument())
+{
+RemoveEntry(pEntry);
+break;
+}
+}
+
 SvLBoxEntry* BasicTreeListBox::CloneEntry( SvLBoxEntry* pSource )
 {
 SvLBoxEntry* pNew = SvTreeListBox::CloneEntry( pSource );
diff --git a/basctl/source/basicide/bastype2.hxx 
b/basctl/source/basicide/bastype2.hxx
index e8acb2b..efcaa4f 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -195,6 +195,8 @@ public:
 SvLBoxEntry*AddEntry( const ::rtl::OUString& rText, const Image& 
rImage,
   SvLBoxEntry* pParent, bool bChildrenOnDemand,
   std::auto_ptr< BasicEntry > aUserData );
+voidRemoveEntry (SvLBoxEntry*);
+voidRemoveEntry (ScriptDocument const&);
 
 ::rtl::OUString GetRootEntryName( const ScriptDocument& rDocument, 
LibraryLocation eLocation ) const;
 voidGetRootEntryBitmaps( const ScriptDocument& rDocument, 
Image& rImage );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

[Noel Power]

 basctl/source/basicide/basides1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 604b1bf89ced64b509122eaa8cc99dbf033438ab
Author: Uray M. János 
Date:   Wed Jul 25 16:06:39 2012 +0200

fixed Replace all message in Basic IDE

Change-Id: I3e4fdb07ea5a1d1d47bcf190a5ee96800b44f89b

diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index b342255..96f0b65 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -147,7 +147,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
 {
 // memorize item because of the adjustments...
 BasicIDEGlobals::GetExtraData()->SetSearchItem( (const 
SvxSearchItem&)rItem );
-sal_uInt16 nFound = 0;
+sal_Int32 nFound = 0;
 sal_Bool bCanceled = sal_False;
 if ( ((const SvxSearchItem&)rItem).GetCommand() == 
SVX_SEARCHCMD_REPLACE_ALL )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re:[PUSHED] [PATCH] fixed Replace all message in Basic IDE

[Noel Power]

On 25/07/12 18:28, Eike Rathke wrote:

Hi János,

On Wednesday, 2012-07-25 16:11:24 +0200, János Uray wrote:

--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
-sal_uInt16 nFound = 0;
+int nFound = 0;

valueOf() is defined for sal_... types, so instead of using int here it
should be sal_Int32.


pushed with Eike's tweak to nFound

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

Re: need help for Android build.

[Yi Fan Jiang]

Hi Tor,

The problem has gone with r8 ndk :) Thanks for your great help and explanation!

Best wishes,
Yifan

>>> Yi Fan Jiang 07/26/12 4:06 PM >>>
Hi Tor,

>>> Tor Lillqvist  07/26/12 3:46 PM >>>
> >> This shows that it is not a cross-compilation.
> >
> > Thanks! I see, shall I change the --build value in autogen.lastrun?

> No; note that "build" means the platform where you are running the
> cross-compilation (in your case SUSE), and "host" means the platform
> where the produced code will run (Android). Anyway, if you indeed use
> --with-distro=LibreOfficeAndroid that shouldn't be necessary. Perhaps
> the part of the configure output you showed first was for the build
> platform? For a cross-compilation, the configure script is
> automatically run a second time...

Thanks for the hints, and yes I was running the build in a SUSE Linux x86
machine.

> So probably your autogen.lastrun is OK. I saw the pathname /windows in
> your first mail; what kind of file system is that? There might be
> problems if trying to build on SMB or FAT file systems.

The path /windows is something misleading, but it is an ext3 file system :)

I am going to try r8 ndk for more experiments.

Best wishes,
Yifan

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

Re: need help for Android build.

[Yi Fan Jiang]

Hi Tor,

>>> Tor Lillqvist  07/26/12 3:46 PM >>>
> >> This shows that it is not a cross-compilation.
> >
> > Thanks! I see, shall I change the --build value in autogen.lastrun?

> No; note that "build" means the platform where you are running the
> cross-compilation (in your case SUSE), and "host" means the platform
> where the produced code will run (Android). Anyway, if you indeed use
> --with-distro=LibreOfficeAndroid that shouldn't be necessary. Perhaps
> the part of the configure output you showed first was for the build
> platform? For a cross-compilation, the configure script is
> automatically run a second time...

Thanks for the hints, and yes I was running the build in a SUSE Linux x86
machine.

> So probably your autogen.lastrun is OK. I saw the pathname /windows in
> your first mail; what kind of file system is that? There might be
> problems if trying to build on SMB or FAT file systems.

The path /windows is something misleading, but it is an ext3 file system :)

I am going to try r8 ndk for more experiments.

Best wishes,
Yifan

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

Re: [PUSHED 3-6][REVIEW 3-6-0] fdo#52240 add uncontroversial date acceptance patterns

[Miklos Vajna]

Forgot to update subject.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GSoC 2012][Collaboration] status, ideas

[Matúš Kukan]

Hi Eike,

On 23 July 2012 17:04, Eike Rathke  wrote:
>> https://gerrit.libreoffice.org/#/c/336/
>
> See my nitpicking there..

Thanks :-)

>> It's associated to ScDocFuncSend.
>> But It does not work if we -
>> open another document | receive another channel -
>> between receiving channel and setting session for document belonging
>> to that channel.
>
> Is that '|' as in one or the other?

Yes.

> Anyhow, I think that could be
> solved by queuing the requested channels while an association of channel
> with document is in progress.

Good idea, but I think it would solve only one event.
Receiving another channel would be fine (delayed)
but still if you open document while receiving channel, it could steal
the TeleConference meant for collaboration.
Anyway I don't think this is real problem, it just can't really happen :-)

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

Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52240 add uncontroversial date acceptance patterns

[Miklos Vajna]

On Wed, Jul 25, 2012 at 05:55:55PM +0200, Eike Rathke  wrote:
> Please review (date acceptance patterns, xml locale data changes only)
> and cherry-pick to 3-6 and if possible, in case we'll do 3.6.0.4rc,
> 3-6-0
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=7828847618b58ff2009b5ce55416a8b2e5dcf55a
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae660e9efa4994bbfafa6de46b4b18aef2f1bb49
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=dc52902eb218095652bf2921d5acfb9d0c863ac9
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=05035c894644f700fdc972b51dbd918f7530b2d5

Pushed to -3-6.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 i18npool/source/localedata/data/ak_GH.xml  |1 +
 i18npool/source/localedata/data/ar_DZ.xml  |1 +
 i18npool/source/localedata/data/ar_EG.xml  |1 +
 i18npool/source/localedata/data/ar_OM.xml  |1 +
 i18npool/source/localedata/data/ast_ES.xml |1 +
 i18npool/source/localedata/data/ee_GH.xml  |1 +
 i18npool/source/localedata/data/el_GR.xml  |1 +
 i18npool/source/localedata/data/en_AU.xml  |1 +
 i18npool/source/localedata/data/en_GH.xml  |1 +
 i18npool/source/localedata/data/en_JM.xml  |1 +
 i18npool/source/localedata/data/en_NA.xml  |1 +
 i18npool/source/localedata/data/en_ZA.xml  |1 +
 i18npool/source/localedata/data/es_AR.xml  |1 +
 i18npool/source/localedata/data/es_BO.xml  |1 +
 i18npool/source/localedata/data/es_CO.xml  |1 +
 i18npool/source/localedata/data/es_CR.xml  |1 +
 i18npool/source/localedata/data/es_DO.xml  |1 +
 i18npool/source/localedata/data/es_EC.xml  |1 +
 i18npool/source/localedata/data/es_GT.xml  |1 +
 i18npool/source/localedata/data/es_PE.xml  |1 +
 i18npool/source/localedata/data/eu.xml |1 +
 i18npool/source/localedata/data/fa_IR.xml  |1 +
 i18npool/source/localedata/data/fur_IT.xml |1 +
 i18npool/source/localedata/data/gl_ES.xml  |1 +
 i18npool/source/localedata/data/gug_PY.xml |1 +
 i18npool/source/localedata/data/ha_GH.xml  |1 +
 i18npool/source/localedata/data/haw_US.xml |1 +
 i18npool/source/localedata/data/he_IL.xml  |1 +
 i18npool/source/localedata/data/hil_PH.xml |1 +
 i18npool/source/localedata/data/ht_HT.xml  |1 +
 i18npool/source/localedata/data/hy_AM.xml  |1 +
 i18npool/source/localedata/data/ia.xml |1 +
 i18npool/source/localedata/data/id_ID.xml  |1 +
 i18npool/source/localedata/data/jbo.xml|1 +
 i18npool/source/localedata/data/ka_GE.xml  |1 +
 i18npool/source/localedata/data/km_KH.xml  |1 +
 i18npool/source/localedata/data/ko_KR.xml  |1 +
 i18npool/source/localedata/data/ku_TR.xml  |1 +
 i18npool/source/localedata/data/la_VA.xml  |1 +
 i18npool/source/localedata/data/lg_UG.xml  |1 +
 i18npool/source/localedata/data/lif_NP.xml |1 +
 i18npool/source/localedata/data/lo_LA.xml  |1 +
 i18npool/source/localedata/data/mt_MT.xml  |1 +
 i18npool/source/localedata/data/my_MM.xml  |1 +
 i18npool/source/localedata/data/myv_RU.xml |1 +
 i18npool/source/localedata/data/ne_NP.xml  |1 +
 i18npool/source/localedata/data/om_ET.xml  |1 +
 i18npool/source/localedata/data/or_IN.xml  |1 +
 i18npool/source/localedata/data/pjt_AU.xml |1 +
 i18npool/source/localedata/data/rue_SK.xml |1 +
 i18npool/source/localedata/data/rw_RW.xml  |1 +
 i18npool/source/localedata/data/sc_IT.xml  |1 +
 i18npool/source/localedata/data/sg_CF.xml  |1 +
 i18npool/source/localedata/data/so_SO.xml  |1 +
 i18npool/source/localedata/data/sw_TZ.xml  |1 +
 i18npool/source/localedata/data/th_TH.xml  |1 +
 i18npool/source/localedata/data/ti_ER.xml  |1 +
 i18npool/source/localedata/data/tpi_PG.xml |1 +
 i18npool/source/localedata/data/uk_UA.xml  |1 +
 i18npool/source/localedata/data/ur_PK.xml  |1 +
 i18npool/source/localedata/data/vi_VN.xml  |1 +
 i18npool/source/localedata/data/wa_BE.xml  |1 +
 i18npool/source/localedata/data/zh_HK.xml  |1 +
 i18npool/source/localedata/data/zh_SG.xml  |1 +
 64 files changed, 64 insertions(+)

New commits:
commit a10f7178b3b57eb81bc5d3ef046bfc935e8ba346
Author: Eike Rathke 
Date:   Wed Jul 25 15:56:12 2012 +0200

fdo#52240 added M/D date acceptance pattern to locales with M/D/Y edit 
format

Change-Id: Ic45b89d5cc1238bb58a29ed0e5fe967e23caefd5
(cherry picked from commit 05035c894644f700fdc972b51dbd918f7530b2d5)

Signed-off-by: Miklos Vajna 

diff --git a/i18npool/source/localedata/data/ak_GH.xml 
b/i18npool/source/localedata/data/ak_GH.xml
index 0f15f65..1355de7 100644
--- a/i18npool/source/localedata/data/ak_GH.xml
+++ b/i18npool/source/localedata/data/ak_GH.xml
@@ -35,6 +35,7 @@
 metric
   
   
+M/D
 
   General
 
diff --git a/i18npool/source/localedata/data/ee_GH.xml 
b/i18npool/source/localedata/data/ee_GH.xml
index 971ec09..171d7f9 100644
--- a/i18npool/source/localedata/data/ee_GH.xml
+++ b/i18npool/source/localedata/data/ee_GH.xml
@@ -35,6 +35,7 @@
 metric
   
   
+M/D
 
   General
 
diff --git a/i18npool/source/localedata/data/ha_GH.xml 
b/i18npool/source/localedata/data/ha_GH.xml
index 1b2abb7..a8d16bb 100644
--- a/i18npool/source/localedata/data/ha_GH.xml
+++ b/i18npool/source/localedata/data/ha_GH.xml
@@ -35,6 +35,7 @@
 metric
   
   
+M/D
 
   General
 
diff --git a/i18npool/source/localedata/data/hil_PH.xml 
b/i18npool/source/localedata/data/hil_PH.xml
index fcc8be6..c2dab0b 100644
--- a/i18npool/source/localedata/data/hil_PH.xml
+++ b/i18npool/source/localedata/data/hil_PH.xml
@@ -35,6 +35,7 @@
 metric
   
   
+M/D
 
   G

Re: [REVIEW 3-6][REVIEW 3-6-0] fdo#52240 add uncontroversial date acceptance patterns

[David Tardon]

Hi,

On Wed, Jul 25, 2012 at 05:55:55PM +0200, Eike Rathke wrote:
> Hi,
> 
> Please review (date acceptance patterns, xml locale data changes only)
> and cherry-pick to 3-6 and if possible, in case we'll do 3.6.0.4rc,
> 3-6-0
> 
> that enable abbreviated date input for locales that use '/' date
> separator, which, contrary to '.' and '-', are uncontroversial, see
> https://bugs.freedesktop.org/show_bug.cgi?id=52240

Hm, are they? What if I want to insert a fraction? Or am I missing
something (very probable)?

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

[Libreoffice-commits] .: 5 commits - starmath/source writerfilter/qa

[Miklos Vajna]

 starmath/source/rtfexport.cxx  |  208 +++--
 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |   14 -
 2 files changed, 204 insertions(+), 18 deletions(-)

New commits:
commit 4f08fcb8e337f79f1282966bf726f82ddadf24a3
Author: Miklos Vajna 
Date:   Wed Jul 25 18:20:17 2012 +0200

export RTF_MSSU{B,P} and related keywords

Change-Id: Ida24beda4d961db068279e81711e10c3d87b0ac1

diff --git a/starmath/source/rtfexport.cxx b/starmath/source/rtfexport.cxx
index 32c441a..2031fe0 100644
--- a/starmath/source/rtfexport.cxx
+++ b/starmath/source/rtfexport.cxx
@@ -86,6 +86,9 @@ void SmRtfExport::HandleNode(const SmNode* pNode, int nLevel)
 case NMATH:
 HandleMath(pNode, nLevel);
 break;
+case NSUBSUP:
+HandleSubSupScript(static_cast(pNode), 
nLevel);
+break;
 case NEXPRESSION:
 HandleAllSubNodes(pNode, nLevel);
 break;
@@ -381,14 +384,122 @@ void SmRtfExport::HandleOperator(const SmOperNode* 
pNode, int nLevel)
 }
 }
 
-void SmRtfExport::HandleSubSupScript(const SmSubSupNode* /*pNode*/, int 
/*nLevel*/)
+void SmRtfExport::HandleSubSupScript(const SmSubSupNode* pNode, int nLevel)
 {
-SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
+// set flags to a bitfield of which sub/sup items exists
+int flags = (pNode->GetSubSup(CSUB) ? (1 << CSUB) : 0)
+| (pNode->GetSubSup(CSUP) ? (1 << CSUP) : 0)
+| (pNode->GetSubSup(RSUB) ? (1 << RSUB) : 0)
+| (pNode->GetSubSup(RSUP) ? (1 << RSUP) : 0)
+| (pNode->GetSubSup(LSUB) ? (1 << LSUB) : 0)
+| (pNode->GetSubSup(LSUP) ? (1 << LSUP) : 0);
+HandleSubSupScriptInternal(pNode, nLevel, flags);
 }
 
-void SmRtfExport::HandleSubSupScriptInternal(const SmSubSupNode* /*pNode*/, 
int /*nLevel*/, int /*flags*/)
+void SmRtfExport::HandleSubSupScriptInternal(const SmSubSupNode* pNode, int 
nLevel, int flags)
 {
-SAL_INFO("starmath.rtf", "TODO: " << OSL_THIS_FUNC);
+// rtf supports only a certain combination of sub/super scripts, but LO can 
have any,
+// so try to merge it using several tags if necessary
+if (flags == 0) // none
+return;
+if ((flags & (1 << RSUP | 1 << RSUB)) == (1 << RSUP | 1 << RSUB))
+{ // m:sSubSup
+m_pBuffer->append("{\\msSubSup ");
+m_pBuffer->append("{\\me ");
+flags &= ~(1 << RSUP | 1 << RSUB);
+if (flags == 0)
+HandleNode(pNode->GetBody(), nLevel + 1);
+else
+HandleSubSupScriptInternal(pNode, nLevel, flags);
+m_pBuffer->append("}"); // me
+m_pBuffer->append("{\\msub ");
+HandleNode(pNode->GetSubSup(RSUB), nLevel + 1);
+m_pBuffer->append("}"); // msub
+m_pBuffer->append("{\\msup ");
+HandleNode(pNode->GetSubSup(RSUP ), nLevel + 1);
+m_pBuffer->append("}"); // msup
+m_pBuffer->append("}"); // msubSup
+}
+else if ((flags & (1 << RSUB)) == 1 << RSUB)
+{ // m:sSub
+m_pBuffer->append("{\\msSub ");
+m_pBuffer->append("{\\me ");
+flags &= ~(1 << RSUB);
+if (flags == 0)
+HandleNode(pNode->GetBody(), nLevel + 1);
+else
+HandleSubSupScriptInternal(pNode, nLevel, flags);
+m_pBuffer->append("}"); // me
+m_pBuffer->append("{\\msub ");
+HandleNode(pNode->GetSubSup(RSUB), nLevel + 1);
+m_pBuffer->append("}"); // msub
+m_pBuffer->append("}"); // msSub
+}
+else if ((flags & (1 << RSUP)) == 1 << RSUP)
+{ // m:sSup
+m_pBuffer->append("{\\msSup ");
+m_pBuffer->append("{\\me ");
+flags &= ~(1 << RSUP);
+if (flags == 0)
+HandleNode(pNode->GetBody(), nLevel + 1);
+else
+HandleSubSupScriptInternal(pNode, nLevel, flags);
+m_pBuffer->append("}"); // me
+m_pBuffer->append("{\\msup ");
+HandleNode(pNode->GetSubSup(RSUP), nLevel + 1);
+m_pBuffer->append("}"); // msup
+m_pBuffer->append("}"); // msSup
+}
+else if ((flags & (1 << LSUP | 1 << LSUB)) == (1 << LSUP | 1 << LSUB))
+{ // m:sPre
+m_pBuffer->append("{\\msPre ");
+m_pBuffer->append("{\\msub ");
+HandleNode(pNode->GetSubSup(LSUB ), nLevel + 1);
+m_pBuffer->append("}"); // msub
+m_pBuffer->append("{\\msup ");
+HandleNode(pNode->GetSubSup(LSUP), nLevel + 1);
+m_pBuffer->append("}"); // msup
+m_pBuffer->append("{\\me ");
+flags &= ~(1 << LSUP | 1 << LSUB);
+if (flags == 0)
+HandleNode(pNode->GetBody(), nLevel + 1);
+else
+HandleSubSupScriptInternal(pNode, nLevel, flags);
+m_pBuffer->append("}"); // me
+m_pBuffer->append("}"); // msPre
+}
+else if ((flags & (1 << CSUB)) == (1 << CSUB))
+{ // m:limLow looks like a good element for central superscript
+m_pBuffer->append("{\\mlimLow ");
+m

Re: need help for Android build.

[Tor Lillqvist]

>> This shows that it is not a cross-compilation.
>
> Thanks! I see, shall I change the --build value in autogen.lastrun?

No; note that "build" means the platform where you are running the
cross-compilation (in your case SUSE), and "host" means the platform
where the produced code will run (Android). Anyway, if you indeed use
--with-distro=LibreOfficeAndroid that shouldn't be necessary. Perhaps
the part of the configure output you showed first was for the build
platform? For a cross-compilation, the configure script is
automatically run a second time...

So probably your autogen.lastrun is OK. I saw the pathname /windows in
your first mail; what kind of file system is that? There might be
problems if trying to build on SMB or FAT file systems.

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

[GSoC 2012][Collaboration] unit test story

[Matúš Kukan]

Hi all,

To let you know that I am still alive, now something about unit test:
I thought that 1-1 collaboration works quite like expected (you get a
file on start.. now also you see contacts dialog updated when someone
goes on/offline (both does not seem to work for gmail accounts
though!)),
So I was going to work on MUC collaboration but found out that it does
not work at all.
Then found out it's the same for 1-1.
So I decided to resurrect unit test.
This was done with help of Stephan, Markus and Eike, thanks.
But the unit test was working and real collaboration not.
Luckily I was able to find out relatively soon what's different:
I have tried to install .service and .client files at some time and
they broke it, I need to investigate why.
In unit test we use different service name.
So - I'd like to change this and revert
5edcd7fa12c69c5b27d6b317f380f266f292008d
Eike, would that be fine ?
I am not sure what for was that.. to be able to run unit test while
real LibO is running ?
Would we want that ?

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

Re: [PATCH] Native background for some more widgets

[Ruslan Kabatsayev]

On Wed, Jul 25, 2012 at 10:56 PM, Ivan Timofeev  wrote:
> this patch a bit breaks a toolbar look to me. (on Linux, the default
> Ubuntu's Ambiance theme, have not tried on windows, where it is now
> completely broken I guess).

Yes, I can reproduce this. I'll try to fix it asap (so that toolbar bg
is rendered, not window), and if I fail, we'll have to revert this
patch.

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

Re: need help for Android build.

[Yi Fan Jiang]

Hi Tor,

Sorry, I didn't paste my last mail completely:

> Are you btw trying to build for x86 Android or ARM Android? I only
> have experience of the latter; mmeeks can tell you more about the
> former (and hopefully he has updated or will update README.cross
> and/or README.Android;))

I am trying to build an ARM Android.

>> checking build system type... x86-unknown-linux-gnu
>> checking host system type... x86-unknown-linux-gnu

> This shows that it is not a cross-compilation.

Thanks! I see, shall I change the --build value in autogen.lastrun?

>> checking gcc home... /usr
>> checking for gcc... 
/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
 
/home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
 -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 
--sysroot /home/bench/android-ndk-r8b/platforms/android-9/arch-arm 
-L/home/bench/android-ndk-r8b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a

>This is weird. How did it you get it to use that compiler? And still
>it says that "gcc home" (the exact meaning and use of which is a bit
>unclear; that might well be unneeded cruft in configure.in) is /usr?

What I did was I  manually changing the autogen.lastrun as the previous mail 
shown, 
then running ./autogen.sh will give me such a log.

Thanks again!

Best wishes,
Yifan

>>> Yi Fan Jiang 07/26/12 3:25 PM >>>
Hi Tor,

Many thanks for your quick reply! Yes, I suspect I made some mistakes when 
configuring stuff  :( While I am still reading, the document I used for autogen 
is:

http://cgit.freedesktop.org/libreoffice/core/tree/README.cross#n357

My autogen.lastrun (now I know the first two lines can be ignored):

--

CC_FOR_BUILD=gcc
CXX_FOR_BUILD=g++
--with-android-ndk=/home/bench/android-ndk-r8b
--with-android-sdk=/home/bench/android-sdk-linux
--build=x86-unknown-linux-gnu
--with-ant-home=/usr/share/ant
--disable-zenity
--with-distro=LibreOfficeAndroid
--disable-python
--with-num-cpus=1
--with-max-jobs=1
--without-helppack-integration
--without-myspell-dicts

--

Best wishes,
Yifan

>>> Tor Lillqvist  07/26/12 2:41 PM >>>
> ndk: android-ndk-r8b

Note thet NDK r8b is quite new, and despite just the minor "b" version
bump, if I understand correctly (I haven't tried it yet as I am on
vacation) it comes with a large bump in tool-chain versions. I suggest
staying with r8 until building with r8b has been verified. (r8b comes
with the gold linker, yay, that should speed up linking time
considerably one hopes, maybe we can now make libmerged much larger!)

> sdk: android-sdk_r20.0.1
> gcc: 4.3.4

Ah ok, so apparently r8b comes also with the old GCC 4.3.4.

> running ./configure with 'CC_FOR_BUILD=gcc' 'CXX_FOR_BUILD=g++' 
> '--with-android-ndk=/home/bench/android-ndk-r8b' 
> '--with-android-sdk=/home/bench/android-sdk-linux' 
> '--build=x86-unknown-linux-gnu' '--with-ant-home=/usr/share/ant' 
> '--disable-zenity' '--disable-python' '--with-num-cpus=1' '--with-max-jobs=1' 
> '--without-helppack-integration' '--without-myspell-dicts'

You don't tell configure that you are cross-compiling at all here, or
am I missing something? The CC_FOR_BUILD and CXX_FOR_BUILD values you
give are unnecessary, those are surely the default anyway for the
build platform (i.e. your desktop Linux). {CC,CXX}_FOR_BUILD need to
be given only if you want to use some non-default compiler or compiler
options for the build platform bits.

Check the README.cross for better autogen.lastrun examples.

Are you btw trying to build for x86 Android or ARM Android? I only
have experience of the latter; mmeeks can tell you more about the
former (and hopefully he has updated or will update README.cross
and/or README.Android;))


> checking gcc home... /usr
> checking for gcc... 
> /home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
>  
> /home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
>  -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot 
> /home/bench/android-ndk-r8b/platforms/android-9/arch-arm 
> -L/home/bench/android-ndk-r8b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a

This is weird. How did it you get it to use that compiler? And still
it says that "gcc home" (the exact meaning and use of which is a bit
unclear; that might well be unneeded cruft in configure.in) is /usr?

It would be best if you posted your autogen.lastrun.

--tml



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

Re: need help for Android build.

[Yi Fan Jiang]

Hi Tor,

Many thanks for your quick reply! Yes, I suspect I made some mistakes when 
configuring stuff  :( While I am still reading, the document I used for autogen 
is:

http://cgit.freedesktop.org/libreoffice/core/tree/README.cross#n357

My autogen.lastrun (now I know the first two lines can be ignored):

--

CC_FOR_BUILD=gcc
CXX_FOR_BUILD=g++
--with-android-ndk=/home/bench/android-ndk-r8b
--with-android-sdk=/home/bench/android-sdk-linux
--build=x86-unknown-linux-gnu
--with-ant-home=/usr/share/ant
--disable-zenity
--with-distro=LibreOfficeAndroid
--disable-python
--with-num-cpus=1
--with-max-jobs=1
--without-helppack-integration
--without-myspell-dicts

--

Best wishes,
Yifan

>>> Tor Lillqvist  07/26/12 2:41 PM >>>
> ndk: android-ndk-r8b

Note thet NDK r8b is quite new, and despite just the minor "b" version
bump, if I understand correctly (I haven't tried it yet as I am on
vacation) it comes with a large bump in tool-chain versions. I suggest
staying with r8 until building with r8b has been verified. (r8b comes
with the gold linker, yay, that should speed up linking time
considerably one hopes, maybe we can now make libmerged much larger!)

> sdk: android-sdk_r20.0.1
> gcc: 4.3.4

Ah ok, so apparently r8b comes also with the old GCC 4.3.4.

> running ./configure with 'CC_FOR_BUILD=gcc' 'CXX_FOR_BUILD=g++' 
> '--with-android-ndk=/home/bench/android-ndk-r8b' 
> '--with-android-sdk=/home/bench/android-sdk-linux' 
> '--build=x86-unknown-linux-gnu' '--with-ant-home=/usr/share/ant' 
> '--disable-zenity' '--disable-python' '--with-num-cpus=1' '--with-max-jobs=1' 
> '--without-helppack-integration' '--without-myspell-dicts'

You don't tell configure that you are cross-compiling at all here, or
am I missing something? The CC_FOR_BUILD and CXX_FOR_BUILD values you
give are unnecessary, those are surely the default anyway for the
build platform (i.e. your desktop Linux). {CC,CXX}_FOR_BUILD need to
be given only if you want to use some non-default compiler or compiler
options for the build platform bits.

Check the README.cross for better autogen.lastrun examples.

Are you btw trying to build for x86 Android or ARM Android? I only
have experience of the latter; mmeeks can tell you more about the
former (and hopefully he has updated or will update README.cross
and/or README.Android;))

> checking build system type... x86-unknown-linux-gnu
> checking host system type... x86-unknown-linux-gnu

This shows that it is not a cross-compilation.

> checking gcc home... /usr
> checking for gcc... 
> /home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
>  
> /home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
>  -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot 
> /home/bench/android-ndk-r8b/platforms/android-9/arch-arm 
> -L/home/bench/android-ndk-r8b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a

This is weird. How did it you get it to use that compiler? And still
it says that "gcc home" (the exact meaning and use of which is a bit
unclear; that might well be unneeded cruft in configure.in) is /usr?

It would be best if you posted your autogen.lastrun.

--tml



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

Re: need help for Android build.

[Tor Lillqvist]

> ndk: android-ndk-r8b

Note thet NDK r8b is quite new, and despite just the minor "b" version
bump, if I understand correctly (I haven't tried it yet as I am on
vacation) it comes with a large bump in tool-chain versions. I suggest
staying with r8 until building with r8b has been verified. (r8b comes
with the gold linker, yay, that should speed up linking time
considerably one hopes, maybe we can now make libmerged much larger!)

> sdk: android-sdk_r20.0.1
> gcc: 4.3.4

Ah ok, so apparently r8b comes also with the old GCC 4.3.4.

> running ./configure with 'CC_FOR_BUILD=gcc' 'CXX_FOR_BUILD=g++' 
> '--with-android-ndk=/home/bench/android-ndk-r8b' 
> '--with-android-sdk=/home/bench/android-sdk-linux' 
> '--build=x86-unknown-linux-gnu' '--with-ant-home=/usr/share/ant' 
> '--disable-zenity' '--disable-python' '--with-num-cpus=1' '--with-max-jobs=1' 
> '--without-helppack-integration' '--without-myspell-dicts'

You don't tell configure that you are cross-compiling at all here, or
am I missing something? The CC_FOR_BUILD and CXX_FOR_BUILD values you
give are unnecessary, those are surely the default anyway for the
build platform (i.e. your desktop Linux). {CC,CXX}_FOR_BUILD need to
be given only if you want to use some non-default compiler or compiler
options for the build platform bits.

Check the README.cross for better autogen.lastrun examples.

Are you btw trying to build for x86 Android or ARM Android? I only
have experience of the latter; mmeeks can tell you more about the
former (and hopefully he has updated or will update README.cross
and/or README.Android;))

> checking build system type... x86-unknown-linux-gnu
> checking host system type... x86-unknown-linux-gnu

This shows that it is not a cross-compilation.

> checking gcc home... /usr
> checking for gcc... 
> /home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
>  
> /home/bench/android-ndk-r8b/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
>  -march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot 
> /home/bench/android-ndk-r8b/platforms/android-9/arch-arm 
> -L/home/bench/android-ndk-r8b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a

This is weird. How did it you get it to use that compiler? And still
it says that "gcc home" (the exact meaning and use of which is a bit
unclear; that might well be unneeded cruft in configure.in) is /usr?

It would be best if you posted your autogen.lastrun.

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