date:20120604

On Mon, Jun 04, 2012 at 07:11:03PM +0200, Nino wrote:
> I gave it a (first) try :)

Looking much better already. Thanks!

Best,

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

Re: [Libreoffice-commits] .: 2 commits - chart2/source connectivity/source cui/source desktop/source editeng/source embeddedobj/source extensions/source forms/source framework/source oox/source sc/Cpp

2012-06-04 Thread Stephan Bergmann


On 06/04/2012 09:14 PM, Norbert Thiebaud wrote:

On 6/4/12 09:58 , Stephan Bergmann wrote:
...

  sdext/Library_minimizer.mk   |1
  sdext/source/minimizer/impoptimizer.cxx  |6
  sdext/source/minimizer/informationdialog.cxx |5



  54 files changed, 426 insertions(+), 490 deletions(-)

New commits:
commit b3c76dee6d44d07eae404b8d7341e6c88e6c4429
Author: Noel Grandin
Date:   Sat May 26 13:53:19 2012 +0200

 fdo#46808, Adapt UNO services to new style, Part 7, updating ::create

 Update calls to factories to use new ::create methods

 Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d
 Signed-off-by: Stephan Bergmann, added some tweaks.



seems to make MacOSX unhappy:

illegal combination shl/OXT/OOO at 
/Volumes/TBRAM/core/solenv/bin/macosx-change-install-names.pl line 70,  
line 3.
make[2]: *** 
[/Volumes/TBRAM/core/workdir/unxmacxi.pro/LinkTarget/Library/SunPresentationMinimizer.uno.dylib]
 Error 9
make[2]: *** Deleting file 
`/Volumes/TBRAM/core/workdir/unxmacxi.pro/LinkTarget/Library/SunPresentationMinimizer.uno.dylib'


argh, sure, an extension must not link against comphelper

will take care

Stephan

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

Re: [PUSHED] Re: [PATCH] fdo#46378: Poor Resampling Image quality

2012-06-04 Thread Tomaž Vajngerl

Hi,

I found the problem - rescaling did not work correctly when upscaling
the image. I don't see any artifacts with this fix anymore when I use
Lanczos for all scale operations.

Best regards,
Tomaž Vajngerl


0001-Lanczos-resampling-mirror-image-on-edges-and-fix-ima.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: cui/source

2012-06-04 Thread Ivan Timofeev

 cui/source/options/optsave.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 39205cb3ab21418f715a4e8c0628dec859a577c9
Author: Ivan Timofeev 
Date:   Tue Jun 5 08:43:09 2012 +0400

Revert "Dupe code removal in cui"

FI is an image, FT is a text...

This reverts commit ecdd0501c809e8f283a09cc320a539b828bfec2f.

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index efae17b..6abeaed 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -657,6 +657,7 @@ IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
 }
 
 aODFWarningFI.Show( bShown );
+aODFWarningFT.Show( bShown );
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Building Individual Debian Packages

On Sun, Jun 03, 2012 at 09:45:04PM -0700, Joel Madero wrote:

> Going to try to build the updated git every month for Bodhi repository but
> I need to separate LO like Ubuntu does. I want to know how to build each
> component the same way.

I suggest to recycle their debian/ directory, and adapt it to your
needs; the process is driven by debian/rules, which probably calls
many Debian-specific tools (which Ubuntu also uses, as a Debian
derivative).

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

New backward-compat ODF mode / consolidation of the ODFVER_LATEST & ODFVER_012 stuff

2012-06-04 Thread Thorsten Behrens

Hi there,

with a bunch of commits just in, we have a fourth ODF mode under
the Tools->Options->Load/Save->General's ODF Format version setting.

It's labelled "1.2 Extended (compat mode)" and errs towards two
slightly more backward-compatible options for ODF writing, namely
for ODF encryption, and the infamous svg:d bug (fdo#47406).

In the process, I also cleaned up the "all extended stuff is only
written if ODFVER_LATEST is set", which depending on ODF version
evolution clearly is not universally correct. ;)

Current matrix of how the odf version setting affects output is
this:

odf1.1 -> force SHA1/BLOWFISH; force svg:d paths to be written with absolute 
coordinates
odf1.2 -> default to AES, but configurable; default to correct svg:d path
odf1.2-compat -> force SHA1/BLOWFISH; force svg:d paths to be written with 
absolute coordinates
odf1.2-extended -> default to AES, but configurable; default to correct svg:d 
path

Otherwise the last two options are equivalent in which elements & 
attributes get written. 

Does anyone consider making svg:d path writing a separate option
worthwhile? I'd still probably clamp odf1.2-compat to have this
hard-set & override those things collectively, though.

Cheers,

-- Thorsten


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

[Libreoffice-commits] .: 5 commits - chart2/source cui/source sc/source sd/source sfx2/source sw/source unotools/inc xmloff/inc xmloff/source

2012-06-04 Thread Thorsten Behrens

 chart2/source/tools/DiagramHelper.cxx  |2 -
 cui/source/options/optsave.cxx |1 
 cui/source/options/optsave.src |1 
 sc/source/filter/xml/XMLExportDataPilot.cxx|   10 +++---
 sc/source/filter/xml/xmlstyle.cxx  |2 -
 sd/source/ui/annotations/annotationmanager.cxx |2 -
 sfx2/source/doc/objstor.cxx|4 +-
 sw/source/filter/xml/xmlexp.cxx|2 -
 unotools/inc/unotools/saveopt.hxx  |1 
 xmloff/inc/xexptran.hxx|9 +++---
 xmloff/source/chart/SchXMLExport.cxx   |8 ++---
 xmloff/source/core/xmlexp.cxx  |1 
 xmloff/source/draw/shapeexport2.cxx|6 ++--
 xmloff/source/draw/shapeexport3.cxx|2 -
 xmloff/source/draw/xexptran.cxx|   36 +++--
 xmloff/source/meta/MetaExportComponent.cxx |1 
 xmloff/source/style/MarkerStyle.cxx|2 -
 xmloff/source/style/PageMasterStyleMap.cxx |2 -
 xmloff/source/text/txtparae.cxx|8 ++---
 xmloff/source/text/txtprmap.cxx|   10 +++---
 20 files changed, 61 insertions(+), 49 deletions(-)

New commits:
commit 3fb24e6307e0ec3e09b1e48e9a4ce5f6787d2cc9
Author: Thorsten Behrens 
Date:   Tue Jun 5 05:03:06 2012 +0200

Fix fdo#50704 Default to absolute svg:d paths for ODF1.2 compat-mode

This writes out absolute paths, to side-step buggy odf consumers'
wrong handling of the 'z' statement (i.e. they ignore it for current
positions).

diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 86883cf..b38860a 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 
@@ -46,6 +45,8 @@
 struct ImpSdXMLExpTransObj2DBase;
 struct ImpSdXMLExpTransObj3DBase;
 class SvXMLUnitConverter;
+class SvXMLImport;
+class SvXMLExport;
 
 namespace basegfx
 {
@@ -160,14 +161,14 @@ class SdXMLImExSvgDElement
 const SdXMLImExViewBox& mrViewBox;
 boolmbIsClosed;
 boolmbIsCurve;
-
+boolmbRelative;
 sal_Int32   mnLastX;
 sal_Int32   mnLastY;
 
 com::sun::star::drawing::PolyPolygonBezierCoords maPoly;
 
 public:
-SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox);
+SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox, const SvXMLExport& 
rExport);
 SdXMLImExSvgDElement(const rtl::OUString& rNew,
 const SdXMLImExViewBox& rViewBox,
 const com::sun::star::awt::Point& rObjectPos,
@@ -179,7 +180,7 @@ public:
 com::sun::star::drawing::FlagSequence* pFlags,
 const com::sun::star::awt::Point& rObjectPos,
 const com::sun::star::awt::Size& rObjectSize,
-bool bClosed = false, bool bRelative = true);
+bool bClosed = false);
 
 const rtl::OUString& GetExportString() const { return msString; }
 bool IsClosed() const { return mbIsClosed; }
diff --git a/xmloff/source/draw/shapeexport2.cxx 
b/xmloff/source/draw/shapeexport2.cxx
index 43d9711..00856c8 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -999,7 +999,7 @@ void XMLShapeExport::ImpExportPolygonShape(
 if(pOuterSequence && pOuterFlags)
 {
 // prepare svx:d element export
-SdXMLImExSvgDElement aSvgDElement(aViewBox);
+SdXMLImExSvgDElement aSvgDElement(aViewBox, GetExport());
 
 for(sal_Int32 a(0L); a < nOuterCnt; a++)
 {
@@ -1066,7 +1066,7 @@ void XMLShapeExport::ImpExportPolygonShape(
 if(pOuterSequence)
 {
 // prepare svx:d element export
-SdXMLImExSvgDElement aSvgDElement(aViewBox);
+SdXMLImExSvgDElement aSvgDElement(aViewBox, 
GetExport());
 
 for(sal_Int32 a(0L); a < nOuterCnt; a++)
 {
@@ -1432,7 +1432,7 @@ void XMLShapeExport::ImpExportConnectorShape(
 awt::Point aPoint( 0, 0 );
 awt::Size aSize( 1, 1 );
 SdXMLImExViewBox aViewBox( 0, 0, 1, 1 );
-SdXMLImExSvgDElement aSvgDElement(aViewBox);
+SdXMLImExSvgDElement aSvgDElement(aViewBox, GetExport());
 
 for(sal_Int32 a(0L); a < nOuterCnt; a++)
 {
diff --git a/xmloff/source/draw/shapeexport3.cxx 
b/xmloff/source/draw/shapeexport3.cxx
index 7e111d6..888f4b6 100644
--- a/xmloff/source/draw/shapeexport3.cxx
+++ b/xmloff/source/draw/shapeexport3.cxx
@@ -263,7 +263,7 @@ void XMLShapeExport::ImpExport3DShape(
 aViewBox.GetExportString());
 
 // prepare svx:d element export
-SdXML

Re: 3.5.3rc1 win32 / debug package ...

2012-06-04 Thread Nino


On 04.06.2012 18:02, Bjoern Michaelsen wrote:


On Mon, Jun 04, 2012 at 08:55:59AM -0700, bfo wrote:

I thought so, but according to http://wiki.documentfoundation.org/BugTriage
there are three bold ANDs before you can change a status to NEW.
Further more, an exclamation mark at the end of that paragraph
(and the whole scary sentence before it) discouraged me to change anything
in the Status field at all.


can we make that text less scary? ;)


I gave it a (first) try :)

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

License statement

2012-06-04 Thread Lionel Dricot

License statement:

All of my past and future contributions to the LibreOffice project are
under LGPLv3+/GPLv3+/MPL until further notice.


Lionel
 

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

Re: [PATCH] [WIP] fdo#45747 - [EasyHack] remove the limitation to 3 sort entries in calc, part 2

2012-06-04 Thread Markus Mohrhard

Hey Albert,

>
> I already had a quick look at the closing problem and it seems it is
> not a crash. It looks more like a missing close handler which results
> in the parent window being closed which is in this case the LibO
> window but I need to spend some more time on it. I will spend next
> week on your patch and make sure that it is ready for 3-6.

I finally had time to fix the issue with your patch and pushed it to master.

The problem has been that vcl's window class destructor checks that
all child windows are destroyed in dbgutil builds and your design did
not ensure this. The changes that I did to your patch are in
http://cgit.freedesktop.org/libreoffice/core/commit/?id=57e35b0ed54a2e74c107493869e72ab7eb86222a.

I also fixed a crash that I noticed when using more than 3 sort
entries. I checked and the dialog looks good now.

Thanks a lot for this amazing work. I added it to the 3.6 release notes page.

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

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

2012-06-04 Thread Markus Mohrhard

 sc/Library_scui.mk|1 
 sc/inc/helpids.h  |1 
 sc/inc/sc.hrc |5 
 sc/source/ui/dbgui/sortdlg.cxx|1 
 sc/source/ui/dbgui/sortkeydlg.cxx |  197 +++
 sc/source/ui/dbgui/tpsort.cxx |  272 +++---
 sc/source/ui/inc/sortdlg.hrc  |   21 +-
 sc/source/ui/inc/sortdlg.hxx  |6 
 sc/source/ui/inc/sortkeydlg.hxx   |  107 ++
 sc/source/ui/inc/tpsort.hxx   |   40 +
 sc/source/ui/src/sortdlg.src  |  142 ++-
 11 files changed, 494 insertions(+), 299 deletions(-)

New commits:
commit 57e35b0ed54a2e74c107493869e72ab7eb86222a
Author: Markus Mohrhard 
Date:   Tue Jun 5 03:08:09 2012 +0200

fix some issues with sort dlg patch

Change-Id: Iba2839ec04a79b8fa49968aebb194f9dc6799d4d

diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index a057c19..3a4f446 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -43,7 +43,6 @@ ScSortDlg::ScSortDlg( Window*   pParent,
   pArgSet ),
 bIsHeaders  ( false ),
 bIsByRows   ( false )
-
 {
 AddTabPage( TP_FIELDS,  ScTabPageSortFields::Create,  0 );
 AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 );
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx 
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 0801b8d..29e69d0 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -86,6 +86,7 @@ ScSortKeyWindow::ScSortKeyWindow( Window* pParent, const 
ResId& rResId, ScSortKe
 
 ScSortKeyWindow::~ScSortKeyWindow()
 {
+mrSortKeyItems.clear();
 }
 
 // ---
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 1afe9bd..303d6c6 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -227,13 +227,6 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& 
rArgSet )
 {
 ScSortParam aNewSortData = aSortData;
 
-if (pDlg)
-{
-const SfxItemSet* pExample = pDlg->GetExampleSet();
-const SfxPoolItem* pItem;
-if ( pExample && pExample->GetItemState( nWhichSort, sal_True, &pItem 
) == SFX_ITEM_SET )
-aNewSortData = static_cast(pItem)->GetSortData();
-}
 std::vector  nSortPos;
 
 for ( sal_uInt16 i=0; iGetExampleSet();
-const SfxPoolItem* pItem;
-if ( pExample && pExample->GetItemState( nWhichSort, sal_True, &pItem 
) == SFX_ITEM_SET )
-aNewSortData = static_cast(pItem)->GetSortData();
-}
 aNewSortData.bByRow  = aBtnTopDown.IsChecked();
 aNewSortData.bHasHeader  = aBtnHeader.IsChecked();
 aNewSortData.bCaseSens   = aBtnCase.IsChecked();
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index 2ae6adb..004c178 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -38,9 +38,9 @@
 class ScSortDlg : public SfxTabDialog
 {
 public:
-ScSortDlg( Window*   pParent,
-   const SfxItemSet* pArgSet );
-~ScSortDlg();
+ScSortDlg( Window*   pParent,
+const SfxItemSet* pArgSet );
+virtual ~ScSortDlg();
 
 voidSetHeaders( sal_Bool bHeaders );
 voidSetByRows ( sal_Bool bByRows );
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 8930d16..14fce4e 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -59,9 +59,9 @@ struct ScSortParam;
 class ScTabPageSortFields : public SfxTabPage
 {
 public:
-ScTabPageSortFields( Window* pParent,
- const SfxItemSet&   rArgSet );
-~ScTabPageSortFields();
+ScTabPageSortFields( Window* pParent,
+const SfxItemSet&   rArgSet );
+virtual ~ScTabPageSortFields();
 
 static  SfxTabPage* Create  ( Window*   pParent,
   const SfxItemSet& rArgSet );
@@ -120,9 +120,9 @@ class CollatorWrapper;
 class ScTabPageSortOptions : public SfxTabPage
 {
 public:
-ScTabPageSortOptions( Window*pParent,
-  const SfxItemSet&  rArgSet );
-~ScTabPageSortOptions();
+ScTabPageSortOptions( Window*pParent,
+const SfxItemSet&  rArgSet );
+virtual ~ScTabPageSortOptions();
 
 #undef SfxTabPage
 #define SfxTabPage ::SfxTabPage
commit 35b1d1a9b47abb8cb3b45d4c6351d1c2b86b379f
Author: Albert Thuswaldner 
Date:   Mon May 21 23:04:12 2012 +0200

fdo#45747 remove the limitation to 3 sort entries in calc part2

Change-Id: I699c424f536b0096b35d3db3aee371793e9e56c4

diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index fbb84d6..19adbb2 100644
--- a/sc/Library_scui.mk
+++ b/sc/Librar

[Libreoffice-commits] .: 2 commits - connectivity/source dbaccess/source

 connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx |8 ++--
 dbaccess/source/core/api/RowSetCache.cxx  |9 -
 2 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 475bafc4be1b113095e1b0dcacfd565374777f8d
Author: Lionel Elie Mamane 
Date:   Wed Feb 22 06:53:51 2012 +0100

Replace manual Mutex handling by clearable guard

Change-Id: I4c20bf3a2aa5ca908db233e54f50404cc7466d72

diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx 
b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 6e9079c..eed6e97 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -222,28 +222,24 @@ MQueryHelper::getByIndex( sal_uInt32 nRow )
 }
 
 do {
-// Obtain the Mutex - don't use a guard as we want to be able to 
release
-// and acquire again...
-m_aMutex.acquire();
+::osl::ClearableMutexGuard aGuard( m_aMutex );
 if ( nRow > m_aResults.size() )
 {
 if ( m_bQueryComplete )
 {
 m_bAtEnd = sal_True;
-m_aMutex.release();
 return( NULL );
 }
 else
 {
 clearResultOrComplete();
-m_aMutex.release();
+aGuard.clear();
 if ( !waitForResultOrComplete( ) )
 return( NULL );
 }
 }
 else
 {
-m_aMutex.release();
 return( m_aResults[ nRow -1 ] );
 }
 } while ( sal_True );
commit 43f9468d3529ab7e6f20a5ba3ae12dc14ead4193
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 23:28:18 2012 +0200

bCheck is guaranteed by the for loop condition

Change-Id: Ia54eaa5cb1aa8bb4a052cea25396b07f048ff74c

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 940618a..05a88d0 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1087,11 +1087,10 @@ sal_Bool ORowSetCache::moveWindow()
 for(; !aIter->is() && bCheck;++aIter, ++nPos)
 {
 OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator");
-if ( bCheck ) // resultset stands on right position
-{
-*aIter = new 
ORowSetValueVector(m_xMetaData->getColumnCount());
-m_pCacheSet->fillValueRow(*aIter, nPos);
-}
+
+*aIter = new 
ORowSetValueVector(m_xMetaData->getColumnCount());
+m_pCacheSet->fillValueRow(*aIter, nPos);
+
 bCheck = m_pCacheSet->next();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 1.6Gb of workdir/.../Dep - thoughts ...

On Mon, Jun 04, 2012 at 06:53:56PM +0100, Michael Meeks wrote:
>   Sigh; true - it'll mostly speedup build time then; then again we could
> filter them during / after generation I suppose.

But thats not the big part - as a:

 du -h $(WORKDIR)/Dep/*

will confirm -- CxxObjects is rather large ... Im beginning to like the idea of
gzipping those.

>   Why do you think that Deps are 10% of the working directory ?
> 
> $ du -m workdir/unxlngi6.pro | tail -n 1
> 2906  unxlngi6.pro
> $ du -m workdir/unxlngi6.pro/Dep | tail -n 1
> 1546  unxlngi6.pro/Dep
> 
>   For me that reads > 50% of the size.

Indeed. I looked at a -3-5 build with is much different. I couldnt get a master
build as it is broken all day today.

>   Is my workdir abnormally different to yours ? it's normal to have >
> 1.5Gb of 'stuff' in there I think - at least someone I sanity checked
> with saw that too - IMHO it's too big.

see above. ;)

Best,

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

[Libreoffice-commits] .: liblangtag/liblangtag-0.2-datadir.patch liblangtag/makefile.mk liblangtag/prj

2012-06-04 Thread Eike Rathke

 liblangtag/liblangtag-0.2-datadir.patch |   35 +
 liblangtag/makefile.mk  |   31 ++
 liblangtag/prj/d.lst|   38 ++--
 3 files changed, 56 insertions(+), 48 deletions(-)

New commits:
commit 12cfcf3733a5302bd78c277a1a33794c38c3610c
Author: Eike Rathke 
Date:   Mon Jun 4 23:28:55 2012 +0200

configure prefix for "installation" and get_data() function

* LIBO_LANGTAG_DATADIR environment variable may point to liblangtag data and
  override REGDATADIR define.
* deliver data files to $SOLARVER/$INPATH/share/liblangtag

diff --git a/liblangtag/liblangtag-0.2-datadir.patch 
b/liblangtag/liblangtag-0.2-datadir.patch
new file mode 100644
index 000..061f530
--- /dev/null
+++ b/liblangtag/liblangtag-0.2-datadir.patch
@@ -0,0 +1,35 @@
+--- misc/liblangtag-0.2/liblangtag/lt-xml.c2012-02-02 09:54:51.0 
+0100
 misc/build/liblangtag-0.2/liblangtag/lt-xml.c  2012-06-04 
17:39:32.010299830 +0200
+@@ -45,6 +45,14 @@
+ 
+ G_LOCK_DEFINE_STATIC (lt_xml);
+ 
++static const char* get_datadir()
++{
++const char* pEnv = getenv( "LIBO_LANGTAG_DATADIR");
++if (pEnv && *pEnv)
++return pEnv;
++return REGDATADIR;
++}
++
+ /*< private >*/
+ static gboolean
+ lt_xml_read_subtag_registry(lt_xml_t  *xml,
+@@ -62,7 +70,7 @@
+   if (!g_file_test(regfile, G_FILE_TEST_EXISTS)) {
+   g_free(regfile);
+ #endif
+-  regfile = g_build_filename(REGDATADIR, "language-subtag-registry.xml", 
NULL);
++  regfile = g_build_filename(get_datadir(), 
"language-subtag-registry.xml", NULL);
+ #ifdef GNOME_ENABLE_DEBUG
+   }
+ #endif
+@@ -120,7 +128,7 @@
+   if (!g_file_test(regfile, G_FILE_TEST_EXISTS)) {
+   g_free(regfile);
+ #endif
+-  regfile = g_build_filename(REGDATADIR, "common", "bcp47", filename, 
NULL);
++  regfile = g_build_filename(get_datadir(), "common", "bcp47", filename, 
NULL);
+ #ifdef GNOME_ENABLE_DEBUG
+   }
+ #endif
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 977eca7..a8efa55 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -14,8 +14,8 @@ TARGET=liblangtag
 LIBLANGTAG_MAJOR=0
 LIBLANGTAG_MINOR=2
 LIBLANGTAG_MICRO=0
-# currently liblangtag.so.0.1.0 is generated, presumably a bug?
-LIBLANGTAG_LIBMINOR=1
+# Currently liblangtag.so.0.1.0 is generated instead of 0.2.0, presumably a 
bug?
+# For new versions adapt symlink in prj/d.lst
 
 # --- Settings -
 
@@ -36,12 +36,15 @@ PATCH_FILES=liblangtag-0.2-0001-Fix-a-memory-leak.patch
 # liblangtag cf8dfcf1604e534f4c9eccbd9a05571c8a9dc74d
 PATCH_FILES+=liblangtag-0.2-0002-Fix-invalid-memory-access.patch
 PATCH_FILES+=liblangtag-0.2-configure.patch
+PATCH_FILES+=liblangtag-0.2-datadir.patch
 
 CONFIGURE_DIR=.
 BUILD_DIR=$(CONFIGURE_DIR)
 
+CONFIGURE_FLAGS+= --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)$/install
+
 .IF "$(SYSTEM_LIBXML)"!="YES"
-CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)/external/libxml'
+CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external$/libxml'
 .IF "$(GUI)"=="WNT" && "$(COM)"!="GCC"
 CONFIGURE_FLAGS+= LIBXML2_LIBS='$(SOLARLIBDIR)$/libxml2.lib'
 .ELSE
@@ -66,20 +69,11 @@ CONFIGURE_FLAGS+= --disable-glibtest
 
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure
 
-BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS)
-
-.IF "$(GUI)"=="UNX"
-
-OUT2LIB= \
-   
$(BUILD_DIR)$/liblangtag/.libs$/$(TARGET)$(DLLPOST).$(LIBLANGTAG_MAJOR).$(LIBLANGTAG_LIBMINOR).$(LIBLANGTAG_MICRO)
 \
-$(BUILD_DIR)$/liblangtag/.libs$/$(TARGET)$(DLLPOST).$(LIBLANGTAG_MAJOR) \
-$(BUILD_DIR)$/liblangtag/.libs$/$(TARGET)$(DLLPOST)
-
-.ENDIF # "$(GUI)"=="UNX"
+BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS) && \
+$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install
 
 
 .IF "$(GUI)"=="WNT"
-
 .IF "$(COM)"=="GCC"
 
 CONFIGURE_FLAGS+= LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
@@ -88,20 +82,11 @@ CONFIGURE_FLAGS+= 
LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
 CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
-OUT2LIB= \
-   
$(BUILD_DIR)$/liblangtag/.libs$/$(TARGET)$(DLLPOST).$(LIBLANGTAG_MAJOR).$(LIBLANGTAG_LIBMINOR).$(LIBLANGTAG_MICRO)
 \
-$(BUILD_DIR)$/liblangtag/.libs$/$(TARGET)$(DLLPOST).$(LIBLANGTAG_MAJOR) \
-$(BUILD_DIR)$/liblangtag/.libs$/$(TARGET)$(DLLPOST)
-
 .ELSE  # "$(COM)"=="GCC"
 
 PATCH_FILES+=liblangtag-0.2-msc-configure.patch
 
-OUT2LIB= \
-   $(BUILD_DIR)$/liblangtag/.libs$/langtag.lib
-
 .ENDIF # "$(COM)"=="GCC"
-
 .ENDIF # "$(GUI)"=="WNT"
 
 
diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst
index d07e0a8..43e9c34 100644
--- a/liblangtag/prj/d.lst
+++ b/liblangtag/prj/d.lst
@@ -1,29 +1,17 @@
 mkdir: %_DEST%\inc\liblangtag
 
-..\%__SRC%\misc\build\liblangtag*\liblangtag\langtag.h  
%_DEST%\inc\liblangtag\
-..\%__SRC%\misc\build\liblangt

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

2012-06-04 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bf7b50a75916e5564062b5121fb67de584045b33
Author: Andras Timar 
Date:   Mon Jun 4 23:07:24 2012 +0200

add incidentally deleted setAllUsersProfile2K back

Change-Id: I687328d08c89c45fc5d95ee02aea5318b9b5a3ff

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 6423f1e..4d7125f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -2,6 +2,7 @@ Action  TypeSource  Target
 s72i2  S64 S255
 CustomAction   Action
 ISInitAllUsers 307 ALLUSERS1
+setAllUsersProfile2K   51  ALLUSERSPROFILE [%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51  ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
 setUserProfileNT   51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

 sw/source/ui/docvw/edtwin.cxx |   34 --
 1 file changed, 20 insertions(+), 14 deletions(-)

New commits:
commit 7b54689b0eba179e29ede8a7f0732fb4628dd031
Author: Michael Stahl 
Date:   Mon Jun 4 22:52:47 2012 +0200

edtwin.cxx: try to shut up the tinderboxes

Change-Id: I504d3b0ac6250b88ca3de3cad179a7caec35e2a5

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 831ab46..fffe6c3 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5656,27 +5656,33 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const 
String& rWord )
 }
 }
 
+namespace {
+
+struct CompareIgnoreCaseAscii
+{
+bool operator()(const String& s1, const String& s2) const
+{
+return s1.CompareIgnoreCaseToAscii(s2) == COMPARE_LESS;
+}
+};
+
+struct EqualIgnoreCaseAscii
+{
+bool operator()(const String& s1, const String& s2) const
+{
+return s1.CompareIgnoreCaseToAscii(s2) == COMPARE_EQUAL;
+}
+};
+
+} // anonymous namespace
+
 // TODO - implement an i18n aware sort
 void QuickHelpData::SortAndFilter()
 {
-struct CompareIgnoreCaseAscii
-{
-bool operator()(const String& s1, const String& s2) const
-{
-return s1.CompareIgnoreCaseToAscii(s2) == COMPARE_LESS;
-}
-};
 std::sort( pHelpStrings->begin(),
pHelpStrings->end(),
CompareIgnoreCaseAscii() );
 
-struct EqualIgnoreCaseAscii
-{
-bool operator()(const String& s1, const String& s2) const
-{
-return s1.CompareIgnoreCaseToAscii(s2) == COMPARE_EQUAL;
-}
-};
 std::vector::iterator it = std::unique( pHelpStrings->begin(),
 pHelpStrings->end(),
 EqualIgnoreCaseAscii() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Re: [PATCH 2/2] Smarter auto-complete capitalization (#i22961#) and i18n handling

On 04/06/12 14:03, Brad Sowden wrote:
> Hi,
> 
> This patch implements the following:
> 
> (1) Completes a TODO in the code related to i18n handling of month and 
> day names with auto-completion. Previously, when non-ASCII names were 
> added to the auto-complete word list these had to be an exact 
> case-sensitive match of the word to be auto-completed. This patch allows 
> a case-insensitive match for non-ASCII names when deciding what names to 
> add to the auto-complete list.
> 
> (2) Smarter auto-complete capitalization as described in OpenOffice bug 
> 22961. If a word is in sentence case then the auto-completed word should 
> be in the same case i.e. if the auto-complete list contains the word 
> "LIBRE" then "Lib" should auto-complete to "Libre" rather
> than "LibRE".
> 
> https://issues.apache.org/ooo/show_bug.cgi?id=22961

hi Brad,

thanks a lot for the patch, that is a nice improvement (2 improvements
even), i've pushed it to master.

> * Sidenote - Initially I tried using CharClass::titlecase() but 
> discovered this doesn't actually work. There appears to be an issue with 
> class cclass_Unicode where "trans" is only ever set to 
> "Transliteration_casemapping" and there is no mechanism to set it to 
> "Transliteration_titlecase".

hmmm... don't know much about that unfortunately...

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

[PUSHED] Re: [PATCH 1/2] Replace SvStringsISortDtor in edtwin.cxx and gloslst.[ch]xx

On 04/06/12 14:01, Brad Sowden wrote:
> Hi,
> 
> This patch converts a SvStringsISortDtor to a vector and maintains 
> equivalent functionality.

hi Brad,

thanks for the patch, i've pushed it to master.

> Instead of sorting strings upon each insertion all strings are now added 
> and then a single sort and "unique" are applied (SvStringsISortDtor 
> behaves like a SET with regards to insertion, which is why "unique" is 
> applied). SwEditWin::ShowAutoTextCorrectQuickHelp() is the only place 
> where strings are added to the vector.
> 
> The change in behaviour from keeping the first inserted version of a 
> string to keeping the first version post-sort (case-insensitive ASCII 
> comparison) should have no material impact as the strings retrieved from 
> SwAutoCompleteWord are already unique (case-insensitive ASCII 
> comparison) and the capitalization of the string is generally changed 
> anyway to match the capitalization of the word to be auto-completed. 
> Also, there appears to be no logical reason to store the first inserted 
> version of a string over the first version post-sort.

hmmm... makes sense.

> * In previous patches that I've seen on the list it appears ok to 
> convert a vector of String pointers to simply a vector of String values 
> so I've done the same.

yes that's a nice improvement.

> * I used a pointer to the vector as the move() function previously 
> copied and cleared all elements whereas a pointer swap would suffice.

ah that's why, i had wondered
would it be possible to use std::swap on the vector itself rather than
the pointer?   i could imagine that being implemented efficiently, and
it would allow the vector to not be a pointer, which is simpler.

also (but that was a pre-existing condition, not really your fault)
member names should start with "m_" so it's easy to grep for member access.

> * I've put a TODO in the code to replace the ASCII only case-insensitive 
> sort (existing limitation).
> 
> - make + make dev-install successful

that's a good start, please try to use "make check", which is a one-stop
command that does everything.  it probably wouldn't have found a problem
in this case, as i doubt there's a good test for autotext, but in
general it's a good idea.

> - functionality tested ok
> - licence statement on file

regards,
 michael

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

[Libreoffice-commits] .: vcl/generic vcl/inc

2012-06-04 Thread Julien Nabet

 vcl/generic/fontmanager/fontconfig.cxx |8 +---
 vcl/inc/vcl/fontmanager.hxx|2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 881accb9a75fd080e706a6e184de955ae0ae17e1
Author: Julien Nabet 
Date:   Mon Jun 4 22:33:55 2012 +0200

Change return PrintFontManager::countFontconfigFonts

PrintFontManager::countFontconfigFonts returns an int but it's never used
so let's drop the int returned

Change-Id: Iab00916aec36b899a04555743d698a3fc1d45085

diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index db53846..fbe18dd 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -479,10 +479,11 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i)
 memmove(pFSet->fonts + i, pFSet->fonts + i + 1, nTail*sizeof(FcPattern*));
 }
 
-int PrintFontManager::countFontconfigFonts( boost::unordered_map& o_rVisitedPaths )
+void PrintFontManager::countFontconfigFonts( 
boost::unordered_map& o_rVisitedPaths )
 {
+#if OSL_DEBUG_LEVEL > 1
 int nFonts = 0;
-
+#endif
 FontCfgWrapper& rWrapper = FontCfgWrapper::get();
 
 FcFontSet* pFSet = rWrapper.getFontSet();
@@ -640,7 +641,9 @@ int PrintFontManager::countFontconfigFonts( 
boost::unordered_map 1
 nFonts++;
+#endif
 #if OSL_DEBUG_LEVEL > 2
 fprintf( stderr, "inserted font %s as fontID %d\n", family, 
aFont );
 #endif
@@ -661,7 +664,6 @@ int PrintFontManager::countFontconfigFonts( 
boost::unordered_map 1
 fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
 #endif
-return nFonts;
 }
 
 void PrintFontManager::deinitFontconfig()
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 2cb07ae..3bdfa48 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -334,7 +334,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 called from initialize()
 */
 void initFontconfig();
-int  countFontconfigFonts( boost::unordered_map& o_rVisitedPaths );
+void countFontconfigFonts( boost::unordered_map& o_rVisitedPaths );
 /* deinitialize fontconfig
  */
 void deinitFontconfig();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-06-04 Thread René Engelhard

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

New commits:
commit 187c1cd4af803de5bfa8228195e30d150e5cb6cb
Author: Rene Engelhard 
Date:   Mon Jun 4 22:33:22 2012 +0200

bump libcmis check to >= 0.2.1 given 
966d20e35d5a2be2fce6c204af5c156c3ead7063

Change-Id: Ic6814b9a3916493bf0b1c96d5e8c12f3d187f887

diff --git a/configure.in b/configure.in
index 09600f1..38f7b0c 100644
--- a/configure.in
+++ b/configure.in
@@ -6273,7 +6273,7 @@ AC_MSG_CHECKING([which libcmis to use])
 if test "$with_system_libcmis" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCMIS=YES
-PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
+PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 >= 0.2.1 )
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBCMIS=NO
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/ui/docvw/edtwin.cxx  |  210 ++---
 sw/source/ui/inc/gloslst.hxx   |5 
 sw/source/ui/utlui/gloslst.cxx |6 -
 3 files changed, 141 insertions(+), 80 deletions(-)

New commits:
commit 230662c3afa208780d280401d63add3eece7ab8f
Author: Brad Sowden 
Date:   Mon Jun 4 22:02:34 2012 +1200

Smarter auto-complete capitalization (#i22961#) and i18n handling

If a word is in sentence case then the auto-completed word should
be in the same case i.e. if the auto-complete list contains the
word "LIBRE" then "Lib" should auto-complete to "Libre" rather
than "LibRE". See OpenOffice bug 22961.

Also implement better i18n handling for calander month and day
names. Previously, if a month or day name was not ASCII then it
would only auto-complete if it exactly matched the names retrieved
from the internal calander i.e. had be a case sensitive match.

Change-Id: I0c4543bd9e912072bce1ceaf4adecd41b55b576b

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index dca8219..831ab46 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5565,67 +5565,93 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
 
 void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
 {
+enum Capitalization { CASE_LOWER, CASE_UPPER, CASE_SENTENCE, CASE_OTHER };
+
+// Determine word capitalization
+const CharClass& rCC = GetAppCharClass();
+const String sWordLower = rCC.lowercase( rWord );
+Capitalization aWordCase = CASE_OTHER;
+if ( rWord.Len() > 0 )
+{
+if ( rWord.GetChar(0) == sWordLower.GetChar(0) )
+{
+if ( rWord == sWordLower )
+aWordCase = CASE_LOWER;
+}
+else
+{
+// First character is not lower case i.e. assume upper or title 
case
+String sWordSentence = sWordLower;
+sWordSentence.SetChar( 0, rWord.GetChar(0) );
+if ( rWord == sWordSentence )
+aWordCase = CASE_SENTENCE;
+else
+{
+if ( rWord == static_cast( rCC.uppercase( rWord ) ) )
+aWordCase = CASE_UPPER;
+}
+}
+}
+
 salhelper::SingletonRef* pCalendar = 
s_getCalendarWrapper();
 (*pCalendar)->LoadDefaultCalendar( rSh.GetCurLang() );
 
+// Add matching calendar month and day names
+uno::Sequence< i18n::CalendarItem2 > aNames( (*pCalendar)->getMonths() );
+for ( sal_uInt16 i = 0; i < 2; ++i )
 {
-uno::Sequence< i18n::CalendarItem2 > aNames(
-(*pCalendar)->getMonths() );
-for( int n = 0; n < 2; ++n )
+for ( long n = 0; n < aNames.getLength(); ++n )
 {
-for( long nPos = 0, nEnd = aNames.getLength(); nPos < nEnd; ++nPos 
)
+const String& rStr( aNames[n].FullName );
+// Check string longer than word and case insensitive match
+if( rStr.Len() > rWord.Len() &&
+static_cast( rCC.lowercase( rStr, 0, rWord.Len() ) )
+== sWordLower )
 {
-String sStr( aNames[ nPos ].FullName );
-if( rWord.Len() + 1 < sStr.Len() &&
-
-//!!! UNICODE: missing interface
-COMPARE_EQUAL == rWord.CompareIgnoreCaseToAscii(
-sStr, rWord.Len() ))
+if ( aWordCase == CASE_LOWER )
+pHelpStrings->push_back( rCC.lowercase( rStr ) );
+else if ( aWordCase == CASE_SENTENCE )
 {
-pHelpStrings->push_back( sStr );
+String sTmp = rCC.lowercase( rStr );
+sTmp.SetChar( 0, rStr.GetChar(0) );
+pHelpStrings->push_back( sTmp );
 }
+else if ( aWordCase == CASE_UPPER )
+pHelpStrings->push_back( rCC.uppercase( rStr ) );
+else // CASE_OTHER - use retrieved capitalization
+pHelpStrings->push_back( rStr );
 }
-if( !n )// get data for the second loop
-aNames = (*pCalendar)->getDays();
 }
+// Data for second loop iteration
+if ( i == 0 )
+aNames = (*pCalendar)->getDays();
 }
 
-// and than add all words from the AutoCompleteWord-List
-const SwAutoCompleteWord& rACLst = rSh.GetAutoCompleteWords();
-sal_uInt16 nStt, nEnd;
-if( rACLst.GetRange( rWord, nStt, nEnd ) )
+// Add matching words from AutoCompleteWord list
+const SwAutoCompleteWord& rACList = rSh.GetAutoCompleteWords();
+sal_uInt16 nPos, nEnd;
+// TODO - GetRange only performs a case insensitive match for ASCII
+if ( rACList.GetRange( rWord, nPos, nEnd ) )
 {
-while( nStt < nEnd )
+for ( ; nPos < nEnd; ++nPos )
 {
-c

License statement

2012-06-04 Thread Tomaž Vajngerl

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

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

Re: dbaccess build error

On Mon, Jun 04, 2012 at 07:59:25PM +0200, Riccardo Magliocchetti wrote:

> latest dbaccess commits (master is at
> a88f54f53a370e61bedd868c65233723f816775a) break the build here:

> /home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx: In member
> function ‘sal_Bool dbaccess::OKeySet::fetchRow()’:
> /home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx:1461:101:
> error: ‘BOOST_STATIC_ASSERT_MSG’ was not declared in this scope

It seems Michael Stahl has fixed it by now. If not, yell, and I'll
take a look.

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

[Libreoffice-commits] .: libcmis/libcurl-version-fix.patch libcmis/makefile.mk

 libcmis/libcurl-version-fix.patch |   21 +
 libcmis/makefile.mk   |3 +++
 2 files changed, 24 insertions(+)

New commits:
commit 4f1821203ec8fd4df3dafdf95c2e91f97d17fd8d
Author: CÃ©dric Bosdonnat 
Date:   Mon Jun 4 20:48:16 2012 +0200

Oops, fix a bad fix in libcmis for libcurl version checks

Change-Id: I56b5bcd459c79de5be079d0c6563148e17f0bc9b

diff --git a/libcmis/libcurl-version-fix.patch 
b/libcmis/libcurl-version-fix.patch
new file mode 100644
index 000..075fc6c
--- /dev/null
+++ b/libcmis/libcurl-version-fix.patch
@@ -0,0 +1,21 @@
+diff -ur misc/build/libcmis-0.2.2.old/src/libcmis/atom-session.cxx 
misc/build/libcmis-0.2.2/src/libcmis/atom-session.cxx
+--- misc/build/libcmis-0.2.2.old/src/libcmis/atom-session.cxx  2012-06-04 
20:35:46.400203393 +0200
 misc/build/libcmis-0.2.2/src/libcmis/atom-session.cxx  2012-06-04 
20:36:16.255205010 +0200
+@@ -382,7 +382,7 @@
+ if ( pos != string::npos )
+ {
+ // Escape the URL by chunks
+-#if LIBCURL_VERSION_VALUE >= 71504
++#if LIBCURL_VERSION_VALUE >= 0x071504
+ char* escaped = curl_easy_escape( m_curlHandle, value.c_str(), 
value.length() );
+ #else
+ char* escaped = curl_escape( value.c_str(), value.length() );
+@@ -550,7 +550,7 @@
+ {
+ curl_easy_setopt( m_curlHandle, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
+ 
+-#if LIBCURL_VERSION_VALUE >= 71901
++#if LIBCURL_VERSION_VALUE >= 0x071901
+ curl_easy_setopt( m_curlHandle, CURLOPT_USERNAME, m_username.c_str() 
);
+ curl_easy_setopt( m_curlHandle, CURLOPT_PASSWORD, m_password.c_str() 
);
+ #else
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index fb07f95..f3416ae 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -44,6 +44,9 @@ TARGET=cmis
 TARFILE_NAME=libcmis-0.2.2
 TARFILE_MD5=ce31ac7b92cb5e66459f67213bbb6168
 
+# Fixed for 0.2.3
+PATCH_FILES+=libcurl-version-fix.patch
+
 .IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+=boost-win.patch
 .ENDIF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Bug 50386 - Page count field makes scrolling impossible

2012-06-04 Thread Muhammad Haggag

Hello.

= Bugs =
https://bugs.freedesktop.org/show_bug.cgi?id=50386
https://bugs.freedesktop.org/show_bug.cgi?id=50540

= Patch =
https://bugs.freedesktop.org/attachment.cgi?id=62532

= Patch review =
https://bugs.freedesktop.org/page.cgi?id=splinter.html&bug=50386&attachment=62532

= Change =
This patch fixes a regression caused by my fix for fdo#34772 (adding
word count to the status bar). The code used to count words was
wrapped in StartAction/EndAction, which seem to be meant for input
actions based on keyboard/mouse. EndAction calls UpdateCrsr with the
SwCrsrShell::SCROLLWIN flag, resulting in the behavior described in
fdo#50386 and fdo#50540.

We were calling it directly (Start/EndAction) and indirectly (through
SwWrtShell::GetUpdatedDocStat). I removed the
direct calls and replaced the SwWrtShell call with
SwDoc::GetUpdatedDocStat, which doesn't call Start/EndAction.

Can someone advise on whether we need the SwWait? It's there because I
initially copied the code from wordcountdialog.cxx, but I'm not sure
whether we actually need it (or need it to lock the dispatcher
either).

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Bug 37361 depends on bug 50676, which changed state.

Bug 50676 Summary: soffice.bin crashed after entering chars using ibus-chewing
https://bugs.freedesktop.org/show_bug.cgi?id=50676

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|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

Re: dbaccess build error

2012-06-04 Thread Riccardo Magliocchetti


Il 04/06/2012 20:10, Michael Stahl ha scritto:

On 04/06/12 19:59, Riccardo Magliocchetti wrote:

Hello,

latest dbaccess commits (master is at
a88f54f53a370e61bedd868c65233723f816775a) break the build here:

/home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx: In member
function ‘sal_Bool dbaccess::OKeySet::fetchRow()’:
/home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx:1461:101: error:
‘BOOST_STATIC_ASSERT_MSG’ was not declared in this scope


should be fixed now, git pull...


Thanks! tried adding the include locally but didn't work, nice to read 
the explanation on your commit log.


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

Re: 1.6Gb of workdir/.../Dep - thoughts ...

2012-06-04 Thread Rob Snelders


Hi All,

I want to add that the buildspeed and disksize does matter. Not 
everybody who wants to help can afford the newest machines.


--
Greetings,
Rob Snelders

Op 04-06-12 19:53, Michael Meeks schreef:

Hi Bjoern,

On Mon, 2012-06-04 at 17:19 +0200, Bjoern Michaelsen wrote:

But concat-deps is _after_ the creation dep files of the objects (which will
then still be huge).

Sigh; true - it'll mostly speedup build time then; then again we could
filter them during / after generation I suppose.


- a significant part of .d content is the depend-on-nothing deps created
by -MP , if those would be merged into one dedicated .d file that'd save a
lot of space as well; not sure if this is easily doable though

Arent we doing that already when merging the .d files for one library?

Right; that is done already as we merge to a library.


Note however, that every bit of added complexity to the build system will bite
you back one day. Currently the Deps are ~10% of the working directory -- even
if you reduce them by 90%(*)

Why do you think that Deps are 10% of the working directory ?

$ du -m workdir/unxlngi6.pro | tail -n 1
2906unxlngi6.pro
$ du -m workdir/unxlngi6.pro/Dep | tail -n 1
1546unxlngi6.pro/Dep

For me that reads>  50% of the size.


So right now, I consider the topic premature optimization until proven 
otherwise.

Is my workdir abnormally different to yours ? it's normal to have>
1.5Gb of 'stuff' in there I think - at least someone I sanity checked
with saw that too - IMHO it's too big.

ATB,

Michael.


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

regcomp under windows, registering components

2012-06-04 Thread Olivier Hallot

Hi

I need to disable the extensions install GUI for end-users (extensions are
"Nasty Security Exposures (TM)" here )

In previous versions (OOo 3.2.1) I used the following command to
de-register the extension GUI (in a install script):

Regcomp = chr("34") & strProgramFiles & "\OpenOffice.org
3\URE\bin\regcomp.exe" & chr("34")
Servicesrdb = chr("34") & strProgramFiles & "\OpenOffice.org
3\Basis\program\services.rdb" & chr("34")
Services =
"vnd.sun.star.expand:$BRAND_BASE_DIR/program/deploymentguimi.uno.dll"
wshShell.run Regcomp & " -revoke -r " & Servicesrdb & " -c " & Services, 0,
True

since LibreOffice 3.?, some of these libs moved elsewhere and dll's have
new names, specifically:

what is now "deploymentguimi.uno.dll" ?

(I have deployment.dll, deploymentgui.dll and deploymentmisclo.dll, so
which one?)

and

\Basis\program\services.rdb

seems to have moved to

\program\services\services.rdb,

my best guess so far... Right?

Thanks for the help
-- 
Olivier Hallot
Founder and Steering Commitee Member
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Re: [PATCH] fdo#46378: Poor Resampling Image quality

2012-06-04 Thread Quikee

Hi Jan,

On Mon, Jun 4, 2012 at 4:50 PM, Jan Holesovsky  wrote:

> - changed sal_Bool -> bool (we prefer the native bool in the new code)
I used what other code around was using. If bool is preferred to
sal_Bool maybe the whole bitmap and bitmapex code should be changed to
reflect this. I can do this in a cleanup task for bitmap and bitmapex
as there are also some German comments to translate.

> - modified one method to be void (it always returned true)
OK, I did not pay attention to this.

> - added your real name as the author (please set your git config \
>  --global user.name)
OK changed.

> - and reverted the _LANCZOS use for the PDF export for now - sorry for
>  that; but I am afraid there must be a small glitch somewhere :-(
>
> How did I find out; I told myself "let's be bold, and default to
> Lanczos" ;-) - and tried with the attached 2 patches, but from some
> reason the start screen looks like the attached "start.png" then - can
> you please have a look?
I have also tried this and I think this is related to resizing of
really small images (1px width or height) which Lanczos does not
handle well. In such cases it is probably better to fallback to
bilinear interpolation or "fast". I will have a look and see exactly
is wrong - maybe I can fix this issue.

> Thank you so much for your work - if you can fix that, and ideally add a
> unit test, or few, I am all for enabling it for 3.6 even a bit later as
> a late feature; hopefully we might find 2 more approvals for that :-)
This is great if it could go into 3.6. I will work to fix the issues ASAP.

> All the best,
> Kendy

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

Re: dbaccess build error

On 04/06/12 19:59, Riccardo Magliocchetti wrote:
> Hello,
> 
> latest dbaccess commits (master is at 
> a88f54f53a370e61bedd868c65233723f816775a) break the build here:
> 
> /home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx: In member 
> function ‘sal_Bool dbaccess::OKeySet::fetchRow()’:
> /home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx:1461:101: error: 
> ‘BOOST_STATIC_ASSERT_MSG’ was not declared in this scope

should be fixed now, git pull...

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

[Libreoffice-commits] .: dbaccess/source

 dbaccess/source/core/api/KeySet.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1ca20c89c0a1f1ca34de4939d6fef66fb68ceff9
Author: Michael Stahl 
Date:   Mon Jun 4 20:07:26 2012 +0200

KeySet.cxx: fix boost include; also...

... BOOST_STATIC_ASSERT_MSG was added in boost 1.46, while the internal
boost is still at version 1.44, so use BOOST_STATIC_ASSERT instead.

Change-Id: I14f8e48e31956b34a1a907cd2c4e454a5715889b

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 5d863a8..3a114a9 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1458,7 +1459,7 @@ sal_Bool OKeySet::fetchRow()
 connectivity::ORowVector< ORowSetValue >::Vector::iterator aFRIter = 
aFullRow->get().begin();
 // Column 0 is reserved for the bookmark; unused here.
 ++aFRIter;
-BOOST_STATIC_ASSERT_MSG(sizeof(int) >= sizeof(sal_Int32), "At least a 
32 bit word expecteed");
+BOOST_STATIC_ASSERT(sizeof(int) >= sizeof(sal_Int32)); // "At least a 
32 bit word expected"
 for (int i = 1; i <= cc; ++i, ++aFRIter )
 {
 aFRIter->fill(i, m_xSetMetaData->getColumnType(i), m_xDriverRow);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

dbaccess build error

2012-06-04 Thread Riccardo Magliocchetti


Hello,

latest dbaccess commits (master is at 
a88f54f53a370e61bedd868c65233723f816775a) break the build here:


/home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx: In member 
function ‘sal_Bool dbaccess::OKeySet::fetchRow()’:
/home/rm/src/libo/dbaccess/source/core/api/KeySet.cxx:1461:101: error: 
‘BOOST_STATIC_ASSERT_MSG’ was not declared in this scope


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

Re: 1.6Gb of workdir/.../Dep - thoughts ...

Hi Bjoern,

On Mon, 2012-06-04 at 17:19 +0200, Bjoern Michaelsen wrote:
> But concat-deps is _after_ the creation dep files of the objects (which will
> then still be huge).

Sigh; true - it'll mostly speedup build time then; then again we could
filter them during / after generation I suppose.

> > - a significant part of .d content is the depend-on-nothing deps created 
> > by -MP , if those would be merged into one dedicated .d file that'd save a 
> > lot of space as well; not sure if this is easily doable though
> 
> Arent we doing that already when merging the .d files for one library?

Right; that is done already as we merge to a library.

> Note however, that every bit of added complexity to the build system will bite
> you back one day. Currently the Deps are ~10% of the working directory -- even
> if you reduce them by 90%(*)

Why do you think that Deps are 10% of the working directory ?

$ du -m workdir/unxlngi6.pro | tail -n 1
2906unxlngi6.pro
$ du -m workdir/unxlngi6.pro/Dep | tail -n 1
1546unxlngi6.pro/Dep

For me that reads > 50% of the size.

> So right now, I consider the topic premature optimization until proven 
> otherwise.

Is my workdir abnormally different to yours ? it's normal to have >
1.5Gb of 'stuff' in there I think - at least someone I sanity checked
with saw that too - IMHO it's too big.

ATB,

Michael.

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

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

[Libreoffice-commits] Changes to 'features/base-preview'

New branch 'features/base-preview' available with the following commits:
commit 8490067159d54b3b8e2f074978753a8bdc15879b
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

 - Data must be fetched in increasing order of column number
   (again, this is about SQLGetData).

   This is a harder issue. The current solution has the nice advantage
   of completely isolating the rest of LibO from these restrictions.

   I don't currently see how to cleanly avoid (potentially
   unnecessarily) caching column 4 if we are asked for column 3 then
   column 5, just in case we are asked for column 4 later on, unless
   we issue a specific "SELECT column4" later. But the latter would be
   quite expensive in terms of app-to-database roudtripe times :-( and
   thus creates another performance issue.

Change-Id: I999b3f8f0b8a215acb390ffefc839235346e8353

commit 4b103279f910a5c73c3ba71318e2a02b825b4a5a
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:41:33 2012 +0200

Need to refresh row after moving to bookmark!

Change-Id: Ia8d12d02829087309e248506a7d3b0f94b5a425e

commit f066b483e859a95610eb874917071e32df09cf0e
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:40:30 2012 +0200

Cleanup m_xSet in destructor

Change-Id: I3d7023fcb1857da1ef107a8af0d373b9ca464f03

commit 038f141c12bb6472bcd6ddad1d303c810a589d36
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:35:52 2012 +0200

typos in comments

Change-Id: I1dbb1990033602d7909ecdee72b8b699cce44cab

commit 4194b560faaa2ed3ebbc8201ec974b3125b609b8
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:31:25 2012 +0200

Remove wrong optimisation

fixup of d4ae29a37873843c20fe7d5f5f071f8fb201fed9
after the call to m_pCacheSet->absolute_checked, the data *is* used,
so we cannot anymore exempt m_pCacheSet from giving correct data.

Change-Id: I7d3644ca08ce43cb030a80984605a1f8a8a64211

commit 9e5fdfef9b86b56154fd7d77a6a49316816a6747
Author: Lionel Elie Mamane 
Date:   Fri Jun 1 16:40:41 2012 +0200

fdo#47520 use the already retrieved row instead of driver row

This avoids a

Re: Dialog "About LibreOffice" contents

2012-06-04 Thread Rob Snelders

or search for a string on the about dialog in opengrok.libreoffice.org. 
That will probably lead you to the src-file corresponding with the 
cxx-file you want. (that's the way I look for code-files I need).


--
Greetings,
Rob Snelders

Op 04-06-12 18:22, Noel Grandin schreef:

"git grep" is your friend.

On 2012-06-04 18:13, Yoandy Pérez Villazón wrote:
Hi, can someone tell me where in the code is the contents of the 
dialog (About LibreOffice)?

Thank you all,

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...

CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice




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


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

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

[Libreoffice-commits] Changes to 'refs/features/base-preview'


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

[Libreoffice-commits] Changes to 'refs/features/base-preview'


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

SHURE MICROPHONE shared photos with you

2012-06-04 Thread SHURE MICROPHONE


Hi,sir

thank you very much for your time

attached is shure mic , yamaha speaker and crown amp, dbx speaker  
andsenhiser mic prices list.


if you are interest, can you contact us?

Steven
www.newplayaudio.net
<>___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'features/base-preview' - 0 commits -

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/features/base-preview'


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

[Libreoffice-commits] .: connectivity/source readlicense_oo/makefile.mk readlicense_oo/prj readlicense_oo/README readlicense_oo/txt scp2/source

 connectivity/source/drivers/evoab2/EApi.cxx |   39 ++
 connectivity/source/drivers/evoab2/EApi.h   |   38 ++
 readlicense_oo/README   |3 
 readlicense_oo/makefile.mk  |3 
 readlicense_oo/prj/d.lst|1 
 readlicense_oo/txt/NOTICE   |  164 
 scp2/source/ooo/common_brand.scp|   14 ++
 7 files changed, 211 insertions(+), 51 deletions(-)

New commits:
commit a88f54f53a370e61bedd868c65233723f816775a
Author: Michael Meeks 
Date:   Mon Jun 4 18:20:32 2012 +0100

ALv2 licensing compliance, and first test / re-based module pair.

Change-Id: If75d2daaac2c629028a76f55941345c1c565a69a

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx 
b/connectivity/source/drivers/evoab2/EApi.cxx
index 5cf5247..38908f7 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -1,32 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
+/*
+ * This file is part of the LibreOffice project.
  *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
+ * 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/.
  *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
+ * This file incorporates work covered by the following license notice:
  *
- /
-
-
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 #include 
 #include 
 #include 
diff --git a/connectivity/source/drivers/evoab2/EApi.h 
b/connectivity/source/drivers/evoab2/EApi.h
index 90422b7..97afaf1 100644
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
@@ -1,31 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
- /*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * 
- * for a copy of the LGPLv3 License.
- *
- /
-
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   cont

Re: Continuing converting ScMyTables in feature/gsoc-calc-perf

2012-06-04 Thread Kohei Yoshida


On 06/04/2012 01:04 PM, Daniel Bankston wrote:


On 06/01/2012 02:56 AM, Daniel Bankston wrote:



I think most of the other methods will follow fine from there except
for GetCurrentXDrawPage() and GetCurrentXShapes() which are separate
from the merge method concern. These methods get into things like
xmloff's XMLShapeImportHelper. Do we want to go here?

And of course we have already discussed trying to reexamine
ScMyTables::SetTableStyle() at some point.


I was looking at the XShape and DrawPage methods again and it would
require some untangling, but I don't think they would be as confusing as
SetTableStyle().


Yeah, I hope so.  Although from my own experience dealing with the shape 
import, this code is also shared across apps, and there is a potential 
of it being almost as convoluted as the styles import.


Also, the shapes may be handled entirely outside the sc (note: I'm 
speaking from memory here).  The only exception being the chart object, 
which sc handles some parts of it to register listeners etc.  So, it may 
or may not make sense to de-UNO-ize the shape import just for Calc alone.


Anyway, let's dig deeper and find out for sure what the situation is on 
the shape import front.



In an IRC conversation, Markus and I discussed that I work on
ScXMLTableRowCellContext::EndElement() in xmlcelli.cxx next. I will work
on EndElement() now and come back later to XShape, DrawPage, and Styles
in ScMyTables unless you guys think I should do differently.


Sounds good to me.  Thanks for the update!

Kohei

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

[Libreoffice-commits] .: 5 commits - dbaccess/source

 dbaccess/source/core/api/KeySet.cxx  |  168 +++
 dbaccess/source/core/api/KeySet.hxx  |4 
 dbaccess/source/core/api/RowSetCache.cxx |   10 +
 3 files changed, 139 insertions(+), 43 deletions(-)

New commits:
commit e581bef6dfc03d0bab9de1485c6f6cdcd034d581
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

 - Data must be fetched in increasing order of column number
   (again, this is about SQLGetData).

   This is a harder issue. The current solution has the nice advantage
   of completely isolating the rest of LibO from these restrictions.

   I don't currently see how to cleanly avoid (potentially
   unnecessarily) caching column 4 if we are asked for column 3 then
   column 5, just in case we are asked for column 4 later on, unless
   we issue a specific "SELECT column4" later. But the latter would be
   quite expensive in terms of app-to-database roudtripe times :-( and
   thus creates another performance issue.

Change-Id: I999b3f8f0b8a215acb390ffefc839235346e8353

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 6af8123..5d863a8 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -378,6 +378,12 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& 
io_aFilter,const ::rtl::OU
 ::comphelper::disposeComponent(io_xAnalyzer);
 }
 
+void OKeySet::invalidateRow()
+{
+m_xRow = NULL;
+::comphelper::disposeComponent(m_xSet);
+}
+
 Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", 
"OKeySet::getBookmark" );
@@ -403,10 +409,11 @@ sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const 
Any& bookmark, sal_Int3
 m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
 if(m_aKeyIter != m_aKeyMap.end())
 {
-relative(rows);
+return relative(rows);
 }
 
-return !isBeforeFirst() && !isAfterLast();
+invalidateRow();
+return false;
 }
 
 sal_Int32 SAL_CALL OKeySet::compareBookmarks( con

Re: [PUSHED][REVIEW-3.5] Various .doc/.docx fixes

2012-06-04 Thread Lubos Lunak

On Thursday 31 of May 2012, Caolán McNamara wrote:
> On Wed, 2012-05-30 at 18:38 +0200, Lubos Lunak wrote:
> > > - http://cgit.freedesktop.org/libreoffice/core/commit/?id=04d600d4be7c
> > > - http://cgit.freedesktop.org/libreoffice/core/commit/?id=5935a6db6483
> > > - http://cgit.freedesktop.org/libreoffice/core/commit/?id=d4798414f270
> > > - http://cgit.freedesktop.org/libreoffice/core/commit/?id=5845298e615a
> > > - http://cgit.freedesktop.org/libreoffice/core/commit/?id=0a9161263b8e
> > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=e05e77f4b737
> > > and
> > > http://cgit.freedesktop.org/libreoffice/core/commit/?id=9365a3255875
> > > merged
> >
> > - http://cgit.freedesktop.org/libreoffice/core/commit/?id=20a8768b1c6a
>
> re the real non-real findsdrobject used in the api. Does load/save of
> z-order stacking of frames/drawing objects in headers/footers used on
> multiple pages to/from .odt still work ?

 New document, insert header, insert a picture, insert another picture, save, 
load, the stacking order is the same; if that's what you mean.

 I don't quite see how the change should change anything, given that it's only 
a fallback for the case when the real object is not found.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - configure.in editeng/source solenv/gbuild

 configure.in  |4 
 editeng/source/items/frmitems.cxx |3 ++-
 solenv/gbuild/platform/solaris.mk |9 -
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit d51af3a62a640783993e83566c3a86d62f24637b
Author: Michael Stahl 
Date:   Mon Jun 4 19:09:55 2012 +0200

solaris.mk: re-add nsl and socket libraries

Seems these were dropped in 3c4cd1deaf71d0d800957b3580d426c721bf7844.

Change-Id: Ib929e322719e4a50d8d2d32e3cd9466242e1c034

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index d0cbdaf..8639793 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -217,7 +217,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call 
gb_GenCxxObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat 
$(extraobjectlist)`) \
-Wl$(COMMA)--start-group $(foreach 
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) 
-Wl$(COMMA)--end-group \
-   $(LIBS) -lnsl -lsocket \
+   $(LIBS) \
$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach 
lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib) \
-o $(1))
 endef
@@ -255,6 +255,11 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
 gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
 gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
 
+gb_STDLIBS := \
+   m \
+   nsl \
+   socket \
+
 gb_Library_PLAINLIBS_NONE += \
dl \
fontconfig \
@@ -263,7 +268,9 @@ gb_Library_PLAINLIBS_NONE += \
GLU \
ICE \
m \
+   nsl \
pthread \
+   socket \
SM \
ICE \
X11 \
commit a87f45ab78b61dba6b615a88846682b0c35d7d40
Author: Michael Stahl 
Date:   Mon Jun 4 19:01:01 2012 +0200

configure.in: refuse to run in sourced solar environment

revert one hunk from 909cd34b7b0982078a50b9ed46cf57811d9571df

Change-Id: I9eb3f3c1cdab2c0624ab65f540b9c3d6b8f1bfb5

diff --git a/configure.in b/configure.in
index 6d6155f..09600f1 100644
--- a/configure.in
+++ b/configure.in
@@ -49,6 +49,10 @@ PathFormat()
 fi
 }
 
+if test -n "$SOLARENV" ; then
+AC_MSG_ERROR([You have sourced config_host.mk in this shell.  This may 
lead to trouble, please run in a fresh (login) shell.])
+fi
+
 echo ""
 echo "*"
 echo "*   Running ${PACKAGE_NAME} build configuration."
commit 30aa036181480c76f909c2dda86b2682cac1fd73
Author: Michael Stahl 
Date:   Mon Jun 4 18:54:34 2012 +0200

fdo#46112: tweak condition to prevent guessing only...

...if there are actually individual line widths given; fixes the
sw_rtftok test.

Change-Id: If5f6ef54b93c5bfccfd011f25d9d9301637d388e

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index c40bec9..bfdf178 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1867,7 +1867,8 @@ SvxBoxItem::LineToSvxLine(const 
::com::sun::star::table::BorderLine2& rLine, Svx
 rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) 
: rLine.LineWidth );
 // fdo#46112: double does not necessarily mean symmetric
 // for backwards compatibility
-bGuessWidth = (DOUBLE == nStyle);
+bGuessWidth = (DOUBLE == nStyle) &&
+(rLine.InnerLineWidth > 0) && (rLine.OuterLineWidth > 0);
 }
 
 return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 1.6Gb of workdir/.../Dep - thoughts ...

On Mon, Jun 04, 2012 at 06:38:46PM +0200, Michael Stahl wrote:
> who cares how big the files are (disk is cheap), the relevant metric is:
> how many seconds does make need to parse them?
> ...
> yes, but keep in mind that variables in the dep files will need to be
> expanded by make, which will likely result in memory allocations, so
> it's an open question whether that will actually improve performance or
> slow it down.

IIRC I made some measurements back then. Though not very scientific, they
suggested it makes no difference at all.

> >> - a significant part of .d content is the depend-on-nothing deps created 
> >> by -MP , if those would be merged into one dedicated .d file that'd save a 
> >> lot of space as well; not sure if this is easily doable though
> > 
> > Arent we doing that already when merging the .d files for one library?
> 
> to some extent yes, but of course the same headers are included in many
> libraries, so there is still some amount of duplication there; however i
> don't know to improve this without breaking separate building of
> modules, which requires the LinkTarget .d files to be self-contained.
> 
> > So right now, I consider the topic premature optimization until proven 
> > otherwise.
> 
> > (*) which you wont unless you gzip them (which is doable and shouldnt have 
> > too
> > big of an performance impact)
> 
> sadly AFAIK make cannot include compressed files...

We never include the dep-files of the objects ( $(WORKDIR)/Dep/CxxObject ),
only the concated per-library output ( $(WORKDIR)/Dep/LinkTarget ), right?

Best,

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

[Libreoffice-commits] .: 2 commits - oox/source sc/source

2012-06-04 Thread Noel Power

 oox/source/token/properties.txt  |1 
 sc/source/filter/inc/drawingbase.hxx |4 -
 sc/source/filter/oox/drawingbase.cxx |   28 -
 sc/source/filter/oox/drawingfragment.cxx |3 -
 sc/source/filter/oox/sheetdatabuffer.cxx |2 
 sc/source/filter/oox/worksheethelper.cxx |   18 
 sc/source/ui/unoobj/docuno.cxx   |   64 ---
 7 files changed, 2 insertions(+), 118 deletions(-)

New commits:
commit 764752f5d85cb7c86ad21340dfdda4b62754790c
Author: Noel Power 
Date:   Mon Jun 4 18:00:36 2012 +0100

better import xlsx heights

don't call UpdateAllRowHeights when IsAdjustHeightEnabled property is set 
and additionally set manual heights for *all* imported row heights ( same 
afaics xls import does ) - certainly this improves import ( also see documents 
attached in i#94028, i#93609 )

Change-Id: Id8aff727587ed4fa19fd0897aaf25b2202737084

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx 
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 6d4e305..2a04f8a 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -793,8 +793,6 @@ void SheetDataBuffer::applyCellMerging( const 
CellRangeAddress& rRange )
 {
 if( const EditTextObject* pEditObj = static_cast< const 
ScEditCell* >( rDoc.GetCell( rStart ) )->GetData() )
 bTextWrap = pEditObj->GetParagraphCount() > 1;
-if( bTextWrap )
-setManualRowHeight(  rStart.Row() );
 }
 }
 }
diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 43c1b33..48dc7d6 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -342,8 +342,6 @@ public:
 @descr  Row default formatting is converted directly, other settings
 are cached and converted in the finalizeImport() call. */
 voidsetRowModel( const RowModel& rModel );
-/** Specifies that the passed row needs to set its height manually. */
-voidsetManualRowHeight( sal_Int32 nRow );
 
 /** Initial conversion before importing the worksheet. */
 voidinitializeWorksheetImport();
@@ -401,7 +399,6 @@ private:
 RowModelRangeMapmaRowModels;/// Ranges of rows sorted by first 
row index.
 HyperlinkModelList  maHyperlinks;   /// Cell ranges containing 
hyperlinks.
 ValidationModelList maValidations;  /// Cell ranges containing data 
validation settings.
-ValueRangeSet   maManualRowHeights; /// Rows that need manual height 
independent from own settings.
 SheetDataBuffer maSheetData;/// Buffer for cell contents and 
cell formatting.
 CondFormatBuffermaCondFormats;  /// Buffer for conditional 
formatting.
 CommentsBuffer  maComments; /// Buffer for all cell comments 
in this sheet.
@@ -938,11 +935,6 @@ void WorksheetGlobals::setRowModel( const RowModel& rModel 
)
 lclUpdateProgressBar( mxRowProgress, maUsedArea, nRow );
 }
 
-void WorksheetGlobals::setManualRowHeight( sal_Int32 nRow )
-{
-maManualRowHeights.insert( nRow );
-}
-
 void WorksheetGlobals::initializeWorksheetImport()
 {
 // set default cell style for unused cells
@@ -1236,10 +1228,7 @@ void WorksheetGlobals::convertRows( OutlineLevelVec& 
orRowLevels,
 custom height, otherwise get all rows specified in the class member
 maManualRowHeights that are inside the passed row model. */
 ValueRangeVector aManualRows;
-if( rModel.mbCustomHeight )
-aManualRows.push_back( rRowRange );
-else
-aManualRows = maManualRowHeights.getIntersection( rRowRange );
+aManualRows.push_back( rRowRange );
 for( ValueRangeVector::const_iterator aIt = aManualRows.begin(), aEnd 
= aManualRows.end(); aIt != aEnd; ++aIt )
 {
 PropertySet aPropSet( getRows( *aIt ) );
@@ -1551,11 +1540,6 @@ void WorksheetHelper::setRowModel( const RowModel& 
rModel )
 mrSheetGlob.setRowModel( rModel );
 }
 
-void WorksheetHelper::setManualRowHeight( sal_Int32 nRow )
-{
-mrSheetGlob.setManualRowHeight( nRow );
-}
-
 void WorksheetHelper::putValue( const CellAddress& rAddress, double fValue ) 
const
 {
 ScAddress aAddress;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a7589d8..2220e2d 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1683,11 +1683,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
 bool bOldAdjustHeightEnabled = pDoc->IsAdjustHeightEnabled();
 bool bAdjustHeightEnabled = ScUnoHelpFunctions::GetBoolFromAny( 
aValue );
 if( bOldAdjustHeightEnabled != bAdjustHeightEnabled )
-{
 pDoc->EnableAdjustHeight( bAdjustHeightEnabled );
-if( bAdjustHeightEnabled )
-

Re: Continuing converting ScMyTables in feature/gsoc-calc-perf

2012-06-04 Thread Daniel Bankston


On 06/04/2012 08:38 AM, Kohei Yoshida wrote:


It looks good to me.  Please push to your branch.

Kohei


 Done.

This leaves the SetTableStyle() and small part of NewSheet() which can't 
be changed until SetTableStyle() is converted.  Also, there are the 
XShape and DrawPage methods.


On 06/01/2012 02:56 AM, Daniel Bankston wrote:



I think most of the other methods will follow fine from there except 
for GetCurrentXDrawPage() and GetCurrentXShapes() which are separate 
from the merge method concern.  These methods get into things like 
xmloff's XMLShapeImportHelper.  Do we want to go here?


And of course we have already discussed trying to reexamine 
ScMyTables::SetTableStyle() at some point.


I was looking at the XShape and DrawPage methods again and it would 
require some untangling, but I don't think they would be as confusing as 
SetTableStyle().


In an IRC conversation, Markus and I discussed that I work on 
ScXMLTableRowCellContext::EndElement() in xmlcelli.cxx next.  I will 
work on EndElement() now and come back later to XShape, DrawPage, and 
Styles in ScMyTables unless you guys think I should do differently.



Respectfully,
Daniel Bankston
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: libcmis/boost-win.patch libcmis/makefile.mk ooo.lst.in

 libcmis/boost-win.patch |   21 ++---
 libcmis/makefile.mk |4 ++--
 ooo.lst.in  |2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 293f6a7a24c30f4d4234d973dba1d90005165455
Author: CÃ©dric Bosdonnat 
Date:   Mon Jun 4 18:58:40 2012 +0200

update libcmis to 0.2.2 to fix macos old libcurl problems

Change-Id: I0ea2191a281405a0672fac2f8c1d4dafea224ef4

diff --git a/libcmis/boost-win.patch b/libcmis/boost-win.patch
index 02188c0..fde29df 100644
--- a/libcmis/boost-win.patch
+++ b/libcmis/boost-win.patch
@@ -1,5 +1,5 @@
 misc/libcmis-0.2.1/src/libcmis/atom-object.cxx 2012-06-01 
07:44:26.0 -0600
-+++ misc/build/libcmis-0.2.1/src/libcmis/atom-object.cxx   2012-06-04 
07:52:24.131190200 -0600
+--- misc/libcmis-0.2.2/src/libcmis/atom-object.cxx 2012-06-01 
07:44:26.0 -0600
 misc/build/libcmis-0.2.2/src/libcmis/atom-object.cxx   2012-06-04 
07:52:24.131190200 -0600
 @@ -29,6 +29,9 @@
  #include 
  #include 
@@ -10,8 +10,8 @@
  #include 
  
  #include "atom-object.hxx"
 misc/libcmis-0.2.1/src/libcmis/object.hxx  2012-06-01 07:38:36.0 
-0600
-+++ misc/build/libcmis-0.2.1/src/libcmis/object.hxx2012-06-04 
07:52:21.900386200 -0600
+--- misc/libcmis-0.2.2/src/libcmis/object.hxx  2012-06-01 07:38:36.0 
-0600
 misc/build/libcmis-0.2.2/src/libcmis/object.hxx2012-06-04 
07:52:21.900386200 -0600
 @@ -32,6 +32,9 @@
  #include 
  #include 
@@ -22,8 +22,8 @@
  #include 
  #include 
  
 misc/libcmis-0.2.1/src/libcmis/property-type.hxx   2012-02-17 
08:00:50.0 -0700
-+++ misc/build/libcmis-0.2.1/src/libcmis/property-type.hxx 2012-06-04 
07:52:17.157977900 -0600
+--- misc/libcmis-0.2.2/src/libcmis/property-type.hxx   2012-02-17 
08:00:50.0 -0700
 misc/build/libcmis-0.2.2/src/libcmis/property-type.hxx 2012-06-04 
07:52:17.157977900 -0600
 @@ -28,6 +28,9 @@
  #ifndef _PROPERTY_TYPE_HXX_
  #define _PROPERTY_TYPE_HXX_
@@ -34,8 +34,8 @@
  #include 
  #include 
  
 misc/libcmis-0.2.1/src/libcmis/property.hxx2012-02-17 
06:38:33.0 -0700
-+++ misc/build/libcmis-0.2.1/src/libcmis/property.hxx  2012-06-04 
07:52:19.388781800 -0600
+--- misc/libcmis-0.2.2/src/libcmis/property.hxx2012-02-17 
06:38:33.0 -0700
 misc/build/libcmis-0.2.2/src/libcmis/property.hxx  2012-06-04 
07:52:19.388781800 -0600
 @@ -31,6 +31,9 @@
  #include 
  #include 
@@ -46,8 +46,8 @@
  #include 
  #include 
  
 misc/libcmis-0.2.1/src/libcmis/xml-utils.hxx   2012-05-30 
06:17:12.0 -0600
-+++ misc/build/libcmis-0.2.1/src/libcmis/xml-utils.hxx 2012-06-04 
07:52:10.621566400 -0600
+--- misc/libcmis-0.2.2/src/libcmis/xml-utils.hxx   2012-05-30 
06:17:12.0 -0600
 misc/build/libcmis-0.2.2/src/libcmis/xml-utils.hxx 2012-06-04 
07:52:10.621566400 -0600
 @@ -30,6 +30,9 @@
  
  #include 
@@ -56,4 +56,4 @@
 +#define BOOST_DATE_TIME_NO_LIB
 +#endif
  #include 
- #include 
\ No newline at end of file
+ #include 
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index ec04b45..fb07f95 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -41,8 +41,8 @@ TARGET=cmis
 @echo "Using system libcmis..."
 .ENDIF
 
-TARFILE_NAME=libcmis-0.2.1
-TARFILE_MD5=aba670de3beaafac1e287a9399dcc023
+TARFILE_NAME=libcmis-0.2.2
+TARFILE_MD5=ce31ac7b92cb5e66459f67213bbb6168
 
 .IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+=boost-win.patch
diff --git a/ooo.lst.in b/ooo.lst.in
index 98eb1ea..a49e66c 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -88,7 +88,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
 90010e213dd25648e70f0cc12f8fed55-libvisio-0.0.17.tar.bz2
 e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-aba670de3beaafac1e287a9399dcc023-libcmis-0.2.1.tar.gz
+ce31ac7b92cb5e66459f67213bbb6168-libcmis-0.2.2.tar.gz
 c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2
 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz
 @GOOGLE_DOCS_EXTENSION_PACK@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 1.6Gb of workdir/.../Dep - thoughts ...




On 2012-06-04 18:38, Michael Stahl wrote:

sadly AFAIK make cannot include compressed files...

True.

But it should be possible to either (a) teach it that trick or (b) check 
if the filesystem supports it, and if so, activate per-file compression.


NTFS:
http://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/compact.mspx
EXTFS
http://e2compr.sourceforge.net/attic/manual-0.3/e2compr_45.html
BTRFS
https://blogs.oracle.com/wim/entry/btrfs_compression

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


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

[Libreoffice-commits] .: Branch 'features/base-preview' - 5 commits - dbaccess/source

 dbaccess/source/core/api/KeySet.cxx  |  170 +++
 dbaccess/source/core/api/KeySet.hxx  |4 
 dbaccess/source/core/api/RowSetCache.cxx |   10 +
 3 files changed, 140 insertions(+), 44 deletions(-)

New commits:
commit c2c329fbd01093cd26a71a91de2d3803a535d76f
Author: Lionel Elie Mamane 
Date:   Mon Jun 4 17:54:30 2012 +0200

i#102625 avoid fetching same row twice in different queries

We do a "SELECT * FROM table" just to fetch the primary key columns;
so reuse the same XResultSet to fetch all columns.
Else, we immediately issue a "SELECT * FROM table WHERE
primary_key=current_value" to read the other columns, which is
wasteful and particularly silly.

Commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b already tried
to do that, but was essentially reverted piecewise because
it caused fdo#47520, fdo#48345, fdo#50372.

Commit c08067d6da94743d53217cbc26cffae00a22dc3a thought it did that,
but actually reverted commit 1ae17f5b03cc14844fb600ca3573a96deb37ab3b.

This implementation fetches the whole current row and caches it in memory;
only one row is cached: when the current row changes, the cache contains
the new current row.

This could be problematic (wrt to memory consumption) if the current
row is big (e.g. with BLOBs) and nobody is interested in the data
anyway (as would often be the case with BLOBs). Note that because of
our "SELECT *", the driver most probably has it in memory already
anyway, so we don't make the situation that much worse.

This could be incrementally improved with a heuristic of not
preemptively caching binary data (and also not LONGVARCHAR / TEXT /
MEMO / ...); a getFOO on these columns would issue a specific "SELECT
column FROM table WHERE primary_key=current_value" each time.

The *real* complete fix to all these issues would be to not do "SELECT
*" at all. Use "SELECT pkey_col1, pkey_col2, ..." when we are only
interested in the key columns. As to data, somehow figure out which
columns were ar interested in and "SELECT" only these (and maybe only
those with "small datatype"?). Interesting columns could be determined
by our caller (creator) as an argument to our constructor, or some
heuristic (no binary data, no "big" unbound data).
Also be extra smart and use *(m_aKeyIter) when getFOO is called
on a column included in it (and don't include it in any subsequent
SELECT).

However, there are several pitfalls.

One is buggy drivers that give use column names of columns that we
cannot fetch :-| Using "SELECT *" works around that because the driver
there *obviously* gives us only fetchable columns in the result.

Another one is the very restrictive nature of some database access
technologies. Take for example ODBC:

 - Data can be fetched only *once* (with the SQLGetData interface;
   bound columns offer a way around that, but that's viable only for
   constant-length data, not variable-length data).

   This could be addressed by an intelligent & lazy cache.

 - Data must be fetched in increasing order of column number
   (again, this is about SQLGetData).

   This is a harder issue. The current solution has the nice advantage
   of completely isolating the rest of LibO from these restrictions.

   I don't currently see how to cleanly avoid (potentially
   unnecessarily) caching column 4 if we are asked for column 3 then
   column 5, just in case we are asked for column 4 later on, unless
   we issue a specific "SELECT column4" later. But the latter would be
   quite expensive in terms of app-to-database roudtripe times :-( and
   thus creates another performance issue.

Change-Id: I999b3f8f0b8a215acb390ffefc839235346e8353

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index b943d10..2709b2e 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -379,6 +379,12 @@ void OKeySet::executeStatement(::rtl::OUStringBuffer& 
io_aFilter,const ::rtl::OU
 ::comphelper::disposeComponent(io_xAnalyzer);
 }
 
+void OKeySet::invalidateRow()
+{
+m_xRow = NULL;
+::comphelper::disposeComponent(m_xSet);
+}
+
 Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com", 
"OKeySet::getBookmark" );
@@ -404,10 +410,11 @@ sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const 
Any& bookmark, sal_Int3
 m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
 if(m_aKeyIter != m_aKeyMap.end())
 {
-relative(rows);
+return relative(rows);
 }
 
-return !isBeforeFirst() && !isAfterLast();
+invalidateRow();
+return false;
 }
 
 sal_Int32 SAL_CALL OKeySet::compareBookmarks( con

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/source vcl/unx

 sw/source/core/txtnode/fntcache.cxx |2 ++
 sw/source/core/view/viewsh.cxx  |2 ++
 vcl/unx/gtk/window/gtkframe.cxx |   11 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 5ae8cb8fc0d7ae3c85ccf23ffb8e2a890728cb72
Author: CaolÃ¡n McNamara 
Date:   Tue Mar 6 09:45:08 2012 +

fdo#50676: silence SolarMutex not locked spew

(cherry picked from commit f9a4af41ca574760dbd22c8207661fabb6823e3b)

Change-Id: I1c2a24e9f8fbbea7227c3c8e3a567ae22e070578
Signed-off-by: Bjoern Michaelsen 
Signed-off-by: Thorsten Behrens 

diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 2ec7fb9..4ddeb3d 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -382,6 +382,8 @@ sal_uInt16 SwFntObj::GetFontLeading( const ViewShell *pSh, 
const OutputDevice& r
 {
 if ( USHRT_MAX == nGuessedLeading || USHRT_MAX == nExtLeading )
 {
+SolarMutexGuard aGuard;
+
 const Font aOldFnt( rOut.GetFont() );
 ((OutputDevice&)rOut).SetFont( *pPrtFont );
 const FontMetric aMet( rOut.GetFontMetric() );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index f0dd635..04717dd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -253,6 +253,8 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
 {
 if ( !nLockPaint )
 {
+SolarMutexGuard aGuard;
+
 sal_Bool bPaintsFromSystem = aInvalidRect.HasArea();
 GetWin()->Update();
 if ( aInvalidRect.HasArea() )
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index ded316f..29fc04b 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -3886,6 +3886,7 @@ void GtkSalFrame::IMHandler::signalIMCommit( 
GtkIMContext* CONTEXT_ARG, gchar* p
 {
 GtkSalFrame::IMHandler* pThis = (GtkSalFrame::IMHandler*)im_handler;
 
+SolarMutexGuard aGuard;
 vcl::DeletionListener aDel( pThis->m_pFrame );
 // open a block that will end the GTK_YIELD_GRAB before calling preedit 
changed again
 {
@@ -4052,6 +4053,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( 
GtkIMContext*, gpointer im_
 
 GTK_YIELD_GRAB();
 
+SolarMutexGuard aGuard;
 vcl::DeletionListener aDel( pThis->m_pFrame );
 
 pThis->m_pFrame->CallCallback( SALEVENT_EXTTEXTINPUT, 
(void*)&pThis->m_aInputEvent);
@@ -4072,6 +4074,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditEnd( 
GtkIMContext*, gpointer im_hand
 
 pThis->m_bPreeditJustChanged = true;
 
+SolarMutexGuard aGuard;
 vcl::DeletionListener aDel( pThis->m_pFrame );
 pThis->doCallEndExtTextInput();
 if( ! aDel.isDeleted() )
commit 10a390d4676cb678c58b2d6f1db9db8a76041996
Author: CaolÃ¡n McNamara 
Date:   Mon Mar 5 21:02:45 2012 +

fdo#50676: Related: rhbz#799628 crash with chewing-IM with g3g

(cherry picked from commit 7e3ebe35a6a1a69b3a36f7eb41e1ec5c5905f714)

Change-Id: I30767fdf7eb6297d12f2b8fb76dab084bd160bed
Signed-off-by: Bjoern Michaelsen 
Signed-off-by: Thorsten Behrens 

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index c5df600..ded316f 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -4035,8 +4035,14 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( 
GtkIMContext*, gpointer im_
 g_slist_free (attr_list);
 
 // Set the sal attributes on our text
-for (int i = start; i < end; i++)
+for (int i = start; i < end; ++i)
+{
+SAL_WARN_IF(i >= static_cast(pThis->m_aInputFlags.size()),
+"vcl.gtk", "pango attrib out of range?");
+if (i >= static_cast(pThis->m_aInputFlags.size()))
+continue;
 pThis->m_aInputFlags[i] |= sal_attr;
+}
 } while (pango_attr_iterator_next (iter));
 
 pThis->m_aInputEvent.mpTextAttr = &pThis->m_aInputFlags[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 1.6Gb of workdir/.../Dep - thoughts ...

On 04/06/12 17:19, Bjoern Michaelsen wrote:
> On Mon, Jun 04, 2012 at 03:56:41PM +0200, Lubos Lunak wrote:
>> On Friday 01 of June 2012, Michael Meeks wrote:

>>> IMHO we could - without significant loss of functionality reduce all
>>> those deps to a single stamp file (which we prolly install anyway) in
>>> the solver. Should be ~trivial to elide in our dep-re-writing anyway,
>>> save > 300Mb of space etc.
>>>
>>> Should just be a few lines in solenv/bin/concat-deps.c
> 
> But concat-deps is _after_ the creation dep files of the objects (which will
> then still be huge).

who cares how big the files are (disk is cheap), the relevant metric is:
how many seconds does make need to parse them?

>>> My question would be: do we want to continue to make 'over precise
>>> deps' at this large computational, space and build performance cost
>>> possible ?
>>
>>  I think there are several ways of reducing the size of .d files that are 
>> safer:
>>
>> - a significant part of .d content is the LO build directory - defining that 
>> one and some other common paths (solver, workdir) and sed /path/define/ 
>> should save quite some space (50% or possibly even more)
> 
> We even did that once IIRC using $(OUTDIR)/$(WORKDIR) vars which are known to
> gbuild already.

yes, but keep in mind that variables in the dep files will need to be
expanded by make, which will likely result in memory allocations, so
it's an open question whether that will actually improve performance or
slow it down.

>> - a significant part of .d content is the depend-on-nothing deps created 
>> by -MP , if those would be merged into one dedicated .d file that'd save a 
>> lot of space as well; not sure if this is easily doable though
> 
> Arent we doing that already when merging the .d files for one library?

to some extent yes, but of course the same headers are included in many
libraries, so there is still some amount of duplication there; however i
don't know to improve this without breaking separate building of
modules, which requires the LinkTarget .d files to be self-contained.

> So right now, I consider the topic premature optimization until proven 
> otherwise.

> (*) which you wont unless you gzip them (which is doable and shouldnt have too
> big of an performance impact)

sadly AFAIK make cannot include compressed files...

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

Re: Gerrit auto-merge

On Sat, 2012-06-02 at 08:54 +0200, Lionel Elie Mamane wrote:
> Ah, that's very different. So essentially people that now have
> immediate gratification^W commit rights would "go back" to "one day
> delay"?

Nah - as Bjoern says this is only for non-trivial patches that the
reviewer is not confident about and that would prolly benefit from a day
of delay to allow a specialist in the given area to jump in and do the
work; clearly interacting / forwarding to the right person etc. is a
good idea here.

> something to the effect: "one day waiting period is a lot for eager
> new contributors". I think I thought this was about requests to apply
> a commit *already* in master to stable branch.

Heh ;-) it's about the above subset of patches that some are worried
about going into master without enough review.

Lets see how the gerrit flow helps as/when it comes. What I hated wrt.
the CWS process was it's huge amount of round-trips. If there is a
sausage machine that (as a committer) I can choose to push to, that
after building on  platforms auto-pushes that to master, I'd be dead
pleased. It means I can do more risky cross-platform changes more
quickly, and queue them up back to back - knowing I'm not going to bust
other people's builds ;-)

Of course, if we start finding new contributors' patches taking much
longer to merge, we should re-visit ;-) IIRC we decided to re-discuss
this at a later date.

HTH,

Michael.

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

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

Re: Dialog "About LibreOffice" contents


"git grep" is your friend.

On 2012-06-04 18:13, Yoandy Pérez Villazón wrote:
Hi, can someone tell me where in the code is the contents of the 
dialog (About LibreOffice)?

Thank you all,

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...

CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice




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


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

[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf' - sc/source

2012-06-04 Thread Daniel Bankston

 sc/source/filter/xml/xmlsubti.cxx |  187 --
 sc/source/filter/xml/xmlsubti.hxx |7 -
 2 files changed, 2 insertions(+), 192 deletions(-)

New commits:
commit 5d757936fa06330f0abfd4a0c77521b7d4f5f7b4
Author: Daniel Bankston 
Date:   Mon Jun 4 11:11:00 2012 -0500

Remove unused ScMyTables merge methods and convert column/row methods

Change-Id: I5c5aaa7e80859ada894595203d2554ef4ce8663b

diff --git a/sc/source/filter/xml/xmlsubti.cxx 
b/sc/source/filter/xml/xmlsubti.cxx
index 2876309..950cbbd 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -49,7 +49,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -265,126 +264,6 @@ void ScMyTables::SetTableStyle(const rtl::OUString& 
sStyleName)
 }
 }
 
-bool ScMyTables::IsMerged (const uno::Reference & 
xCellRange, const sal_Int32 nCol, const sal_Int32 nRow,
-table::CellRangeAddress& aCellAddress) const
-{
-uno::Reference  xMergeable 
(xCellRange->getCellRangeByPosition(nCol,nRow,nCol,nRow), uno::UNO_QUERY);
-if (xMergeable.is())
-{
-uno::Reference xMergeSheetCellRange 
(xMergeable, uno::UNO_QUERY);
-uno::Reference 
xTable(xMergeSheetCellRange->getSpreadsheet());
-uno::Reference 
xMergeSheetCursor(xTable->createCursorByRange(xMergeSheetCellRange));
-if (xMergeSheetCursor.is())
-{
-xMergeSheetCursor->collapseToMergedArea();
-uno::Reference xMergeCellAddress 
(xMergeSheetCursor, uno::UNO_QUERY);
-if (xMergeCellAddress.is())
-{
-aCellAddress = xMergeCellAddress->getRangeAddress();
-if (aCellAddress.StartColumn == nCol && aCellAddress.EndColumn 
== nCol &&
-aCellAddress.StartRow == nRow && aCellAddress.EndRow == 
nRow)
-return false;
-else
-return true;
-}
-}
-}
-return false;
-}
-
-void ScMyTables::UnMerge()
-{
-if ( xCurrentCellRange.is() )
-{
-//extra step here until this area is fully converted
-com::sun::star::table::CellAddress aCellPos;
-ScAddress aScCellPos = GetRealScCellPos();
-ScUnoConversion::FillApiAddress( aCellPos, aScCellPos );
-
-table::CellRangeAddress aCellAddress;
-if (IsMerged(xCurrentCellRange, aCellPos.Column, aCellPos.Row, 
aCellAddress))
-{
-//unmerge
-uno::Reference  xMergeable 
(xCurrentCellRange->getCellRangeByPosition(aCellAddress.StartColumn, 
aCellAddress.StartRow,
-aCellAddress.EndColumn, 
aCellAddress.EndRow), uno::UNO_QUERY);
-if (xMergeable.is())
-xMergeable->merge(false);
-}
-}
-}
-
-void ScMyTables::DoMerge(sal_Int32 nCount)
-{
-if ( xCurrentCellRange.is() )
-{
-//extra step here until this area is fully converted
-com::sun::star::table::CellAddress aCellPos;
-ScAddress aScCellPos = GetRealScCellPos();
-ScUnoConversion::FillApiAddress( aCellPos, aScCellPos );
-
-table::CellRangeAddress aCellAddress;
-if (IsMerged(xCurrentCellRange, aCellPos.Column, aCellPos.Row, 
aCellAddress))
-{
-//unmerge
-uno::Reference  xMergeable 
(xCurrentCellRange->getCellRangeByPosition(aCellAddress.StartColumn, 
aCellAddress.StartRow,
-aCellAddress.EndColumn, 
aCellAddress.EndRow), uno::UNO_QUERY);
-if (xMergeable.is())
-xMergeable->merge(false);
-}
-
-//merge
-uno::Reference  xMergeCellRange;
-if (nCount == -1)
-{
-const ScMyTableData& r = *pCurrentTab;
-xMergeCellRange.set(
-xCurrentCellRange->getCellRangeByPosition(
-aCellAddress.StartColumn, aCellAddress.StartRow,
-aCellAddress.EndColumn + r.GetColsPerCol(r.GetColumn()) - 
1,
-aCellAddress.EndRow + r.GetRowsPerRow(r.GetRow()) - 1));
-}
-else
-xMergeCellRange.set(
-xCurrentCellRange->getCellRangeByPosition(
-aCellAddress.StartColumn, aCellAddress.StartRow,
-aCellAddress.StartColumn + nCount - 1,
-aCellAddress.EndRow));
-
-uno::Reference  xMergeable (xMergeCellRange, 
uno::UNO_QUERY);
-if (xMergeable.is())
-xMergeable->merge(true);
-}
-}
-
-void ScMyTables::InsertRow()
-{
-if ( xCurrentCellRange.is() )
-{
-ScAddress aScCellPos = GetRealScCellPos();
-table::CellRangeAddress aCellAddress;
-SCROW nRow(aScCellPos.Row());
-for (sal_Int32 j = 0; j < aScCellPos.Col() - pCurrentTab->GetColumn() 
- 1; ++j)
-{
-if (IsMerged(xCurrentCellRange, j, nRow - 1, aCellA

Re: Document to developers

Hi there,

On Mon, 2012-06-04 at 08:55 -0400, Yoandy Pérez Villazón wrote:
> Excellent link (http://docs.libreoffice.org/ ), was looking for 
> documentation on this subject with this brief description of the source 
> folders and class diagrams published by Kohei on your blog is easier to 
> understand the tool.

These docs are generated from README files in each directory in the
checkout: ls */README eg. should be helpful. Patches / improvements to
the structural docs there are much appreciated - they are sadly sparse
in many ways.

Thanks !

Michael.

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

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

Dialog "About LibreOffice" contents

2012-06-04 Thread Yoandy Pérez Villazón

Hi, can someone tell me where in the code is the contents of the dialog 
(About LibreOffice)?

Thank you all,

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...
CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: 3.5.3rc1 win32 / debug package ...

2012-06-04 Thread Rainer Bielefeld


Bjoern Michaelsen schrieb:


can we make that text less scary? ;)


Hi,

the logic is ok, but the sentence is really adult tapeworm, please feel 
free to make that more readable.


Best regards

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

Re: 3.5.3rc1 win32 / debug package ...

Hi Rainer,

On Mon, Jun 04, 2012 at 08:55:59AM -0700, bfo wrote:
> I thought so, but according to http://wiki.documentfoundation.org/BugTriage
> there are three bold ANDs before you can change a status to NEW. 
> Further more, an exclamation mark at the end of that paragraph 
> (and the whole scary sentence before it) discouraged me to change anything
> in the Status field at all.

can we make that text less scary? ;)

Best,

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

Re: 3.5.3rc1 win32 / debug package ...

2012-06-04 Thread bfo


Petr Mladek wrote
> 
> If you prepare the pages and template and
> if it is easy to add new week, Michael might do it himself in the
> future.
> 
Firefox team is using CreateBox Wiki Extension for minutes - check their
wiki page at https://wiki.mozilla.org/Platform#Meetings 



> Yes, any help is really appreciated. If you feel like, please propose
> some prioritization. 
> 

>From my users perspective the proposal is simple:
1. crashers
2. dataloss
3. regressions
4. something do not work as expected bugs
5. enhancements  

BTW: With time scheduled release cycle (monthly in your case) IMHO it is
difficult to triage bugs as blockers or critical anyway. 
I do not know if you are prepared to do chemspills, emergency releases or
stop the release channel if things go wrong big time...



>>  Maybe, but changing to NEW is quite complicated 
>> in your workflow, so mostly I leave them as UNCONFIRMED.
> Heh, what is complicated about it? Is the documentation unclear? IMHO,
> if you make sure that e bug is reproducible with the given information,
> you could move it to the state NEW.
> 

I thought so, but according to http://wiki.documentfoundation.org/BugTriage
there are three bold ANDs before you can change a status to NEW. 
Further more, an exclamation mark at the end of that paragraph 
(and the whole scary sentence before it) discouraged me to change anything
in the Status field at all.

Best regards.


--
View this message in context: 
http://nabble.documentfoundation.org/Re-3-5-3rc1-win32-debug-package-tp3984895p3988078.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Bug 46114 - Java Access Bridge no longer works

On Sat, 2012-06-02 at 18:25 -0700, V Stuart Foote wrote:
> Seems I'd screwed up the JAB 2.0.2 installation, so unlikely to be be able
> to recreate the original crash for stack dump. There are some issues with
> structure of the jfw::isAccessibilitySupportDesired() calls but otherwise
> won't do anything further with this effort.

Phew :-) of course, it'd still be nice not to crash in this situation,
and instead warn the user - indeed we should never crash; however -
since we'll kill all that code in favour of IAcc2, hopefully in the
release after 3.6 - things should get better & perhaps we can ignore it.

Thanks for reporting anyhow ! early reports of serious bugs are much
appreciated.

All the best,

Michael.

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

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

Re: 1.6Gb of workdir/.../Dep - thoughts ...




On 2012-06-04 17:19, Bjoern Michaelsen wrote:
Note however, that every bit of added complexity to the build system 
will bite you back one day. Currently the Deps are ~10% of the working 
directory -- even if you reduce them by 90%(*),
(*) which you wont unless you gzip them (which is doable and shouldnt 
have too big of an performance impact)


When dealing with simple stuff like ascii text, the compress command is
- practically free on modern CPU's,
- uses minimal memory,
and gives you 80% of the benefit of the more sophisticated compression 
tools.



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


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

Re: 1.6Gb of workdir/.../Dep - thoughts ...

On Mon, Jun 04, 2012 at 03:56:41PM +0200, Lubos Lunak wrote:
> On Friday 01 of June 2012, Michael Meeks wrote:
> > And some thoughts on improving this; currently we add a ton of deps for
> > packages that are really internal and typically change en-masse or not
> > at all.
> >
> > eg. 'boost' - it is installed, and then ~never changes again - people
> > don't edit a single boost header and expect a dependency clean
> > re-compile.
> ...
> > IMHO we could - without significant loss of functionality reduce all
> > those deps to a single stamp file (which we prolly install anyway) in
> > the solver. Should be ~trivial to elide in our dep-re-writing anyway,
> > save > 300Mb of space etc.
> >
> > Should just be a few lines in solenv/bin/concat-deps.c

But concat-deps is _after_ the creation dep files of the objects (which will
then still be huge).

> >
> > My question would be: do we want to continue to make 'over precise
> > deps' at this large computational, space and build performance cost
> > possible ?
> 
>  I think there are several ways of reducing the size of .d files that are 
> safer:
> 
> - a significant part of .d content is the LO build directory - defining that 
> one and some other common paths (solver, workdir) and sed /path/define/ 
> should save quite some space (50% or possibly even more)

We even did that once IIRC using $(OUTDIR)/$(WORKDIR) vars which are known to
gbuild already.

> - a significant part of .d content is the depend-on-nothing deps created 
> by -MP , if those would be merged into one dedicated .d file that'd save a 
> lot of space as well; not sure if this is easily doable though

Arent we doing that already when merging the .d files for one library?

Note however, that every bit of added complexity to the build system will bite
you back one day. Currently the Deps are ~10% of the working directory -- even
if you reduce them by 90%(*), nobody will jump with joy because his build now
fits on his drive by being 9% smaller.

So right now, I consider the topic premature optimization until proven 
otherwise.

Best,

Bjoern

(*) which you wont unless you gzip them (which is doable and shouldnt have too
big of an performance impact)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - libcmis/makefile.mk solenv/bin

2012-06-04 Thread Korrawit Pruegsanusak

 libcmis/makefile.mk  |2 +-
 solenv/bin/packimages.pl |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d1ea0b2253d9d09aad96f0b6b0251d20d063856
Author: Korrawit Pruegsanusak 
Date:   Mon Jun 4 22:09:22 2012 +0700

related fdo#50630: use print_warning when image not found

Change-Id: I8811ce96cb70429ae458e31cafb8979bb6bb9644

diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 12eb3ea..9369001 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -362,7 +362,7 @@ sub create_zip_archive
 print_error("can't add file '$path' to image zip archive: $!", 
5);
 }
 } else {
-print_message("file '$path' not found");
+print_warning("file '$path' not found");
 }
 }
 my $status = $zip->writeToFileNamed($tmp_out_file);
commit 3d2ca79abf0ff2f74c6a4a463f65fc89d5f98bba
Author: Korrawit Pruegsanusak 
Date:   Mon Jun 4 22:08:11 2012 +0700

$(COM) not $(COMP)

Change-Id: I2e97af8b0d1d6a6770730aa0bf22556b2ec115c0

diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index f42fe73..ec04b45 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -44,7 +44,7 @@ TARGET=cmis
 TARFILE_NAME=libcmis-0.2.1
 TARFILE_MD5=aba670de3beaafac1e287a9399dcc023
 
-.IF "$(OS)$(COMP)" == "WNTMSC"
+.IF "$(OS)$(COM)" == "WNTMSC"
 PATCH_FILES+=boost-win.patch
 .ENDIF
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#46808, Adapt UNO services to new style, Part 7, updating ::create

2012-06-04 Thread Stephan Bergmann


On 06/01/2012 03:27 PM, Noel Grandin wrote:

This is part of the ongoing quest to reach the wondrous land of the
shiny new UNO framework.

This patch series updates tons of places to use the new factory ::create
methods .

Unfortunately, it does not come with my usual guarantees - it compiles
and links, but the unit tests generate a bunch of errors.

I'm hoping Stephan can either patch up the problems or point me in the
right direction - build error log attached.


Pushed the first of your five patches now, as 
 
"fdo#46808, Adapt UNO services to new style, Part 7, updating ::create." 
 It needed some trivial merge fixes; and I added a number of tweaks, 
esp. inclusion of svtools/util/svt.component in some tests (see attached 
fixes-0001.patch for reference).


Will look at the other four patches later.

Thanks,
Stephan
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2ce2f9f..adaeaaa 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5060,8 +5060,6 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
 m_xGraphProvider = uno::Reference< graphic::XGraphicProvider >(
 graphic::GraphicProvider::create( xComponentContext ) );
 
-aBtnImport.Enable( sal_False );
-
 uno::Reference< beans::XPropertySet > xPropSet(
 xServiceManager->createInstance( ::rtl::OUString("com.sun.star.util.PathSettings"  ) ),
 uno::UNO_QUERY );
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 9d5a31d..039d3e4 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -82,7 +82,7 @@ void lcl_getFormatter(com::sun::star::uno::Reference
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -138,8 +139,8 @@ XPlugin_Impl::XPlugin_Impl( const uno::Reference< com::sun::star::lang::XMultiSe
 uno::Reference< com::sun::star::beans::XPropertySet >  xPS( m_xModel, UNO_QUERY );
 xPS->addPropertyChangeListener( OUString(), this );
 
-Guard< Mutex > aGuard( PluginManager::get().getPluginMutex() );
-PluginManager::get().getPlugins().push_back( this );
+Guard< Mutex > aGuard( ::PluginManager::get().getPluginMutex() );
+::PluginManager::get().getPlugins().push_back( this );
 }
 
 void XPlugin_Impl::destroyInstance()
@@ -199,11 +200,11 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
 
 // may have become undisposable between PostUserEvent and here
 // or may have disposed and receive a second UserEvent
-std::list& rList = PluginManager::get().getPlugins();
+std::list& rList = ::PluginManager::get().getPlugins();
 std::list::iterator iter;
 
 {
-Guard< Mutex > aPluginGuard( PluginManager::get().getPluginMutex() );
+Guard< Mutex > aPluginGuard( ::PluginManager::get().getPluginMutex() );
 for( iter = rList.begin(); iter != rList.end(); ++iter )
 {
 if( *iter == this )
@@ -223,7 +224,7 @@ IMPL_LINK( XPlugin_Impl, secondLevelDispose, XPlugin_Impl*, /*pThis*/ )
 uno::Reference< com::sun::star::beans::XPropertySet >  xPS( m_xModel, UNO_QUERY );
 xPS->removePropertyChangeListener( OUString(), this );
 {
-Guard< Mutex > aPluginGuard( PluginManager::get().getPluginMutex() );
+Guard< Mutex > aPluginGuard( ::PluginManager::get().getPluginMutex() );
 rList.remove( this );
 }
 m_aNPWindow.window = NULL;
@@ -513,8 +514,8 @@ void XPlugin_Impl::loadPlugin()
 Guard< Mutex > aGuard( m_aMutex );
 
 std::list::iterator iter;
-for( iter = PluginManager::get().getPluginComms().begin();
- iter != PluginManager::get().getPluginComms().end(); ++iter )
+for( iter = ::PluginManager::get().getPluginComms().begin();
+ iter != ::PluginManager::get().getPluginComms().end(); ++iter )
 {
 if( OStringToOUString( (*iter)->getLibName(), m_aEncoding ) == m_aDescription.PluginName )
 {
@@ -894,7 +895,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_,
 
 PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL )
 {
-uno::Reference< XPluginManager >  xPMgr( PluginManager::create(comphelper::ComponentContext(m_xSMgr).getUNOContext()) );
+uno::Reference< XPluginManager >  xPMgr( plugin::PluginManager::create(comphelper::ComponentContext(m_xSMgr).getUNOContext()) );
 
 Sequence< PluginDescription > aDescrs = xPMgr->getPluginDescriptions();
 const PluginDescription* pDescrs = aDescrs.getConstArray();
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index c503a04..7d1a8fb 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_macros_test,\
 sfx2/util/sfx \
 sot/util/sot \
 svl/source/fsstor/fsstorage \
+svtools/u

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

--- Comment #323 from Steven Shelton  2012-06-04 
08:10:01 PDT ---
Nominate Bug 46480 (Calc cannot filter data from the data source). This bug
makes it impossible to draw data from a database and use that data in any
helpful way in Calc, and there is no workaround. It is for this reason that my
office has not been able to upgrade to LibO 3.5 at all. It looks to be a
regression to a prior bug that may have been present in LibO 3.3.4.

-- 
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 - glib/makefile.mk glib/prj liblangtag/liblangtag-0.2-0001-Fix-a-memory-leak.patch liblangtag/liblangtag-0.2-0002-Fix-invalid-memory-access.patch liblangtag/liblangt

2012-06-04 Thread Eike Rathke

 glib/makefile.mk   |3 
 glib/prj/d.lst |2 
 liblangtag/README  |1 
 liblangtag/liblangtag-0.2-0001-Fix-a-memory-leak.patch |   44 +++
 liblangtag/liblangtag-0.2-0002-Fix-invalid-memory-access.patch |   50 
 liblangtag/liblangtag-0.2-configure.patch  |   46 +++
 liblangtag/liblangtag-0.2-msc-configure.patch  |  116 
++
 liblangtag/makefile.mk |  112 +
 liblangtag/prj/build.lst   |3 
 liblangtag/prj/d.lst   |   29 ++
 10 files changed, 406 insertions(+)

New commits:
commit 0fb770c4a86ef0b5e3740ab7078b6f36db7638e3
Author: Eike Rathke 
Date:   Mon Jun 4 17:00:55 2012 +0200

ported liblangtag build to wntmsci

diff --git a/glib/makefile.mk b/glib/makefile.mk
index 0180e1d..77ad4f0 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -163,6 +163,9 @@ OUT2LIB+=gobject/glib-genmarshal.lib
 OUT2LIB+=gobject/gobject-2.0.lib
 OUT2LIB+=gthread/gthread-2.0.lib
 
+.IF "$(OS)"=="WNT"
+OUT2INC+=build$/win32$/dirent.h
+.ENDIF
 OUT2INC+=build$/win32$/make.msc
 OUT2INC+=build$/win32$/module.defs
 
diff --git a/glib/prj/d.lst b/glib/prj/d.lst
index 7e4ab84..cb20723 100644
--- a/glib/prj/d.lst
+++ b/glib/prj/d.lst
@@ -29,6 +29,7 @@ symlink: %_DEST%\lib\libgobject-2.0.so.0 
%_DEST%\lib\libgobject-2.0.so
 ..\%__SRC%\lib\gthread-2.0.lib %_DEST%\lib\gthread-2.0.lib
 ..\%__SRC%\lib\glib-2.0.lib %_DEST%\lib\glib-2.0.lib
 ..\%__SRC%\lib\gobject-2.0.lib %_DEST%\lib\gobject-2.0.lib
+..\%__SRC%\lib\dirent.lib %_DEST%\lib\dirent.lib
 
 mkdir: %_DEST%\inc\external\gio-unix-2.0
 mkdir: %_DEST%\inc\external\gio-unix-2.0\gio
@@ -50,6 +51,7 @@ mkdir: %_DEST%\inc\external\glib-2.0
 ..\%__SRC%\inc\gmodule.h %_DEST%\inc\external\glib-2.0\gmodule.h
 ..\%__SRC%\inc\make.msc %_DEST%\inc\external\glib-2.0\make.msc
 ..\%__SRC%\inc\module.defs %_DEST%\inc\external\glib-2.0\module.defs
+..\%__SRC%\inc\dirent.h %_DEST%\inc\external\glib-2.0\dirent.h
 
 mkdir: %_DEST%\inc\external\glib-2.0\gio
 ..\%__SRC%\inc\gaction.h %_DEST%\inc\external\glib-2.0\gio\gaction.h
diff --git a/liblangtag/liblangtag-0.2-configure.patch 
b/liblangtag/liblangtag-0.2-configure.patch
new file mode 100644
index 000..d78f4dd
--- /dev/null
+++ b/liblangtag/liblangtag-0.2-configure.patch
@@ -0,0 +1,46 @@
+--- misc/liblangtag-0.2/configure  2012-02-02 11:04:11.0 +0100
 misc/build/liblangtag-0.2/configure2012-05-24 22:50:18.991459556 
+0200
+@@ -13514,7 +13514,9 @@
+   no_glib=""
+ 
+   if test "x$PKG_CONFIG" = x ; then
+-no_glib=yes
++  if test "x$LIBO_GLIB_CHEAT" = x ; then
++  no_glib=yes
++  fi
+ PKG_CONFIG=no
+   fi
+ 
+@@ -13537,18 +13539,20 @@
+   fi
+ 
+   if test x"$no_glib" = x ; then
+-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+-GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+-
+-GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+-GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+-glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+-   sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+-glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+-   sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+-glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+-   sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++  if test "x$LIBO_GLIB_CHEAT" = x ; then
++  GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
++  GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
++  GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
++
++  GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
++  GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
++  glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
++  sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++  glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
++  sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++  glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
++  sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++  fi
+ if test "x$enable_glibtest" = "xyes" ; then
+   ac_save_CFLAGS="$CFLAGS"
+   ac_save_LIBS="$LIBS"
diff --git a/liblangtag/liblangtag-0.2-msc-configure.patch 
b/liblangtag/liblangtag-0.2-msc-configure.patch
new file mode 100644
index 000..df75941
--- /dev/null
+++ b/liblangtag/liblangtag-0.2-msc-configure.patch
@@ -0,0 +1,116 @@
+--- misc/liblangtag-0.2/configure  2012-06-03 03:21:20.513755000 +0200
 misc/build/liblangtag-0.2/configure2012-06-02 23:04:17.742605700 
+02

[Libreoffice-commits] .: config_host.mk.in solenv/gbuild

2012-06-04 Thread Lubos Lunak

 config_host.mk.in   |1 -
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b6526cfa9070c5b9734c92ca20f16b16807b1031
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Jun 4 16:40:51 2012 +0200

do not export INCLUDE for MSVC, avoids problems long LO build path

INCLUDE is used by MSVC 
(http://msdn.microsoft.com/en-us/library/kezkeayy.aspx)
and make somehow (not sure why) exports the INCLUDE that gbuild uses,
which (again, not sure why) causes MSVC to report a misleading error about
incorrect argument. There actually does not appear to be any (unreasonably)
low path length limit on Windows.

Change-Id: I9329eb668f7a710ec69c8b5262b855f346ed01d2

diff --git a/config_host.mk.in b/config_host.mk.in
index ef798eb..fd738fe 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -226,7 +226,6 @@ export 
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITION
 export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
 export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
 export ILIB=@ILIB@
-@x_Cygwin@ export INCLUDE=
 export INPATH=@INPATH@
 export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
 export INSTALLDIR=@INSTALLDIR@
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 23ccc7f..5629ee5 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -264,6 +264,7 @@ define gb_CObject__command
 $(call gb_Output_announce,$(2).c,$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
+   unset INCLUDE && \
$(gb_CC) \
$(DEFS) \
$(T_CFLAGS) \
@@ -284,6 +285,7 @@ define gb_CxxObject__command
 $(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
+   unset INCLUDE && \
$(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \
$(DEFS) \
$(T_CXXFLAGS) \
@@ -337,6 +339,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat 
$(extraobjectlist))) \
$(NATIVERES)) && \
+   unset INCLUDE && \
$(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter 
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

I'll be away

2012-06-04 Thread Kohei Yoshida


Hi there,

Just FYI, I'll be away on vacation between June 7 and June 28.  I'll 
probably have access to my gmail account (though I'll probably check 
less frequently), but I'll definitely be away from any machine that can 
build libreoffice.


Kohei

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

Re: [PUSHED] Re: [PATCH] fdo#46378: Poor Resampling Image quality

Hi again,

On 2012-06-04 at 16:50 +0200, Jan Holesovsky wrote:

> I've pushed that to master

And - please can you confirm that the license of your work is according
to the project's needs?  Ideally if you can send a license statement to
this mailing list stating

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

Thank you a lot,
Kendy

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

[Libreoffice-commits] .: lcms2/makefile.mk

 lcms2/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 646c6681f5f9bf1727694fdbba67771b99ae95a4
Author: Lionel Dricot 
Date:   Mon Jun 4 16:08:56 2012 +0200

fdo#50680: lcms2 should use GNUMAKE for solaris

Module lcms2 is now using $GNUMAKE instead of the hardcoded "make" in order 
to allow compilation under Solaris

Change-Id: If4b3395e2b255f6199971792988c242dc5c13a69

diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk
index ce5f2be..50a42dd 100644
--- a/lcms2/makefile.mk
+++ b/lcms2/makefile.mk
@@ -76,7 +76,7 @@ CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)
 CONFIGURE_ACTION += --disable-shared
 .ENDIF
 
-BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM)
+BUILD_ACTION = $(GNUMAKE) -j$(GMAKE_MODULE_PARALLELISM)
 
 .ENDIF # "$(GUI)$(COM)"=="WNTMSC"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Rotated glyphs

2012-06-04 Thread Norbert Thiebaud

On Mon, Jun 4, 2012 at 6:17 AM, Jan Holesovsky  wrote:
> Hi Norbert, Thorsten, or anybody with MacOSX experience :-),
>
> On 2012-06-01 at 22:42 +0200, Jan Holesovsky wrote:
>
>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=ac25f124858b79e302adcc533d6a658d5c529394
>>
>> I think it does the right thing, but because I know ~nothing about
>> fonts, better to have your attention there :-) - can you please have a
>> look?
>
> And the same problem appeared on MacOSX:
>
> https://bugs.freedesktop.org/show_bug.cgi?id=50631
>
> I believe the attached patch fixes that, but I have no way to test that
> it even compiles, not to say if it really works ;-)  Can you please try
> it?  When you compile with it, the shifted text on the vertical ruler
> should appear centered inside the ruler again.

Thanks,
Pushed, modulo a missing ';' ...

The build is borked at this point... so i can validate the fix yet..
but the before symptom is verified...

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

[Libreoffice-commits] .: 2 commits - configure.in vcl/aqua

2012-06-04 Thread Norbert Thiebaud

 configure.in   |3 +++
 vcl/aqua/source/gdi/salgdi.cxx |   26 +-
 2 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 6b44e97fb6a4deffeee0654951a2a9dc43554820
Author: Norbert Thiebaud 
Date:   Mon Jun 4 09:31:25 2012 -0500

module icc removal was a bit too harsh in configure.in

re-instated lines that were accidentally wiped out in configure.in

Change-Id: I54d3140723e99eae1dda6c7b05c29327a22028a3

diff --git a/configure.in b/configure.in
index 27b3e1b..6d6155f 100644
--- a/configure.in
+++ b/configure.in
@@ -7945,6 +7945,9 @@ dnl Check for nsplugin
 dnl ===
 AC_MSG_CHECKING([whether to build nsplugin extension])
 ENABLE_NSPLUGIN=NO
+if test $_os = Darwin -o $_os = iOS -o $_os = Android; then
+enable_gtk=no
+fi
 if test "$enable_nsplugin" != "no"; then
 if test "$enable_gtk" != "no"; then
 AC_MSG_RESULT([yes])
commit 1802271ac4aef34a7957a1fac492daa788d1d984
Author: Norbert Thiebaud 
Date:   Mon Jun 4 09:30:10 2012 -0500

fdo#50631: Fix the bounding box of rotated glyphs on MacOSX.

Similarly to Ifb04d4a8e485182c5ef2771025b06832bfd75ae0 (commit
ac25f124858b79e302adcc533d6a658d5c529394), we need to rotate the bounding
box of glyphs on MacOSX too.

Additionally, round the position up, and convert the size more
straight-forward way.

Change-Id: Idf7a077836e65072795c6d98d61925ce62ee35b7

diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 0fccd6d..e21c30a 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -1860,11 +1860,27 @@ sal_Bool AquaSalGraphics::GetGlyphBoundRect( 
sal_GlyphId nGlyphId, Rectangle& rR
 if( eStatus != noErr )
 return false;
 
-const long nMinX = (long)(+aGlyphMetrics.topLeft.x * mfFontScale - 0.5);
-const long nMaxX = (long)(aGlyphMetrics.width * mfFontScale + 0.5) + nMinX;
-const long nMinY = (long)(-aGlyphMetrics.topLeft.y * mfFontScale - 0.5);
-const long nMaxY = (long)(aGlyphMetrics.height * mfFontScale + 0.5) + 
nMinY;
-rRect = Rectangle( nMinX, nMinY, nMaxX, nMaxY );
+const long nMinX = (long)(+aGlyphMetrics.topLeft.x * mfFontScale + 0.5);
+const long nMinY = (long)(-aGlyphMetrics.topLeft.y * mfFontScale + 0.5);
+const long nWidth  = (long)(aGlyphMetrics.width * mfFontScale + 0.5);
+const long nHeight = (long)(aGlyphMetrics.height * mfFontScale + 0.5);
+Rectangle aRect(Point(nMinX, nMinY), Size(nWidth, nHeight));
+
+if ( mnATSUIRotation == 0 )
+rRect = aRect;
+else
+{
+const double fRadians = mnATSUIRotation * (M_PI/0xB4);
+const double nSin = sin( fRadians );
+const double nCos = cos( fRadians );
+
+rRect.Left() =  nCos*aRect.Left() + nSin*aRect.Top();
+rRect.Top()  = -nSin*aRect.Left() - nCos*aRect.Top();
+
+rRect.Right()  =  nCos*aRect.Right() + nSin*aRect.Bottom();
+rRect.Bottom() = -nSin*aRect.Right() - nCos*aRect.Bottom();
+}
+
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libcmis/boost-win.patch libcmis/makefile.mk

 libcmis/boost-win.patch |   59 
 libcmis/makefile.mk |4 +++
 2 files changed, 63 insertions(+)

New commits:
commit 2195b65c2106b529af833eca2c0f59674a299415
Author: CÃ©dric Bosdonnat 
Date:   Mon Jun 4 16:30:00 2012 +0200

libcmis: fix for windows build

Change-Id: Ibc600ce33bd59b3fd2d5ff29c5fb19710dc0df8f

diff --git a/libcmis/boost-win.patch b/libcmis/boost-win.patch
new file mode 100644
index 000..02188c0
--- /dev/null
+++ b/libcmis/boost-win.patch
@@ -0,0 +1,59 @@
+--- misc/libcmis-0.2.1/src/libcmis/atom-object.cxx 2012-06-01 
07:44:26.0 -0600
 misc/build/libcmis-0.2.1/src/libcmis/atom-object.cxx   2012-06-04 
07:52:24.131190200 -0600
+@@ -29,6 +29,9 @@
+ #include 
+ #include 
+ 
++#ifndef BOOST_DATE_TIME_NO_LIB
++#define BOOST_DATE_TIME_NO_LIB
++#endif
+ #include 
+ 
+ #include "atom-object.hxx"
+--- misc/libcmis-0.2.1/src/libcmis/object.hxx  2012-06-01 07:38:36.0 
-0600
 misc/build/libcmis-0.2.1/src/libcmis/object.hxx2012-06-04 
07:52:21.900386200 -0600
+@@ -32,6 +32,9 @@
+ #include 
+ #include 
+ 
++#ifndef BOOST_DATE_TIME_NO_LIB
++#define BOOST_DATE_TIME_NO_LIB
++#endif
+ #include 
+ #include 
+ 
+--- misc/libcmis-0.2.1/src/libcmis/property-type.hxx   2012-02-17 
08:00:50.0 -0700
 misc/build/libcmis-0.2.1/src/libcmis/property-type.hxx 2012-06-04 
07:52:17.157977900 -0600
+@@ -28,6 +28,9 @@
+ #ifndef _PROPERTY_TYPE_HXX_
+ #define _PROPERTY_TYPE_HXX_
+ 
++#ifndef BOOST_DATE_TIME_NO_LIB
++#define BOOST_DATE_TIME_NO_LIB
++#endif
+ #include 
+ #include 
+ 
+--- misc/libcmis-0.2.1/src/libcmis/property.hxx2012-02-17 
06:38:33.0 -0700
 misc/build/libcmis-0.2.1/src/libcmis/property.hxx  2012-06-04 
07:52:19.388781800 -0600
+@@ -31,6 +31,9 @@
+ #include 
+ #include 
+ 
++#ifndef BOOST_DATE_TIME_NO_LIB
++#define BOOST_DATE_TIME_NO_LIB
++#endif
+ #include 
+ #include 
+ 
+--- misc/libcmis-0.2.1/src/libcmis/xml-utils.hxx   2012-05-30 
06:17:12.0 -0600
 misc/build/libcmis-0.2.1/src/libcmis/xml-utils.hxx 2012-06-04 
07:52:10.621566400 -0600
+@@ -30,6 +30,9 @@
+ 
+ #include 
+ 
++#ifndef BOOST_DATE_TIME_NO_LIB
++#define BOOST_DATE_TIME_NO_LIB
++#endif
+ #include 
+ #include 
\ No newline at end of file
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index 4657202..f42fe73 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -44,6 +44,10 @@ TARGET=cmis
 TARFILE_NAME=libcmis-0.2.1
 TARFILE_MD5=aba670de3beaafac1e287a9399dcc023
 
+.IF "$(OS)$(COMP)" == "WNTMSC"
+PATCH_FILES+=boost-win.patch
+.ENDIF
+
 .IF "$(debug)" != ""
 CFLAGS+=-g
 .ELSE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 editeng/source/items/frmitems.cxx |   11 ++-
 vcl/source/glyphs/graphite_layout.cxx |8 +---
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 70a6a4d425558340bb49507975343a3e0a1bdde8
Author: Michael Stahl 
Date:   Mon Jun 4 16:12:59 2012 +0200

fdo#46112: fix Calc ODF border line import:

There are 2 problems here:

- the border widths are tripled on import, because that is effectively
  what SetWidth does for DOUBLE borders; set a divisor of 3 similar to
  e2ffb71305c5f085eec6d396651c76d6daee3406

- the 3 individual line widths are ignored and the 3 lines end up with
  the same width, while older versions had numerous pre-defined border
  styles with asymmetric line widths; fix this by always guessing the
  width from the 3 parts for DOUBLE lines

Change-Id: Ibdde7e034e25433835765330e81db0825efd9eb8

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index e336ef2..c40bec9 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1789,6 +1789,13 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, 
SvxBorderLine& rSvxLine, sal_B
 sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : 
rLine.InnerLineWidth  ),
 sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance )  : 
rLine.LineDistance  ));
 }
+else
+{
+if (DOUBLE == rSvxLine.GetStyle())
+{   // fdo#46112: divide width by 3 for outer line, gap, inner line
+   rSvxLine.ScaleMetrics(1, 3);
+}
+}
 
 sal_Bool bRet = !rSvxLine.isEmpty();
 return bRet;
@@ -1858,7 +1865,9 @@ SvxBoxItem::LineToSvxLine(const 
::com::sun::star::table::BorderLine2& rLine, Svx
 if ( rLine.LineWidth )
 {
 rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) 
: rLine.LineWidth );
-bGuessWidth = sal_False;
+// fdo#46112: double does not necessarily mean symmetric
+// for backwards compatibility
+bGuessWidth = (DOUBLE == nStyle);
 }
 
 return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);
commit e18f53c624443bb2fbb9edba7b81b57487eb0e50
Author: Michael Stahl 
Date:   Mon Jun 4 13:48:59 2012 +0200

fdo#50169: skip the rest of the loop in case of wrong index

Presumably that is what Martin wanted to do in the previous patch.

Change-Id: I64f1da88c1802a27cf974aa6abc15b014b56126d

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 6416f70..e3bd926 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -849,12 +849,13 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs 
&rArgs)
 nOffset = static_cast(fExtraPerCluster * nCluster);
 int nCharIndex = mvGlyph2Char[i];
 assert(nCharIndex > -1);
-if (nCharIndex < mnMinCharPos) continue;
-if (static_cast(nCharIndex-mnMinCharPos)
-< mvCharDxs.size())
+if (nCharIndex < mnMinCharPos ||
+static_cast(nCharIndex-mnMinCharPos)
+>= mvCharDxs.size())
 {
-mvCharDxs[nCharIndex-mnMinCharPos] += nOffset;
+continue;
 }
+mvCharDxs[nCharIndex-mnMinCharPos] += nOffset;
 // adjust char dxs for rest of characters in cluster
 while (++nCharIndex - mnMinCharPos < 
static_cast(mvChar2BaseGlyph.size()))
 {
commit 981fd1612fb853287f0bb916b8600de3e587ed64
Author: Martin Hosken 
Date:   Mon Jun 4 13:38:33 2012 +0200

fdo#50169: add another index check

Change-Id: I974ac27ee17219ce3f8a7e5641dbb0098da18f8e

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 429e700..6416f70 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -849,6 +849,7 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs &rArgs)
 nOffset = static_cast(fExtraPerCluster * nCluster);
 int nCharIndex = mvGlyph2Char[i];
 assert(nCharIndex > -1);
+if (nCharIndex < mnMinCharPos) continue;
 if (static_cast(nCharIndex-mnMinCharPos)
 < mvCharDxs.size())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 3.5.3rc1 win32 / debug package ...

2012-06-04 Thread Petr Mladek

On Fri, 2012-06-01 at 13:10 -0700, bfo wrote:
> Michael Meeks-2 wrote
> > 
> I think it won't do any good in the long term. Enabling reporting tool would
> give you a chance to
> get more data without the need to know the bugzilla magic by the users (just
> opt in to send the reports). 
> It could bring more testers to the project, as now you have to do an own
> debug build to test LO 
> with proper backtraces (especially on Windows).
> Then (or I should write "Before that") you can think about what to do with
> the data (and how). 
> Luckily you can use experience of other projects (nice reading at
> http://blog.mozilla.org/metrics/) 
> or code even and work with dashboards like https://crash-stats.mozilla.com/ 
> or http://brasstacks.mozilla.com/orangefactor for instance. 
> I can see you have quite a few  http://tinderbox.libreoffice.org tinderboxes  
> but the question is - how do you use them for QA? 
> Browsing through QA articles I can feel it is more like - download, run,
> test, report scheme atm.

I hope that we could end here. I also like Launchpad from Ubuntu. It
merges reports with the same backtrace. So, it automatically handles
duplicates. You could easily see how many people are affected and find
the related comments on a single location.

Note that we need to do this step by step. First, we need to have the
builds with debuginfo. Then we need to have infrastructure to filter the
results, handle duplicates, ... Finally, we could enable the reporting
tool.

Note that we already have troubles to filter all the manually created
bugs. We are looking for more people helping with the bug triage, see
http://wiki.documentfoundation.org/BugTriage

If you could help, please step in.

> > Anyone is welcome to put / link them into whatever wiki page they
> > like :-) if you want it - go for it ! I'm happy to add a link to it at
> > the bottom of my template so it's easy to find in future.
> > 
> Yea... As wiki.d.o can have 
> http://wiki.documentfoundation.org/TDF/BoD_Meetings TDF BoD meetings  or 
> http://wiki.documentfoundation.org/TDF/Membership_Committee_Meetings
> Membership Committee Meetings  
> I simply do not understand why Engineering Steering Committee Meeting are
> not there. 
> It is very valuable information about what is going on in the project. 
> http://wiki.documentfoundation.org/RBd/TSC_Call_Minutes RBd 's notes are a
> good read, 
> but you know... pasting minutes into wiki template do not need another
> volunteer...

Heh, Michael already does so many things. In fact, he is looking for a
volunteer who could join the call and take the minutes.

Anyway, you might volunteer and take the minutes from the mailing list
and paste them into the wiki. If you prepare the pages and template and
if it is easy to add new week, Michael might do it himself in the
future.

> >> Also I am really concerned about your QA priorities. IMHO you should
> >> care little more about Windows builds and MS Office filters.
> > Who is the 'you' here ? you are one of us if you're helping out :-) 
> > [...]
> > However, getting the best and fastest possible list of and
> > prioritisation of bugs is a crucial task of QA 
> > 
> By "you" I mean QA Team.

We are still building the QA team. Feel free to join and move forward
some activities.

>  Reading ESC minutes I do not see general rule of
> prioritisation of bugs.

It is pity but we do not have defined rules for prioritization of bugs.
It currently depends on the feeling of the reporters and bug triagers.

Would you be interested into creating such a proposal? You might take
inspiration in the attached document that describes rules for Novell
bugzilla. IMHO, it is reasonable and might fit even LibreOffice. We just
need to use LibreOffice-specific examples.

> Is it 1. crashers 2. regressions 3. enhancements or any other scheme? I
> can't feel it atm. 

We use the keyword "regression" to mark regressions. We motivate
developers to work on these bugs with higher priority.

AFAIK, we do not have any keyword for crashers. IMHO, we use a
workaround because these bugs usually have the work crash in subject.

In each case, Rainer is leading the activities in this area. I am not
sure if he has it described in the wiki. I can't find it easily.

> You have MAB meta bugs, but it's more "my bug is more buggy than your bug"
> attitude there.

This is only a workaround. We do not have enough people to go trough all
reported bugs and standardize the priority and severity flags. Users
tend to set higher severity for their bug, so the original setting is
not useful. MAB is the place for high priority bugs that have been
confirmed by a developer or bug triager.

MAB wont be needed once we have good rules for setting severities and
priorities and enough people who could confirm the original reports.

> >> Sadly I'm not QA specialist. I just decided to help LO project by
> >> confirming as many bugs as I can find in Bugzilla. Hope this will help
> >> increase the qu

[Libreoffice-commits] .: connectivity/source fpicker/source jvmfwk/plugins pyuno/source sw/source vcl/unx xml2cmp/source xmloff/source

2012-06-04 Thread Takeshi Abe

 connectivity/source/drivers/file/FStatement.cxx |3 -
 connectivity/source/drivers/hsqldb/HStorageAccess.cxx   |1 
 connectivity/source/drivers/hsqldb/StorageFileAccess.cxx|1 
 connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx |1 
 connectivity/source/drivers/odbcbase/OStatement.cxx |   12 --
 connectivity/source/drivers/postgresql/pq_baseresultset.cxx |2 -
 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |2 -
 connectivity/source/drivers/postgresql/pq_xcolumn.cxx   |2 -
 connectivity/source/drivers/postgresql/pq_xindex.cxx|2 -
 connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx  |2 -
 connectivity/source/drivers/postgresql/pq_xkey.cxx  |2 -
 connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx|2 -
 connectivity/source/drivers/postgresql/pq_xtable.cxx|2 -
 fpicker/source/office/iodlgimp.cxx  |   18 
--
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx|1 
 pyuno/source/module/pyuno.cxx   |2 -
 pyuno/source/module/pyuno_util.cxx  |1 
 sw/source/ui/dbui/dbinsdlg.cxx  |4 --
 vcl/unx/gtk/a11y/atklistener.cxx|2 -
 xml2cmp/source/xcd/parse.cxx|6 ---
 xmloff/source/text/txtprhdl.cxx |3 -
 21 files changed, 71 deletions(-)

New commits:
commit 54a908a003db858874d85ca528983882e85e5c2e
Author: Takeshi Abe 
Date:   Mon Jun 4 23:25:40 2012 +0900

nuke unused defines

Change-Id: I7924da4bff73ca8f82c76eb8cb211401530acdeb

diff --git a/connectivity/source/drivers/file/FStatement.cxx 
b/connectivity/source/drivers/file/FStatement.cxx
index b6878f0..754630e 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -46,9 +46,6 @@
 #include 
 #include 
 
-#define THROW_SQL(x) \
-OTools::ThrowException(x,m_aStatementHandle,SQL_HANDLE_STMT,*this)
-
 namespace connectivity
 {
 namespace file
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx 
b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index b80deeb..7877c58 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 #define ThrowException(env, type, msg) { \
 env->ThrowNew(env->FindClass(type), msg); }
 
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx 
b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index ce87529..2a276d9 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -44,7 +44,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 /*/
 /* exception macros */
 
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx 
b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index a222d52..84cf3de 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -56,7 +56,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
 /*/
 /* exception macros */
 
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx 
b/connectivity/source/drivers/odbcbase/OStatement.cxx
index a143433..396facf 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -54,18 +54,6 @@ using namespace ::comphelper;
 #define THROW_SQL(x) \
 
OTools::ThrowException(m_pConnection,x,m_aStatementHandle,SQL_HANDLE_STMT,*this)
 
-#if OSL_DEBUG_LEVEL > 1
-#define DEBUG_THROW \
-try \
-{   \
-THROW_SQL(nRetCode);\
-}   \
-catch(const SQLException&)  \
-{   \
-OSL_FAIL("Exception in odbc caught"); \
-}
-#endif
-
 
 
 using namespace connectivity::odbc;
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx 
b/connect

[Bug 44446] LibreOffice 3.6 most annoying bugs

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on||50679

--- Comment #13 from Rainer Bielefeld  
2012-06-04 07:21:56 PDT ---
Add "Bug 50679 - EDITING Copying cell(s) with conditional CRASH when paste" -
but Markus is already involved, no panic ;-)

-- 
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] .: vcl/inc vcl/source

 vcl/inc/vcl/bitmap.hxx |   13 ++
 vcl/source/gdi/bitmap3.cxx |  237 +
 2 files changed, 250 insertions(+)

New commits:
commit 47e0df5cebc05576e55210c5dd408a6f3eb91700
Author: Tomaz Vajngerl 
Date:   Sat Jun 2 20:16:36 2012 +0200

fdo#46378: Lanczos3 resampling of images added to Bitmap.

Current resampling methods for images are FAST and INTERPOLATE.
FAST is used where speed of resampling is required, on the other
hand INTERPOLATE resampling is used when we need quality. For
example INTERPOLATE resampling method is used at PDF export.
INTERPOLATE resampling uses bilinear interpolation which is known
to be lower quality as other modern (and slower) resampling
algorithms such as Lanczos, Mitchell or BiCubic resampling.
This change adds Lanczos resampling to the Bitmap class and
enables Lanczos resampling in PDF export.

Lanczos3 resampling is implmented using separable convolution
with which it is also possible to easily add other resampling
methods like BiCubic just by changing the kernel function.

Change-Id: I8dff5b65753b09dffd5bc34f2343d9818efb3e58

diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 17041d8..14aae27 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -49,6 +49,7 @@
 #define BMP_SCALE_NONE  0xUL
 #define BMP_SCALE_FAST  0x0001UL
 #define BMP_SCALE_INTERPOLATE   0x0002UL
+#define BMP_SCALE_LANCZOS   0x0003UL
 
 // 
-
 
@@ -276,6 +277,18 @@ public:
 
 SAL_DLLPRIVATE sal_Bool ImplScaleFast( const double& 
rScaleX, const double& rScaleY );
 SAL_DLLPRIVATE sal_Bool ImplScaleInterpolate( const 
double& rScaleX, const double& rScaleY );
+SAL_DLLPRIVATE bool ImplScaleLanczos( const double& 
rScaleX, const double& rScaleY );
+
+SAL_DLLPRIVATE void ImplCalculateContributions( const 
int aSourceSize, const int aDestinationSize,
+const double aSupport, const 
int aNumberOfContributions,
+double* pWeights, int* 
pPixels, int* pCount );
+SAL_DLLPRIVATE bool ImplHorizontalConvolution( Bitmap& 
aNewBitmap, BitmapReadAccess* pReadAcc,
+int aNumberOfContributions, 
double* pWeights, int* pPixels, int* pCount );
+SAL_DLLPRIVATE bool ImplVerticalConvolution( Bitmap& 
aNewBitmap, BitmapReadAccess* pReadAcc,
+int aNumberOfContributions, 
double* pWeights, int* pPixels, int* pCount );
+
+SAL_DLLPRIVATE static doubleImplLanczosKernel( const double 
aValue, const double aSupport );
+
 SAL_DLLPRIVATE sal_Bool ImplMakeMono( sal_uInt8 cThreshold 
);
 SAL_DLLPRIVATE sal_Bool ImplMakeMonoDither();
 SAL_DLLPRIVATE sal_Bool ImplMakeGreyscales( sal_uInt16 
nGreyscales );
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index a2b8587..2d35c6a 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -36,6 +36,7 @@
 
 #include 
 #include 
+#include 
 
 // ---
 // - Defines -
@@ -914,6 +915,8 @@ sal_Bool Bitmap::Scale( const double& rScaleX, const 
double& rScaleY, sal_uLong
 bRet = ImplScaleFast( rScaleX, rScaleY );
 else if( BMP_SCALE_INTERPOLATE == nScaleFlag )
 bRet = ImplScaleInterpolate( rScaleX, rScaleY );
+else if( BMP_SCALE_LANCZOS == nScaleFlag )
+bRet = ImplScaleLanczos( rScaleX, rScaleY );
 else
 bRet = sal_False;
 }
@@ -2205,4 +2208,238 @@ sal_Bool Bitmap::Adjust( short nLuminancePercent, short 
nContrastPercent,
 return bRet;
 }
 
+//---
+bool Bitmap::ImplScaleLanczos( const double& rScaleX, const double& rScaleY )
+{
+const Size  aSizePix( GetSizePixel() );
+const long  nWidth = aSizePix.Width();
+const long  nHeight = aSizePix.Height();
+const long  nNewWidth = FRound( nWidth * rScaleX );
+const long  nNewHeight = FRound( nHeight * rScaleY );
+
+double aSupport = 3.0; // Sampling radius
+
+// Do horizontal filtering
+double aScale = nNewWidth / (double) nWidth;
+double aScaledRadius = aSupport / aScale;
+int aNumberOfContributions  = (int) ( 2 * aScaledRadius + 1 );
+
+double* pWeights = new double[ nNewWidth*aNumberOfContributions ];
+int* pPixels = new int[ nNewWidth*aNumberOfContributions ];
+int* pCount = new int[ nNewWidth ];
+
+ImplCalculateContributions( nWidth, nNewWidth, aSupport, 
aNumberOfContributions, pWeights, pPixels, pCount );
+
+BitmapReadAccess* pReadAcc =

Re: 1.6Gb of workdir/.../Dep - thoughts ...

2012-06-04 Thread Lubos Lunak

On Friday 01 of June 2012, Michael Meeks wrote:
>   And some thoughts on improving this; currently we add a ton of deps for
> packages that are really internal and typically change en-masse or not
> at all.
>
>   eg. 'boost' - it is installed, and then ~never changes again - people
> don't edit a single boost header and expect a dependency clean
> re-compile.
...
>   IMHO we could - without significant loss of functionality reduce all
> those deps to a single stamp file (which we prolly install anyway) in
> the solver. Should be ~trivial to elide in our dep-re-writing anyway,
> save > 300Mb of space etc.
>
>   Should just be a few lines in solenv/bin/concat-deps.c
>
>   My question would be: do we want to continue to make 'over precise
> deps' at this large computational, space and build performance cost
> possible ?

 I think there are several ways of reducing the size of .d files that are 
safer:

- a significant part of .d content is the LO build directory - defining that 
one and some other common paths (solver, workdir) and sed /path/define/ 
should save quite some space (50% or possibly even more)

- a significant part of .d content is the depend-on-nothing deps created 
by -MP , if those would be merged into one dedicated .d file that'd save a 
lot of space as well; not sure if this is easily doable though

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Continuing converting ScMyTables in feature/gsoc-calc-perf

2012-06-04 Thread Kohei Yoshida


On 06/01/2012 06:33 PM, Daniel Bankston wrote:


Hi, Kohei and Markus,

With the attached diff (diff to the latest pushed commit on
feature/gsoc-calc-perf), I was able to build and open my test ods files
with merged cells and content without problems. The patch removes the
ScMyTables merge methods and adjusts the add/new/insert row/column
methods. The big thing here is in ScMyTables::InsertColumn/Row(), there
is a for loop that never seems to be entered that contains calls to
IsMerged() and UNO interfaces. If the logic in the for loop isn't
needed, then ScMyTables::InsertColumn/Row() is unnecessary, and we can
just directly call ScMyStylesImportHelper::InsertCol/Row() from
ScMyTables::NewColumn/Row().

I won't commit this until you guys have had a chance to give input and
guidance on it.


It looks good to me.  Please push to your branch.

Kohei

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

Re: [ANN] LibreOffice 3.6.0 ALPHA1 test builds available

Hi,

On 2012-06-04 at 12:45 +0200, Petr Mladek wrote:

> > first obvious thing I notice on Windows is the menu bar being glassed.
> > That wouldn't be a problem of itself (I'm used to that from Firefox)
> > if the font color used for the menu entries combined with the badly
> > done glow effect wasn't making the menu completely unreadable. This
> > needs a lot of polishing.
> 
> Kendy, are you aware of this problem?

Yes, this is still not finished, and what is visible in the Alpha is
still more a proof-of-concept than the final thing.  It was discussed at
the ESC as the "UI cleanups / improvements (Kendy)" point in "Known
features racing the freeze".

The final thing will probably have to go in as a late feature [or the
current looke reverted] later this week.  But I'm meeting with Mirek M.
tomorrow, and I'm sure he'll come up with something beautiful :-)

All the best,
Kendy

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

Re: Document to developers

2012-06-04 Thread Yoandy Pérez Villazón

Excellent link (http://docs.libreoffice.org/ ), was looking for 
documentation on this subject with this brief description of the source 
folders and class diagrams published by Kohei on your blog is easier to 
understand the tool.


Thank you!

El 04/06/12 07:50, Noel Grandin escribió:

Start here:

https://wiki.documentfoundation.org/Development
http://docs.libreoffice.org/

On 2012-06-04 05:59, Yoandy Pérez Villazón wrote:

Hi all,

My name is Yoandy, I'm an engineer in computer science and software 
developer for a while and I started to make developments LibOffice 
level for creating extensions creating some custom extensions to the 
work environment in which I work. A few weeks ago I started 
introducing me LibOffice code, but I found it hard to learn 
everything faster than I wanted.


I ask please if you have any information to explain by a class 
diagram, architecture or simply a guide where they are the source 
directory and have the share or tell me a URL to access it.


My ultimate goal is to contribute to the development of LibreOffice.

Thank you very much to all,

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...

CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice




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


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

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...

CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci



10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...
CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSOC] PDF signing report

2012-06-04 Thread Gökçen Eraslan

Hello,

I want to write the progress about the PDF signing GSoC project:

After weeks of reading the PDF reference and inspecting the
PortableSigner implementation, here is what I must do to implement
signing support:

1- Create an Annotation object of Widget subtype. Make it's width and
height zero since we don't want to make the signature visible, for now.
(Yes, digital signatures may be visible[1]. There is even a document
about that[2].)

2- Create and AcroForm field (/FT/Sig) as the parent of the Annotation
object we created.[3] Only buttons, combobox, listbox, edit and
hierarchy is defined now.

3- Create a Signature dictionary (/Type/Sig). AcroForm field must point
to that dictionary in the /V field. This is the crucial object. Prepare
a PKCS#7 object and use it as the /Contents value. It must contain the
X.509 certificate and the encrypted message digest.

4- Modify /Catalog object of the PDF document so that /AcroForm points
to the our AcroForm field.

5- Modify the first /Page object so that it's /Annots key points to our
Annotation object.

6- Write a new xref table and the final trailer.

That's all, it's very easy :) It seems most of these changes will be
applied to vcl/source/gdi/pdfwriter_impl.{c,h}xx files.

As Thorsten said, I will mimic the behaviour of the PortableSigner tool
first. PortableSigner use the incremental updating feature of the PDF.
This feature allows pdf editing tools to edit PDF file by adding new or
existing objects to the end of the file. So, if an object exists more
than once, last occurence is used.

In the PDF export code I have to:

1- Add PDFWriter::SignatureWidget AcroForm type and use
PDFWriterImpl::createControl() to add a Signature field.

2- Now, PDFWriterImpl::emitCatalog method writes all the Pages,
Resources and Catalog objects. I think I need to split those into
different methods, so I can emit the modified catalog again.

3- Re-write the /Page object that contains recently added Signature
annotation.

4- Add a new xref table and a new trailer at the end. I don't know how
to implement that now. PDFWriterImpl::emitTrailer() method writes all
objects but in incremental updates we must include only added/modified
objects to the xref table.

I know that is a kind of "note-to-self" but I've tried to write down all
the steps that I can think of.

Cheers.

[1]
http://www.tracker-software.com/knowledgebase/290-How-do-I-create-an-invisible-digital-certificate

[2]
http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/devnet/acrobat/pdfs/acrobat_digital_signature_appearances_v9.pdf

[3] Since Annotation object and AcroForm Sig field have no common keys,
signature implementation merge those two dictionaries.

--
Gökçen Eraslan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/template-dialog' - sfx2/source

 sfx2/source/doc/templatedlg.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5b20e0572f266fef0775208737ac08599a0dd1ce
Author: CÃ©dric Bosdonnat 
Date:   Mon Jun 4 14:48:42 2012 +0200

Make the template manager closeable

Change-Id: Ic5e614529883784b2cc098520ffbb47c76875471

diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 85a8064..3d73d11 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -16,6 +16,7 @@ ModalDialog DLG_TEMPLATE_MANAGER
 OutputSize = TRUE;
 SVLook = TRUE;
 Moveable = TRUE;
+Closeable = TRUE;
 Size = MAP_APPFONT ( 270 , 165 );
 Text [en-US] = "Template Manager";
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - extensions/source solenv/gbuild

2012-06-04 Thread David Tardon

 extensions/source/scanner/sanedlg.cxx |2 +-
 solenv/gbuild/AllLangResTarget.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0b638638ef6e8c93318cb898ef8312e0e197b45e
Author: David Tardon 
Date:   Mon Jun 4 11:38:30 2012 +0200

fdo#50628 fix resource file name

Change-Id: I17df8114983a06f7a58df30821873ecd4387cec0

diff --git a/extensions/source/scanner/sanedlg.cxx 
b/extensions/source/scanner/sanedlg.cxx
index e12e640..4fbd382 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -41,7 +41,7 @@
 
 ResId SaneResId( sal_uInt32 nID )
 {
-static ResMgr* pResMgr = ResMgr::CreateResMgr( "san" );
+static ResMgr* pResMgr = ResMgr::CreateResMgr( "scn" );
 return ResId( nID, *pResMgr );
 }
 
commit 52cd118b4e460787059aeab90bdbe5bc9ef33cbd
Author: David Tardon 
Date:   Mon Jun 4 10:23:33 2012 +0200

fdo#50630 set correct path to images' module dir

Change-Id: Iabaf8f41e82fb7c2f881057bedb4c7757dcf1bce

diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index eb36343..e7703df 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -341,7 +341,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-   -subMODULE=$(dir 
$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
+   -subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-oil=$(dir $(call 
gb_ResTarget_get_imagelist_target,$*)) \
$(filter-out $(gb_Helper_MISCDUMMY) 
$(gb_ResTarget_RSCTARGET),$^)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 37361] LibreOffice 3.5 most annoying bugs

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

Björn Michaelsen  changed:

   What|Removed |Added

 Depends on||50676

--- Comment #322 from Björn Michaelsen  
2012-06-04 05:14:11 PDT ---
suggesting 50676 as it makes LibreOffice hardly usable for Chinese users.

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

[PATCH 2/2] Smarter auto-complete capitalization (#i22961#) and i18n handling

2012-06-04 Thread Brad Sowden


Hi,

This patch implements the following:

(1) Completes a TODO in the code related to i18n handling of month and 
day names with auto-completion. Previously, when non-ASCII names were 
added to the auto-complete word list these had to be an exact 
case-sensitive match of the word to be auto-completed. This patch allows 
a case-insensitive match for non-ASCII names when deciding what names to 
add to the auto-complete list.


(2) Smarter auto-complete capitalization as described in OpenOffice bug 
22961. If a word is in sentence case then the auto-completed word should 
be in the same case i.e. if the auto-complete list contains the word 
"LIBRE" then "Lib" should auto-complete to "Libre" rather

than "LibRE".

https://issues.apache.org/ooo/show_bug.cgi?id=22961

* The algorithm simply looks at the first character in the word to 
decide whether a word is sentence case.
* I've put a TODO in the code as SwAutoCompleteWord::GetRange() only 
performs an ASCII case-insensitive match (existing limitation).
* Sidenote - Initially I tried using CharClass::titlecase() but 
discovered this doesn't actually work. There appears to be an issue with 
class cclass_Unicode where "trans" is only ever set to 
"Transliteration_casemapping" and there is no mechanism to set it to 
"Transliteration_titlecase".


- make + make dev-install successful
- functionality tested ok
- licence statement on file

Cheers,
Brad

>From 7f1e68f9a06bebd6690c8938b379508af96ab26c Mon Sep 17 00:00:00 2001
From: Brad Sowden 
Date: Mon, 4 Jun 2012 22:02:34 +1200
Subject: [PATCH 2/2] Smarter auto-complete capitalization (#i22961#) and i18n
 handling

If a word is in sentence case then the auto-completed word should
be in the same case i.e. if the auto-complete list contains the
word "LIBRE" then "Lib" should auto-complete to "Libre" rather
than "LibRE". See OpenOffice bug 22961.

Also implement better i18n handling for calander month and day
names. Previously, if a month or day name was not ASCII then it
would only auto-complete if it exactly matched the names retrieved
from the internal calander i.e. had be a case sensitive match.

Change-Id: I0c4543bd9e912072bce1ceaf4adecd41b55b576b
---
 sw/source/ui/docvw/edtwin.cxx |  114 +
 1 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index dca8219..831ab46 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5565,67 +5565,93 @@ void QuickHelpData::Stop( SwWrtShell& rSh )
 
 void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
 {
+enum Capitalization { CASE_LOWER, CASE_UPPER, CASE_SENTENCE, CASE_OTHER };
+
+// Determine word capitalization
+const CharClass& rCC = GetAppCharClass();
+const String sWordLower = rCC.lowercase( rWord );
+Capitalization aWordCase = CASE_OTHER;
+if ( rWord.Len() > 0 )
+{
+if ( rWord.GetChar(0) == sWordLower.GetChar(0) )
+{
+if ( rWord == sWordLower )
+aWordCase = CASE_LOWER;
+}
+else
+{
+// First character is not lower case i.e. assume upper or title case
+String sWordSentence = sWordLower;
+sWordSentence.SetChar( 0, rWord.GetChar(0) );
+if ( rWord == sWordSentence )
+aWordCase = CASE_SENTENCE;
+else
+{
+if ( rWord == static_cast( rCC.uppercase( rWord ) ) )
+aWordCase = CASE_UPPER;
+}
+}
+}
+
 salhelper::SingletonRef* pCalendar = s_getCalendarWrapper();
 (*pCalendar)->LoadDefaultCalendar( rSh.GetCurLang() );
 
+// Add matching calendar month and day names
+uno::Sequence< i18n::CalendarItem2 > aNames( (*pCalendar)->getMonths() );
+for ( sal_uInt16 i = 0; i < 2; ++i )
 {
-uno::Sequence< i18n::CalendarItem2 > aNames(
-(*pCalendar)->getMonths() );
-for( int n = 0; n < 2; ++n )
+for ( long n = 0; n < aNames.getLength(); ++n )
 {
-for( long nPos = 0, nEnd = aNames.getLength(); nPos < nEnd; ++nPos )
+const String& rStr( aNames[n].FullName );
+// Check string longer than word and case insensitive match
+if( rStr.Len() > rWord.Len() &&
+static_cast( rCC.lowercase( rStr, 0, rWord.Len() ) )
+== sWordLower )
 {
-String sStr( aNames[ nPos ].FullName );
-if( rWord.Len() + 1 < sStr.Len() &&
-
-//!!! UNICODE: missing interface
-COMPARE_EQUAL == rWord.CompareIgnoreCaseToAscii(
-sStr, rWord.Len() ))
+if ( aWordCase == CASE_LOWER )
+pHelpStrings->push_back( rCC.lowercase( rStr ) );
+else if ( aWordCase == CASE_SENTENCE )
 {
-pHelpS

[PATCH 1/2] Replace SvStringsISortDtor in edtwin.cxx and gloslst.[ch]xx

2012-06-04 Thread Brad Sowden


Hi,

This patch converts a SvStringsISortDtor to a vector and maintains 
equivalent functionality.


Instead of sorting strings upon each insertion all strings are now added 
and then a single sort and "unique" are applied (SvStringsISortDtor 
behaves like a SET with regards to insertion, which is why "unique" is 
applied). SwEditWin::ShowAutoTextCorrectQuickHelp() is the only place 
where strings are added to the vector.


The change in behaviour from keeping the first inserted version of a 
string to keeping the first version post-sort (case-insensitive ASCII 
comparison) should have no material impact as the strings retrieved from 
SwAutoCompleteWord are already unique (case-insensitive ASCII 
comparison) and the capitalization of the string is generally changed 
anyway to match the capitalization of the word to be auto-completed. 
Also, there appears to be no logical reason to store the first inserted 
version of a string over the first version post-sort.


* In previous patches that I've seen on the list it appears ok to 
convert a vector of String pointers to simply a vector of String values 
so I've done the same.
* I used a pointer to the vector as the move() function previously 
copied and cleared all elements whereas a pointer swap would suffice.
* I've put a TODO in the code to replace the ASCII only case-insensitive 
sort (existing limitation).


- make + make dev-install successful
- functionality tested ok
- licence statement on file

Cheers,
Brad

>From ddf05af3c0614c9565c42cf87b43722523703eac Mon Sep 17 00:00:00 2001
From: Brad Sowden 
Date: Sat, 2 Jun 2012 19:09:43 +1200
Subject: [PATCH 1/2] Replace SvStringsISortDtor in edtwin.cxx and
 gloslst.[ch]xx

Note that the replacement vector stores all strings first and then
sort and "unique" are applied (ASCII treated as case-insensitive).
Previously strings were inserted sequentially and only the first
version of a string would be stored (case-insensitive ASCII
comparision). This should have no material impact as the strings
retreived from SwAutoCompleteWord are already unique (case-
insensitive ASCII comparison) and the capitalization of the string
is generally changed anyway to match the capitalization of the word
to be auto-completed. Also, there appears to be no logical reason
to store the first inserted version of a string over of the first
version post-sort.

Change-Id: I132865bbb9b382d417fb2cff9de351fdb2cbfb13
---
 sw/source/ui/docvw/edtwin.cxx  |  100 +++
 sw/source/ui/inc/gloslst.hxx   |5 +-
 sw/source/ui/utlui/gloslst.cxx |6 +--
 3 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 6d5cc4f..dca8219 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -143,6 +143,7 @@
 #include 
 
 #include 
+#include 
 
 #include "../../core/inc/rootfrm.hxx"
 
@@ -271,33 +272,39 @@ public:
 
 struct QuickHelpData
 {
-SvStringsISortDtor aArr;
+std::vector *pHelpStrings;
 sal_uInt16* pAttrs;
 CommandExtTextInputData* pCETID;
 sal_uLong nTipId;
 sal_uInt16 nLen, nCurArrPos;
 sal_Bool bClear : 1, bChkInsBlank : 1, bIsTip : 1, bIsAutoText : 1;
 
-QuickHelpData() : pAttrs( 0 ), pCETID( 0 )  { ClearCntnt(); }
+QuickHelpData() : pAttrs( 0 ), pCETID( 0 )
+{
+pHelpStrings = new std::vector;
+ClearCntnt();
+}
+~QuickHelpData() { delete pHelpStrings; }
 
 void Move( QuickHelpData& rCpy );
 void ClearCntnt();
 void Start( SwWrtShell& rSh, sal_uInt16 nWrdLen );
 void Stop( SwWrtShell& rSh );
 
-sal_Bool HasCntnt() const   { return aArr.Count() && 0 != nLen; }
+sal_Bool HasCntnt() const { return !pHelpStrings->empty() && 0 != nLen; }
 
 void Inc( sal_Bool bEndLess )
-{
-if( ++nCurArrPos >= aArr.Count() )
-nCurArrPos = (bEndLess && !bIsAutoText )? 0 : nCurArrPos-1;
-}
+{
+if( ++nCurArrPos >= pHelpStrings->size() )
+nCurArrPos = (bEndLess && !bIsAutoText ) ? 0 : nCurArrPos-1;
+}
 void Dec( sal_Bool bEndLess )
-{
-if( 0 == nCurArrPos-- )
-nCurArrPos = (bEndLess && !bIsAutoText ) ? aArr.Count()-1 : 0;
-}
+{
+if( 0 == nCurArrPos-- )
+nCurArrPos = (bEndLess && !bIsAutoText ) ?  pHelpStrings->size()-1 : 0;
+}
 void FillStrArr( SwWrtShell& rSh, const String& rWord );
+void SortAndFilter();
 };
 
 /*
@@ -2468,7 +2475,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
 // replace the word or abbreviation with the auto text
 rSh.StartUndo( UNDO_START );
 
-String sFnd( *aTmpQHD.aArr[ aTmpQHD.nCurArrPos ] );
+String sFnd( (*aTmpQHD.pHelpStrings)[ aTmpQHD.nCurArrPos ] );
 if( aTmpQHD.bIsAutoText )
 {
 SwGlossaryList*

Re: [PUSHED][3-5] Re: [REVIEW:3-5] fdo#49968 speed up RTF import of repeated character/paragraph properties

2012-06-04 Thread Miklos Vajna

On Mon, Jun 04, 2012 at 01:29:02PM +0200, Michael Stahl  
wrote:
> pushed to libreoffice-3-5
> 
> why does the tokenizer store the sprms in a vector anyway, would a map
> or hash_map perhaps be more suitable?

Check the ones, where the set() is called with false, i.e. not
overwriting previous sprms:

grep '\.set(.*false' source/rtftok/rtfdocumentimpl.cxx

Tables and numberings are the only ones, where repeated sprms are
necessary, I think. (Without them, a map would work, yes.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Document to developers


Start here:

https://wiki.documentfoundation.org/Development
http://docs.libreoffice.org/

On 2012-06-04 05:59, Yoandy Pérez Villazón wrote:

Hi all,

My name is Yoandy, I'm an engineer in computer science and software 
developer for a while and I started to make developments LibOffice 
level for creating extensions creating some custom extensions to the 
work environment in which I work. A few weeks ago I started 
introducing me LibOffice code, but I found it hard to learn everything 
faster than I wanted.


I ask please if you have any information to explain by a class 
diagram, architecture or simply a guide where they are the source 
directory and have the share or tell me a URL to access it.


My ultimate goal is to contribute to the development of LibreOffice.

Thank you very much to all,

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...

CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice




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


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

[PUSHED][3-5] Re: [REVIEW:3-5] fdo#49968 speed up RTF import of repeated character/paragraph properties

On 04/06/12 10:44, Miklos Vajna wrote:
> Hi,
> 
> See http://cgit.freedesktop.org/libreoffice/core/commit/?id=a5328cf
> 
> This time the commit can be simply cherry-picked. :)

pushed to libreoffice-3-5

why does the tokenizer store the sprms in a vector anyway, would a map
or hash_map perhaps be more suitable?

[re-sent due to gmane problems]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Document to developers

2012-06-04 Thread Yoandy Pérez Villazón


Hi all,

My name is Yoandy, I'm an engineer in computer science and software 
developer for a while and I started to make developments LibOffice level 
for creating extensions creating some custom extensions to the work 
environment in which I work. A few weeks ago I started introducing me 
LibOffice code, but I found it hard to learn everything faster than I 
wanted.


I ask please if you have any information to explain by a class diagram, 
architecture or simply a guide where they are the source directory and 
have the share or tell me a URL to access it.


My ultimate goal is to contribute to the development of LibreOffice.

Thank you very much to all,

10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS 
INFORMATICAS...
CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION

http://www.uci.cu
http://www.facebook.com/universidad.uci
http://www.flickr.com/photos/universidad_uci
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-ux-advise] Disabling file opening and saving in print preview mode

2012-06-04 Thread Jean-Francois Nifenecker


Hi,

Le 31/05/2012 17:48, Kohei Yoshida a écrit :


Views and opinions appreciated.



As Regina has already pointed out: *page* preview <> print preview. Page 
preview doesn't imply printing. Eg; exporting to PDF is usefully 
previewed with Page preview.


BTW, I share the comment that the print preview is cluttered. To me, it 
is too much integrated with the modules. A modal window would less 
disturb the user, making things clear about what is what (eg: the page 
preview in Calc displays two zoom rulers... why so? Which is the right one?)


--
Jean-Francois Nifenecker, Bordeaux
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: finding code for UI strings ...

2012-06-04 Thread Kevin Hunter


At 1:51pm -0400 Thu, 31 May 2012, Joel Madero wrote:

As for the explanation of why my search didn't come up with it, I did
the following search (twice now) with grep:

grep -rl "Save with password">  password_code.txt

I would think that the grep would find the code regardless of the
underscore. Still a bit confused about that, didn't get a chance last
night to look into the other src file but hopefully tonight or this
weekend.


Looks to me like you forgot to tell grep /where/ to search:

# wait for input via stdin
$ grep -rl "Save with password" > password_code.txt

# search starting from "this" directory
$ grep -rl "Save with password" . > password_code.txt

The latter should yield results of interest to you.

Git might return results a bit faster than a blanket search of 
everything (e.g. non-source files, uncompressed versions of files in 
Git, etc.):


$ git grep "Save with password"

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

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

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   20 ++--
 writerfilter/source/rtftok/rtfsprm.cxx |   14 ++
 writerfilter/source/rtftok/rtfsprm.hxx |2 ++
 3 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit d366ae2031d13f3198cb58c715f18e8c8ce8686f
Author: Miklos Vajna 
Date:   Wed May 30 11:43:41 2012 +0200

fdo#49968 speed up RTF import of repeated character/paragraph properties

Most RTF documents (produced by Word/Writer) reset character and
paragraph properties at the start of each paragraph. Because of this,
appending properties of the same type didn't cause any noticable
performance problems. However, it's valid to not reset these properties,
and in this case a longer document takes forever to import.

Filter these duplicates at the tokenizer level for trivial properties to
get acceptable import speed.

Also fixes rhbz#825548 in an easier-to-backport way.

Change-Id: Id0b7289323d45ff0d747c74bb78d8eb7def0cfc2
(cherry picked from commit a5328cf5605cdc243522eddcaffe7336196a4900)

Signed-off-by: Michael Stahl 

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 063d94b..ea14c57 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1664,7 +1664,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 if (nParam >= 0)
 {
 RTFValue::Pointer_t pValue(new RTFValue(nParam));
-m_aStates.top().aParagraphSprms->push_back(make_pair(NS_sprm::LN_PJc, 
pValue));
+m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PJc, pValue);
 return 0;
 }
 
@@ -,7 +,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 }
 if (nSprm > 0)
 {
-m_aStates.top().aCharacterSprms->push_back(make_pair(nSprm, 
pIntValue));
+m_aStates.top().aCharacterSprms.set(nSprm, pIntValue);
 // Language is a character property, but we should store it at a 
paragraph level as well for fields.
 if (nKeyword == RTF_LANG && m_bNeedPap)
 m_aStates.top().aParagraphSprms->push_back(make_pair(nSprm, 
pIntValue));
@@ -2240,7 +2240,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 }
 if (nSprm > 0)
 {
-m_aStates.top().aParagraphSprms->push_back(make_pair(nSprm, 
pIntValue));
+m_aStates.top().aParagraphSprms.set(nSprm, pIntValue);
 if (nKeyword == RTF_ITAP && nParam > 0)
 // Invalid tables may omit INTBL after ITAP
 dispatchFlag(RTF_INTBL);
@@ -2305,7 +2305,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 {
 int nFontIndex = getFontIndex(nParam);
 RTFValue::Pointer_t pValue(new RTFValue(nFontIndex));
-
m_aStates.top().aCharacterSprms->push_back(make_pair(NS_sprm::LN_CRgFtc0, 
pValue));
+m_aStates.top().aCharacterSprms.set(NS_sprm::LN_CRgFtc0, 
pValue);
 m_aStates.top().nCurrentEncoding = getEncoding(nFontIndex);
 }
 break;
@@ -2353,7 +2353,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 
m_aStates.top().aTableAttributes->push_back(make_pair(NS_rtf::LN_SGC, pValue)); 
// paragraph style
 }
 else
-
m_aStates.top().aParagraphAttributes->push_back(make_pair(NS_rtf::LN_ISTD, 
pIntValue));
+m_aStates.top().aParagraphAttributes.set(NS_rtf::LN_ISTD, 
pIntValue);
 break;
 case RTF_CS:
 if (m_aStates.top().nDestinationState == DESTINATION_STYLESHEET)
@@ -2814,11 +2814,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 break;
 case RTF_SB:
 lcl_putNestedAttribute(m_aStates.top().aParagraphSprms,
-NS_ooxml::LN_CT_PPrBase_spacing, 
NS_ooxml::LN_CT_Spacing_before, pIntValue);
+NS_ooxml::LN_CT_PPrBase_spacing, 
NS_ooxml::LN_CT_Spacing_before, pIntValue, true);
 break;
 case RTF_SA:
 lcl_putNestedAttribute(m_aStates.top().aParagraphSprms,
-NS_ooxml::LN_CT_PPrBase_spacing, 
NS_ooxml::LN_CT_Spacing_after, pIntValue);
+NS_ooxml::LN_CT_PPrBase_spacing, 
NS_ooxml::LN_CT_Spacing_after, pIntValue, true);
 break;
 case RTF_DPX:
 m_aStates.top().aDrawingObject.nLeft = TWIP_TO_MM100(nParam);
@@ -2847,11 +2847,11 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 m_aStates.top().nBinaryToRead = nParam;
 break;
 case RTF_LI:
-
m_aStates.top().aParagraphSprms->push_back(make_pair(NS_sprm::LN_PDxaLeft, 
pIntValue));
+m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PDxaLeft, 
pIntVa

Re: Rotated glyphs