License

[Werner Körner]

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

Werner Körner
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Change in core[libreoffice-3-6]: fix sometimes data corruption with xlsx import ( with scenar...

[Kohei Yoshida (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1338

Approvals:
  Kohei Yoshida: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Noel Power 
Gerrit-Reviewer: Kohei Yoshida 

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

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

[Libreoffice Gerrit user]

 sc/source/filter/oox/workbookhelper.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f81cae7a1e9d85ad3e17ced53bac40bfd1690a16
Author: Noel Power 
Date:   Thu Dec 13 16:52:50 2012 +

fix sometimes data corruption with xlsx import ( with scenario sheets )

formula import is buffered 'till the end of import. The processing of the
formula data need to happen before the scenario import happens. This is
necessary because sheet numbers stored in the formula addresses can become
invalid as scenario import insertes new hidden sheets upsetting the previous
table order

Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc
Reviewed-on: https://gerrit.libreoffice.org/1338
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/filter/oox/workbookhelper.cxx 
b/sc/source/filter/oox/workbookhelper.cxx
index 071b9a6..dce942c 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -591,11 +591,6 @@ void WorkbookGlobals::finalize()
 // #i79826# enable updating automatic row height after loading the 
document
 aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
 
-getFormulaBuffer().finalizeImport();
-
-// hack, setting it true the second time will delete the cache
-aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
-
 // Insert all pivot tables. Must be done after loading all sheets and
 // formulas, because data pilots expect existing source data on
 // creation.
@@ -667,6 +662,8 @@ void WorkbookHelper::finalizeWorkbookImport()
 mrBookGlob.getWorkbookSettings().finalizeImport();
 mrBookGlob.getViewSettings().finalizeImport();
 
+// need to import formulas before scenarios
+mrBookGlob.getFormulaBuffer().finalizeImport();
 /*  Insert scenarios after all sheet processing is done, because new hidden
 sheets are created for scenarios which would confuse code that relies
 on certain sheet indexes. Must be done after pivot tables too. */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Change in core[libreoffice-3-6]: fix fdo#58237 import hyperlinks for shapes in xlsx documents

[Kohei Yoshida (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1337

Approvals:
  Kohei Yoshida: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Noel Power 
Gerrit-Reviewer: Kohei Yoshida 

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

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

[Libreoffice Gerrit user]

 oox/inc/oox/core/relations.hxx|2 ++
 oox/source/core/relations.cxx |6 ++
 oox/source/drawingml/hyperlinkcontext.cxx |5 +
 sc/source/filter/inc/worksheetbuffer.hxx  |4 
 sc/source/filter/oox/drawingfragment.cxx  |   21 -
 sc/source/filter/oox/worksheetbuffer.cxx  |   19 +++
 6 files changed, 56 insertions(+), 1 deletion(-)

New commits:
commit 9f576bac2267bb143058a343255ab2ad47869847
Author: Noel Power 
Date:   Thu Dec 13 16:26:58 2012 +

fix fdo#58237 import hyperlinks for shapes in xlsx documents

Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f
Reviewed-on: https://gerrit.libreoffice.org/1337
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index e7d558b..67f298e 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -88,6 +88,8 @@ public:
 
 /** Returns the external target of the relation with the passed relation 
identifier. */
 ::rtl::OUString getExternalTargetFromRelId( const ::rtl::OUString& 
rRelId ) const;
+/** Returns the internal target of the relation with the passed relation 
identifier. */
+::rtl::OUString getInternalTargetFromRelId( const ::rtl::OUString& 
rRelId ) const;
 
 /** Returns the full fragment path for the target of the passed relation. 
*/
 ::rtl::OUString getFragmentPathFromRelation( const Relation& rRelation 
) const;
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index ef9510c..ad39489 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -92,6 +92,12 @@ OUString Relations::getExternalTargetFromRelId( const 
OUString& rRelId ) const
 return (pRelation && pRelation->mbExternal) ? pRelation->maTarget : 
OUString();
 }
 
+OUString Relations::getInternalTargetFromRelId( const OUString& rRelId ) const
+{
+const Relation* pRelation = getRelationFromRelId( rRelId );
+return (pRelation && !pRelation->mbExternal) ? pRelation->maTarget : 
OUString();
+}
+
 OUString Relations::getFragmentPathFromRelation( const Relation& rRelation ) 
const
 {
 // no target, no fragment path
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx 
b/oox/source/drawingml/hyperlinkcontext.cxx
index 06958aa..ed03ddd 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -59,6 +59,11 @@ HyperLinkContext::HyperLinkContext( ContextHandler& rParent,
 OSL_TRACE("OOX: URI href %s", ::rtl::OUStringToOString (sHref, 
RTL_TEXTENCODING_UTF8).pData->buffer);
 sURL = getFilter().getAbsoluteUrl( sHref );
 }
+else
+{
+// not sure if we also need to set sHref to the internal target
+sURL = getRelations().getInternalTargetFromRelId( aRelId );
+}
 }
 OUString sTooltip = xAttributes->getOptionalValue( R_TOKEN( tooltip ) );
 if ( !sTooltip.isEmpty() )
diff --git a/sc/source/filter/inc/worksheetbuffer.hxx 
b/sc/source/filter/inc/worksheetbuffer.hxx
index e527a72..3402518 100644
--- a/sc/source/filter/inc/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -90,6 +90,10 @@ public:
 sal_Int16   getCalcSheetIndex( const ::rtl::OUString& 
rWorksheetName ) const;
 /** Returns the finalized name of the sheet with the passed worksheet 
name. */
 ::rtl::OUString getCalcSheetName( const ::rtl::OUString& 
rWorksheetName ) const;
+/** Converts sSheetNameRef (e.g. '#SheetName!A1' to '#SheetName.A1' )
+if sSheetNameRef doesn't start with '#' it is ignored and not modified
+*/
+voidconvertSheetNameRef( ::rtl::OUString& sSheetNameRef ) 
const;
 
 private:
 struct SheetInfo : public SheetInfoModel
diff --git a/sc/source/filter/oox/drawingfragment.cxx 
b/sc/source/filter/oox/drawingfragment.cxx
index 73e6b47..6e8dc5e 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -35,6 +35,9 @@
 #include 
 #include 
 #include 
+#include 
+#include "drwlayer.hxx"
+#include "userdat.hxx"
 #include "oox/drawingml/connectorshapecontext.hxx"
 #include "oox/drawingml/graphicshapecontext.hxx"
 #include "oox/helper/attributelist.hxx"
@@ -45,7 +48,7 @@
 #include "stylesbuffer.hxx"
 #include "themebuffer.hxx"
 #include "unitconverter.hxx"
-
+#include "worksheetbuffer.hxx"
 namespace oox {
 namespace xls {
 
@@ -66,6 +69,10 @@ using namespace ::oox::core;
 using namespace ::oox::drawingml;
 using namespace ::oox::ole;
 
+using ::com::sun::star::awt::Size;
+using ::com::sun::star::awt::Point;
+using ::com::sun::star::awt::Rectangle;
+using ::com::sun::star::awt::XControlModel;
 using ::rtl::OStringBuffer;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
@@ -110,12 +117,24 @@ Shape::Shape( const WorksheetHelper& rHelper, const 
AttributeList& rAttribs, con

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

[Libreoffice Gerrit user]

 sc/source/core/data/attarray.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 315b9b4a5c53eed5fd283bc329e05d7d8fbc9ebc
Author: Markus Mohrhard 
Date:   Tue Dec 18 02:28:24 2012 +0100

we need to use a copy of the original ScPatternAttr, fdo#58338

Change-Id: Ic231347cb864bff073d46ddef06f65b7517c45c3

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 31e4b2f..201538d 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -279,9 +279,10 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 nInd
 {
 const ScPatternAttr* pPattern = GetPattern(nTempStartRow);
 
-ScPatternAttr aPattern( pDocument->GetPool() );
+boost::scoped_ptr pNewPattern;
 if(pPattern)
 {
+pNewPattern.reset( new ScPatternAttr(*pPattern) );
 SCROW nPatternStartRow;
 SCROW nPatternEndRow;
 GetPatternRange( nPatternStartRow, nPatternEndRow, nTempStartRow );
@@ -296,17 +297,18 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 nInd
 
 ScCondFormatItem aItem;
 aItem.SetCondFormatData( aCondFormatData );
-aPattern.GetItemSet().Put( aItem );
+pNewPattern->GetItemSet().Put( aItem );
 }
 else
 {
+pNewPattern.reset( new ScPatternAttr( pDocument->GetPool() ) );
 ScCondFormatItem aItem;
 aItem.AddCondFormatData(nIndex);
-aPattern.GetItemSet().Put( aItem );
+pNewPattern->GetItemSet().Put( aItem );
 nTempEndRow = nEndRow;
 }
 
-SetPatternArea( nTempStartRow, nTempEndRow, &aPattern, true );
+SetPatternArea( nTempStartRow, nTempEndRow, pNewPattern.get(), true );
 nTempStartRow = nTempEndRow + 1;
 }
 while(nTempEndRow < nEndRow);
@@ -328,9 +330,9 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 n
 {
 const ScPatternAttr* pPattern = GetPattern(nTempStartRow);
 
-ScPatternAttr aPattern( pDocument->GetPool() );
 if(pPattern)
 {
+ScPatternAttr aPattern( *pPattern );
 SCROW nPatternStartRow;
 SCROW nPatternEndRow;
 GetPatternRange( nPatternStartRow, nPatternEndRow, nTempStartRow );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/attarray.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 8a028afd55decfd269268d0d1e6adcfbdc9d85d0
Author: Markus Mohrhard 
Date:   Tue Dec 18 02:28:24 2012 +0100

we need to use a copy of the original ScPatternAttr, fdo#58338

Change-Id: Ic231347cb864bff073d46ddef06f65b7517c45c3

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 31e4b2f..201538d 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -279,9 +279,10 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 nInd
 {
 const ScPatternAttr* pPattern = GetPattern(nTempStartRow);
 
-ScPatternAttr aPattern( pDocument->GetPool() );
+boost::scoped_ptr pNewPattern;
 if(pPattern)
 {
+pNewPattern.reset( new ScPatternAttr(*pPattern) );
 SCROW nPatternStartRow;
 SCROW nPatternEndRow;
 GetPatternRange( nPatternStartRow, nPatternEndRow, nTempStartRow );
@@ -296,17 +297,18 @@ void ScAttrArray::AddCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 nInd
 
 ScCondFormatItem aItem;
 aItem.SetCondFormatData( aCondFormatData );
-aPattern.GetItemSet().Put( aItem );
+pNewPattern->GetItemSet().Put( aItem );
 }
 else
 {
+pNewPattern.reset( new ScPatternAttr( pDocument->GetPool() ) );
 ScCondFormatItem aItem;
 aItem.AddCondFormatData(nIndex);
-aPattern.GetItemSet().Put( aItem );
+pNewPattern->GetItemSet().Put( aItem );
 nTempEndRow = nEndRow;
 }
 
-SetPatternArea( nTempStartRow, nTempEndRow, &aPattern, true );
+SetPatternArea( nTempStartRow, nTempEndRow, pNewPattern.get(), true );
 nTempStartRow = nTempEndRow + 1;
 }
 while(nTempEndRow < nEndRow);
@@ -328,9 +330,9 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW 
nEndRow, sal_uInt32 n
 {
 const ScPatternAttr* pPattern = GetPattern(nTempStartRow);
 
-ScPatternAttr aPattern( pDocument->GetPool() );
 if(pPattern)
 {
+ScPatternAttr aPattern( *pPattern );
 SCROW nPatternStartRow;
 SCROW nPatternEndRow;
 GetPatternRange( nPatternStartRow, nPatternEndRow, nTempStartRow );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/qa

[Libreoffice Gerrit user]

 sc/qa/unit/data/contentCSV/new_cond_format_test.csv |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6859c0230444e57dc8526e398c4c3c6f5bb218cc
Author: Markus Mohrhard 
Date:   Tue Dec 18 00:43:38 2012 +0100

fix the test for cond format export

Change-Id: I01e0b3e76e39bf26d2398745bf706cfa60d5621f

diff --git a/sc/qa/unit/data/contentCSV/new_cond_format_test.csv 
b/sc/qa/unit/data/contentCSV/new_cond_format_test.csv
index 156f2a0..37893fc 100644
--- a/sc/qa/unit/data/contentCSV/new_cond_format_test.csv
+++ b/sc/qa/unit/data/contentCSV/new_cond_format_test.csv
@@ -1,8 +1,8 @@
 ,top n elements,,bottom n elements,,top n percent,,bottom n percent,,above 
average,,below average,,above equal average,,below equal average
 ,1,,1.00,,1,,1.00,,1,,1.00,,2,,2.00
 ,2,,2.00,,2,,2.00,,2,,2.00,,3,,3.00
-,3,,3.00,,3,,3.00,,3,,3.00,,4,,4.00
-,4,,4.00,,4,,4,,4,,4.00,,5,,5.00
+,3,,3.00,,3,,3,,3,,3.00,,4,,4.00
+,4,,4,,4,,4,,4,,4.00,,5,,5.00
 ,5,,5,,5,,5,,5,,5.00,,6,,6.00
 ,6,,6,,6,,6,,6,,6.00,,7,,7.00
 ,7,,7,,7,,7,,7,,7.00,,11.00,,11
@@ -11,12 +11,12 @@
 ,12,,12,,12,,12,,12.00,,12,,12.00,,12
 ,13,,13,,13,,13,,13.00,,13,,13.00,,13
 ,14,,14,,14,,14,,14.00,,14,,14.00,,14
-,15.00,,15,,15,,15,,15.00,,15,,15.00,,15
+,15,,15,,15,,15,,15.00,,15,,15.00,,15
 ,16.00,,16,,16,,16,,16.00,,16,,16.00,,16
 ,17.00,,17,,17,,17,,17.00,,17,,17.00,,17
-,18.00,,18,,18.00,,18,,18.00,,18,,18.00,,18
+,18.00,,18,,18,,18,,18.00,,18,,18.00,,18
 ,19.00,,19,,19.00,,19,,19.00,,19,,19.00,,19
 ,20.00,,20,,20.00,,20,,20.00,,20,,20.00,,20
 ,1,,1.00,,1,,1.00,,1,,1.00,,2,,2.00
 ,2,,2.00,,2,,2.00,,2,,2.00,,2,,2.00
-,3,,3.00,,3,,3.00,,3,,3.00,,3,,3.00
+,3,,3.00,,3,,3,,3,,3.00,,3,,3.00
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/unit/data/contentCSV/new_cond_format_test.csv |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f5bf097d6afe500ace599e90b3bdfcf2a0eb965d
Author: Markus Mohrhard 
Date:   Tue Dec 18 00:43:38 2012 +0100

fix the test for cond format export

Change-Id: I01e0b3e76e39bf26d2398745bf706cfa60d5621f

diff --git a/sc/qa/unit/data/contentCSV/new_cond_format_test.csv 
b/sc/qa/unit/data/contentCSV/new_cond_format_test.csv
index 156f2a0..37893fc 100644
--- a/sc/qa/unit/data/contentCSV/new_cond_format_test.csv
+++ b/sc/qa/unit/data/contentCSV/new_cond_format_test.csv
@@ -1,8 +1,8 @@
 ,top n elements,,bottom n elements,,top n percent,,bottom n percent,,above 
average,,below average,,above equal average,,below equal average
 ,1,,1.00,,1,,1.00,,1,,1.00,,2,,2.00
 ,2,,2.00,,2,,2.00,,2,,2.00,,3,,3.00
-,3,,3.00,,3,,3.00,,3,,3.00,,4,,4.00
-,4,,4.00,,4,,4,,4,,4.00,,5,,5.00
+,3,,3.00,,3,,3,,3,,3.00,,4,,4.00
+,4,,4,,4,,4,,4,,4.00,,5,,5.00
 ,5,,5,,5,,5,,5,,5.00,,6,,6.00
 ,6,,6,,6,,6,,6,,6.00,,7,,7.00
 ,7,,7,,7,,7,,7,,7.00,,11.00,,11
@@ -11,12 +11,12 @@
 ,12,,12,,12,,12,,12.00,,12,,12.00,,12
 ,13,,13,,13,,13,,13.00,,13,,13.00,,13
 ,14,,14,,14,,14,,14.00,,14,,14.00,,14
-,15.00,,15,,15,,15,,15.00,,15,,15.00,,15
+,15,,15,,15,,15,,15.00,,15,,15.00,,15
 ,16.00,,16,,16,,16,,16.00,,16,,16.00,,16
 ,17.00,,17,,17,,17,,17.00,,17,,17.00,,17
-,18.00,,18,,18.00,,18,,18.00,,18,,18.00,,18
+,18.00,,18,,18,,18,,18.00,,18,,18.00,,18
 ,19.00,,19,,19.00,,19,,19.00,,19,,19.00,,19
 ,20.00,,20,,20.00,,20,,20.00,,20,,20.00,,20
 ,1,,1.00,,1,,1.00,,1,,1.00,,2,,2.00
 ,2,,2.00,,2,,2.00,,2,,2.00,,2,,2.00
-,3,,3.00,,3,,3.00,,3,,3.00,,3,,3.00
+,3,,3.00,,3,,3,,3,,3.00,,3,,3.00
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/inc

[Libreoffice Gerrit user]

 oox/inc/oox/vml/vmltextbox.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aea98fa5e3dacd34575b17eeb46692491e35116a
Author: Luboš Luňák 
Date:   Tue Dec 18 00:25:31 2012 +0100

class vs struct mismatch

Apparently this was enough to cause a linking error with 
oox::vml::TextBox::TextBox
on Windows.

diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 3f40136..93b06b5 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -42,7 +42,7 @@ namespace com { namespace sun { namespace star {
 namespace oox {
 namespace vml {
 
-class ShapeTypeModel;
+struct ShapeTypeModel;
 
 // 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/inc

[Libreoffice Gerrit user]

 oox/inc/oox/vml/vmltextbox.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d35fa4161f83c84408c192c642978fe1aa528752
Author: Luboš Luňák 
Date:   Tue Dec 18 00:25:31 2012 +0100

class vs struct mismatch

Apparently this was enough to cause a linking error with 
oox::vml::TextBox::TextBox
on Windows.

diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index 4981443..1dc30ab 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
 namespace oox {
 namespace vml {
 
-class ShapeTypeModel;
+struct ShapeTypeModel;
 
 // 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/conditio.cxx   |   36 +++--
 sc/source/ui/condformat/condformatdlgentry.cxx |4 ++
 sc/source/ui/condformat/condformathelper.cxx   |4 ++
 sc/source/ui/inc/condformatdlg.hxx |2 -
 4 files changed, 32 insertions(+), 14 deletions(-)

New commits:
commit 313575bd0d307ab37b0f3ab0d2c47330d546eaa1
Author: Markus Mohrhard 
Date:   Mon Dec 17 23:53:38 2012 +0100

first check that the number of cells has not been reached yet, fdo#58346

Change-Id: I0fea5719f524584acdbbc560c47b3c427c174845

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index e4d3d75..935ff48 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -865,10 +865,10 @@ bool ScConditionEntry::IsTopNElement( double nArg ) const
 for(ScConditionEntryCache::ValueCacheType::const_reverse_iterator itr = 
mpCache->maValues.rbegin(),
 itrEnd = mpCache->maValues.rend(); itr != itrEnd; ++itr)
 {
-if(itr->first <= nArg)
-return true;
 if(nCells >= nVal1)
 return false;
+if(itr->first <= nArg)
+return true;
 nCells += itr->second;
 }
 
@@ -886,10 +886,10 @@ bool ScConditionEntry::IsBottomNElement( double nArg ) 
const
 for(ScConditionEntryCache::ValueCacheType::const_iterator itr = 
mpCache->maValues.begin(),
 itrEnd = mpCache->maValues.end(); itr != itrEnd; ++itr)
 {
-if(itr->first >= nArg)
-return true;
 if(nCells >= nVal1)
 return false;
+if(itr->first >= nArg)
+return true;
 nCells += itr->second;
 }
 
@@ -905,10 +905,10 @@ bool ScConditionEntry::IsTopNPercent( double nArg ) const
 for(ScConditionEntryCache::ValueCacheType::const_reverse_iterator itr = 
mpCache->maValues.rbegin(),
 itrEnd = mpCache->maValues.rend(); itr != itrEnd; ++itr)
 {
-if(itr->first <= nArg)
-return true;
 if(nCells >= nLimitCells)
 return false;
+if(itr->first <= nArg)
+return true;
 nCells += itr->second;
 }
 
@@ -924,10 +924,10 @@ bool ScConditionEntry::IsBottomNPercent( double nArg ) 
const
 for(ScConditionEntryCache::ValueCacheType::const_iterator itr = 
mpCache->maValues.begin(),
 itrEnd = mpCache->maValues.end(); itr != itrEnd; ++itr)
 {
-if(itr->first >= nArg)
-return true;
 if(nCells >= nLimitCells)
 return false;
+if(itr->first >= nArg)
+return true;
 nCells += itr->second;
 }
 
commit 4d46369f128393441ca87945cb419fe1350d1feb
Author: Markus Mohrhard 
Date:   Mon Dec 17 22:58:26 2012 +0100

UI does not update correctly for icon sets, fdo#58308

Change-Id: Iceeab1ea3624fbefa8cb626899262e857b445ac1

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 36b8ddb..3fc1612 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1354,9 +1354,13 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 Point aPos = maEntries[0].GetPosPixel();
 aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
 maEntries[i].SetPosPixel( aPos );
+maEntries[i].Show();
 }
 maEntries.back().SetLastEntry();
 
+SetHeight();
+static_cast(GetParent())->RecalcAll();
+
 return 0;
 }
 
diff --git a/sc/source/ui/inc/condformatdlg.hxx 
b/sc/source/ui/inc/condformatdlg.hxx
index 588d04d..68651ff 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -78,7 +78,6 @@ private:
 ScAddress maPos;
 ScRangeList maRanges;
 
-void RecalcAll();
 void DoScroll(long nDiff);
 
 public:
@@ -86,6 +85,7 @@ public:
 const ScRangeList& rRanges, const ScAddress& rPos, 
condformat::dialog::ScCondFormatDialogType eType);
 
 ScConditionalFormat* GetConditionalFormat() const;
+void RecalcAll();
 
 DECL_LINK( AddBtnHdl, void* );
 DECL_LINK( RemoveBtnHdl, void* );
commit f2dac67df505f51e6341d29cd185f25323c75251
Author: Markus Mohrhard 
Date:   Mon Dec 17 22:57:35 2012 +0100

workaround FORMULA is not part of the condition is in the UI

Change-Id: I6c51ecfbddeeaed3f8747cde90996f7e236a0afd

diff --git a/sc/source/ui/condformat/condformathelper.cxx 
b/sc/source/ui/condformat/condformathelper.cxx
index 67a175d..b594910 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -153,6 +153,10 @@ rtl::OUString ScCondFormatHelper::GetExpression( 
ScCondFormatEntryType eType, sa
 aBuffer.append(rtl::OUString(" "));
 if(eType == CONDITION)
 {
+// workaround missing FORMULA option in the conditions case
+// FORMULA is handled later
+if(nIndex > 9)
+++nIndex;

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

[Libreoffice Gerrit user]

 unotools/source/misc/fontcvt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 62ba857cfcf6550cad81fc93a1e5e5e6b57dbcae
Author: Michael Meeks 
Date:   Mon Dec 17 20:19:47 2012 +

32bit compile fix for OString::valueOf usage.

Signed-off-by: Luboš Luňák 

diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 3d5d30d..96212c0 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1285,8 +1285,8 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) 
const
 {
 cRetVal = 0xE12C;
 SAL_WARN( "unotools", "Forcing a bullet substition from 
0x" <<
-OString::valueOf(cChar, 16) << " to 0x" <<
-OString::valueOf(cRetVal, 16));
+OString::valueOf((sal_Int32)cChar, 16) << " to 0x" <<
+OString::valueOf((sal_Int32)cRetVal, 16));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 src/msocrypto.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8ada71b0a79ff223d3ccb09ed752709e844922d1
Author: Kohei Yoshida 
Date:   Mon Dec 17 18:00:26 2012 -0500

Print the whole xml content (plus the trailing garbage bytes).

Right now we don't have a reliable way of discarding the trailing
garbage bytes.

diff --git a/src/msocrypto.py b/src/msocrypto.py
index c264d54..09989c2 100644
--- a/src/msocrypto.py
+++ b/src/msocrypto.py
@@ -72,4 +72,5 @@ class EncryptionInfo(object):
 self.outputInt("header stream size", self.size)
 
 def outputAgile (self):
-pass
+bytes = self.strm.readRemainingBytes()
+print (bytes)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/conditio.cxx   |   36 +++--
 sc/source/ui/condformat/condformatdlgentry.cxx |4 ++
 sc/source/ui/condformat/condformathelper.cxx   |4 ++
 sc/source/ui/inc/condformatdlg.hxx |2 -
 tools/inc/tools/date.hxx   |2 -
 tools/source/datetime/tdate.cxx|2 -
 6 files changed, 32 insertions(+), 18 deletions(-)

New commits:
commit f3df19b23d80a23e8f42cf766499b1a23ecfe923
Author: Markus Mohrhard 
Date:   Mon Dec 17 23:53:38 2012 +0100

first check that the number of cells has not been reached yet, fdo#58346

Change-Id: I0fea5719f524584acdbbc560c47b3c427c174845

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 2b4fa0c..2b58f33 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -865,10 +865,10 @@ bool ScConditionEntry::IsTopNElement( double nArg ) const
 for(ScConditionEntryCache::ValueCacheType::const_reverse_iterator itr = 
mpCache->maValues.rbegin(),
 itrEnd = mpCache->maValues.rend(); itr != itrEnd; ++itr)
 {
-if(itr->first <= nArg)
-return true;
 if(nCells >= nVal1)
 return false;
+if(itr->first <= nArg)
+return true;
 nCells += itr->second;
 }
 
@@ -886,10 +886,10 @@ bool ScConditionEntry::IsBottomNElement( double nArg ) 
const
 for(ScConditionEntryCache::ValueCacheType::const_iterator itr = 
mpCache->maValues.begin(),
 itrEnd = mpCache->maValues.end(); itr != itrEnd; ++itr)
 {
-if(itr->first >= nArg)
-return true;
 if(nCells >= nVal1)
 return false;
+if(itr->first >= nArg)
+return true;
 nCells += itr->second;
 }
 
@@ -905,10 +905,10 @@ bool ScConditionEntry::IsTopNPercent( double nArg ) const
 for(ScConditionEntryCache::ValueCacheType::const_reverse_iterator itr = 
mpCache->maValues.rbegin(),
 itrEnd = mpCache->maValues.rend(); itr != itrEnd; ++itr)
 {
-if(itr->first <= nArg)
-return true;
 if(nCells >= nLimitCells)
 return false;
+if(itr->first <= nArg)
+return true;
 nCells += itr->second;
 }
 
@@ -924,10 +924,10 @@ bool ScConditionEntry::IsBottomNPercent( double nArg ) 
const
 for(ScConditionEntryCache::ValueCacheType::const_iterator itr = 
mpCache->maValues.begin(),
 itrEnd = mpCache->maValues.end(); itr != itrEnd; ++itr)
 {
-if(itr->first >= nArg)
-return true;
 if(nCells >= nLimitCells)
 return false;
+if(itr->first >= nArg)
+return true;
 nCells += itr->second;
 }
 
commit 92a8be9fb4877d43e099c99d067bd3f06397d212
Author: Markus Mohrhard 
Date:   Mon Dec 17 22:58:26 2012 +0100

UI does not update correctly for icon sets, fdo#58308

Change-Id: Iceeab1ea3624fbefa8cb626899262e857b445ac1

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 36b8ddb..3fc1612 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1354,9 +1354,13 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl )
 Point aPos = maEntries[0].GetPosPixel();
 aPos.Y() += maEntries[0].GetSizePixel().Height() * i * 1.2;
 maEntries[i].SetPosPixel( aPos );
+maEntries[i].Show();
 }
 maEntries.back().SetLastEntry();
 
+SetHeight();
+static_cast(GetParent())->RecalcAll();
+
 return 0;
 }
 
diff --git a/sc/source/ui/inc/condformatdlg.hxx 
b/sc/source/ui/inc/condformatdlg.hxx
index 5541c49..262a976 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -78,7 +78,6 @@ private:
 ScAddress maPos;
 ScRangeList maRanges;
 
-void RecalcAll();
 void DoScroll(long nDiff);
 
 public:
@@ -86,6 +85,7 @@ public:
 const ScRangeList& rRanges, const ScAddress& rPos, 
condformat::dialog::ScCondFormatDialogType eType);
 
 ScConditionalFormat* GetConditionalFormat() const;
+void RecalcAll();
 
 DECL_LINK( AddBtnHdl, void* );
 DECL_LINK( RemoveBtnHdl, void* );
commit 2f0bc524daf8ed27a8f9fbb2cdb31460d5be077d
Author: Markus Mohrhard 
Date:   Mon Dec 17 22:57:35 2012 +0100

workaround FORMULA is not part of the condition is in the UI

Change-Id: I6c51ecfbddeeaed3f8747cde90996f7e236a0afd

diff --git a/sc/source/ui/condformat/condformathelper.cxx 
b/sc/source/ui/condformat/condformathelper.cxx
index 67a175d..b594910 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -153,6 +153,10 @@ rtl::OUString ScCondFormatHelper::GetExpression( 
ScCondFormatEntryType eType, sa
 aBuffer.append(rtl::OUString(" "));
 if(eType == CONDITION)
 {
+// workaround missing FORMULA 

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

[Libreoffice Gerrit user]

 svtools/source/graphic/grfmgr2.cxx |   14 --
 sw/source/filter/html/htmlfly.cxx  |3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 5e5282f4f6048449e7f8a9721775e5b7f9b56332
Author: Michael Stahl 
Date:   Mon Dec 17 17:44:22 2012 +0100

fdo#58286: sw HTML export: fix missing end tags on FrmFmts

SwHTMLWriter::OutFrmFmtOptions must return a value that includes the
parameter rEndTags.

(regression from 3852a6f54880af8ed9161227baa80c7d4517)

Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec
(cherry picked from commit a923084f872b8ce13f6213827fe5b1c711e6b15f)

diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index cdf6292..f9761aa 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -534,7 +534,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt 
&rFrmFmt,
  sal_uInt32 nFrmOpts,
  const rtl::OString &rEndTags )
 {
-rtl::OString sRetEndTags;
+rtl::OString sRetEndTags(rEndTags);
 rtl::OStringBuffer sOut;
 const SfxPoolItem* pItem;
 const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
@@ -811,6 +811,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt 
&rFrmFmt,
 sRetEndTags = sOut.makeStringAndClear();
 }
 }
+assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286
 return sRetEndTags;
 }
 
commit 5cb9fe63458558951f91ed1aaf6e90472dff9a28
Author: Werner Koerner 
Date:   Thu Dec 13 21:38:02 2012 +0100

fdo#58196 Viewing: Reenable mirroring for scaled-down images

commit I6feb744712956a92d6140d079dc3a85ee8511930 (Stepwise
rebuild bitmap rendering from scratch to avoid rendering bugs)
missed horizontal and vertical flipping for images scaled down
by more than about 60%.

Change-Id: I68241792d2b43edde33f478c998d447debd8fd13
Reviewed-on: https://gerrit.libreoffice.org/1332
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 3d969a60852d505cfa02a6b3410d4461718138ba)

Signed-off-by: Michael Stahl 

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index b992144..4aeccf9 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -436,7 +436,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 }
 }
 }
-else
+else // scaleByAveraging
 {
 double aSumRed, aSumGreen, aSumBlue, aCount;
 BitmapColor aColor;
@@ -452,6 +452,11 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 double aUnrotatedX = ( pCosX[ x ] - nSinY ) / 256.0;
 double aUnrotatedY = ( pSinX[ x ] + nCosY ) / 256.0;
 
+if ( bHMirr )
+aUnrotatedX = aUnrotatedWidth - aUnrotatedX - 1;
+if ( bVMirr )
+aUnrotatedY = aUnrotatedHeight - aUnrotatedY - 1;
+
 if( ( aUnrotatedX >= 0 ) && ( aUnrotatedX < 
aUnrotatedWidth ) &&
 ( aUnrotatedY >= 0 ) && ( aUnrotatedY < 
aUnrotatedHeight ) )
 {
@@ -563,7 +568,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 }
 }
 }
-else
+else // scaleByAveraging
 {
 const BitmapColor   aTrans( 
pWriteAccess->GetBestMatchingColor( Color( COL_WHITE ) ) );
 BitmapColor aResultColor( 0 );
@@ -580,6 +585,11 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 double aUnrotatedX = ( pCosX[ x ] - nSinY 
) / 256.0;
 double aUnrotatedY = ( pSinX[ x ] + nCosY 
) / 256.0;
 
+if ( bHMirr )
+aUnrotatedX = aUnrotatedWidth - 
aUnrotatedX - 1;
+if ( bVMirr )
+aUnrotatedY = aUnrotatedHeight - 
aUnrotatedY - 1;
+
 if( ( aUnrotatedX >= 0 ) && ( aUnrotatedX 
< aUnrotatedWidth ) &&
 ( aUnrotatedY >= 0 ) && ( aUnrotatedY 
< aUnrotatedHeight ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6]: fdo#58286: sw HTML export: fix missing end tags on FrmFmts

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1390

To pull it, you can do:

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

fdo#58286: sw HTML export: fix missing end tags on FrmFmts

SwHTMLWriter::OutFrmFmtOptions must return a value that includes the
parameter rEndTags.

(regression from 3852a6f54880af8ed9161227baa80c7d4517)

Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec
(cherry picked from commit a923084f872b8ce13f6213827fe5b1c711e6b15f)
---
M sw/source/filter/html/htmlfly.cxx
1 file changed, 2 insertions(+), 1 deletion(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Michael Stahl 

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

[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

 sw/source/filter/html/htmlfly.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a923084f872b8ce13f6213827fe5b1c711e6b15f
Author: Michael Stahl 
Date:   Mon Dec 17 17:44:22 2012 +0100

fdo#58286: sw HTML export: fix missing end tags on FrmFmts

SwHTMLWriter::OutFrmFmtOptions must return a value that includes the
parameter rEndTags.

(regression from 3852a6f54880af8ed9161227baa80c7d4517)

Change-Id: I280a0de57e254f75b69d08d93e23bf7c765058ec

diff --git a/sw/source/filter/html/htmlfly.cxx 
b/sw/source/filter/html/htmlfly.cxx
index cdf6292..f9761aa 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -534,7 +534,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt 
&rFrmFmt,
  sal_uInt32 nFrmOpts,
  const rtl::OString &rEndTags )
 {
-rtl::OString sRetEndTags;
+rtl::OString sRetEndTags(rEndTags);
 rtl::OStringBuffer sOut;
 const SfxPoolItem* pItem;
 const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet();
@@ -811,6 +811,7 @@ rtl::OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt 
&rFrmFmt,
 sRetEndTags = sOut.makeStringAndClear();
 }
 }
+assert(sRetEndTags.endsWith(rEndTags)); // fdo#58286
 return sRetEndTags;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: src/msocrypto.py xls-dump.py

[Kohei Yoshida]

 src/msocrypto.py |   75 +++
 xls-dump.py  |8 +
 2 files changed, 83 insertions(+)

New commits:
commit 6dcfa7596d5b721b46787cd1d7b0ddb3a1e26105
Author: Kohei Yoshida 
Date:   Mon Dec 17 17:11:12 2012 -0500

Dump EncryptionInfo directory which stores info about encrypted documents.

This is true even for the OOXML-based file formats.

diff --git a/src/msocrypto.py b/src/msocrypto.py
new file mode 100644
index 000..c264d54
--- /dev/null
+++ b/src/msocrypto.py
@@ -0,0 +1,75 @@
+
+#
+# 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/.
+#
+
+
+import globals
+
+class EncryptionInfo(object):
+
+class Type:
+Unknown = -1
+Standard = 0
+Extensible = 1
+Agile = 2
+
+def __init__ (self, bytes):
+self.strm = globals.ByteStream(bytes)
+self.type = EncryptionInfo.Type.Unknown
+self.size = -1
+
+def read (self):
+self.major = self.strm.readUnsignedInt(2)
+self.minor = self.strm.readUnsignedInt(2)
+
+if self.major == 3 or self.major == 4:
+if self.minor == 2:
+self.type = EncryptionInfo.Type.Standard
+elif self.minor == 3:
+self.type = EncryptionInfo.Type.Extensible
+elif self.minor == 4:
+self.type = EncryptionInfo.Type.Agile
+
+flag = self.strm.readUnsignedInt(4)
+self.fCryptoAPI = (flag & 0x0004) != 0 # C
+self.fDocProps  = (flag & 0x0008) != 0 # D (false if document 
properties are encrypted.)
+self.fExternal  = (flag & 0x0010) != 0 # E (extensible encryption 
used)
+self.fAES   = (flag & 0x0020) != 0 # F (ECMA-376 document)
+
+if self.type == EncryptionInfo.Type.Standard or self.type == 
EncryptionInfo.Type.Extensible:
+self.size = self.strm.readUnsignedInt(4)
+
+def outputBoolean (self, name, value):
+if value:
+bs = "true"
+else:
+bs = "false"
+print ("%s: %s"%(name, bs))
+
+def outputInt (self, name, value):
+print ("%s: %d"%(name, value))
+
+def output (self):
+print ("version: %d.%d"%(self.major, self.minor))
+self.outputBoolean("crypto API", self.fCryptoAPI)
+self.outputBoolean("encrypted document properties", not self.fDocProps)
+self.outputBoolean("extensible encryption", self.fExternal)
+self.outputBoolean("ECMA-376 document", self.fAES)
+if self.type == EncryptionInfo.Type.Standard:
+self.outputStandard()
+elif self.type == EncryptionInfo.Type.Extensible:
+self.outputExtensible()
+elif self.type == EncryptionInfo.Type.Agile:
+self.outputAgile()
+
+def outputStandard (self):
+self.outputInt("header stream size", self.size)
+
+def outputExtensible (self):
+self.outputInt("header stream size", self.size)
+
+def outputAgile (self):
+pass
diff --git a/xls-dump.py b/xls-dump.py
index 75e333e..0b7a7f6 100755
--- a/xls-dump.py
+++ b/xls-dump.py
@@ -30,6 +30,7 @@ import sys, os.path, optparse
 sys.path.append(sys.path[0]+"/src")
 import ole, xlsstream, globals, node, xlsmodel, olestream
 import xlsparser
+import msocrypto
 
 from globals import error
 
@@ -143,6 +144,13 @@ class XLDumper(object):
 dirstrm.type = xlsstream.DirType.RevisionLog
 self.__readSubStream(dirstrm)
 
+elif dirname == "EncryptionInfo":
+globals.dumpBytes(dirstrm.bytes, 512)
+print("-"*globals.OutputWidth)
+info = msocrypto.EncryptionInfo(dirstrm.bytes)
+info.read()
+info.output()
+
 elif self.strmData.isPivotCacheStream(dirname):
 dirstrm.type = xlsstream.DirType.PivotTableCache
 self.__readSubStream(dirstrm)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Calc sort - missing sort area information

[Markus Mohrhard]

Hello Hannu,

2012/12/17 Hannu Puhakka :
> Hi
> LibreOffice 3.5.4.2
> Build ID: 350m1(Build:2)
>
> Menu: Data / Sort
> Opens a dialog where you can select sorting order and options.
>
> Problem: User cannot check what is the real area to be sorted.
> Should be a field at least to show the area "A1..C33" or to change it by
> cells.
>
> If the area is big there you need to check if the sorting will influence the
> right area.

This is the developer list for discussion of code, patches and other
development related topics.

Please open a bug report for your problem. If you want to work on
fixing it I can give you some code pointers.

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

[PUSHED] fdo#58196 Viewing: Reenable mirroring for scaled-down images

[Michael Stahl (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1332

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68241792d2b43edde33f478c998d447debd8fd13
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Werner Körner 
Gerrit-Reviewer: Michael Stahl 
Gerrit-Reviewer: Tomaž Vajngerl 

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

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks  changed:

   What|Removed |Added

 Depends on|51300   |

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

[Libreoffice Gerrit user]

 svtools/source/graphic/grfmgr2.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 3d969a60852d505cfa02a6b3410d4461718138ba
Author: Werner Koerner 
Date:   Thu Dec 13 21:38:02 2012 +0100

fdo#58196 Viewing: Reenable mirroring for scaled-down images

commit I6feb744712956a92d6140d079dc3a85ee8511930 (Stepwise
rebuild bitmap rendering from scratch to avoid rendering bugs)
missed horizontal and vertical flipping for images scaled down
by more than about 60%.

Change-Id: I68241792d2b43edde33f478c998d447debd8fd13
Reviewed-on: https://gerrit.libreoffice.org/1332
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index b992144..4aeccf9 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -436,7 +436,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 }
 }
 }
-else
+else // scaleByAveraging
 {
 double aSumRed, aSumGreen, aSumBlue, aCount;
 BitmapColor aColor;
@@ -452,6 +452,11 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 double aUnrotatedX = ( pCosX[ x ] - nSinY ) / 256.0;
 double aUnrotatedY = ( pSinX[ x ] + nCosY ) / 256.0;
 
+if ( bHMirr )
+aUnrotatedX = aUnrotatedWidth - aUnrotatedX - 1;
+if ( bVMirr )
+aUnrotatedY = aUnrotatedHeight - aUnrotatedY - 1;
+
 if( ( aUnrotatedX >= 0 ) && ( aUnrotatedX < 
aUnrotatedWidth ) &&
 ( aUnrotatedY >= 0 ) && ( aUnrotatedY < 
aUnrotatedHeight ) )
 {
@@ -563,7 +568,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 }
 }
 }
-else
+else // scaleByAveraging
 {
 const BitmapColor   aTrans( 
pWriteAccess->GetBestMatchingColor( Color( COL_WHITE ) ) );
 BitmapColor aResultColor( 0 );
@@ -580,6 +585,11 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, 
const GraphicAttr& rAt
 double aUnrotatedX = ( pCosX[ x ] - nSinY 
) / 256.0;
 double aUnrotatedY = ( pSinX[ x ] + nCosY 
) / 256.0;
 
+if ( bHMirr )
+aUnrotatedX = aUnrotatedWidth - 
aUnrotatedX - 1;
+if ( bVMirr )
+aUnrotatedY = aUnrotatedHeight - 
aUnrotatedY - 1;
+
 if( ( aUnrotatedX >= 0 ) && ( aUnrotatedX 
< aUnrotatedWidth ) &&
 ( aUnrotatedY >= 0 ) && ( aUnrotatedY 
< aUnrotatedHeight ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/layout/colfrm.cxx |   46 ---
 1 file changed, 19 insertions(+), 27 deletions(-)

New commits:
commit 335b76de4a75d75790ab74b6fe057619b4d46535
Author: Yong Lin Ma 
Date:   Sat Jun 16 06:47:30 2012 +

118878: Writer crash after column number and width of frame are modified

Patch by: Lin Yuan
Review by: mayongl
Reported by: Ji Yan

diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 654657a..f8522c1 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -349,7 +349,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
 long nGutter = 0;
 
-for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i )
+for ( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; ++i ) //i118878, 
value returned by GetNumCols() can't be trusted
 {
 if( !bOrtho )
 {
@@ -426,7 +426,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 {
 long nInnerWidth = ( nAvail - nGutter ) / pAttr->GetNumCols();
 pCol = Lower();
-for( sal_uInt16 i = 0; i < pAttr->GetNumCols(); pCol = 
pCol->GetNext(), ++i )
+for( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; pCol = 
pCol->GetNext(), ++i ) //i118878, value returned by GetNumCols() can't be 
trusted
 {
 SwTwips nWidth;
 if ( i == pAttr->GetNumCols() - 1 )
commit 70ba2b40541adcea848ad40b19674d62e9cbbc37
Author: Michael Meeks 
Date:   Mon Dec 17 21:14:21 2012 +

fdo#53525 - Revert "writer:crash(i118878) when adding

columns and chang. properties in a frame"

This reverts commit de1c42d9f552bc57b28d50f4313bc982c63b84d4.

diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index a47258b..654657a 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -340,26 +340,20 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 const sal_Bool bLine = pAttr->GetLineAdj() != COLADJ_NONE;
 const sal_uInt16 nMin = bLine ? sal_uInt16( 20 + ( pAttr->GetLineWidth() / 
2) ) : 0;
 
+const sal_Bool bR2L = IsRightToLeft();
+SwFrm *pCol = bR2L ? GetLastLower() : Lower();
+
 // #i27399#
 // bOrtho means we have to adjust the column frames manually. Otherwise
 // we may use the values returned by CalcColWidth:
 const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
 long nGutter = 0;
-sal_uInt16 real_nb_col = 0;
-
-SwFrm* pColHead = Lower();;
-SwFrm* pColTail;
-for ( pColTail = pColHead; pColTail; pColTail = pColTail->GetNext(), 
real_nb_col += 1 );
-
-sal_uInt16 i = IsRightToLeft() ? real_nb_col : 0;
 
-for ( SwFrm* pColCursor = IsRightToLeft() ? pColTail : pColHead;
-  pColCursor;
-  (pColCursor = IsRightToLeft() ? pColCursor->GetPrev() : 
pColCursor->GetNext()), (i += IsRightToLeft() ? -1 : +1) )
+for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i )
 {
 if( !bOrtho )
 {
-const SwTwips nWidth = (pColCursor == (IsRightToLeft() ? pColTail 
: pColHead) ) ?
+const SwTwips nWidth = i == (pAttr->GetNumCols() - 1) ?
nAvail :
pAttr->CalcColWidth( i, sal_uInt16( 
(Prt().*fnRect->fnGetWidth)() ) );
 
@@ -367,14 +361,14 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 Size( Prt().Width(), nWidth ) :
 Size( nWidth, Prt().Height() );
 
-pColCursor->ChgSize( aColSz );
+pCol->ChgSize( aColSz );
 
 // With this, the ColumnBodyFrms from page columns gets adjusted 
and
 // their bFixHeight flag is set so they won't shrink/grow.
 // Don't use the flag with frame columns because BodyFrms in frame
 // columns can grow/shrink.
 if( IsBodyFrm() )
-((SwLayoutFrm*)pColCursor)->Lower()->ChgSize( aColSz );
+((SwLayoutFrm*)pCol)->Lower()->ChgSize( aColSz );
 
 nAvail -= nWidth;
 }
@@ -382,7 +376,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 if ( bOrtho || bAdjustAttributes )
 {
 const SwColumn *pC = &pAttr->GetColumns()[i];
-const SwAttrSet* pSet = pColCursor->GetAttrSet();
+const SwAttrSet* pSet = pCol->GetAttrSet();
 SvxLRSpaceItem aLR( pSet->GetLRSpace() );
 
 //In order to have enough space for the separation lines, we have 
to
@@ -418,44 +412,42 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 aUL.SetUpper( pC->GetUpper());
 aUL.S

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 53525, which changed state.

Bug 53525 Summary: FILEOPEN existing document: 2 columns Table of contents 
exceeds page width
https://bugs.freedesktop.org/show_bug.cgi?id=53525

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Libreoffice Gerrit user]

 sw/source/core/layout/colfrm.cxx |   46 ---
 1 file changed, 19 insertions(+), 27 deletions(-)

New commits:
commit 6560cae1b5f81cb753a7216cb22d4e7f9d175cd1
Author: Yong Lin Ma 
Date:   Sat Jun 16 06:47:30 2012 +

118878: Writer crash after column number and width of frame are modified

Patch by: Lin Yuan
Review by: mayongl
Reported by: Ji Yan

diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 654657a..f8522c1 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -349,7 +349,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
 long nGutter = 0;
 
-for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i )
+for ( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; ++i ) //i118878, 
value returned by GetNumCols() can't be trusted
 {
 if( !bOrtho )
 {
@@ -426,7 +426,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 {
 long nInnerWidth = ( nAvail - nGutter ) / pAttr->GetNumCols();
 pCol = Lower();
-for( sal_uInt16 i = 0; i < pAttr->GetNumCols(); pCol = 
pCol->GetNext(), ++i )
+for( sal_uInt16 i = 0; i < pAttr->GetNumCols() && pCol; pCol = 
pCol->GetNext(), ++i ) //i118878, value returned by GetNumCols() can't be 
trusted
 {
 SwTwips nWidth;
 if ( i == pAttr->GetNumCols() - 1 )
commit 092a4385c2616943baccc8ec43ca29c1dcfba9fa
Author: Michael Meeks 
Date:   Mon Dec 17 21:14:21 2012 +

fdo#53525 - Revert "writer:crash(i118878) when adding

columns and chang. properties in a frame"

This reverts commit de1c42d9f552bc57b28d50f4313bc982c63b84d4.

diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index a47258b..654657a 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -340,26 +340,20 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 const sal_Bool bLine = pAttr->GetLineAdj() != COLADJ_NONE;
 const sal_uInt16 nMin = bLine ? sal_uInt16( 20 + ( pAttr->GetLineWidth() / 
2) ) : 0;
 
+const sal_Bool bR2L = IsRightToLeft();
+SwFrm *pCol = bR2L ? GetLastLower() : Lower();
+
 // #i27399#
 // bOrtho means we have to adjust the column frames manually. Otherwise
 // we may use the values returned by CalcColWidth:
 const sal_Bool bOrtho = pAttr->IsOrtho() && pAttr->GetNumCols() > 0;
 long nGutter = 0;
-sal_uInt16 real_nb_col = 0;
-
-SwFrm* pColHead = Lower();;
-SwFrm* pColTail;
-for ( pColTail = pColHead; pColTail; pColTail = pColTail->GetNext(), 
real_nb_col += 1 );
-
-sal_uInt16 i = IsRightToLeft() ? real_nb_col : 0;
 
-for ( SwFrm* pColCursor = IsRightToLeft() ? pColTail : pColHead;
-  pColCursor;
-  (pColCursor = IsRightToLeft() ? pColCursor->GetPrev() : 
pColCursor->GetNext()), (i += IsRightToLeft() ? -1 : +1) )
+for ( sal_uInt16 i = 0; i < pAttr->GetNumCols(); ++i )
 {
 if( !bOrtho )
 {
-const SwTwips nWidth = (pColCursor == (IsRightToLeft() ? pColTail 
: pColHead) ) ?
+const SwTwips nWidth = i == (pAttr->GetNumCols() - 1) ?
nAvail :
pAttr->CalcColWidth( i, sal_uInt16( 
(Prt().*fnRect->fnGetWidth)() ) );
 
@@ -367,14 +361,14 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 Size( Prt().Width(), nWidth ) :
 Size( nWidth, Prt().Height() );
 
-pColCursor->ChgSize( aColSz );
+pCol->ChgSize( aColSz );
 
 // With this, the ColumnBodyFrms from page columns gets adjusted 
and
 // their bFixHeight flag is set so they won't shrink/grow.
 // Don't use the flag with frame columns because BodyFrms in frame
 // columns can grow/shrink.
 if( IsBodyFrm() )
-((SwLayoutFrm*)pColCursor)->Lower()->ChgSize( aColSz );
+((SwLayoutFrm*)pCol)->Lower()->ChgSize( aColSz );
 
 nAvail -= nWidth;
 }
@@ -382,7 +376,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 if ( bOrtho || bAdjustAttributes )
 {
 const SwColumn *pC = &pAttr->GetColumns()[i];
-const SwAttrSet* pSet = pColCursor->GetAttrSet();
+const SwAttrSet* pSet = pCol->GetAttrSet();
 SvxLRSpaceItem aLR( pSet->GetLRSpace() );
 
 //In order to have enough space for the separation lines, we have 
to
@@ -418,44 +412,42 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, 
sal_Bool bAdjustAttribut
 aUL.SetUpper( pC->GetUpper());
 aUL.S

Calc sort - missing sort area information

[Hannu Puhakka]

Hi
LibreOffice 3.5.4.2
Build ID: 350m1(Build:2)

Menu: Data / Sort
Opens a dialog where you can select sorting order and options.

Problem: User cannot check what is the real area to be sorted.
Should be a field at least to show the area "A1..C33" or to change it by 
cells.


If the area is big there you need to check if the sorting will influence 
the right area.


Regards
Hannu

--
Hannu Puhakka, +358 40 59 68 159, hannu.puha...@vetokonsultit.fi
Vetokonsultit Oy,+358 9 2747 400, Kultasepänkatu 4 B, 04250 KERAVA,FINLAND
--___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Rene Engelhard]

On Mon, Dec 17, 2012 at 06:49:55PM +0100, Németh László wrote:
>It seems, the LinguServiceManager used by the optlingu.cxx (Writing Aids)
>doesn't know the bundled English package (I have checked on Windows and
>Linux).

Hrm. Indeed. In Windows the Extension Manager doesn't complain but it doesn't
actually work. (didn't test that on Windows..)

> I will check the python 3.3 port again.

Thanks.

Regards,

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

[Libreoffice-commits] calc/xlsx-import

[Libreoffice Gerrit user]

 calc/xlsx-import/encryption/README |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 653f2a75798e38bf0823bc7f48c741345c98627e
Author: Kohei Yoshida 
Date:   Mon Dec 17 15:46:42 2012 -0500

README about what the password is for these encrypted docs.

diff --git a/calc/xlsx-import/encryption/README 
b/calc/xlsx-import/encryption/README
new file mode 100644
index 000..3b006a5
--- /dev/null
+++ b/calc/xlsx-import/encryption/README
@@ -0,0 +1 @@
+Password for all documents in this directory is 'pass' unless otherwise 
indicated.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] calc/data-pilot

[Libreoffice Gerrit user]

 calc/data-pilot/field-cell-format.xls |binary
 1 file changed

New commits:
commit 6bbdd63e7522297039870af6fba8b8103bc2db21
Author: Kohei Yoshida 
Date:   Fri Dec 14 17:00:14 2012 -0500

Added custom strings to pivot table options.

diff --git a/calc/data-pilot/field-cell-format.xls 
b/calc/data-pilot/field-cell-format.xls
index fedfafb..d9622c0 100644
Binary files a/calc/data-pilot/field-cell-format.xls and 
b/calc/data-pilot/field-cell-format.xls differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] calc/xlsx-import

[Libreoffice Gerrit user]

 calc/xlsx-import/encryption/simple-encryption-2007.xlsx |binary
 calc/xlsx-import/encryption/simple-encryption-2010.xlsx |binary
 2 files changed

New commits:
commit 38c9747ced5792e8ba069d54f13b44da0b0fa1ba
Author: Kohei Yoshida 
Date:   Mon Dec 17 15:33:58 2012 -0500

Two encrypted xlsx files created by Excel 2007 and 2010.

diff --git a/calc/xlsx-import/encryption/simple-encryption-2007.xlsx 
b/calc/xlsx-import/encryption/simple-encryption-2007.xlsx
new file mode 100644
index 000..ee69648
Binary files /dev/null and 
b/calc/xlsx-import/encryption/simple-encryption-2007.xlsx differ
diff --git a/calc/xlsx-import/encryption/simple-encryption-2010.xlsx 
b/calc/xlsx-import/encryption/simple-encryption-2010.xlsx
new file mode 100644
index 000..5f50c32
Binary files /dev/null and 
b/calc/xlsx-import/encryption/simple-encryption-2010.xlsx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: unotools/source

[Libreoffice Gerrit user]

 unotools/source/misc/fontcvt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 439d600138515d10b40a00653f8ac51e5ccfc1e5
Author: Michael Meeks 
Date:   Mon Dec 17 20:19:47 2012 +

32bit compile fix for OString::valueOf usage.

diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 3d5d30d..96212c0 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1285,8 +1285,8 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) 
const
 {
 cRetVal = 0xE12C;
 SAL_WARN( "unotools", "Forcing a bullet substition from 
0x" <<
-OString::valueOf(cChar, 16) << " to 0x" <<
-OString::valueOf(cRetVal, 16));
+OString::valueOf((sal_Int32)cChar, 16) << " to 0x" <<
+OString::valueOf((sal_Int32)cRetVal, 16));
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[RFC] syslog output from SAL_* messages

[Riccardo Magliocchetti]

Hello,

i've refreshed my patch for adding possibility to send SAL_* messages to 
syslog. I have two issues:
- am not able to send the ENABLE_SYSLOG definition down to 
sal/osl/unx/salinit.cxx
- if i add calls to SAL_INFO in vcl/headless/headlessinst.cxx like, i 
see the fprintf but i don't see the SAL_INFO one. Tried with SAL_WARN, 
same result.


diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 7793d85..204500f 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -42,6 +42,8 @@ public:
 HeadlessSalInstance::HeadlessSalInstance( SalYieldMutex *pMutex ) :
 SvpSalInstance( pMutex)
 {
+SAL_INFO("vcl", "ciao\n");
+::fprintf(stdout, "LibreOffice\n");
 }

 HeadlessSalInstance::~HeadlessSalInstance()

Any help appreciated

thanks,
riccardo
>From 5bb7dc21b0a24623c65e959695095e30ba15d390 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti 
Date: Fri, 23 Nov 2012 18:34:17 +0100
Subject: [PATCH] Add ability to send SAL_* messages to syslog

Use environment variable SAL_LOG_SYSLOG=1

Change-Id: I0c260ca69fbeefb0c2e8cc46ca6955e92791c05b
---
 configure.ac|6 +-
 sal/osl/all/log.cxx |   36 +---
 sal/osl/unx/salinit.cxx |   12 
 solenv/gbuild/gbuild.mk |5 +
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 320384c..e06fb01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4273,7 +4273,11 @@ SOURCEVERSION="OOO$UPD"
 AC_SUBST(UPD)
 AC_SUBST(SOURCEVERSION)
 
-
+dnl ===
+dnl Check for syslog header
+dnl ===
+AC_CHECK_HEADER([syslog.h], ENABLE_SYSLOG="TRUE", ENABLE_SYSLOG="")
+AC_SUBST(ENABLE_SYSLOG)
 
 dnl ===
 dnl Set the ENABLE_CRASHDUMP variable.
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 8d4d5f2..b6d8edf 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -56,12 +56,18 @@
 #define OSL_DETAIL_GETPID getpid()
 #endif
 
+#ifdef ENABLE_SYSLOG
+#include 
+#endif
+
 // Avoid the use of other sal code in this file as much as possible, so that
 // this code can be called from other sal code without causing endless
 // recursion.
 
 namespace {
 
+bool sal_use_syslog = false;
+
 bool equalStrings(
 char const * string1, std::size_t length1, char const * string2,
 std::size_t length2)
@@ -96,6 +102,22 @@ char const * getEnvironmentVariable() {
 return p2;
 }
 
+#ifdef ENABLE_SYSLOG
+int toSyslogPriority(sal_detail_LogLevel level) {
+switch (level) {
+default:
+assert(false); // this cannot happen
+// fall through
+case SAL_DETAIL_LOG_LEVEL_INFO:
+return LOG_INFO;
+case SAL_DETAIL_LOG_LEVEL_WARN:
+return LOG_WARNING;
+case SAL_DETAIL_LOG_LEVEL_DEBUG:
+return LOG_DEBUG;
+}
+}
+#endif
+
 bool report(sal_detail_LogLevel level, char const * area) {
 if (level == SAL_DETAIL_LOG_LEVEL_DEBUG)
 return true;
@@ -167,14 +189,22 @@ void log(
 char const * message)
 {
 std::ostringstream s;
+if (!sal_use_syslog)
+s << toString(level) << ':';
 if (level == SAL_DETAIL_LOG_LEVEL_DEBUG) {
-s << toString(level) << ':' << /*no where*/' ' << message << '\n';
+s << /*no where*/' ' << message << '\n';
 } else {
-s << toString(level) << ':' << area << ':' << OSL_DETAIL_GETPID << ':'
+s << area << ':' << OSL_DETAIL_GETPID << ':'
 << osl::Thread::getCurrentIdentifier() << ':' << where << message
 << '\n';
 }
-std::fputs(s.str().c_str(), stderr);
+
+#ifdef ENABLE_SYSLOG
+if (sal_use_syslog)
+syslog(toSyslogPriority(level), "%s", s.str().c_str());
+else
+#endif
+std::fputs(s.str().c_str(), stderr);
 }
 
 }
diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index d880258..890589e 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -25,10 +25,16 @@
 #include 
 #endif
 
+#ifdef ENABLE_SYSLOG
+#include 
+#endif
+
 #include "osl/process.h"
 #include "sal/main.h"
 #include "sal/types.h"
 
+extern bool sal_use_syslog;
+
 extern "C" {
 
 void sal_detail_initialize(int argc, char ** argv) {
@@ -57,6 +63,12 @@ void sal_detail_initialize(int argc, char ** argv) {
 close(fd);
 }
 #endif
+#ifdef ENABLE_SYSLOG
+const char *use_syslog = getenv("SAL_LOG_SYSLOG");
+sal_use_syslog = use_syslog != NULL && !strcmp(use_syslog, "1");
+if (sal_use_syslog)
+openlog("libreoffice", 0, LOG_USER);
+#endif
 
 osl_setCommandArgs(argc, argv);
 }
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 9e621cd..99ca578 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -255,6 +255,11 @@ gb_GLOBALDEFS += -DDEBUG \
 endif
 endif
 
+ifeq ($(ENABLE_SYSLOG),TRUE)
+gb_GLOBALDEFS += -DENAB

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

--- Comment #55 from Michael Meeks  ---
bug#56048 has been there forever and a day - it belongs better vs. 3.6 I think.

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

[PUSHED] Revert part of 34e79c19babc0e6cc281025b40635b91dca444f3.

[Michael Meeks (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1389


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I92074e108dc405e1484503cb39c8c46b2cf50ce0
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini 
Gerrit-Reviewer: Arnaud Versini 
Gerrit-Reviewer: Julien Nabet 
Gerrit-Reviewer: Luboš Luňák 
Gerrit-Reviewer: Michael Meeks 

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

[Libreoffice-commits] .: sal/Library_sal.mk

[Libreoffice Gerrit user]

 sal/Library_sal.mk |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e3420747c2883b56375d9f4e9a1ab675450744a0
Author: Arnaud Versini 
Date:   Mon Dec 17 20:58:51 2012 +0100

Revert part of 34e79c19babc0e6cc281025b40635b91dca444f3.

undefined reference to `sal_detail_initialize'

Change-Id: I92074e108dc405e1484503cb39c8c46b2cf50ce0

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index cae8219..acec543 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -180,13 +180,9 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/module \
sal/osl/unx/process \
sal/osl/unx/process_impl \
+$(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
sal/osl/unx/uunxapi \
 ))
-ifeq ($(filter-out DESKTOP,$(BUILD_TYPE)),)
-$(eval $(call gb_Library_add_exception_objects,sal,\
-   sal/osl/unx/salinit \
-))
-endif
 $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/mutex \
sal/osl/unx/nlsupport \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Revert part of 34e79c19babc0e6cc281025b40635b91dca444f3.

[Arnaud Versini (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1389

To pull it, you can do:

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

Revert part of 34e79c19babc0e6cc281025b40635b91dca444f3.

undefined reference to `sal_detail_initialize'

Change-Id: I92074e108dc405e1484503cb39c8c46b2cf50ce0
---
M sal/Library_sal.mk
1 file changed, 1 insertion(+), 5 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I92074e108dc405e1484503cb39c8c46b2cf50ce0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini 

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

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

[Libreoffice Gerrit user]

 svx/inc/svx/svdoashp.hxx   |4 +---
 svx/source/svdraw/svdoashp.cxx |   28 +++-
 2 files changed, 12 insertions(+), 20 deletions(-)

New commits:
commit 51ecd2f55d608f853852335808b643f61b9a844e
Author: Michael Meeks 
Date:   Mon Dec 17 19:55:32 2012 +

fdo#58399 - revert attempts to untangle and accelerate this mess.

Reverts commits:
76350361f386b78e1bc9edb75af89e7ff3afe356
67f899e1d2db0dccde4b9587a52b7157fe1fb0be
1d77d4eada214e14938336070b248c18705939ff
1d16f59023b1b19d01ca69b8c9735be6d3baf5d9

The bug has a great series of linked bugs and stack-traces; the
weakref / mixed tools & UNO lifecycle here is simply hideous.

diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 987132f..847ebf1 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -92,12 +92,10 @@ public:
 
 com::sun::star::uno::Reference< com::sun::star::drawing::XShape > 
mXRenderedCustomShape;
 
-mutable com::sun::star::uno::Reference< 
com::sun::star::drawing::XCustomShapeEngine > mxCustomShapeEngine;
-
 // #i37011# render geometry shadow
 SdrObject*  mpLastShadowGeometry;
 
-com::sun::star::uno::Reference< 
com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine() const;
+static com::sun::star::uno::Reference< 
com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine( const 
SdrObjCustomShape* pCustomShape );
 
 //  SVX_DLLPRIVATE com::sun::star::uno::Sequence< 
com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > >
 //  SdrObjCustomShape::GetInteraction( const SdrObjCustomShape* 
pCustomShape ) const;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 61b9002..abce04a 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -87,6 +87,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::drawing;
 
+
 static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, 
sal_uInt16 nSDat )
 {
 switch( nSDat >> 8 )
@@ -389,18 +390,16 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& 
rOriginal, const SfxItemS
 
 

 
-Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const
+Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const 
SdrObjCustomShape* pCustomShape )
 {
-if (mxCustomShapeEngine.is())
-return mxCustomShapeEngine;
-
-String aEngine(((SdrCustomShapeEngineItem&)GetMergedItem( 
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
+Reference< XCustomShapeEngine > xCustomShapeEngine;
+String aEngine(((SdrCustomShapeEngineItem&)pCustomShape->GetMergedItem( 
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
 if ( !aEngine.Len() )
 aEngine = String( RTL_CONSTASCII_USTRINGPARAM ( 
"com.sun.star.drawing.EnhancedCustomShapeEngine" ) );
 
 Reference< XMultiServiceFactory > xFactory( 
::comphelper::getProcessServiceFactory() );
 
-Reference< XShape > aXShape = 
GetXShapeForSdrObject(const_cast(this));
+Reference< XShape > aXShape = GetXShapeForSdrObject( 
(SdrObjCustomShape*)pCustomShape );
 if ( aXShape.is() )
 {
 if ( aEngine.Len() && xFactory.is() )
@@ -412,18 +411,16 @@ Reference< XCustomShapeEngine > 
SdrObjCustomShape::GetCustomShapeEngine() const
 aArgument[ 0 ] <<= aPropValues;
 Reference< XInterface > xInterface( 
xFactory->createInstanceWithArguments( aEngine, aArgument ) );
 if ( xInterface.is() )
-mxCustomShapeEngine = Reference< XCustomShapeEngine >( 
xInterface, UNO_QUERY );
+xCustomShapeEngine = Reference< XCustomShapeEngine >( 
xInterface, UNO_QUERY );
 }
 }
-
-return mxCustomShapeEngine;
+return xCustomShapeEngine;
 }
-
 const SdrObject* SdrObjCustomShape::GetSdrObjectFromCustomShape() const
 {
 if ( !mXRenderedCustomShape.is() )
 {
-Reference< XCustomShapeEngine > xCustomShapeEngine( 
GetCustomShapeEngine() );
+Reference< XCustomShapeEngine > xCustomShapeEngine( 
GetCustomShapeEngine( this ) );
 if ( xCustomShapeEngine.is() )
 ((SdrObjCustomShape*)this)->mXRenderedCustomShape = 
xCustomShapeEngine->render();
 }
@@ -550,12 +547,10 @@ double SdrObjCustomShape::GetExtraTextRotation( const 
bool bPreRotation ) const
 *pAny >>= fExtraTextRotateAngle;
 return fExtraTextRotateAngle;
 }
-
 sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
 {
 sal_Bool bRet = sal_False;
-
-Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() 
);
+Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine( 
this ) ); // a candidate for being cached
 if ( xCustom

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 58267, which changed state.

Bug 58267 Summary: weakref / lifecycle nightmare on calc draw shape load
https://bugs.freedesktop.org/show_bug.cgi?id=58267

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Libreoffice Gerrit user]

 svx/inc/svx/svdoashp.hxx   |4 +---
 svx/source/svdraw/svdoashp.cxx |   28 +++-
 2 files changed, 12 insertions(+), 20 deletions(-)

New commits:
commit bb3f2900a867fdcb6df916fff58199b4ce94dd05
Author: Michael Meeks 
Date:   Mon Dec 17 19:55:32 2012 +

fdo#58399 - revert attempts to untangle and accelerate this mess.

Reverts commits:
76350361f386b78e1bc9edb75af89e7ff3afe356
67f899e1d2db0dccde4b9587a52b7157fe1fb0be
1d77d4eada214e14938336070b248c18705939ff
1d16f59023b1b19d01ca69b8c9735be6d3baf5d9

The bug has a great series of linked bugs and stack-traces; the
weakref / mixed tools & UNO lifecycle here is simply hideous.

diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 987132f..847ebf1 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -92,12 +92,10 @@ public:
 
 com::sun::star::uno::Reference< com::sun::star::drawing::XShape > 
mXRenderedCustomShape;
 
-mutable com::sun::star::uno::Reference< 
com::sun::star::drawing::XCustomShapeEngine > mxCustomShapeEngine;
-
 // #i37011# render geometry shadow
 SdrObject*  mpLastShadowGeometry;
 
-com::sun::star::uno::Reference< 
com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine() const;
+static com::sun::star::uno::Reference< 
com::sun::star::drawing::XCustomShapeEngine > GetCustomShapeEngine( const 
SdrObjCustomShape* pCustomShape );
 
 //  SVX_DLLPRIVATE com::sun::star::uno::Sequence< 
com::sun::star::uno::Reference< com::sun::star::drawing::XCustomShapeHandle > >
 //  SdrObjCustomShape::GetInteraction( const SdrObjCustomShape* 
pCustomShape ) const;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 61b9002..abce04a 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -87,6 +87,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::drawing;
 
+
 static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment& rSegInfo, 
sal_uInt16 nSDat )
 {
 switch( nSDat >> 8 )
@@ -389,18 +390,16 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& 
rOriginal, const SfxItemS
 
 

 
-Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const
+Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine( const 
SdrObjCustomShape* pCustomShape )
 {
-if (mxCustomShapeEngine.is())
-return mxCustomShapeEngine;
-
-String aEngine(((SdrCustomShapeEngineItem&)GetMergedItem( 
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
+Reference< XCustomShapeEngine > xCustomShapeEngine;
+String aEngine(((SdrCustomShapeEngineItem&)pCustomShape->GetMergedItem( 
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
 if ( !aEngine.Len() )
 aEngine = String( RTL_CONSTASCII_USTRINGPARAM ( 
"com.sun.star.drawing.EnhancedCustomShapeEngine" ) );
 
 Reference< XMultiServiceFactory > xFactory( 
::comphelper::getProcessServiceFactory() );
 
-Reference< XShape > aXShape = 
GetXShapeForSdrObject(const_cast(this));
+Reference< XShape > aXShape = GetXShapeForSdrObject( 
(SdrObjCustomShape*)pCustomShape );
 if ( aXShape.is() )
 {
 if ( aEngine.Len() && xFactory.is() )
@@ -412,18 +411,16 @@ Reference< XCustomShapeEngine > 
SdrObjCustomShape::GetCustomShapeEngine() const
 aArgument[ 0 ] <<= aPropValues;
 Reference< XInterface > xInterface( 
xFactory->createInstanceWithArguments( aEngine, aArgument ) );
 if ( xInterface.is() )
-mxCustomShapeEngine = Reference< XCustomShapeEngine >( 
xInterface, UNO_QUERY );
+xCustomShapeEngine = Reference< XCustomShapeEngine >( 
xInterface, UNO_QUERY );
 }
 }
-
-return mxCustomShapeEngine;
+return xCustomShapeEngine;
 }
-
 const SdrObject* SdrObjCustomShape::GetSdrObjectFromCustomShape() const
 {
 if ( !mXRenderedCustomShape.is() )
 {
-Reference< XCustomShapeEngine > xCustomShapeEngine( 
GetCustomShapeEngine() );
+Reference< XCustomShapeEngine > xCustomShapeEngine( 
GetCustomShapeEngine( this ) );
 if ( xCustomShapeEngine.is() )
 ((SdrObjCustomShape*)this)->mXRenderedCustomShape = 
xCustomShapeEngine->render();
 }
@@ -550,12 +547,10 @@ double SdrObjCustomShape::GetExtraTextRotation( const 
bool bPreRotation ) const
 *pAny >>= fExtraTextRotateAngle;
 return fExtraTextRotateAngle;
 }
-
 sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
 {
 sal_Bool bRet = sal_False;
-
-Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() 
);
+Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine( 
this ) ); // a candidate for being cached
 if ( xCustom

[Libreoffice-commits] .: Branch 'feature/androidapp' - android/qa

[Libreoffice Gerrit user]

 android/qa/desktop/native-code.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 850bcef4ba983ba4fc86006eb774a3e7cdaad50c
Author: Michael Meeks 
Date:   Mon Dec 17 19:44:48 2012 +

finally it starts and renders - well, something again.

diff --git a/android/qa/desktop/native-code.cxx 
b/android/qa/desktop/native-code.cxx
index 566daac..4f54ccd 100644
--- a/android/qa/desktop/native-code.cxx
+++ b/android/qa/desktop/native-code.cxx
@@ -13,6 +13,7 @@ extern "C"
 {
 extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -27,6 +28,7 @@ extern "C"
 extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * lotuswordpro_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
+extern void * protocolhandler_component_getFactory( const char * 
pImplName, void * pServiceManager, void * pRegistryKey );
 extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sb_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -40,11 +42,13 @@ extern "C"
 extern void * spell_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * svgfilter_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * sw_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * svx_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * swd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * t602filter_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * textfd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * unoxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * unordf_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * uui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * wpftdraw_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * wpftwriter_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
 extern void * xmlfd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -63,6 +67,7 @@ lo_get_libmap(void)
 { "libavmedialo.a", avmedia_component_getFactory },
 { "libdbalo.a", dba_component_getFactory },
 { "libdbaxmllo.a", dbaxml_component_getFactory },
+{ "libcuilo.a", cui_component_getFactory },
 { "libevtattlo.a", evtatt_component_getFactory },
 { "libfileacc.a", fileacc_component_getFactory },
 { "libfrmlo.a", frm_component_getFactory },
@@ -76,6 +81,7 @@ lo_get_libmap(void)
 { "liblnthlo.a", lnth_component_getFactory },
 { "liblwpftlo.a", lotuswordpro_component_getFactory },
 { "libooxlo.a", oox_component_getFactory },
+{ "libprotocolhandlerlo.a", protocolhandler_component_getFactory },
 { "libscdlo.a", scd_component_getFactory },
 { "libscfiltlo.a", scfilt_component_getFactory },
 { "libsblo.a", sb_component_getFactory },
@@ -86,12 +92,14 @@ lo_get_libmap(void)
 { "libsmlo.a", sm_component_getFactory },
 { "libspllo.a", spl_component_getFactory },
 { "libsvgfilterlo.a", svgfilter_component_getFactory },
+{ "libsvxlo.a", svx_component_getFactory },
 { "libswdlo.a", swd_component_getFactory },
 { "libswlo.a", sw_component_getFactory },
 { "libt602filterlo.a", t602filter_component_getFactory },
   

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 58278, which changed state.

Bug 58278 Summary: FORMATTING: Crash applying AutoCorrect
https://bugs.freedesktop.org/show_bug.cgi?id=58278

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
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] .: Branch 'libreoffice-4-0' - wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/document/OfficeDocument.py |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9fc8010b757b6ea88370ad0065209e08656a9a76
Author: Xisco Fauli 
Date:   Mon Dec 17 19:53:03 2012 +0100

pywizards: absolutize fails in Windows with backslash

I don't have a way to test it in Windows, so I hope it fixed now

Change-Id: I0f24aadb26c0d091fa95d9fcc655fa876c4b18db

diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py 
b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index 1211d0b..2e892a4 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -16,8 +16,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
+import os.path
 import traceback
-from unohelper import absolutize, systemPathToFileUrl
+from unohelper import systemPathToFileUrl
 from ..ui.event.CommonListener import TerminateListenerProcAdapter
 from ..common.Desktop import Desktop
 
@@ -209,10 +210,8 @@ class OfficeDocument(object):
 else:
 oStoreProperties = list(range(0))  
 
-sPath = StorePath[:(StorePath.rfind("/") + 1)]
-sFile = StorePath[(StorePath.rfind("/") + 1):]
 xComponent.storeToURL(
-absolutize(systemPathToFileUrl(sPath), sFile),
+os.path.abspath(systemPathToFileUrl(StorePath)),
 tuple(oStoreProperties))
 return True
 except ErrorCodeIOException:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: wizards/com

[Libreoffice Gerrit user]

 wizards/com/sun/star/wizards/document/OfficeDocument.py |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 355c30789e311aa13d7421ce653dc80a9030c2e2
Author: Xisco Fauli 
Date:   Mon Dec 17 19:53:03 2012 +0100

pywizards: absolutize fails in Windows with backslash

I don't have a way to test it in Windows, so I hope it fixed now

Change-Id: I0f24aadb26c0d091fa95d9fcc655fa876c4b18db

diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.py 
b/wizards/com/sun/star/wizards/document/OfficeDocument.py
index 85c49bc..75d7d72 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.py
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.py
@@ -16,8 +16,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 import uno
+import os.path
 import traceback
-from unohelper import absolutize, systemPathToFileUrl
+from unohelper import systemPathToFileUrl
 from ..ui.event.CommonListener import TerminateListenerProcAdapter
 from ..common.Desktop import Desktop
 
@@ -209,10 +210,8 @@ class OfficeDocument(object):
 else:
 oStoreProperties = list(range(0))  
 
-sPath = StorePath[:(StorePath.rfind("/") + 1)]
-sFile = StorePath[(StorePath.rfind("/") + 1):]
 xComponent.storeToURL(
-absolutize(systemPathToFileUrl(sPath), sFile),
+os.path.abspath(systemPathToFileUrl(StorePath)),
 tuple(oStoreProperties))
 return True
 except ErrorCodeIOException:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - officecfg/registry sc/inc sc/source

[Libreoffice Gerrit user]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |4 ++--
 sc/inc/calcconfig.hxx|8 
 sc/inc/formulaopt.hxx|8 
 sc/source/core/tool/formulaopt.cxx   |   10 +-
 sc/source/filter/oox/workbookfragment.cxx|8 +---
 sc/source/ui/optdlg/tpformula.cxx|8 
 sc/source/ui/src/optdlg.src  |8 
 7 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 244da713e5b08ec3724ed6870757fb0f55d30611
Author: Kohei Yoshida 
Date:   Mon Dec 17 11:57:06 2012 -0500

Change the order of always, never, ask enumerations.

This tri-state option is commonly ordered ask-always-never or
always-never-ask, but not always-ask-never, which is not very common.

Change-Id: Ie3a3d1b40397b5cd7d28e64948a2b946bb619b49

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 2dd5d7c..cc61d83 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1524,12 +1524,12 @@
 
 
 
-Ask before Recalc
+Recalc never
 
 
 
 
-Recalc never
+Ask before Recalc
 
 
 
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 2006ba2..7a9c73c 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -32,6 +32,14 @@
 #include "scdllapi.h"
 #include "formula/grammar.hxx"
 
+// have to match the registry values
+enum ScRecalcOptions
+{
+RECALC_ALWAYS = 0,
+RECALC_NEVER,
+RECALC_ASK,
+};
+
 /**
  * Configuration options for formula interpreter.
  */
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index bf12fce..fe585fe 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -37,14 +37,6 @@
 #include "global.hxx"
 #include "calcconfig.hxx"
 
-// have to match the registry values
-enum ScRecalcOptions
-{
-RECALC_ALWAYS = 0,
-RECALC_ASK = 1,
-RECALC_NEVER = 2
-};
-
 class SC_DLLPUBLIC ScFormulaOptions
 {
 private:
diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index fe54621..a14463b 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -367,10 +367,10 @@ ScFormulaCfg::ScFormulaCfg() :
 eOpt = RECALC_ALWAYS;
 break;
 case 1:
-eOpt = RECALC_ASK;
+eOpt = RECALC_NEVER;
 break;
 case 2:
-eOpt = RECALC_NEVER;
+eOpt = RECALC_ASK;
 break;
 default:
 SAL_WARN("sc", "unknown ooxml recalc option!");
@@ -446,16 +446,16 @@ void ScFormulaCfg::Commit()
 break;
 case SCFORMULAOPT_OOXML_RECALC:
 {
-sal_Int32 nVal = 1;
+sal_Int32 nVal = 2;
 switch (GetOOXMLRecalcOptions())
 {
 case RECALC_ALWAYS:
 nVal = 0;
 break;
-case RECALC_ASK:
+case RECALC_NEVER:
 nVal = 1;
 break;
-case RECALC_NEVER:
+case RECALC_ASK:
 nVal = 2;
 break;
 }
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 4f71e57..ba74b96 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -47,6 +47,7 @@
 #include "document.hxx"
 #include "docsh.hxx"
 #include "globstr.hrc"
+#include "calcconfig.hxx"
 
 #include 
 #include 
@@ -321,9 +322,10 @@ void WorkbookFragment::finalizeImport()
 ScDocument& rDoc = getScDocument();
 ScDocShell* pDocSh = static_cast(rDoc.GetDocumentShell());
 Reference< XComponentContext > xContext = 
comphelper::getProcessComponentContext();
-sal_Int32 nRecalcMode = 
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext);
+ScRecalcOptions nRecalcMode =
+
static_cast(officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext));
 bool bHardRecalc = false;
-if (nRecalcMode == 1)
+if (nRecalcMod

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

[Libreoffice Gerrit user]

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |4 ++--
 sc/inc/calcconfig.hxx|8 
 sc/inc/formulaopt.hxx|8 
 sc/source/core/tool/formulaopt.cxx   |   10 +-
 sc/source/filter/oox/workbookfragment.cxx|8 +---
 sc/source/ui/optdlg/tpformula.cxx|8 
 sc/source/ui/src/optdlg.src  |8 
 7 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit 97b583a7bfb5dc9000290c3bdc8df8751a97d65d
Author: Kohei Yoshida 
Date:   Mon Dec 17 11:57:06 2012 -0500

Change the order of always, never, ask enumerations.

This tri-state option is commonly ordered ask-always-never or
always-never-ask, but not always-ask-never, which is not very common.

Change-Id: Ie3a3d1b40397b5cd7d28e64948a2b946bb619b49

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 2dd5d7c..cc61d83 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1524,12 +1524,12 @@
 
 
 
-Ask before Recalc
+Recalc never
 
 
 
 
-Recalc never
+Ask before Recalc
 
 
 
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 2006ba2..7a9c73c 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -32,6 +32,14 @@
 #include "scdllapi.h"
 #include "formula/grammar.hxx"
 
+// have to match the registry values
+enum ScRecalcOptions
+{
+RECALC_ALWAYS = 0,
+RECALC_NEVER,
+RECALC_ASK,
+};
+
 /**
  * Configuration options for formula interpreter.
  */
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index bf12fce..fe585fe 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -37,14 +37,6 @@
 #include "global.hxx"
 #include "calcconfig.hxx"
 
-// have to match the registry values
-enum ScRecalcOptions
-{
-RECALC_ALWAYS = 0,
-RECALC_ASK = 1,
-RECALC_NEVER = 2
-};
-
 class SC_DLLPUBLIC ScFormulaOptions
 {
 private:
diff --git a/sc/source/core/tool/formulaopt.cxx 
b/sc/source/core/tool/formulaopt.cxx
index fe54621..a14463b 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -367,10 +367,10 @@ ScFormulaCfg::ScFormulaCfg() :
 eOpt = RECALC_ALWAYS;
 break;
 case 1:
-eOpt = RECALC_ASK;
+eOpt = RECALC_NEVER;
 break;
 case 2:
-eOpt = RECALC_NEVER;
+eOpt = RECALC_ASK;
 break;
 default:
 SAL_WARN("sc", "unknown ooxml recalc option!");
@@ -446,16 +446,16 @@ void ScFormulaCfg::Commit()
 break;
 case SCFORMULAOPT_OOXML_RECALC:
 {
-sal_Int32 nVal = 1;
+sal_Int32 nVal = 2;
 switch (GetOOXMLRecalcOptions())
 {
 case RECALC_ALWAYS:
 nVal = 0;
 break;
-case RECALC_ASK:
+case RECALC_NEVER:
 nVal = 1;
 break;
-case RECALC_NEVER:
+case RECALC_ASK:
 nVal = 2;
 break;
 }
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 4f71e57..ba74b96 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -47,6 +47,7 @@
 #include "document.hxx"
 #include "docsh.hxx"
 #include "globstr.hrc"
+#include "calcconfig.hxx"
 
 #include 
 #include 
@@ -321,9 +322,10 @@ void WorkbookFragment::finalizeImport()
 ScDocument& rDoc = getScDocument();
 ScDocShell* pDocSh = static_cast(rDoc.GetDocumentShell());
 Reference< XComponentContext > xContext = 
comphelper::getProcessComponentContext();
-sal_Int32 nRecalcMode = 
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext);
+ScRecalcOptions nRecalcMode =
+
static_cast(officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::get(xContext));
 bool bHardRecalc = false;
-if (nRecalcMode == 1)
+if (nRecalcMod

[Libreoffice-commits] .: svx/source

[Libreoffice Gerrit user]

 svx/source/svdraw/svdobj.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f828e91d1b2f0491e3d1c724ddd12f1b9177f466
Author: Noel Power 
Date:   Mon Dec 17 17:49:00 2012 +

fix problematic calc object selection after object create  (at non 100% 
zoom)

sometimes difficult to select custom shapes etc. created at non 100% zoom
levels. workaround was to use selection tool to select an area.

Change-Id: I112a60ebf37a37b16f6af5e70358853088e648a8

diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 31fef51..fefe00d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -943,6 +943,7 @@ void SdrObject::RecalcBoundRect()
 aOutRect = Rectangle(
 (sal_Int32)floor(aRange.getMinX()), 
(sal_Int32)floor(aRange.getMinY()),
 (sal_Int32)ceil(aRange.getMaxX()), 
(sal_Int32)ceil(aRange.getMaxY()));
+aOutRect -= GetGridOffset(); // don't include grid offset
 return;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Németh László]

Hi,

It seems, the LinguServiceManager used by the optlingu.cxx (Writing Aids)
doesn't know the bundled English package (I have checked on Windows and
Linux). I will check the python 3.3 port again.

Regards,
László





2012/12/17 Rene Engelhard 

> Hi,
>
> On Wed, Dec 05, 2012 at 11:17:21AM +0100, Németh László wrote:
> >By the way, I have ported the lightproof modules to Python 3.3, but it
> >seems, there is a registration issue with the bundled dictionary
> packages
> >with Lightproof components (unfortunately, I couldn't test it
> yesterday,
> >because the daily build had a missing library problem on Ubuntu), so I
> >will write soon.
>
> What is the status on this?
>
> I have
>  - a beta1 build with a python3-uno built against system python3.3
>(snapshot from weekend is bad, too)
>  - lightproof-libreoffice-en. Based on latest git of
>http://cgit.freedesktop.org/libreoffice/lightproof, so *with* the
>"python3.3 port"
>(both also availale at http://people.debian.org/~rene/libreoffice/4.0.0
> )
>  - python3.3 as of Debian experimental (
> http://packages.debian.org/search?keywords=python3.3 and
> http://packages.debian.org/search?keywords=python3)
>
> and I do still get the unknown state of the lightproof extensions when
> I install them.
>
> Interestingly, when I installed 4.0.0 beta1 _for Windows_ in a VM it
> worked?!
>
> (3.6.4-1 and lightproof of 2012-11-23 - before the python 3.3 fixes - do
> also work just fine)
>
> Regards,
>
> Rene
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

john.pr...@cantab.net changed:

   What|Removed |Added

 Depends on||55032

--- Comment #54 from john.pr...@cantab.net ---
Adding bug 55032 - CONDITIONAL FORMATTING after copy/paste sheet only visible
in 'CF-Manage', not in 'CF-CF', and without effect

Conditional formatting is a critical feature of a spreadsheet and it is not
possible to copy sheets between files without losing the conditional
formatting.

The bug is partially fixed as copying within a file works in 4.0 beta 1, but
conditional formatting does not appear in CF-Manage at all when copying between
files.

This makes it impossible for me to upgrade from the 3.5 branch.

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

[Libreoffice Gerrit user]

 librelogo/source/ChangeLog  |4 
 librelogo/source/LibreLogo/LibreLogo.py |   22 --
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit a108f4b14e119736c6a24f00cbfe87acb71e1e4a
Author: László Németh 
Date:   Mon Dec 17 18:33:28 2012 +0100

LibreLogo: fixes for the Slovenian and other localizations

Change-Id: I52f8526f91b93420e2da6ad69e86ddbf70ad01bd

diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 414c50e..36c8345 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-17 László Németh:
+* handle possible translation problems (strip terminating bars)
+* keep double compilation of the commands
+* trace loading problems (with PYUNO_LOGLEVEL environmental variable)
 
 2012-11-24 László Németh:
 * zero turtle width in hideturtle mode to draw at the left border of the 
page
diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index af89b9c..c89f92e 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -50,6 +50,7 @@ __COLORS__ = ['BLACK', 0x00], ['SILVER', 0xc0c0c0], 
['GRAY', 0x808080], \
 ['ORANGE', 0xffa500], ['GOLD', 0xffd700], ['VIOLET', 0x9400d3], \
 ['SKYBLUE', 0x87ceeb], ['CHOCOLATE', 0xd2691e], ['BROWN', 0xa52a2a], \
 ['INVISIBLE', 0xff00]
+__STRCONST__ = [i[0] for i in __COLORS__] + ['NONE', 'BEVEL', 'MITER', 
'ROUNDED', 'SOLID', 'DASH', 'DOTTED', 'BOLD', 'ITALIC', 'UPRIGHT', 'NORMAL', 
"HOUR", "PT", "INCH", "MM", "CM"]
 __SLEEP_SLICE_IN_MILLISECONDS__ = 500
 __PT_TO_TWIP__ = 20
 __MM_TO_PT__ = 1/(25.4/72)
@@ -137,9 +138,10 @@ def __l12n__(lng):
 return __lng__[lng]
 except:
 try:
-__lng__[lng] = 
dict([[i.decode("unicode-escape").split("=")[0].strip(), 
i.decode("unicode-escape").split("=")[1].strip()] for i in open(__lngpath__ + 
"LibreLogo_" + lng + ".properties", 'rb').readlines() if b"=" in i])
+__lng__[lng] = 
dict([[i.decode("unicode-escape").split("=")[0].strip(), 
i.decode("unicode-escape").split("=")[1].strip().strip("|")] for i in 
open(__lngpath__ + "LibreLogo_" + lng + ".properties", 'rb').readlines() if 
b"=" in i])
 return __lng__[lng]
-except:
+except Exception:
+__trace__()
 return None
 
 # dot for dotted line (implemented as an array of dot-headed arrows, because 
PostScript dot isn't supported by Writer)
@@ -220,7 +222,7 @@ def Input(s):
 # dispose the dialog
 controlContainer.dispose()
 return inputtext
-except Exception as e:
+except Exception:
 __trace__()
 
 def __string__(s, decimal = None): # convert decimal sign, localized BOOL and 
SET
@@ -337,8 +339,8 @@ def __translate__(arg = None):
 # decode strings
 quoted = u"(?ui)(?<=%s)(%%s)(?=%s)" % (__l12n__(_.lng)['LEFTSTRING'][0], 
__l12n__(_.lng)['RIGHTSTRING'][0])
 text = re.sub(__DECODE_STRING_REGEX__, __decodestring2__, text)
-for i in __COLORS__ + (['NONE'], ['BEVEL'], ['MITER'], ['ROUNDED'], 
['SOLID'], ['DASH'], ['DOTTED'], ['BOLD'], ['ITALIC'], ['UPRIGHT'], ['NORMAL']):
-text = re.sub(quoted % lang[i[0]], 
__l12n__(_.lng)[i[0]].split("|")[0].upper(), text)
+for i in __STRCONST__:
+text = re.sub(quoted % lang[i], 
__l12n__(_.lng)[i].split("|")[0].upper(), text)
 _.doc.getText().setString(text)
 # convert to paragraphs
 __dispatcher__(".uno:ExecuteSearch", 
(__getprop__("SearchItem.SearchString", r"\n"), 
__getprop__("SearchItem.ReplaceString", r"\n"), \
@@ -986,7 +988,6 @@ def __color__(c):
 return c
 if type(c) == unicode:
 if c == u'any':
-#return __COLORS__[int(random.random() * 24)][1]
 return int(random.random() * 2**31) # max. 50% transparency
 if c[0:1] == '~':
 c = __componentcolor__(__colors__[_.lng][c[1:].lower()])
@@ -1159,13 +1160,15 @@ def __loadlang__(lang, a):
 for i in __COLORS__:
 for j in a[i[0]].split("|"):
 __colors__[lang][j] = i[1]
-
+for i in a:
+if not i[0:3] in ["LIB", "ERR", "PT", "INC", "MM", "CM", "HOU", "DEG"] 
and not i in __STRCONST__: # uppercase native commands
+a[i] = a[i].upper()
 repcount = a['REPCOUNT'].split('|')[0]
 loopi = itertools.count()
 loop = lambda r: "%(i)s = 1\n%(orig)s%(j)s = %(i)s\n%(i)s += 1\n" % \
 { "i": repcount + str(next(loopi)), "j": repcount, "orig": re.sub( 
r"(?ui)(?___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] API CHANGE: Remove useless deprecated rtl/memory.h

[Stephan Bergmann (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1268


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac156b004464018225bbfda24f0a234f9ebcb19f
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini 
Gerrit-Reviewer: Arnaud Versini 
Gerrit-Reviewer: Norbert Thiebaud 
Gerrit-Reviewer: Stephan Bergmann 

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

[Libreoffice-commits] .: sal/inc sal/Library_sal.mk sal/osl sal/Package_inc.mk sal/rtl

[Libreoffice Gerrit user]

 sal/Library_sal.mk|1 
 sal/Package_inc.mk|1 
 sal/inc/rtl/memory.h  |   53 
 sal/osl/all/compat.cxx|   32 ++
 sal/rtl/source/memory.cxx |   55 --
 5 files changed, 32 insertions(+), 110 deletions(-)

New commits:
commit 542ad7f1c5ac7794c42248ac13e9b33f84888490
Author: Arnaud Versini 
Date:   Sat Dec 8 11:35:00 2012 +0100

API CHANGE: Remove useless deprecated rtl/memory.h

Signed-off-by: Stephan Bergmann , adapted some function
definitions in sal/osl/all/compat.cxx to avoid "must return a value" 
warnings.

Change-Id: Iac156b004464018225bbfda24f0a234f9ebcb19f

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 5ea6b55..cae8219 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/rtl/source/locale \
sal/rtl/source/logfile \
sal/rtl/source/math \
-   sal/rtl/source/memory \
sal/rtl/source/random \
sal/rtl/source/rtl_process \
sal/rtl/source/strbuf \
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 425db1d..15fb477 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -80,7 +80,6 @@ $(eval $(call 
gb_Package_add_file,sal_inc,inc/rtl/logfile.hxx,rtl/logfile.hxx))
 $(eval $(call 
gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/malformeduriexception.hxx))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
-$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/memory.h,rtl/memory.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
diff --git a/sal/inc/rtl/memory.h b/sal/inc/rtl/memory.h
deleted file mode 100644
index 25e2a73..000
--- a/sal/inc/rtl/memory.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#ifndef _RTL_MEMORY_H_
-#define _RTL_MEMORY_H_
-
-#include "sal/config.h"
-
-#include "sal/saldllapi.h"
-#include "sal/types.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-SAL_DEPRECATED("Use memset instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_zeroMemory(void *Ptr, sal_Size Bytes);
-SAL_DEPRECATED("Use memset instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_fillMemory(void *Ptr, sal_Size Bytes, 
sal_uInt8 Fill);
-SAL_DEPRECATED("Use memcpy instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_copyMemory(void *Dst, const void *Src, 
sal_Size Bytes);
-SAL_DEPRECATED("Use memmove instead")
-SAL_DLLPUBLIC void SAL_CALL rtl_moveMemory(void *Dst, const void *Src, 
sal_Size Bytes);
-SAL_DEPRECATED("Use memcmp instead")
-SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_compareMemory(const void *MemA, const 
void *MemB, sal_Size Bytes);
-SAL_DEPRECATED("Use memchr instead")
-SAL_DLLPUBLIC void* SAL_CALL rtl_findInMemory(const void *MemA, sal_uInt8 ch, 
sal_Size Bytes);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /*_RTL_MEMORY_H_ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
index fb8a1ec..f9c7129 100644
--- a/sal/osl/all/compat.cxx
+++ b/sal/osl/all/compat.cxx
@@ -37,6 +37,38 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL 
osl_tryToAcquireSemaphore(void *) {
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+SAL_DLLPUBLIC_EXPORT sal_Int32 SAL_CALL rtl_compareMemory(
+void const *, void const *, sal_Size)
+{
+for (;;) { std::abort(); } // avoid "must return a value" warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_copyMemory(
+void *, void const *, sal_Size)
+{
+std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL rtl_fillMemory(void *, sal_Size, sal_uInt8) 
{
+std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL rtl_findInMemory(
+void const *, sal_uInt8, sal_Size)
+{
+for (;;) { std::abort(); } // avoid "must return a value" wa

Re: modules removal surprises

[Stephan Bergmann]

On 11/09/2012 10:29 AM, Michael Meeks wrote:

On Fri, 2012-11-09 at 10:01 +0100, Stephan Bergmann wrote:

(It can already be considered deprecated for quite a while, so I
would not mind removing it already in 4.0, either, if need be.


Sounds reasonable to remove it now (to me) :-) having at least some
sort of impedance mismatch for 4.0 is expected I think (?); that is
unless we want to save some of that up for a 4.1 ;-)


As discussed in the ESC, already removed it from LO 4.0 now, see 
 
"drop bundled STLport library already from LO 4.0."


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

lcov report: which directory's to filter out ?

[John Smith]

Hi,


I have made a new lcov code coverage report over at:
http://dev-builds.libreoffice.org/lcov_reports/master~2012-12-15_08.47.02/

As I ran all tests in 'make test' now, instead of stopping when a
single one fails (I had a lot of failures though) it should be at
least a somewhat more accurate description of the code that is covered
by the tests.

But maybe it still contains some directory's that should better be
filtered out ? I already filtered out '/usr/include/*' and
'/usr/lib/*', but maybe outhers should be too ?

I also excluded branch coverage data for this report (including it
takes longer, and the default is 'off'), as I wasnt sure about the
interest in it.


Regards,


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

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

[Libreoffice Gerrit user]

 librelogo/source/ChangeLog  |4 
 librelogo/source/LibreLogo/LibreLogo.py |   22 --
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 2f0fb1618151a896593964fffa80a65a4bf3946c
Author: László Németh 
Date:   Mon Dec 17 18:19:52 2012 +0100

LibreLogo: fixes for the Slovenian and other localizations

Change-Id: Id72be285185572b446473aac78f92813093e20b8

diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index 414c50e..36c8345 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-17 László Németh:
+* handle possible translation problems (strip terminating bars)
+* keep double compilation of the commands
+* trace loading problems (with PYUNO_LOGLEVEL environmental variable)
 
 2012-11-24 László Németh:
 * zero turtle width in hideturtle mode to draw at the left border of the 
page
diff --git a/librelogo/source/LibreLogo/LibreLogo.py 
b/librelogo/source/LibreLogo/LibreLogo.py
index af89b9c..c89f92e 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -50,6 +50,7 @@ __COLORS__ = ['BLACK', 0x00], ['SILVER', 0xc0c0c0], 
['GRAY', 0x808080], \
 ['ORANGE', 0xffa500], ['GOLD', 0xffd700], ['VIOLET', 0x9400d3], \
 ['SKYBLUE', 0x87ceeb], ['CHOCOLATE', 0xd2691e], ['BROWN', 0xa52a2a], \
 ['INVISIBLE', 0xff00]
+__STRCONST__ = [i[0] for i in __COLORS__] + ['NONE', 'BEVEL', 'MITER', 
'ROUNDED', 'SOLID', 'DASH', 'DOTTED', 'BOLD', 'ITALIC', 'UPRIGHT', 'NORMAL', 
"HOUR", "PT", "INCH", "MM", "CM"]
 __SLEEP_SLICE_IN_MILLISECONDS__ = 500
 __PT_TO_TWIP__ = 20
 __MM_TO_PT__ = 1/(25.4/72)
@@ -137,9 +138,10 @@ def __l12n__(lng):
 return __lng__[lng]
 except:
 try:
-__lng__[lng] = 
dict([[i.decode("unicode-escape").split("=")[0].strip(), 
i.decode("unicode-escape").split("=")[1].strip()] for i in open(__lngpath__ + 
"LibreLogo_" + lng + ".properties", 'rb').readlines() if b"=" in i])
+__lng__[lng] = 
dict([[i.decode("unicode-escape").split("=")[0].strip(), 
i.decode("unicode-escape").split("=")[1].strip().strip("|")] for i in 
open(__lngpath__ + "LibreLogo_" + lng + ".properties", 'rb').readlines() if 
b"=" in i])
 return __lng__[lng]
-except:
+except Exception:
+__trace__()
 return None
 
 # dot for dotted line (implemented as an array of dot-headed arrows, because 
PostScript dot isn't supported by Writer)
@@ -220,7 +222,7 @@ def Input(s):
 # dispose the dialog
 controlContainer.dispose()
 return inputtext
-except Exception as e:
+except Exception:
 __trace__()
 
 def __string__(s, decimal = None): # convert decimal sign, localized BOOL and 
SET
@@ -337,8 +339,8 @@ def __translate__(arg = None):
 # decode strings
 quoted = u"(?ui)(?<=%s)(%%s)(?=%s)" % (__l12n__(_.lng)['LEFTSTRING'][0], 
__l12n__(_.lng)['RIGHTSTRING'][0])
 text = re.sub(__DECODE_STRING_REGEX__, __decodestring2__, text)
-for i in __COLORS__ + (['NONE'], ['BEVEL'], ['MITER'], ['ROUNDED'], 
['SOLID'], ['DASH'], ['DOTTED'], ['BOLD'], ['ITALIC'], ['UPRIGHT'], ['NORMAL']):
-text = re.sub(quoted % lang[i[0]], 
__l12n__(_.lng)[i[0]].split("|")[0].upper(), text)
+for i in __STRCONST__:
+text = re.sub(quoted % lang[i], 
__l12n__(_.lng)[i].split("|")[0].upper(), text)
 _.doc.getText().setString(text)
 # convert to paragraphs
 __dispatcher__(".uno:ExecuteSearch", 
(__getprop__("SearchItem.SearchString", r"\n"), 
__getprop__("SearchItem.ReplaceString", r"\n"), \
@@ -986,7 +988,6 @@ def __color__(c):
 return c
 if type(c) == unicode:
 if c == u'any':
-#return __COLORS__[int(random.random() * 24)][1]
 return int(random.random() * 2**31) # max. 50% transparency
 if c[0:1] == '~':
 c = __componentcolor__(__colors__[_.lng][c[1:].lower()])
@@ -1159,13 +1160,15 @@ def __loadlang__(lang, a):
 for i in __COLORS__:
 for j in a[i[0]].split("|"):
 __colors__[lang][j] = i[1]
-
+for i in a:
+if not i[0:3] in ["LIB", "ERR", "PT", "INC", "MM", "CM", "HOU", "DEG"] 
and not i in __STRCONST__: # uppercase native commands
+a[i] = a[i].upper()
 repcount = a['REPCOUNT'].split('|')[0]
 loopi = itertools.count()
 loop = lambda r: "%(i)s = 1\n%(orig)s%(j)s = %(i)s\n%(i)s += 1\n" % \
 { "i": repcount + str(next(loopi)), "j": repcount, "orig": re.sub( 
r"(?ui)(?___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add script to regenerate pch files

[via Code Review]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1350

Approvals:
  Luboš Luňák: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib32de8be8a57b3b430f4b5b298b7f417e5a02ccb
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Peter Foley 
Gerrit-Reviewer: Luboš Luňák 
Gerrit-Reviewer: Peter Foley 
Gerrit-Reviewer: Peter Foley 

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

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxattributeoutput.cxx |   13 -
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 1a776160ba9abde53bbebce6fdd2cb264a800c2f
Author: Miklos Vajna 
Date:   Wed Nov 14 19:03:05 2012 +0100

fdo#52477 n#789482 DOCX: export track change data after w:hyperlink

(cherry picked from commit eac3e6e746300df379226941ba75c4e0ce1feb7a)

Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx

Change-Id: If204523d7da544b11b2d809993ada180476104ef

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d075cd4..71b84f4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -507,8 +507,9 @@ void DocxAttributeOutput::EndParagraphProperties()
 
 void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool 
/*bSingleEmptyRun*/ )
 {
-// if there is some redlining in the document, output it
-StartRedline( pRedlineData );
+// Don't start redline data here, possibly there is a hyperlink later, and
+// that has to be started first.
+m_pRedlineData = pRedlineData;
 
 // postpone the output of the start of a run (there are elements that need
 // to be written before the start of the run, but we learn which they are
@@ -585,6 +586,9 @@ void DocxAttributeOutput::EndRun()
 m_startedHyperlink = true;
 }
 
+// if there is some redlining in the document, output it
+StartRedline();
+
 DoWriteBookmarks( );
 
 m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
@@ -1315,12 +1319,11 @@ static OString impl_DateTimeToOString( const DateTime& 
rDateTime )
 return aBuffer.makeStringAndClear();
 }
 
-void DocxAttributeOutput::StartRedline( const SwRedlineData* pRedlineData )
+void DocxAttributeOutput::StartRedline()
 {
-m_pRedlineData = pRedlineData;
-
 if ( !m_pRedlineData )
 return;
+const SwRedlineData* pRedlineData = m_pRedlineData;
 
 // FIXME check if it's necessary to travel over the Next()'s in 
pRedlineData
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 3cc75b7..b605aba 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -137,7 +137,7 @@ public:
 ///
 /// Start of the tag that encloses the run, fills the info according to
 /// the value of m_pRedlineData.
-void StartRedline( const SwRedlineData* pRedlineData );
+void StartRedline();
 
 /// Output redlining.
 ///
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/fr source/pt source/zh-TW

[Libreoffice Gerrit user]

 source/fr/cui/source/options.po   |1 +
 source/fr/cui/uiconfig/ui.po  |1 +
 source/fr/helpcontent2/source/text/scalc/01.po|1 +
 source/fr/helpcontent2/source/text/scalc/05.po|1 +
 source/fr/helpcontent2/source/text/shared/optionen.po |1 +
 source/fr/helpcontent2/source/text/swriter/01.po  |1 +
 source/fr/helpcontent2/source/text/swriter/librelogo.po   |1 +
 source/fr/instsetoo_native/inc_openoffice/windows/msi_languages.po|1 +
 source/fr/padmin/source.po|1 +
 source/fr/sc/source/ui/src.po |1 +
 source/fr/sc/source/ui/styleui.po |1 +
 source/fr/sc/uiconfig/scalc/ui.po |1 +
 source/fr/scaddins/source/pricing.po  |1 +
 source/fr/scp2/source/ooo.po  |1 +
 source/fr/sd/source/ui/app.po |1 +
 source/fr/sfx2/source/dialog.po   |1 +
 source/fr/sfx2/uiconfig/ui.po |1 +
 source/fr/svtools/source/misc.po  |1 +
 source/fr/svtools/uiconfig/ui.po  |1 +
 source/fr/svx/inc.po  |1 +
 source/fr/sw/source/ui/app.po |1 +
 source/fr/sw/uiconfig/swriter/ui.po   |1 +
 source/pt/helpcontent2/source/text/swriter/librelogo.po   |1 +
 source/pt/scaddins/source/pricing.po  |1 +
 source/zh-TW/instsetoo_native/inc_openoffice/windows/msi_languages.po |1 +
 25 files changed, 25 insertions(+)

New commits:
commit e8e55341aad0521fce7f154a9937a0f3ed162c92
Author: Petr Mladek 
Date:   Mon Dec 17 17:32:53 2012 +0100

fdo#58068 fix invalid .po headers

Change-Id: Ie3e6e498309f42adfa89d37654f0ded092e15f9a

diff --git a/source/fr/cui/source/options.po b/source/fr/cui/source/options.po
index 84a0222..cb97661 100644
--- a/source/fr/cui/source/options.po
+++ b/source/fr/cui/source/options.po
@@ -1,3 +1,4 @@
+#. extracted from cui/source/options
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/source/fr/cui/uiconfig/ui.po b/source/fr/cui/uiconfig/ui.po
index b10dbd5..f33be38 100644
--- a/source/fr/cui/uiconfig/ui.po
+++ b/source/fr/cui/uiconfig/ui.po
@@ -1,3 +1,4 @@
+#. extracted from cui/uiconfig/ui
 msgid ""
 msgstr ""
 "Project-Id-Version: LibO 40l10n\n"
diff --git a/source/fr/helpcontent2/source/text/scalc/01.po 
b/source/fr/helpcontent2/source/text/scalc/01.po
index b6b274c..05a9c09 100644
--- a/source/fr/helpcontent2/source/text/scalc/01.po
+++ b/source/fr/helpcontent2/source/text/scalc/01.po
@@ -1,3 +1,4 @@
+#. extracted from helpcontent2/source/text/scalc/01
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/source/fr/helpcontent2/source/text/scalc/05.po 
b/source/fr/helpcontent2/source/text/scalc/05.po
index 2ab1c41..cfd6563 100644
--- a/source/fr/helpcontent2/source/text/scalc/05.po
+++ b/source/fr/helpcontent2/source/text/scalc/05.po
@@ -1,3 +1,4 @@
+#. extracted from helpcontent2/source/text/scalc/05
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/source/fr/helpcontent2/source/text/shared/optionen.po 
b/source/fr/helpcontent2/source/text/shared/optionen.po
index e78ff57..981afef 100644
--- a/source/fr/helpcontent2/source/text/shared/optionen.po
+++ b/source/fr/helpcontent2/source/text/shared/optionen.po
@@ -1,3 +1,4 @@
+#. extracted from helpcontent2/source/text/shared/optionen
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/source/fr/helpcontent2/source/text/swriter/01.po 
b/source/fr/helpcontent2/source/text/swriter/01.po
index f40f424..1ff7e9b 100644
--- a/source/fr/helpcontent2/source/text/swriter/01.po
+++ b/source/fr/helpcontent2/source/text/swriter/01.po
@@ -1,3 +1,4 @@
+#. extracted from helpcontent2/source/text/swriter/01
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/source/fr/helpcontent2/source/text/swriter/librelogo.po 
b/source/fr/helpcontent2/source/text/swriter/librelogo.po
index 696a4b7..4d5e646 100644
--- a/source/fr/helpcontent2/source/text/swriter/librelogo.po
+++ b/source/fr/helpcontent2/source/text/swriter/librelogo.po
@@ -1,3 +1,4 @@
+#. extracted from helpcontent2/source/text/swriter/librelogo
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/source/fr/instsetoo_native/inc_openoffice/windows/msi_languages.po 
b/source/fr/instsetoo_native/inc_openoffice/windows/msi_languages.po
index 66c4f6a..18ee0b5 100644
-

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

[Libreoffice Gerrit user]

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

New commits:
commit 4b41e6f81593111a7ee1f8009ed1f21cc6fbebaa
Author: Petr Mladek 
Date:   Mon Dec 17 17:32:53 2012 +0100

Updated core
Project: translations  e8e55341aad0521fce7f154a9937a0f3ed162c92
fdo#58068 fix invalid .po headers

diff --git a/translations b/translations
index d0d2528..e8e5534 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d0d252860637d5c022c735f7497894c248473cec
+Subproject commit e8e55341aad0521fce7f154a9937a0f3ed162c92
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/androidapp' - android/qa desktop/source vcl/android vcl/source

[Libreoffice Gerrit user]

 android/qa/desktop/Makefile|   12 
++
 android/qa/desktop/native-code.cxx |2 +
 android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java |   20 
++
 desktop/source/app/app.cxx |5 
++
 desktop/source/app/sofficemain.cxx |1 
 vcl/android/androidinst.cxx|   10 
-
 vcl/source/app/svmain.cxx  |4 
--
 7 files changed, 33 insertions(+), 21 deletions(-)

New commits:
commit 508e5ce94814fa904c52f20e01ebab48a6015900
Author: Michael Meeks 
Date:   Mon Dec 17 16:23:34 2012 +

more hackery - finally getting to missing components.

diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 3a3562b..a8c2bc5 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -130,6 +130,18 @@ copy-stuff:
mkdir -p assets/presets/$$D ; \
echo "content" > assets/presets/$$D/stamp; \
done
+# lofficerc
+   mkdir -p assets/program/
+   echo "[Bootstrap]" > assets/program/lofficerc
+   echo "Logo=1" >> assets/program/lofficerc
+   echo "NativeProgress=1" >> assets/program/lofficerc
+   echo "URE_BOOTSTRAP=file:///assets/program/fundamentalrc" >> 
assets/program/lofficerc
+#  echo "RTL_LOGFILE=file:///dev/log/main" >> assets/program/lofficerc
+   echo "HOME=$(APP_DATA_PATH)/files" >> assets/program/lofficerc
+   echo "OSL_SOCKET_PATH=$(APP_DATA_PATH)/files" >> 
assets/program/lofficerc
+# - this looks useful but breaks more than it fixes ...
+#  echo "DISABLE_EXTENSION_SYNCHRONIZATION=1" >> assets/program/lofficerc
+
 
 setup-jars:
 #
diff --git a/android/qa/desktop/native-code.cxx 
b/android/qa/desktop/native-code.cxx
index e9298e0..566daac 100644
--- a/android/qa/desktop/native-code.cxx
+++ b/android/qa/desktop/native-code.cxx
@@ -36,6 +36,7 @@ extern "C"
 extern void * sdd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * smd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
+extern void * spl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * spell_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
 extern void * svgfilter_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
 extern void * sw_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
@@ -83,6 +84,7 @@ lo_get_libmap(void)
 { "libsdlo.a", sd_component_getFactory },
 { "libsmdlo.a", smd_component_getFactory },
 { "libsmlo.a", sm_component_getFactory },
+{ "libspllo.a", spl_component_getFactory },
 { "libsvgfilterlo.a", svgfilter_component_getFactory },
 { "libswdlo.a", swd_component_getFactory },
 { "libswlo.a", sw_component_getFactory },
diff --git 
a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java 
b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
index 287dbb6..bf370e6 100644
--- a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
+++ b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
@@ -240,17 +240,6 @@ public class LODesktop
 bootstrapContext.mcf = 
bootstrapContext.componentContext.getServiceManager();
 
 Log.i(TAG, "mcf is" + (bootstrapContext.mcf!=null ? " not" : "") + 
" null");
-
-Bootstrap.initVCL();
-
-Object desktop = bootstrapContext.mcf.createInstanceWithContext
-("com.sun.star.frame.Desktop", 
bootstrapContext.componentContext);
-
-Log.i(TAG, "desktop is" + (desktop!=null ? " not" : "") + " null");
-
-bootstrapContext.componentLoader = (XComponentLoader) 
UnoRuntime.queryInterface(XComponentLoader.class, desktop);
-
-Log.i(TAG, "componentLoader is" + 
(bootstrapContext.componentLoader!=null ? " not" : "") + " null");
 }
 catch (Exception e)
 {
@@ -267,9 +256,11 @@ public class LODesktop
 Log.i(TAG, "onCreate - added here\n");
 
 try {
-String input = getIntent().getStringExtra("input");
-if (input == null)
-input = "/assets/test1.odt";
+String input;
+//input = getIntent().getStringExtra("input");
+//if (input == null)
+//input = "/assets/test1.odt";
+input = "-writer";
 
 // We need to fake up an argv, and the argv[0] even needs to

[Libreoffice-commits] .: sc/source

[Libreoffice Gerrit user]

 sc/source/ui/inc/tpformula.hxx|   10 ++--
 sc/source/ui/optdlg/tpformula.cxx |   10 ++--
 sc/source/ui/src/optdlg.src   |   77 +++---
 3 files changed, 50 insertions(+), 47 deletions(-)

New commits:
commit f55f86e016e8d1b509be1e7ba59919301dc17d67
Author: Kohei Yoshida 
Date:   Mon Dec 17 11:15:16 2012 -0500

Re-arranged formula options page to make room for re-calc option.

Change-Id: If144ffa1c5d868f41f6303b0f99fbe2e4d23a6b8

diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 646f429..55ea854 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -61,6 +61,11 @@ private:
 ListBox   maLbFormulaSyntax;
 CheckBox  maCbEnglishFuncName;
 
+FixedLine  maFlCustomCalcOpt;
+RadioButton maBtnCustomCalcDefault;
+RadioButton maBtnCustomCalcCustom;
+PushButton maBtnCustomCalcDetails;
+
 FixedLine  maFlFormulaSeps;
 FixedText  maFtSepFuncArg;
 Edit   maEdSepFuncArg;
@@ -70,11 +75,6 @@ private:
 Edit   maEdSepArrayRow;
 PushButton maBtnSepReset;
 
-FixedLine  maFlCustomCalcOpt;
-RadioButton maBtnCustomCalcDefault;
-RadioButton maBtnCustomCalcCustom;
-PushButton maBtnCustomCalcDetails;
-
 FixedLine maFlRecalcOptions;
 ListBox maLbOOXMLRecalcOptions;
 
diff --git a/sc/source/ui/optdlg/tpformula.cxx 
b/sc/source/ui/optdlg/tpformula.cxx
index 5b60bd3..4a9608c 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -48,6 +48,12 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, 
const SfxItemSet& rCoreA
 maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
 maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
 maCbEnglishFuncName(this, ScResId(CB_ENGLISH_FUNC_NAME)),
+
+maFlCustomCalcOpt(this, ScResId(FL_CUSTOM_CALC_OPTIONS)),
+maBtnCustomCalcDefault(this, ScResId(BTN_CUSTOM_CALC_DEFAULT)),
+maBtnCustomCalcCustom(this, ScResId(BTN_CUSTOM_CALC_CUSTOM)),
+maBtnCustomCalcDetails(this, ScResId(BTN_CUSTOM_CALC_DETAILS)),
+
 maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
 maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
 maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
@@ -56,10 +62,6 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, 
const SfxItemSet& rCoreA
 maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)),
 maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)),
 maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)),
-maFlCustomCalcOpt(this, ScResId(FL_CUSTOM_CALC_OPTIONS)),
-maBtnCustomCalcDefault(this, ScResId(BTN_CUSTOM_CALC_DEFAULT)),
-maBtnCustomCalcCustom(this, ScResId(BTN_CUSTOM_CALC_CUSTOM)),
-maBtnCustomCalcDetails(this, ScResId(BTN_CUSTOM_CALC_DETAILS)),
 maFlRecalcOptions(this, ScResId(FL_RECALC_OPTIONS)),
 maLbOOXMLRecalcOptions( this, ScResId(LB_OOXML_RECALC)),
 mnDecSep(0)
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 821f200..43cb595 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -201,16 +201,44 @@ TabPage RID_SCPAGE_FORMULA
 Text [ en-US ] = "Use English function names" ;
 };
 
+FixedLine FL_CUSTOM_CALC_OPTIONS
+{
+Pos = MAP_APPFONT ( 6 , 47 ) ;
+Size = MAP_APPFONT ( 140 , 8 ) ;
+Text [ en-US ] = "Detailed calculation settings";
+};
+
+RadioButton BTN_CUSTOM_CALC_DEFAULT
+{
+Pos = MAP_APPFONT ( 21 , 62 ) ;
+Size = MAP_APPFONT ( 60, 14 ) ;
+Text [ en-US ] = "Default";
+};
+
+RadioButton BTN_CUSTOM_CALC_CUSTOM
+{
+Pos = MAP_APPFONT ( 21 , 76 ) ;
+Size = MAP_APPFONT ( 60, 14 ) ;
+Text [ en-US ] = "Custom";
+};
+
+PushButton BTN_CUSTOM_CALC_DETAILS
+{
+Pos = MAP_APPFONT ( 83 , 74 ) ;
+Size = MAP_APPFONT ( 58, 14 ) ;
+Text [ en-US ] = "Details...";
+};
+
 FixedLine FL_FORMULA_SEPS
 {
-Pos = MAP_APPFONT ( 6 , 46 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 154 , 47 ) ;
+Size = MAP_APPFONT ( 100 , 8 ) ;
 Text [ en-US ] = "Separators";
 };
 
 FixedText FT_FORMULA_SEP_ARG
 {
-Pos = MAP_APPFONT ( 21, 59 );
+Pos = MAP_APPFONT ( 169, 60 );
 Size = MAP_APPFONT ( 60, 8 );
 Text [ en-US ] = "~Function";
 };
@@ -218,13 +246,13 @@ TabPage RID_SCPAGE_FORMULA
 Edit ED_FORMULA_SEP_ARG
 {
 Border = TRUE;
-Pos = MAP_APPFONT ( 85, 57 );
+Pos = MAP_APPFONT ( 233, 58 );
 Size = MAP_APPFONT ( 10, 12 );
 };
 
 FixedText FT_FORMULA_SEP_ARRAY_C
 {
-Pos = MAP_APPFONT ( 21, 77 );
+Pos = MAP_APPFONT ( 169, 78 );
 Size = MAP_APPFONT ( 60, 8 );
 Text [ en-US ] = "Array co~lumn";
 };
@@ -232,13 +260,13 @@ TabPage RID_SCPAGE_FORMULA
 Edit ED_FORMULA_SEP_ARRAY_C
 {
 Border = TRUE;
-Pos = MAP

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

[Libreoffice Gerrit user]

 sc/source/ui/inc/tpformula.hxx|   10 ++--
 sc/source/ui/optdlg/tpformula.cxx |   10 ++--
 sc/source/ui/src/optdlg.src   |   77 +++---
 3 files changed, 50 insertions(+), 47 deletions(-)

New commits:
commit 7f7a5c3c731d2bea4138181dd71454cd31577a1e
Author: Kohei Yoshida 
Date:   Mon Dec 17 11:15:16 2012 -0500

Re-arranged formula options page to make room for re-calc option.

Change-Id: If144ffa1c5d868f41f6303b0f99fbe2e4d23a6b8

diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 646f429..55ea854 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -61,6 +61,11 @@ private:
 ListBox   maLbFormulaSyntax;
 CheckBox  maCbEnglishFuncName;
 
+FixedLine  maFlCustomCalcOpt;
+RadioButton maBtnCustomCalcDefault;
+RadioButton maBtnCustomCalcCustom;
+PushButton maBtnCustomCalcDetails;
+
 FixedLine  maFlFormulaSeps;
 FixedText  maFtSepFuncArg;
 Edit   maEdSepFuncArg;
@@ -70,11 +75,6 @@ private:
 Edit   maEdSepArrayRow;
 PushButton maBtnSepReset;
 
-FixedLine  maFlCustomCalcOpt;
-RadioButton maBtnCustomCalcDefault;
-RadioButton maBtnCustomCalcCustom;
-PushButton maBtnCustomCalcDetails;
-
 FixedLine maFlRecalcOptions;
 ListBox maLbOOXMLRecalcOptions;
 
diff --git a/sc/source/ui/optdlg/tpformula.cxx 
b/sc/source/ui/optdlg/tpformula.cxx
index 5b60bd3..4a9608c 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -48,6 +48,12 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, 
const SfxItemSet& rCoreA
 maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
 maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
 maCbEnglishFuncName(this, ScResId(CB_ENGLISH_FUNC_NAME)),
+
+maFlCustomCalcOpt(this, ScResId(FL_CUSTOM_CALC_OPTIONS)),
+maBtnCustomCalcDefault(this, ScResId(BTN_CUSTOM_CALC_DEFAULT)),
+maBtnCustomCalcCustom(this, ScResId(BTN_CUSTOM_CALC_CUSTOM)),
+maBtnCustomCalcDetails(this, ScResId(BTN_CUSTOM_CALC_DETAILS)),
+
 maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
 maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
 maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
@@ -56,10 +62,6 @@ ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, 
const SfxItemSet& rCoreA
 maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)),
 maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)),
 maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)),
-maFlCustomCalcOpt(this, ScResId(FL_CUSTOM_CALC_OPTIONS)),
-maBtnCustomCalcDefault(this, ScResId(BTN_CUSTOM_CALC_DEFAULT)),
-maBtnCustomCalcCustom(this, ScResId(BTN_CUSTOM_CALC_CUSTOM)),
-maBtnCustomCalcDetails(this, ScResId(BTN_CUSTOM_CALC_DETAILS)),
 maFlRecalcOptions(this, ScResId(FL_RECALC_OPTIONS)),
 maLbOOXMLRecalcOptions( this, ScResId(LB_OOXML_RECALC)),
 mnDecSep(0)
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 821f200..43cb595 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -201,16 +201,44 @@ TabPage RID_SCPAGE_FORMULA
 Text [ en-US ] = "Use English function names" ;
 };
 
+FixedLine FL_CUSTOM_CALC_OPTIONS
+{
+Pos = MAP_APPFONT ( 6 , 47 ) ;
+Size = MAP_APPFONT ( 140 , 8 ) ;
+Text [ en-US ] = "Detailed calculation settings";
+};
+
+RadioButton BTN_CUSTOM_CALC_DEFAULT
+{
+Pos = MAP_APPFONT ( 21 , 62 ) ;
+Size = MAP_APPFONT ( 60, 14 ) ;
+Text [ en-US ] = "Default";
+};
+
+RadioButton BTN_CUSTOM_CALC_CUSTOM
+{
+Pos = MAP_APPFONT ( 21 , 76 ) ;
+Size = MAP_APPFONT ( 60, 14 ) ;
+Text [ en-US ] = "Custom";
+};
+
+PushButton BTN_CUSTOM_CALC_DETAILS
+{
+Pos = MAP_APPFONT ( 83 , 74 ) ;
+Size = MAP_APPFONT ( 58, 14 ) ;
+Text [ en-US ] = "Details...";
+};
+
 FixedLine FL_FORMULA_SEPS
 {
-Pos = MAP_APPFONT ( 6 , 46 ) ;
-Size = MAP_APPFONT ( 248 , 8 ) ;
+Pos = MAP_APPFONT ( 154 , 47 ) ;
+Size = MAP_APPFONT ( 100 , 8 ) ;
 Text [ en-US ] = "Separators";
 };
 
 FixedText FT_FORMULA_SEP_ARG
 {
-Pos = MAP_APPFONT ( 21, 59 );
+Pos = MAP_APPFONT ( 169, 60 );
 Size = MAP_APPFONT ( 60, 8 );
 Text [ en-US ] = "~Function";
 };
@@ -218,13 +246,13 @@ TabPage RID_SCPAGE_FORMULA
 Edit ED_FORMULA_SEP_ARG
 {
 Border = TRUE;
-Pos = MAP_APPFONT ( 85, 57 );
+Pos = MAP_APPFONT ( 233, 58 );
 Size = MAP_APPFONT ( 10, 12 );
 };
 
 FixedText FT_FORMULA_SEP_ARRAY_C
 {
-Pos = MAP_APPFONT ( 21, 77 );
+Pos = MAP_APPFONT ( 169, 78 );
 Size = MAP_APPFONT ( 60, 8 );
 Text [ en-US ] = "Array co~lumn";
 };
@@ -232,13 +260,13 @@ TabPage RID_SCPAGE_FORMULA
 Edit ED_FORMULA_SEP_ARRAY_C
 {
 Border = TRUE;
-Pos = MAP

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

[Libreoffice Gerrit user]

 unotools/source/misc/fontcvt.cxx |   43 ---
 1 file changed, 27 insertions(+), 16 deletions(-)

New commits:
commit a71dab147afa218d18b092d047c186c2b169612d
Author: Caolán McNamara 
Date:   Mon Dec 17 15:49:52 2012 +

Resolves: fdo#31055 fallback to a default bullet on symbol lack

a) fix up some entries in Wingdings for which we do have a suitable mapping
after all

b) on complete failure for mapping to OpenSymbol show a default
bullet, which is better than no glyph

c) document that the original tables were against StarSymbol which
had extra glyphs (and/or I thought it had)

Change-Id: I5e43cc0a5216e76d00b7df1a69967e08c3656e21
(cherry picked from commit 0d777f33a1d818a7fd27d755e54db64823f46636)

diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index c4c6613..3d5d30d 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -21,18 +21,16 @@
 #include 
 #include 
 
-#ifndef _STLP_MAP
 #include 
-#endif
-#ifndef _STLP_VECTOR
 #include 
-#endif
-#ifndef _STLP_ALGORITHM
 #include 
-#endif
-#ifndef _STLP_FUNCTIONAL
 #include 
-#endif
+
+//These conversion tables were designed for StarSymbol. OpenSymbol
+//originally didn't have the same code points as StarSymbol, and
+//then gained some extra code points, but there are still potentially
+//various holes in OpenSymbol which were filled by StarSymbol, i.e.
+//destination mapping points which are empty in OpenSymbol
 
 //===
 // note: the character mappings that are only approximations
@@ -307,17 +305,17 @@ static const sal_Unicode aWingDings2Tab[224] =
 0xe569,0xe56a,0xe56b,0xe56c,
 0xe56d,0xe56e,0xe56f,0xe570,
 0xe571,0xe572,0xe573,0xe574,
-0xe575,0xe576,0xe577,0xe578,
+0xe575, 0, 0,0xe578,
 // F0a0
 0xe579,0xe57a,0xe57b,0xe57c,
-0xe57d,0xe57e,0xe57f,0xe580,
-0xe581,0xe582,0xe583,0xe584,
-0xe585,0xe586,0xe587,0xe588,
+ 0, 0, 0, 0,
+ 0, 0, 0,0xe584,
+0xe585, 0,0xe586, 0,
 // F0b0
-0xe589,0xe58a,0xe58b,0xe58c,
+ 0, 0, 0, 0,
 0xe58d,0xe58e,0xe58f,0xe590,
-0xe591,0xe592,0xe593,0xe594,
-0xe595,0xe596,0xe597,0xe598,
+ 0, 0,0xe593,0xe594,
+ 0, 0, 0,0xe587,
 // F0c0
 0xe599,0xe59a,0xe59b,0xe59c,
 0xe59d,0xe59e,0xe59f,0xe5a0,
@@ -334,7 +332,7 @@ static const sal_Unicode aWingDings2Tab[224] =
 0xe5c1,0xe5c2,0xe5c3,0xe5c4,
 0xe5c5,0xe5c6,0xe5c7,0xe5c8,
 // F0f0
-0xe5c9,0,0xe5cb,0xe5cc,
+0xe5c9,0, 0xe5cb,0xe477,
 0xe5cd,0xe5ce,0xe5cf,0xe5d0,
 0x203b,0x2042, 0, 0,
  0, 0, 0, 0
@@ -1278,7 +1276,20 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) 
const
 cIndex -= 0xF000;
 // recode the symbol
 if( cIndex>=0x0020 && cIndex<=0x00FF )
+{
 cRetVal = mpCvtTab[ cIndex - 0x0020 ];
+
+if (!cRetVal && mpSubsFontName)
+{
+if (!strcmp(mpSubsFontName, "OpenSymbol") || 
(!strcmp(mpSubsFontName, "StarSymbol")))
+{
+cRetVal = 0xE12C;
+SAL_WARN( "unotools", "Forcing a bullet substition from 
0x" <<
+OString::valueOf(cChar, 16) << " to 0x" <<
+OString::valueOf(cRetVal, 16));
+}
+}
+}
 }
 
 return cRetVal ? cRetVal : cChar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rene Engelhard]

Hi,

On Wed, Dec 05, 2012 at 11:17:21AM +0100, Németh László wrote:
>By the way, I have ported the lightproof modules to Python 3.3, but it
>seems, there is a registration issue with the bundled dictionary packages
>with Lightproof components (unfortunately, I couldn't test it yesterday,
>because the daily build had a missing library problem on Ubuntu), so I
>will write soon.

What is the status on this?

I have
 - a beta1 build with a python3-uno built against system python3.3
   (snapshot from weekend is bad, too)
 - lightproof-libreoffice-en. Based on latest git of
   http://cgit.freedesktop.org/libreoffice/lightproof, so *with* the
   "python3.3 port"
   (both also availale at http://people.debian.org/~rene/libreoffice/4.0.0)
 - python3.3 as of Debian experimental 
(http://packages.debian.org/search?keywords=python3.3 and 
http://packages.debian.org/search?keywords=python3)

and I do still get the unknown state of the lightproof extensions when
I install them.

Interestingly, when I installed 4.0.0 beta1 _for Windows_ in a VM it
worked?!

(3.6.4-1 and lightproof of 2012-11-23 - before the python 3.3 fixes - do
also work just fine)

Regards,

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

[Libreoffice-commits] .: unotools/source

[Libreoffice Gerrit user]

 unotools/source/misc/fontcvt.cxx |   43 ---
 1 file changed, 27 insertions(+), 16 deletions(-)

New commits:
commit 0d777f33a1d818a7fd27d755e54db64823f46636
Author: Caolán McNamara 
Date:   Mon Dec 17 15:49:52 2012 +

Resolves: fdo#31055 fallback to a default bullet on symbol lack

a) fix up some entries in Wingdings for which we do have a suitable mapping
after all

b) on complete failure for mapping to OpenSymbol show a default
bullet, which is better than no glyph

c) document that the original tables were against StarSymbol which
had extra glyphs (and/or I thought it had)

Change-Id: I5e43cc0a5216e76d00b7df1a69967e08c3656e21

diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index c4c6613..3d5d30d 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -21,18 +21,16 @@
 #include 
 #include 
 
-#ifndef _STLP_MAP
 #include 
-#endif
-#ifndef _STLP_VECTOR
 #include 
-#endif
-#ifndef _STLP_ALGORITHM
 #include 
-#endif
-#ifndef _STLP_FUNCTIONAL
 #include 
-#endif
+
+//These conversion tables were designed for StarSymbol. OpenSymbol
+//originally didn't have the same code points as StarSymbol, and
+//then gained some extra code points, but there are still potentially
+//various holes in OpenSymbol which were filled by StarSymbol, i.e.
+//destination mapping points which are empty in OpenSymbol
 
 //===
 // note: the character mappings that are only approximations
@@ -307,17 +305,17 @@ static const sal_Unicode aWingDings2Tab[224] =
 0xe569,0xe56a,0xe56b,0xe56c,
 0xe56d,0xe56e,0xe56f,0xe570,
 0xe571,0xe572,0xe573,0xe574,
-0xe575,0xe576,0xe577,0xe578,
+0xe575, 0, 0,0xe578,
 // F0a0
 0xe579,0xe57a,0xe57b,0xe57c,
-0xe57d,0xe57e,0xe57f,0xe580,
-0xe581,0xe582,0xe583,0xe584,
-0xe585,0xe586,0xe587,0xe588,
+ 0, 0, 0, 0,
+ 0, 0, 0,0xe584,
+0xe585, 0,0xe586, 0,
 // F0b0
-0xe589,0xe58a,0xe58b,0xe58c,
+ 0, 0, 0, 0,
 0xe58d,0xe58e,0xe58f,0xe590,
-0xe591,0xe592,0xe593,0xe594,
-0xe595,0xe596,0xe597,0xe598,
+ 0, 0,0xe593,0xe594,
+ 0, 0, 0,0xe587,
 // F0c0
 0xe599,0xe59a,0xe59b,0xe59c,
 0xe59d,0xe59e,0xe59f,0xe5a0,
@@ -334,7 +332,7 @@ static const sal_Unicode aWingDings2Tab[224] =
 0xe5c1,0xe5c2,0xe5c3,0xe5c4,
 0xe5c5,0xe5c6,0xe5c7,0xe5c8,
 // F0f0
-0xe5c9,0,0xe5cb,0xe5cc,
+0xe5c9,0, 0xe5cb,0xe477,
 0xe5cd,0xe5ce,0xe5cf,0xe5d0,
 0x203b,0x2042, 0, 0,
  0, 0, 0, 0
@@ -1278,7 +1276,20 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) 
const
 cIndex -= 0xF000;
 // recode the symbol
 if( cIndex>=0x0020 && cIndex<=0x00FF )
+{
 cRetVal = mpCvtTab[ cIndex - 0x0020 ];
+
+if (!cRetVal && mpSubsFontName)
+{
+if (!strcmp(mpSubsFontName, "OpenSymbol") || 
(!strcmp(mpSubsFontName, "StarSymbol")))
+{
+cRetVal = 0xE12C;
+SAL_WARN( "unotools", "Forcing a bullet substition from 
0x" <<
+OString::valueOf(cChar, 16) << " to 0x" <<
+OString::valueOf(cRetVal, 16));
+}
+}
+}
 }
 
 return cRetVal ? cRetVal : cChar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/globstr.hrc|5 +--
 sc/source/filter/oox/workbookfragment.cxx |   46 +++---
 sc/source/ui/src/globstr.src  |8 +
 sc/source/ui/src/optdlg.src   |2 -
 4 files changed, 16 insertions(+), 45 deletions(-)

New commits:
commit 828fcbc8c7f0ff7c6288190b62dbadca5a4cd190
Author: Kohei Yoshida 
Date:   Mon Dec 17 10:31:14 2012 -0500

Use check box "Always perform this in future" rather than 4 buttons.

Change-Id: Ib04debaf3c2d06e694e965c1ece01d6cc7a43fa8

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index e860a6b..4b8031d 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -619,9 +619,8 @@
 
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 493
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 494
-#define STR_ALWAYS  495
-#define STR_NEVER   496
+#define STR_ALWAYS_PERFORM_SELECTED 495
 
-#define STR_COUNT   497
+#define STR_COUNT   496
 
 #endif
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 0e92e2a..4f71e57 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -327,55 +327,31 @@ void WorkbookFragment::finalizeImport()
 {
 if (rDoc.IsUserInteractionEnabled())
 {
-
-#define RET_ALWAYS 10
-#define RET_NEVER 11
 // Ask the user if full re-calculation is desired.
 QueryBox aBox(
 pDocSh->GetActiveDialogParent(), WinBits(WB_YES_NO | 
WB_DEF_YES),
 ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
-aBox.AddButton(ScGlobal::GetRscString(STR_ALWAYS), RET_ALWAYS, 0);
-aBox.AddButton(ScGlobal::GetRscString(STR_NEVER), RET_NEVER, 0);
+
aBox.SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED));
 
 boost::shared_ptr< comphelper::ConfigurationChanges > batch( 
comphelper::ConfigurationChanges::create() );
 sal_Int32 nRet = aBox.Execute();
-switch (nRet)
+bHardRecalc = nRet == RET_YES;
+
+if (aBox.GetCheckBoxState())
 {
-case RET_YES:
-bHardRecalc = true;
-break;
-case RET_NO:
-bHardRecalc = false;
-break;
-case RET_ALWAYS:
-{
-bHardRecalc = true;
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0), 
batch);
-ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(RECALC_ALWAYS);
-SC_MOD()->SetFormulaOptions(aOpt);
-}
-break;
-case RET_NEVER:
-{
-bHardRecalc = false;
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(2), 
batch);
-ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(RECALC_NEVER);
-SC_MOD()->SetFormulaOptions(aOpt);
-}
-break;
-default:
-SAL_WARN("sc", "unknown return value!");
-bHardRecalc = true;
+// Always perform selected action in the future.
+
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0), 
batch);
+ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions();
+aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS : 
RECALC_NEVER);
+SC_MOD()->SetFormulaOptions(aOpt);
+
 }
 batch->commit();
 }
 }
-else if(nRecalcMode == 0)
+else if (nRecalcMode == 0)
 bHardRecalc = true;
 
-
 if (bHardRecalc)
 pDocSh->DoHardRecalc(false);
 else
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 955dcb5..79ad06e 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1961,13 +1961,9 @@ Resource RID_GLOBSTR
 Text [ en-US ] = "This document was last saved by Excel.  Some formula 
cells may produce different results when recalculated.\n\nDo you want to 
recalculate all formula cells now?";
 };
 
-String STR_ALWAYS
+String STR_ALWAYS_PERFORM_SELECTED
 {
-Text [ en-US ] = "Always";
-};
-String STR_NEVER
-{
-Text [ en-US ] = "Never";
+Text [ en-US ] = "Always perform this without prompt in the future.";
 };
 };
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index e3a1175..821f200 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -288,7 +288,7 @@ TabPage RID

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

[Libreoffice Gerrit user]

 sc/inc/globstr.hrc|5 +--
 sc/source/filter/oox/workbookfragment.cxx |   46 +++---
 sc/source/ui/src/globstr.src  |8 +
 sc/source/ui/src/optdlg.src   |2 -
 4 files changed, 16 insertions(+), 45 deletions(-)

New commits:
commit 8d5479cde68b8e70c4bfa2a6edae030260c740e4
Author: Kohei Yoshida 
Date:   Mon Dec 17 10:31:14 2012 -0500

Use check box "Always perform this in future" rather than 4 buttons.

Change-Id: Ib04debaf3c2d06e694e965c1ece01d6cc7a43fa8

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index e860a6b..4b8031d 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -619,9 +619,8 @@
 
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 493
 #define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 494
-#define STR_ALWAYS  495
-#define STR_NEVER   496
+#define STR_ALWAYS_PERFORM_SELECTED 495
 
-#define STR_COUNT   497
+#define STR_COUNT   496
 
 #endif
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 0e92e2a..4f71e57 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -327,55 +327,31 @@ void WorkbookFragment::finalizeImport()
 {
 if (rDoc.IsUserInteractionEnabled())
 {
-
-#define RET_ALWAYS 10
-#define RET_NEVER 11
 // Ask the user if full re-calculation is desired.
 QueryBox aBox(
 pDocSh->GetActiveDialogParent(), WinBits(WB_YES_NO | 
WB_DEF_YES),
 ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS));
-aBox.AddButton(ScGlobal::GetRscString(STR_ALWAYS), RET_ALWAYS, 0);
-aBox.AddButton(ScGlobal::GetRscString(STR_NEVER), RET_NEVER, 0);
+
aBox.SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED));
 
 boost::shared_ptr< comphelper::ConfigurationChanges > batch( 
comphelper::ConfigurationChanges::create() );
 sal_Int32 nRet = aBox.Execute();
-switch (nRet)
+bHardRecalc = nRet == RET_YES;
+
+if (aBox.GetCheckBoxState())
 {
-case RET_YES:
-bHardRecalc = true;
-break;
-case RET_NO:
-bHardRecalc = false;
-break;
-case RET_ALWAYS:
-{
-bHardRecalc = true;
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0), 
batch);
-ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(RECALC_ALWAYS);
-SC_MOD()->SetFormulaOptions(aOpt);
-}
-break;
-case RET_NEVER:
-{
-bHardRecalc = false;
-
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(2), 
batch);
-ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions();
-aOpt.SetOOXMLRecalcOptions(RECALC_NEVER);
-SC_MOD()->SetFormulaOptions(aOpt);
-}
-break;
-default:
-SAL_WARN("sc", "unknown return value!");
-bHardRecalc = true;
+// Always perform selected action in the future.
+
officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0), 
batch);
+ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions();
+aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS : 
RECALC_NEVER);
+SC_MOD()->SetFormulaOptions(aOpt);
+
 }
 batch->commit();
 }
 }
-else if(nRecalcMode == 0)
+else if (nRecalcMode == 0)
 bHardRecalc = true;
 
-
 if (bHardRecalc)
 pDocSh->DoHardRecalc(false);
 else
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 955dcb5..79ad06e 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1961,13 +1961,9 @@ Resource RID_GLOBSTR
 Text [ en-US ] = "This document was last saved by Excel.  Some formula 
cells may produce different results when recalculated.\n\nDo you want to 
recalculate all formula cells now?";
 };
 
-String STR_ALWAYS
+String STR_ALWAYS_PERFORM_SELECTED
 {
-Text [ en-US ] = "Always";
-};
-String STR_NEVER
-{
-Text [ en-US ] = "Never";
+Text [ en-US ] = "Always perform this without prompt in the future.";
 };
 };
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index e3a1175..821f200 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -288,7 +288,7 @@ TabPage RID

[Libreoffice-commits] .: sal/inc sal/qa

[Libreoffice Gerrit user]

 sal/inc/rtl/ustring.hxx |   13 +
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx |1 +
 2 files changed, 14 insertions(+)

New commits:
commit c075b8068bff1b3c6025638aaf0acab5bbebab4d
Author: Luboš Luňák 
Date:   Mon Dec 17 16:27:22 2012 +0100

OUString::reverseCompareTo() string literal overload to match the AsciiL one

Change-Id: Id5ca706aa3fd1831990db2310933c6b94ca376cb

diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 5760914..c9fe25e 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -528,6 +528,19 @@ public:
 }
 
 /**
+ @overload
+ This function accepts an ASCII string literal as its argument.
+ @since LibreOffice 4.1
+*/
+template< typename T >
+typename internal::ConstCharArrayDetector< T, sal_Int32 >::Type 
reverseCompareTo( T& literal ) const SAL_THROW(())
+{
+assert( strlen( literal ) == internal::ConstCharArrayDetector< T 
>::size - 1 );
+return rtl_ustr_asciil_reverseCompare_WithLength( pData->buffer, 
pData->length,
+literal, internal::ConstCharArrayDetector< T, void >::size - 1 );
+}
+
+/**
   Perform a comparison of two strings.
 
   The result is true if and only if second string
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx 
b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index a6d7145..873b536 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -145,6 +145,7 @@ void test::oustring::StringLiterals::checkUsage()
 CPPUNIT_ASSERT( foobarfoo.replaceFirst( "foo", "test" ) == "testbarfoo" );
 CPPUNIT_ASSERT( foobarfoo.replaceAll( "foo", test ) == "testbartest" );
 CPPUNIT_ASSERT( foobarfoo.replaceAll( "foo", "test" ) == "testbartest" );
+CPPUNIT_ASSERT( foo.reverseCompareTo( "foo" ) == 0 );
 // if this is not true, some of the calls above converted to OUString
 CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-3-6]: fix for fdo#57551: landscape/portrait sequence lost in FILES...

[Luke Deller (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1387

To pull it, you can do:

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

fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .doc

Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Reviewed-on: https://gerrit.libreoffice.org/1251
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
---
M sw/source/filter/ww8/writerwordglue.cxx
1 file changed, 4 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Luke Deller 
Gerrit-Reviewer: Caolán McNamara 

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

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

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/bibliographyentry.ui |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 678e81636f2d12fdc4b3240d631a2ad955011cb4
Author: Caolán McNamara 
Date:   Mon Dec 17 14:33:50 2012 +

Resolves: fdo#58237 set listbox to be expandable

which is currently also a synonym as shrinkable
so the listbox is shrunk to fit.

we do need to get around for forcing widgets to
stay within their available space in boxes (should
work fine in grids)

Change-Id: I38a570b2d59952f3457252c57399e2d6ab9e12c6
(cherry picked from commit 1b0591e934540db3bb31342ccc7849ed49338a96)

diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui 
b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index e6bb977..aa528c5 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -131,11 +131,13 @@
   
 True
 False
+True
 12
 
   
 True
 False
+True
 6
 
   
@@ -211,6 +213,7 @@
   
 True
 False
+True
   
   
 0
@@ -262,6 +265,7 @@
   
 True
 True
+True
 ●
   
   
@@ -287,7 +291,7 @@
 
   
   
-False
+True
 True
 1
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/bibliographyentry.ui |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1b0591e934540db3bb31342ccc7849ed49338a96
Author: Caolán McNamara 
Date:   Mon Dec 17 14:33:50 2012 +

Resolves: fdo#58237 set listbox to be expandable

which is currently also a synonym as shrinkable
so the listbox is shrunk to fit.

we do need to get around for forcing widgets to
stay within their available space in boxes (should
work fine in grids)

Change-Id: I38a570b2d59952f3457252c57399e2d6ab9e12c6

diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui 
b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index e6bb977..aa528c5 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -131,11 +131,13 @@
   
 True
 False
+True
 12
 
   
 True
 False
+True
 6
 
   
@@ -211,6 +213,7 @@
   
 True
 False
+True
   
   
 0
@@ -262,6 +265,7 @@
   
 True
 True
+True
 ●
   
   
@@ -287,7 +291,7 @@
 
   
   
-False
+True
 True
 1
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Change in core[libreoffice-4-0]: fix for fdo#57551: landscape/portrait sequence lost in FILES...

[Luke Deller (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1386

To pull it, you can do:

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

fix for fdo#57551: landscape/portrait sequence lost in FILESAVE as .doc

Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Reviewed-on: https://gerrit.libreoffice.org/1251
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
---
M sw/source/filter/ww8/writerwordglue.cxx
1 file changed, 4 insertions(+), 0 deletions(-)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4d888fc7e9b68ee4c693b565d8ef23dcb825f7ce
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Luke Deller 
Gerrit-Reviewer: Caolán McNamara 

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

[Libreoffice-commits] .: oox/inc

[Libreoffice Gerrit user]

 oox/inc/oox/vml/vmlshape.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83193b44d08e5c5eb9fbe2262cea5f1d019a2462
Author: Miklos Vajna 
Date:   Mon Dec 17 14:56:10 2012 +0100

oox: try to make Windows build happy

Change-Id: Ib7340d79fc29ef0d0c46083a6aac6c27aba2629b

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 35d3a85..2f4ab6f 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -55,7 +55,7 @@ const sal_Int32 VML_CLIENTDATA_FORMULA  = 4;
 // 
 
 /** The shape model structure contains all properties shared by all types of 
shapes. */
-struct ShapeTypeModel
+struct OOX_DLLPUBLIC ShapeTypeModel
 {
 ::rtl::OUString maShapeId;  ///< Unique identifier of the 
shape.
 ::rtl::OUString maShapeName;///< Name of the shape, if 
present.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Addin exceptions in SvStream

[Lubos Lunak]

On Saturday 15 of December 2012, Marc-André Laverdière wrote:
> Sounds to me like a big learning curve is involved - which is going to
> be very distracting from research activities.

 Depends. It is something new to learn, but the API is rather intuitive.

> If someone can give me link to a good tutorial that gives me a good
> feeling about it I may bite.

 I don't think there's anything like that (yet, at least). The Clang tutorials 
I could find only say how to create a very basic plugin, which is something 
I've already sorted out for LO, so now it is about writing actual code using 
Clang internal API (http://clang.llvm.org/doxygen/).

 That said, at this point it should be enough just to give it a try. Under 
compilerplugins/clang there are already several plugins, with 2 of them 
(lclstaticfix.cxx and postfixincrementfix.cxx) doing code rewriting. Writing 
a new one would mean something like looking at what's there, compile a 
relevant piece of code with '-Xclang -ast-dump' options to get AST dump to 
see how Clang represents it internally, and write a new plugin using the 
relevant classes mentioned in the AST dump (and I find it much simpler to 
check them out in CLANGDIR/include/clang/AST/ rather than the doxygen 
documentation).

 It's not exactly trivial, but it's probably simpler to get than a lot of LO 
code. If you decide to give it a try, feel free to ask if you run into 
trouble.

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

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 58399, which changed state.

Bug 58399 Summary: CRASH when FILEOPEN particular .docx (MSO2007)
https://bugs.freedesktop.org/show_bug.cgi?id=58399

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

-- 
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: Question about vcl/source/window/builder.cxx

[Caolán McNamara]

On Sat, 2012-12-15 at 06:19 -0800, julien2412 wrote:
> Should it be  (sValue[0] == 'e' || sValue[0] == 'E')

Yeah, that's what I had in mind. Fixed now, thanks for that :-)

C.

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

[Libreoffice-commits] .: vcl/source

[Libreoffice Gerrit user]

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

New commits:
commit daca24d2779260042ee84229f0f476a03e2a5ca0
Author: Caolán McNamara 
Date:   Mon Dec 17 13:05:17 2012 +

cppcheck: I wanted to check for 'e' and 'E' here for 'end'

Change-Id: Ie5a1da69c1282c518ec33835fefe723b0fdf3a40

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 61036a7..18bb670 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1911,7 +1911,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 }
 else if (sKey == "pack-type")
 {
-VclPackType ePackType = (sValue[0] == 'e' || sValue[0] == 'e') 
? VCL_PACK_END : VCL_PACK_START;
+VclPackType ePackType = (sValue[0] == 'e' || sValue[0] == 'E') 
? VCL_PACK_END : VCL_PACK_START;
 pCurrent->set_pack_type(ePackType);
 }
 else if (sKey == "left-attach")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 58284, which changed state.

Bug 58284 Summary: UI: Number dropdown list in Tools > Outline Numbering is 
empty
https://bugs.freedesktop.org/show_bug.cgi?id=58284

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

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

[Libreoffice Gerrit user]

 sw/source/ui/misc/outline.cxx  |1 +
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a5205b8dfc04343dacc396a0d1e8b5168edd51af
Author: Caolán McNamara 
Date:   Mon Dec 17 12:56:02 2012 +

sort style list in outline numbering

Change-Id: I17139da65d0adbdaaa2c7bafb066fc6f74c42700

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 48cfd5c..1d7fc43 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -427,6 +427,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* 
pParent,
 {
 get(m_pLevelLB, "level");
 get(m_pCollBox, "style");
+m_pCollBox->SetStyle(m_pCollBox->GetStyle()|WB_SORT);
 get(m_pNumberBox, "numbering");
 get(m_pCharFmtLB, "charstyle");
 get(m_pAllLevelFT, "sublevelsft");
commit e0238a46e0850150e68218734dda86d6bd08523f
Author: Julien Nabet 
Date:   Mon Dec 17 12:43:21 2012 +

Resolves: fdo#58284 outline numbering list is of wrong type

Change-Id: Ifb1fa41bef033b4f0624f46a945d5a5c47bada4a
(cherry picked from commit ec1f1c16e36b1fa5138604ca08fff1888cf7513c)

Signed-off-by: Caolán McNamara 

diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui 
b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index fd15817..e488681 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -161,6 +161,7 @@
   
 True
 False
+17
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/ui/misc/outline.cxx  |1 +
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 65b241eb0bc25597336a0b1b15af85c3428e40cf
Author: Caolán McNamara 
Date:   Mon Dec 17 12:56:02 2012 +

sort style list in outline numbering

Change-Id: I17139da65d0adbdaaa2c7bafb066fc6f74c42700

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 0afcc8a..b146b97 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -427,6 +427,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* 
pParent,
 {
 get(m_pLevelLB, "level");
 get(m_pCollBox, "style");
+m_pCollBox->SetStyle(m_pCollBox->GetStyle()|WB_SORT);
 get(m_pNumberBox, "numbering");
 get(m_pCharFmtLB, "charstyle");
 get(m_pAllLevelFT, "sublevelsft");
commit ec1f1c16e36b1fa5138604ca08fff1888cf7513c
Author: Julien Nabet 
Date:   Mon Dec 17 12:43:21 2012 +

Resolves: fdo#58284 outline numbering list is of wrong type

Change-Id: Ifb1fa41bef033b4f0624f46a945d5a5c47bada4a

diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui 
b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index fd15817..e488681 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -161,6 +161,7 @@
   
 True
 False
+17
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: rc -nologo

[Tor Lillqvist]

> I guess it is unreasonable to expect people who work on the MSVC build
> environment to have all three compiler installed,

And the three bundled SDKs (6.0, 7.0 and 8.0), plus perhaps even more
freestanding ones (like 7.1), I was going to say.

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

Re: rc -nologo

[Michael Stahl]

On 17/12/12 13:46, Lubos Lunak wrote:
> On Monday 17 of December 2012, Stephan Bergmann wrote:
>> > 6e045ff08bf32e5812fa9e> "hide rc.exe splash screen" adds "-nologo" to an
>> invocation of rc on Windows.  At least with my Windows build environment
>> where the rc used is C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\rc
>> that apparently does not understand a "nologo" switch, that causes the
>> build to fail.
>>
>> Is the rc that is picked up for my build too old, or is the commit unsound?
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=a6e3c2b4800144df40e5f78f6f912cdc6a575a32

just reverted that once more, this time adding a comment :)



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

[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 dev/null |binary
 1 file changed

New commits:
commit bfbbb83857834ac21ec61e201de3b778625b8d1f
Author: Michael Stahl 
Date:   Mon Dec 17 13:50:55 2012 +0100

argh... remove accidentally committed concat-deps

Change-Id: I212bda7ac80c9903bb72ec919c4c8fc232a89cfc

diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps
deleted file mode 100755
index 2fc20c3..000
Binary files a/solenv/bin/concat-deps and /dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] rtl:: prefixes removal in oox

[Olivier Hallot (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/1334

Approvals:
  Olivier Hallot: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8b24535775df85cc5bb87cc808afcd338ec52df6
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: José Guilherme Vanz 
Gerrit-Reviewer: José Guilherme Vanz 
Gerrit-Reviewer: Olivier Hallot 

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

[Libreoffice-commits] .: l10ntools/source

[Libreoffice Gerrit user]

 l10ntools/source/propmerge.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ce2f7954fdd9c537f8904c15c150171bc14642dd
Author: Andras Timar 
Date:   Mon Dec 17 13:49:09 2012 +0100

fix ascii escaped unicode generation

Change-Id: I732a480e71c3f26ffde527c5e0eea36f814b8b03

diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 3bd44fb..8c2b97b 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -88,7 +88,9 @@ namespace
 rOfstream
 << "\\u"
 << std::setfill('0') << std::setw(2) << std::uppercase
-<< std::hex << (cUniCode >> 8) << (cUniCode & 0xFF);
+<< std::hex << (cUniCode >> 8)
+<< std::setfill('0') << std::setw(2) << std::uppercase
+<< std::hex << (cUniCode & 0xFF);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 l10ntools/source/propmerge.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a176815ee9c9ac4549794306164648e6cbc628f3
Author: Andras Timar 
Date:   Mon Dec 17 13:49:09 2012 +0100

fix ascii escaped unicode generation

Change-Id: I732a480e71c3f26ffde527c5e0eea36f814b8b03

diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 3bd44fb..8c2b97b 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -88,7 +88,9 @@ namespace
 rOfstream
 << "\\u"
 << std::setfill('0') << std::setw(2) << std::uppercase
-<< std::hex << (cUniCode >> 8) << (cUniCode & 0xFF);
+<< std::hex << (cUniCode >> 8)
+<< std::setfill('0') << std::setw(2) << std::uppercase
+<< std::hex << (cUniCode & 0xFF);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin solenv/gbuild

[Libreoffice Gerrit user]

 solenv/bin/concat-deps  |binary
 solenv/gbuild/platform/com_MSC_class.mk |3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit de1cbc17952a7e5838c0ded2ed3042171cb997c4
Author: Michael Stahl 
Date:   Mon Dec 17 13:41:12 2012 +0100

Revert "hide rc.exe splash screen"

This reverts commit c2e3d09bb740749e1a6e045ff08bf32e5812fa9e.

Quoting from my last revert of the exact same rc.exe -nologo:

 commit a6e3c2b4800144df40e5f78f6f912cdc6a575a32

 gbuild: Microsoft Resource Compiler does not do -nologo

 At least the version 6.1.6723.1 that is in the Windows SDK 6.0A only
 complains about "invalid option: -ologo".

Change-Id: Id6affdf4c833796691c903257dd515cc0d0e861e

diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps
new file mode 100755
index 000..2fc20c3
Binary files /dev/null and b/solenv/bin/concat-deps differ
diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 9a960a5..cbd39d0 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -481,11 +481,12 @@ endif
 
 gb_WinResTarget_POSTFIX :=.res
 
+# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
 define gb_WinResTarget__command
 $(call gb_Output_announce,$(2),$(true),RC ,1)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
-   $(gb_RC) -nologo \
+   $(gb_RC) \
$(DEFS) $(FLAGS) \
$(INCLUDE) \
-Fo$(1) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: rc -nologo

[Lubos Lunak]

On Monday 17 of December 2012, Stephan Bergmann wrote:
> 6e045ff08bf32e5812fa9e> "hide rc.exe splash screen" adds "-nologo" to an
> invocation of rc on Windows.  At least with my Windows build environment
> where the rc used is C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\rc
> that apparently does not understand a "nologo" switch, that causes the
> build to fail.
>
> Is the rc that is picked up for my build too old, or is the commit unsound?

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

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

[Libreoffice-commits] .: oox/source

[Libreoffice Gerrit user]

 oox/source/dump/dffdumper.cxx  |3 ---
 oox/source/dump/dumperbase.cxx |   12 ++--
 oox/source/dump/oledumper.cxx  |   24 +---
 oox/source/dump/pptxdumper.cxx |   37 ++---
 4 files changed, 29 insertions(+), 47 deletions(-)

New commits:
commit 9a30ab1b99a1041bf5f232c2bc3fbe4bc370342e
Author: José Guilherme Vanz 
Date:   Sun Dec 16 17:03:31 2012 -0200

rtl:: prefixes removal in oox

This commit removes some ::rtl:: prefixes and macros in oox

Change-Id: I8b24535775df85cc5bb87cc808afcd338ec52df6
Signed-off-by: José Guilherme Vanz 
Reviewed-on: https://gerrit.libreoffice.org/1334
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index e4a2727..b530998 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -26,9 +26,6 @@ namespace dump {
 
 // 
 
-using ::rtl::OUString;
-
-// 
 
 namespace {
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 1825b33..067cf7b 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -48,14 +48,6 @@ using namespace ::com::sun::star::uno;
 
 using ::comphelper::MediaDescriptor;
 using ::oox::core::FilterBase;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
-using ::rtl::OStringToOUString;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringToOString;
-
-// 
 
 namespace {
 
@@ -2465,7 +2457,7 @@ void XmlStreamObject::implDumpText( TextInputStream& 
rTextStrm )
 matching start/end elements and the element text on the same line. */
 OUStringBuffer aOldStartElem;
 // special handling for VML
-bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName 
).equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vml"));
+bool bIsVml = InputOutputHelper::getFileNameExtension( maSysFileName 
).equalsIgnoreAsciiCaseAscii("vml");
 
 while( !rTextStrm.isEof() )
 {
@@ -2622,7 +2614,7 @@ void RecordObjectBase::writeHeader()
 // 
 
 void SequenceRecordObjectBase::construct( const ObjectBase& rParent,
-const BinaryInputStreamRef& rxBaseStrm, const ::rtl::OUString& 
rSysFileName,
+const BinaryInputStreamRef& rxBaseStrm, const OUString& rSysFileName,
 const String& rRecNames, const String& rSimpleRecs )
 {
 BinaryInputStreamRef xRecStrm( new SequenceInputStream( *mxRecData ) );
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 5b900e9..9f26fcf 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -39,12 +39,6 @@ namespace dump {
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-// 
 // 
 
 OUString OleInputObjectBase::dumpAnsiString32( const String& rName )
@@ -552,7 +546,7 @@ void OleStorageObject::implDumpStream( const Reference< 
XInputStream >& rxStrm,
 {
 if ( rStrmName == "\001CompObj" )
 OleCompObjObject( *this, rxStrm, rSysFileName ).dump();
-else if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"\005SummaryInformation" ) ) || rStrmName.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM( "\005DocumentSummaryInformation" ) ) )
+else if( rStrmName ==  "\005SummaryInformation"  || rStrmName == 
"\005DocumentSummaryInformation" )
 OlePropertyStreamObject( *this, rxStrm, rSysFileName ).dump();
 else
 BinaryStreamObject( *this, rxStrm, rSysFileName ).dump();
@@ -1523,13 +1517,13 @@ void FormControlStreamObject::implDump()
 {
 if ( maProgId == "Forms.CommandButton.1" )
 AxCommandButtonObject( *this ).dump();
-else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Forms.TextBox.1" ) ) ||
- maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Forms.ListBox.1" ) ) ||
- maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Forms.ComboBox.1" ) ) ||
- maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Forms.CheckBox.1" ) ) ||
- maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Forms.OptionButton.1" ) ) ||
- maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"Forms.ToggleButton.1" ) ) ||
- maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"RefEdit.Ctrl" ) ) )
+else if( maProgId ==  "Forms.TextBox.1" ||
+ 

Re: rc -nologo

[Tor Lillqvist]

> Is the rc that is picked up for my build too old, or is the commit unsound?

The latter, please revert. I do think we are supposed to still fully
support building with tools from SDK 6.0A. (If not, then we should
also make sure that SDK is not found.)

I guess it is unreasonable to expect people who work on the MSVC build
environment to have all three compiler installed, especially as it is
extremely easy to get their installations royally screwed up if you
happen to install them during the wrong phase of the moon. But it sure
would be nice if one could make sure that changes to one environment
don't break another.

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

rc -nologo

[Stephan Bergmann]

 
"hide rc.exe splash screen" adds "-nologo" to an invocation of rc on 
Windows.  At least with my Windows build environment where the rc used 
is C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\rc that apparently 
does not understand a "nologo" switch, that causes the build to fail.


Is the rc that is picked up for my build too old, or is the commit unsound?

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

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

[Libreoffice Gerrit user]

 cui/source/inc/chardlg.hxx  |1 
 cui/source/tabpages/chardlg.cxx |9 ++-
 cui/uiconfig/ui/charnamepage.ui |   15 +
 svtools/inc/svtools/ctrltool.hxx|   11 
 svtools/source/control/ctrltool.cxx |   97 ++--
 5 files changed, 127 insertions(+), 6 deletions(-)

New commits:
commit 268352b13d54ac4195246f6fc75a9f490b8a4dea
Author: Caolán McNamara 
Date:   Mon Dec 17 12:29:03 2012 +

Resolves: fdo#58373 restore label for font is printer/both or unavailable

I removed it because it only refers to the Western font and not the
two other categories. But apparently there's demand for it, so
better to restore it as misleading as it is for non-Western

Change-Id: I84c0cf858c16a9cadcba8d0c3993f0b0b7ad5a45
(cherry picked from commit b53a329a7fef6262e437f8de0a771633a731704b)

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index c5b075d..587161d 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -48,6 +48,7 @@ class SvxCharBasePage : public SfxTabPage
 {
 protected:
 SvxFontPrevWindow*  m_pPreviewWin;
+FixedText*  m_pFontTypeFT;
 
 sal_Boolm_bPreviewBackgroundToCharacter;
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 4beeaeb..f412fd3 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -365,6 +365,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet& rInSet )
 m_pCTLFrame->Show(bShowCTL);
 
 get(m_pPreviewWin, "preview");
+get(m_pFontTypeFT, "fontinfo");
 
 m_pWestFontLanguageLB->SetLanguageList(LANG_LIST_WESTERN, sal_True, 
sal_False, sal_True);
 m_pEastFontLanguageLB->SetLanguageList(LANG_LIST_CJK, sal_True, sal_False, 
sal_True);
@@ -537,13 +538,15 @@ void SvxCharNamePage::UpdatePreview_Impl()
 // Font
 const FontList* pFontList = GetFontList();
 
-
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
+FontInfo aFontInfo =
+
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
 
 
calcFontInfo(rCJKFont,this,m_pEastFontNameLB,m_pEastFontStyleLB,m_pEastFontSizeLB,m_pEastFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CJK_FONT ),GetWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT ));
 
 
calcFontInfo(rCTLFont,this,m_pCTLFontNameLB,m_pCTLFontStyleLB,m_pCTLFontSizeLB,m_pCTLFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CTL_FONT ),GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
 
 m_pPreviewWin->Invalidate();
+m_pFontTypeFT->SetText( pFontList->GetFontMapText( aFontInfo ) );
 }
 
 // ---
@@ -819,6 +822,10 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, 
LanguageGroup eLangGrp
 }
 }
 
+if ( Western == eLangGrp )
+m_pFontTypeFT->SetText( pFontList->GetFontMapText(
+pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) ) );
+
 // save these settings
 pNameBox->SaveValue();
 pStyleBox->SaveValue();
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index eab5b32..df934e3 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -5,6 +5,7 @@
 True
 False
 vertical
+6
 
   
 False
@@ -623,6 +624,18 @@
   
 
 
+  
+True
+False
+0
+  
+  
+False
+True
+4
+  
+
+
   
 True
 False
@@ -657,7 +670,7 @@
 False
 True
 end
-4
+5
   
 
   
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index 33cd1e9..b90f1b6 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
@@ -83,6 +83,13 @@ Name generiert, der dem Anwender praesentiert werden kann.
 
 --
 
+XubString FontList::GetFontMapText( const FontInfo& rInfo ) const;
+
+Diese Methode gibt einen Matchstring zurueck, der dem Anwender
+anzeigen soll, welche Probleme es mit diesem Font geben kann.
+
+--
+
 FontInfo FontList::Get( const String& rName, const String& rStyleName ) const;
 
 Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName
@@ -131,6 +138,9 @@ von der FontList, sollte deshalb das Array nicht mehr 
referenziert werden.
 
 #define FONTLIST_FONTINFO_NOTFOUND  ((sal_uInt16)0x)
 
+#define FONTLIST_FONTNAMETYPE_PRINTER   ((sal_uInt16)0x0001)
+#define FONTLIST_FONTNAMETYPE_SCREEN((sal_uInt16)0x00

[Libreoffice-commits] .: cui/source cui/uiconfig svtools/inc svtools/source

[Libreoffice Gerrit user]

 cui/source/inc/chardlg.hxx  |1 
 cui/source/tabpages/chardlg.cxx |9 ++-
 cui/uiconfig/ui/charnamepage.ui |   15 +
 svtools/inc/svtools/ctrltool.hxx|   11 
 svtools/source/control/ctrltool.cxx |   97 ++--
 5 files changed, 127 insertions(+), 6 deletions(-)

New commits:
commit b53a329a7fef6262e437f8de0a771633a731704b
Author: Caolán McNamara 
Date:   Mon Dec 17 12:29:03 2012 +

Resolves: fdo#58373 restore label for font is printer/both or unavailable

I removed it because it only refers to the Western font and not the
two other categories. But apparently there's demand for it, so
better to restore it as misleading as it is for non-Western

Change-Id: I84c0cf858c16a9cadcba8d0c3993f0b0b7ad5a45

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index c5b075d..587161d 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -48,6 +48,7 @@ class SvxCharBasePage : public SfxTabPage
 {
 protected:
 SvxFontPrevWindow*  m_pPreviewWin;
+FixedText*  m_pFontTypeFT;
 
 sal_Boolm_bPreviewBackgroundToCharacter;
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 4beeaeb..f412fd3 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -365,6 +365,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet& rInSet )
 m_pCTLFrame->Show(bShowCTL);
 
 get(m_pPreviewWin, "preview");
+get(m_pFontTypeFT, "fontinfo");
 
 m_pWestFontLanguageLB->SetLanguageList(LANG_LIST_WESTERN, sal_True, 
sal_False, sal_True);
 m_pEastFontLanguageLB->SetLanguageList(LANG_LIST_CJK, sal_True, sal_False, 
sal_True);
@@ -537,13 +538,15 @@ void SvxCharNamePage::UpdatePreview_Impl()
 // Font
 const FontList* pFontList = GetFontList();
 
-
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
+FontInfo aFontInfo =
+
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
 
 
calcFontInfo(rCJKFont,this,m_pEastFontNameLB,m_pEastFontStyleLB,m_pEastFontSizeLB,m_pEastFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CJK_FONT ),GetWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT ));
 
 
calcFontInfo(rCTLFont,this,m_pCTLFontNameLB,m_pCTLFontStyleLB,m_pCTLFontSizeLB,m_pCTLFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CTL_FONT ),GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
 
 m_pPreviewWin->Invalidate();
+m_pFontTypeFT->SetText( pFontList->GetFontMapText( aFontInfo ) );
 }
 
 // ---
@@ -819,6 +822,10 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, 
LanguageGroup eLangGrp
 }
 }
 
+if ( Western == eLangGrp )
+m_pFontTypeFT->SetText( pFontList->GetFontMapText(
+pFontList->Get( pNameBox->GetText(), pStyleBox->GetText() ) ) );
+
 // save these settings
 pNameBox->SaveValue();
 pStyleBox->SaveValue();
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index eab5b32..df934e3 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -5,6 +5,7 @@
 True
 False
 vertical
+6
 
   
 False
@@ -623,6 +624,18 @@
   
 
 
+  
+True
+False
+0
+  
+  
+False
+True
+4
+  
+
+
   
 True
 False
@@ -657,7 +670,7 @@
 False
 True
 end
-4
+5
   
 
   
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index 33cd1e9..b90f1b6 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
@@ -83,6 +83,13 @@ Name generiert, der dem Anwender praesentiert werden kann.
 
 --
 
+XubString FontList::GetFontMapText( const FontInfo& rInfo ) const;
+
+Diese Methode gibt einen Matchstring zurueck, der dem Anwender
+anzeigen soll, welche Probleme es mit diesem Font geben kann.
+
+--
+
 FontInfo FontList::Get( const String& rName, const String& rStyleName ) const;
 
 Diese Methode sucht aus dem uebergebenen Namen und dem uebergebenen StyleName
@@ -131,6 +138,9 @@ von der FontList, sollte deshalb das Array nicht mehr 
referenziert werden.
 
 #define FONTLIST_FONTINFO_NOTFOUND  ((sal_uInt16)0x)
 
+#define FONTLIST_FONTNAMETYPE_PRINTER   ((sal_uInt16)0x0001)
+#define FONTLIST_FONTNAMETYPE_SCREEN((sal_uInt16)0x0002)
+
 class SVT_DLLPUBLIC FontList
 {
 private:
@@ -169,6 +179,7 @@ publ

[Libreoffice-commits] .: Branch 'feature/androidapp' - android/qa vcl/android

[Libreoffice Gerrit user]

 android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java |2 
+-
 vcl/android/androidinst.cxx|2 
+-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ff8d7c587bd6ae56bb6136ac42cab89f518fa7cb
Author: Michael Meeks 
Date:   Mon Dec 17 12:18:00 2012 +

fixup stride issue.

diff --git 
a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java 
b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
index f0956b4..287dbb6 100644
--- a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
+++ b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
@@ -309,7 +309,7 @@ public class LODesktop
 }
 
 @Override protected void onDraw(Canvas canvas) {
-canvas.drawColor(0xFF1ABCDD);
+//canvas.drawColor(0xFF1ABCDD);
 
 mDesktop.renderVCL(mBitmap);
 canvas.drawBitmap(mBitmap, 0, 0, null);
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 44be265..85b8a0f 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -935,7 +935,7 @@ typedef struct ANativeWindow_Buffer {
 ANativeWindow_Buffer dummyOut; // look like a window for now ...
 dummyOut.width = info.width;
 dummyOut.height = info.height;
-dummyOut.stride = info.stride;
+dummyOut.stride = info.stride / 4; // sigh !
 dummyOut.format = info.format;
 dummyOut.bits = pixels;
 AndroidSalInstance::getInstance()->RedrawWindows (NULL, &dummyOut);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 l10ntools/inc/po.hxx   |4 +---
 l10ntools/source/merge.cxx |   15 ---
 l10ntools/source/po.cxx|   38 +-
 3 files changed, 10 insertions(+), 47 deletions(-)

New commits:
commit d684056f9a7e75fa73439277bdda16aec2da0e46
Author: Zolnai Tamás 
Date:   Tue Dec 11 19:11:35 2012 +0100

Skip poheader

Po headers can be various and they don not
contain any needed information for merge so
skip it without any checking.

Change-Id: I6d81b7c85bfdbfd961361d98131ed80ba304e9ba

diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index ace9e09..a84b5a0 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -122,12 +122,11 @@ class PoIfstream: private boost::noncopyable
 private:
 
 std::ifstream   m_aInPut;
-boolm_bIsAfterHeader;
 boolm_bEof;
 
 public:
 
-enum Exception { INVALIDENTRY, INVALIDHEADER };
+enum Exception { INVALIDENTRY };
 
 PoIfstream();
 ~PoIfstream();
@@ -136,7 +135,6 @@ public:
 
 voidopen(const OString& rFileName);
 voidclose();
-voidreadHeader(PoHeader& rHeader);
 voidreadEntry(PoEntry& rPo);
 };
 
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 4f065fb..34f590c 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -175,21 +175,6 @@ MergeDataFile::MergeDataFile(
 printf( "Warning : Can't open %s\n", sPoFileName.getStr() );
 return;
 }
-PoHeader aPoHeader;
-try
-{
-aPoInput.readHeader( aPoHeader );
-}
-catch( PoIfstream::Exception& aException )
-{
-if( aException == PoIfstream::INVALIDHEADER )
-{
-printf(
-"Warning : %s has invalid header\n",
-sPoFileName.getStr() );
-return;
-}
-}
 
 OString sLang;
 //Get language id from path
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 41167bc..cdc2c98 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -735,7 +735,6 @@ void PoOfstream::writeEntry( const PoEntry& rPoEntry )
 
 PoIfstream::PoIfstream()
 : m_aInPut()
-, m_bIsAfterHeader( false )
 , m_bEof( false )
 {
 }
@@ -752,7 +751,14 @@ void PoIfstream::open( const OString& rFileName )
 {
 assert( !isOpen() );
 m_aInPut.open( rFileName.getStr(), std::ios_base::in );
-m_bIsAfterHeader = false;
+
+//Skip header
+std::string sTemp;
+std::getline(m_aInPut,sTemp);
+while( !sTemp.empty() && !m_aInPut.eof() )
+{
+std::getline(m_aInPut,sTemp);
+}
 m_bEof = false;
 }
 
@@ -762,35 +768,9 @@ void PoIfstream::close()
 m_aInPut.close();
 }
 
-void PoIfstream::readHeader( PoHeader& rPoHeader )
-{
-assert( isOpen() && !eof() && !m_bIsAfterHeader );
-GenPoEntry aGenPo;
-aGenPo.readFromFile( m_aInPut );
-if( !aGenPo.getExtractCom().isEmpty() &&
-aGenPo.getMsgId().isEmpty() &&
-!aGenPo.getMsgStr().isEmpty() )
-{
-if( rPoHeader.m_pGenPo )
-{
-*(rPoHeader.m_pGenPo) = aGenPo;
-}
-else
-{
-rPoHeader.m_pGenPo = new GenPoEntry( aGenPo );
-}
-rPoHeader.m_bIsInitialized = true;
-m_bIsAfterHeader = true;
-}
-else
-{
-throw INVALIDHEADER;
-}
-}
-
 void PoIfstream::readEntry( PoEntry& rPoEntry )
 {
-assert( isOpen() && !eof() && m_bIsAfterHeader );
+assert( isOpen() && !eof() );
 GenPoEntry aGenPo;
 aGenPo.readFromFile( m_aInPut );
 if( aGenPo.isNull() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/androidapp' - 2 commits - android/Bootstrap android/qa desktop/source vcl/android vcl/inc vcl/source

[Libreoffice Gerrit user]

 android/Bootstrap/Makefile.shared  |6 
 android/qa/desktop/native-code.cxx |3 
 android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java |   31 
+++
 desktop/source/app/app.cxx |2 
 desktop/source/app/sofficemain.cxx |7 
 vcl/android/androidinst.cxx|   96 
--
 vcl/inc/android/androidinst.hxx|2 
 vcl/source/app/svmain.cxx  |7 
 8 files changed, 138 insertions(+), 16 deletions(-)

New commits:
commit 5076ece1c759278d409057be22912bee4f4d46a1
Author: Michael Meeks 
Date:   Mon Dec 17 12:02:55 2012 +

get blue foo onto the screen ...

diff --git 
a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java 
b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
index 9b5f103..f0956b4 100644
--- a/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
+++ b/android/qa/desktop/src/org/libreoffice/android/examples/LODesktop.java
@@ -58,6 +58,7 @@ package org.libreoffice.android.examples;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -125,7 +126,7 @@ public class LODesktop
 private static native void spawnMain();
 
 /* implementend by vcl */
-private static native void renderVCL(Bitmap bitmap);
+public static native void renderVCL(Bitmap bitmap);
 
 /**
  * This class contains the state that is initialized once and never changes
@@ -258,26 +259,6 @@ public class LODesktop
 }
 }
 
-class BitmapView extends View {
-LODesktop mDesktop;
-private Bitmap mBitmap;
-private long mStartTime;
-
-public BitmapView(LODesktop desktop)
-{
-mDesktop = desktop;
-mBitmap = Bitmap.createBitmap(1000, 600, Bitmap.Config.ARGB_);
-}
-
-@Override protected void onDraw(Canvas canvas) {
-renderVCL(mBitmap);
-canvas.drawBitmap(mBitmap, 0, 0, null);
-
-// force a redraw / re-call of ourselves, with a different 
time-based pattern.
-invalidate();
-}
-}
-
 @Override
 public void onCreate(Bundle savedInstanceState)
 {
@@ -310,8 +291,32 @@ public class LODesktop
 finish();
 }
 
-setContentView(new BitmapView(this));
+Log.i(TAG, "onCreate - set content view\n");
+setContentView(new BitmapView(this, this));
 }
 }
 
+class BitmapView extends android.view.View
+{
+LODesktop mDesktop;
+Bitmap mBitmap;
+
+public BitmapView(Context context, LODesktop desktop)
+{
+super(context);
+mDesktop = desktop;
+mBitmap = Bitmap.createBitmap(1000, 600, Bitmap.Config.ARGB_);
+}
+
+@Override protected void onDraw(Canvas canvas) {
+canvas.drawColor(0xFF1ABCDD);
+
+mDesktop.renderVCL(mBitmap);
+canvas.drawBitmap(mBitmap, 0, 0, null);
+
+// re-call ourselves a bit later ...
+invalidate();
+}
+}
+
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 144c51f..44be265 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -263,30 +263,33 @@ void 
AndroidSalInstance::BlitFrameToWindow(ANativeWindow_Buffer *pOutBuffer,
 
 void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow, 
ANativeWindow_Buffer *pBuffer)
 {
-if (!pWindow)
-return;
-
 ANativeWindow_Buffer aOutBuffer;
 memset ((void *)&aOutBuffer, 0, sizeof (aOutBuffer));
 
+fprintf (stderr, "RedrawWindows\n");
+
 int32_t nRet = 0;
 if (pBuffer != NULL)
 aOutBuffer = *pBuffer;
 else
 {
+if (!pWindow)
+return;
+
 //ARect aRect;
 fprintf (stderr, "pre lock #3\n");
 nRet = ANativeWindow_lock(pWindow, &aOutBuffer, NULL);
 }
-fprintf (stderr, "locked window %d returned " // rect:  %d,%d->%d,%d "
+fprintf (stderr, "Frame count: %d locked window %d returned " // rect:  
%d,%d->%d,%d "
  "buffer: %dx%d stride %d, format %d, bits %p\n",
+ (int)getFrames().size(),
  nRet, // aRect.left, aRect.top, aRect.right, aRect.bottom,
  aOutBuffer.width, aOutBuffer.height, aOutBuffer.stride,
  aOutBuffer.format, aOutBuffer.bits);
 if (aOutBuffer.bits != NULL)
 {
 
-#if 0   // pre-'clean' the buffer with cruft:
+#if 1   // pre-'clean' the buffer with cruft:
 // hard-code / guess at a format ...
 int32_t *p = (int32_t

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/inc oox/source sw/qa writerfilter/source

[Libreoffice Gerrit user]

 oox/inc/oox/vml/vmlshape.hxx  |6 +
 oox/inc/oox/vml/vmltextbox.hxx|   11 ++
 oox/inc/oox/vml/vmltextboxcontext.hxx |1 
 oox/source/vml/vmlshape.cxx   |   81 +-
 oox/source/vml/vmlshapecontext.cxx|   11 +-
 oox/source/vml/vmltextbox.cxx |   38 +++-
 oox/source/vml/vmltextboxcontext.cxx  |   45 ++
 sw/qa/extras/ooxmltok/ooxmltok.cxx|   35 ++-
 sw/qa/extras/swmodeltestbase.hxx  |   10 ++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   42 +
 10 files changed, 190 insertions(+), 90 deletions(-)

New commits:
commit 2f47c9525f293481fdb07761de25cef83e76e2e8
Author: Miklos Vajna 
Date:   Wed Aug 29 09:25:40 2012 +0100

n#792778 DOCX import: parse group shapes in oox only

Previously textframes inside groupshapes were tried to be imported as
TextFrames, but then their addition to a GroupShape failed, so the text
simply ended up as a normal paragraph. Fix this by importing members of
groupshapes as drawinglayer objects, just like how the WW8 import does.

Also fix two testcases, which implicitely tested that the groupshape VML
element is ignored on import.

(cherry picked from commits 7fe05dc95d0c9a584e07483c04b13c071d55293f and
d5c934d150cb6cea5f96cbbee4fb5e8312bf027e)

Conflicts:
oox/source/vml/vmlshape.cxx
oox/source/vml/vmltextbox.cxx

Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 2bdf16e..68ae1cd 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -208,7 +208,7 @@ struct ShapeModel
 ~ShapeModel();
 
 /** Creates and returns a new shape textbox structure. */
-TextBox&createTextBox();
+TextBox&createTextBox(ShapeTypeModel& rModel);
 /** Creates and returns a new shape client data structure. */
 ClientData& createClientData();
 };
@@ -290,6 +290,10 @@ protected:
 implConvertAndInsert(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShapes >& rxShapes,
 const ::com::sun::star::awt::Rectangle& rShapeRect 
) const;
+/** Used by both RectangleShape and ComplexShape. */
+
com::sun::star::uno::ReferencecreatePictureObject(
+const com::sun::star::uno::Reference< 
com::sun::star::drawing::XShapes >& rxShapes,
+const com::sun::star::awt::Rectangle& rShapeRect, rtl::OUString& 
rGraphicPath ) const;
 
 private:
 ::rtl::OUString maService;  /// Name of the UNO shape service.
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index ed716de..3f40136 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -33,10 +33,17 @@
 #include 
 #include "oox/helper/helper.hxx"
 #include "oox/dllapi.h"
+#include 
+
+namespace com { namespace sun { namespace star {
+namespace drawing { class XShape; }
+} } }
 
 namespace oox {
 namespace vml {
 
+class ShapeTypeModel;
+
 // 
 
 /** Font settings for a text portion in a textbox. */
@@ -71,7 +78,7 @@ struct TextPortionModel
 class OOX_DLLPUBLIC TextBox
 {
 public:
-explicitTextBox();
+explicitTextBox(ShapeTypeModel& rTypeModel);
 
 /** Appends a new text portion to the textbox. */
 voidappendPortion( const TextFontModel& rFont, const 
::rtl::OUString& rText );
@@ -82,7 +89,9 @@ public:
 const TextFontModel* getFirstFont() const;
 /** Returns the entire text of all text portions. */
 ::rtl::OUString getText() const;
+void 
convert(com::sun::star::uno::Reference xShape) 
const;
 
+ShapeTypeModel& mrTypeModel;
 /// Text distance from the border (inset attribute of v:textbox), valid 
only if set.
 bool borderDistanceSet;
 int borderDistanceLeft, borderDistanceTop, borderDistanceRight, 
borderDistanceBottom;
diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx 
b/oox/inc/oox/vml/vmltextboxcontext.hxx
index abe6395..9aa0998 100644
--- a/oox/inc/oox/vml/vmltextboxcontext.hxx
+++ b/oox/inc/oox/vml/vmltextboxcontext.hxx
@@ -50,6 +50,7 @@ public:
 virtual ::oox::core::ContextHandlerRef
 onCreateContext( sal_Int32 nElement, const 
AttributeList& rAttribs );
 virtual voidonCharacters( const ::rtl::OUString& rChars );
+virtual voidonStartElement(const AttributeList& rAttribs);
 virtual voidonEndElement();
 
 private:
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index fde972c..e3f2c62 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/sour

Re: Running all 'make check' targets, even when some fail ?

[John Smith]

On Mon, Dec 17, 2012 at 10:41 AM, John Smith  wrote:
> On Mon, Dec 17, 2012 at 10:30 AM, Stephan Bergmann  
> wrote:
>>
>> Looking into Makefile.top, it might work to do
>>
>>   GMAKE_OPTIONS=-rsk make check
>>
> Thanks.
>
> Adding 'k' to GMAKE_OPTIONS in Makefile.top and then running make
> check seems to work. Lets see if it continues when the first check
> fails.
Yup, that works great.

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

RE: additional calc functions produce warnings

[Winfried Donkers]

Please disregard my mail;
I have overlooked the mails from Eike/Caolán in which the resource is found.


Winfried


> -Oorspronkelijk bericht-
> Van: libreoffice-bounces+osc=dci-electronics...@lists.freedesktop.org
> [mailto:libreoffice-bounces+osc=dci-electronics...@lists.freedesktop.org]
> Namens Winfried Donkers
> Verzonden: maandag 17 december 2012 11:39
> Aan: Caolán McNamara
> CC: tino; libreoffice@lists.freedesktop.org
> Onderwerp: RE: additional calc functions produce warnings
> 
> > . ./ooenv
> > gdb ./soffice.bin
> > break tools/source/rc/resmgr.cxx:773
> > run --calc
> > and get the backtrace of that warning. That'll help indicate what's going 
> > on.
> > These are indeed the .res file parser and so its fairly "mundane" code. e.g.
> > missing resources of double freeresource of some such
> 
> I have 2 backtraces:
> Breakpoint 1, ResMgr::RscError_Impl (pMessage=0xb61b16e5 "Cannot load
> resource! ", pResMgr=
> 0x8fa7378, nRT=377, nId=3001,
> rResStack=std::__debug::vector of length 2, capacity 2 = {...}, 
> nDepth=0)
> at /home/w.donkers/git/libo/tools/source/rc/resmgr.cxx:773
> 773 OSL_FAIL(aStr.getStr());
> 
> and
> Breakpoint 1, ResMgr::RscError_Impl (pMessage=0xb61b16e5 "Cannot load
> resource! ", pResMgr=
> 0x8aeb968, nRT=273, nId=6, rResStack=std::__debug::vector of length 4,
> capacity 4 = {...},
> nDepth=0) at /home/w.donkers/git/libo/tools/source/rc/resmgr.cxx:773
> 773 OSL_FAIL(aStr.getStr());
> 
> The difference is that I did a rebuild with enable-debug (but without make
> clean).
> I'm doing a make clean and rebuild in the hope to get more info, but that will
> take many hours as the test machine here is slow.
> 
> Winfried
> ___
> 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] .: Branch 'libreoffice-4-0' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/app/officeipcthread.cxx |   54 ++---
 desktop/source/app/officeipcthread.hxx |1 
 2 files changed, 23 insertions(+), 32 deletions(-)

New commits:
commit 6527b8a135c20e223a6fcf7c49835205a99ff02a
Author: Stephan Bergmann 
Date:   Thu Dec 13 15:41:10 2012 +0100

Related fdo#33484: Terminate OfficeIPCThread by closing the accepting pipe

... (and setting mbDowning to indicate an error returned from accept() is 
due to
termination) instead of setting up an extra pipe connection to send an
"InternalIPC::TerminateThread" message (which allegedly caused deadlocks, 
see
 "Change Idf933915: office ipc: 
use
timeout pipe feature when connecting to self").

Change-Id: Id302ca13112fc409685e7665b38f1030704a0ccf
(cherry picked from commit 4ce2602befd59e69264d8e4ced8730b40c2b947c)

Conflicts:
desktop/source/app/officeipcthread.cxx
desktop/source/app/officeipcthread.hxx

diff --git a/desktop/source/app/officeipcthread.cxx 
b/desktop/source/app/officeipcthread.cxx
index 7d477a7..56e54db 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -51,8 +51,6 @@ using ::rtl::OString;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 
-const char  *OfficeIPCThread::sc_aTerminationSequence = 
"InternalIPC::TerminateThread";
-const int OfficeIPCThread::sc_nTSeqLength = 28;
 const char  *OfficeIPCThread::sc_aShowSequence = "-tofront";
 const int OfficeIPCThread::sc_nShSeqLength = 5;
 const char  *OfficeIPCThread::sc_aConfirmationSequence = 
"InternalIPC::ProcessingDone";
@@ -427,8 +425,6 @@ OfficeIPCThread::Status 
OfficeIPCThread::EnableOfficeIPCThread()
 
 rtl::Reference< OfficeIPCThread > pThread(new OfficeIPCThread);
 
-pThread->maPipeIdent = OUString( "SingleOfficeIPC_"  );
-
 // The name of the named pipe is created with the hashcode of the user 
installation directory (without /user). We have to retrieve
 // this information from a unotools implementation.
 ::utl::Bootstrap::PathStatus aLocateResult = 
::utl::Bootstrap::locateUserInstallation( aUserInstallPath );
@@ -485,19 +481,19 @@ OfficeIPCThread::Status 
OfficeIPCThread::EnableOfficeIPCThread()
 if ( aUserInstallPathHashCode.isEmpty() )
 return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we 
cannot create a valid hash code!
 
-pThread->maPipeIdent = pThread->maPipeIdent + aUserInstallPathHashCode;
+OUString aPipeIdent( "SingleOfficeIPC_" + aUserInstallPathHashCode );
 
 PipeMode nPipeMode = PIPEMODE_DONTKNOW;
 do
 {
 osl::Security &rSecurity = Security::get();
 // Try to create pipe
-if ( pThread->maPipe.create( pThread->maPipeIdent.getStr(), 
osl_Pipe_CREATE, rSecurity ))
+if ( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE, 
rSecurity ))
 {
 // Pipe created
 nPipeMode = PIPEMODE_CREATED;
 }
-else if( pThread->maPipe.create( pThread->maPipeIdent.getStr(), 
osl_Pipe_OPEN, rSecurity )) // Creation not successfull, now we try to connect
+else if( pThread->maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, 
rSecurity )) // Creation not successfull, now we try to connect
 {
 osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle());
 char pReceiveBuffer[sc_nCSASeqLength + 1];
@@ -601,18 +597,8 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
 pGlobalOfficeIPCThread);
 pGlobalOfficeIPCThread.clear();
 
-// send thread a termination message
-// this is done so the subsequent join will not hang
-// because the thread hangs in accept of pipe
-osl::StreamPipe aPipe ( pOfficeIPCThread->maPipeIdent, osl_Pipe_OPEN, 
Security::get() );
-if (aPipe.is())
-{
-aPipe.send( sc_aTerminationSequence, sc_nTSeqLength+1 ); // also 
send 0-byte
-
-// close the pipe so that the streampipe on the other
-// side produces EOF
-aPipe.close();
-}
+pOfficeIPCThread->mbDowning = true;
+pOfficeIPCThread->maPipe.close();
 
 // release mutex to avoid deadlocks
 aMutex.clear();
@@ -680,22 +666,23 @@ void OfficeIPCThread::execute()
 // down during wait
 osl::ClearableMutexGuard aGuard( GetMutex() );
 
-if (!mbDowning)
+if ( mbDowning )
 {
-// notify client we're ready to process its args
-int nBytes = 0;
-int nResult = 0;
-while (
-(nResult = 
maStreamPipe.send(sc_aSendArgumentsSequence+nBytes, sc_nCSASeqLength-nBytes))>0 
&&
-((nBytes += nResult) < sc_nCSASeqLength) ) ;
+break;
 }
+
+// notify client we're ready to process its args
+int