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

2012-06-05 Thread Stephan Bergmann

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

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

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



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

New commits:
commit b3c76dee6d44d07eae404b8d7341e6c88e6c4429
Author: Noel Grandinn...@peralex.com
Date:   Sat May 26 13:53:19 2012 +0200

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

 Update calls to factories to use new ::create methods

 Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d
 Signed-off-by: Stephan Bergmannsberg...@redhat.com, added some tweaks.



seems to make MacOSX unhappy:

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


argh, sure, an extension must not link against comphelper

will take care

Stephan

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


Re: 3.5.3rc1 win32 / debug package ...

2012-06-05 Thread Bjoern Michaelsen
On Mon, Jun 04, 2012 at 07:11:03PM +0200, Nino wrote:
 I gave it a (first) try :)

Looking much better already. Thanks!

Best,

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


[Libreoffice-commits] .: sdext/Library_minimizer.mk sdext/source

2012-06-05 Thread Stephan Bergmann
 sdext/Library_minimizer.mk   |1 -
 sdext/source/minimizer/impoptimizer.cxx  |5 ++---
 sdext/source/minimizer/informationdialog.cxx |3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 719618f28e003c545c20a8fc94d348b667c8376a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 5 09:15:05 2012 +0200

Remove bogus dependency of extension on comphelper

Change-Id: I2a0d4bc968b9b1d285006f26603da4a98fbd870b

diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk
index f19b541..5c918c3 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_minimizer.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_api,SunPresentationMinimizer,\
 ))
 
 $(eval $(call gb_Library_use_libraries,SunPresentationMinimizer,\
-comphelper \
 cppu \
 cppuhelper \
 sal \
diff --git a/sdext/source/minimizer/impoptimizer.cxx 
b/sdext/source/minimizer/impoptimizer.cxx
index 699dc34..8afd16f 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -69,7 +69,6 @@
 #include com/sun/star/io/XSeekable.hpp
 #include com/sun/star/frame/XComponentLoader.hpp
 #include com/sun/star/util/URL.hpp
-#include comphelper/componentcontext.hxx
 
 using namespace ::std;
 using namespace ::rtl;
@@ -351,7 +350,7 @@ Reference XGraphic  ImpCompressGraphic( const Reference 
XComponentContext 
 {
 Reference XStream  xTempFile( 
rxMSF-getServiceManager()-createInstanceWithContext( 
OUString(com.sun.star.io.TempFile), rxMSF ), UNO_QUERY_THROW );
 Reference XOutputStream  xOutputStream( 
xTempFile-getOutputStream() );
-Reference XGraphicProvider  
xGraphicProvider( 
GraphicProvider::create(comphelper::ComponentContext(rxMSF).getUNOContext()) );
+Reference XGraphicProvider  
xGraphicProvider( GraphicProvider::create( rxMSF ) );
 
 ImpCompressGraphic( xGraphicProvider, 
xGraphic, xOutputStream, aDestMimeType, aLogicalSize, 
rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, 
bRemoveCropArea, aGraphicCropLogic );
 Reference XInputStream  xInputStream( 
xTempFile-getInputStream() );
@@ -371,7 +370,7 @@ Reference XGraphic  ImpCompressGraphic( const Reference 
XComponentContext 
 rtl::OUString aDestMimeType( aSourceMimeType );
 Reference XStream  xTempFile( 
rxMSF-getServiceManager()-createInstanceWithContext( 
OUString(com.sun.star.io.TempFile), rxMSF ), UNO_QUERY_THROW );
 Reference XOutputStream  xOutputStream( 
xTempFile-getOutputStream() );
-Reference XGraphicProvider  xGraphicProvider( 
GraphicProvider::create( ::comphelper::ComponentContext(rxMSF).getUNOContext() 
) );
+Reference XGraphicProvider  xGraphicProvider( 
GraphicProvider::create( rxMSF ) );
 ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, 
aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, 
rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic );
 Reference XInputStream  xInputStream( 
xTempFile-getInputStream() );
 Reference XSeekable  xSeekable( xInputStream, 
UNO_QUERY_THROW );
diff --git a/sdext/source/minimizer/informationdialog.cxx 
b/sdext/source/minimizer/informationdialog.cxx
index 7f510b6..c74599f 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -37,7 +37,6 @@
 #include sal/macros.h
 #include com/sun/star/util/URL.hpp
 #include com/sun/star/util/XURLTransformer.hpp
-#include comphelper/componentcontext.hxx
 
 #define DIALOG_WIDTH240
 #define DIALOG_HEIGHT   80
@@ -220,7 +219,7 @@ OUString InformationDialog::ImpGetStandardImage( const 
OUString sPrivateURL )
 Reference XOutputStream  xOutputStream( 
mxTempFile-getOutputStream() );
 if ( xOutputStream.is()  xPropSet.is() )
 {
-Reference graphic::XGraphicProvider  xGraphicProvider( 
graphic::GraphicProvider::create( 
::comphelper::ComponentContext(mxMSF).getUNOContext() ) );
+Reference graphic::XGraphicProvider  xGraphicProvider( 
graphic::GraphicProvider::create( mxMSF ) );
 Sequence PropertyValue  aArgs( 1 );
 aArgs[ 0 ].Name = OUString(URL);
 aArgs[ 0 ].Value = sPrivateURL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-06-05 Thread Stephan Bergmann

On 06/05/2012 08:47 AM, Stephan Bergmann wrote:

argh, sure, an extension must not link against comphelper

will take care


Fixed now as 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=719618f28e003c545c20a8fc94d348b667c8376a 
Remove bogus dependency of extension on comphelper.  Despite their 
names, those MSF variables were already references to XComponentContext, 
so comphelper::ComponentContext(X).getUNOContext() was a complicated way 
to just write X.


Stephan

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


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

2012-06-05 Thread Daniel Bankston
 sc/source/filter/xml/XMLStylesImportHelper.cxx |5 
 sc/source/filter/xml/XMLStylesImportHelper.hxx |4 
 sc/source/filter/xml/xmlcelli.cxx  |  301 ++---
 sc/source/filter/xml/xmlcelli.hxx  |8 
 4 files changed, 131 insertions(+), 187 deletions(-)

New commits:
commit b91e54a89586717fef49531d9626fbd2c75cf24e
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Tue Jun 5 02:17:07 2012 -0500

Replace CellAddress with ScAddress in ScXMLTableRowCellContext::EndElement()

Replaced CellAddress with ScAddress in EndElement() and adjusted related
methods.

Also removed commented-out code.

Also did intermediate conversion for XText::getString() as related code was 
unnecessary since there is now direct access to ScAddress cell position.

Change-Id: Ia237d0deb2d03a9d0470208d289947d474bc6d38

diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx 
b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 471e531..9947db7 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -500,10 +500,9 @@ void ScMyStylesImportHelper::AddRange(const ScRange 
rRange)
 }
 }
 
-void ScMyStylesImportHelper::AddCell(const com::sun::star::table::CellAddress 
rAddress)
+void ScMyStylesImportHelper::AddCell(const ScAddress rAddress)
 {
-ScAddress aScAddress( static_castSCCOL(rAddress.Column), 
static_castSCROW(rAddress.Row), rAddress.Sheet );
-ScRange aScRange( aScAddress, aScAddress );
+ScRange aScRange( rAddress, rAddress );
 AddRange(aScRange);
 }
 
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx 
b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 3f8b90b..c5bf5d3 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -32,8 +32,6 @@
 #include rangelst.hxx
 #include simplerangelist.hxx
 #include rtl/ustring.hxx
-#include com/sun/star/table/CellRangeAddress.hpp
-#include com/sun/star/table/CellAddress.hpp
 
 #include set
 #include vector
@@ -179,7 +177,7 @@ public:
 void SetAttributes(rtl::OUString* pStyleName,
 rtl::OUString* pCurrency, const sal_Int16 nCellType);
 void AddRange(const ScRange rRange);
-void AddCell(const com::sun::star::table::CellAddress rAddress);
+void AddCell(const ScAddress rAddress);
 void InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* 
pDoc); // a row is inserted before nRow
 void InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* 
pDoc); // a col is inserted before nCol
 void EndTable();
diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 9e36e95..e6cf759 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -42,6 +42,7 @@
 #include postit.hxx
 #include sheetdata.hxx
 #include docsh.hxx
+#include cellform.hxx
 
 #include XMLTableShapeImportHelper.hxx
 #include XMLTextPContext.hxx
@@ -282,6 +283,15 @@ void ScXMLTableRowCellContext::UnlockSolarMutex()
 }
 }
 
+namespace {
+
+bool scCellExists( const ScAddress rCellPos )
+{
+return( rCellPos.Col() = MAXCOL  rCellPos.Row() = MAXROW );
+}
+
+}
+
 void ScXMLTableRowCellContext::SetCursorOnTextImport(const rtl::OUString 
rOUTempText)
 {
 //extra step here until this area is fully converted
@@ -530,8 +540,10 @@ void 
ScXMLTableRowCellContext::SetContentValidation(com::sun::star::uno::Referen
 }
 
 void ScXMLTableRowCellContext::SetCellProperties(const 
uno::Referencetable::XCellRange xCellRange,
-const table::CellAddress 
aCellAddress)
+const ScAddress 
aScCellAddress)
 {
+com::sun::star::table::CellAddress aCellAddress;
+ScUnoConversion::FillApiAddress( aCellAddress, aScCellAddress );
 if (CellExists(aCellAddress)  pContentValidationName  
!pContentValidationName-isEmpty())
 {
 sal_Int32 nBottom = aCellAddress.Row + nRepeatedRows - 1;
@@ -557,7 +569,7 @@ void ScXMLTableRowCellContext::SetCellProperties(const 
uno::Referencetable::XCe
 }
 }
 
-void ScXMLTableRowCellContext::SetAnnotation(const table::CellAddress 
aCellAddress)
+void ScXMLTableRowCellContext::SetAnnotation(const ScAddress rPos)
 {
 ScDocument* pDoc = rXMLImport.GetDocument();
 if( !pDoc || !mxAnnotationData.get() )
@@ -565,8 +577,6 @@ void ScXMLTableRowCellContext::SetAnnotation(const 
table::CellAddress aCellAddr
 
 LockSolarMutex();
 
-ScAddress aPos;
-ScUnoConversion::FillScAddress( aPos, aCellAddress );
 ScPostIt* pNote = 0;
 
 uno::Reference drawing::XShapes  xShapes = 
rXMLImport.GetTables().GetCurrentXShapes();
@@ -589,7 +599,7 @@ void ScXMLTableRowCellContext::SetAnnotation(const 
table::CellAddress aCellAddr
 {
 OSL_ENSURE( !pCaption-GetLogicRect().IsEmpty(), 
ScXMLTableRowCellContext::SetAnnotation - 

Re: regcomp under windows, registering components

2012-06-05 Thread Stephan Bergmann

On 06/04/2012 08:14 PM, Olivier Hallot wrote:

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

what is now deploymentguimi.uno.dll ?

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


should be deploymentgui.dll now (for one, there was a move to replace 
per-platform suffixes like mi or li with a common lo, and for 
another, during gbuild'ification some lib names got changed slightly, too).



\Basis\program\services.rdb

seems to have moved to

\program\services\services.rdb,

my best guess so far... Right?


Yes (for one, the three-layer layout got unwound again, so Basis is gone 
now, and for another, service rdbs were moved into a sub-directory of 
their own, program\services).


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


[Libreoffice-commits] .: RepositoryExternal.mk

2012-06-05 Thread Bjoern Michaelsen
 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d45c4112b1cac10a46b35e10a8fcfa891840a846
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jun 5 10:05:20 2012 +0200

oh yes, we need some date_time implementation

Change-Id: I7f88382a8244799c293f23555243d381ea793685

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 67d5be6..eafe5ed 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -272,8 +272,8 @@ endif # SYSTEM_HUNSPELL
 
 ifeq ($(SYSTEM_BOOST),YES)
 
-# No need of libboostdatetime at all
 define gb_LinkTarget__use_boostdatetime
+$(call gb_LinkTarget_add_libs,$(1),-lboost_date_time)
 endef
 
 else # !SYSTEM_BOOST
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [Libreoffice-qa] [ANN] LibreOffice 3.6.0 ALPHA1 test builds available

2012-06-05 Thread Bjoern Michaelsen
On Fri, Jun 01, 2012 at 05:12:19PM +0200, Fridrich Strba wrote:
 Hi *,
 
 for the upcoming new version 3.6.0, the first public ALPHA1 builds now
 start to be available on pre-releases. 

 Builds are now being uploaded to a public (but non-mirrored - so don't
 spread news too widely!) place, as soon as they're available. Grab
 them here:
 
  http://dev-builds.libreoffice.org/pre-releases/
 
 If you've a bit of time, please give them a try  report bugs not yet in
 bugzilla. The first beta release is planned for after the feature freeze
 that will happen on 4th of June 2012.

I also finished a very early prelease package of the LibreOffice-3.6.0~alpha1.
It is:

 - i386 only
 - in https://launchpad.net/~libreoffice/+archive/libreoffice-prereleases/
 - totally untested
 - I had to disable smoketest to finish it
 - will eat your cat and sacrifice your children to Zul
 - if you throw valueable data at it or install it on a productive system and
   complain about dataloss, I will mock you in public for it ;)
 - if you file bugs however, thats of course most welcome!
 - see:
   - 
http://blog.documentfoundation.org/2012/06/03/new-and-changed-features-experience-and-test-them-now/
   - 
http://blog.documentfoundation.org/2012/05/11/new-and-changed-functions-you-can-experience-and-test-them-now/
   for things to test and try out

To test this:
 - install Ubuntu 12.04 in a VMWare/VirtualBox
 - sudo add-apt-repository ppa:libreoffice/libreoffice-prereleases
 - sudo apt-get update  sudo apt-get install libreoffice libreoffice-gnome

Dont use this on productive machines!

Best,

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


Re: Dialog About LibreOffice contents

2012-06-05 Thread Petr Mladek
On Mon, 2012-06-04 at 12:13 -0400, Yoandy Pérez Villazón wrote:
 Hi, can someone tell me where in the code is the contents of the dialog 
 (About LibreOffice)?

It is in desktop/source/app/app.cxx.

AFAIK, it is just being reworked by Astron. You might want to coordinate
your efforts :-)


Best Regards,
Petr

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


[Libreoffice-commits] .: xmloff/source

2012-06-05 Thread Thorsten Behrens
 xmloff/source/chart/PropertyMap.hxx  |2 +-
 xmloff/source/chart/SchXMLExport.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0e9598fa6c388024fa788358e26ef77b5fc3f074
Author: Thorsten Behrens tbehr...@suse.com
Date:   Tue Jun 5 10:52:17 2012 +0200

Catch more remnant ODFVER_LATEST instances.

This extends commit d0af38eaa029c2f2c2617544c8b6798c463381b9,
converting more latest-ver to 1.2-extended cases.

diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index b295eed..5ef9021 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -94,7 +94,7 @@
 #define MAP_FULL( ApiName, NameSpace, XMLTokenName, XMLType, ContextId, 
EarliestODFVersionForExport ) { ApiName, sizeof(ApiName)-1, 
XML_NAMESPACE_##NameSpace, xmloff::token::XMLTokenName, 
XMLType|XML_TYPE_PROP_CHART, ContextId, EarliestODFVersionForExport }
 #define MAP_ENTRY( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_010 }
 #define MAP_ENTRY_ODF12( a, ns, nm, t )  { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012 }
-#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_LATEST }
+#define MAP_ENTRY_ODF_EXT( a, ns, nm, t ){ a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT }
 #define MAP_CONTEXT( a, ns, nm, t, c )   { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, 
SvtSaveOptions::ODFVER_010 }
 #define MAP_SPECIAL( a, ns, nm, t, c )   { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | 
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010 }
 #define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, 
XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | 
MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012 }
diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 9cb5bc5..83a3491 100755
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3119,7 +3119,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const 
Referencebeans::XPropertySe
 const SvtSaveOptions::ODFDefaultVersion nCurrentVersion( 
SvtSaveOptions().GetODFDefaultVersion() );
 
 /// Dont export X ErrorBars for older ODF versions.
-if ( !bYError  nCurrentVersion != SvtSaveOptions::ODFVER_LATEST )
+if ( !bYError  nCurrentVersion = SvtSaveOptions::ODFVER_012 )
 return;
 
 if (xSeriesProp.is())
@@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportErrorBar( const 
Referencebeans::XPropertySe
 for( ::std::vector Reference chart2::data::XDataSequence  
::const_iterator aIt(
  aErrorBarSequences.begin()); aIt != 
aErrorBarSequences.end(); ++aIt )
 {
-if ( nCurrentVersion == SvtSaveOptions::ODFVER_LATEST )
+if ( nCurrentVersion  SvtSaveOptions::ODFVER_012 )
 {
 rtl::OUString aRole, aRange;
 Reference beans::XPropertySet  xSeqProp( *aIt, 
uno::UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: oox/source

2012-06-05 Thread Miklos Vajna
 oox/source/shape/ShapeContextHandler.cxx |   83 ++-
 oox/source/shape/ShapeFilterBase.cxx |   44 
 oox/source/shape/ShapeFilterBase.hxx |7 ++
 3 files changed, 131 insertions(+), 3 deletions(-)

New commits:
commit 110c8df2d80bd09c2848eba0091d8a1f7b51bcc9
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jun 4 12:46:17 2012 +0200

oox: import prerendered smartart into writer

Change-Id: I1c76c1bb2098c42727ae4e605e20746d0bb09463

diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index 0643603..77223c0 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -26,11 +26,17 @@
  *
  /
 
+#include com/sun/star/xml/sax/XFastSAXSerializable.hpp
+
 #include ShapeContextHandler.hxx
 #include oox/vml/vmldrawingfragment.hxx
 #include oox/vml/vmlshape.hxx
 #include oox/vml/vmlshapecontainer.hxx
 #include oox/drawingml/diagram/diagram.hxx
+#include oox/drawingml/shapegroupcontext.hxx
+#include oox/drawingml/shapestylecontext.hxx
+#include oox/drawingml/textbodycontext.hxx
+#include oox/drawingml/themefragmenthandler.hxx
 
 namespace oox { namespace shape {
 
@@ -172,7 +178,21 @@ void SAL_CALL ShapeContextHandler::startFastElement
 mpThemePtr.reset(new Theme());
 
 if (Element == DGM_TOKEN(relIds))
+{
+// Parse the theme relation, if available; the diagram won't have 
colors without it.
+if (!msRelationFragmentPath.isEmpty())
+{
+FragmentHandlerRef rFragmentHandler(new 
ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
+rtl::OUString aThemeFragmentPath = 
rFragmentHandler-getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( 
theme ) );
+uno::Referencexml::sax::XFastSAXSerializable 
xDoc(mxFilterBase-importFragment(aThemeFragmentPath), uno::UNO_QUERY_THROW);
+mxFilterBase-importFragment(new 
ThemeFragmentHandler(*mxFilterBase, aThemeFragmentPath, *mpThemePtr ), xDoc);
+ShapeFilterBase* 
pShapeFilterBase(dynamic_castShapeFilterBase*(mxFilterBase.get()));
+if (pShapeFilterBase)
+pShapeFilterBase-setCurrentTheme(mpThemePtr);
+}
+
 createFastChildContext(Element, Attribs);
+}
 
 uno::ReferenceXFastContextHandler xContextHandler(getContextHandler());
 
@@ -252,6 +272,48 @@ void SAL_CALL ShapeContextHandler::characters(const 
::rtl::OUString  aChars)
 xContextHandler-characters(aChars);
 }
 
+/// Generic (i.e. not specific to PPTX) handler for the prerendered diagram 
parsing.
+class ShapeExtDrawingFragmentHandler : public ::oox::core::FragmentHandler
+{
+public:
+ShapeExtDrawingFragmentHandler( oox::core::XmlFilterBase rFilter, const 
::rtl::OUString rFragmentPath,
+oox::drawingml::ShapePtr pGroupShapePtr ) throw()
+: FragmentHandler( rFilter, rFragmentPath ),
+mpGroupShapePtr( pGroupShapePtr )
+{
+}
+
+virtual ~ShapeExtDrawingFragmentHandler() throw()
+{
+}
+
+virtual void SAL_CALL endDocument() throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
+{
+}
+
+virtual ::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XFastContextHandler  SAL_CALL 
createFastChildContext( ::sal_Int32 Element, const 
::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XFastAttributeList  /*Attribs*/ ) throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
+{
+uno::Reference XFastContextHandler  xRet;
+
+switch( Element )
+{
+case DSP_TOKEN( spTree ):
+xRet.set( new ShapeGroupContext(*this, ShapePtr((Shape*)0), 
mpGroupShapePtr));
+break;
+default:
+break;
+}
+
+if( !xRet.is() )
+xRet = getFastContextHandler();
+
+return xRet;
+}
+
+private:
+oox::drawingml::ShapePtrmpGroupShapePtr;
+};
+
 // ::com::sun::star::xml::sax::XFastShapeContextHandler:
 uno::Reference drawing::XShape  SAL_CALL
 ShapeContextHandler::getShape() throw (uno::RuntimeException)
@@ -270,8 +332,25 @@ ShapeContextHandler::getShape() throw 
(uno::RuntimeException)
 else if (mxDiagramShapeContext.is())
 {
 basegfx::B2DHomMatrix aMatrix;
-mpShape-addShape( *mxFilterBase, mpThemePtr.get(), xShapes, 
aMatrix );
-xResult = mpShape-getXShape();
+if (mpShape-getExtDrawings().size() == 0)
+{
+xResult = mpShape-getXShape();
+mpShape-addShape( *mxFilterBase, mpThemePtr.get(), xShapes, 
aMatrix );
+}
+else
+{
+// Prerendered diagram output is available, then use that, and 
throw away the original result.
+  

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

2012-06-05 Thread Bjoern Michaelsen
On Mon, Jun 04, 2012 at 11:35:44PM +0200, Bjoern Michaelsen wrote:
 On Mon, Jun 04, 2012 at 06:53:56PM +0100, Michael Meeks wrote:
  Sigh; true - it'll mostly speedup build time then; then again we could
  filter them during / after generation I suppose.
 
 But thats not the big part - as a:
 
  du -h $(WORKDIR)/Dep/*
 
 will confirm -- CxxObjects is rather large ... Im beginning to like the idea 
 of
 gzipping those.
Finished a master build:

1.2Gworkdir/unxlngx6.pro/Dep/

of a:

5.4G.

total. Yeah, thats a bit much. Theres:

644Mworkdir/unxlngx6.pro/Dep/CxxObject

which can likely be compressed without much performance impact, giving us back
some ~500MB with gzip. Might be worth a try.

Best,

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


[Libreoffice-commits] .: 2 commits - binfilter/bf_so3 binfilter/bf_xmloff binfilter/inc

2012-06-05 Thread Caolán McNamara
 binfilter/bf_so3/source/persist/svstor.cxx  |5 -
 binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx |   83 
 binfilter/inc/bf_so3/svstor.hxx |2 
 3 files changed, 90 deletions(-)

New commits:
commit bf3ac96236b16bd7eae74e91117f41ded8b09379
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 4 20:58:57 2012 +0100

This SyncSvStream stuff isn't used

Change-Id: I827e46dc2e38646c9b9869a2230cdcd299d7a3c9

diff --git a/binfilter/bf_so3/source/persist/svstor.cxx 
b/binfilter/bf_so3/source/persist/svstor.cxx
index 51d7da8..71621aa 100644
--- a/binfilter/bf_so3/source/persist/svstor.cxx
+++ b/binfilter/bf_so3/source/persist/svstor.cxx
@@ -102,11 +102,6 @@ USHORT SvStorageStream::IsA() const
 return ID_STORAGESTREAM;
 }
 
-void SvStorageStream::SyncSvStream()
-{
-SotStorageStream::SyncSvStream();
-}
-
 ULONG SvStorageStream::GetData( void* pData, ULONG nSize )
 {
 return SotStorageStream::GetData( pData, nSize );
diff --git a/binfilter/inc/bf_so3/svstor.hxx b/binfilter/inc/bf_so3/svstor.hxx
index 8f2cd7a..335fc5b 100644
--- a/binfilter/inc/bf_so3/svstor.hxx
+++ b/binfilter/inc/bf_so3/svstor.hxx
@@ -71,8 +71,6 @@ public:
 SO2_DECL_STANDARD_CLASS_DLL(SvStorageStream,SOAPP)
 
 virtual USHORT  IsA() const;
-using SvStream::SyncSvStream;
-virtual voidSyncSvStream();
 
 virtual voidSetSize( ULONG nNewSize );
 virtual BOOLCommit();
commit b9f83fca37a3544b825de9d2f295090257d3477b
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Jun 2 23:14:45 2012 +0100

ThreeByteToFourByte and friends are no longer in use

Change-Id: I9a2aaebfc5cc6b8b6327d61270043611283a6975

diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx 
b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
index 48946da..4a83edd 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
@@ -1454,89 +1454,6 @@ void SvXMLUnitConverter::convertVector3D( OUStringBuffer 
rBuffer,
 rBuffer.append(sal_Unicode(')'));
 }
 
-const
-  sal_Char aBase64EncodeTable[] =
-{ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-  'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-  'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-  '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/' };
-
-const
-  sal_uInt8 aBase64DecodeTable[]  =
-{62,255,255,255, 63, // 43-47
-//+   /
-
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255, // 48-63
-//0   1   2   3   4   5   6   7   8   9   =
-
-255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, // 64-79
-//A   B   C   D   E   F   G   H   I   J   K   L   M   N   O
-
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255, // 80-95
-//P   Q   R   S   T   U   V   W   X   Y   Z
-
-  0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111
-//a   b   c   d   e   f   g   h   i   j   k   l   m   n   o
-
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 }; // 112-123
-//p   q   r   s   t   u   v   w   x   y   z
-
-
-
-void ThreeByteToFourByte (const sal_Int8* pBuffer, const sal_Int32 nStart, 
const sal_Int32 nFullLen, ::rtl::OUStringBuffer sBuffer)
-{
-sal_Int32 nLen(nFullLen - nStart);
-if (nLen  3)
-nLen = 3;
-if (nLen == 0)
-{
-return;
-}
-
-sal_Int32 nBinaer;
-switch (nLen)
-{
-case 1:
-{
-nBinaer = ((sal_uInt8)pBuffer[nStart + 0])  16;
-}
-break;
-case 2:
-{
-nBinaer = (((sal_uInt8)pBuffer[nStart + 0])  16) +
-(((sal_uInt8)pBuffer[nStart + 1])   8);
-}
-break;
-default:
-{
-nBinaer = (((sal_uInt8)pBuffer[nStart + 0])  16) +
-(((sal_uInt8)pBuffer[nStart + 1])   8) +
-((sal_uInt8)pBuffer[nStart + 2]);
-}
-break;
-}
-
-sal_Unicode buf[4] = { '=', '=', '=', '=' };
-
-sal_uInt8 nIndex ((nBinaer  0xFC)  18);
-buf[0] = aBase64EncodeTable [nIndex];
-
-nIndex = (nBinaer  0x3F000)  12;
-buf[1] = aBase64EncodeTable [nIndex];
-if (nLen  1)
-{
-nIndex = (nBinaer  0xFC0)  6;
-buf[2] = aBase64EncodeTable [nIndex];
-if (nLen  2)
-{
-nIndex = (nBinaer  0x3F);
-buf[3] = aBase64EncodeTable [nIndex];
-}
-}
-sBuffer.append(buf, SAL_N_ELEMENTS(buf));
-}
-
 sal_Bool SvXMLUnitConverter::convertNumFormat(
 sal_Int16 rType,
 const OUString rNumFmt,

[Libreoffice-commits] .: 3 commits - canvas/source cui/source filter/source framework/source sd/source sfx2/source svx/source toolkit/source vcl/inc vcl/source

2012-06-05 Thread Jan Holesovsky
 canvas/source/vcl/canvasbitmaphelper.cxx   |2 
 canvas/source/vcl/canvashelper.cxx |2 
 cui/source/dialogs/cuigrfflt.cxx   |2 
 filter/source/graphicfilter/eps/eps.cxx|2 
 framework/source/fwe/classes/addonsoptions.cxx |6 -
 framework/source/uielement/imagebuttontoolbarcontroller.cxx|2 
 sd/source/ui/dlg/dlgass.cxx|2 
 sd/source/ui/presenter/SlideRenderer.cxx   |2 
 sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx|2 
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx |2 
 sd/source/ui/tools/PreviewRenderer.cxx |2 
 sfx2/source/toolbox/tbxitem.cxx|2 
 svx/source/gallery2/galobj.cxx |2 
 toolkit/source/awt/vclxmenu.cxx|2 
 vcl/inc/vcl/bitmap.hxx |4 
 vcl/inc/vcl/bitmapex.hxx   |4 
 vcl/source/gdi/bitmap3.cxx |   60 
+++---
 vcl/source/gdi/bitmapex.cxx|2 
 vcl/source/gdi/pdfwriter_impl2.cxx |2 
 vcl/source/helper/canvasbitmap.cxx |2 
 20 files changed, 65 insertions(+), 41 deletions(-)

New commits:
commit 94f87ad9b1e50bb4458eb0b3e87dd053b636094f
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jun 4 15:02:45 2012 +0200

Let's be bold, and default to the nice method when scaling.

[ie. use BMP_SCALE_FAST only where explicitly asked for.]

Change-Id: Ia5eccc786262216a803b989b073ffd9c1ed78377

diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 14aae27..8b11318 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -538,7 +538,7 @@ public:
 @return sal_True, if the operation was completed successfully.
  */
 sal_BoolScale( const Size rNewSize,
-   sal_uLong nScaleFlag = BMP_SCALE_FAST );
+   sal_uLong nScaleFlag = BMP_SCALE_LANCZOS );
 
 /** Scale the bitmap
 
@@ -551,7 +551,7 @@ public:
 @return sal_True, if the operation was completed successfully.
  */
 sal_BoolScale( const double rScaleX, const double 
rScaleY,
-   sal_uLong nScaleFlag = BMP_SCALE_FAST );
+   sal_uLong nScaleFlag = BMP_SCALE_LANCZOS );
 
 /** Rotate bitmap by the specified angle
 
diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index c9e4627..f1f46d3 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.hxx
@@ -254,7 +254,7 @@ public:
 
 @return sal_True, if the operation was completed successfully.
  */
-sal_BoolScale( const Size rNewSize, sal_uLong nScaleFlag 
= BMP_SCALE_FAST );
+sal_BoolScale( const Size rNewSize, sal_uLong nScaleFlag 
= BMP_SCALE_LANCZOS );
 
 /** Scale the bitmap
 
@@ -266,7 +266,7 @@ public:
 
 @return sal_True, if the operation was completed successfully.
  */
-sal_BoolScale( const double rScaleX, const double 
rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FAST );
+sal_BoolScale( const double rScaleX, const double 
rScaleY, sal_uLong nScaleFlag = BMP_SCALE_LANCZOS );
 
 /** Rotate bitmap by the specified angle
 
commit 9afb6e1e38c362a768e8e981f7b03cf8bcaf22cf
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jun 4 14:47:18 2012 +0200

Use BMP_SCALE_LANCZOS instead of BMP_SCALE_INTERPOLATE.

Where we explicitly ask for better quality, use BMP_SCALE_LANCZOS, instead 
of
BMP_SCALE_INTERPOLATE.

Change-Id: I28ddf3290204532a8660e09ee9ab0949b6ce1c73

diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx 
b/canvas/source/vcl/canvasbitmaphelper.cxx
index 3032c18..cceaf7b 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.cxx
@@ -129,7 +129,7 @@ namespace vclcanvas
 BitmapEx aRes( mpBackBuffer-getBitmapReference() );
 
 aRes.Scale( ::vcl::unotools::sizeFromRealSize2D(newSize),
- beFast ? BMP_SCALE_FAST : BMP_SCALE_INTERPOLATE );
+ beFast ? BMP_SCALE_FAST : BMP_SCALE_LANCZOS );
 
 return uno::Reference rendering::XBitmap (
 new CanvasBitmap( aRes, *mpDevice, mpOutDevReference ) );
diff --git a/canvas/source/vcl/canvashelper.cxx 
b/canvas/source/vcl/canvashelper.cxx
index 83f3ccf..ba36f40 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -927,7 +927,7 @@ namespace vclcanvas
 Bitmap aBitmap( rOutDev.GetBitmap(aEmptyPoint, aBmpSize) );
 
 

watch out for check entries in menus

2012-06-05 Thread Caolán McNamara
We have a lot of menu entries that are checkable. They have checkboxes
in them or they have radio buttons. Some of the these entries are a
little broken in that they can have check marks in them but they are not
marked as truly checkable. 

If a menu entry is broken the symptoms are that, if you have a theme
that draws a blank box for unchecked entries and a tick mark for checked
entries, then when the state is unchecked you get a menu entry without
the unchecked box but when its checked you get a menu entry with a
check mark. The inconsistency from non-broken entries is annoying

I fixed a pile of these over the w/e, but if anyone sees any more then
let me know. Its hardly a critical bug, but they're easy to fix and
polish the UI experience a bit.

C.

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


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

2012-06-05 Thread Jan Holesovsky
Hi Tomaz,

On 2012-06-05 at 07:34 +0200, Tomaž Vajngerl wrote:

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

Great stuff - I have pushed your patch, and also my patches to default
to Lanczos filter.  Can you please add an example of before and
after where the advantages of the Lanzcos filter are nicely visible to
the Release Notes (http://wiki.documentfoundation.org/ReleaseNotes/3.6)?

Adding the QA list to the CC: - thanks to Tomaz, we have changed the
default of the image resize operations to a new scaling operation.
Please be careful about bugs that involve scaling of images, quality of
eg. PDF output, or speed of such operations.

Tomaz - what interests you next? :-)  You've already outlined some ideas
regarding the filters, correct?

Thank you a lot,
Kendy



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


[Libreoffice-commits] .: oox/Library_oox.mk oox/source

2012-06-05 Thread Miklos Vajna
 oox/Library_oox.mk   |1 
 oox/source/shape/ShapeContextHandler.cxx |   50 
 oox/source/shape/ShapeDrawingFragmentHandler.cxx |   71 +++
 oox/source/shape/ShapeDrawingFragmentHandler.hxx |   56 ++
 4 files changed, 130 insertions(+), 48 deletions(-)

New commits:
commit baa591a93566632471a804a3425d1e04a9166126
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jun 5 11:37:20 2012 +0200

oox: move ShapeDrawingFragmentHandler to its own file

Change-Id: I12b057555e00f3623c45c831f4042747f140ff92

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 2301fd7..928e0b6 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -275,6 +275,7 @@ $(eval $(call gb_Library_add_exception_objects,oox,\
 oox/source/ppt/timetargetelementcontext \
 oox/source/ppt/extdrawingfragmenthandler \
 oox/source/shape/ShapeContextHandler \
+oox/source/shape/ShapeDrawingFragmentHandler \
 oox/source/shape/ShapeFilterBase \
 oox/source/token/namespacemap \
 oox/source/token/propertynames \
diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index 77223c0..0d59ffe 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -29,13 +29,9 @@
 #include com/sun/star/xml/sax/XFastSAXSerializable.hpp
 
 #include ShapeContextHandler.hxx
+#include ShapeDrawingFragmentHandler.hxx
 #include oox/vml/vmldrawingfragment.hxx
 #include oox/vml/vmlshape.hxx
-#include oox/vml/vmlshapecontainer.hxx
-#include oox/drawingml/diagram/diagram.hxx
-#include oox/drawingml/shapegroupcontext.hxx
-#include oox/drawingml/shapestylecontext.hxx
-#include oox/drawingml/textbodycontext.hxx
 #include oox/drawingml/themefragmenthandler.hxx
 
 namespace oox { namespace shape {
@@ -272,48 +268,6 @@ void SAL_CALL ShapeContextHandler::characters(const 
::rtl::OUString  aChars)
 xContextHandler-characters(aChars);
 }
 
-/// Generic (i.e. not specific to PPTX) handler for the prerendered diagram 
parsing.
-class ShapeExtDrawingFragmentHandler : public ::oox::core::FragmentHandler
-{
-public:
-ShapeExtDrawingFragmentHandler( oox::core::XmlFilterBase rFilter, const 
::rtl::OUString rFragmentPath,
-oox::drawingml::ShapePtr pGroupShapePtr ) throw()
-: FragmentHandler( rFilter, rFragmentPath ),
-mpGroupShapePtr( pGroupShapePtr )
-{
-}
-
-virtual ~ShapeExtDrawingFragmentHandler() throw()
-{
-}
-
-virtual void SAL_CALL endDocument() throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
-{
-}
-
-virtual ::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XFastContextHandler  SAL_CALL 
createFastChildContext( ::sal_Int32 Element, const 
::com::sun::star::uno::Reference 
::com::sun::star::xml::sax::XFastAttributeList  /*Attribs*/ ) throw 
(::com::sun::star::xml::sax::SAXException, 
::com::sun::star::uno::RuntimeException)
-{
-uno::Reference XFastContextHandler  xRet;
-
-switch( Element )
-{
-case DSP_TOKEN( spTree ):
-xRet.set( new ShapeGroupContext(*this, ShapePtr((Shape*)0), 
mpGroupShapePtr));
-break;
-default:
-break;
-}
-
-if( !xRet.is() )
-xRet = getFastContextHandler();
-
-return xRet;
-}
-
-private:
-oox::drawingml::ShapePtrmpGroupShapePtr;
-};
-
 // ::com::sun::star::xml::sax::XFastShapeContextHandler:
 uno::Reference drawing::XShape  SAL_CALL
 ShapeContextHandler::getShape() throw (uno::RuntimeException)
@@ -345,7 +299,7 @@ ShapeContextHandler::getShape() throw 
(uno::RuntimeException)
 DiagramGraphicDataContext* pDiagramGraphicDataContext = 
dynamic_castDiagramGraphicDataContext*(mxDiagramShapeContext.get());
 rtl::OUString 
aFragmentPath(pDiagramGraphicDataContext-getFragmentPathFromRelId(*aIt));
 oox::drawingml::ShapePtr pShapePtr( new Shape( 
com.sun.star.drawing.GroupShape ) );
-mxFilterBase-importFragment(new 
ShapeExtDrawingFragmentHandler(*mxFilterBase, aFragmentPath, pShapePtr));
+mxFilterBase-importFragment(new 
ShapeDrawingFragmentHandler(*mxFilterBase, aFragmentPath, pShapePtr));
 pShapePtr-addShape( *mxFilterBase, mpThemePtr.get(), 
xShapes, aMatrix );
 xResult = pShapePtr-getXShape();
 }
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx 
b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
new file mode 100644
index 000..6e2381c
--- /dev/null
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public 

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

2012-06-05 Thread Noel Grandin



On 2012-06-05 11:14, Bjoern Michaelsen wrote:
Yes, but in this case buildspeed and disksize are likely a tradeoff. 
Making the build smaller will likely make it slower.
Not necessarily. On rotating disks, it can be cheaper to compress 
because it results in less IO.



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


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


Re: [Patch] Make new About dialogue a little nicer

2012-06-05 Thread Stefan Knorr (Astron)
Hi.

I've received some feedback (almost unreadable copyright text etc.)
which I've incorporated. Additionally I found that the gradient in the
background didn't make much sense on many systems, especially when the
window colour is dark. So now, the background contains a white to
green gradient, not a transparent to green gradient.

I almost bothered to start on a high-contrast version, but since I
didn't know how to best get to my high-contrast logo and high-contrast
background, I will leave that for someone else.

Updated patch attached.

Screenshot links from below still work.


Astron.


On 4 June 2012 16:32, Stefan Knorr (Astron) heinzless...@googlemail.com wrote:
 Hi,

 Since I noticed, the beta is supposed to be tagged today or tomorrow
 already and we in the Design team had talked about our new About thing
 a little...
 and I also don't seem to have anything to do... I made this patch for About.
 It does the following:
 * it removes the bevel from the SVG background
 * it removes the hardcoded button colour for the Website button (and
 also changes it's text, so it looks less like a link)
 * it unhides the Close button
 * it moves the button row below the copyright text

 Requisite screenshots:
 Before: 
 https://wiki.documentfoundation.org/File:Libreoffice-new-about-dialog.png
 After: https://wiki.documentfoundation.org/File:Modified-new-about-dialog.png

 I would be grateful if someone could take a look at this and commit it
 or well, not.

 Regards,

 Astron.


0001-Make-the-new-About-dialog-a-little-nicer.patch.tar.bz2
Description: BZip2 compressed data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: Dialog About LibreOffice contents

2012-06-05 Thread Stefan Knorr (Astron)
Hi Yoandy,

I just posted a patch on this list. Unless there are any obvious
problems with it, I think I am not going to work any more this...

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


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

2012-06-05 Thread Lubos Lunak
 glib/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4cf7551c24f5dad694fecbb2b80b2b52173ffdb7
Author: Luboš Luňák l.lu...@suse.cz
Date:   Tue Jun 5 12:02:39 2012 +0200

correct path to dirent.h for win32 glib build

diff --git a/glib/makefile.mk b/glib/makefile.mk
index 77ad4f0..b81cc53 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -164,7 +164,7 @@ OUT2LIB+=gobject/gobject-2.0.lib
 OUT2LIB+=gthread/gthread-2.0.lib
 
 .IF $(OS)==WNT
-OUT2INC+=build$/win32$/dirent.h
+OUT2INC+=build$/win32$/dirent/dirent.h
 .ENDIF
 OUT2INC+=build$/win32$/make.msc
 OUT2INC+=build$/win32$/module.defs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [Patch] Make new About dialogue a little nicer

2012-06-05 Thread Riccardo Magliocchetti

Hi Stefan,

Il 05/06/2012 11:58, Stefan Knorr (Astron) ha scritto:
[snip]

Screenshot links from below still work.

On 4 June 2012 16:32, Stefan Knorr (Astron)heinzless...@googlemail.com  wrote:

Requisite screenshots:
Before: 
https://wiki.documentfoundation.org/File:Libreoffice-new-about-dialog.png
After: https://wiki.documentfoundation.org/File:Modified-new-about-dialog.png


It looks way cleaner, also what do you think about to align all the text 
above buttons to left instead of center ?


thanks,
riccardo

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


[Libreoffice-commits] .: 5 commits - cui/source extras/prj extras/source extras/util icon-themes/galaxy icon-themes/hicontrast

2012-06-05 Thread Stefan Knorr
 cui/source/dialogs/hyperdlg.src  |2 
 dev/null |binary
 extras/prj/build.lst |1 
 extras/source/symbols/delzip |1 
 extras/source/symbols/makefile.mk|   51 ---
 extras/util/target.pmk   |3 
 icon-themes/galaxy/svx/res/doc_modified.svg  |   87 +++
 icon-themes/galaxy/svx/res/doc_modified_feedback.png |binary
 icon-themes/galaxy/svx/res/doc_modified_no_14.png|binary
 icon-themes/galaxy/svx/res/doc_modified_yes_14.png   |binary
 icon-themes/hicontrast/res/sx03145.png   |binary
 11 files changed, 88 insertions(+), 57 deletions(-)

New commits:
commit df26c5f47ec3e80e0697bbf38882f0ed7e3aa1f7
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date:   Tue Jun 5 11:27:49 2012 +0200

New file status indicators

To fit better in with the rest of the new statusbar elements

Change-Id: Ifad97b71f55920c0ef32d8cdcb9f9b189a6bafa5

diff --git a/icon-themes/galaxy/svx/res/doc_modified.svg 
b/icon-themes/galaxy/svx/res/doc_modified.svg
new file mode 100644
index 000..6c42475
--- /dev/null
+++ b/icon-themes/galaxy/svx/res/doc_modified.svg
@@ -0,0 +1,87 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+!-- Created with Inkscape (http://www.inkscape.org/) --
+
+svg
+   xmlns:dc=http://purl.org/dc/elements/1.1/;
+   xmlns:cc=http://creativecommons.org/ns#;
+   xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+   xmlns:svg=http://www.w3.org/2000/svg;
+   xmlns=http://www.w3.org/2000/svg;
+   version=1.2
+   width=44
+   height=11
+   id=svg2
+  defs
+ id=defs4 /
+  metadata
+ id=metadata7
+rdf:RDF
+  cc:Work
+ rdf:about=
+dc:formatimage/svg+xml/dc:format
+dc:type
+   rdf:resource=http://purl.org/dc/dcmitype/StillImage; /
+dc:title/dc:title
+  /cc:Work
+/rdf:RDF
+  /metadata
+  g
+ transform=translate(0,-1042.2329)
+ id=layer1
+g
+   id=g12289
+  path
+ d=m 2,1042.2318 0,11 9,0 0,-4.0629 -1,1 0,2.0629 -7,0 0,-9 7,0 
0,2.6871 1,-1 0,-2.6871 z
+ id=rect12049
+ style=fill:#00;fill-opacity:0.39215686;stroke:none /
+  path
+ d=m 12.25,1045.0923 -4.25,4.25 -1.75,-1.7813 -0.71875,0.7188 
2.484375,2.4531 4.953125,-4.9219 z
+ id=rect12076
+ style=fill:#4e9a06;fill-opacity:1;stroke:none /
+/g
+g
+   id=g12278
+  path
+ d=m 17,1.15625 0,11 9,0 0,-2 -1,0 0,1 -7,0 0,-9 7,0 0,1 1,0 0,-2 
-9,0 z
+ transform=translate(0,1041.0756)
+ id=rect12049-5
+ style=fill:#00;fill-opacity:0.39215686;stroke:none /
+  g
+ transform=matrix(0.88835382,0,0,0.85685397,6.4153812,149.84411)
+ id=text12229
+ 
style=font-size:13.79506969px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#a4;fill-opacity:1;stroke:none;font-family:Cantarell;-inkscape-font-specification:Cantarell
+path
+   d=m 20.903735,1044.9725 0.124156,2.1382 -1.79336,-1.1864 
-0.565597,1.0071 1.917514,0.9656 -1.917514,0.9519 0.565597,1.007 
1.79336,-1.1863 -0.124156,2.1382 1.144991,0 -0.110361,-2.1382 1.793359,1.1863 
0.565598,-1.007 -1.917515,-0.9519 1.917515,-0.9656 -0.565598,-1.0071 
-1.793359,1.1864 0.110361,-2.1382 -1.144991,0
+   id=path12234 /
+  /g
+/g
+g
+   id=g12283
+  g
+ id=g12293
+path
+   d=m 32,1042.2329 0,11 9,0 0,-4.063 -1,1 0,2.063 -7,0 0,-9 7,0 
0,2.687 1,-1 0,-2.687 z
+   id=rect12049-8
+   style=fill:#00;fill-opacity:0.39215686;stroke:none /
+path
+   d=m 42.25,1045.0922 -4.25,4.25 -1.75,-1.7812 -0.71875,0.7187 
2.484375,2.4532 4.953125,-4.9219 z
+   id=rect12076-0
+   style=fill:#00;fill-opacity:0.39215686;stroke:none /
+  /g
+/g
+rect
+   width=1
+   height=14
+   x=14
+   y=1041.2329
+   id=rect12399
+   style=fill:#5c3566;fill-opacity:1;stroke:none /
+rect
+   width=1
+   height=14
+   x=29
+   y=1041.2329
+   id=rect12399-2
+   style=fill:#5c3566;fill-opacity:1;stroke:none /
+  /g
+/svg
diff --git a/icon-themes/galaxy/svx/res/doc_modified_feedback.png 
b/icon-themes/galaxy/svx/res/doc_modified_feedback.png
index 1fa1f74..0dc824d 100644
Binary files a/icon-themes/galaxy/svx/res/doc_modified_feedback.png and 
b/icon-themes/galaxy/svx/res/doc_modified_feedback.png differ
diff --git a/icon-themes/galaxy/svx/res/doc_modified_no_14.png 
b/icon-themes/galaxy/svx/res/doc_modified_no_14.png
index 2fbd22e..c824b09 100644
Binary files a/icon-themes/galaxy/svx/res/doc_modified_no_14.png and 
b/icon-themes/galaxy/svx/res/doc_modified_no_14.png differ
diff --git a/icon-themes/galaxy/svx/res/doc_modified_yes_14.png 

Re: getting a list at build time of supported languages ?

2012-06-05 Thread Caolán McNamara
On Mon, 2012-04-16 at 14:18 +0200, Eike Rathke wrote:
 If it's languages that can be used as character attribution that would
 be svtools/source/misc/langtab.src

With 2b2bdcf84fc1ea41c4d9e69d53ba9f1177da9bdd I added a little dumbo
utility to write these out the way I wanted. Not enabled for anything
except Linux at the moment.

C.


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


[Libreoffice-commits] .: sw/source

2012-06-05 Thread Michael Stahl
 sw/source/core/layout/frmtool.cxx |   43 +++---
 1 file changed, 27 insertions(+), 16 deletions(-)

New commits:
commit 960d72c0d721b08dcf331c8caf51ea4a99b501ef
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 12:59:30 2012 +0200

Revert fdo#39006: Fixed layout loop

This reverts commit 2a22e664811e10ca58ec66ba8fd10b1a6185c178.

i don't have an opinion whether this commit is wrong or right,
but nobody has time to investigate the layout changes that it causes,
so since it's not a regression itself it's safest to revert it.

diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index d1ff0b3..4cf9a6c 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -724,22 +724,33 @@ SwFlyNotify::~SwFlyNotify()
  ( !pFly-ISA(SwFlyFreeFrm) ||
!static_castSwFlyFreeFrm*(pFly)-IsNoMoveOnCheckClip() ) )
 {
-// lock position
-pFly-LockPosition();
-
-if ( !pFly-ConsiderForTextWrap() )
-{
-// indicate that object has to be considered for text wrap
-pFly-SetConsiderForTextWrap( true );
-// invalidate 'background' in order to allow its 'background'
-// to wrap around it.
-pFly-NotifyBackground( pFly-GetPageFrm(),
-pFly-GetObjRectWithSpaces(),
-PREP_FLY_ARRIVE );
-// invalidate position of anchor frame in order to force
-// a re-format of the anchor frame, which also causes a
-// re-format of the invalid previous frames of the anchor frame.
-pFly-AnchorFrm()-InvalidatePos();
+// #i54138# - suppress restart of the layout process
+// on changed frame height.
+// Note: It doesn't seem to be necessary and can cause layout loops.
+if ( bPosChgd )
+{
+// indicate a restart of the layout process
+pFly-SetRestartLayoutProcess( true );
+}
+else
+{
+// lock position
+pFly-LockPosition();
+
+if ( !pFly-ConsiderForTextWrap() )
+{
+// indicate that object has to be considered for text wrap
+pFly-SetConsiderForTextWrap( true );
+// invalidate 'background' in order to allow its 'background'
+// to wrap around it.
+pFly-NotifyBackground( pFly-GetPageFrm(),
+pFly-GetObjRectWithSpaces(),
+PREP_FLY_ARRIVE );
+// invalidate position of anchor frame in order to force
+// a re-format of the anchor frame, which also causes a
+// re-format of the invalid previous frames of the anchor 
frame.
+pFly-AnchorFrm()-InvalidatePos();
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-06-05 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 39006, which changed state.

Bug 39006 Summary: FILEOPEN: LibreOffice hangs with 100% CPU usage on specific 
.doc file
https://bugs.freedesktop.org/show_bug.cgi?id=39006

   What|Old Value   |New Value

 Resolution|FIXED   |
 Status|RESOLVED|REOPENED

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


[Bug 35673] LibreOffice 3.4 most annoying bugs

2012-06-05 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=35673

Bug 35673 depends on bug 39006, which changed state.

Bug 39006 Summary: FILEOPEN: LibreOffice hangs with 100% CPU usage on specific 
.doc file
https://bugs.freedesktop.org/show_bug.cgi?id=39006

   What|Old Value   |New Value

 Resolution|FIXED   |
 Status|RESOLVED|REOPENED

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


[Libreoffice-commits] .: sw/source

2012-06-05 Thread Philipp Weissenbacher
 sw/source/core/text/porlay.hxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f404878976f228859379b803448fe9ce15278fef
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Tue Jun 5 13:18:54 2012 +0200

Post-translation clean-up with small formatting change

Change-Id: I0f237c360cfaa02c6492cbd95ebfd07657e04fd0

diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index e7f9559..36feb86 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -45,7 +45,7 @@ class SvStream;
 class SwTxtFormatter;
 
 /*
- *  class SwCharRange
+ * class SwCharRange
  */
 
 class SwCharRange
@@ -72,12 +72,12 @@ public:
 };
 
 /*
- *  class SwRepaint
+ * class SwRepaint
  */
 
 // SwRepaint is a document-global SwRect
 // nOfst states from where in the first line should be painted
-// nRightOfst gives teh right margin
+// nRightOfst gives the right margin
 class SwRepaint : public SwRect
 {
 SwTwips nOfst;
@@ -94,7 +94,7 @@ public:
 };
 
 /*
- *  class SwLineLayout
+ * class SwLineLayout
  */
 
 class SwLineLayout : public SwTxtPortion
@@ -117,7 +117,7 @@ private:
 sal_Bool bContent   : 1; // Text for line numbering
 sal_Bool bRedline   : 1; // The Redlining
 sal_Bool bForcedLeftMargin : 1; // Left adjustment moved by the Fly
-sal_Bool bHanging : 1; // contents a hanging portion in the margin
+sal_Bool bHanging : 1; // Contains a hanging portion in the margin
 sal_Bool bUnderscore : 1;
 
 SwTwips _GetHangingMargin() const;
@@ -270,7 +270,7 @@ class SwParaPortion : public SwLineLayout
 // Fraction aZoom;
 long nDelta;
 
-// If a SwTxtFrma is locked, no changes occur to the formatting data (under
+// If a SwTxtFrm is locked, no changes occur to the formatting data (under
 // pLine) (compare with Orphans)
 sal_Bool bFlys  : 1; // Overlapping Flys?
 sal_Bool bPrep  : 1; // PREP_*
@@ -280,8 +280,8 @@ class SwParaPortion : public SwLineLayout
 sal_Bool bFollowField   : 1; // We have a bit of field left for the Follow
 
 sal_Bool bFixLineHeight : 1; // Fixed line height
-sal_Bool bFtnNum: 1; // contents a footnotenumberportion
-sal_Bool bMargin: 1; // contents a hanging punctuation in the margin
+sal_Bool bFtnNum: 1; // contains a footnotenumberportion
+sal_Bool bMargin: 1; // contains a hanging punctuation in the margin
 
 sal_Bool bFlag00: 1;
 sal_Bool bFlag11: 1;
@@ -372,7 +372,7 @@ public:
 };
 
 /*
- *  Inline-Implementierungen
+ * Inline implementations
  */
 
 inline void SwLineLayout::ResetFlags()
@@ -408,7 +408,7 @@ inline void SwParaPortion::FormatReset()
 }
 
 #ifdef UNX
-// The terniary expression is too much for the C30
+// The ternary expression is too much for the C30
 inline SwLinePortion *SwLineLayout::GetFirstPortion() const
 {
 SwLinePortion *pTmp = pPortion;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-06-05 Thread Caolán McNamara
 dbaccess/source/core/api/KeySet.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 38786a76cf3dbc421635d40354e8c9ece409c6c5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jun 1 11:42:53 2012 +0200

fdo#50372: crash when refresh of last already-known row unexpectedly fails

Instead, try to do the least unreasonable thing:
Fetch a new row
If that fails because no new row to fetch, at least we are properly 
positioned after last row. Calling code may not expect that and get confused, 
but that is the best we can do.

Change-Id: Ib7248e99ae3deee8344e9386cac2c9440e8bccd8

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 74b8b17..881da40 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1375,10 +1375,23 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, 
RuntimeException)
 sal_Bool bOK = m_xSet-next();
 if ( !bOK )
 {
+// This row has disappeared; remove it.
 OKeySetMatrix::iterator aTemp = m_aKeyIter;
+// use *next* row
 ++m_aKeyIter;
 m_aKeyMap.erase(aTemp);
---m_rRowCount;
+
+// adjust RowCount for the row we have removed
+if (m_rRowCount  0)
+--m_rRowCount;
+else
+OSL_FAIL(m_rRowCount got out of sync: non-empty m_aKeyMap, but 
m_rRowCount = 0);
+
+if (!isAfterLast())
+{
+// it was the last row, but there may be another one to fetch
+fetchRow();
+}
 refreshRow();
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH][PUSHED][REVIEW:3-5] fdo#50372 crash on timestamp primary key

2012-06-05 Thread Caolán McNamara
On Fri, 2012-06-01 at 17:15 +0200, Lionel Elie Mamane wrote:
 Attached patch fixes a crash when a row fails to refresh
 correctly. This can be triggered when the primary key is a timestamp
 column with SQLite (because LibO truncates timestamp values and thus
 does not find the exact same value back).

pushed to 3-5 now.

C

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


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

2012-06-05 Thread Caolán McNamara
 dbaccess/source/core/api/KeySet.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 16910edcae542e8eb8a5f9b4278aceaa39262b44
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jun 1 16:40:41 2012 +0200

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

This avoids asking the driver for the same data twice.
This is particularly important for ODBC data sources, because when asking 
for (VAR)CHAR data the second time, one gets no data (and status SQL_NO_DATA) 
because of the retrieve in parts semantics of these datatypes.

Change-Id: I96f2df9927fda72ccf19f78ec5c561f5626c003f

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 881da40..44c17d8 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1271,8 +1271,7 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 
row,sal_Bool i_bFetchRow )
 bNext = fetchRow();
 if ( bNext )
 {
-m_xRow.set(m_xDriverRow,UNO_QUERY_THROW);
-return m_aKeyIter != m_aKeyMap.end()  m_aKeyIter != 
m_aKeyMap.begin();
+i_bFetchRow = true;
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH][PUSHED] [REVIEW:3-5] fdo#47520: ODBC (var)char primary key: column shown empty

2012-06-05 Thread Caolán McNamara
On Fri, 2012-06-01 at 17:11 +0200, Lionel Elie Mamane wrote:
 Technically a continuation of the fix of fdo#48345; the latter removed
 the m_xRow.set(m_xDriverRow,UNO_QUERY_THROW); from OKeySet::next,
 this one removes it from OKeySet::absolute().

err..., ok if you say so :-), pushed to 3-5.

C.

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


Re: Wasted a day on an Android bug...

2012-06-05 Thread Iain Billett
Just a quick update of where I'm at. I've implemented an OpenGL graphics
surface and can render a resource bitmap onto a plane. I've also got
pinch-to-zoom and scrolling the document working but that still needs
some work. What I'm doing now is to combine this code with DocumentLoader
to render actual LibreOffice documents. I'll also work on incorporating
this with the general app UI stuff I wrote at the beginning.

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


Re: [Libreoffice-ux-advise] [PUSHED] Make new About dialogue a little nicer

2012-06-05 Thread Petr Mladek
On Tue, 2012-06-05 at 12:06 +0200, Riccardo Magliocchetti wrote:
 Hi Stefan,
 
 Il 05/06/2012 11:58, Stefan Knorr (Astron) ha scritto:
 [snip]
  Screenshot links from below still work.
 
  On 4 June 2012 16:32, Stefan Knorr (Astron)heinzless...@googlemail.com  
  wrote:
  Requisite screenshots:
  Before: 
  https://wiki.documentfoundation.org/File:Libreoffice-new-about-dialog.png
  After: 
  https://wiki.documentfoundation.org/File:Modified-new-about-dialog.png
 
 It looks way cleaner, also what do you think about to align all the text 
 above buttons to left instead of center ?

I prefer the new version as well, so pushed into master. It will be in
the 3-6 branch.

Feel free to commit more improvements into master and even 3-6 branch
during the beta phase.


Best Regards,
Petr

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


[Libreoffice-commits] .: extras/prj extras/source extras/util

2012-06-05 Thread Stefan Knorr
 extras/prj/build.lst   |1 
 extras/source/symbols/delzip   |1 
 extras/source/symbols/l_2people.bmp|binary
 extras/source/symbols/l_attention1.bmp |binary
 extras/source/symbols/l_attention2.bmp |binary
 extras/source/symbols/l_attention3.bmp |binary
 extras/source/symbols/l_candy.bmp  |binary
 extras/source/symbols/l_face.bmp   |binary
 extras/source/symbols/l_flower.bmp |binary
 extras/source/symbols/l_ghost.bmp  |binary
 extras/source/symbols/l_halloween.bmp  |binary
 extras/source/symbols/l_home.bmp   |binary
 extras/source/symbols/l_lamp.bmp   |binary
 extras/source/symbols/l_lock.bmp   |binary
 extras/source/symbols/l_page_b.bmp |binary
 extras/source/symbols/l_page_g.bmp |binary
 extras/source/symbols/l_page_y.bmp |binary
 extras/source/symbols/l_people.bmp |binary
 extras/source/symbols/l_rose.bmp   |binary
 extras/source/symbols/l_save.bmp   |binary
 extras/source/symbols/l_smiley_1.bmp   |binary
 extras/source/symbols/l_smiley_oh.bmp  |binary
 extras/source/symbols/l_smiley_sad.bmp |binary
 extras/source/symbols/l_snow.bmp   |binary
 extras/source/symbols/l_star.bmp   |binary
 extras/source/symbols/makefile.mk  |   51 +
 extras/source/symbols/s_arrow-1.bmp|binary
 extras/source/symbols/s_arrow-2.bmp|binary
 extras/source/symbols/s_arrow-3.bmp|binary
 extras/source/symbols/s_arrow-4.bmp|binary
 extras/source/symbols/s_attention1.bmp |binary
 extras/source/symbols/s_attention2.bmp |binary
 extras/source/symbols/s_attention3.bmp |binary
 extras/source/symbols/s_ball-b.bmp |binary
 extras/source/symbols/s_ball-g.bmp |binary
 extras/source/symbols/s_ball-r.bmp |binary
 extras/source/symbols/s_ball.bmp   |binary
 extras/source/symbols/s_bug.bmp|binary
 extras/source/symbols/s_clover.bmp |binary
 extras/source/symbols/s_egg.bmp|binary
 extras/source/symbols/s_face.bmp   |binary
 extras/source/symbols/s_flower.bmp |binary
 extras/source/symbols/s_ghost.bmp  |binary
 extras/source/symbols/s_group.bmp  |binary
 extras/source/symbols/s_halloween.bmp  |binary
 extras/source/symbols/s_heart.bmp  |binary
 extras/source/symbols/s_home.bmp   |binary
 extras/source/symbols/s_lock.bmp   |binary
 extras/source/symbols/s_ok-g.bmp   |binary
 extras/source/symbols/s_ok-r.bmp   |binary
 extras/source/symbols/s_ok.bmp |binary
 extras/source/symbols/s_page_b.bmp |binary
 extras/source/symbols/s_page_g.bmp |binary
 extras/source/symbols/s_page_y.bmp |binary
 extras/source/symbols/s_pen-b.bmp  |binary
 extras/source/symbols/s_pen-g.bmp  |binary
 extras/source/symbols/s_pen-r.bmp  |binary
 extras/source/symbols/s_people.bmp |binary
 extras/source/symbols/s_smily_1.bmp|binary
 extras/source/symbols/s_smily_oh.bmp   |binary
 extras/source/symbols/s_smily_sad.bmp  |binary
 extras/source/symbols/s_snow.bmp   |binary
 extras/source/symbols/s_star.bmp   |binary
 extras/source/symbols/s_team.bmp   |binary
 extras/source/symbols/s_x-g.bmp|binary
 extras/source/symbols/s_x-r.bmp|binary
 extras/source/symbols/s_x.bmp  |binary
 extras/util/target.pmk |3 +
 68 files changed, 56 insertions(+)

New commits:
commit e74c007e25d05e49d94a94d9b024076faa02c8d0
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date:   Tue Jun 5 13:35:29 2012 +0200

Revert Remove ugly symbols

This reverts commit 9cfde0143195f14192e22fd437938d7810f8618c.

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index a9fd80a..3aca646 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -70,6 +70,7 @@ er  extras\source\gallery\accessories\Elements\Bullets2   
   nmake   -
 er  extras\source\gallery\accessories-nonfree   nmake  
 -   all er_gaccenf NULL
 er extras\source\misc_config   nmake   -   
all er_mcnf NULL
 er extras\source\palettes  nmake   -   
all er_palet NULL
+er extras\source\symbols   nmake   -   
all er_symb NULL
 er  extras\source\templates\layout  nmake   -  
 all er_tlal NULL
 er  extras\source\templates\presnt\lang nmake   -  
 all er_tprel NULL
 er  extras\source\templates\wizard\agenda\lang  nmake   -  
 all er_twagl NULL
diff --git a/extras/source/symbols/delzip b/extras/source/symbols/delzip
new file mode 100644
index 000..636fda9
--- /dev/null
+++ b/extras/source/symbols/delzip
@@ -0,0 +1 @@
+ECHO is OFF
diff --git a/extras/source/symbols/l_2people.bmp 
b/extras/source/symbols/l_2people.bmp
new file mode 100644
index 000..5b7a8fc
Binary files /dev/null and b/extras/source/symbols/l_2people.bmp differ
diff --git 

Re: Rotated glyphs

2012-06-05 Thread Caolán McNamara
On Fri, 2012-06-01 at 22:42 +0200, Jan Holesovsky wrote:
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=ac25f124858b79e302adcc533d6a658d5c529394
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9311947aa0bbfda60af8f97d850d6e5b909d62b5

To my mind some of our vertical text code is a bit dubious in the first
place. I don't see anything wrong with your changes, but vertical text
isn't really my thing so I'm willing to be corrected.

I have a vertical text test case I drag out to look at when I have to
tweak the code at qadevOOo/testdocs/vertical-testcase.odt (you need to
install the fonts mentioned at the top really to get the right effect)
and it looks as equally ugly now as it did the last time I looked at it.

C.

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


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

2012-06-05 Thread Petr Mladek
New branch 'libreoffice-3-6' available with the following commits:
commit f52427d580b475ce095d4e1d91e5681c84aa6679
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jun 5 13:42:59 2012 +0200

Branch libreoffice-3-6

This is 'libreoffice-3-6' - the stable branch for the 3.6.x releases.
The commit rules are different according to the development phase:

+ 3.6.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 3.5.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I799be1eff25304af2675a1a0798b8d1b6abb8b28

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


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

2012-06-05 Thread Petr Mladek
New branch 'libreoffice-3-6' available with the following commits:
commit 1804bf3711f53b836dcac2c7a3dc866576b2f2e5
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jun 5 13:43:01 2012 +0200

Branch libreoffice-3-6

This is 'libreoffice-3-6' - the stable branch for the 3.6.x releases.
The commit rules are different according to the development phase:

+ 3.6.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 3.5.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I2f26edfe95dbbdf1089d6bc7f64abb28c7b0da2b

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


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

2012-06-05 Thread Petr Mladek
New branch 'libreoffice-3-6' available with the following commits:
commit 02a51d8b826119acbefa515f918270146285fc97
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jun 5 13:43:00 2012 +0200

Branch libreoffice-3-6

This is 'libreoffice-3-6' - the stable branch for the 3.6.x releases.
The commit rules are different according to the development phase:

+ 3.6.0 beta phase:

+ any bug fixes are allowed without review
+ late features need approval by 3 people with different affiliation

+ 3.5.0 rc phase and later:

+ fixes need approval by one reviewer
+ late features need approval by 3 more people with different 
affiliation

IMPORTANT: Every developer is responsible for pushing the fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

Please, help use to make stable and usable release. If you want to build
something cool, unstable, and risky, use master.

Change-Id: I7c5cb3b6322bccf25b99b3d07042b21ae2b49ff6

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


[Libreoffice-commits] .: scp2/source

2012-06-05 Thread Andras Timar
 scp2/source/ooo/file_extra_ooo.scp|6 --
 scp2/source/ooo/module_hidden_ooo.scp |1 -
 2 files changed, 7 deletions(-)

New commits:
commit 144697310bdc99f95c37f0bede540b652442a288
Author: Andras Timar ati...@suse.com
Date:   Tue Jun 5 13:45:57 2012 +0200

remove ugly extra symbols from scp2, too

Change-Id: Ice52de070220b4e7ae8a3dd0ccb41e3a12d471b8

diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 353fc62..d6923e9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -337,12 +337,6 @@ File gid_File_Extra_Show_Pl
 Name = show.pl;
 End
 
-File gid_File_Extra_Symbols
-Dir = gid_Dir_Config_Symbol;
-ARCHIVE_TXT_FILE_BODY;
-Name = symbols.zip;
-End
-
 File gid_File_Extra_Tplpresntimpr_Lang
 Dir = gid_Dir_Template_Presnt;
 TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 3308e20..9c87d80 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -547,7 +547,6 @@ Module gid_Module_Root_Files_6
gid_File_Basic_Tutorials,
gid_File_Extra_Cfgsrv,
gid_File_Extra_Cfgsrv_Bitmap_Unx,
-   gid_File_Extra_Symbols,
gid_File_Extra_Common_Inc,
gid_File_Extra_Common_Pl,
gid_File_Extra_Edit_Asp,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH][PUSHED] GTK theming: implement frame rendering

2012-06-05 Thread Caolán McNamara
On Sat, 2012-06-02 at 16:12 +0400, Ruslan Kabatsayev wrote:
 Hello,
 
 This patch implements frame rendering via GTK theme.
 This way we get rid of those ugly square black/gray frames we had all
 over the place and replace them with native frames.

Looks good to me, especially in tools-options. Pushed, thanks for this.

C.

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


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

2012-06-05 Thread Caolán McNamara
 vcl/inc/unx/gtk/gtkgdi.hxx   |5 +
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |  110 ++-
 2 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit 0d314b0158b9d3660973656597d25a1504987b93
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date:   Sat Jun 2 16:04:51 2012 +0400

GTK theming: implement frame rendering

Change-Id: I7efa167cee05f84c56f554b5c2002e825809

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index fbdcef1..b4fe837 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -165,6 +165,11 @@ protected:
 GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect );
 sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
 
+sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, 
ControlPart nPart,
+   const Rectangle rControlRectangle,
+   const clipList rClipList,
+   ControlState nState, const ImplControlValue aValue,
+   const OUString rCaption );
 sal_Bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType 
nType, ControlPart nPart,
const Rectangle rControlRectangle,
const clipList rClipList,
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e9101bf..b21f12c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -45,6 +45,8 @@
 
 #include vcl/vclenum.hxx
 #include vcl/fontmanager.hxx
+#include vcl/decoview.hxx
+
 typedef struct _cairo_font_options cairo_font_options_t;
 const char* const tabPrelitDataName=libreoffice-tab-is-prelit;
 
@@ -243,6 +245,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen,
ControlState nState,
const ImplControlValue aValue,
const OUString rCaption );
+
+static int getFrameWidth(GtkWidget* widget);
 //---
 
 static Rectangle NWGetScrollButtonRect(SalX11Screen nScreen, ControlPart 
nPart, Rectangle aAreaRect );
@@ -581,6 +585,7 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( 
ControlType nType, ControlPar
 return true;
 break;
 
+case CTRL_FRAME:
 case CTRL_WINDOW_BACKGROUND:
 return true;
 
@@ -768,7 +773,6 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 // get a GC with current clipping region set
 GetFontGC();
 
-
 // theme changed ?
 if( GtkSalGraphics::bThemeChanged )
 {
@@ -918,6 +922,11 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 returnVal = NWPaintGTKWindowBackground( gdkDrawable, nType, nPart, 
aCtrlRect, aClip, nState, aValue, rCaption );
 }
 
+if(nType==CTRL_FRAME)
+{
+returnVal = NWPaintGTKFrame( gdkDrawable, nType, nPart, aCtrlRect, 
aClip, nState, aValue, rCaption);
+}
+
 if( pixmap )
 {
 returnVal = NWRenderPixmapToScreen( pixmap, aPixmapRect )  returnVal;
@@ -1144,6 +1153,33 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 rNativeBoundingRegion = rNativeContentRegion = aRect;
 returnVal = sal_True;
 }
+if( nType == CTRL_FRAME  nPart == PART_BORDER )
+{
+int frameWidth = getFrameWidth(m_pWindow);
+rNativeBoundingRegion = rControlRegion;
+sal_uInt16 nStyle = aValue.getNumericVal();
+int x1=rControlRegion.Left();
+int y1=rControlRegion.Top();
+int x2=rControlRegion.Right();
+int y2=rControlRegion.Bottom();
+
+if( nStyle  FRAME_DRAW_NODRAW )
+{
+if( (nStyle  FRAME_DRAW_TOPBOTTOM) == FRAME_DRAW_TOPBOTTOM )
+rNativeContentRegion = Rectangle(x1,
+ y1+frameWidth,
+ x2,
+ y2-frameWidth);
+else
+rNativeContentRegion = Rectangle(x1+frameWidth,
+ y1+frameWidth,
+ x2-frameWidth,
+ y2-frameWidth);
+}
+else
+rNativeContentRegion = rControlRegion;
+returnVal=true;
+}
 
 return( returnVal );
 }
@@ -1151,6 +1187,73 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 /
  * Individual control drawing functions
  /
+sal_Bool GtkSalGraphics::NWPaintGTKFrame(
+GdkDrawable* gdkDrawable,
+ControlType, ControlPart,
+const Rectangle rControlRectangle,
+

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3-6-branch-point'

2012-06-05 Thread Petr Mladek
Tag 'libreoffice-3-6-branch-point' created by Petr Mladek pmla...@suse.cz at 
2012-06-05 12:51 -0700

Tag libreoffice-3-6-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPzfLXAAoJEPQ0oe+v7q6jUfkQAK65V8XYO6JD6XLtIxX4CIje
95LuOb8mI7xUS7fX4PHwv2LQWFB3UiOIFgYZHZa5DUeZ0ixfBKBew8W3j6ZPCNpC
huktlzno+DWUYnE2d/jHkamc3QjYb7273cswr4Dq4A0N/tzi2eweq6Ooj8T5JKB2
8ClPhRTDTXwPYxuBr6LbcQoYCaixOqBIZirrT+FMV9QJwDbC1xj3jxq1CSIYJkck
duccfCMdf6xJts61uHxw7yZKdEZEbNPv8gfgO3Tdzh2dlP2XM90D9ma0CDflG2Q8
lxtguI4kkWQeyNuXW6DApjHiUEwuOb5drIRdqcDoJhEmBsfJB8/mZQC0t61mo7Vx
6ry9nCpBWKgwl8OFk/hwJX50hri437Ua6RKRQone1SscW+MEv/pNAzKcqal95ddQ
nEGsiGo+Sv9dO10ewD8JO8Lar0WdEcLkodILRSvtukUAg6oXs30+YWwunlyF3gIb
ErNfPYnw0q2KZkYMskIx+0aPbr1GUh+h7NaaMrB0yylnl5xYc5SqbKX3zxWe2nUJ
eWTRd0rDz5jvNnxQYyDbOxcBxV8Oxb5921q40I/NPWd+x0oylnAaVDIQh8akUqNO
F2syXczMz3LOxMvTx4Bvj7WfeVJKT/745tgFfB9WI8Fgf2N6Ig+qPcsyvJLrXHhD
g0k9UJKUrppml3pxd7mv
=2HZG
-END PGP SIGNATURE-

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


[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3-6-branch-point'

2012-06-05 Thread Petr Mladek
Tag 'libreoffice-3-6-branch-point' created by Petr Mladek pmla...@suse.cz at 
2012-06-05 12:51 -0700

Tag libreoffice-3-6-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPzfLXAAoJEPQ0oe+v7q6jUjwQAKANDOEcba8nlZgENIWDAtoA
Z16oCCUMA8splH4tcVgmmPFsDQpaDGKuwQLBgmubA56k0+AzJo/zGjsLs0f3TA/g
tflJHju/B8xxphzaB7YymNnJWFm8EkzESPC/Y3yDYHmBZak1+LreY5udY0OGST5H
wNMCKtX9lQqbCaIZNpFV+ot/uQO7qBkYi8/BWhLDDiYnBsZUzr6VBgnrsWvXcqa7
1jeXGF0XR6fia12/PQBIoLmkkF3wiDVfW/tnZXsqlisqe0n2hVktGARdoq9tHFuy
xyY8g43aN0J1uPpwodQUkjELawu/Amon6fwdFo/NhGga+YmKhOqcshGTj022uVn3
dLioApS6jDtHXvgSgmo8/GXvl5W9pxUrd6Nj7c5ZeM3LvP2q+2peUV0hvYpz8OuX
EH+iqsBaqAzG719J/6YUXGYm3gypDDzzu++eU7UA75dbXXDLv0BHhRvXSvUVXrjg
GeHVACY/WACv+zkPXbbvuUVPVuGUR7m2Q1rI/QINDaPKcabp1zoV01Hd6A0N9OCh
RXDLtXo39OrvLqUNMtR8IbVPCuXYKMVHDXallRFTWBNlspzLqbSXyvChBCa0wkco
Q/bqqckjsu+qpdd2NB4ohd8qQVF1J30JuUdnTyteGxsEWhHk4NFSz+Yh7opO/XO1
6+AJceuZUtKzbnDBUuSz
=RvUr
-END PGP SIGNATURE-

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


[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3-6-branch-point'

2012-06-05 Thread Petr Mladek
Tag 'libreoffice-3-6-branch-point' created by Petr Mladek pmla...@suse.cz at 
2012-06-05 12:51 -0700

Tag libreoffice-3-6-branch-point
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJPzfLXAAoJEPQ0oe+v7q6jBSsP/1JAWZ/GtPyLucBacm/YB9m1
H5qvE7CzLRDd8PmHsNk79fzlr4YjdR5YbKV2QpsvQ2OPEPr6WaIds/NHHp3zHgyX
z+eKThK5ciCCEgBj0XsDrKjO86FPkJI/TF4VS2mNiGV2TrFE8RuaKLGrEW/MxPf+
jaciQDHGQimj9DApthXePbpV1kzecDTbHXzvw44bqN0i3l9xAZZRUNxdX9asaZI0
tMkT8iqwv6CrkR/UeHrvk0vg2uZhcfso81mwIPuh07ZXxCKaLimWops8CIjwxzY4
6YUHPJYkUbF59rvxZ6Rh3gFQ5pd5fQ6kwORY5NxpwfB5/gWQUEAtraxTaySiyuBY
KJ2YqkpUnX2xy614HjmUHlieu4yVjSG7nXPyVGhCukZlYQjcEqn915moY8atlNMK
ss6crrSZcGjcUfan/SoUSNNDrT8dkTL1sjXQR9DfhyRd9clB6gDOVOARWd7xGPZK
0a4jHEiUZfoAtW3TG+M1JUIds0tmKHhTseSdpPdooBPm+sLcIi56GVBn7wrrDehv
HCckZoABwZmVwN3oAZ+JB/sV7b4AU4uYv1j2+NlTTe9TzHQe6X1X7/vJYJ88bkUG
oeTgs9EZ0AHOHpcIXLMFQQ9a7+H8GKMnArtHisOaStwU7v1vaVybHZWOd5ws49Bz
Vnzn2J4SAZ2tZIuJ5rXA
=CgMf
-END PGP SIGNATURE-

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


[ANNOUNCE] Branch libreoffice-3-6 created

2012-06-05 Thread Petr Mladek
Hi all,

as promised, we have created a branch for the stabilization of the
3.6.x releases, called 'libreoffice-3-6'. It is based on master, last
pull on June 5, 2011 at about 11pm UTC. See also the tag
libreoffice-3-6-branch-point.

The following rules apply:

+ only bugfixes are allowed
+ no approval needed during beta phase until July 9, 2012
+ 1 approval needed during rc phase and upcoming bug fix releases
+ 3 approvals with different/no affiliation needed for late
  features

IMPORTANT: Every developer is responsible for pushing fixes into all
   appropriate branches. Note that we do not plan any merge
   from this branch to master or vice versa.

   Please, help use to make stable and usable 3.6 release.
   Do not forget to push useful fixes to this branch.

   git cherry-pick commit-id is your friend :-)
 


The 'master' branch is used for 3.7 development and has the rules:

+ free commit; do your best to do not break build and
  functionality
+ any development allowed


For further information about the roadmap, please check

http://wiki.documentfoundation.org/ReleasePlan


Now, if you want to switch your clone to the libreoffice-3-6 branch,
do:

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

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

git config --global push.default tracking

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

Happy hacking,
Petr


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


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

2012-06-05 Thread Philipp Weissenbacher
 sw/source/core/text/porlay.cxx |  223 +
 1 file changed, 76 insertions(+), 147 deletions(-)

New commits:
commit cf6c32b7c4a5f7d182ae082aaf391553d6c1891a
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Tue Jun 5 13:57:00 2012 +0200

Translate German comments, actualize some English ones

Change-Id: I460be3ddef4a5f2f71682895a5819923eb1d149e

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 533751e..2ca71cf 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -142,13 +142,11 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode 
cPrevCh )
 /*
  * SwLineLayout::~SwLineLayout()
  *
- * class SwLineLayout: Das Layout einer einzelnen Zeile. Dazu
- * gehoeren vor allen Dingen die Dimension, die Anzahl der
- * Character und der Wortzwischenraeume in der Zeile.
- * Zeilenobjekte werden in einem eigenen Pool verwaltet, um zu
- * erreichen, dass sie im Speicher moeglichst beeinander liegen
- * (d.h. zusammen gepaged werden und den Speicher nicht
- * fragmentieren).
+ * class SwLineLayout: This is the layout of a single line, which is made
+ * up of it's dimension, the character count and the word spacing in the
+ * line.
+ * Line objects are managed in an own pool, in order to store them continuously
+ * in memory so that they are paged out together and don't fragment memory.
  */
 
 SwLineLayout::~SwLineLayout()
@@ -163,8 +161,8 @@ SwLineLayout::~SwLineLayout()
 
 SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
 {
-// Erster Attributwechsel, Masse und Laengen
-// aus *pCurr in die erste Textportion kopieren.
+   // First attribute change: copy mass and length from *pIns into the first
+   // text portion
 if( !pPortion )
 {
 if( GetLen() )
@@ -182,21 +180,21 @@ SwLinePortion *SwLineLayout::Insert( SwLinePortion *pIns )
 return pIns;
 }
 }
-// mit Skope aufrufen, sonst Rekursion !
+// Call with scope or we'll end up with recursion!
 return pPortion-SwLinePortion::Insert( pIns );
 }
 
 SwLinePortion *SwLineLayout::Append( SwLinePortion *pIns )
 {
-// Erster Attributwechsel, Masse und Laengen
-// aus *pCurr in die erste Textportion kopieren.
+// First attribute change: copy mass and length from *pIns into the first
+// text portion
 if( !pPortion )
 pPortion = new SwTxtPortion( *(SwLinePortion*)this );
-// mit Skope aufrufen, sonst Rekursion !
+// Call with scope or we'll end up with recursion!
 return pPortion-SwLinePortion::Append( pIns );
 }
 
-// fuer die Sonderbehandlung bei leeren Zeilen
+// For special treatment of empty lines
 
 sal_Bool SwLineLayout::Format( SwTxtFormatInfo rInf )
 {
@@ -212,7 +210,8 @@ sal_Bool SwLineLayout::Format( SwTxtFormatInfo rInf )
 /*
  * SwLineLayout::CalcLeftMargin()
  *
- * Wir sammeln alle FlyPortions am Anfang der Zeile zu einer MarginPortion.
+ * We collect all FlyPortions at the beginning of the line and make that a
+ * MarginPortion.
  */
 
 SwMarginPortion *SwLineLayout::CalcLeftMargin()
@@ -242,7 +241,7 @@ SwMarginPortion *SwLineLayout::CalcLeftMargin()
 {
 if( pPos-IsFlyPortion() )
 {
-// Die FlyPortion wird ausgesogen ...
+// The FlyPortion get's sucked out ...
 pLeft-Join( (SwGluePortion*)pPos );
 pPos = pLeft-GetPortion();
 if( GetpKanaComp()  !GetKanaComp().empty() )
@@ -291,7 +290,7 @@ bool lcl_HasOnlyBlanks( const XubString rTxt, xub_StrLen 
nStt, xub_StrLen nEnd
 /*
  * SwLineLayout::CalcLine()
  *
- * Aus FormatLine() ausgelagert.
+ * Swapped out from FormatLine()
  */
 
 void SwLineLayout::CalcLine( SwTxtFormatter rLine, SwTxtFormatInfo rInf )
@@ -336,20 +335,19 @@ void SwLineLayout::CalcLine( SwTxtFormatter rLine, 
SwTxtFormatInfo rInf )
 SwLinePortion *pLast = this;
 KSHORT nMaxDescent = 0;
 
-//  Eine Gruppe ist ein Abschnitt in der Portion-Kette von
-//  pCurr oder einer Fix-Portion bis zum Ende bzw. zur naechsten
-//  Fix-Portion.
+// A group is a segment in the portion chain of pCurr or a fixed
+// portion spanning to the end or the next fixed portion
 while( pPos )
 {
 OSL_ENSURE( POR_LIN != pPos-GetWhichPor(),
 SwLineLayout::CalcLine: don't use SwLinePortions ! );
 
-// Null-Portions werden eliminiert. Sie koennen entstehen,
-// 

[Libreoffice-commits] .: xmloff/source

2012-06-05 Thread Michael Stahl
 xmloff/source/text/txtparae.cxx |   49 
 1 file changed, 20 insertions(+), 29 deletions(-)

New commits:
commit 4190e9351e69730f0097e6cdf4dad2fafa10577e
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 13:51:09 2012 +0200

fdo#30711: fix some problems in 7a1c5e54:

The elements are exported without checking for bAutoStyles, and the Any
conversion is overly verbose.

Change-Id: Iebb52c8cd2638424dd48d28ec5a12c10a41f6cbf

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e7b370b..04b008c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2295,16 +2295,15 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 if (xParameters.is()  xParameters-hasByName(Name))
 {
 const Any aValue = xParameters-getByName(Name);
-const Type aValueType = aValue.getValueType();
-if (aValueType == ::getCppuType((OUString*)0))
+OUString sValue;
+if (aValue = sValue)
 {
-OUString sValue;
-aValue = sValue;
 GetExport().AddAttribute(XML_NAMESPACE_TEXT, 
XML_NAME, sValue);
 }
 }
-GetExport().StartElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
+sal_False, sal_False );
 const OUString sFieldType = xFormField-getFieldType();
 if (sFieldType ==  ODF_FORMTEXT)
 {
@@ -2319,19 +2318,15 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 openFieldMark = NONE;
 }
 }
-else
-{
-GetExport().StartElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
-}
 }
 }
 else if (sType.equals(sTextFieldEnd))
 {
 if ( GetExport().getDefaultVersion()  
SvtSaveOptions::ODFVER_012 )
 {
-GetExport().StartElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_END, sal_False);
-GetExport().EndElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_END, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_FIELD, XML_FIELDMARK_END,
+sal_False, sal_False );
 }
 else
 {
@@ -2342,17 +2337,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 if (xParameters.is()  xParameters-hasByName(Name))
 {
 const Any aValue = xParameters-getByName(Name);
-const Type aValueType = aValue.getValueType();
-if (aValueType == ::getCppuType((OUString*)0))
+OUString sValue;
+if (aValue = sValue)
 {
-OUString sValue;
-aValue = sValue;
 GetExport().AddAttribute(XML_NAMESPACE_TEXT, 
XML_NAME, sValue);
 }
 }
 }
-GetExport().StartElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_END, sal_False);
-
GetExport().EndElement(XML_NAMESPACE_TEXT,XML_BOOKMARK_END, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK_END,
+sal_False, sal_False );
 }
 }
 else if (sType.equals(sTextFieldStartEnd))
@@ -2383,8 +2377,9 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 {
 GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, 
xBookmark-getName());
 }
-GetExport().StartElement(XML_NAMESPACE_TEXT, XML_BOOKMARK, 
sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, XML_BOOKMARK, 
sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK,
+  

[Libreoffice-commits] .: config_host.mk.in configure.in filter/Configuration_filter.mk filter/source libmspub/makefile.mk libmspub/prj libmspub/README Makefile.top ooo.lst.in RepositoryExternal.mk tai

2012-06-05 Thread Fridrich Strba
 Makefile.top |2 
 RepositoryExternal.mk|   27 
 config_host.mk.in|3 
 configure.in |   25 
 filter/Configuration_filter.mk   |2 
 filter/source/config/fragments/filters/PublisherDocument.xcu |   13 
 filter/source/config/fragments/types/draw_Publisher_Document.xcu |   12 
 libmspub/README  |1 
 libmspub/makefile.mk |   72 ++
 libmspub/prj/build.lst   |3 
 libmspub/prj/d.lst   |6 
 ooo.lst.in   |1 
 tail_build/prj/build.lst |2 
 writerperfect/Library_wpftdraw.mk|2 
 writerperfect/Module_writerperfect.mk|2 
 writerperfect/prj/build.lst  |2 
 writerperfect/source/draw/MSPUBImportFilter.cxx  |  275 
++
 writerperfect/source/draw/MSPUBImportFilter.hxx  |  111 
 writerperfect/source/draw/wpftdraw_genericfilter.cxx |5 
 writerperfect/util/wpftdraw.component|4 
 20 files changed, 568 insertions(+), 2 deletions(-)

New commits:
commit dc4b91d310b3b4c9b826345df5babc33cad46ba3
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu May 24 11:59:16 2012 +0200

Adding Microsoft Publisher Import filter

Change-Id: Iec9c9c5419a40e7ad64af057f1bbb426ca3163b0

diff --git a/Makefile.top b/Makefile.top
index 7362bbc..a560236 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -198,6 +198,7 @@ libcmis\
 libcroco\
 libexttextcat\
 libgsf\
+libmspub\
 libpng\
 librsvg\
 libvisio\
@@ -465,6 +466,7 @@ findunusedcode:
   | grep -v ^jvmaccess:: \
   | grep -v ^libcdr:: \
   | grep -v ^libcmis:: \
+  | grep -v ^libmspub:: \
   | grep -v ^libvisio:: \
   | grep -v ^libwpg:: \
   | grep -v ^libwps_tools_win:: \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 57b7249..613cf39 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -809,6 +809,33 @@ endef
 endif # SYSTEM_LIBCDR
 
 
+ifeq ($(SYSTEM_LIBMSPUB),YES)
+
+define gb_LinkTarget__use_mspub
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+$(MSPUB_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(MSPUB_LIBS))
+
+endef
+
+else # !SYSTEM_LIBMSPUB
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+   mspublib \
+))
+
+define gb_LinkTarget__use_mspub
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   mspublib \
+)
+
+endef
+
+endif # SYSTEM_LIBMSPUB
+
+
 ifeq ($(SYSTEM_LIBVISIO),YES)
 
 define gb_LinkTarget__use_visio
diff --git a/config_host.mk.in b/config_host.mk.in
index 6d45f50..76e398c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -362,6 +362,8 @@ export MOZ_INC=@MOZ_INC@
 export MOZ_LDAP_CFLAGS=@MOZ_LDAP_CFLAGS@
 export MOZ_LIB=@MOZ_LIB@
 export MOZ_LIB_XPCOM=@MOZ_LIB_XPCOM@
+export MSPUB_CFLAGS=@MSPUB_CFLAGS@
+export MSPUB_LIBS=@MSPUB_LIBS@
 export MYSQL_DEFINES=@MYSQL_DEFINES@
 export MYSQL_INC=@MYSQL_INC@
 export MYSQL_LIB=@MYSQL_LIB@
@@ -497,6 +499,7 @@ export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@
+export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@
 export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@
diff --git a/configure.in b/configure.in
index aa907d0..ec4461d 100644
--- a/configure.in
+++ b/configure.in
@@ -1215,6 +1215,11 @@ AC_ARG_WITH(system-libcdr,
 [Use libcdr already on system.]),,
 [with_system_libcdr=$with_system_libs])
 
+AC_ARG_WITH(system-libmspub,
+AS_HELP_STRING([--with-system-libmspub],
+[Use libmspub already on system.]),,
+[with_system_libmspub=$with_system_libs])
+
 AC_ARG_WITH(system-libvisio,
 AS_HELP_STRING([--with-system-libvisio],
 [Use libvisio already on system.]),,
@@ -6247,6 +6252,26 @@ AC_SUBST(CDR_CFLAGS)
 AC_SUBST(CDR_LIBS)
 
 dnl ===
+dnl Check for system libmspub
+dnl ===
+AC_MSG_CHECKING([which libmspub to use])
+if test $with_system_libmspub = yes; then
+AC_MSG_RESULT([external])
+SYSTEM_LIBMSPUB=YES
+PKG_CHECK_MODULES( MSPUB, libmspub-0.0 )
+elif test $_os = iOS; then
+# libmspub depends on libwpd and libwpg and those are LGPL
+AC_MSG_RESULT([none])

[Libreoffice-commits] .: Branch 'feature/cmclayout' - sw/Package_uiconfig.mk sw/uiconfig

2012-06-05 Thread Caolán McNamara
 sw/Package_uiconfig.mk  |2 
 sw/uiconfig/sw/ui/20705.ui  |  253 
 sw/uiconfig/swriter/ui/20705.ui |  253 
 3 files changed, 254 insertions(+), 254 deletions(-)

New commits:
commit 383a53933a3316a7bc7f1ca2249a52ee18937672
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 5 13:05:39 2012 +0100

.ui.ui - .ui

diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
index 926f2cd..5862eba 100644
--- a/sw/Package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
@@ -29,7 +29,7 @@
 $(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig))
 
 $(eval $(call 
gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/ui/titlepage.ui,swriter/ui/titlepage.ui))
-$(eval $(call 
gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/ui/20705.ui,swriter/ui/20705.ui))
+$(eval $(call 
gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sw/ui/20705.ui,sw/ui/20705.ui))
 
 $(eval $(call 
gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml))
 $(eval $(call 
gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml))
diff --git a/sw/uiconfig/sw/ui/20705.ui b/sw/uiconfig/sw/ui/20705.ui
new file mode 100644
index 000..a5b2e2e
--- /dev/null
+++ b/sw/uiconfig/sw/ui/20705.ui
@@ -0,0 +1,253 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=20705
+property name=can_focusFalse/property
+property name=border_width5/property
+property name=title translatable=yesInsert Break/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property name=spacing2/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area1
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=100
+property name=labelgtk-ok/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=101
+property name=labelgtk-cancel/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=102
+property name=labelgtk-help/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property 

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

2012-06-05 Thread Michael Stahl
 xmloff/source/text/txtparae.cxx |   49 
 1 file changed, 20 insertions(+), 29 deletions(-)

New commits:
commit 01ef7d0c5c6e3ea746a3661c7e3498027ca62291
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 13:51:09 2012 +0200

fdo#30711: fix some problems in 7a1c5e54:

The elements are exported without checking for bAutoStyles, and the Any
conversion is overly verbose.

Change-Id: Iebb52c8cd2638424dd48d28ec5a12c10a41f6cbf
(cherry picked from commit 4190e9351e69730f0097e6cdf4dad2fafa10577e)

diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e7b370b..04b008c 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2295,16 +2295,15 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 if (xParameters.is()  xParameters-hasByName(Name))
 {
 const Any aValue = xParameters-getByName(Name);
-const Type aValueType = aValue.getValueType();
-if (aValueType == ::getCppuType((OUString*)0))
+OUString sValue;
+if (aValue = sValue)
 {
-OUString sValue;
-aValue = sValue;
 GetExport().AddAttribute(XML_NAMESPACE_TEXT, 
XML_NAME, sValue);
 }
 }
-GetExport().StartElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK_START,
+sal_False, sal_False );
 const OUString sFieldType = xFormField-getFieldType();
 if (sFieldType ==  ODF_FORMTEXT)
 {
@@ -2319,19 +2318,15 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 openFieldMark = NONE;
 }
 }
-else
-{
-GetExport().StartElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_START, sal_False);
-}
 }
 }
 else if (sType.equals(sTextFieldEnd))
 {
 if ( GetExport().getDefaultVersion()  
SvtSaveOptions::ODFVER_012 )
 {
-GetExport().StartElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_END, sal_False);
-GetExport().EndElement(XML_NAMESPACE_FIELD, 
XML_FIELDMARK_END, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_FIELD, XML_FIELDMARK_END,
+sal_False, sal_False );
 }
 else
 {
@@ -2342,17 +2337,16 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 if (xParameters.is()  xParameters-hasByName(Name))
 {
 const Any aValue = xParameters-getByName(Name);
-const Type aValueType = aValue.getValueType();
-if (aValueType == ::getCppuType((OUString*)0))
+OUString sValue;
+if (aValue = sValue)
 {
-OUString sValue;
-aValue = sValue;
 GetExport().AddAttribute(XML_NAMESPACE_TEXT, 
XML_NAME, sValue);
 }
 }
 }
-GetExport().StartElement(XML_NAMESPACE_TEXT, 
XML_BOOKMARK_END, sal_False);
-
GetExport().EndElement(XML_NAMESPACE_TEXT,XML_BOOKMARK_END, sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,
+XML_NAMESPACE_TEXT, XML_BOOKMARK_END,
+sal_False, sal_False );
 }
 }
 else if (sType.equals(sTextFieldStartEnd))
@@ -2383,8 +2377,9 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
 {
 GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NAME, 
xBookmark-getName());
 }
-GetExport().StartElement(XML_NAMESPACE_TEXT, XML_BOOKMARK, 
sal_False);
-GetExport().EndElement(XML_NAMESPACE_TEXT, XML_BOOKMARK, 
sal_False);
+SvXMLElementExport aElem( GetExport(), !bAutoStyles,

[Libreoffice-commits] .: sw/source

2012-06-05 Thread Philipp Weissenbacher
 sw/source/core/text/frmform.cxx  |   90 +++-
 sw/source/core/text/frmpaint.cxx |   23 -
 sw/source/core/text/inftxt.cxx   |  170 +++
 3 files changed, 34 insertions(+), 249 deletions(-)

New commits:
commit fe436dfef61f7804ecacc745aa551f03cca18134
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date:   Tue Jun 5 14:17:14 2012 +0200

Remove visual navigator comments

Change-Id: I8e19021df0a904df0877aa58adc83571c5991b9b

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index ba78087..47111d0 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -73,10 +73,6 @@ public:
 };
 MSHORT FormatLevel::nLevel = 0;
 
-/*
- *  ValidateTxt/Frm()
- */
-
 void ValidateTxt( SwFrm *pFrm ) // Friend of frame
 {
 if ( ( ! pFrm-IsVertical() 
@@ -121,12 +117,11 @@ void SwTxtFrm::ValidateFrm()
 }
 
 /*
- *  ValidateBodyFrm()
- */
-
-// After a RemoveFtn the BodyFrm and all Frms contained within it, need to be
-// recalculated, so that the DeadLine is right.
-// First we search outwards, on the way back we calculate everything.
+ * ValidateBodyFrm()
+ * After a RemoveFtn the BodyFrm and all Frms contained within it, need to be
+ * recalculated, so that the DeadLine is right.
+ * First we search outwards, on the way back we calculate everything.
+*/
 
 void _ValidateBodyFrm( SwFrm *pFrm )
 {
@@ -159,10 +154,6 @@ void SwTxtFrm::ValidateBodyFrm()
 UNDO_SWAP( this )
 }
 
-/*
- *  SwTxtFrm::FindBodyFrm()
- */
-
 sal_Bool SwTxtFrm::_GetDropRect( SwRect rRect ) const
 {
 SWAP_IF_NOT_SWAPPED( this )
@@ -191,10 +182,6 @@ sal_Bool SwTxtFrm::_GetDropRect( SwRect rRect ) const
 return sal_False;
 }
 
-/*
- *  SwTxtFrm::FindBodyFrm()
- */
-
 const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
 {
 if ( IsInDocBody() )
@@ -207,10 +194,6 @@ const SwBodyFrm *SwTxtFrm::FindBodyFrm() const
 return 0;
 }
 
-/*
- *  SwTxtFrm::CalcFollow()
- */
-
 sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
 {
 SWAP_IF_SWAPPED( this )
@@ -375,10 +358,6 @@ sal_Bool SwTxtFrm::CalcFollow( const xub_StrLen nTxtOfst )
 return sal_False;
 }
 
-/*
- *  SwTxtFrm::AdjustFrm()
- */
-
 void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
 {
 if( IsUndersized() )
@@ -535,15 +514,13 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, 
sal_Bool bHasToFit )
 
 /*
  *  SwTxtFrm::AdjustFollow()
- */
-
-/* AdjustFollow expects the following situtation:
+ * AdjustFollow expects the following situtation:
  * The SwTxtIter points to the lower end of the Master, the Offset is set in
  * the Follow.
  * nOffset holds the Offset in the text string, from which the Master closes
  * and the Follow starts.
  * If it's 0, the FollowFrame is deleted.
- */
+ */
 
 void SwTxtFrm::_AdjustFollow( SwTxtFormatter rLine,
  const xub_StrLen nOffset, const xub_StrLen nEnd,
@@ -601,10 +578,6 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter rLine,
 }
 }
 
-/*
- *  SwTxtFrm::JoinFrm()
- */
-
 SwCntntFrm *SwTxtFrm::JoinFrm()
 {
 OSL_ENSURE( GetFollow(), +SwTxtFrm::JoinFrm: no follow );
@@ -676,10 +649,6 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
 return pNxt;
 }
 
-/*
- *  SwTxtFrm::SplitFrm()
- */
-
 SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
 {
 

[Libreoffice-commits] .: 2 commits - autogen.sh config_host.mk.in

2012-06-05 Thread Stephan Bergmann
 autogen.sh|6 +++---
 config_host.mk.in |1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 1dfb956306a1ec63e1d2f683c3414fffeb07b2e8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 5 11:57:31 2012 +0200

Indentation clean up

Change-Id: I1e3633f5bbf6b3ad0cdb2005a2a5608f3265ffdb

diff --git a/autogen.sh b/autogen.sh
index 67d462c..663a4ed 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -111,10 +111,10 @@ for my $arg (@cmdline_args) {
 my $config = distro-configs/$1.conf;
 if (! -f $config) {
 invalid_distro ($config, $1);
-} else {
-push @args, read_args ($config);
-}
 } else {
+push @args, read_args ($config);
+}
+} else {
 push @args, $arg;
 }
 }
commit 484b8cdf001d1305cf32ec96db0fe36ee0c3a25e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 5 11:45:53 2012 +0200

LO_PATH unused outside configure.in and config_host.mk.in

Change-Id: Ib349d9bf93ad59c4c171b87f10c4fe608cecb5fd

diff --git a/config_host.mk.in b/config_host.mk.in
index 76e398c..116c4f9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -285,7 +285,6 @@ export LIBXML_LIBS=@LIBXML_LIBS@
 export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@
 export LIBXSLT_LIBS=@LIBXSLT_LIBS@
 export LINK_X64_BINARY=@LINK_X64_BINARY@
-export LO_PATH=@LO_PATH@
 @x_Cygwin@ export LS=@WIN_LS@
 export MANDIR=@MANDIR@
 export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: sc/source

2012-06-05 Thread Noel Power
 sc/source/ui/view/preview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05409d2f950cb8c747afa621c0f43e3bafbc56b7
Author: Noel Power noel.po...@novell.com
Date:   Tue Jun 5 13:04:56 2012 +0100

fix incredible shrinking scrollbars when zooming in calc preview fdo#50722

Change-Id: If6fe9ccb1aa3320d96921f76a86def7d588f5f4e

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index bc2d355..da05322 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -705,7 +705,7 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom)
 SetMapMode( aMMMode );
 
 bInSetZoom = true;  // don't scroll during SetYOffset in 
UpdateScrollBars
-if ( Window* pWin = pViewShell-GetWindow() )
+if ( Window* pWin = ( pViewShell-GetViewFrame() ? 
pViewShell-GetViewFrame()-GetWindow() : NULL ) )
 pViewShell-AdjustPosSizePixel( pWin-GetPosPixel(), 
pWin-GetSizePixel() );
 else
 pViewShell-UpdateScrollBars();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-06-05 Thread Noel Power
 sc/source/ui/view/preview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit daf35c9aa78aad9638e49d81af020677273250d4
Author: Noel Power noel.po...@novell.com
Date:   Tue Jun 5 13:04:56 2012 +0100

fix incredible shrinking scrollbars when zooming in calc preview fdo#50722

Change-Id: If6fe9ccb1aa3320d96921f76a86def7d588f5f4e

diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index bc2d355..da05322 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -705,7 +705,7 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom)
 SetMapMode( aMMMode );
 
 bInSetZoom = true;  // don't scroll during SetYOffset in 
UpdateScrollBars
-if ( Window* pWin = pViewShell-GetWindow() )
+if ( Window* pWin = ( pViewShell-GetViewFrame() ? 
pViewShell-GetViewFrame()-GetWindow() : NULL ) )
 pViewShell-AdjustPosSizePixel( pWin-GetPosPixel(), 
pWin-GetSizePixel() );
 else
 pViewShell-UpdateScrollBars();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: f70fe6e6 regression: options dialog is a bit broken

2012-06-05 Thread Caolán McNamara
On Mon, 2012-06-04 at 11:45 +0400, Ivan Timofeev wrote:
 moving controls in every page is a huge tedious work...

All of our hard-coded positions widgetry is hugely miserable. FWIW I've
some experimental stuff in
http://cgit.freedesktop.org/libreoffice/core/log/?h=feature/cmclayout
where we have layout widgets and can also render gtkbuilder xml (i.e.
use glade as visual widget editor). In that world it should (eventually
anyway) be possible to just hide the unwanted widgets and the layout
will do the right thing automatically.

What I've got so far...

There's 
a) a ui-previewer mini-app in there that can render arbitrary
gtkbuilder xml with vcl widgets (well, the stuff I've implemented so
far) and an example .ui xml in vcl/qa/cppunit/builder/demo.ui
b) a hard-coded character dialog with layout example
c) a hard-coded word-count dialog with layout example
d) a title page dialog which demos loading gtk builder xml from a .ui
file
e) a view zoom example where an existing dialog is made layout aware and
loads .ui xml with no code changes
f) an insert break example where an existing dialog is made layout aware
and loads .ui xml with no code changes

The hope is that we end up in a place where someone can just edit and/or
create dialogs in glade and drop them into the right place and it just
works without it being necessary to change any additional code at all.

Once a dialog is converted over than a hacker at their leisure can go
back to the dialog code and trivially tidy it up to e.g. delete all the
code in it which just exists to create the widgets, mark it as not
loading resources from a .src file anymore, and remove those too, etc.

The big stuff that remains to be done is a
a) translations, whether to for the interim use our existing translate
xml mechanism or move over to gettext. Probably just use our existing
stuff for now and leave gettext as a battle for a later time
b) generate stub .ui files from .src files to load in glade to get an
initial ugly dialog with the correct id names to prettify

Medium stuff is
a) rtl mode
b) more widgets
c) theme tweaks
d) odd placement of reset button in page dialog
e) connect up GtkListStore in .ui files to pre-full dropdown lists, e.g.
to complete the insert break example
f) see how close I can get to converting an entire tab dialog with
custom widgets etc. over to a .ui file
g) follow system ok, help, cancel button order, etc.

Here's some screenshots of two examples
before:
http://people.redhat.com/caolanm/png/oldzoom.png
http://people.redhat.com/caolanm/png/oldwordcount.png

after:
http://people.redhat.com/caolanm/png/newzoom.png
http://people.redhat.com/caolanm/png/newwordcount.png

C.

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


[Libreoffice-commits] .: instsetoo_native/util solenv/inc

2012-06-05 Thread Petr Mladek
 instsetoo_native/util/openoffice.lst |   98 +--
 solenv/inc/minor.mk  |   12 ++--
 solenv/inc/productversion.mk |2 
 3 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit c260b4e78e80b399defd35e9442baf2e9ed03eae
Author: Petr Mladek pmla...@suse.cz
Date:   Tue Jun 5 14:37:06 2012 +0200

bump product version to 3.7.0-alpha0+

keep the package version on 3.6.98, so we could restart release number
from 0 for Betas and RCs

Change-Id: I7a862a202d2080dcc924362e4deb0e026c940a34

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index b3c4efa..a82fa24 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,13 +4,13 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 3.6.0
+UREPACKAGEVERSION 3.6.98
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
-UNIXBASISROOTNAME libreoffice3.6
-SERVICETAG_PRODUCTNAME LibreOffice 3.6
-SERVICETAG_PRODUCTVERSION 3.6
-SERVICETAG_PARENTNAME LibreOffice 3.6
+UNIXBASISROOTNAME libreoffice3.7
+SERVICETAG_PRODUCTNAME LibreOffice 3.7
+SERVICETAG_PRODUCTVERSION 3.7
+SERVICETAG_PARENTNAME LibreOffice 3.7
 SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
 SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
 HIDELICENSEDIALOG 1
@@ -47,17 +47,17 @@ LibreOffice
 variables
 {
 PRODUCTNAME LibreOffice
-PRODUCTVERSION 3.6
+PRODUCTVERSION 3.7
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha1
+SHORT_PRODUCTEXTENSION alpha0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 3.6
+BRANDPACKAGEVERSION 3.7
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.0
-ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
-BASEPRODUCTVERSION 3.6
+ABOUTBOXPRODUCTVERSION 3.7.0
+ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+
+BASEPRODUCTVERSION 3.7
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
 ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
@@ -65,7 +65,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.0
+PACKAGEVERSION 3.6.98
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -99,18 +99,18 @@ LibreOffice_Dev
 variables
 {
 PRODUCTNAME LOdev
-PRODUCTVERSION 3.6
+PRODUCTVERSION 3.7
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha1
-UNIXBASISROOTNAME lodev3.6
+SHORT_PRODUCTEXTENSION alpha0
+UNIXBASISROOTNAME lodev3.7
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
-BRANDPACKAGEVERSION 3.6
+BRANDPACKAGEVERSION 3.7
 USERDIRPRODUCTVERSION 3
-ABOUTBOXPRODUCTVERSION 3.6.0
-ABOUTBOXPRODUCTVERSIONSUFFIX alpha1+
-BASEPRODUCTVERSION 3.6
+ABOUTBOXPRODUCTVERSION 3.7.0
+ABOUTBOXPRODUCTVERSIONSUFFIX alpha0+
+BASEPRODUCTVERSION 3.7
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -123,7 +123,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 3.6.0
+PACKAGEVERSION 3.6.98
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -160,13 +160,13 @@ URE
 variables
 {
 PRODUCTNAME URE
-PRODUCTVERSION 3.6
-PACKAGEVERSION 3.6
+PRODUCTVERSION 3.7
+PACKAGEVERSION 3.7
 PACKAGEREVISION 1
 PRODUCTEXTENSION
-BRANDPACKAGEVERSION 3.6
+BRANDPACKAGEVERSION 3.7
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha1
+SHORT_PRODUCTEXTENSION alpha0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
 PCPFILENAME ure.pcp
@@ -195,14 +195,14 @@ LibreOffice_SDK
 variables
 {
 PRODUCTNAME LibreOffice
-PRODUCTVERSION 3.6
+PRODUCTVERSION 3.7
 PRODUCTEXTENSION
 LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION alpha1
+

[REVIEW][3-5] fdo#46112 Calc ODF import double border regression

2012-06-05 Thread Michael Stahl

the Calc ODF import mangles double borders written by older versions and
OOo, they have their width tripled and are beaten into a symmetric
shape; the following patches fix that and should go into libreoffice-3-5:

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

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

similar regressions in Writer i have fixed some time ago, and Impress
seems unaffected, i.e. double borders in Impress look just as ugly now
as they always have.

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


Re: Wasted a day on an Android bug...

2012-06-05 Thread Tor Lillqvist
 What I'm doing now is to combine this code with DocumentLoader to
 render actual LibreOffice documents.

Great! Note that I am working on a more permanent API for the
document loading and rendering, one that can be used both from Android
Java code, and from iOS code (C++ (or Objective-C++)). But it
shouldn't be too hard to adapt your code to it. Will commit some stuff
today to a new subdirectory touch, and then work on adapting the
DocumentLoader sample to use this API instead.

Don't wait unnecessarily before committing code to the repository; as
long as it is completely new code that doesn't interfer at all with
existing code it doesn't matter whether it works or not, etc.

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


Re: f70fe6e6 regression: options dialog is a bit broken

2012-06-05 Thread Noel Grandin



On 2012-06-05 14:40, Caolán McNamara wrote:

use glade as visual widget editor). In that world it should (eventually
anyway) be possible to just hide the unwanted widgets and the layout
will do the right thing automatically.



Awesome stuff!
Finally, a world where changing my system font size does not mess up all 
my application dialogs !!

:-)



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


[Libreoffice-commits] .: configure.in

2012-06-05 Thread Stephan Bergmann
 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9616b9440106a40058b7c1f1134417fdbfc0cdf6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Jun 5 14:53:46 2012 +0200

Bump AC_PACKAGE_VERSION, too

Change-Id: I8ec106cc0d8bb09e5a1947aacaf12ad6a0ddd8ef

diff --git a/configure.in b/configure.in
index ec4461d..bb3eed0 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil -*-
 dnl configure.in serves as input for the GNU autoconf package
 dnl in order to create a configure script.
 
-AC_INIT([LibreOffice],[3.6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[3.7],[],[],[http://documentfoundation.org/])
 AC_PREREQ([2.59])
 
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - distro-configs/LibreOfficeLinux.conf

2012-06-05 Thread Fridrich Strba
 distro-configs/LibreOfficeLinux.conf |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 536b688aacc9cce8749358bb7a50d582d8ab34a4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jun 5 14:57:25 2012 +0200

This option does not exist anymore

Change-Id: I748976e284e1812035f18abac628f0b2397d74c7

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 4b77cba..499d30a 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -37,7 +37,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-nlpsolver
 --enable-epm
---enable-cairo
 --enable-binfilter
 --enable-python=internal
 --enable-online-update
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH] [PYTHON] DialogBox class for Python

2012-06-05 Thread Caolán McNamara
On Fri, 2012-06-01 at 09:54 -0400, Kohei Yoshida wrote:
 Setting [PATCH] in the subject to make sure this one doesn't get lost...
 
 Anyone familiar with PyUNO care to comment on Joost's nice dialog box
 class addition?

The header would have to be changed to the TEMPLATE.SOURCECODE.HEADER
template in the root dir to get in of course, but otherwise there
doesn't seem anything wrong with it anyway :-)

Would the idea be to install it along with the rest of pyuno as a
utility class for reuse, or to just have it as a demo ?

C.

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


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

2012-06-05 Thread Michael Stahl
 drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx|   
34 
 drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx |   
 3 
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx  |   
75 +++---
 drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx   |   
 3 
 4 files changed, 66 insertions(+), 49 deletions(-)

New commits:
commit ee42895d684be9430a414adf3f569d279d437148
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 15:23:54 2012 +0200

fdo#49438: heuristic pseudo-hack to use hair-lines if width = 0.5 pixel

diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 6ca9643..1c9c1a9 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -83,35 +83,8 @@ namespace drawinglayer
 unsignedmbCreateOutside : 
1;
 
 /// local helpers
-double getCorrectedLeftWidth() const
-{
-return mfLeftWidth = 0.1 ? 0.0 : mfLeftWidth;
-}
-
-double getCorrectedDistance() const
-{
-return mfDistance = 0.1 ? 0.0 : mfDistance;
-}
-
-double getCorrectedRightWidth() const
-{
-return mfRightWidth = 0.1 ? 0.0 : mfRightWidth;
-}
-
-double getWidth() const
-{
-return getCorrectedLeftWidth() + getCorrectedDistance() + 
getCorrectedRightWidth();
-}
-
-bool leftIsHairline() const
-{
-return 0  mfLeftWidth  mfLeftWidth = 0.1;
-}
-
-bool rightIsHairline() const
-{
-return 0  mfRightWidth  mfRightWidth = 0.1;
-}
+double getWidth(
+const geometry::ViewInformation2D rViewInformation) const;
 
 bool isSolidLine() const
 {
@@ -129,7 +102,8 @@ namespace drawinglayer
 }
 
 protected:
-virtual basegfx::B2DPolyPolygon getClipPolygon( ) const;
+virtual basegfx::B2DPolyPolygon getClipPolygon(
+const geometry::ViewInformation2D rViewInformation) const;
 
 /// create local decomposition
 virtual Primitive2DSequence create2DDecomposition(const 
geometry::ViewInformation2D rViewInformation) const;
diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
index 9c1495b..689f358 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
@@ -49,7 +49,8 @@ namespace drawinglayer
 const basegfx::B2DPolygon maIntersection;
 
 protected:
-virtual basegfx::B2DPolyPolygon getClipPolygon( ) const;
+virtual basegfx::B2DPolyPolygon getClipPolygon(
+const geometry::ViewInformation2D rViewInformation) const;
 
 public:
 /// constructor
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 86f58d6..4591330 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -41,9 +41,45 @@
 
 namespace drawinglayer
 {
+// fdo#49438: heuristic pseudo hack
+static bool lcl_UseHairline(double const fW,
+basegfx::B2DPoint const rStart, basegfx::B2DPoint const rEnd,
+geometry::ViewInformation2D const rViewInformation)
+{
+basegfx::B2DTuple scale;
+basegfx::B2DTuple translation;
+double fRotation;
+double fShear;
+rViewInformation.getObjectToViewTransformation().decompose(
+scale, translation, fRotation, fShear);
+double const fScale(
+(rEnd.getX() - rStart.getX()  rEnd.getY() - rStart.getY())
+? scale.getY() : scale.getX());
+return (fW * fScale  0.51);
+}
+
+static double lcl_GetCorrectedWidth(double const fW,
+basegfx::B2DPoint const rStart, basegfx::B2DPoint const rEnd,
+geometry::ViewInformation2D const rViewInformation)
+{
+return (lcl_UseHairline(fW, rStart, rEnd, rViewInformation)) ? 0.0 : 
fW;
+}
+
 namespace primitive2d
 {
-basegfx::B2DPolyPolygon BorderLinePrimitive2D::getClipPolygon( ) const
+double BorderLinePrimitive2D::getWidth(
+geometry::ViewInformation2D const rViewInformation) const
+{
+return lcl_GetCorrectedWidth(mfLeftWidth, getStart(), getEnd(),
+  

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

2012-06-05 Thread Michael Stahl
 drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx|   
34 
 drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx |   
 3 
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx  |   
75 +++---
 drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx   |   
 3 
 4 files changed, 66 insertions(+), 49 deletions(-)

New commits:
commit 8fd62d93d583a1ed67a7cea76b51acc104aeaa08
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 15:23:54 2012 +0200

fdo#49438: heuristic pseudo-hack to use hair-lines if width = 0.5 pixel
(cherry picked from commit ee42895d684be9430a414adf3f569d279d437148)

diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 6ca9643..1c9c1a9 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -83,35 +83,8 @@ namespace drawinglayer
 unsignedmbCreateOutside : 
1;
 
 /// local helpers
-double getCorrectedLeftWidth() const
-{
-return mfLeftWidth = 0.1 ? 0.0 : mfLeftWidth;
-}
-
-double getCorrectedDistance() const
-{
-return mfDistance = 0.1 ? 0.0 : mfDistance;
-}
-
-double getCorrectedRightWidth() const
-{
-return mfRightWidth = 0.1 ? 0.0 : mfRightWidth;
-}
-
-double getWidth() const
-{
-return getCorrectedLeftWidth() + getCorrectedDistance() + 
getCorrectedRightWidth();
-}
-
-bool leftIsHairline() const
-{
-return 0  mfLeftWidth  mfLeftWidth = 0.1;
-}
-
-bool rightIsHairline() const
-{
-return 0  mfRightWidth  mfRightWidth = 0.1;
-}
+double getWidth(
+const geometry::ViewInformation2D rViewInformation) const;
 
 bool isSolidLine() const
 {
@@ -129,7 +102,8 @@ namespace drawinglayer
 }
 
 protected:
-virtual basegfx::B2DPolyPolygon getClipPolygon( ) const;
+virtual basegfx::B2DPolyPolygon getClipPolygon(
+const geometry::ViewInformation2D rViewInformation) const;
 
 /// create local decomposition
 virtual Primitive2DSequence create2DDecomposition(const 
geometry::ViewInformation2D rViewInformation) const;
diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
index 9c1495b..689f358 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx
@@ -49,7 +49,8 @@ namespace drawinglayer
 const basegfx::B2DPolygon maIntersection;
 
 protected:
-virtual basegfx::B2DPolyPolygon getClipPolygon( ) const;
+virtual basegfx::B2DPolyPolygon getClipPolygon(
+const geometry::ViewInformation2D rViewInformation) const;
 
 public:
 /// constructor
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 86f58d6..4591330 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -41,9 +41,45 @@
 
 namespace drawinglayer
 {
+// fdo#49438: heuristic pseudo hack
+static bool lcl_UseHairline(double const fW,
+basegfx::B2DPoint const rStart, basegfx::B2DPoint const rEnd,
+geometry::ViewInformation2D const rViewInformation)
+{
+basegfx::B2DTuple scale;
+basegfx::B2DTuple translation;
+double fRotation;
+double fShear;
+rViewInformation.getObjectToViewTransformation().decompose(
+scale, translation, fRotation, fShear);
+double const fScale(
+(rEnd.getX() - rStart.getX()  rEnd.getY() - rStart.getY())
+? scale.getY() : scale.getX());
+return (fW * fScale  0.51);
+}
+
+static double lcl_GetCorrectedWidth(double const fW,
+basegfx::B2DPoint const rStart, basegfx::B2DPoint const rEnd,
+geometry::ViewInformation2D const rViewInformation)
+{
+return (lcl_UseHairline(fW, rStart, rEnd, rViewInformation)) ? 0.0 : 
fW;
+}
+
 namespace primitive2d
 {
-basegfx::B2DPolyPolygon BorderLinePrimitive2D::getClipPolygon( ) const
+double BorderLinePrimitive2D::getWidth(
+geometry::ViewInformation2D const rViewInformation) const
+{
+

[Libreoffice-commits] .: 2 commits - icon-themes/galaxy icon-themes/hicontrast sw/source

2012-06-05 Thread Jan Holesovsky
 dev/null  |binary
 icon-themes/galaxy/sw/res/emptypage_10x14.png |binary
 icon-themes/galaxy/sw/res/emptypage_a_10x14.png   |binary
 icon-themes/galaxy/sw/res/twopages_10x24.png  |binary
 icon-themes/galaxy/sw/res/twopages_a_10x24.png|binary
 icon-themes/hicontrast/svx/res/doublepage_10x22.png   |binary
 icon-themes/hicontrast/svx/res/doublepage_a_10x22.png |binary
 icon-themes/hicontrast/svx/res/emptypage_10x14.png|binary
 icon-themes/hicontrast/svx/res/emptypage_a_10x14.png  |binary
 icon-themes/hicontrast/svx/res/slidezoombutton_10.png |binary
 icon-themes/hicontrast/svx/res/slidezoomin_10.png |binary
 icon-themes/hicontrast/svx/res/slidezoomout_10.png|binary
 icon-themes/hicontrast/svx/res/twopages_10x24.png |binary
 icon-themes/hicontrast/svx/res/twopages_a_10x24.png   |binary
 sw/source/ui/utlui/utlui.src  |8 
 sw/source/ui/utlui/viewlayoutctrl.cxx |4 ++--
 16 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 8d5402b8a8bf32a7e33d3d18d6324259523aa8a6
Author: Mirek Mazel maz...@gmail.com
Date:   Tue Jun 5 15:30:05 2012 +0200

hicontrast icons for layout status and zoom slider controls.

Change-Id: I247d792e3e912ea1f51bc363aca14c43bb72546e

diff --git a/icon-themes/hicontrast/svx/res/doublepage_10x22.png 
b/icon-themes/hicontrast/svx/res/doublepage_10x22.png
new file mode 100644
index 000..c986b93
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/doublepage_10x22.png differ
diff --git a/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png 
b/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png
new file mode 100644
index 000..db398f9
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png differ
diff --git a/icon-themes/hicontrast/svx/res/emptypage_10x14.png 
b/icon-themes/hicontrast/svx/res/emptypage_10x14.png
new file mode 100644
index 000..451dcbd
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/emptypage_10x14.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png 
b/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png
new file mode 100644
index 000..01541da
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoombutton_10.png 
b/icon-themes/hicontrast/svx/res/slidezoombutton_10.png
new file mode 100644
index 000..5ee7630
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/slidezoombutton_10.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoomin_10.png 
b/icon-themes/hicontrast/svx/res/slidezoomin_10.png
new file mode 100644
index 000..e8027ec
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoomin_10.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoomout_10.png 
b/icon-themes/hicontrast/svx/res/slidezoomout_10.png
new file mode 100644
index 000..a99db1b
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoomout_10.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/twopages_10x24.png 
b/icon-themes/hicontrast/svx/res/twopages_10x24.png
new file mode 100644
index 000..d1eb252
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/twopages_10x24.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/twopages_a_10x24.png 
b/icon-themes/hicontrast/svx/res/twopages_a_10x24.png
new file mode 100644
index 000..cc475d9
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/twopages_a_10x24.png differ
commit 985cf57131214f512b1c4494e17c01de1a527101
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Jun 5 15:22:02 2012 +0200

layout status control: Improved artwork by Mirek M.

Change-Id: I0584f4d158225dc28518fb67185d0a704bfe10d1

diff --git a/icon-themes/galaxy/sw/res/emptypage_10x14.png 
b/icon-themes/galaxy/sw/res/emptypage_10x14.png
new file mode 100644
index 000..d564bfd
Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_10x14.png 
differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_10x22.png 
b/icon-themes/galaxy/sw/res/emptypage_10x22.png
deleted file mode 100644
index b72bbdc..000
Binary files a/icon-themes/galaxy/sw/res/emptypage_10x22.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x14.png 
b/icon-themes/galaxy/sw/res/emptypage_a_10x14.png
new file mode 100644
index 000..4359b49
Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_a_10x14.png 
differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png 
b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png
deleted file mode 100644
index ac011b8..000
Binary files a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/sw/res/twopages_10x22.png 
b/icon-themes/galaxy/sw/res/twopages_10x22.png
deleted file mode 100644
index 9c95268..000
Binary files 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - icon-themes/galaxy icon-themes/hicontrast sw/source

2012-06-05 Thread Jan Holesovsky
 dev/null  |binary
 icon-themes/galaxy/sw/res/emptypage_10x14.png |binary
 icon-themes/galaxy/sw/res/emptypage_a_10x14.png   |binary
 icon-themes/galaxy/sw/res/twopages_10x24.png  |binary
 icon-themes/galaxy/sw/res/twopages_a_10x24.png|binary
 icon-themes/hicontrast/svx/res/doublepage_10x22.png   |binary
 icon-themes/hicontrast/svx/res/doublepage_a_10x22.png |binary
 icon-themes/hicontrast/svx/res/emptypage_10x14.png|binary
 icon-themes/hicontrast/svx/res/emptypage_a_10x14.png  |binary
 icon-themes/hicontrast/svx/res/slidezoombutton_10.png |binary
 icon-themes/hicontrast/svx/res/slidezoomin_10.png |binary
 icon-themes/hicontrast/svx/res/slidezoomout_10.png|binary
 icon-themes/hicontrast/svx/res/twopages_10x24.png |binary
 icon-themes/hicontrast/svx/res/twopages_a_10x24.png   |binary
 sw/source/ui/utlui/utlui.src  |8 
 sw/source/ui/utlui/viewlayoutctrl.cxx |4 ++--
 16 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit fa1e8be2825ca1f4210f3066e05da9ff54d3ed75
Author: Mirek Mazel maz...@gmail.com
Date:   Tue Jun 5 15:30:05 2012 +0200

hicontrast icons for layout status and zoom slider controls.

Change-Id: I247d792e3e912ea1f51bc363aca14c43bb72546e

diff --git a/icon-themes/hicontrast/svx/res/doublepage_10x22.png 
b/icon-themes/hicontrast/svx/res/doublepage_10x22.png
new file mode 100644
index 000..c986b93
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/doublepage_10x22.png differ
diff --git a/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png 
b/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png
new file mode 100644
index 000..db398f9
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/doublepage_a_10x22.png differ
diff --git a/icon-themes/hicontrast/svx/res/emptypage_10x14.png 
b/icon-themes/hicontrast/svx/res/emptypage_10x14.png
new file mode 100644
index 000..451dcbd
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/emptypage_10x14.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png 
b/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png
new file mode 100644
index 000..01541da
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/emptypage_a_10x14.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoombutton_10.png 
b/icon-themes/hicontrast/svx/res/slidezoombutton_10.png
new file mode 100644
index 000..5ee7630
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/slidezoombutton_10.png differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoomin_10.png 
b/icon-themes/hicontrast/svx/res/slidezoomin_10.png
new file mode 100644
index 000..e8027ec
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoomin_10.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/slidezoomout_10.png 
b/icon-themes/hicontrast/svx/res/slidezoomout_10.png
new file mode 100644
index 000..a99db1b
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/slidezoomout_10.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/twopages_10x24.png 
b/icon-themes/hicontrast/svx/res/twopages_10x24.png
new file mode 100644
index 000..d1eb252
Binary files /dev/null and b/icon-themes/hicontrast/svx/res/twopages_10x24.png 
differ
diff --git a/icon-themes/hicontrast/svx/res/twopages_a_10x24.png 
b/icon-themes/hicontrast/svx/res/twopages_a_10x24.png
new file mode 100644
index 000..cc475d9
Binary files /dev/null and 
b/icon-themes/hicontrast/svx/res/twopages_a_10x24.png differ
commit cfc690e06f373b162a84277d9c473b66d9df3cc6
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Jun 5 15:22:02 2012 +0200

layout status control: Improved artwork by Mirek M.

Change-Id: I0584f4d158225dc28518fb67185d0a704bfe10d1

diff --git a/icon-themes/galaxy/sw/res/emptypage_10x14.png 
b/icon-themes/galaxy/sw/res/emptypage_10x14.png
new file mode 100644
index 000..d564bfd
Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_10x14.png 
differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_10x22.png 
b/icon-themes/galaxy/sw/res/emptypage_10x22.png
deleted file mode 100644
index b72bbdc..000
Binary files a/icon-themes/galaxy/sw/res/emptypage_10x22.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x14.png 
b/icon-themes/galaxy/sw/res/emptypage_a_10x14.png
new file mode 100644
index 000..4359b49
Binary files /dev/null and b/icon-themes/galaxy/sw/res/emptypage_a_10x14.png 
differ
diff --git a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png 
b/icon-themes/galaxy/sw/res/emptypage_a_10x22.png
deleted file mode 100644
index ac011b8..000
Binary files a/icon-themes/galaxy/sw/res/emptypage_a_10x22.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/sw/res/twopages_10x22.png 
b/icon-themes/galaxy/sw/res/twopages_10x22.png
deleted file mode 100644
index 9c95268..000
Binary files 

License statement

2012-06-05 Thread Mirek M.
All of my past  future contributions to LibreOffice may be licensed under
the MPL/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: packimages: many files not found

2012-06-05 Thread Korrawit Pruegsanusak
Hello,

On Sat, Jan 21, 2012 at 9:43 AM, Korrawit Pruegsanusak
detective.conan.1...@gmail.com wrote:
 From a tinderbox success build log [1] of master branch, we have these
 errors:

For a record, this is reported at fdo#50630 and fixed by David Tardon.
Thanks a lot! :-)

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


[Libreoffice-commits] .: oox/source

2012-06-05 Thread Miklos Vajna
 oox/source/drawingml/textparagraph.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25d7dffde13ecf32df1cce521a91c7075f372167
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jun 5 15:55:13 2012 +0200

oox::drawingml::TextParagraph: OSL_TRACE - SAL_INFO

Change-Id: I79af1d624c420dff87751691ff8aa484fd3de2b6

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 63a2845..adaae12 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -65,7 +65,7 @@ void TextParagraph::insertAt(
 
 sal_Int16 nLevel = maProperties.getLevel();
 
-OSL_TRACE(TextParagraph::insertAt() - level %d, nLevel);
+SAL_INFO(oox, TextParagraph::insertAt() - level   nLevel);
 
 const TextParagraphPropertiesVector rListStyle = 
rTextListStyle.getListStyle();
 if ( nLevel = static_cast sal_Int16 ( rListStyle.size() ) )
@@ -143,7 +143,7 @@ void TextParagraph::insertAt(
 }
 catch( Exception  )
 {
-OSL_TRACE(OOX: exception in TextParagraph::insertAt);
+SAL_INFO(oox, exception in TextParagraph::insertAt);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - extras/prj extras/source extras/util

2012-06-05 Thread Andras Timar
 dev/null  |binary
 extras/prj/build.lst  |1 
 extras/source/symbols/delzip  |1 
 extras/source/symbols/makefile.mk |   51 --
 extras/util/target.pmk|3 --
 5 files changed, 56 deletions(-)

New commits:
commit 4dd1f2d3cdcb34428ba53ccec305713a7195ea20
Author: Andras Timar ati...@suse.com
Date:   Tue Jun 5 16:02:34 2012 +0200

Revert Revert Remove ugly symbols

This reverts commit e74c007e25d05e49d94a94d9b024076faa02c8d0.

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 3aca646..a9fd80a 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -70,7 +70,6 @@ er  extras\source\gallery\accessories\Elements\Bullets2   
   nmake   -
 er  extras\source\gallery\accessories-nonfree   nmake  
 -   all er_gaccenf NULL
 er extras\source\misc_config   nmake   -   
all er_mcnf NULL
 er extras\source\palettes  nmake   -   
all er_palet NULL
-er extras\source\symbols   nmake   -   
all er_symb NULL
 er  extras\source\templates\layout  nmake   -  
 all er_tlal NULL
 er  extras\source\templates\presnt\lang nmake   -  
 all er_tprel NULL
 er  extras\source\templates\wizard\agenda\lang  nmake   -  
 all er_twagl NULL
diff --git a/extras/source/symbols/delzip b/extras/source/symbols/delzip
deleted file mode 100644
index 636fda9..000
--- a/extras/source/symbols/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/extras/source/symbols/l_2people.bmp 
b/extras/source/symbols/l_2people.bmp
deleted file mode 100644
index 5b7a8fc..000
Binary files a/extras/source/symbols/l_2people.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention1.bmp 
b/extras/source/symbols/l_attention1.bmp
deleted file mode 100644
index bf6890f..000
Binary files a/extras/source/symbols/l_attention1.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention2.bmp 
b/extras/source/symbols/l_attention2.bmp
deleted file mode 100644
index 120c9e9..000
Binary files a/extras/source/symbols/l_attention2.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention3.bmp 
b/extras/source/symbols/l_attention3.bmp
deleted file mode 100644
index 7b48a9c..000
Binary files a/extras/source/symbols/l_attention3.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_candy.bmp 
b/extras/source/symbols/l_candy.bmp
deleted file mode 100644
index 935fdf8..000
Binary files a/extras/source/symbols/l_candy.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_face.bmp b/extras/source/symbols/l_face.bmp
deleted file mode 100644
index c44d956..000
Binary files a/extras/source/symbols/l_face.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_flower.bmp 
b/extras/source/symbols/l_flower.bmp
deleted file mode 100644
index ced7409..000
Binary files a/extras/source/symbols/l_flower.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_ghost.bmp 
b/extras/source/symbols/l_ghost.bmp
deleted file mode 100644
index 877ba27..000
Binary files a/extras/source/symbols/l_ghost.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_halloween.bmp 
b/extras/source/symbols/l_halloween.bmp
deleted file mode 100644
index 8326cd2..000
Binary files a/extras/source/symbols/l_halloween.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_home.bmp b/extras/source/symbols/l_home.bmp
deleted file mode 100644
index c34900a..000
Binary files a/extras/source/symbols/l_home.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lamp.bmp b/extras/source/symbols/l_lamp.bmp
deleted file mode 100644
index 6a824ef..000
Binary files a/extras/source/symbols/l_lamp.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lock.bmp b/extras/source/symbols/l_lock.bmp
deleted file mode 100644
index 986f4d0..000
Binary files a/extras/source/symbols/l_lock.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_b.bmp 
b/extras/source/symbols/l_page_b.bmp
deleted file mode 100644
index 94c3c67..000
Binary files a/extras/source/symbols/l_page_b.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_g.bmp 
b/extras/source/symbols/l_page_g.bmp
deleted file mode 100644
index f0b8d7d..000
Binary files a/extras/source/symbols/l_page_g.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_y.bmp 
b/extras/source/symbols/l_page_y.bmp
deleted file mode 100644
index 39e7c98..000
Binary files a/extras/source/symbols/l_page_y.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_people.bmp 
b/extras/source/symbols/l_people.bmp
deleted file mode 100644
index 1123390..000
Binary files a/extras/source/symbols/l_people.bmp and /dev/null differ

[Libreoffice-commits] .: extras/prj extras/source extras/util

2012-06-05 Thread Andras Timar
 dev/null  |binary
 extras/prj/build.lst  |1 
 extras/source/symbols/delzip  |1 
 extras/source/symbols/makefile.mk |   51 --
 extras/util/target.pmk|3 --
 5 files changed, 56 deletions(-)

New commits:
commit ea08541bd644d671c7cef6b64311cd8a691a207c
Author: Andras Timar ati...@suse.com
Date:   Tue Jun 5 16:03:55 2012 +0200

Revert Revert Remove ugly symbols

This reverts commit e74c007e25d05e49d94a94d9b024076faa02c8d0.

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 3aca646..a9fd80a 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -70,7 +70,6 @@ er  extras\source\gallery\accessories\Elements\Bullets2   
   nmake   -
 er  extras\source\gallery\accessories-nonfree   nmake  
 -   all er_gaccenf NULL
 er extras\source\misc_config   nmake   -   
all er_mcnf NULL
 er extras\source\palettes  nmake   -   
all er_palet NULL
-er extras\source\symbols   nmake   -   
all er_symb NULL
 er  extras\source\templates\layout  nmake   -  
 all er_tlal NULL
 er  extras\source\templates\presnt\lang nmake   -  
 all er_tprel NULL
 er  extras\source\templates\wizard\agenda\lang  nmake   -  
 all er_twagl NULL
diff --git a/extras/source/symbols/delzip b/extras/source/symbols/delzip
deleted file mode 100644
index 636fda9..000
--- a/extras/source/symbols/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/extras/source/symbols/l_2people.bmp 
b/extras/source/symbols/l_2people.bmp
deleted file mode 100644
index 5b7a8fc..000
Binary files a/extras/source/symbols/l_2people.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention1.bmp 
b/extras/source/symbols/l_attention1.bmp
deleted file mode 100644
index bf6890f..000
Binary files a/extras/source/symbols/l_attention1.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention2.bmp 
b/extras/source/symbols/l_attention2.bmp
deleted file mode 100644
index 120c9e9..000
Binary files a/extras/source/symbols/l_attention2.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_attention3.bmp 
b/extras/source/symbols/l_attention3.bmp
deleted file mode 100644
index 7b48a9c..000
Binary files a/extras/source/symbols/l_attention3.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_candy.bmp 
b/extras/source/symbols/l_candy.bmp
deleted file mode 100644
index 935fdf8..000
Binary files a/extras/source/symbols/l_candy.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_face.bmp b/extras/source/symbols/l_face.bmp
deleted file mode 100644
index c44d956..000
Binary files a/extras/source/symbols/l_face.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_flower.bmp 
b/extras/source/symbols/l_flower.bmp
deleted file mode 100644
index ced7409..000
Binary files a/extras/source/symbols/l_flower.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_ghost.bmp 
b/extras/source/symbols/l_ghost.bmp
deleted file mode 100644
index 877ba27..000
Binary files a/extras/source/symbols/l_ghost.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_halloween.bmp 
b/extras/source/symbols/l_halloween.bmp
deleted file mode 100644
index 8326cd2..000
Binary files a/extras/source/symbols/l_halloween.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_home.bmp b/extras/source/symbols/l_home.bmp
deleted file mode 100644
index c34900a..000
Binary files a/extras/source/symbols/l_home.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lamp.bmp b/extras/source/symbols/l_lamp.bmp
deleted file mode 100644
index 6a824ef..000
Binary files a/extras/source/symbols/l_lamp.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_lock.bmp b/extras/source/symbols/l_lock.bmp
deleted file mode 100644
index 986f4d0..000
Binary files a/extras/source/symbols/l_lock.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_b.bmp 
b/extras/source/symbols/l_page_b.bmp
deleted file mode 100644
index 94c3c67..000
Binary files a/extras/source/symbols/l_page_b.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_g.bmp 
b/extras/source/symbols/l_page_g.bmp
deleted file mode 100644
index f0b8d7d..000
Binary files a/extras/source/symbols/l_page_g.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_page_y.bmp 
b/extras/source/symbols/l_page_y.bmp
deleted file mode 100644
index 39e7c98..000
Binary files a/extras/source/symbols/l_page_y.bmp and /dev/null differ
diff --git a/extras/source/symbols/l_people.bmp 
b/extras/source/symbols/l_people.bmp
deleted file mode 100644
index 1123390..000
Binary files a/extras/source/symbols/l_people.bmp and /dev/null differ

[Libreoffice-commits] .: 3 commits - framework/source icon-themes/galaxy sc/uiconfig sw/uiconfig

2012-06-05 Thread Jan Holesovsky
 framework/source/services/backingwindow.cxx  |2 +-
 icon-themes/galaxy/brand/shell/backing_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_right.png |binary
 icon-themes/galaxy/brand/shell/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
 icon-themes/galaxy/brand/shell/backing_space.png |binary
 sc/uiconfig/scalc/statusbar/statusbar.xml|4 ++--
 sw/uiconfig/sglobal/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/sweb/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swform/statusbar/statusbar.xml   |4 ++--
 sw/uiconfig/swreport/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swriter/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/swxform/statusbar/statusbar.xml  |4 ++--
 13 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 4d6368d6bba270f6f4d985eaac475be584d5d13d
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Jun 5 16:08:31 2012 +0200

status bar: Normalize the selection and modification status icons sizes.

Change-Id: I4c11c82df0fdbf0040729323dc1fda2ece7f2582

diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml 
b/sc/uiconfig/scalc/statusbar/statusbar.xml
index 95be231..8a0819a 100644
--- a/sc/uiconfig/scalc/statusbar/statusbar.xml
+++ b/sc/uiconfig/scalc/statusbar/statusbar.xml
@@ -4,8 +4,8 @@
  statusbar:statusbaritem xlink:href=.uno:StatusDocPos 
statusbar:align=left statusbar:autosize=true statusbar:width=58 
statusbar:helpid=helpid:26114/
  statusbar:statusbaritem xlink:href=.uno:StatusPageStyle 
statusbar:align=left statusbar:autosize=true statusbar:width=83 
statusbar:helpid=helpid:26115/
  statusbar:statusbaritem xlink:href=.uno:InsertMode 
statusbar:align=center statusbar:width=55 statusbar:helpid=helpid:10221/
- statusbar:statusbaritem xlink:href=.uno:StatusSelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:26116/
- statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:5584/
+ statusbar:statusbaritem xlink:href=.uno:StatusSelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:26116/
+ statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:5584/
  statusbar:statusbaritem xlink:href=.uno:Signature statusbar:align=center 
statusbar:ownerdraw=true statusbar:width=16 statusbar:helpid=helpid:5699/
  statusbar:statusbaritem xlink:href=.uno:Size statusbar:align=center 
statusbar:autosize=true statusbar:ownerdraw=true statusbar:width=200 
statusbar:helpid=helpid:10224/
  statusbar:statusbaritem xlink:href=.uno:ZoomSlider 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=140 
statusbar:helpid=helpid:11065/
diff --git a/sw/uiconfig/sglobal/statusbar/statusbar.xml 
b/sw/uiconfig/sglobal/statusbar/statusbar.xml
index e6c495f..ac30138 100644
--- a/sw/uiconfig/sglobal/statusbar/statusbar.xml
+++ b/sw/uiconfig/sglobal/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  statusbar:statusbaritem xlink:href=.uno:PageStyleName 
statusbar:align=left statusbar:autosize=true statusbar:width=79 
statusbar:helpid=helpid:21182/
  statusbar:statusbaritem xlink:href=.uno:LanguageStatus 
statusbar:align=center statusbar:autosize=true statusbar:width=100 /
  statusbar:statusbaritem xlink:href=.uno:InsertMode 
statusbar:align=center statusbar:width=55 statusbar:helpid=helpid:10221/
- statusbar:statusbaritem xlink:href=.uno:SelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:21185/
- statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:5584/
+ statusbar:statusbaritem xlink:href=.uno:SelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:21185/
+ statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:5584/
  statusbar:statusbaritem xlink:href=.uno:Signature statusbar:align=center 
statusbar:ownerdraw=true statusbar:width=16 statusbar:helpid=helpid:5699/
  statusbar:statusbaritem xlink:href=.uno:Size statusbar:align=left 
statusbar:autosize=true statusbar:ownerdraw=true statusbar:width=110 
statusbar:helpid=helpid:10224/
  statusbar:statusbaritem xlink:href=.uno:ViewLayout 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=63 
statusbar:helpid=helpid:11064/
diff --git a/sw/uiconfig/sweb/statusbar/statusbar.xml 
b/sw/uiconfig/sweb/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/sweb/statusbar/statusbar.xml
+++ b/sw/uiconfig/sweb/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  statusbar:statusbaritem xlink:href=.uno:PageStyleName 

[Libreoffice-commits] .: oox/source

2012-06-05 Thread Miklos Vajna
 oox/source/drawingml/textparagraphproperties.cxx |   25 ++-
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 9dc26ca9461dbb539c523c8bd68ce171aab25d90
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jun 5 16:13:26 2012 +0200

TextParagraphProperties::pushToPropSet: limit effect of failed numrule 
import

Fixes missing paragraph properties in Writer when importing SmartArt.

Change-Id: I0091d7156b30b7ef99e550d7252a60676c23046e

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index e82124d..abd0b3b 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -443,18 +443,25 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 aPropSet.getProperty( xNumRule, PROP_NumberingRules );
 OSL_ENSURE( xNumRule.is(), can't get Numbering rules);
 
-if( xNumRule.is() )
+try
 {
-if( !rioBulletMap.empty() )
+if( xNumRule.is() )
 {
-// fix default bullet size to be 100%
-if( rioBulletMap.find( PROP_BulletRelSize ) == 
rioBulletMap.end() )
-rioBulletMap[ PROP_BulletRelSize ] = static_cast 
sal_Int16 ( 100 );
-Sequence PropertyValue  aBulletPropSeq = 
rioBulletMap.makePropertyValueSequence();
-xNumRule-replaceByIndex( getLevel(), makeAny( aBulletPropSeq 
) );
+if( !rioBulletMap.empty() )
+{
+// fix default bullet size to be 100%
+if( rioBulletMap.find( PROP_BulletRelSize ) == 
rioBulletMap.end() )
+rioBulletMap[ PROP_BulletRelSize ] = static_cast 
sal_Int16 ( 100 );
+Sequence PropertyValue  aBulletPropSeq = 
rioBulletMap.makePropertyValueSequence();
+xNumRule-replaceByIndex( getLevel(), makeAny( 
aBulletPropSeq ) );
+}
+
+aPropSet.setProperty( PROP_NumberingRules, xNumRule );
 }
-
-aPropSet.setProperty( PROP_NumberingRules, xNumRule );
+}
+catch (const Exception )
+{
+// Don't warn for now, expected to fail for Writer.
 }
 }
 if ( noParaLeftMargin )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/inc vcl/unx

2012-06-05 Thread Caolán McNamara
 vcl/inc/unx/gtk/gtkgdi.hxx   |5 +
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |  110 ++-
 2 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit 797c51759f332adb3241da0abc904b11a39eb6d4
Author: Ruslan Kabatsayev b7.10110...@gmail.com
Date:   Sat Jun 2 16:04:51 2012 +0400

GTK theming: implement frame rendering

Change-Id: I7efa167cee05f84c56f554b5c2002e825809
(cherry picked from commit 0d314b0158b9d3660973656597d25a1504987b93)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index fbdcef1..b4fe837 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -165,6 +165,11 @@ protected:
 GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect );
 sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
 
+sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, 
ControlPart nPart,
+   const Rectangle rControlRectangle,
+   const clipList rClipList,
+   ControlState nState, const ImplControlValue aValue,
+   const OUString rCaption );
 sal_Bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType 
nType, ControlPart nPart,
const Rectangle rControlRectangle,
const clipList rClipList,
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e9101bf..b21f12c 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -45,6 +45,8 @@
 
 #include vcl/vclenum.hxx
 #include vcl/fontmanager.hxx
+#include vcl/decoview.hxx
+
 typedef struct _cairo_font_options cairo_font_options_t;
 const char* const tabPrelitDataName=libreoffice-tab-is-prelit;
 
@@ -243,6 +245,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen,
ControlState nState,
const ImplControlValue aValue,
const OUString rCaption );
+
+static int getFrameWidth(GtkWidget* widget);
 //---
 
 static Rectangle NWGetScrollButtonRect(SalX11Screen nScreen, ControlPart 
nPart, Rectangle aAreaRect );
@@ -581,6 +585,7 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( 
ControlType nType, ControlPar
 return true;
 break;
 
+case CTRL_FRAME:
 case CTRL_WINDOW_BACKGROUND:
 return true;
 
@@ -768,7 +773,6 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 // get a GC with current clipping region set
 GetFontGC();
 
-
 // theme changed ?
 if( GtkSalGraphics::bThemeChanged )
 {
@@ -918,6 +922,11 @@ sal_Bool GtkSalGraphics::drawNativeControl(ControlType 
nType,
 returnVal = NWPaintGTKWindowBackground( gdkDrawable, nType, nPart, 
aCtrlRect, aClip, nState, aValue, rCaption );
 }
 
+if(nType==CTRL_FRAME)
+{
+returnVal = NWPaintGTKFrame( gdkDrawable, nType, nPart, aCtrlRect, 
aClip, nState, aValue, rCaption);
+}
+
 if( pixmap )
 {
 returnVal = NWRenderPixmapToScreen( pixmap, aPixmapRect )  returnVal;
@@ -1144,6 +1153,33 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 rNativeBoundingRegion = rNativeContentRegion = aRect;
 returnVal = sal_True;
 }
+if( nType == CTRL_FRAME  nPart == PART_BORDER )
+{
+int frameWidth = getFrameWidth(m_pWindow);
+rNativeBoundingRegion = rControlRegion;
+sal_uInt16 nStyle = aValue.getNumericVal();
+int x1=rControlRegion.Left();
+int y1=rControlRegion.Top();
+int x2=rControlRegion.Right();
+int y2=rControlRegion.Bottom();
+
+if( nStyle  FRAME_DRAW_NODRAW )
+{
+if( (nStyle  FRAME_DRAW_TOPBOTTOM) == FRAME_DRAW_TOPBOTTOM )
+rNativeContentRegion = Rectangle(x1,
+ y1+frameWidth,
+ x2,
+ y2-frameWidth);
+else
+rNativeContentRegion = Rectangle(x1+frameWidth,
+ y1+frameWidth,
+ x2-frameWidth,
+ y2-frameWidth);
+}
+else
+rNativeContentRegion = rControlRegion;
+returnVal=true;
+}
 
 return( returnVal );
 }
@@ -1151,6 +1187,73 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 /
  * Individual control drawing functions
  /
+sal_Bool GtkSalGraphics::NWPaintGTKFrame(
+ 

[Libreoffice-commits] .: testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_uno_test.mk

2012-06-05 Thread Michael Stahl
 testtools/CustomTarget_bridgetest.mk   |   47 ++---
 testtools/CustomTarget_bridgetest_climaker.mk  |9 ++--
 testtools/CustomTarget_bridgetest_javamaker.mk |   10 ++---
 testtools/CustomTarget_uno_test.mk |   11 +++--
 4 files changed, 36 insertions(+), 41 deletions(-)

New commits:
commit 71dbf5bfd0b9622ad485a5b7620e11d8405ed474
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 16:04:20 2012 +0200

normalize gbuild variable names in testtools.

Variables should have module name as prefix to prevent collisions.

Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524

diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index 473613d..c30ac3d 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -26,44 +26,37 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
 
-workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
-UNO_EXE := $(OUTDIR)/bin/uno
+testtools_BRIDGEDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
 
 ifeq ($(OS),WNT)
-BATCH_SUFFIX := .bat
-GIVE_EXEC_RIGHTS=@echo
+testtools_BATCHSUFFIX := .bat
 else
-BATCH_SUFFIX :=
-GIVE_EXEC_RIGHTS=chmod +x
+testtools_BATCHSUFFIX :=
 endif
 
-bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
+   $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \
+   $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \
+   $(if $(SOLAR_JAVA),\
+   
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \
+   
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX))
 
-ifneq ($(SOLAR_JAVA),)
-bridgetest_TARGET := $(bridgetest_TARGET) \
-   $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX)
-endif
-
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
-
-$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
-   echo $(UNO_EXE) \
+   echo $(call gb_Executable_get_target_for_build,uno) \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
-s com.sun.star.test.bridge.CppTestObject \
-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test' \
--singleaccept  $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
 
 testtools_MY_CLASSPATH := 
$(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
 
-$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo java \
@@ -71,14 +64,14 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
com.sun.star.comp.bridge.TestComponentMain \

\uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test\ \
singleaccept $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo JAVA_HOME=$(JAVA_HOME) \
LD_LIBRARY_PATH=$(OUTDIR)/lib \
-   $(UNO_EXE) \
+   $(call gb_Executable_get_target_for_build,uno) \
-ro $(OUTDIR)/xml/ure/services.rdb \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
@@ -88,12 +81,12 @@ $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) 
:| $(workdir_SERVER)/
-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib \
-- com.sun.star.test.bridge.JavaTestObject noCurrentContext \
 $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTa

2012-06-05 Thread Michael Stahl
 testtools/CustomTarget_bridgetest.mk   |   47 ++---
 testtools/CustomTarget_bridgetest_climaker.mk  |9 ++--
 testtools/CustomTarget_bridgetest_javamaker.mk |   10 ++---
 testtools/CustomTarget_uno_test.mk |   11 +++--
 4 files changed, 36 insertions(+), 41 deletions(-)

New commits:
commit 160181bbf11586796a6deb50ad13d895f3a74727
Author: Michael Stahl mst...@redhat.com
Date:   Tue Jun 5 16:04:20 2012 +0200

normalize gbuild variable names in testtools.

Variables should have module name as prefix to prevent collisions.

Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524
(cherry picked from commit 71dbf5bfd0b9622ad485a5b7620e11d8405ed474)

diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index 473613d..c30ac3d 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -26,44 +26,37 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,testtools/bridgetest))
 
-workdir_SERVER := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
-UNO_EXE := $(OUTDIR)/bin/uno
+testtools_BRIDGEDIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest)
 
 ifeq ($(OS),WNT)
-BATCH_SUFFIX := .bat
-GIVE_EXEC_RIGHTS=@echo
+testtools_BATCHSUFFIX := .bat
 else
-BATCH_SUFFIX :=
-GIVE_EXEC_RIGHTS=chmod +x
+testtools_BATCHSUFFIX :=
 endif
 
-bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
+   $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) \
+   $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) \
+   $(if $(SOLAR_JAVA),\
+   
$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) \
+   
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX))
 
-ifneq ($(SOLAR_JAVA),)
-bridgetest_TARGET := $(bridgetest_TARGET) \
-   $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
-   $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX)
-endif
-
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
-
-$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
-   echo $(UNO_EXE) \
+   echo $(call gb_Executable_get_target_for_build,uno) \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
-s com.sun.star.test.bridge.CppTestObject \
-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test' \
--singleaccept  $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
 
 testtools_MY_CLASSPATH := 
$(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
 
-$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo java \
@@ -71,14 +64,14 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
com.sun.star.comp.bridge.TestComponentMain \

\uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test\ \
singleaccept $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) :| 
$(workdir_SERVER)/.dir
+$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| 
$(testtools_BRIDGEDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo JAVA_HOME=$(JAVA_HOME) \
LD_LIBRARY_PATH=$(OUTDIR)/lib \
-   $(UNO_EXE) \
+   $(call gb_Executable_get_target_for_build,uno) \
-ro $(OUTDIR)/xml/ure/services.rdb \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
@@ -88,12 +81,12 @@ $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) 
:| $(workdir_SERVER)/
-env:URE_INTERNAL_LIB_DIR=file://$(OUTDIR)/lib \
-- com.sun.star.test.bridge.JavaTestObject noCurrentContext \
 $@)
-   $(GIVE_EXEC_RIGHTS) $@
+   $(if $(filter-out WNT,$(OS)),chmod +x $@)
 
-$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - framework/source icon-themes/galaxy sc/uiconfig sw/uiconfig

2012-06-05 Thread Jan Holesovsky
 framework/source/services/backingwindow.cxx  |2 +-
 icon-themes/galaxy/brand/shell/backing_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_right.png |binary
 icon-themes/galaxy/brand/shell/backing_rtl_left.png  |binary
 icon-themes/galaxy/brand/shell/backing_rtl_right.png |binary
 icon-themes/galaxy/brand/shell/backing_space.png |binary
 sc/uiconfig/scalc/statusbar/statusbar.xml|4 ++--
 sw/uiconfig/sglobal/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/sweb/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swform/statusbar/statusbar.xml   |4 ++--
 sw/uiconfig/swreport/statusbar/statusbar.xml |4 ++--
 sw/uiconfig/swriter/statusbar/statusbar.xml  |4 ++--
 sw/uiconfig/swxform/statusbar/statusbar.xml  |4 ++--
 13 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 51bc62d4df7311a27cebfc1afd160908b431cba7
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Jun 5 16:08:31 2012 +0200

status bar: Normalize the selection and modification status icons sizes.

Change-Id: I4c11c82df0fdbf0040729323dc1fda2ece7f2582

diff --git a/sc/uiconfig/scalc/statusbar/statusbar.xml 
b/sc/uiconfig/scalc/statusbar/statusbar.xml
index 95be231..8a0819a 100644
--- a/sc/uiconfig/scalc/statusbar/statusbar.xml
+++ b/sc/uiconfig/scalc/statusbar/statusbar.xml
@@ -4,8 +4,8 @@
  statusbar:statusbaritem xlink:href=.uno:StatusDocPos 
statusbar:align=left statusbar:autosize=true statusbar:width=58 
statusbar:helpid=helpid:26114/
  statusbar:statusbaritem xlink:href=.uno:StatusPageStyle 
statusbar:align=left statusbar:autosize=true statusbar:width=83 
statusbar:helpid=helpid:26115/
  statusbar:statusbaritem xlink:href=.uno:InsertMode 
statusbar:align=center statusbar:width=55 statusbar:helpid=helpid:10221/
- statusbar:statusbaritem xlink:href=.uno:StatusSelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:26116/
- statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:5584/
+ statusbar:statusbaritem xlink:href=.uno:StatusSelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:26116/
+ statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:5584/
  statusbar:statusbaritem xlink:href=.uno:Signature statusbar:align=center 
statusbar:ownerdraw=true statusbar:width=16 statusbar:helpid=helpid:5699/
  statusbar:statusbaritem xlink:href=.uno:Size statusbar:align=center 
statusbar:autosize=true statusbar:ownerdraw=true statusbar:width=200 
statusbar:helpid=helpid:10224/
  statusbar:statusbaritem xlink:href=.uno:ZoomSlider 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=140 
statusbar:helpid=helpid:11065/
diff --git a/sw/uiconfig/sglobal/statusbar/statusbar.xml 
b/sw/uiconfig/sglobal/statusbar/statusbar.xml
index e6c495f..ac30138 100644
--- a/sw/uiconfig/sglobal/statusbar/statusbar.xml
+++ b/sw/uiconfig/sglobal/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  statusbar:statusbaritem xlink:href=.uno:PageStyleName 
statusbar:align=left statusbar:autosize=true statusbar:width=79 
statusbar:helpid=helpid:21182/
  statusbar:statusbaritem xlink:href=.uno:LanguageStatus 
statusbar:align=center statusbar:autosize=true statusbar:width=100 /
  statusbar:statusbaritem xlink:href=.uno:InsertMode 
statusbar:align=center statusbar:width=55 statusbar:helpid=helpid:10221/
- statusbar:statusbaritem xlink:href=.uno:SelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:21185/
- statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=9 
statusbar:helpid=helpid:5584/
+ statusbar:statusbaritem xlink:href=.uno:SelectionMode 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:21185/
+ statusbar:statusbaritem xlink:href=.uno:ModifiedStatus 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=16 
statusbar:helpid=helpid:5584/
  statusbar:statusbaritem xlink:href=.uno:Signature statusbar:align=center 
statusbar:ownerdraw=true statusbar:width=16 statusbar:helpid=helpid:5699/
  statusbar:statusbaritem xlink:href=.uno:Size statusbar:align=left 
statusbar:autosize=true statusbar:ownerdraw=true statusbar:width=110 
statusbar:helpid=helpid:10224/
  statusbar:statusbaritem xlink:href=.uno:ViewLayout 
statusbar:align=center statusbar:ownerdraw=true statusbar:width=63 
statusbar:helpid=helpid:11064/
diff --git a/sw/uiconfig/sweb/statusbar/statusbar.xml 
b/sw/uiconfig/sweb/statusbar/statusbar.xml
index dbdf008..6232a25 100644
--- a/sw/uiconfig/sweb/statusbar/statusbar.xml
+++ b/sw/uiconfig/sweb/statusbar/statusbar.xml
@@ -5,8 +5,8 @@
  statusbar:statusbaritem xlink:href=.uno:PageStyleName 

[Libreoffice-commits] .: 2 commits - android/Bootstrap android/experimental Makefile.top Module_tail_build.mk Repository.mk RepositoryModule_ooo.mk sal/android touch/CustomTarget_touch_javamaker.mk to

2012-06-05 Thread Tor Lillqvist
 Makefile.top   
  |1 
 Module_tail_build.mk   
  |1 
 Repository.mk  
  |8 
 RepositoryModule_ooo.mk
  |1 
 android/Bootstrap/src/org/libreoffice/android/Bootstrap.java   
  |2 
 android/experimental/DocumentLoader/Makefile   
  |2 
 
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
 |  195 +
 sal/android/lo-bootstrap.c 
  |   23 +
 touch/CustomTarget_touch_javamaker.mk  
  |   21 
 touch/InternalUnoApi_touch.mk  
  |   33 +
 touch/Library_libotouch.mk 
  |   39 +
 touch/Makefile 
  |7 
 touch/Module_touch.mk  
  |   22 +
 touch/Package_inc.mk   
  |   13 
 touch/README   
  |   20 
 touch/idl/org/libreoffice/touch/Document.idl   
  |   25 +
 touch/idl/org/libreoffice/touch/DocumentRenderCallback.idl 
  |   25 +
 touch/idl/org/libreoffice/touch/XDocument.idl  
  |   73 +++
 touch/idl/org/libreoffice/touch/XDocumentRenderCallback.idl
  |   55 ++
 touch/inc/touch/libotouch.hxx  
  |   15 
 touch/prj/build.lst
  |1 
 touch/source/generic/libotouch.cxx 
  |   11 
 touch/source/ios/ios.cxx   
  |   10 
 touch/source/uno/Document.cxx  
  |  213 ++
 vcl/android/androidinst.cxx
  |2 
 vcl/headless/svpbmp.cxx
  |1 
 vcl/headless/svpframe.cxx  
  |5 
 vcl/headless/svpvd.cxx 
  |6 
 28 files changed, 744 insertions(+), 86 deletions(-)

New commits:
commit 8ae077379edcdbf7bf106121593361d2486aacb7
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jun 5 17:05:56 2012 +0300

Use 32bpp bitmaps on Android (and iOS)

Modify DocumentLoader correspondingly. Take Android bug 32588 into
account.

Ideal would be to extend the XDevice stuff, or something, so that one
could hand it a pre-allocated RGBA buffer into which the
drawing/rendering would go. Then one could get rid of the silly
convert-to-BMP phase, which prefixes the bitmap data with BMP and DIB
headers (and thus, I guess, has to copy and allocate another
copy). Will see.

Change-Id: I4597cd933db8faa8105dc8f19638d712d5d2238a

diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java 
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index 47366a2..1f0c14e 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -116,6 +116,8 @@ public class Bootstrap extends NativeActivity
 // documentation sucks.
 public static native void twiddle_BGR_to_RGBA(byte[] source, int offset, 
int width, int height, ByteBuffer destination);
 
+public static native void force_full_alpha(byte[] source, int offset, int 
size);
+
 // This setup() method is called 1) in apps that use *this* class as their 
activity from onCreate(),
 // and 2) should be called from other kinds of LO code using apps.
 public static void setup(Activity activity)
diff --git a/android/experimental/DocumentLoader/Makefile 
b/android/experimental/DocumentLoader/Makefile
index 1e9cebc..8129948 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -262,8 +262,10 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
 
 run:
+# /data/local/tmp/sample-document.odt
adb shell am start -n org.libreoffice.android.examples/.DocumentLoader 
-e input 

[REVIEW:3-5] fdo#50539 fix RTF import of automatic character background color

2012-06-05 Thread Miklos Vajna
Hi,

See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bbb849

A similar issue was already backported for paragraph background color,
this is the same, but for character backgrounds.

Thanks,

Miklos
From 697b6dea49d2ebbe1c1cf0b726ebd5647dea8519 Mon Sep 17 00:00:00 2001
From: Miklos Vajna vmik...@suse.cz
Date: Fri, 1 Jun 2012 16:30:06 +0200
Subject: [PATCH] fdo#50539 fix RTF import of automatic character background
 color

Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93
---
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ea14c57..f76e1e2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2376,6 +2376,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
 m_aDefaultState.aCharacterSprms-push_back(make_pair(NS_sprm::LN_CLidBi, pIntValue));
 break;
 case RTF_CHCBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
-- 
1.7.7

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


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

2012-06-05 Thread Caolán McNamara
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41bb183bfb366d04817b4c2522e12936d473d99c
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Jun 1 16:30:06 2012 +0200

fdo#50539 fix RTF import of automatic character background color

Change-Id: I7efb3bce9a3a6f6c029d99de2264e00bb1bc7c93

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index ea14c57..f76e1e2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2376,6 +2376,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 
m_aDefaultState.aCharacterSprms-push_back(make_pair(NS_sprm::LN_CLidBi, 
pIntValue));
 break;
 case RTF_CHCBPAT:
+if (nParam)
 {
 RTFValue::Pointer_t pValue(new 
RTFValue(getColorTable(nParam)));
 lcl_putNestedAttribute(m_aStates.top().aCharacterSprms, 
NS_sprm::LN_CShd, NS_ooxml::LN_CT_Shd_fill, pValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PUSHED][REVIEW:3-5] fdo#50539 fix RTF import of automatic character background color

2012-06-05 Thread Caolán McNamara
On Tue, 2012-06-05 at 16:27 +0200, Miklos Vajna wrote:
 Hi,
 
 See
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bbb849
 
 A similar issue was already backported for paragraph background color,
 this is the same, but for character backgrounds.

pushed to 3-5

C.

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


[Libreoffice-commits] .: framework/source

2012-06-05 Thread Caolán McNamara
 framework/source/jobs/jobdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0665c3e52b0b0053c3d622d3fa975d4234801bdd
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 5 16:03:17 2012 +0100

extra trailing NUL char in string

This began life as ::rtl::OUString::createFromAscii which stops at the first
NULL terminator. So drop the \0 to get the same results

Change-Id: I7d9abbff2a6e6131ef5e7208e05cfd13178418cb

diff --git a/framework/source/jobs/jobdata.cxx 
b/framework/source/jobs/jobdata.cxx
index c1cbcf8..a6cf7c4 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -583,7 +583,7 @@ sal_Bool isEnabled( const ::rtl::OUString sAdminTime ,
 we have to encode all '?' signs. Otherwhise e.g. ??- will be 
translated
 to ~ ...
  */
-static ::rtl::OUString PATTERN_ISO8601(\?\?\?\?-\?\?-\?\?*\0);
+static ::rtl::OUString PATTERN_ISO8601(\?\?\?\?-\?\?-\?\?*);
 WildCard aISOPattern(PATTERN_ISO8601);
 
 sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-06-05 Thread Caolán McNamara
 framework/source/jobs/jobdata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 55f5b676d49f5660c6241b03f1fb5a2bf556a969
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 5 16:03:17 2012 +0100

extra trailing NUL char in string

This began life as ::rtl::OUString::createFromAscii which stops at the first
NULL terminator. So drop the \0 to get the same results

Change-Id: I7d9abbff2a6e6131ef5e7208e05cfd13178418cb
(cherry picked from commit 0665c3e52b0b0053c3d622d3fa975d4234801bdd)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/framework/source/jobs/jobdata.cxx 
b/framework/source/jobs/jobdata.cxx
index c1cbcf8..a6cf7c4 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -583,7 +583,7 @@ sal_Bool isEnabled( const ::rtl::OUString sAdminTime ,
 we have to encode all '?' signs. Otherwhise e.g. ??- will be 
translated
 to ~ ...
  */
-static ::rtl::OUString PATTERN_ISO8601(\?\?\?\?-\?\?-\?\?*\0);
+static ::rtl::OUString PATTERN_ISO8601(\?\?\?\?-\?\?-\?\?*);
 WildCard aISOPattern(PATTERN_ISO8601);
 
 sal_Bool bValidAdmin = aISOPattern.Matches(sAdminTime);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: scp2/source

2012-06-05 Thread Andras Timar
 scp2/source/ooo/windowscustomaction_ooo.scp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8783ead70cc2bc2a83bf473b0dfb51f3ee10b6da
Author: Andras Timar ati...@suse.com
Date:   Tue Jun 5 16:57:53 2012 +0200

fdo#43989 let unopkg.exe run with elevated privileges during install

... so it can do the pre-registration of bundled extensions in
INSTALLLOCATION/share/prereg/bundle.
The meaning of Type of custom action is the following:
msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData +
msidbCustomActionTypeInScript + msidbCustomActionTypeNoImpersonate +
msidbCustomActionTypeCommit = 3585
So it is a binary in a dll from the MSI itself, it runs deferred
with system privileges and after commit, because msvcrt90.dll is
available only after commit. The same type was chosen for the
removing part, it works.

Change-Id: I14c347b5cbc47789eb0484769a676703361c2193

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 077cd6e..2fdae2c 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -178,21 +178,21 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
Name = RegisterExtensions;
-   Typ = 1;
+   Typ = 3585;
Source = shlxtmsi.dll;
Target = RegisterExtensions;
Inbinarytable = 1;
-   Assignment1 = (InstallExecuteSequence, Not REMOVE=\ALL\, 
behind_InstallFinalize);
-   Assignment2 = (AdminExecuteSequence, Not REMOVE=\ALL\, 
behind_InstallFinalize);
+   Assignment1 = (InstallExecuteSequence, Not REMOVE=\ALL\, 
InstallFinalize);
+   Assignment2 = (AdminExecuteSequence, Not REMOVE=\ALL\, 
InstallFinalize);
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions
Name = RemoveExtensions;
-   Typ = 65;
+   Typ = 3585;
Source = shlxtmsi.dll;
Target = RemoveExtensions;
Inbinarytable = 1;
-   Assignment1 = (InstallExecuteSequence, REMOVE=\ALL\ And Not 
PATCH, FileCost);
+   Assignment1 = (InstallExecuteSequence, REMOVE=\ALL\ And Not 
PATCH, InstallFinalize);
 End
 
 WindowsCustomAction gid_Customaction_Set_Admininstall
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-06-05 Thread Andras Timar
 scp2/source/ooo/windowscustomaction_ooo.scp |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b33f69d2f45d92fd84cdff73d8baee0b14b40791
Author: Andras Timar ati...@suse.com
Date:   Tue Jun 5 16:57:53 2012 +0200

fdo#43989 let unopkg.exe run with elevated privileges during install

... so it can do the pre-registration of bundled extensions in
INSTALLLOCATION/share/prereg/bundle.
The meaning of Type of custom action is the following:
msidbCustomActionTypeDll + msidbCustomActionTypeBinaryData +
msidbCustomActionTypeInScript + msidbCustomActionTypeNoImpersonate +
msidbCustomActionTypeCommit = 3585
So it is a binary in a dll from the MSI itself, it runs deferred
with system privileges and after commit, because msvcrt90.dll is
available only after commit. The same type was chosen for the
removing part, it works.

Change-Id: I14c347b5cbc47789eb0484769a676703361c2193

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 077cd6e..2fdae2c 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -178,21 +178,21 @@ End
 
 WindowsCustomAction gid_Customaction_Register_Extensions
Name = RegisterExtensions;
-   Typ = 1;
+   Typ = 3585;
Source = shlxtmsi.dll;
Target = RegisterExtensions;
Inbinarytable = 1;
-   Assignment1 = (InstallExecuteSequence, Not REMOVE=\ALL\, 
behind_InstallFinalize);
-   Assignment2 = (AdminExecuteSequence, Not REMOVE=\ALL\, 
behind_InstallFinalize);
+   Assignment1 = (InstallExecuteSequence, Not REMOVE=\ALL\, 
InstallFinalize);
+   Assignment2 = (AdminExecuteSequence, Not REMOVE=\ALL\, 
InstallFinalize);
 End
 
 WindowsCustomAction gid_Customaction_Remove_Extensions
Name = RemoveExtensions;
-   Typ = 65;
+   Typ = 3585;
Source = shlxtmsi.dll;
Target = RemoveExtensions;
Inbinarytable = 1;
-   Assignment1 = (InstallExecuteSequence, REMOVE=\ALL\ And Not 
PATCH, FileCost);
+   Assignment1 = (InstallExecuteSequence, REMOVE=\ALL\ And Not 
PATCH, InstallFinalize);
 End
 
 WindowsCustomAction gid_Customaction_Set_Admininstall
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: configure.in

2012-06-05 Thread Tor Lillqvist
 configure.in |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 05cc8975d17b2f2c00e794252c34dc12394abc62
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue Jun 5 18:01:43 2012 +0300

PATH for cross-compilations was broken in some way, this seems to fix it

Change-Id: Ifa82be2dfae383ed8570c1d99584e67d85833612

diff --git a/configure.in b/configure.in
index bb3eed0..8f74557 100644
--- a/configure.in
+++ b/configure.in
@@ -3555,7 +3555,7 @@ if test $cross_compiling = yes; then
 fi
 done
 
-for V in OUTDIR LO_PATH SOLARINC SOLARLIB WORKDIR; do
+for V in OUTDIR SOLARINC SOLARLIB WORKDIR; do
 VV='$'$V
 VV=`eval echo $VV`
 VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -3564,6 +3564,10 @@ if test $cross_compiling = yes; then
 echo $line build-config
 fi
 done
+
+line=`echo LO_PATH_FOR_BUILD=$PATH | sed -e 's,/CONF-FOR-BUILD,,g'`
+echo $line build-config
+
 )
 test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure 
script for BUILD system failed, see CONF-FOR-BUILD/config.log])
 test -f config_build.mk || AC_MSG_ERROR([A file called config_build.mk was 
supposed to have been copied here, but it isn't found])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Disabling file opening and saving in print preview mode

2012-06-05 Thread Kohei Yoshida

On 05/31/2012 10:13 PM, Kohei Yoshida wrote:

On Thu, 2012-05-31 at 19:04 +0200, Stefan Knorr (Astron) wrote:

→ reply to list, too

Hi Kohei,


I noticed that we actually allow saving and loading of document in print
preview mode.  But to me that feels very odd.


What sticks out as most odd to me is that our print preview is so
incredibly cluttered (menu bar + 2 toolbars), whereas e.g. in Firefox
it is very focused (just a toolbar).
So, yes, I do agree with this, in general, just the Print Preview
toolbar should be enough.


Actually (thinking about this again), given the way our current preview
window is implemented, this (i.e. remove the menu bar and the top tool
bar, and only leave the preview toolbar and disable a bunch of other
things) is probably the best we can offer.  Anything else we try to do
would end up causing lots of odd behaviors in many corners, such as bug
fdo#48348.


Some updates.

For 3.6, I will just disable a bunch of commands including the file open 
and save, intercept the window close event so that clicking the 'x' 
button on the title bar ends the preview and moves back to the main Calc 
window, and disable the close command to avoid closing the window via 
File - Close and Ctrl-W.  The reason for disabling the close commands 
rather than intercepting them and translating them to just end the 
preview mode is because it's technically very difficult to do so because 
of the way we end the preview shell.  I won't go into the detail here.


Also, for 3.6, I'll leave the menu bar and the tool bars alone, because 
(again), it won't be easy to change this without doing massive rework.


Now, I'm almost done, except for the disabling of the close commands. 
Normally, we can disable commands by simply handling their respective 
state handler callbacks, but for the close commands (i.e. 
.uno:CloseDoc and .uno:CloseWin) it's not that simple.  This is 
because we need to show the start center pane when the last app window 
closes.  The framework code handles these commands in a special way. 
And currently, the Close commands are always enabled no matter what, and 
there is no systematic way to disable them (that I know of).


I'm still trying to figure out how to optionally disable them in a clean 
way, but I may not be able to do this before I leave for my vacation. 
So, I might just push what I've done so far, and tackle the issue of 
disabling the Close commands later.


Kohei

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


[Libreoffice-commits] .: sw/qa

2012-06-05 Thread Miklos Vajna
 sw/qa/extras/ooxmltok/data/smartart.docx |binary
 sw/qa/extras/ooxmltok/ooxmltok.cxx   |   29 +
 2 files changed, 29 insertions(+)

New commits:
commit 67a041cf75c2d21de2ab59ef2ea0e0c612943ebd
Author: Miklos Vajna vmik...@suse.cz
Date:   Tue Jun 5 17:21:54 2012 +0200

sw: add smartart import testcase

Change-Id: I6a120fc69036fef8f21a2f80a2f424f36f876d23

diff --git a/sw/qa/extras/ooxmltok/data/smartart.docx 
b/sw/qa/extras/ooxmltok/data/smartart.docx
new file mode 100644
index 000..7a553f4
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/smartart.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 6dd7927..2b050eb 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -39,6 +39,7 @@
 #include com/sun/star/text/XTextFieldsSupplier.hpp
 #include com/sun/star/text/XTextFramesSupplier.hpp
 #include com/sun/star/text/XTextViewCursorSupplier.hpp
+#include com/sun/star/style/ParagraphAdjust.hpp
 
 #include vcl/svapp.hxx
 
@@ -63,6 +64,7 @@ public:
 void testN652364();
 void testN760764();
 void testN764005();
+void testSmartart();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -80,6 +82,7 @@ public:
 CPPUNIT_TEST(testN652364);
 CPPUNIT_TEST(testN760764);
 CPPUNIT_TEST(testN764005);
+CPPUNIT_TEST(testSmartart);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -443,6 +446,32 @@ void Test::testN764005()
 CPPUNIT_ASSERT_EQUAL(sal_False, bValue);
 }
 
+void Test::testSmartart()
+{
+load(smartart.docx);
+
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); // One groupshape 
in the doc
+
+uno::Referencecontainer::XIndexAccess xGroup(xDraws-getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xGroup-getCount()); // 3 rectangles 
and an arrow in the group
+
+uno::Referencebeans::XPropertySet xPropertySet(xGroup-getByIndex(1), 
uno::UNO_QUERY);
+sal_Int32 nValue(0);
+xPropertySet-getPropertyValue(FillColor) = nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), nValue); // If fill color is 
right, theme import is OK
+
+uno::Referencetext::XTextRange xTextRange(xGroup-getByIndex(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(Sample), xTextRange-getString()); // 
Shape has text
+
+uno::Referencecontainer::XEnumerationAccess 
xParaEnumAccess(xTextRange-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration xParaEnum = 
xParaEnumAccess-createEnumeration();
+xPropertySet.set(xParaEnum-nextElement(), uno::UNO_QUERY);
+xPropertySet-getPropertyValue(ParaAdjust) = nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(style::ParagraphAdjust_CENTER), nValue); // 
Paragraph properties are imported
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[REVIEW][3-5] fdo#33634, fdo#49438 border line drawing regressions

2012-06-05 Thread Michael Stahl

drawing of borders in Calc looks rather ugly, the lines suddenly getting
much fatter when zooming in etc., and there's a fix for that by moggi,
mostly doing arithmetic on doubles and changing the hairline predicate
from something that is right for Writer to something that is right (or
at least not as wrong) for Calc:

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

this fix unfortunately introduces a regression that thin lines become
invisible when anti-aliasing is disabled, and i've come up with this
horrible hack that seems to fix it for me:

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

so i'd say we should backport both of these to libreoffice-3-5.



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


[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-06-05 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 43989, which changed state.

Bug 43989 Summary: After installation first launch terminates after splash 
screen
https://bugs.freedesktop.org/show_bug.cgi?id=43989

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|RESOLVED

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


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

2012-06-05 Thread Noel Power
 oox/inc/oox/core/fragmenthandler2.hxx  |3 +--
 sc/source/filter/oox/worksheetfragment.cxx |4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit afbb2d8f7d72292532a9ea54fa2e6757b6d548c2
Author: Noel Power noel.po...@novell.com
Date:   Tue Jun 5 16:41:53 2012 +0100

fix missing ole and form control(s) on xlsx import

chang the visibility of aMceState in order to access that member to filter 
out reading and parsing of ./xl/ctrlProps/ctrlProp[N].xml fragments for 
'controls'  'oleObjects' elements nested withing 'mc:AlternateContent' elements

Change-Id: I6892db7e3302b9977f0fdaabbe3ac1444315e011

diff --git a/oox/inc/oox/core/fragmenthandler2.hxx 
b/oox/inc/oox/core/fragmenthandler2.hxx
index 781ed85..70ded85 100644
--- a/oox/inc/oox/core/fragmenthandler2.hxx
+++ b/oox/inc/oox/core/fragmenthandler2.hxx
@@ -41,7 +41,7 @@ namespace core {
 
 class OOX_DLLPUBLIC FragmentHandler2 : public FragmentHandler, public 
ContextHandler2Helper
 {
-private:
+protected:
 enum MCE_STATE
 {
 MCE_UNUSED,
@@ -50,7 +50,6 @@ private:
 };
 ::std::vectorMCE_STATE   aMceState;
 
-private:
 boolprepareMceContext( sal_Int32 nElement, const 
AttributeList rAttribs );
 
 
diff --git a/sc/source/filter/oox/worksheetfragment.cxx 
b/sc/source/filter/oox/worksheetfragment.cxx
index be41a16..8616305 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -332,10 +332,10 @@ ContextHandlerRef WorksheetFragment::onCreateContext( 
sal_Int32 nElement, const
 break;
 
 case XLS_TOKEN( oleObjects ):
-if( nElement == XLS_TOKEN( oleObject ) ) importOleObject( rAttribs 
);
+if( nElement == XLS_TOKEN( oleObject )  aMceState.empty() ) 
importOleObject( rAttribs );
 break;
 case XLS_TOKEN( controls ):
-if( nElement == XLS_TOKEN( control ) ) importControl( rAttribs );
+if( nElement == XLS_TOKEN( control )  aMceState.empty() ) 
importControl( rAttribs );
 break;
 }
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[REVIEW-3-5] fdo#47805 rework handling of 64-bit registry entries

2012-06-05 Thread Andras Timar
Hi,

This is a big patch, but I think the logic is simple. It makes Windows
shell extensions work out of the box on 64-bit Windows. Instead of a
(non-working) hack with Reg64 table and 4 registry manipulating custom
actions, we use normal MSI actions to set the appropriate registry
keys during install and remove them during uninstall.

On the other hand, the resulting MSI database fails the ICE80 test,
because it associates a 64-bit registry item to a 32-bit directory
(WTF?), and installs 64-bit elements from a 32-bit installer. But in
real life it seems to be OK, installer does what it has to do (and
what I wanted). I tested it on Windows 7 32/64 bit, and Windows 2008
Server R2.

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

Please let me know, if you want this in libreoffice-3-5. I did not
try, maybe it does not apply cleanly, but I can backport.

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


[Libreoffice-commits] .: i18npool/CppunitTest_i18npool_test_characterclassification.mk i18npool/Module_i18npool.mk i18npool/qa

2012-06-05 Thread Caolán McNamara
 i18npool/CppunitTest_i18npool_test_characterclassification.mk |   54 
 i18npool/Module_i18npool.mk   |1 
 i18npool/qa/cppunit/test_characterclassification.cxx  |  110 ++
 3 files changed, 165 insertions(+)

New commits:
commit eb9b8ebca49291797e655b50f64af2c2fa03434c
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jun 5 16:43:55 2012 +0100

add a titlecase regression test

Change-Id: Ic802fc816d54b97b333e3b2bc394beb383f3e5ef

diff --git a/i18npool/CppunitTest_i18npool_test_characterclassification.mk 
b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
new file mode 100644
index 000..b4e0a81
--- /dev/null
+++ b/i18npool/CppunitTest_i18npool_test_characterclassification.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#   Matúš Kukan matus.ku...@gmail.com
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call 
gb_CppunitTest_CppunitTest,i18npool_test_characterclassification))
+
+$(eval $(call gb_CppunitTest_use_api,i18npool_test_characterclassification,\
+   udkapi \
+   offapi \
+))
+
+$(eval $(call 
gb_CppunitTest_use_libraries,i18npool_test_characterclassification,\
+   cppu \
+   cppuhelper \
+   sal \
+   unotest \
+$(gb_STDLIBS) \
+))
+
+$(eval $(call 
gb_CppunitTest_add_exception_objects,i18npool_test_characterclassification,\
+i18npool/qa/cppunit/test_characterclassification \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,i18npool_test_characterclassification))
+
+$(eval $(call 
gb_CppunitTest_use_components,i18npool_test_characterclassification,\
+   i18npool/util/i18npool \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index a2aee88..bed175a 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -62,6 +62,7 @@ endif
 
 $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
+   CppunitTest_i18npool_test_characterclassification \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/qa/cppunit/test_characterclassification.cxx 
b/i18npool/qa/cppunit/test_characterclassification.cxx
new file mode 100644
index 000..08c2029
--- /dev/null
+++ b/i18npool/qa/cppunit/test_characterclassification.cxx
@@ -0,0 +1,110 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *   Caolán McNamara caol...@redhat.com
+ *
+ * Contributor(s):
+ *   Caolán McNamara caol...@redhat.com
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the GPLv3+), or
+ * the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include sal/config.h
+#include sal/precppunit.hxx
+
+#include cppuhelper/compbase1.hxx
+#include cppuhelper/bootstrap.hxx
+#include cppuhelper/basemutex.hxx
+#include com/sun/star/i18n/XCharacterClassification.hpp
+#include unotest/bootstrapfixturebase.hxx
+
+#include rtl/strbuf.hxx
+#include rtl/ustrbuf.hxx
+
+#include string.h
+
+using namespace ::com::sun::star;
+
+class 

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

2012-06-05 Thread Caolán McNamara
On Mon, 2012-06-04 at 22:44 +0200, Michael Stahl wrote:
 On 04/06/12 14:03, Brad Sowden wrote:
  * Sidenote - Initially I tried using CharClass::titlecase() but 
  discovered this doesn't actually work. 

What did you try and what went wrong ?

  There appears to be an issue with 
  class cclass_Unicode where trans is only ever set to 
  Transliteration_casemapping and there is no mechanism to set it to 
  Transliteration_titlecase.

I believe that the casemapping thing there knows about upper, lower and
title case and uses setMappingType to MappingTypeToTitle to toggle which
one to return

e.g. I added this test
http://cgit.freedesktop.org/libreoffice/core/commit/?id=eb9b8ebca49291797e655b50f64af2c2fa03434c
to confirm to myself that its working like I think its supposed to.

C.

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


[Libreoffice-commits] .: autodoc/source chart2/source codemaker/source connectivity/source UnoControls/source

2012-06-05 Thread Takeshi Abe
 UnoControls/source/base/basecontainercontrol.cxx   |   10 ---
 UnoControls/source/controls/framecontrol.cxx   |   22 ---
 autodoc/source/parser_i/idoc/cx_dsapi.cxx  |7 -
 chart2/source/tools/NameContainer.cxx  |4 --
 chart2/source/view/charttypes/AreaChart.cxx|   14 --
 chart2/source/view/charttypes/CandleStickChart.cxx |   15 --
 chart2/source/view/inc/PlottingPositionHelper.hxx  |8 -
 codemaker/source/cppumaker/cpputype.cxx|   29 -
 connectivity/source/drivers/mozab/MTables.cxx  |5 ---
 connectivity/source/drivers/mysql/YTables.cxx  |   12 
 10 files changed, 126 deletions(-)

New commits:
commit f7ebee38a3c5c6cb58f40109a213d449138ea987
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Tue Jun 5 22:59:19 2012 +0900

removed dead code

Change-Id: I02e535f0a0e55446e5a29297c2d05b1503805e71

diff --git a/UnoControls/source/base/basecontainercontrol.cxx 
b/UnoControls/source/base/basecontainercontrol.cxx
index f219b3f..02a0f53 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -575,16 +575,6 @@ WindowDescriptor* 
BaseContainerControl::impl_getWindowDescriptor ( const Referen
 
 void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, 
const Reference XGraphics   /*rGraphics*/ )
 {
-/*
-if (rGraphics.is())
-{
-for ( size_t n = maControlInfoList.size(); n; )
-{
-ControlInfo* pSearchControl = maControlInfoList[ --n ];
-pSearchControl-xControl-paint ( nX, nY, rGraphics ) ;
-}
-}
-*/
 }
 
 
//
diff --git a/UnoControls/source/controls/framecontrol.cxx 
b/UnoControls/source/controls/framecontrol.cxx
index 49f3ed8..0504a11 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -426,28 +426,6 @@ IPropertyArrayHelper FrameControl::getInfoHelper()
 
 return *pInfo ;
 }
-/*
-//--
-// start OConnectionPointContainerHelper
-//--
-Uik* FrameControl::getConnectionPointUiks ( sal_Int32* pCount ) const
-{
-static Uik szUiks[] =
-{
-((XEventListener*)NULL)-getSmartUik  (),
-::getCppuType((const Reference XPropertyChangeListener *)0),
-::getCppuType((const Reference XVetoableChangeListener *)0),
-::getCppuType((const Reference XPropertiesChangeListener *)0)
-} ;
-
-*pCount = 4 ;
-
-return szUiks ;
-}
-//--
-// end OConnectionPointContainerHelper
-//--
-*/
 
 
//
 //  OPropertySetHelper
diff --git a/autodoc/source/parser_i/idoc/cx_dsapi.cxx 
b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
index 662af48..21b8595 100644
--- a/autodoc/source/parser_i/idoc/cx_dsapi.cxx
+++ b/autodoc/source/parser_i/idoc/cx_dsapi.cxx
@@ -305,13 +305,6 @@ Context_Docu::SetupStateMachine()
 
 // constants for use in the table:
 const INT16 ght = goto_EoHtml;
-/*
-const INT16 gxc = goto_EoXmlConst;
-const INT16 glb = goto_EoXmlLink_TagBegin;
-const INT16 gle = goto_EoXmlLink_TagEnd;
-const INT16 gfb = goto_EoXmlFormat_TagBegin;
-const INT16 gfe = goto_EoXmlFormat_TagEnd;
-*/
 const INT16 err = finError;
 const INT16 faw = finAnyWord;
 //  const INT16 fig = finIgnore;
diff --git a/chart2/source/tools/NameContainer.cxx 
b/chart2/source/tools/NameContainer.cxx
index a0d2a4f..52bf75e 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -29,10 +29,6 @@
 
 #include NameContainer.hxx
 
-/*
-//SvXMLUnitConverter
-#include xmloff/xmluconv.hxx
-*/
 #include com/sun/star/uno/Any.hxx
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/view/charttypes/AreaChart.cxx 
b/chart2/source/view/charttypes/AreaChart.cxx
index bcc2456..0d8b299 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -168,20 +168,6 @@ uno::Any AreaChart::getExplicitSymbol( const VDataSeries 
rSeries, sal_Int32 nPo
 return aRet;
 }
 
-//-
-// lang::XServiceInfo
-//-
-/*
-APPHELPER_XSERVICEINFO_IMPL(AreaChart,CHART2_VIEW_AREACHART_SERVICE_IMPLEMENTATION_NAME)
-
-uno::Sequence rtl::OUString  AreaChart

[Libreoffice-commits] .: 3 commits - sc/sdi sc/source vcl/inc vcl/source

2012-06-05 Thread Kohei Yoshida
 sc/sdi/docsh.sdi |   14 +++---
 sc/sdi/prevwsh.sdi   |3 +++
 sc/source/ui/app/scmod.cxx   |   31 +--
 sc/source/ui/docshell/docsh4.cxx |   13 +
 sc/source/ui/inc/prevwsh.hxx |3 +++
 sc/source/ui/view/prevwsh.cxx|   34 +-
 vcl/inc/vcl/syswin.hxx   |3 +++
 vcl/source/window/syswin.cxx |   11 +++
 vcl/source/window/winproc.cxx|   32 ++--
 9 files changed, 104 insertions(+), 40 deletions(-)

New commits:
commit c379b5b82e1ce693b5dc158dcea0f8b0a508ea46
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Jun 5 12:10:45 2012 -0400

Slightly cleaner way to get to the system window instance.

Change-Id: Ia75a70ff8cdb00db2c5b21825774fd5922992573

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index eb65065..1e556f0 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -114,7 +114,7 @@ void ScPreviewShell::Construct( Window* pParent )
 // Find the top-most window, and set the close window handler to intercept
 // the window close event.
 Window* pWin = pParent;
-while (true)
+while (!pWin-IsSystemWindow())
 {
 if (pWin-GetParent())
 pWin = pWin-GetParent();
@@ -122,7 +122,6 @@ void ScPreviewShell::Construct( Window* pParent )
 break;
 }
 
-pWin = pWin-GetWindow(WINDOW_CLIENT);
 mpFrameWindow = dynamic_castSystemWindow*(pWin);
 if (mpFrameWindow)
 mpFrameWindow-SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl));
commit 80fb93fe6c08f25a404ff2afa989fca246ac9efd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Jun 5 00:22:16 2012 -0400

Intercept the window close event and end the preview when clicking 'x'.

This is to prevent the preview window from closing the whole document
when pressing the window frame's 'x' button.  Instead, pressing the 'x'
will end the preview mode and bring it back to the normal Calc window.

Change-Id: If4d42928784e3e05bc6357d811a1954efb221f01

diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 0664c1e..0f89fc7 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -53,6 +53,7 @@ class ScPreviewShell: public SfxViewShell
 friend class ScPreview; // allow access to AdjustPosSizePixel
 ScDocShell* pDocShell;
 
+SystemWindow*   mpFrameWindow;
 ScPreview*  pPreview;   // Ausgabe-Fenster
 ScrollBar*  pHorScroll;
 ScrollBar*  pVerScroll;
@@ -69,7 +70,9 @@ friend class ScPreview; // allow access to AdjustPosSizePixel
 private:
 voidConstruct( Window* pParent );
 DECL_LINK(ScrollHandler, ScrollBar* );
+DECL_LINK(CloseHdl, SystemWindow*);
 voidDoScroll( sal_uInt16 nMode );
+void ExitPreview();
 
 protected:
 virtual voidActivate(sal_Bool bMDI);
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index c23c2f4..eb65065 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -111,6 +111,22 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, PrintPreview 
)
 
 void ScPreviewShell::Construct( Window* pParent )
 {
+// Find the top-most window, and set the close window handler to intercept
+// the window close event.
+Window* pWin = pParent;
+while (true)
+{
+if (pWin-GetParent())
+pWin = pWin-GetParent();
+else
+break;
+}
+
+pWin = pWin-GetWindow(WINDOW_CLIENT);
+mpFrameWindow = dynamic_castSystemWindow*(pWin);
+if (mpFrameWindow)
+mpFrameWindow-SetCloseHdl(LINK(this, ScPreviewShell, CloseHdl));
+
 eZoom = SVX_ZOOM_WHOLEPAGE;
 
 pCorner = new ScrollBarBox( pParent, WB_SIZEABLE );
@@ -145,6 +161,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 SfxViewShell* pOldSh ) :
 SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ),
 pDocShell( (ScDocShell*)pViewFrame-GetObjectShell() ),
+mpFrameWindow(NULL),
 nSourceDesignMode( SC_FORCEMODE_NONE ),
 pAccessibilityBroadcaster( NULL )
 {
@@ -174,6 +191,9 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 
 ScPreviewShell::~ScPreviewShell()
 {
+if (mpFrameWindow)
+mpFrameWindow-SetCloseHdl(Link()); // Remove close handler.
+
 // #108333#; notify Accessibility that Shell is dying and before destroy 
all
 BroadcastAccessibility( SfxSimpleHint( SFX_HINT_DYING ) );
 DELETEZ(pAccessibilityBroadcaster);
@@ -502,6 +522,12 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* 
,pScroll )
 return 0;
 }
 
+IMPL_LINK (ScPreviewShell, CloseHdl, SystemWindow*, EMPTYARG)
+{
+ExitPreview();
+return 0;
+}
+
 sal_Bool ScPreviewShell::ScrollCommand( const CommandEvent rCEvt )
 {
 sal_Bool bDone = 

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

2012-06-05 Thread Lionel Elie Mamane
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit a2f02b854f709719725cc1faba3881f727b8133d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, GroupFieldNames, 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, FieldNames, sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, Sorting, sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, Sorting, sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = ;
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, RecordFieldNames, 
sMsg);
 if (xNamedForm.hasByName(QueryName))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com

2012-06-05 Thread Lionel Elie Mamane
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 58c716d6ef550c056cc19b75f109983e661b9246
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, GroupFieldNames, 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, FieldNames, sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, Sorting, sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, Sorting, sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = ;
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, RecordFieldNames, 
sMsg);
 if (xNamedForm.hasByName(QueryName))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: wizards/com

2012-06-05 Thread Lionel Elie Mamane
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   11 
+-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 3ec6e1378545b5d5071531d1f6de259ac9028176
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Jun 5 18:40:13 2012 +0200

fdo#47325 legacy reports: survive absence of Sorting hidden control

Reports created in 3.4 and earlier lack it.

Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038..9b1e1e2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.common.SystemDialog;
 import com.sun.star.wizards.db.DBMetaData;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
 import com.sun.star.wizards.ui.UIConsts;
 import java.util.ArrayList;
 import java.util.Vector;
@@ -233,7 +234,15 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 String sCommandType = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, 
PropertyNames.COMMAND_TYPE, sMsg);
 String sGroupFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, GroupFieldNames, 
sMsg);
 String sFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, FieldNames, sMsg);
-final String sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, Sorting, sMsg);
+String sorting;
+try
+{
+sorting = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, Sorting, sMsg);
+}
+catch (UnknownHiddenControlException exception)
+{
+   sorting = ;
+}
 String sRecordFieldNames = 
getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, RecordFieldNames, 
sMsg);
 if (xNamedForm.hasByName(QueryName))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


  1   2   3   4   >