date:20121013

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-10-13 Thread bugzilla-daemon

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

Bug 37361 depends on bug 40289, which changed state.

Bug 40289 Summary: PDF export : thin top table border disappear for particular 
zooms
https://bugs.freedesktop.org/show_bug.cgi?id=40289

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

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

[PUSHED] Change in core[libreoffice-3-6]: fdo#55931 Fix renderding of subscript/superscript with Autof...

2012-10-13 Thread Thorsten Behrens (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/866

Approvals:
  Thorsten Behrens: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: LibreOffice gerrit bot 
Gerrit-Reviewer: Jan Holesovsky 
Gerrit-Reviewer: Thorsten Behrens 

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

[PATCH] gbuildification of expat

2012-10-13 Thread David Ostrovsky (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/867

To pull it, you can do:

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

gbuildification of expat

Change-Id: I3b3aa40f39ef82c70f6f28790b582c83e48bdf76
---
M config_host.mk.in
M configure.in
A expat/ExternalPackage_expat.mk
A expat/ExternalProject_expat.mk
A expat/Makefile
A expat/Module_expat.mk
A expat/StaticLibrary_ascii_expat_xmlparse.mk
A expat/StaticLibrary_expat_xmlparse.mk
A expat/StaticLibrary_expat_xmltok.mk
A expat/UnpackedTarball_expat.mk
M expat/expat-2.1.0.patch
M expat/prj/build.lst
M expat/prj/d.lst
D expat/prj/dmake
M ooo.lst.in
15 files changed, 263 insertions(+), 112 deletions(-)


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

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

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

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

2012-10-13 Thread Libreoffice Gerrit user

 editeng/source/editeng/impedit3.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4339c9e6a0e01acecd0ce687a8d0c20128cdd7cf
Author: Jan Holesovsky 
Date:   Fri Oct 12 17:41:49 2012 +0200

fdo#55931 Fix renderding of subscript/superscript with Autofit Text.

We are using font metrics to compute the stretch ratio for autofit; but that
collides with nPropr property of SvxFont - it is then counted twice, ie. in
the case of nPropr == 25, we actually behave as if it was much less; and
worse, only in the horizontal direction.

Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
Reviewed-on: https://gerrit.libreoffice.org/866
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index e4025ac..59c70bf 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2647,10 +2647,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, 
sal_uInt16 nPos, SvxFont& rF
 // ugly on the screen!
 OutputDevice* pDev = pOut ? pOut : GetRefDevice();
 rFont.SetPhysFont( pDev );
-FontMetric aMetric( pDev->GetFontMetric() );
-// For the height do not consider the metrics, because it will go
-// wrong at Superscript/Subscript.
-Size aRealSz( aMetric.GetSize().Width(), rFont.GetSize().Height() );
+Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
 if ( aStatus.DoStretch() )
 {
 if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

2012-10-13 Thread Libreoffice Gerrit user

 oox/source/drawingml/fillpropertiesgroupcontext.cxx |4 ++--
 oox/source/export/chartexport.cxx   |2 +-
 oox/source/export/drawingml.cxx |4 ++--
 oox/source/ole/axcontrol.cxx|4 ++--
 oox/source/ppt/buildlistcontext.cxx |4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 7518af82eb4b46355ba9a4f7278bac206e3fb360
Author: Miklos Vajna 
Date:   Sat Oct 13 22:35:08 2012 +0200

oox: fix loplugin warnings

Change-Id: I73375f46d31ef7446b7c059aa2a23024e677021c

diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx 
b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index 5136d9e..ad928cd 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -167,8 +167,8 @@ BlipContext::BlipContext( ContextHandler& rParent,
 else if( aAttribs.hasAttribute( R_TOKEN( link ) ) )
 {
 // external URL
-OUString aRelId = aAttribs.getString( R_TOKEN( link ), OUString() );
-OUString aTargetLink = getFilter().getAbsoluteUrl( 
getRelations().getExternalTargetFromRelId( aRelId ) );
+// OUString aRelId = aAttribs.getString( R_TOKEN( link ), OUString() );
+// OUString aTargetLink = getFilter().getAbsoluteUrl( 
getRelations().getExternalTargetFromRelId( aRelId ) );
 // TODO: load external picture
 }
 }
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 08cc68c..37abe5d 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -731,7 +731,7 @@ void ChartExport::_ExportContent()
 aAny >>= msChartAddress;
 //maExportHelper.SetChartRangeAddress( 
sChartAddress );
 
-OUString sTableNumberList;
+// OUString sTableNumberList;
 aAny = xProp->getPropertyValue(
 OUString("TableNumberList"));
 aAny >>= msTableNumberList;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index db61ef9..6cf2264 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -761,7 +761,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet 
> rRun, sal_Bool bIs
 const char* typeface = NULL;
 const char* pitch = NULL;
 const char* charset = NULL;
-OUString usTypeface, usPitch, usCharset;
+OUString usTypeface;
 
 mAny >>= usTypeface;
 String aSubstName( GetSubsFontName( usTypeface, SUBSFONT_ONLYONE | 
SUBSFONT_MS ) );
@@ -781,7 +781,7 @@ void DrawingML::WriteRunProperties( Reference< XPropertySet 
> rRun, sal_Bool bIs
 const char* typeface = NULL;
 const char* pitch = NULL;
 const char* charset = NULL;
-OUString usTypeface, usPitch, usCharset;
+OUString usTypeface;
 
 mAny >>= usTypeface;
 String aSubstName( GetSubsFontName( usTypeface, SUBSFONT_ONLYONE | 
SUBSFONT_MS ) );
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 9e70cfd..28b49be 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1856,7 +1856,7 @@ void AxListBoxModel::convertFromProperties( PropertySet& 
rPropSet, const Control
 bool bRes = false;
 if ( rPropSet.getProperty( bRes, PROP_MultiSelection ) )
 
-rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor );
+rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor );
 
 rConv.convertToAxBorder( rPropSet, mnBorderColor, mnBorderStyle, 
mnSpecialEffect );
 AxMorphDataModelBase::convertFromProperties( rPropSet, rConv );
@@ -2493,8 +2493,8 @@ HtmlTextBoxModel::HtmlTextBoxModel()
 bool
 HtmlTextBoxModel::importBinaryModel( BinaryInputStream& rInStrm )
 {
-OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() );
 #ifdef DEBUG
+OUString sStringContents = rInStrm.readUnicodeArray( rInStrm.size() );
 // in msocximex ( where this is ported from, it appears *nothing* is read
 // from the control stream ), surely there is some useful info there ?
 OSL_TRACE("HtmlTextBoxModel::importBinaryModel - string contents of stream 
:");
diff --git a/oox/source/ppt/buildlistcontext.cxx 
b/oox/source/ppt/buildlistcontext.cxx
index fe85162..b716ebd 100644
--- a/oox/source/ppt/buildlistcontext.cxx
+++ b/oox/source/ppt/buildlistcontext.cxx
@@ -46,7 +46,7 @@ namespace oox { namespace ppt {
 }
 }
 
-::oox::core::ContextHandlerRef BuildListContext::onCreateContext( 
sal_Int32 aElementToken, const AttributeList& rAttribs )
+::oox::core::ContextHandlerRef BuildListContext::onCreateContext( 
sal_Int32 aElementToken, const AttributeList& /*rAttribs*/ )
 {
 switch( aElementToken )
 {
@@ -64,7 +64,7 @@ nam

[Libreoffice-commits] .: 2 commits - cppuhelper/Module_cppuhelper.mk sw/source

2012-10-13 Thread Libreoffice Gerrit user

 cppuhelper/Module_cppuhelper.mk |4 ---
 sw/source/core/doc/docnew.cxx   |   28 ++
 sw/source/core/doc/docnum.cxx   |   39 ++---
 sw/source/core/doc/docsort.cxx  |   24 ++
 sw/source/core/doc/poolfmt.cxx  |   42 
 5 files changed, 62 insertions(+), 75 deletions(-)

New commits:
commit 823bd50429a504de21c9a045e9da56b30cc0d97e
Author: Michael Stahl 
Date:   Sat Oct 13 22:25:20 2012 +0200

cppuhelper: remove obsolete comment

diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index b28a863..b1d89b5 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -43,8 +43,4 @@ $(eval $(call gb_Module_add_check_targets,cppuhelper,\
 ))
 # CppunitTest_cppuhelper_qa_weak depends on module bridges
 
-# TODO ? (I don't think OOO_SUBSEQUENT_TESTS != "" can be true..
-# someone would have to do it on command line)
-#  qa/propertysetmixin/makefile.mk
-
 # vim: set noet sw=4 ts=4:
commit b61991ba2c9e7c59f7e34e8cfefaebfddb170e14
Author: Michael Stahl 
Date:   Sat Oct 13 22:20:33 2012 +0200

sw: tweak comment translations

0413cc28 5513e24e d93196c8

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 92b6edc..e036737 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -530,7 +530,7 @@ SwDoc::~SwDoc()
 delete pLayouter;
 pLayouter = 0L;
 
-// Deactivate Undo notification from the Draw
+// Deactivate Undo notification from Draw
 if( pDrawModel )
 {
 DrawNotifyUndoHdl();
@@ -558,7 +558,7 @@ SwDoc::~SwDoc()
 pLinkMgr->Remove( 0, pLinkMgr->GetLinks().size() );
 }
 
-// The ChapterNumbers/Numbers need to be deleted before the Templates
+// The ChapterNumbers/Numbers need to be deleted before the styles
 // or we update all the time!
 m_pNodes->pOutlineNds->clear();
 SwNodes & rUndoNodes( GetUndoManager().GetUndoNodes() );
@@ -603,12 +603,10 @@ SwDoc::~SwDoc()
 BOOST_FOREACH( SwSectionFmt* pFmt, *pSectionFmtTbl )
 lcl_DelFmtIndizes( pFmt );
 
-// The formattings that come hereafter depend on the default formattings.
-// [Destroy] these only after destroying the FmtIndices, because the 
content
+// The formats/styles that follow depend on the default formats.
+// Destroy these only after destroying the FmtIndices, because the content
 // of headers/footers has to be deleted as well. If in the headers/footers
 // there are still Flys registered at that point, we have a problem.
-// (This comment might have been translated incorrectly. Blame the bad
-// German original)
 BOOST_FOREACH(SwPageDesc *pPageDesc, aPageDescs)
 delete pPageDesc;
 aPageDescs.clear();
@@ -631,7 +629,7 @@ SwDoc::~SwDoc()
 
 // Optimization: Based on the fact that Standard is always 2nd in the
 // array, we should delete it as the last. With this we avoid
-// remangling the Formats all the time!
+// reparenting the Formats all the time!
 if( 2 < pTxtFmtCollTbl->size() )
 DeleteAndDestroy(*pTxtFmtCollTbl, 2, pTxtFmtCollTbl->size());
 DeleteAndDestroy(*pTxtFmtCollTbl, 1, pTxtFmtCollTbl->size());
@@ -641,8 +639,6 @@ SwDoc::~SwDoc()
 "DefaultGrfCollection must always be at the start" );
 
 DeleteAndDestroy(*pGrfFmtCollTbl, 1, pGrfFmtCollTbl->size());
-// Is the result anyway - no _DEL array!
-//  pGrfFmtCollTbl->Remove( 0, n );
 delete pGrfFmtCollTbl;
 
 /*
@@ -654,7 +650,6 @@ SwDoc::~SwDoc()
 pFrmFmtTbl->erase( pFrmFmtTbl->begin() );
 pCharFmtTbl->erase( pCharFmtTbl->begin() );
 
-// Delete for pPrt
 DELETEZ( pPrt );
 DELETEZ( pNewDBMgr );
 
@@ -665,15 +660,14 @@ SwDoc::~SwDoc()
 
 // Only now destroy the Model, the drawing objects - which are also
 // contained in the Undo - need to remove their attributes from the
-// Model. Also, DrawContacts could exist before that.
+// Model. Also, DrawContacts could exist before this.
 ReleaseDrawModel();
 // Destroy DrawModel before the LinkManager, because it's always set
 // in the DrawModel.
 DELETEZ( pLinkMgr );
 
-// Clear the Tables before deleting them, or we crash due to
-// definition dependencies.
-// We also convert the arrays (due to includes) to pointers.
+// Clear the Tables before deleting the defaults, or we crash due to
+// dependencies on defaults.
 delete pFrmFmtTbl;
 delete pSpzFrmFmtTbl;
 
@@ -802,7 +796,7 @@ void SwDoc::ClearDoc()
 GetIDocumentUndoRedo().DelAllUndoObj();
 ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
-// Deactivate Undo notification from the Draw
+// Deactivate Undo notification from Draw
 if( pDrawModel )
 {
 DrawNotifyUndoHdl();
@@ -830,7 +824,7 @@ void SwDoc::ClearDoc()
 SwPageDesc* pDummyPgDsc = aPageDescs[ nDummyPgDsc

[Libreoffice-commits] .: codemaker/source sal/inc svx/source tools/source xmloff/source xmlsecurity/source

2012-10-13 Thread Libreoffice Gerrit user

 codemaker/source/javamaker/javaoptions.cxx|3 +--
 sal/inc/sal/log-areas.dox |5 +
 svx/source/table/tablertfimporter.cxx |2 --
 tools/source/inet/inetmime.cxx|8 +++-
 tools/source/ref/errinf.cxx   |6 +++---
 xmloff/source/transform/StyleOASISTContext.cxx|3 ---
 xmloff/source/transform/TransformerBase.cxx   |2 --
 xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |1 -
 8 files changed, 12 insertions(+), 18 deletions(-)

New commits:
commit 1f9f8f4f4074ce7ec9d2b0f2f751f5c47ce38634
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 13 20:34:54 2012 +0100

loplugin: some log, indent and unused variable warnings

fix up some indents, remove some unused OUStrings and add some log areas

Change-Id: I5c50807aff7a726b03b72522975d9b75e6685b9b

diff --git a/codemaker/source/javamaker/javaoptions.cxx 
b/codemaker/source/javamaker/javaoptions.cxx
index b6e57b5..3889724 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -172,8 +172,7 @@ sal_Bool JavaOptions::initOptions(int ac, char* av[], 
sal_Bool bCmdFile)
 
 m_options["-Gc"] = OString("");
 break;
-} else
-if (av[i][2] != '\0')
+} else if (av[i][2] != '\0')
 {
 OString tmp("'-G', please check");
 if (i <= ac - 1)
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 3040cdb..5ecfd39 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -189,16 +189,21 @@ certain functionality.
 @li @c cppuhelper
 @li @c cppu
 @li @c editeng
+@li @c framework
 @li @c helpcompiler
 @li @c linguistic
 @li @c oox
 @li @c rsc
 @li @c shell
 @li @c stoc
+@li @c svl
+@li @c svx
 @li @c ucbhelper
 @li @c writerfilter
 @li @c xmlhelp
+@li @c xmloff
 @li @c xmlreader
+@li @c xmlsecurity
 
 */
 /* vim:set ft=cpp shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/tablertfimporter.cxx 
b/svx/source/table/tablertfimporter.cxx
index 77d340f..a0f6b8a 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -282,8 +282,6 @@ void SdrTableRTFParser::FillTable()
 if( 
xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET)
 xCell->SetMergedItem( *pPoolItem );
 
-String sDebug = mpOutliner->GetText( 
mpOutliner->GetParagraph( xCellInfo->mnStartPara ), xCellInfo->mnParaCount );
-
 OutlinerParaObject* pTextObject = 
mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, 
(sal_uInt16)xCellInfo->mnParaCount );
 if( pTextObject )
 {
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 4619858..ae1bdb8 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -3591,16 +3591,14 @@ void INetMIMEEncodedWordOutputSink::finish(bool 
bWriteTrailer)
 nSize += nWrapperSize;
 for (; m_nExtraSpaces > 1; --m_nExtraSpaces)
 {
-if (m_rSink.getColumn()
->= m_rSink.getLineLengthLimit())
+if (m_rSink.getColumn() >= 
m_rSink.getLineLengthLimit())
 m_rSink << INetMIMEOutputSink::endl;
 m_rSink << ' ';
 }
 if (m_nExtraSpaces == 1)
 {
-if (m_rSink.getColumn() + nSize
->= m_rSink.getLineLengthLimit())
-m_rSink << INetMIMEOutputSink::endl;
+if (m_rSink.getColumn() + nSize >= 
m_rSink.getLineLengthLimit())
+m_rSink << INetMIMEOutputSink::endl;
 m_rSink << ' ';
 }
 m_rSink << "=?" << pCharsetName << "?Q?";
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index b7867a8..0038c86 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -323,10 +323,10 @@ sal_uInt16 ErrorHandler::HandleError_Impl(
 }
 else
 {
-if( nFlags != USHRT_MAX )
-nErrFlags = nFlags;
+if (nFlags != USHRT_MAX)
+nErrFlags = nFlags;
 return (*(WindowDisplayErrorFunc*)pData->pDsp)(
-pParent, nErrFlags, aErr, aAction);
+pParent, nErrFlag

[ANN] LibreOffice 3.6.3 RC1 available

2012-10-13 Thread Thorsten Behrens

Dear Community,

The Document Foundation is happy to announce the first release
candidate of LibreOffice 3.6.3. The upcoming 3.6.3 will be the third
in a series of frequent bugfix releases, for our feature-packed 3.6
branch. Please be aware that LibreOffice 3.6.3 RC1 is not ready for
production use, you should continue to use LibreOffice 3.6.2 for that.

The release is available for Windows, Linux and Mac OS X from our QA
builds download page at

  http://www.libreoffice.org/download/pre-releases/

Should you find bugs, please report them to the FreeDesktop Bugzilla:

  https://bugs.freedesktop.org

A good way to assess the release candidate quality is to run some
specific manual tests on it, our TCM wiki page has more details:

 
http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test

 (and the announcement mail: 
http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html)
 
For other ways to get involved with this exciting project - you can
e.g. contribute code:

  http://www.libreoffice.org/get-involved/developers/

translate LibreOffice to your language:

  http://wiki.documentfoundation.org/Translation_for_3.5

or help with funding our operations:

  http://donate.libreoffice.org/

A list of known issues and fixed bugs with 3.6.3 RC1 is available
from our wiki:

  http://wiki.documentfoundation.org/Releases/3.6.3/RC1

Let us close again with a BIG Thank You! to all of you having
contributed to the LibreOffice project - this release would not have
been possible without your help.

Yours,

The Document Foundation Board of Directors

The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint


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

[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy

2012-10-13 Thread Libreoffice Gerrit user

 svtools/inc/svtools/treelistbox.hxx   |2 --
 svtools/source/contnr/treelistbox.cxx |   17 -
 unusedcode.easy   |1 -
 3 files changed, 20 deletions(-)

New commits:
commit a51488cb2400163e20bc4fe5e3028587c29d08d9
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 13 20:12:56 2012 +0100

callcatcher: update unused code and drop freshly unused methods

Change-Id: I8b1c0cc4a1af259e39578c36bace126c35337ecd

diff --git a/svtools/inc/svtools/treelistbox.hxx 
b/svtools/inc/svtools/treelistbox.hxx
index 6e2f278..a919cd5 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -639,8 +639,6 @@ protected:
 voidEditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
 const Selection& );
 voidEditedText( const XubString& );
-voidEditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
-const Point& rMousePos );
 
 // berechnet abhaengig von TreeList-Style & Bitmap-Groessen
 // alle Tabulatoren neu; wird beim Einfuegen/Austauschen von
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 3c7da29..724f651 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2950,23 +2950,6 @@ void SvTreeListBox::EditedText( const XubString& rStr )
 }
 }
 
-void SvTreeListBox::EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem,
-const Point& )
-{
-DBG_CHKTHIS(SvTreeListBox,0);
-if( IsEditingActive() )
-EndEditing();
-if( pItem->IsA() == SV_ITEM_ID_LBOXSTRING )
-{
-Selection aSel( SELECTION_MIN, SELECTION_MAX );
-if( EditingEntry( pEntry, aSel ) )
-{
-SelectAll( sal_False );
-EditItemText( pEntry, (SvLBoxString*)pItem, aSel );
-}
-}
-}
-
 SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
 {
 DBG_CHKTHIS(SvTreeListBox,0);
diff --git a/unusedcode.easy b/unusedcode.easy
index 3218143..c3ee05a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2,7 +2,6 @@ FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, 
Size const&, float
 RelatedMultipart::getIds()
 SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, 
unsigned int, unsigned char)
 ScCTB::ScCTB()
-ScCondFormatHelper::GetExpression(ScCondFormatEntryType, int)
 ScCondFormatItem::ScCondFormatItem(unsigned int)
 ScConditionalFormat::dumpInfo(rtl::OUStringBuffer&) const
 ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window*, ScDocument*, ScAddress 
const&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6 3-6-3][PUSHED 3-6] fix for fdo#55885, don't insert notes to deleted cells

2012-10-13 Thread Markus Mohrhard

Hey,

2012/10/13 Kohei Yoshida :
> On Sat, Oct 13, 2012 at 1:22 AM, Markus Mohrhard
>  wrote:
>
>> Yeap, my mistake. It misses the -nStartRow or -nStartCol that makes
>> the nRow/nCol relative to the deleted column/row.
>>
>> I attached a patch that squashs both necessary commits into one.
>
> Yup. That looks more like it. Pushed it to 3-6 with my sign-off.
> We'll need to work on adding a test case for this later (on master)...
>

I already have a test case which is just in my unpushed patch queue.

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

[PATCH] rtl::OUString to OUString and some questions

2012-10-13 Thread oger000


Preface: I am a novice in many things.

To get familiar with the stringclasses I chose the "rtl namespace prefix 
removal" because I have seen some patches of this kind on the mailinglist.


My questions:

1) I did not find background info - at least not at 
 why the 
removing of the "rtl::" namespace prefix is preferable.


Any pointers? - or is it more a cosmetic cleanup?


2) A "make clean; make all" was successfull. Is this enough to think the change 
correct?



-- gerhard

>From 936d0d4fd4ece311559cf04b8c54e1cab66b9122 Mon Sep 17 00:00:00 2001
From: gerhard oettl 
Date: Sat, 13 Oct 2012 11:31:24 +0200
Subject: [PATCH] rtl::OUString to OUString
Content-Type: text/plain; charset="utf-8"

Change-Id: I75bf4d85103663df2e5a2fb905f39c2024769c5d
---
 sw/source/core/text/portxt.cxx |   20 ++--
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index a6391f5..e2440f9 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -521,7 +521,7 @@ void SwTxtPortion::FormatEOL( SwTxtFormatInfo &rInf )
 if( nHoleLen == GetLen() )
 nBlankSize = Width();
 else
-nBlankSize = nHoleLen * rInf.GetTxtSize(rtl::OUString(' ')).Width();
+nBlankSize = nHoleLen * rInf.GetTxtSize(OUString(' ')).Width();
 Width( Width() - nBlankSize );
 rInf.X( rInf.X() - nBlankSize );
 SetLen( GetLen() - nHoleLen );
@@ -559,13 +559,13 @@ void SwTxtPortion::Paint( const SwTxtPaintInfo &rInf ) const
 if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDEND==rInf.GetTxt().GetChar(rInf.GetIdx()))
 {
 rInf.DrawBackBrush( *this );
-const rtl::OUString aTxt(CH_TXT_ATR_SUBST_FIELDEND);
+const OUString aTxt(CH_TXT_ATR_SUBST_FIELDEND);
 rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );
 }
 else if (rInf.OnWin() && 1==rInf.GetLen() && CH_TXT_ATR_FIELDSTART==rInf.GetTxt().GetChar(rInf.GetIdx()))
 {
 rInf.DrawBackBrush( *this );
-const rtl::OUString aTxt(CH_TXT_ATR_SUBST_FIELDSTART);
+const OUString aTxt(CH_TXT_ATR_SUBST_FIELDSTART);
 rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );
 }
 else if( GetLen() )
@@ -728,7 +728,7 @@ void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const
 // #i16816# tagged pdf support
 if( rInf.GetVsh() && rInf.GetVsh()->GetViewOptions()->IsPDFExport() )
 {
-const rtl::OUString aTxt( ' ' );
+const OUString aTxt( ' ' );
 rInf.DrawText( aTxt, *this, 0, 1, false );
 }
 }
@@ -768,19 +768,19 @@ sal_Bool SwFieldMarkPortion::Format( SwTxtFormatInfo & )
 
 namespace {
 static sal_Int32 getCurrentListIndex( IFieldmark* pBM,
-::rtl::OUString* io_pCurrentText = NULL )
+OUString* io_pCurrentText = NULL )
 {
 const IFieldmark::parameter_map_t* const pParameters = pBM->GetParameters();
 sal_Int32 nCurrentIdx = 0;
-const IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT)));
+const IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find(OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_RESULT)));
 if(pResult != pParameters->end())
 pResult->second >>= nCurrentIdx;
 if(io_pCurrentText)
 {
-const IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)));
+const IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMDROPDOWN_LISTENTRY)));
 if(pListEntries != pParameters->end())
 {
-uno::Sequence< ::rtl::OUString > vListEntries;
+uno::Sequence< OUString > vListEntries;
 pListEntries->second >>= vListEntries;
 if(nCurrentIdx < vListEntries.getLength())
 *io_pCurrentText = vListEntries[nCurrentIdx];
@@ -814,7 +814,7 @@ void SwFieldFormPortion::Paint( const SwTxtPaintInfo& rInf ) const
 }
 else if ( pBM->GetFieldname( ) == ODF_FORMDROPDOWN )
 { // a list...
-rtl::OUString aTxt;
+OUString aTxt;
 getCurrentListIndex( pBM, &aTxt );
 rInf.DrawViewOpt( *this, POR_FLD );
 rInf.DrawText( aTxt, *this, 0, aTxt.getLength(), false );
@@ -845,7 +845,7 @@ sal_Bool SwFieldFormPortion::Format( SwTxtFormatInfo & rInf )
 }
 else if ( pBM->GetFieldname( ) == ODF_FORMDROPDOWN )
 {
-::rtl::OUString aTxt;
+OUString aTxt;
 getCurrentListIndex( pBM, &aTxt );
 SwPosSize aPosSize = rInf.GetTxtSize( aTxt );
 Widt

Re: [REVIEW 3-6 3-6-3][PUSHED 3-6] fix for fdo#55885, don't insert notes to deleted cells

2012-10-13 Thread Kohei Yoshida

On Sat, Oct 13, 2012 at 1:22 AM, Markus Mohrhard
 wrote:

> Yeap, my mistake. It misses the -nStartRow or -nStartCol that makes
> the nRow/nCol relative to the deleted column/row.
>
> I attached a patch that squashs both necessary commits into one.

Yup. That looks more like it. Pushed it to 3-6 with my sign-off.
We'll need to work on adding a test case for this later (on master)...

Two more sign-off's needed to push this change to 3-6-3.

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

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

2012-10-13 Thread Libreoffice Gerrit user

 sc/source/core/data/table2.cxx |   18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 04ba130525bf339f774fd17423f8656e6755ed11
Author: Markus Mohrhard 
Date:   Fri Oct 12 16:46:55 2012 +0200

don't insert notes from deleted cells, fdo#55885

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

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4230cbd..cd193c1 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -267,8 +267,13 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, 
SCROW nStartRow, SCSIZE
 
 if (nRow >= nStartRow)
 {
-aNotes.insert(nCol, nRow - nSize, pPostIt);
-maNotes.ReleaseNote(nCol, nRow);
+if(nRow - nStartRow > static_cast(nSize))
+{
+aNotes.insert(nCol, nRow - nSize, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else
+maNotes.erase(nCol, nRow);
 }
 }
 
@@ -486,8 +491,13 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, 
SCROW nEndRow, SCSIZE
 
 if (nCol >= nStartCol)
 {
-aNotes.insert(nCol - nSize, nRow, pPostIt);
-maNotes.ReleaseNote(nCol, nRow);
+if(nCol - nStartCol > static_cast(nSize))
+{
+aNotes.insert(nCol - nSize, nRow, pPostIt);
+maNotes.ReleaseNote(nCol, nRow);
+}
+else
+maNotes.erase(nCol, nRow);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: compilerplugins/clang

2012-10-13 Thread Libreoffice Gerrit user

 compilerplugins/clang/sallogareas.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f1b6058a3b321a150c0373ddc6066ecc8eb85312
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Sat Oct 13 18:26:26 2012 +0200

remove debug output

Change-Id: I719ce8870320f3bddd68fe26cf2c2b941e0a9403

diff --git a/compilerplugins/clang/sallogareas.cxx 
b/compilerplugins/clang/sallogareas.cxx
index b7c2f22..caf2a47 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -58,13 +58,13 @@ bool SalLogAreas::VisitCallExpr( CallExpr* call )
 if( area->getKind() == StringLiteral::Ascii )
 checkArea( area->getBytes(), area->getExprLoc());
 else
-report( DiagnosticsEngine::Warning, "unsupported 
string literal kind (plugin needs fixing?) [loplugin] sallog",
+report( DiagnosticsEngine::Warning, "unsupported 
string literal kind (plugin needs fixing?) [loplugin]",
 area->getLocStart());
 return true;
 }
 if( inFunction->getQualifiedNameAsString() == 
"sal::detail::log" )
 return true; // This function only forwards to 
sal_detail_log, so ok.
-report( DiagnosticsEngine::Warning, "cannot analyse log area 
argument (plugin needs fixing?) [loplugin] sallog",
+report( DiagnosticsEngine::Warning, "cannot analyse log area 
argument (plugin needs fixing?) [loplugin]",
 call->getLocStart());
 }
 }
@@ -78,7 +78,7 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation 
location )
 readLogAreas();
 if( !logAreas.count( area ))
 {
-report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or 
extend sal/inc/sal/log-areas.dox) [loplugin] sallog",
+report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or 
extend sal/inc/sal/log-areas.dox) [loplugin]",
 location ) << area;
 }
 }
@@ -107,7 +107,7 @@ void SalLogAreas::readLogAreas()
 }
 // If you get this error message, you possibly have too old icecream 
(ICECC_EXTRAFILES is needed).
 if( logAreas.empty())
-report( DiagnosticsEngine::Warning, "error reading log areas 
[loplugin] sallog" );
+report( DiagnosticsEngine::Warning, "error reading log areas 
[loplugin]" );
 }
 
 } // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: setup_native/source writerfilter/source

2012-10-13 Thread Libreoffice Gerrit user

 setup_native/source/win32/wintools/makecab/makecab.c |1 -
 writerfilter/source/dmapper/GraphicImport.cxx|1 -
 2 files changed, 2 deletions(-)

New commits:
commit b03278df1d56424d4d6f1fe245676d41183ac8ec
Author: Julien Nabet 
Date:   Sat Oct 13 17:57:21 2012 +0200

Remove consecutive break and a break which follows a return

Change-Id: I8dec9eda857f7da452992bc785426449933acc59

diff --git a/setup_native/source/win32/wintools/makecab/makecab.c 
b/setup_native/source/win32/wintools/makecab/makecab.c
index 9e7c4fe..c632ff4 100644
--- a/setup_native/source/win32/wintools/makecab/makecab.c
+++ b/setup_native/source/win32/wintools/makecab/makecab.c
@@ -235,7 +235,6 @@ FNFCISTATUS(fnStatus) /*(UINT typeStatus, ULONG cb1, ULONG 
cb2, void FAR *pv)*/
 case statusCabinet:
 printf("\rWriting cabinet file (%d of approx. %d bytes)", cb1, cb2);
 return cb2;
-break;
 }
 
 return 0;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 5709a17..10a17e6 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -989,7 +989,6 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
 case NS_ooxml::LN_CT_Inline_distR:
 m_pImpl->nRightMargin = 
ConversionHelper::convertTwipToMM100(nIntValue);
 break;
-break;
 case NS_ooxml::LN_CT_GraphicalObjectData_uri:
 val.getString();
 //TODO: does it need to be handled?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - compilerplugins/clang compilerplugins/Makefile-clang.mk sal/inc sal/osl sal/qa sal/rtl solenv/gbuild

2012-10-13 Thread Libreoffice Gerrit user

 compilerplugins/Makefile-clang.mk |3 
 compilerplugins/clang/compileplugin.cxx   |9 +
 compilerplugins/clang/compileplugin.hxx   |2 
 compilerplugins/clang/sallogareas.cxx |  113 +++
 compilerplugins/clang/sallogareas.hxx |   39 ++
 compilerplugins/clang/unusedvariablecheck.cxx |7 -
 compilerplugins/clang/unusedvariablecheck.hxx |2 
 sal/inc/osl/file.hxx  |   18 +--
 sal/inc/sal/log-areas.dox |  148 ++
 sal/osl/unx/conditn.cxx   |   38 +++---
 sal/osl/unx/process.cxx   |8 -
 sal/qa/osl/security/osl_Security.cxx  |2 
 sal/rtl/source/alloc_arena.cxx|   12 +-
 sal/rtl/source/alloc_cache.cxx|   14 +-
 sal/rtl/source/alloc_global.cxx   |8 -
 sal/rtl/source/logfile.cxx|4 
 solenv/gbuild/platform/com_GCC_class.mk   |2 
 solenv/gbuild/platform/com_GCC_defs.mk|2 
 18 files changed, 370 insertions(+), 61 deletions(-)

New commits:
commit 1e313e759b79bd55d977156483847e22273d8e65
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Sat Oct 13 17:38:58 2012 +0200

compiler check to compare SAL_WARN/LOG areas against 
sal/inc/sal/log-areas.dox

Some of the areas are guesses I've added after seeing them, whoever feels 
reponsible
for whichever part of the code feel free to adjust them.

Change-Id: I2192de84d51cc2bc7c28fa84019d38b465985d15

diff --git a/compilerplugins/Makefile-clang.mk 
b/compilerplugins/Makefile-clang.mk
index e9192fe..f9bec41 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -11,6 +11,7 @@
 # The list of source files.
 CLANGSRC=compileplugin.cxx \
 bodynotinblock.cxx \
+sallogareas.cxx \
 unusedvariablecheck.cxx \
 
 
@@ -52,7 +53,7 @@ CLANGOBJS=
 define clangbuildsrc
 $(3): $(2) $(SRCDIR)/compilerplugins/Makefile-clang.mk 
$(CLANGOUTDIR)/clang-timestamp
@echo [build CXX] $(subst $(SRCDIR)/,,$(2))
-   $(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) $(2) -fPIC -c -o 
$(3) -MMD -MT $(3) -MP -MF $(CLANGOUTDIR)/$(1).d
+   $(CXX) $(CLANGCXXFLAGS) $(CLANGDEFS) $(CLANGINCLUDES) 
-DSRCDIR=$(SRCDIR) $(2) -fPIC -c -o $(3) -MMD -MT $(3) -MP -MF 
$(CLANGOUTDIR)/$(1).d
 
 -include $(CLANGOUTDIR)/$(1).d
 
diff --git a/compilerplugins/clang/compileplugin.cxx 
b/compilerplugins/clang/compileplugin.cxx
index a61a3ba..c243b7a 100644
--- a/compilerplugins/clang/compileplugin.cxx
+++ b/compilerplugins/clang/compileplugin.cxx
@@ -18,6 +18,7 @@
 #include 
 
 #include "bodynotinblock.hxx"
+#include "sallogareas.hxx"
 #include "unusedvariablecheck.hxx"
 
 using namespace clang;
@@ -40,7 +41,10 @@ DiagnosticBuilder Plugin::report( DiagnosticsEngine::Level 
level, StringRef mess
 if( level == DiagnosticsEngine::Error && diag.getErrorsAsFatal())
 level = DiagnosticsEngine::Fatal;
 #endif
-return diag.Report( loc, diag.getCustomDiagID( level, message ));
+if( loc.isValid())
+return diag.Report( loc, diag.getCustomDiagID( level, message ));
+else
+return diag.Report( diag.getCustomDiagID( level, message ));
 }
 
 bool Plugin::ignoreLocation( SourceLocation loc )
@@ -58,6 +62,7 @@ class PluginHandler
 explicit PluginHandler( ASTContext& context )
 : rewriter( context.getSourceManager(), context.getLangOpts())
 , bodyNotInBlock( context )
+, salLogAreas( context )
 , unusedVariableCheck( context )
 {
 }
@@ -66,6 +71,7 @@ class PluginHandler
 if( context.getDiagnostics().hasErrorOccurred())
 return;
 bodyNotInBlock.run();
+salLogAreas.run();
 unusedVariableCheck.run();
 // TODO also LO header files? or a subdir?
if( const RewriteBuffer* buf = rewriter.getRewriteBufferFor( 
context.getSourceManager().getMainFileID()))
@@ -75,6 +81,7 @@ class PluginHandler
 private:
 Rewriter rewriter;
 BodyNotInBlock bodyNotInBlock;
+SalLogAreas salLogAreas;
 UnusedVariableCheck unusedVariableCheck;
 };
 
diff --git a/compilerplugins/clang/compileplugin.hxx 
b/compilerplugins/clang/compileplugin.hxx
index 6c854d1..c8ad296 100644
--- a/compilerplugins/clang/compileplugin.hxx
+++ b/compilerplugins/clang/compileplugin.hxx
@@ -23,7 +23,7 @@ class Plugin
 public:
 explicit Plugin( ASTContext& context );
 protected:
-DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef 
message, SourceLocation loc );
+DiagnosticBuilder report( DiagnosticsEngine::Level level, StringRef 
message, SourceLocation loc = SourceLocation());
 bool ignoreLocation( SourceLocation loc );
 bool ignoreLocation( const Decl* decl );
 bool ignoreLocation( const Stmt* stmt );
diff --git a/compilerplugins/clang/

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-10-13 Thread bugzilla-daemon

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

--- Comment #141 from Rainer Bielefeld  ---
Really added Bug 54898

for the records, latest "nominations" were
"Bug 54898 - : sum error with hours in Pivot Table (AKA Data Pilot)"
"Bug 53924 - FORMATTING: PRINTING changes text (space get's removed) on OS X
10.7/10.8"

@all:
may I ask you to follow Romans hints (he created for the 3.7 MAB tracking bugs)
on 
,
what would help to use these tracking Bugs more effective?

That especially means:
Please always Copy / Paste the complete summary of the "nominated" bug to your
comment in the MAB tracking bug. So aAll in CC, especially Developers and QA
staff on lists, see immediately concerning what that problem that bug is. Some
"fdo#xyz" is not useful because in the Bugzilla Daemon mails nobody can see
Concerning what problem the new bug is, he has to visit the bug, and that's
some work, because neither in mail nor in comment a link will be created.

Thank you!

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source vcl/source

2012-10-13 Thread Libreoffice Gerrit user

 oox/source/drawingml/transform2dcontext.cxx |4 ++--
 vcl/source/gdi/bitmap3.cxx  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 755ceb2f5ba5f605ae2a0c7c84dadfb41c34e264
Author: Andras Timar 
Date:   Sat Oct 13 16:50:57 2012 +0200

it seems we still need the ::rtl:: prefix for OUString at some places

Change-Id: I0c043e2c33ee51d73cf8e00a1032e5953e8c1639

diff --git a/oox/source/drawingml/transform2dcontext.cxx 
b/oox/source/drawingml/transform2dcontext.cxx
index 53d27eb..d5ce984 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -71,8 +71,8 @@ Reference< XFastContextHandler > 
Transform2DContext::createFastChildContext( sal
 {
 case A_TOKEN( off ):
 {
-OUString sXValue = xAttribs->getOptionalValue( XML_x );
-OUString sYValue = xAttribs->getOptionalValue( XML_y );
+::rtl::OUString sXValue = xAttribs->getOptionalValue( 
XML_x );
+::rtl::OUString sYValue = xAttribs->getOptionalValue( 
XML_y );
 if( !sXValue.isEmpty() )
 mrShape.getTextBody()->getTextProperties().moTextOffX 
= GetCoordinate( sXValue.toInt32() - mrShape.getPosition().X );
 if( !sYValue.isEmpty() )
commit 644f7894153a9a9631de307b0ffeadf4bfa283e4
Author: Andras Timar 
Date:   Sat Oct 13 12:46:07 2012 +0200

confusion around parantheses near fabs()

Change-Id: Ifcab9f9ef73eb044288ed68014dc05acd9a2efa8

diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index a469681..42e7de3 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2316,7 +2316,7 @@ void Bitmap::ImplCalculateContributions( const int 
aSourceSize, const int aDesti
 aWeight = aKernel.Calculate( aFilterFactor * ( aCenter - (double) 
j ) );
 
 // Reduce calculations with ignoring weights of 0.0
-if (fabs(aWeight < 0.0001))
+if (fabs(aWeight) < 0.0001)
 continue;
 
 // Handling on edges
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-10-13 Thread bugzilla-daemon

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

Julien Nabet  changed:

   What|Removed |Added

 Depends on||54898

--- Comment #140 from Julien Nabet  ---
Nominating fdo#54898 as MAB since:
- it's a regression from 3.5
- it has been reproduced at least twice (fdo#54898 + its dup 55625)
- it's stealth (no error message or something) and we can't trust results of
Data Pilot for the moment

-- 
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] .: tubes/AllLangResTarget_tubes.mk tubes/Library_tubes.mk tubes/Module_tubes.mk tubes/source tubes/uiconfig tubes/UI_tubes.mk

2012-10-13 Thread Libreoffice Gerrit user

 tubes/AllLangResTarget_tubes.mk |   19 -
 tubes/Library_tubes.mk  |1 
 tubes/Module_tubes.mk   |4 -
 tubes/UI_tubes.mk   |   16 
 tubes/source/contacts.cxx   |  113 ++---
 tubes/source/contacts.hrc   |   12 ---
 tubes/source/contacts.src   |   66 ---
 tubes/uiconfig/ui/contacts.ui   |  135 
 8 files changed, 189 insertions(+), 177 deletions(-)

New commits:
commit e74fc93e4aba7887e6a278cc44c4bc0962471065
Author: MatÃºÅ¡ Kukan 
Date:   Fri Oct 5 22:58:18 2012 +0200

tubes: use new .ui format for contacts dialog

it looks worse; more work needed

Change-Id: If8d15d614d49b1cea751852164b3e0edf43c52a6

diff --git a/tubes/AllLangResTarget_tubes.mk b/tubes/AllLangResTarget_tubes.mk
deleted file mode 100644
index 9cd4e1f..000
--- a/tubes/AllLangResTarget_tubes.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,tubes))
-
-$(eval $(call gb_AllLangResTarget_add_srs,tubes,tubes/res))
-
-$(eval $(call gb_SrsTarget_SrsTarget,tubes/res))
-
-$(eval $(call gb_SrsTarget_add_files,tubes/res,\
-   tubes/source/contacts.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/tubes/Library_tubes.mk b/tubes/Library_tubes.mk
index 1f79aca..d262156 100644
--- a/tubes/Library_tubes.mk
+++ b/tubes/Library_tubes.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,tubes,\
svt \
svxcore \
tl \
-   utl \
vcl \
$(gb_UWINAPI) \
 ))
diff --git a/tubes/Module_tubes.mk b/tubes/Module_tubes.mk
index 7eec798..dc0bba8 100644
--- a/tubes/Module_tubes.mk
+++ b/tubes/Module_tubes.mk
@@ -30,10 +30,10 @@ $(eval $(call gb_Module_Module,tubes))
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 
 $(eval $(call gb_Module_add_targets,tubes,\
-   AllLangResTarget_tubes \
+   Executable_liboapprover \
Library_tubes \
Package_inc \
-   Executable_liboapprover \
+   UI_tubes \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\
diff --git a/tubes/UI_tubes.mk b/tubes/UI_tubes.mk
new file mode 100644
index 000..59801da
--- /dev/null
+++ b/tubes/UI_tubes.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UI_UI,tubes))
+
+$(eval $(call gb_UI_add_uifiles,tubes,\
+   tubes/uiconfig/ui/contacts \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx
index 3c0a332..91cce71 100644
--- a/tubes/source/contacts.cxx
+++ b/tubes/source/contacts.cxx
@@ -28,44 +28,26 @@
 
 #include 
 
-#include "contacts.hrc"
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
 #include 
-#include 
+#include 
 
-#include 
-#include 
 #include 
 
 namespace {
 
-ResId TubesResId( sal_uInt32 nId )
-{
-static ResMgr* pResMgr = NULL;
-if (!pResMgr)
-{
-pResMgr = ResMgr::CreateResMgr( "tubes" );
-}
-return ResId( nId, *pResMgr );
-}
-
 class TubeContacts : public ModelessDialog
 {
-FixedLine   maLabel;
-PushButton  maBtnDemo;
-PushButton  maBtnConnect;
-PushButton  maBtnGroup;
-PushButton  maBtnInvite;
-PushButton  maBtnListen;
-SvxSimpleTableContainer maListContainer;
-SvxSimpleTable  maList;
+PushButton* mpBtnDemo;
+PushButton* mpBtnBuddy;
+PushButton* mpBtnGroup;
+PushButton* mpBtnInvite;
+PushButton* mpBtnListen;
+ListBox*mpList;
 Collaboration*  mpCollaboration;
 
 DECL_LINK( BtnDemoHdl, void * );
@@ -78,12 +60,11 @@ class TubeContacts : public ModelessDialog
 
 void Invite()
 {
-AccountContactPair *pAC = NULL;
-if (maList.FirstSelected())
-pAC = static_cast 
(maList.FirstSelected()->GetUserData());
-if (pAC)
+if (mpList->GetSelectEntryCount())
 {
-mpCollaboration->Invite( pAC->second );
+sal_uInt16 i = mpList->GetSelectEntryPos();
+TpContact* pContact = maACs[i].second;
+mpCollaboration->Invite( pContact );
 }
 }
 
@@ -107,13 +88,11 @@ class TubeContacts : public ModelessDialog
 
 void StartBuddySession()

[Libreoffice-commits] .: 2 commits - connectivity/source cui/source oox/source sd/source sot/source ucb/source

2012-10-13 Thread Libreoffice Gerrit user

 connectivity/source/drivers/mork/MorkParser.cxx |   12 ++--
 cui/source/tabpages/autocdlg.cxx|2 +-
 oox/source/vml/vmlshape.cxx |4 ++--
 sd/source/ui/remotecontrol/Server.cxx   |8 
 sot/source/sdstor/stgcache.cxx  |   10 +-
 ucb/source/ucp/webdav/DAVResourceAccess.cxx |2 +-
 ucb/source/ucp/webdav/webdavcontentcaps.cxx |2 +-
 ucb/source/ucp/webdav/webdavdatasupplier.cxx|4 ++--
 8 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 72fe2e3003b89b4d6bc7a87e0dc5ce85dd043b45
Author: Julien Nabet 
Date:   Sat Oct 13 16:06:44 2012 +0200

Prefer prefix ++/-- operators for non-primitive types

+ replace "<" by "!=" for end iterator comparison with current it

Change-Id: I6e90caa8752c7057cca8c74fca12c0a050544dbb

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 7773d8a..fcc0da5 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -667,8 +667,8 @@ Reference< XShape > BezierShape::implConvertAndInsert( 
const Reference< XShapes
 // Parse VML path string and convert to absolute coordinates
 ConversionHelper::decodeVmlPath( aCoordLists, aFlagLists, 
maShapeModel.maVmlPath );
 
-for ( SubPathList::iterator aListIt = aCoordLists.begin(); aListIt 
!= aCoordLists.end(); aListIt++ )
-for ( ::std::vector< Point >::iterator aPointIt = 
(*aListIt).begin(); aPointIt != (*aListIt).end(); aPointIt++)
+for ( SubPathList::iterator aListIt = aCoordLists.begin(); aListIt 
!= aCoordLists.end(); ++aListIt )
+for ( ::std::vector< Point >::iterator aPointIt = 
(*aListIt).begin(); aPointIt != (*aListIt).end(); ++aPointIt)
 {
 (*aPointIt) = lclGetAbsPoint( (*aPointIt), rShapeRect, 
aCoordSys );
 }
diff --git a/sd/source/ui/remotecontrol/Server.cxx 
b/sd/source/ui/remotecontrol/Server.cxx
index 8ec942d..deb8814 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -186,7 +186,7 @@ void RemoteServer::presentationStarted( const 
css::uno::Reference<
 return;
 MutexGuard aGuard( spServer->mDataMutex );
 for ( vector::const_iterator aIt = 
spServer->mCommunicators.begin();
- aIt < spServer->mCommunicators.end(); aIt++ )
+ aIt != spServer->mCommunicators.end(); ++aIt )
 {
 (*aIt)->presentationStarted( rController );
 }
@@ -197,7 +197,7 @@ void RemoteServer::presentationStopped()
 return;
 MutexGuard aGuard( spServer->mDataMutex );
 for ( vector::const_iterator aIt = 
spServer->mCommunicators.begin();
- aIt < spServer->mCommunicators.end(); aIt++ )
+ aIt != spServer->mCommunicators.end(); ++aIt )
 {
 (*aIt)->disposeListener();
 }
@@ -209,7 +209,7 @@ void RemoteServer::removeCommunicator( Communicator* 
mCommunicator )
 return;
 MutexGuard aGuard( spServer->mDataMutex );
 for ( vector::iterator aIt = 
spServer->mCommunicators.begin();
- aIt < spServer->mCommunicators.end(); aIt++ )
+ aIt != spServer->mCommunicators.end(); ++aIt )
 {
 if ( mCommunicator == *aIt )
 {
@@ -275,7 +275,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, 
rtl::OUString aPin )
 spServer->mCommunicators.push_back( pCommunicator );
 
 for ( vector::iterator aIt = 
spServer->mAvailableClients.begin();
-aIt < spServer->mAvailableClients.end(); aIt++ )
+aIt != spServer->mAvailableClients.end(); ++aIt )
 {
 if ( pClient == *aIt )
 {
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 00c20d4..f2d22e5 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -135,7 +135,7 @@ void StgCache::Erase( const rtl::Reference< StgPage > 
&xElem )
 {
 OSL_ENSURE( xElem.is(), "The pointer should not be NULL!" );
 if ( xElem.is() ) {
-for ( LRUList::iterator it = maLRUPages.begin(); it != 
maLRUPages.end(); it++ ) {
+for ( LRUList::iterator it = maLRUPages.begin(); it != 
maLRUPages.end(); ++it ) {
 if ( it->is() && (*it)->GetPage() == xElem->GetPage() ) {
 it->clear();
 break;
@@ -149,7 +149,7 @@ void StgCache::Erase( const rtl::Reference< StgPage > 
&xElem )
 void StgCache::Clear()
 {
 maDirtyPages.clear();
-for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); 
it++ )
+for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); 
++it )
 it->clear();
 }
 
@@ -157,7 +157,7 @@ void StgCache::Clear()
 
 rtl::Reference< StgPage > StgCache::Find( sal_Int32 nPage )
 {
-for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); 
it++ )
+for ( LRUList::iterator it = maLRUPages.begin(); it != ma

[PATCH] Mark rtl_*memory as deprecated

2012-10-13 Thread Arnaud Versini (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/865

To pull it, you can do:

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

Mark rtl_*memory as deprecated

Change-Id: I0e5e85d6b23961baa9ef3ed4247e39497bb063d7
---
M sal/inc/rtl/memory.h
1 file changed, 6 insertions(+), 0 deletions(-)


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

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

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

[Libreoffice-commits] .: framework/source

2012-10-13 Thread Libreoffice Gerrit user

 framework/source/services/frame.cxx |   27 ++-
 1 file changed, 10 insertions(+), 17 deletions(-)

New commits:
commit 5f12d6d42defc5ad3c286c23771be75595388d54
Author: CaolÃ¡n McNamara 
Date:   Sat Oct 13 11:47:19 2012 +0100

loplugin: what is it with the weird-ass else placement in framework

Change-Id: I81809a80242457147dba716daa92b83726f732ba

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index b4e8e12..e3bf76b 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -805,8 +805,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const ::rtl
 //  It doesn't matter if we have a valid parent or not. User ask for him 
and get it.
 //  An empty result is a valid result too.
 
//-
-else
-if ( sTargetFrameName==SPECIALTARGET_PARENT )
+else if ( sTargetFrameName==SPECIALTARGET_PARENT )
 {
 xTarget = xParent;
 }
@@ -816,13 +815,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const ::rtl
 //  If we are not the top frame in this hierarchy, we must forward request 
to our parent.
 //  Otherwhise we must return ourself.
 
//-
-else
-if ( sTargetFrameName==SPECIALTARGET_TOP )
+else if ( sTargetFrameName==SPECIALTARGET_TOP )
 {
 if (bIsTopFrame)
 xTarget = this;
-else
-if (xParent.is()) // If we are not top - the parent MUST exist. But 
may it's better to check it again .-)
+else if (xParent.is()) // If we are not top - the parent MUST exist. 
But may it's better to check it again .-)
 xTarget = xParent->findFrame(SPECIALTARGET_TOP,0);
 }
 
@@ -830,8 +827,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const ::rtl
 // I.IV) "_self", ""
 //  This mean this frame in every case.
 
//-
-else
-if (
+else if (
 ( sTargetFrameName==SPECIALTARGET_SELF ) ||
 ( sTargetFrameName.isEmpty()   )
)
@@ -845,8 +841,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const ::rtl
 //  or create it there if it not already exists.
 //  Note: Such beamer exists for task(top) frames only!
 
//-
-else
-if ( sTargetFrameName==SPECIALTARGET_BEAMER )
+else if ( sTargetFrameName==SPECIALTARGET_BEAMER )
 {
 // We are a task => search or create the beamer
 if (bIsTopWindow)
@@ -862,8 +857,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::findFrame( const ::rtl
 }
 }
 // We arent a task => forward request to our parent or ignore it.
-else
-if (xParent.is())
+else if (xParent.is())
 xTarget = xParent->findFrame(SPECIALTARGET_BEAMER,0);
 }
 
@@ -1410,7 +1404,8 @@ sal_Bool SAL_CALL Frame::setComponent(  const   
css::uno::Reference< css::awt::X
 xDisposable->dispose();
 }
 catch(const css::lang::DisposedException&)
-{}
+{
+}
 }
 xOldComponentWindow = NULL;
 }
@@ -1431,8 +1426,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   
css::uno::Reference< css::awt::X
 // notifies all interest listener, that current component was changed or a 
new one was loaded
 if (bIsConnected && bWasConnected)
 implts_sendFrameActionEvent( 
css::frame::FrameAction_COMPONENT_REATTACHED );
-else
-if (bIsConnected && !bWasConnected)
+else if (bIsConnected && !bWasConnected)
 implts_sendFrameActionEvent( 
css::frame::FrameAction_COMPONENT_ATTACHED   );
 
 
//_
@@ -3118,12 +3112,11 @@ void Frame::impl_checkMenuCloser()
 // Because it's set at the special member 
aAnalyzer.m_xBackingComponent ... :-)
 xNewCloserFrame = aAnalyzer.m_lOtherVisibleFrames[0];
 }
-else
 // -
 // b)
 // There is no other frame ... means no other document frame. The help 
module
 // will be handled seperatly and must(!) be ignored here ... excepting 
weself includes the help.
-if (
+else if (
 (aAnalyzer.m_lOtherVisibleFrames.getLength()==0) &&
 (!aAnalyzer.m_bReferenceIsHelp ) &&
 (!aAnalyzer.m_bReferenceIsHidden   ) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.free

[Libreoffice-commits] .: writerfilter/source

2012-10-13 Thread Libreoffice Gerrit user

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   22 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|2 -
 writerfilter/source/dmapper/FontTable.cxx|1 
 writerfilter/source/dmapper/FormControlHelper.cxx|1 
 writerfilter/source/dmapper/ThemeTable.cxx   |6 
 writerfilter/source/filter/ImportFilter.cxx  |1 
 6 files changed, 12 insertions(+), 21 deletions(-)

New commits:
commit 2a777a1014365c3cdf5902fcfd67e9bb77baedd1
Author: Miklos Vajna 
Date:   Sat Oct 13 12:28:24 2012 +0200

writerfilter: fix new clang warnings

Change-Id: I0f7cec0f300290fe3ea465f344cfda642824ed0b

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index f8786c9..e6d63f5 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -545,19 +545,19 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 if ( rInfo.pTableDefaults->size( ) )
 pAllCellProps->insert( rInfo.pTableDefaults );
 
-// Fill the cell properties with the ones of the style
-sal_Int32 nCellStyleMask = 0;
-const PropertyMap::iterator aCnfStyleIter =
+// Fill the cell properties with the ones of the style
+sal_Int32 nCellStyleMask = 0;
+const PropertyMap::iterator aCnfStyleIter =
 aCellIterator->get()->find( PropertyDefinition( 
PROP_CNF_STYLE, false ) );
-if ( aCnfStyleIter != aCellIterator->get( )->end( ) )
-{
-if ( rInfo.pTableStyle ) {
-OUString sMask;
-aCnfStyleIter->second >>= sMask;
-nCellStyleMask = sMask.toInt32( 2 );
-}
-aCellIterator->get( )->erase( aCnfStyleIter );
+if ( aCnfStyleIter != aCellIterator->get( )->end( ) )
+{
+if ( rInfo.pTableStyle ) {
+OUString sMask;
+aCnfStyleIter->second >>= sMask;
+nCellStyleMask = sMask.toInt32( 2 );
 }
+aCellIterator->get( )->erase( aCnfStyleIter );
+}
 
 if ( rInfo.pTableStyle )
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d4f4b85..9349f7f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2731,7 +2731,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 break;
 case FIELD_COMMENTS :
 {
-OUString sParam = 
lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") );
+// OUString sParam = 
lcl_ExtractParameter(pContext->GetCommand(), sizeof(" COMMENTS") );
 // A parameter with COMMENTS shouldn't set fixed
 // ( or at least the binary filter doesn't )
 // If we set fixed then we wont export a field cmd.
diff --git a/writerfilter/source/dmapper/FontTable.cxx 
b/writerfilter/source/dmapper/FontTable.cxx
index d821822..08aab11 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -129,7 +129,6 @@ void FontTable::lcl_sprm(Sprm& rSprm)
 Value::Pointer_t pValue = rSprm.getValue();
 sal_Int32 nIntValue = pValue->getInt();
 (void)nIntValue;
-OUString sStringValue = pValue->getString();
 switch(nSprmId)
 {
 case NS_ooxml::LN_CT_Font_charset:
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx 
b/writerfilter/source/dmapper/FormControlHelper.cxx
index 38daa1d..38edf6f 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -231,7 +231,6 @@ bool 
FormControlHelper::processField(uno::Reference xFormField
 aAny <<= m_pFFData->getCheckboxChecked();
 if ( xPropSet.is() )
 xPropSet->setPropertyValue("Checked", aAny);
-OUString sName;
 }
 else if (m_pImpl->m_eFieldId == FIELD_FORMDROPDOWN )
 {
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx 
b/writerfilter/source/dmapper/ThemeTable.cxx
index 7504a79..4e70888 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -87,12 +87,6 @@ void ThemeTable::lcl_sprm(Sprm& rSprm)
 #endif
 
 sal_uInt32 nSprmId = rSprm.getId();
-(void)nSprmId;
-
-Value::Pointer_t pValue = rSprm.getValue();
-sal_Int32 nIn

[Libreoffice-commits] .: vcl/unx

2012-10-13 Thread Libreoffice Gerrit user

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 681e894b1ffa536ea3ccb5071465fbd1b0e34cc3
Author: Ivan Timofeev 
Date:   Sat Oct 13 14:09:45 2012 +0400

brain fog: logic error

Change-Id: I1ebfad03dca16b7530a44dfc7576ff5b73f681aa

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 0b0c0a0..945ae0b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2243,7 +2243,7 @@ static void NWPaintOneEditBox(SalX11Screen nScreen,
 "interior-focus",   &bInteriorFocus,
 "focus-line-width", &nFocusLineWidth,
 (char *)NULL);
-if ( bInteriorFocus )
+if ( !bInteriorFocus )
 {
 xborder += nFocusLineWidth;
 yborder += nFocusLineWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - basctl/source vcl/unx

2012-10-13 Thread Libreoffice Gerrit user

 basctl/source/basicide/basobj3.cxx   |2 +-
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |   20 +++-
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 08ec85d064107d8186b2ca3a05af63fad6d27cdb
Author: Ivan Timofeev 
Date:   Sat Oct 13 13:53:07 2012 +0400

fix String->OUString conversion

Change-Id: Icc21b8998f205b635a21275ea4355824eca83a60

diff --git a/basctl/source/basicide/basobj3.cxx 
b/basctl/source/basicide/basobj3.cxx
index 8ab1add..7850b95 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -92,7 +92,7 @@ SbMethod* CreateMacro( SbModule* pModule, const String& 
rMacroName )
 {
 bool bValid = false;
 OUString aStdMacroText( "Macro" );
-sal_uInt16 nMacro = 1;
+sal_Int32 nMacro = 1;
 while ( !bValid )
 {
 aMacroName = aStdMacroText;
commit 50a20f94869c2033d495da7d57f9948988cd5ad9
Author: Ivan Timofeev 
Date:   Fri Oct 12 21:55:43 2012 +0400

gtk: attempt to fix visual glitches around edit fields

Change-Id: I0c97840e610e6f2170a758afbd263ce6cd9e3129

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 6fd600b..0b0c0a0 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2236,13 +2236,23 @@ static void NWPaintOneEditBox(SalX11Screen nScreen,
 
 NWSetWidgetState( widget, nState, stateType );
 
-/* This doesn't seem to be necessary, and it causes some weird glitch in
- * murrine (with the elementary theme for instance) but it fixes some issue
- * with Orta, so... */
+gint xborder = widget->style->xthickness;
+gint yborder = widget->style->ythickness;
+gint bInteriorFocus, nFocusLineWidth;
+gtk_widget_style_get( widget,
+"interior-focus",   &bInteriorFocus,
+"focus-line-width", &nFocusLineWidth,
+(char *)NULL);
+if ( bInteriorFocus )
+{
+xborder += nFocusLineWidth;
+yborder += nFocusLineWidth;
+}
+
 gtk_paint_flat_box( widget->style, gdkDrawable, stateType, GTK_SHADOW_NONE,
 gdkRect, widget, "entry_bg",
-aEditBoxRect.Left(), aEditBoxRect.Top(),
-aEditBoxRect.GetWidth(), aEditBoxRect.GetHeight() );
+aEditBoxRect.Left() + xborder, aEditBoxRect.Top() + 
yborder,
+aEditBoxRect.GetWidth() - 2*xborder, 
aEditBoxRect.GetHeight() - 2*yborder );
 gtk_paint_shadow( widget->style, gdkDrawable, GTK_STATE_NORMAL, 
GTK_SHADOW_IN,
   gdkRect, widget, "entry",
   aEditBoxRect.Left(), aEditBoxRect.Top(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Review corrections in basctl/.../basobj3.cxx

2012-10-13 Thread Muthu Subramanian K (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/851


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I905e85ce9d754047ad287c9dd3caa92427b25b0d
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Muthu Subramanian K 
Gerrit-Reviewer: Ricardo Montania 

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

[Libreoffice-commits] .: basctl/source

2012-10-13 Thread Libreoffice Gerrit user

 basctl/source/basicide/basobj3.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f50f9c43414403aca721612fdba9a9aa2dbdbf9b
Author: Ricardo Montania 
Date:   Tue Oct 9 17:30:01 2012 -0300

Review corrections in basctl/.../basobj3.cxx

Change-Id: I905e85ce9d754047ad287c9dd3caa92427b25b0d

diff --git a/basctl/source/basicide/basobj3.cxx 
b/basctl/source/basicide/basobj3.cxx
index 6a72666..8ab1add 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -83,20 +83,20 @@ SbMethod* CreateMacro( SbModule* pModule, const String& 
rMacroName )
 if ( pModule->GetMethods()->Find( rMacroName, SbxCLASS_METHOD ) )
 return 0;
 
-String aMacroName( rMacroName );
-if ( aMacroName.Len() == 0 )
+OUString aMacroName( rMacroName );
+if ( aMacroName.getLength() == 0 )
 {
 if ( !pModule->GetMethods()->Count() )
-aMacroName = String( "Main" );
+aMacroName = "Main" ;
 else
 {
 bool bValid = false;
-String aStdMacroText( "Macro" );
+OUString aStdMacroText( "Macro" );
 sal_uInt16 nMacro = 1;
 while ( !bValid )
 {
 aMacroName = aStdMacroText;
-aMacroName += String::CreateFromInt32( nMacro );
+aMacroName += OUString::valueOf( nMacro );
 // test whether existing...
 bValid = pModule->GetMethods()->Find( aMacroName, 
SbxCLASS_METHOD ) ? false : true;
 nMacro++;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-10-13 Thread Libreoffice Gerrit user

 oox/inc/oox/drawingml/textbodyproperties.hxx |2 +
 oox/inc/oox/drawingml/transform2dcontext.hxx |3 +-
 oox/source/drawingml/textbodyproperties.cxx  |   15 ++-
 oox/source/drawingml/transform2dcontext.cxx  |   35 ---
 oox/source/ppt/pptshapecontext.cxx   |4 +--
 oox/source/ppt/slidefragmenthandler.cxx  |4 ++-
 6 files changed, 55 insertions(+), 8 deletions(-)

New commits:
commit 67e59a990a84729a651be3efb32bba3b3ab2e298
Author: Muthu Subramanian 
Date:   Tue Jul 10 19:39:36 2012 +0530

Crash fix.

Though getTheme() is not supposed to be returning NULL.
It seems like doing that sometimes.

diff --git a/oox/source/ppt/slidefragmenthandler.cxx 
b/oox/source/ppt/slidefragmenthandler.cxx
index 49736dd..6e6ba26 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -174,7 +174,9 @@ SlideFragmentHandler::~SlideFragmentHandler() throw()
 
 case PPT_TOKEN( bgRef ):// a:CT_StyleMatrixReference
 {
-const FillProperties *pFillProperties = 
mpSlidePersistPtr->getTheme()->getFillStyle( rAttribs.getInteger( XML_idx, -1 ) 
);
+const FillProperties *pFillProperties = NULL;
+if( mpSlidePersistPtr->getTheme() )
+pFillProperties = mpSlidePersistPtr->getTheme()->getFillStyle( 
rAttribs.getInteger( XML_idx, -1 ) );
 FillPropertiesPtr pFillPropertiesPtr( pFillProperties ? new 
FillProperties( *pFillProperties ) : new FillProperties() );
 ContextHandlerRef ret = new ColorContext( *this, 
mpSlidePersistPtr->getBackgroundColor() );
 mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr );
commit c689856e3c608f436f399b134802a2c7a91ae342
Author: Muthu Subramanian 
Date:   Thu Sep 6 12:34:14 2012 +0530

n#771549: Import text offsets in shapes.

* Also fixed a bug where the (offset) increment was conditional.
* Reusing Transform2D for  as well.
* This is a kind of hack where the margins are adjusted
  for the give offset values.

diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx 
b/oox/inc/oox/drawingml/textbodyproperties.hxx
index addad6e..ff691da 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/oox/inc/oox/drawingml/textbodyproperties.hxx
@@ -45,6 +45,8 @@ struct TextBodyProperties
 OptValue< sal_Int32 >   moRotation;
 OptValue< sal_Int32 >   moVert;
 boost::optional< sal_Int32 >moInsets[4];
+boost::optional< sal_Int32 >moTextOffX;
+boost::optional< sal_Int32 >moTextOffY;
 ::com::sun::star::drawing::TextVerticalAdjust   meVA;
 
 explicitTextBodyProperties();
diff --git a/oox/inc/oox/drawingml/transform2dcontext.hxx 
b/oox/inc/oox/drawingml/transform2dcontext.hxx
index a5481fc..aca925d 100644
--- a/oox/inc/oox/drawingml/transform2dcontext.hxx
+++ b/oox/inc/oox/drawingml/transform2dcontext.hxx
@@ -43,11 +43,12 @@ class Transform2DContext : public 
::oox::core::ContextHandler
 {
 public:
 Transform2DContext( ::oox::core::ContextHandler& rParent,
-const ::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape ) 
throw();
+const ::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape, 
bool btxXfrm = false ) throw();
 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);
 
 protected:
 Shape&  mrShape;
+boolmbtxXfrm;
 };
 
 // 
diff --git a/oox/source/drawingml/textbodyproperties.cxx 
b/oox/source/drawingml/textbodyproperties.cxx
index 8438ed5..77d7be9 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -84,8 +84,21 @@ void TextBodyProperties::pushRotationAdjustments( sal_Int32 
nRotation )
 
 for( sal_Int32 i = 0; i < n; i++ )
 {
+sal_Int32 nVal = 0;
+
+// Hack for n#760986
+// TODO: Preferred method would be to have a textbox on top
+// of the shape and the place it according to the (off,ext)
+if( nOff == 0 && moTextOffX ) nVal = *moTextOffX;
+if( nOff == 1 && moTextOffY ) nVal = *moTextOffY;
+if( nVal < 0 ) nVal = 0;
+
 if( moInsets[i] )
-maPropertyMap[ aProps[ ( nOff++ ) % n ] ] <<= static_cast< 
sal_Int32 >( *moInsets[i] );
+maPropertyMap[ aProps[ nOff ] ] <<= static_cast< sal_Int32 >( 
*moInsets[i] + nVal );
+else if(

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 4 commits - oox/source svx/source

2012-10-13 Thread Libreoffice Gerrit user

 oox/source/drawingml/textbodypropertiescontext.cxx |4 
 oox/source/drawingml/textparagraph.cxx |7 ++-
 svx/source/unodraw/unoshape.cxx|9 -
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 81c3727086699e842930beb1dd9d59891125e9b3
Author: Stephan Bergmann 
Date:   Fri Jun 15 16:23:50 2012 +0200

Avoid bogus "may be used uninitialized" warning

Change-Id: Ib763b8ab1e728d400859a7abb355bba182b28684

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 4c21d47..28b00a7 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -4306,7 +4306,7 @@ void SvxItemPropertySet_setPropertyValue( const 
SvxItemPropertySet& rPropSet, co
 bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || 
pMap->nWID == XATTR_FILLBMP_SIZEY );
 if( pMap->nWID == EE_PARA_LRSPACE ) // n#757419 Don't import negative 
values
 {
-sal_Int32 nVal;
+sal_Int32 nVal = sal_Int32();
 if( (aVal >>= nVal) && nVal < 0 )
 aVal <<= ( sal_Int32 ) 0;
 }
commit f2096b28ad43ad55970060751d5cbf5d4d3c7f38
Author: Muthu Subramanian 
Date:   Tue Aug 14 17:43:54 2012 +0530

n#759180: Override properties with endParaPr.

This is done only for empty textruns.

diff --git a/oox/source/drawingml/textparagraph.cxx 
b/oox/source/drawingml/textparagraph.cxx
index 9f0b29d..3ee16db 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -101,8 +101,13 @@ void TextParagraph::insertAt(
 {
 for( TextRunVector::const_iterator aIt = maRuns.begin(), aEnd = 
maRuns.end(); aIt != aEnd; ++aIt )
 {
+sal_Int32 nLen = (*aIt)->getText().getLength();
+// n#759180: Force use, maEndProperties for the last segment
+// This is currently applied to only empty runs
+if( !nLen && ( ( aIt + 1 ) == aEnd ) )
+(*aIt)->getTextCharacterProperties().assignUsed( 
maEndProperties );
 nCharHeight = std::max< sal_Int32 >( nCharHeight, 
(*aIt)->insertAt( rFilterBase, xText, xAt, aTextCharacterStyle ) );
-nParagraphSize += (*aIt)->getText().getLength();
+nParagraphSize += nLen;
 }
 }
 xAt->gotoEnd( sal_True );
commit 27109f48d82af6b1058220340dfd17e912bc3dcf
Author: Muthu Subramanian 
Date:   Mon Sep 10 18:26:13 2012 +0530

n#778859: Non autofit text are imported as autofit.

Push default values if  exists.

diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index 711da4c..4cd0cfe 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -123,6 +123,10 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler& rParent,
 }
 mrTextBodyProp.maPropertyMap[ PROP_TextVerticalAdjust ] <<= 
mrTextBodyProp.meVA;
 }
+
+// Push defaults
+mrTextBodyProp.maPropertyMap[ PROP_TextAutoGrowHeight ] <<= false;
+mrTextBodyProp.maPropertyMap[ PROP_TextFitToSize ] <<= 
drawing::TextFitToSizeType_NONE;
 }
 
 // 
commit 28a2ae34a4bc97a526cf75a2766089ff0f2c54c1
Author: Muthu Subramanian 
Date:   Fri Jun 15 17:20:20 2012 +0530

n757419: Hidden/Non-wrapping text.

Negative values for left-margin plays havoc with the
text in this case.

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 16af6ec..4c21d47 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -4299,11 +4299,18 @@ uno::Any SvxItemPropertySet_getPropertyValue( const 
SvxItemPropertySet& rPropSet
 
 void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, 
const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet )
 {
+uno::Any aVal(rVal);
 if(!pMap || !pMap->nWID)
 return;
 
 bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || 
pMap->nWID == XATTR_FILLBMP_SIZEY );
-rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
+if( pMap->nWID == EE_PARA_LRSPACE ) // n#757419 Don't import negative 
values
+{
+sal_Int32 nVal;
+if( (aVal >>= nVal) && nVal < 0 )
+aVal <<= ( sal_Int32 ) 0;
+}
+rPropSet.setPropertyValue( pMap, aVal, rSet, bDontConvertNegativeValues );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-10-13 Thread Libreoffice Gerrit user

 oox/inc/oox/drawingml/textbodyproperties.hxx   |3 +
 oox/source/drawingml/shape.cxx |3 +
 oox/source/drawingml/textbodyproperties.cxx|   22 +
 oox/source/drawingml/textbodypropertiescontext.cxx |   25 +++
 oox/source/ppt/pptshape.cxx|4 ++
 oox/source/ppt/pptshapecontext.cxx |   17 +++---
 oox/source/ppt/slidefragmenthandler.cxx|   34 +
 7 files changed, 84 insertions(+), 24 deletions(-)

New commits:
commit b1653c6b3968921ffee34bab2106c6d4e800179c
Author: Muthu Subramanian 
Date:   Thu Aug 16 16:57:47 2012 +0530

n#773048: PPTX shape margins need to be rotated as well.

diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx 
b/oox/inc/oox/drawingml/textbodyproperties.hxx
index adb9c1f..addad6e 100644
--- a/oox/inc/oox/drawingml/textbodyproperties.hxx
+++ b/oox/inc/oox/drawingml/textbodyproperties.hxx
@@ -32,6 +32,7 @@
 #include 
 #include "oox/helper/helper.hxx"
 #include "oox/helper/propertymap.hxx"
+#include 
 
 namespace oox {
 namespace drawingml {
@@ -43,10 +44,12 @@ struct TextBodyProperties
 PropertyMap maPropertyMap;
 OptValue< sal_Int32 >   moRotation;
 OptValue< sal_Int32 >   moVert;
+boost::optional< sal_Int32 >moInsets[4];
 ::com::sun::star::drawing::TextVerticalAdjust   meVA;
 
 explicitTextBodyProperties();
 
+voidpushRotationAdjustments( sal_Int32 nRotation );
 voidpushVertSimulation();
 };
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 66a1ee1..242dd43 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -525,7 +525,10 @@ Reference< XShape > Shape::createAndInsert(
 
 // add properties from textbody to shape properties
 if( mpTextBody.get() )
+{
+mpTextBody->getTextProperties().pushRotationAdjustments( 
mnRotation );
 aShapeProps.assignUsed( 
mpTextBody->getTextProperties().maPropertyMap );
+}
 
 // applying properties
 aShapeProps.assignUsed( getShapeProperties() );
diff --git a/oox/source/drawingml/textbodyproperties.cxx 
b/oox/source/drawingml/textbodyproperties.cxx
index d007647..8438ed5 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -67,6 +67,28 @@ void TextBodyProperties::pushVertSimulation()
 }
 }
 
+/* Push adjusted values, taking into consideration Shape Rotation */
+void TextBodyProperties::pushRotationAdjustments( sal_Int32 nRotation )
+{
+sal_Int32 nOff  = 0;
+sal_Int32 aProps[]  = { PROP_TextLeftDistance, PROP_TextUpperDistance, 
PROP_TextRightDistance, PROP_TextLowerDistance };
+sal_Int32 n = ( sal_Int32 )( sizeof( aProps ) / sizeof( sal_Int32 
) );
+
+switch( nRotation ) // TODO: What happens for part rotations ?
+{
+case (90*1*6): nOff = 1; break;
+case (90*2*6): nOff = 2; break;
+case (90*3*6): nOff = 3; break;
+default: break;
+}
+
+for( sal_Int32 i = 0; i < n; i++ )
+{
+if( moInsets[i] )
+maPropertyMap[ aProps[ ( nOff++ ) % n ] ] <<= static_cast< 
sal_Int32 >( *moInsets[i] );
+}
+}
+
 // 
 
 } // namespace drawingml
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index a654fb6..711da4c 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -63,25 +63,12 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler& rParent,
 
 // ST_Coordinate
 OUString sValue;
-sValue = xAttributes->getOptionalValue( XML_lIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nLeftInset = ( !sValue.isEmpty() ? GetCoordinate(  sValue ) : 
91440 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextLeftDistance ]  <<= static_cast< 
sal_Int32 >( nLeftInset );
-}
-sValue = xAttributes->getOptionalValue( XML_tIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nTopInset  = ( !sValue.isEmpty() ? GetCoordinate(  sValue ) : 
91440 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextUpperDistance ] <<= static_cast< 
sal_Int32 >( nTopInset );
-}
-sValue = xAttributes->getOptionalValue( XML_rIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nRightInset  = ( !sValue.isEmpty() ? GetCoordinate(  sValue ) : 
91440 / 360 );
-mrTextBodyProp.maPropertyMap[ PROP_TextRightDistance ] <<= static_cast< 
sal_Int32 >( nRightInset );
-}
-sValue = xAttributes->getOptionalValue( XML_bIns );
-if( !sValue.isEmpty() ) {
-sal_Int32 nBottonInset = ( !sValue.isEmpty() ? GetCoordinate(  sValue ) : 
45720 / 360 )

[Libreoffice-commits] .: RepositoryExternal.mk

2012-10-13 Thread Libreoffice Gerrit user

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3818933e351cd1d5f950c8891ec3974c066ce99e
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Sat Oct 13 09:32:27 2012 +0200

fix build

I'm not sure why this makes a difference, the real problem is probably 
elsewhere.

Change-Id: Ie52b0b9b5b1279badaa8815aeef054c8bbb125b4

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5a3cf89..8c8e449 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1253,6 +1253,7 @@ ifeq ($(SYSTEM_GLIB),YES)
 
 define gb_LinkTarget__use_gthread
 $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
+
 endef
 
 else # !SYSTEM_GLIB
___
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-10-13 Thread bugzilla-daemon

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

Bug 37361 depends on bug 54214, which changed state.

Bug 54214 Summary: FILESAVE: # in hyperlink corrupts .docx (OOXML) document
https://bugs.freedesktop.org/show_bug.cgi?id=54214

   What|Removed |Added

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

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

[Libreoffice-commits] .: linguistic/source

2012-10-13 Thread Libreoffice Gerrit user

 linguistic/source/lngsvcmgr.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b404024600df82f996882a1b770d595cf35a2ca9
Author: Tor Lillqvist 
Date:   Fri Oct 12 21:28:57 2012 +0300

For me it throws uno::DeploymentException, not 
deployment::DeploymentException

Change-Id: I1104a2b4e551f80c748054f32a37540190076805

diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index ffee4bf..0e9a6e8 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -487,6 +487,8 @@ LngSvcMgr::LngSvcMgr()
 uno::Reference xExtensionManager;
 try {
 xExtensionManager = deployment::ExtensionManager::get(xContext);
+} catch ( const uno::DeploymentException & ) {
+SAL_WARN( "linguistic", "no extension manager - should fire on mobile 
only" );
 } catch ( const deployment::DeploymentException & ) {
 SAL_WARN( "linguistic", "no extension manager - should fire on mobile 
only" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW 3-6 3-6-3] fix for fdo#55885, don't insert notes to deleted cells

2012-10-13 Thread Markus Mohrhard

Hey,

>> [1] prevents to insert notes to deleted cells. These notes have than
>> negative col or row numbers so they produce a crash in the export
>> code.
>>
>> Regards,
>> Markus
>>
>> [1]
>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=2ec03fc221e80479557f05f53972ca864f1ff4bb
>
>
> It appears there is a bug in this code.
>
> Try this scenario.
>
> 1) Insert a node at row 12.
>
> 2) Select rows 10-14, and Delete Row.
>
> 3) Scroll out and back in to repaint.
>
> 4) Now you see the note at row 7, but the note should have been deleted.
>

Yeap, my mistake. It misses the -nStartRow or -nStartCol that makes
the nRow/nCol relative to the deleted column/row.

I attached a patch that squashs both necessary commits into one.

Regards,
Markus


0001-don-t-insert-notes-from-deleted-cells-fdo-55885.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

[PUSHED] Change in core[libreoffice-3-6]: fdo#55931 Fix renderding of subscript/superscript with Autof...

[PATCH] gbuildification of expat

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

[Libreoffice-commits] .: oox/source

[Libreoffice-commits] .: 2 commits - cppuhelper/Module_cppuhelper.mk sw/source

[Libreoffice-commits] .: codemaker/source sal/inc svx/source tools/source xmloff/source xmlsecurity/source

[ANN] LibreOffice 3.6.3 RC1 available

[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy

Re: [REVIEW 3-6 3-6-3][PUSHED 3-6] fix for fdo#55885, don't insert notes to deleted cells

[PATCH] rtl::OUString to OUString and some questions

Re: [REVIEW 3-6 3-6-3][PUSHED 3-6] fix for fdo#55885, don't insert notes to deleted cells

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

[Libreoffice-commits] .: compilerplugins/clang

[Libreoffice-commits] .: setup_native/source writerfilter/source

[Libreoffice-commits] .: 2 commits - compilerplugins/clang compilerplugins/Makefile-clang.mk sal/inc sal/osl sal/qa sal/rtl solenv/gbuild

[Bug 44446] LibreOffice 3.6 most annoying bugs

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - oox/source vcl/source

[Bug 44446] LibreOffice 3.6 most annoying bugs

[Libreoffice-commits] .: tubes/AllLangResTarget_tubes.mk tubes/Library_tubes.mk tubes/Module_tubes.mk tubes/source tubes/uiconfig tubes/UI_tubes.mk

[Libreoffice-commits] .: 2 commits - connectivity/source cui/source oox/source sd/source sot/source ucb/source

[PATCH] Mark rtl_*memory as deprecated

[Libreoffice-commits] .: framework/source

[Libreoffice-commits] .: writerfilter/source

[Libreoffice-commits] .: vcl/unx

[Libreoffice-commits] .: 2 commits - basctl/source vcl/unx

[PUSHED] Review corrections in basctl/.../basobj3.cxx

[Libreoffice-commits] .: basctl/source

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

[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 4 commits - oox/source svx/source

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

[Libreoffice-commits] .: RepositoryExternal.mk

[Bug 37361] LibreOffice 3.5 most annoying bugs

[Libreoffice-commits] .: linguistic/source

Re: [REVIEW 3-6 3-6-3] fix for fdo#55885, don't insert notes to deleted cells

35 matches

Site Navigation

Mail list logo

Footer information