[Libreoffice-commits] core.git: sd/source

[Tor Lillqvist]

 sd/source/filter/eppt/pptx-text.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0451325ae7456da5812564428d73b0226606450f
Author: Tor Lillqvist 
Date:   Wed Mar 13 08:05:39 2013 +0200

WaE: enumeration value not handled in switch

So just switch on the integer value instead. Whether the missing 
enumerations
can occur here and whether not handling them causes a bug or not, I don't
know.

Change-Id: Ib96b855739e8a1e92f72a88c3f6f106d86989d23

diff --git a/sd/source/filter/eppt/pptx-text.cxx 
b/sd/source/filter/eppt/pptx-text.cxx
index 4e6ca95..534a31b 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -878,7 +878,7 @@ void ParagraphObj::ImplGetNumberingLevel( 
PPTExBulletProvider& rBuProv, sal_Int1
 PortionObj* pPortion = front();
 CalculateGraphicBulletSize( ( pPortion ) ? 
pPortion->mnCharHeight : 24 );
 
-switch( (SvxExtNumType)nNumberingType )
+switch( nNumberingType )
 {
 case SVX_NUM_NUMBER_NONE : nParaFlags |= 0xf; break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/app/dbggui.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b125dd74a238242d2c2414f5d3d6c32bedf3cff9
Author: Tor Lillqvist 
Date:   Wed Mar 13 07:32:31 2013 +0200

Avoid misleading leading zeros in hex digit

The hex literal 0x0001 is a 32-bit unsigned int on all our platforms. 
Here
it is being cast to a pointer,resulting in 32 or 64 bits. Using exactly 
eight
hex digits with leading zeroes gives the impression that the leading zeroes
and the total number of hex digits would have some significance.

Change-Id: I75904dc4261c195dfaaf45aa3de729994da6d8dc

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 1fe7385..7a2b99b 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -626,7 +626,7 @@ void DbgWindow::InsertLine( const OUString& rLine )
 
 sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr.copy( 0, nPos ) 
);
 if ( bFirstEntry )
-maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 
0x0001 ) );
+maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 1 
) );
 bFirstEntry = sal_False;
 
 aStr = aStr.replaceAt( 0, nPos+1, "" );
@@ -636,7 +636,7 @@ void DbgWindow::InsertLine( const OUString& rLine )
 maLstBox.RemoveEntry( 0 );
 sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr );
 if ( bFirstEntry )
-maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 
0x0001 ) );
+maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 1 ) );
 maLstBox.SetTopEntry( DBGWIN_MAXLINES-1 );
 maLstBox.Update();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Thomas Arnhold]

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

New commits:
commit 94a5f6b6703d103d76a6954083ba25202506a5bd
Author: Thomas Arnhold 
Date:   Wed Mar 13 04:28:39 2013 +0100

fix mac build

Change-Id: Ib7aa2ffd351e85e76c84cd03c2a3b31c6b2c87ac

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 0b544e2..1fe7385 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -629,7 +629,7 @@ void DbgWindow::InsertLine( const OUString& rLine )
 maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 
0x0001 ) );
 bFirstEntry = sal_False;
 
-aStr.replaceAt( 0, nPos+1, "" );
+aStr = aStr.replaceAt( 0, nPos+1, "" );
 nPos = aStr.indexOf( _LF );
 }
 if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx   |8 ++-
 sc/source/core/data/column.cxx  |   84 +---
 sc/source/core/data/column2.cxx |   10 
 sc/source/core/data/column3.cxx |   28 ++---
 4 files changed, 82 insertions(+), 48 deletions(-)

New commits:
commit a120309902981d9afa5f2068ed0979d1fccb0949
Author: Kohei Yoshida 
Date:   Tue Mar 12 21:12:22 2013 -0400

Turns out I can't really use ScColumnImpl.

Because the column source files are split; not all source files had
access to the impl class definition.

Change-Id: Ic8cff0eeec3504660304be9f020c40bcd98cee85

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 39f9753..0fbd743 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -28,6 +28,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 namespace editeng { class SvxBorderLine; }
 
 class Fraction;
@@ -79,8 +82,9 @@ struct ColEntry
 
 class ScColumn
 {
-private:
-ScColumnImpl* mpImpl;
+typedef mdds::multi_type_vector 
TextWidthType;
+
+TextWidthType maTextWidths;
 
 SCCOL   nCol;
 SCTAB   nTab;
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 1226f9b..e81456d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -36,8 +36,6 @@
 
 #include 
 #include 
-#include 
-#include 
 
 using ::editeng::SvxBorderLine;
 using namespace formula;
@@ -55,22 +53,13 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 
 }
 
-struct ScColumnImpl
-{
-typedef mdds::multi_type_vector 
TextWidthType;
-
-TextWidthType maTextWidths;
-
-ScColumnImpl() : maTextWidths(MAXROWCOUNT) {}
-};
-
 ScNeededSizeOptions::ScNeededSizeOptions() :
 pPattern(NULL), bFormula(false), bSkipMerged(true), bGetFont(true), 
bTotalSize(false)
 {
 }
 
 ScColumn::ScColumn() :
-mpImpl(new ScColumnImpl),
+maTextWidths(MAXROWCOUNT),
 nCol( 0 ),
 pAttrArray( NULL ),
 pDocument( NULL )
@@ -862,15 +851,23 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 be performed (but keep broadcasters and notes at old 
position). */
 maItems[nIndex1].pCell = pCell2;
 maItems[nIndex2].pCell = pCell1;
+CellStorageModified();
 
 SvtBroadcaster* pBC2 = pCell2->ReleaseBroadcaster();
 pCell1->TakeBroadcaster( pBC2 );
 pCell2->TakeBroadcaster( pBC1 );
 
-CellStorageModified();
+// Swap text width values.
+unsigned short nVal1 = maTextWidths.get(nRow1);
+unsigned short nVal2 = maTextWidths.get(nRow2);
+maTextWidths.set(nRow1, nVal2);
+maTextWidths.set(nRow2, nVal1);
 }
 else
 {
+// Only cell 1 exists; cell 2 is empty.  Move cell 1 from to row
+// 2.
+
 ScNoteCell* pDummyCell = pBC1 ? new ScNoteCell( pBC1 ) : 0;
 if ( pDummyCell )
 {
@@ -885,7 +882,12 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 CellStorageModified();
 }
 
-// insert ColEntry at new position
+// Empty text width at the cell 1 position.  For now, we don't
+// transfer the old value to the cell 2 position since Insert() is
+// quite complicated.
+maTextWidths.set_empty(nRow1, nRow1);
+
+// insert ColEntry at new position.
 Insert( nRow2, pCell1 );
 }
 
@@ -988,11 +990,10 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
 
 if ( pCell2 )
 {
-// swap
+// Both cell 1 and cell 2 exist. Swap them.
+
 maItems[nIndex1].pCell = pCell2;
-CellStorageModified();
 rCol.maItems[nIndex2].pCell = pCell1;
-rCol.CellStorageModified();
 
 // update references
 SCsCOL dx = rCol.nCol - nCol;
@@ -1010,12 +1011,20 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
 pFmlaCell2->aPos.SetCol( nCol );
 pFmlaCell2->UpdateReference(URM_MOVE, aRange, -dx, 0, 0);
 }
+
+CellStorageModified();
+rCol.CellStorageModified();
+
+// Swap the text widths.
+unsigned short nVal1 = maTextWidths.get(nRow);
+unsigned short nVal2 = rCol.maTextWidths.get(nRow);
+maTextWidths.set(nRow, nVal2);
+rCol.maTextWidths.set(nRow, nVal1);
 }
 else
 {
-// remove
+// Cell 1 exists but cell 2 isn't.
 maItems.erase(maItems.begin() + nIndex1);
-CellStorageModified();
 
 // update references
 SCsCOL dx = rCol.nCol - nCol;
@@ -1026,6 +1035,12 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
 pFmlaCell1->aPos.SetCol( rCol.nCol );
 pFmlaCell1->UpdateReference(URM_MOVE, aRange, dx, 0, 0);
 }
+
+CellStorageModified();
+maTextWidths.set_empty(nRow, nRow);
+// We don't transfer the text width to the destination 

Re: Code modifications Bug 60724

[Joel Madero]

Hey Steven,

First, thank you so much for joining our great community, any help is
always appreciated.

IMO your best bet is to actually commit the changes via our repository with
these instructions:
https://wiki.documentfoundation.org/Development#Sending_patches_directly_to_gerrit.libreoffice.org

You'll get feedback if chances are needed at which point you can edit the
alterations and then resubmit.

As for the license agreement, having a separate email is probably
preferred:

Subject: License

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

You'll be added to our list of developers who have agreed to provide their
license to these terms.


Best of luck and never hesitate to ask
Joel

P.S. Don't forget you can find us also on freenode channel -
#libreoffice-dev
-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Oliver-Rainer Wittmann]

 sw/source/core/layout/fly.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c083e0f22e2d5bcd7d3e686b18be5f415ffebdc6
Author: Oliver-Rainer Wittmann 
Date:   Tue Jul 10 10:34:43 2012 +

#119952# - method  - do not provide width of text 
frame inclusive margins, if text frame is in its formatting.

Found by: Yan Ji
Patch by: qiuhuaidong at gmail dot com
Review by: Oliver-Rainer Wittmann

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 77c4692..42890b9 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -2559,7 +2559,8 @@ static SwTwips lcl_CalcAutoWidth( const SwLayoutFrm& rFrm 
)
 nMin = ((SwTxtFrm*)pFrm)->CalcFitToContent();
 const SvxLRSpaceItem &rSpace =
 ((SwTxtFrm*)pFrm)->GetTxtNode()->GetSwAttrSet().GetLRSpace();
-nMin += rSpace.GetRight() + rSpace.GetTxtLeft() + 
rSpace.GetTxtFirstLineOfst();
+if (!((SwTxtFrm*)pFrm)->IsLocked())
+nMin += rSpace.GetRight() + rSpace.GetTxtLeft() + 
rSpace.GetTxtFirstLineOfst();
 }
 else if ( pFrm->IsTabFrm() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6c/ecd60ceff2c5064bcca677514d06d6e410654d

[Xisco Fauli]

 6c/ecd60ceff2c5064bcca677514d06d6e410654d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8be31ac66aa00de13a8e6e8109682d938ebb0912
Author: Xisco Fauli 
Date:   Wed Mar 13 01:23:36 2013 +0100

Notes added by 'git notes add'

diff --git a/6c/ecd60ceff2c5064bcca677514d06d6e410654d 
b/6c/ecd60ceff2c5064bcca677514d06d6e410654d
new file mode 100644
index 000..740fc90
--- /dev/null
+++ b/6c/ecd60ceff2c5064bcca677514d06d6e410654d
@@ -0,0 +1 @@
+merged as: 6ab3d3d906fe6d5a871d64ace6db32e13e664661
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#34800 Comments added to footer are placed at the right t...

[Fridrich Strba (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/2572

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Joren De Cuyper 
Gerrit-Reviewer: Michael Stahl 

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

[PATCH libreoffice-4-0] Resolves: #i120773 Numbering lost when saving or opening a p...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2692

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/2692/1

Resolves: #i120773 Numbering lost when saving or opening a ppt file

* subversion/main/editeng/inc/editeng/svxenum.hxx
Define some numbering types supported by MS ppt
* subversion/main/filter/source/msfilter/svdfppt.cxx
Mapping added MS numbering types to Symphony numbering types
* subversion/main/sd/source/filter/eppt/epptso.cxx
Export added MS numbering types

Patch by: Yin Bing 
Suggested by: Wang Zhe 
Found by: Yin Bing 
Review by: Wang Zhe (cherry picked from commit 
39e9cae1ac9b7944c9df0642a193b042a1b68266)

Signed-off-by: Fridrich Štrba 

Conflicts:
editeng/inc/editeng/svxenum.hxx
sd/source/filter/eppt/epptso.cxx

Change-Id: Ic8a9406fd1b58e5cec5c5adc28bf0190ccb87315
(cherry picked from commit ef23b47e887908161d980f3e6f6d321f18acca77)
---
M editeng/inc/editeng/svxenum.hxx
M filter/source/msfilter/svdfppt.cxx
M sd/source/filter/eppt/epptso.cxx
M sd/source/filter/eppt/pptx-text.cxx
4 files changed, 121 insertions(+), 1 deletion(-)



diff --git a/editeng/inc/editeng/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index ff751b0..2759beb 100644
--- a/editeng/inc/editeng/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
@@ -210,7 +210,21 @@
 SVX_NUM_PAGEDESC,   // Numbering from the page template
 SVX_NUM_BITMAP,
 SVX_NUM_CHARS_UPPER_LETTER_N, // Counts from  a-z, aa-zz, aaa-zzz
-SVX_NUM_CHARS_LOWER_LETTER_N
+SVX_NUM_CHARS_LOWER_LETTER_N,
+SVX_NUM_TRANSLITERATION,
+SVX_NUM_NATIVE_NUMBERING,
+SVX_NUM_FULL_WIDTH_ARABIC,
+SVX_NUM_CIRCLE_NUMBER,
+SVX_NUM_NUMBER_LOWER_ZH,
+SVX_NUM_NUMBER_UPPER_ZH,
+SVX_NUM_NUMBER_UPPER_ZH_TW,
+SVX_NUM_TIAN_GAN_ZH,
+SVX_NUM_DI_ZI_ZH,
+SVX_NUM_NUMBER_TRADITIONAL_JA,
+SVX_NUM_AIU_FULLWIDTH_JA,
+SVX_NUM_AIU_HALFWIDTH_JA,
+SVX_NUM_IROHA_FULLWIDTH_JA,
+SVX_NUM_IROHA_HALFWIDTH_JA
 };
 
 enum SvxCompareMode
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 208d8b5..b44fe62 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3529,6 +3529,63 @@
 rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
")" ) ) );
 }
 break;
+case 16: // Simplified Chinese.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+}
+break;
+case 17: // Simplified Chinese with single-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
"." ) ) );
+}
+break;
+case 18: // Double byte circle numbers.
+case 19: // Wingdings white circle numbers.
+case 20: // Wingdings black circle numbers.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_CIRCLE_NUMBER );
+}
+break;
+case 21: // Traditional Chinese.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+}
+break;
+case 22: // Traditional Chinese with single-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
"." ) ) );
+}
+break;
+case 26: // Japanese/Korean.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+}
+break;
+case 27: // Japanese/Korean with single-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
"." ) ) );
+}
+break;
+case 28: // Double-byte Arabic numbers.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+}
+break;
+case 29: // Double-byte Arabic numbers with double-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+rNumberFormat.SetSuffix( OUString( sal_Unicode(0xff0e) ) );
+}
+break;
+case 38: // Japanese with double-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH ); // 
No such type. Instead with Lower Chinese Number
+rNumberFormat.SetSuffix( OUString( sal_Unicode(0xff0e) ) );
+}
+break;
 }
 rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
 }
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.

[Libreoffice-commits] core.git: sw/source

[Joren De Cuyper]

 sw/source/ui/docvw/PostItMgr.cxx |   26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 868f3485126827f6baf7179d1c2c3c20812cac9b
Author: Joren De Cuyper 
Date:   Wed Mar 6 18:10:26 2013 +0100

fdo#34800 Comments added to footer are placed at the right top of the page.

The problem is that the nodes in the Footnote and Footer are stored before
nodes of the document body in the internal structure.

Therefore I wrote this patch to check if the compared
comments are in the Footnote or Footer.
We don't need to check our comment is placed in the header
because it is already the most upper node of the whole document.

Test document: https://bugs.freedesktop.org/attachment.cgi?id=76038

Special thanks to Cédric Bosdonnat and Miklos Vajna

Change-Id: Ibcd0373110fde848dccf93ffe9100459c7cc64a5
Reviewed-on: https://gerrit.libreoffice.org/2572
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index cd94ba0..1a7c063 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -90,7 +90,31 @@ using namespace sw::sidebarwindows;
 bool comp_pos(const SwSidebarItem* a, const SwSidebarItem* b)
 {
 // sort by anchor position
-return a->GetAnchorPosition() < b->GetAnchorPosition();
+SwPosition aPosAnchorA = a->GetAnchorPosition();
+SwPosition aPosAnchorB = b->GetAnchorPosition();
+
+bool aAnchorAInFooter = false;
+bool aAnchorBInFooter = false;
+
+// is the anchor placed in Footnote or the Footer?
+if( aPosAnchorA.nNode.GetNode().FindFootnoteStartNode() || 
aPosAnchorA.nNode.GetNode().FindFooterStartNode() )
+aAnchorAInFooter = true;
+if( aPosAnchorB.nNode.GetNode().FindFootnoteStartNode() || 
aPosAnchorB.nNode.GetNode().FindFooterStartNode() )
+aAnchorBInFooter = true;
+
+// fdo#34800
+// if AnchorA is in footnote, and AnchorB isn't
+// we do not want to change over the position
+if( aAnchorAInFooter && !aAnchorBInFooter )
+return 0;
+// if aAnchorA is not placed in a footnote, and aAnchorB is
+// force a change over
+else if( !aAnchorAInFooter && aAnchorBInFooter )
+return 1;
+// if none of both, or both are in the footer
+// arrange them depending on the position
+else
+return aPosAnchorA < aPosAnchorB;
 }
 
 SwPostItMgr::SwPostItMgr(SwView* pView)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Code modifications Bug 60724

[Steven Meyer]

Hello,

My name is Steven and I'd like to start contributing to LibreOffice. Below
are some modifications (spelling corrections) that I would like to commit
to the master branch.  All modifications are contributed under LGPLv3+ /
MPL.


diff --git a/editeng/inc/editeng/splwrap.hxx
b/editeng/inc/editeng/splwrap.hxx
index c3a559c..d4c9b8d 100644
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -128,7 +128,7 @@ protected:
 virtual sal_Bool HasOtherCnt(); // Are there any special
areas?
 virtual void SpellStart( SvxSpellArea eSpell ); // Preparing the
area
 virtual sal_Bool SpellContinue(); // Check Areas
-  // Result avaliable through
GetLast
+  // Result available through
GetLast
 virtual void ReplaceAll( const String &rNewText, sal_Int16 nLanguage
); //Replace word from the replace list
 virtual void StartThesaurus( const String &rWord, sal_uInt16 nLang );
 virtual ::com::sun::star::uno::Reference<

diff --git a/framework/source/services/frame.cxx
b/framework/source/services/frame.cxx
index 4cf109d..8750e40 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -386,7 +386,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL
Frame::getActiveFrame() throw
 ReadGuard aReadLock( m_aLock );

 // Return current active frame.
-// This information is avaliable on the container.
+// This information is available on the container.
 return m_aChildFrameContainer.getActive();
 }

diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index 252021c..0cf5ead 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -74,7 +74,7 @@ public final class UrlToFileMapper {
StringHelper.replace(url.getPath(), '+',
"%2B")))
 : null;
 } else {
-// If java.net.URI is avaliable, do
+// If java.net.URI is available, do
 //   URI uri = new URI(encodedUrl);
 //   try {
 //   return new File(uri);

diff --git a/libxmlsec/src/tokens.c b/libxmlsec/src/tokens.c
index 8f2a4f8..25c1fb0 100644
--- a/libxmlsec/src/tokens.c
+++ b/libxmlsec/src/tokens.c
@@ -20,7 +20,7 @@
  * every eligibl slot in the list.
  *
  * When try to find a slot for a particular mechanism, the slot bound with
- * avaliable mechanism will be looked up firstly.
+ * available mechanism will be looked up firstly.
  */
 #include "globals.h"
 #include 

diff --git a/svl/source/numbers/zforlist.cxx
b/svl/source/numbers/zforlist.cxx
index e2fa5f6..c2d105d 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -629,7 +629,7 @@ sal_uInt32
SvNumberFormatter::GetIndexPuttingAndConverting( OUString & rString,
 sal_uInt32 nOrig = GetEntryKey( rString, eSysLnge );
 if (nOrig == NUMBERFORMAT_ENTRY_NOT_FOUND)
 {
-nKey = nOrig;   // none avaliable, maybe user-defined
+nKey = nOrig;   // none available, maybe user-defined
 }
 else
 {



I assume the next steps are to update Bug 60724 and commit the code, but if
that is incorrect can you please provide information with how to proceed.

Thank you

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

Re: Simplified Libreoffice API

[Rodolfo]

Just to be clear:

for me, I don't want a 'simplified'/user-friendly API for, e.g., MS
Excel compability. I just want it to know how to use it, without these
so-long-and-not-so-comprehensible-detailed-and-not-clear steps needed
by now. Even if it wouldn't be so powerful UNO API seems to be.

Creating a new API (letting both coexist) or extending the current one
- I really don't care =) I'd just love to make any extensions, and -
even better - clear and readable ones. When I look at some UNO code -
"oh that creepy beast" is my first and only thought.

Regards,
Rodolfo

2013/3/12 Noel Power :
> On 12/03/13 09:15, Michael Meeks wrote:
>>
>> Hi Rodolfo,
>
> [...]
>
>>
>> I think a better approach is to re-use the existing compatibility
>> API
>> that we implement and expose it into StarBasic in some pleasant way; it
>> should be possible to do things like:
>>
>> ActiveSheet.Range("A1") = 3
>>
>> for example - and get something useful; currently it's necessary
>> to
>> enable a compatibility mode with a setting in each file to get that
>> going, and then mixing in old-style UNO APIs for missing pieces is
>> harder, but ...
>>
>> Re-using, extending and improving our interoperable API there
>> makes
>> much more sense (to me) than creating yet-another binding :-)
>>
>> How does that sound ?
>
> I'm not convinced that I really agree with that, I mean no problem with
> improving the interoperable API, any help offered with that always welcome,
> I mean reusing that api for libreoffice wholesale, I feel there are a number
> of problems
> a) More than setting a compatibility mode is required, some stuff will work
> with the compatability mode but alot of stuff wont, for technical reasons
> there are ( at least )  some temporary objects and associations created on
> import ( of a native Microsoft document ) that are needed for things to work
> correctly.
> b) More than the above the main problem here is that while some objects and
> api do map well to libreoffice some don't, considering the main focus of the
> interoperability API is to behave like Excel that's not a surprise but
> trying to use that api for Libreoffice would cause problems, Libreoffice
> isn't Excel and in lots of places the model(s) and behaviours just dont
> match. We would end up trying to make the compatability API have sortof a
> 'Libreoffice' mode I feel ( which is as evil as creating another binding )
>
> However I don't see such a 'Simplified' API as yet another binding but just
> an extension of the existing api. An easier to use more user-centric api
> could ( and would ) also be reused by the interoperatbility API ( and or any
> other scripting language/clients )
>
>
>> Failing that - IMHO we need to move away from a 'pure generic
>> interface' approach with UNO, and move towards more of using interfaces
>> to expose an object hierarchy
>
> I think at least the ground blocks for this have been laid with Noel
> Grandins work to convert services to the new service specifications, that
> should at least for example in the future allow basic to define some
> stronger types ( than Object ), that would in turn allow the IDE to do some
> sort of primitive code-completion ( I intend to create a gsoc task for this
> ) - but... yes if the existing api/model sucks ( and it does ) then this
> wont help with that :-( But... maybe it will encourage people to create some
> less fine grained api ( built on top of the existing interface focused crud
> ) - that is my hope at least
>
>>   - and annotating those interfaces with
>> more information: defaults for parameters, default-methods, etc. to make
>> the scripting bindings truly useful. That would make UNO
>> object-interfaces more usable from other languages like C++ too since
>> currently for optional / defaulting arguments we have to use the 'Any'
>> type
>
> of course such enhancements imho are welcome regardless
>
> HTH ( but I fear it didn't )
>
> Noel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

[Fridrich Strba (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/2651

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie30fbc9c720d8b93d6093e2c95f61dceea8aae2f
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Fridrich Strba 

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

[Libreoffice-commits] core.git: oox/source sw/source

[Radu Ioan]

 oox/source/ppt/animationspersist.cxx |   12 ++---
 oox/source/ppt/commonbehaviorcontext.cxx |7 ---
 oox/source/ppt/pptshape.cxx  |   25 +--
 sw/source/filter/ww8/ww8toolbar.cxx  |   66 +++
 4 files changed, 53 insertions(+), 57 deletions(-)

New commits:
commit a3d299e15526fdcbcaae269e33a83a9c0b187a5a
Author: Radu Ioan 
Date:   Sun Mar 10 23:05:25 2013 +0200

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

- replaced OSL_TRACE with SAL_INFO
- replaced OSL_ENSURE with SAL_WARN_IF

Change-Id: Ie30fbc9c720d8b93d6093e2c95f61dceea8aae2f
Reviewed-on: https://gerrit.libreoffice.org/2651
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/oox/source/ppt/animationspersist.cxx 
b/oox/source/ppt/animationspersist.cxx
index 74a9208..d905c0e 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -60,12 +60,12 @@ namespace oox { namespace ppt {
 {
 case XML_charRg:
 // TODO calculate the corresponding paragraph for the text 
range
-OSL_TRACE( "OOX: TODO calculate the corresponding 
paragraph for the text range..." );
+SAL_INFO("oox.ppt", "OOX: TODO calculate the corresponding 
paragraph for the text range..." );
 break;
 case XML_pRg:
 aParaTarget.Paragraph = static_cast< sal_Int16 >( 
maRange.start );
 // TODO what to do with more than one.
-OSL_TRACE( "OOX: TODO what to do with more than one" );
+SAL_INFO("oox.ppt", "OOX: TODO what to do with more than 
one" );
 break;
 }
 rTarget = makeAny( aParaTarget );
@@ -86,11 +86,11 @@ namespace oox { namespace ppt {
 {
 case XML_inkTgt:
 // TODO
-OSL_TRACE( "OOX: TODO inkTgt" );
+SAL_INFO("oox.ppt", "OOX: TODO inkTgt" );
 break;
 case XML_sldTgt:
 // TODO
-OSL_TRACE( "OOX: TODO sldTgt" );
+SAL_INFO("oox.ppt", "OOX: TODO sldTgt" );
 break;
 case XML_sndTgt:
 aTarget = makeAny(msValue);
@@ -99,11 +99,11 @@ namespace oox { namespace ppt {
 {
 Any rTarget;
 ::oox::drawingml::ShapePtr pShape = pSlide->getShape(msValue);
-OSL_ENSURE( pShape, "failed to locate Shape");
+SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape");
 if( pShape )
 {
 Reference< XShape > xShape( pShape->getXShape() );
-OSL_ENSURE( xShape.is(), "fail to get XShape from shape" );
+SAL_WARN_IF( !xShape.is(), "oox.ppt", "fail to get XShape from 
shape" );
 if( xShape.is() )
 {
 rTarget <<= xShape;
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx 
b/oox/source/ppt/commonbehaviorcontext.cxx
index 14c6c6b..ffaeef5 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -19,7 +19,6 @@
 
 #include "comphelper/anytostring.hxx"
 #include "cppuhelper/exc_hlp.hxx"
-#include 
 #include 
 
 #include 
@@ -98,9 +97,7 @@ namespace oox { namespace ppt {
  
RTL_TEXTENCODING_ASCII_US );
 attr.type = attrConv->meAttribute;
 maAttributes.push_back( attr );
-OSL_TRACE( "OOX: attrName is %s -> %s",
-   OUSTRING_TO_CSTR( msCurrentAttribute ),
-   attrConv->mpAPIName );
+SAL_INFO("oox.ppt", "OOX: attrName is " << 
OUSTRING_TO_CSTR( msCurrentAttribute ) << " -> " << attrConv->mpAPIName );
 break;
 }
 attrConv++;
@@ -143,7 +140,7 @@ namespace oox { namespace ppt {
 }
 else
 {
-OSL_TRACE( "OOX: Attribute Name outside an Attribute List" );
+SAL_INFO("oox.ppt", "OOX: Attribute Name outside an Attribute 
List" );
 }
 return this;
 }
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 6da39d3..6bf6498 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -84,7 +84,7 @@ oox::drawingml::TextListStylePtr 
PPTShape::getSubTypeTextListStyle( const SlideP
 {
 oox::drawingml::TextListStylePtr pTextListStyle;
 
-OSL_TRACE( "subtype style: %s", lclDebugSubType( nSubType ) );
+SAL_INFO("oox.ppt", "subtype style: " << lclDebugSubType( nSubType ) );
 
 switch( nSubType )
 {
@@ -116,7 +116,7 @@ void PPTShape::addShape(
 const awt::Rectangle* pShapeRect,
 ::oox::drawingml::ShapeIdMap* pShapeMap )
 {
-OSL_TRACE("ad

[PUSHED] Polishing 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10

[Fridrich Strba (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/2676

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73334fca8429dc0ad4250ce638027fa52245dec4
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Stephan Bergmann 

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

[Libreoffice-commits] core.git: unotools/source vcl/aqua vcl/generic vcl/source

[Chr . Rossmanith]

 unotools/source/misc/fontdefs.cxx   |8 +++-
 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |2 +-
 vcl/generic/fontmanager/fontsubst.cxx   |6 +++---
 vcl/generic/glyphs/glyphcache.cxx   |6 +++---
 vcl/source/gdi/outdev3.cxx  |   24 
 5 files changed, 22 insertions(+), 24 deletions(-)

New commits:
commit f92a5927052f1e96ed864dd6bc6326531db4fd1f
Author: Chr. Rossmanith 
Date:   Tue Mar 12 10:05:38 2013 +0100

Polishing 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10

Change-Id: I73334fca8429dc0ad4250ce638027fa52245dec4
Reviewed-on: https://gerrit.libreoffice.org/2676
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index fb24325..ad8ab62 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -447,7 +447,7 @@ void GetEnglishSearchFontName( OUString& rName )
 OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex )
 {
 // check for valid start index
-int nStringLen = rTokenStr.getLength();
+sal_Int32 nStringLen = rTokenStr.getLength();
 if( rIndex >= nStringLen )
 {
 rIndex = -1;
@@ -504,13 +504,11 @@ static bool ImplIsFontToken( const OUString& rName, const 
String& rToken )
 
 static void ImplAppendFontToken( OUString& rName, const String& rNewToken )
 {
-if ( rName.getLength() )
+if ( !rName.isEmpty() )
 {
 rName += ";" ;
-rName += rNewToken ;
 }
-else
-rName = rNewToken;
+rName += rNewToken;
 }
 
 void AddTokenFontName( OUString& rName, const OUString& rNewToken )
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx 
b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 2ac160d..502c33b 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -305,7 +305,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, 
ImplDevFontAttributes& rDF
 aUtf16Name = OUString( &aNameBuffer[0], nNameLength, eEncoding );
 
 // ignore empty strings
-if( aUtf16Name.getLength() <= 0 )
+if( aUtf16Name.isEmpty() )
 continue;
 
 // handle the name depending on its namecode
diff --git a/vcl/generic/fontmanager/fontsubst.cxx 
b/vcl/generic/fontmanager/fontsubst.cxx
index fac314c..a339ca9 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -184,10 +184,10 @@ bool FcPreMatchSubstititution::FindFontSubstitute( 
FontSelectPattern &rFontSelDa
 return true;
 }
 
-rtl::OUString aDummy;
+OUString aDummy;
 const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy );
 
-if( !aOut.maSearchName.getLength() )
+if( aOut.maSearchName.isEmpty() )
 return false;
 
 const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut );
@@ -238,7 +238,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( 
FontSelectPattern& rFont
 // FC doing it would be preferable because it knows the invariables
 // e.g. FC knows the FC rule that all Arial gets replaced by LiberationSans
 // whereas we would have to check for every size or attribute
-if( !aOut.maSearchName.getLength() )
+if( aOut.maSearchName.isEmpty() )
 return false;
 
 const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut );
diff --git a/vcl/generic/glyphs/glyphcache.cxx 
b/vcl/generic/glyphs/glyphcache.cxx
index 1d1322c..bc9fb09 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -87,7 +87,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const 
FontSelectPattern& rFontSelData
 sal_IntPtr nFontId = reinterpret_cast( rFontSelData.mpFontData 
);
 #ifdef ENABLE_GRAPHITE
 if 
(rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
-!= STRING_NOTFOUND)
+!= -1)
 {
 rtl::OString aFeatName = rtl::OUStringToOString( 
rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 );
 nFontId ^= aFeatName.hashCode();
@@ -139,9 +139,9 @@ bool GlyphCache::IFSD_Equal::operator()( const 
FontSelectPattern& rA, const Font
 return false;
// check for features
if ((rA.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
-!= STRING_NOTFOUND ||
+!= -1 ||
 rB.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX)
-!= STRING_NOTFOUND) && rA.maTargetName != rB.maTargetName)
+!= -1) && rA.maTargetName != rB.maTargetName)
 return false;
 #endif
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index db1db91..aeb20c4 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -1396,7 +1396,7 @@ ImplDevFontListData* 
ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& r
 cChar = rMissingCodes.iterateCodePoints( &n

[PUSHED] solenv: remove versionlist.hrc

[David Ostrovsky (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/2677

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddbfcacd17c1022293357ff5240ab7a52b1a390e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan 
Gerrit-Reviewer: David Ostrovsky 
Gerrit-Reviewer: LibreOffice gerrit bot 
Gerrit-Reviewer: Matúš Kukan 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] core.git: config_host/config_version.h.in configure.ac solenv/CustomTarget_versionlist.mk solenv/gbuild solenv/inc solenv/Module_solenv.mk solenv/Package_inc.mk

[Matúš Kukan]

 config_host/config_version.h.in|1 
 configure.ac   |8 +++
 solenv/CustomTarget_versionlist.mk |   41 -
 solenv/Module_solenv.mk|5 
 solenv/Package_inc.mk  |   32 
 solenv/gbuild/WinResTarget.mk  |4 +--
 solenv/inc/version.hrc |8 ++-
 7 files changed, 14 insertions(+), 85 deletions(-)

New commits:
commit 133fbbcbd3fa8fec3920b53f6b93f5d3c4779a35
Author: Matúš Kukan 
Date:   Sun Mar 3 11:50:12 2013 +0100

solenv: remove versionlist.hrc

Change-Id: Iddbfcacd17c1022293357ff5240ab7a52b1a390e
Reviewed-on: https://gerrit.libreoffice.org/2677
Reviewed-by: Michael Stahl 
Reviewed-by: David Ostrovsky 
Tested-by: David Ostrovsky 

diff --git a/config_host/config_version.h.in b/config_host/config_version.h.in
index 736c578..0d78882 100644
--- a/config_host/config_version.h.in
+++ b/config_host/config_version.h.in
@@ -13,6 +13,7 @@ Version settings
 #undef LIBO_VERSION_MINOR
 #undef LIBO_VERSION_MICRO
 #undef LIBO_VERSION_PATCH
+#undef LIBO_THIS_YEAR
 
 #define LIBO_VERSION_DOTTED \
 (LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) "." \
diff --git a/configure.ac b/configure.ac
index b202172..5a201f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4138,14 +4138,14 @@ AC_SUBST(LIBO_VERSION_PATCH)
 AC_SUBST(LIBO_VERSION_SUFFIX)
 AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX)
 
+LIBO_THIS_YEAR=`date +%Y`
+AC_SUBST(LIBO_THIS_YEAR)
+
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
-
-LIBO_THIS_YEAR=`date +%Y`
-AC_SUBST(LIBO_THIS_YEAR)
-
+AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
 # This UPD silly thing must go away soon
 UPD="${LIBO_VERSION_MAJOR}${LIBO_VERSION_MINOR}0"
diff --git a/solenv/CustomTarget_versionlist.mk 
b/solenv/CustomTarget_versionlist.mk
deleted file mode 100644
index eb8b440..000
--- a/solenv/CustomTarget_versionlist.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon 
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# 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_CustomTarget_CustomTarget,solenv/versionlist))
-
-$(eval $(call gb_CustomTarget_register_targets,solenv/versionlist,\
-   versionlist.hrc \
-))
-
-$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc :
-   $(call gb_Output_announce,solenv/versionlist,$(true),ECH,1)
-   echo '#define VERSION $(LIBO_VERSION_MAJOR)' > $@ && \
-   echo '#define SUBVERSION $(LIBO_VERSION_MINOR)' >> $@ && \
-   echo '#define MICROVERSION $(LIBO_VERSION_MICRO)' >> $@ && \
-   echo '#define VER_YEARRANGE 2000-$(LIBO_THIS_YEAR)' >> $@
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index c34dc46..e606c10 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -27,11 +27,6 @@
 
 $(eval $(call gb_Module_Module,solenv))
 
-$(eval $(call gb_Module_add_targets,solenv,\
-   CustomTarget_versionlist \
-   Package_inc \
-))
-
 ifeq ($(CROSS_COMPILING),$(false))
 $(eval $(call gb_Module_add_targets,solenv,\
Executable_concat-deps \
diff --git a/solenv/Package_inc.mk b/solenv/Package_inc.mk
deleted file mode 100644
index 00a6f56..000
--- a/solenv/Package_inc.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- 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 

Re: Question on call to IsCrookAllowed in SdrDragView::BegDragObj

[Thorsten Behrens]

Philippe Jung wrote:
> Trying to implement crop Image in writer, I reached the "case
> SDRDRAG_CROP" code in  SdrDragView::BegDragObj.
> 
Nice, would be cool to have that!

> This part of code calls new SdrDragCrop if and only if
> IsCrookAllowed(true) or IsCrookAllowed(false)
> 
> This basically means that the cropped object must be RotateFreeAllowed
> or ContortionPossible.
> 
Looks like copypasta to me -

> If I create a IsCropAllowed for the SDRDRAG_CROP case (not changing
> anything for SDRDRAG_CROOK case) and in IsCropAllowed I put only
> 
> ForcePossibilities();
> return (!bMoveProtect && bMoveAllowed)
>|| (!bResizeProtect && bContortionPossible);
> 
Yeah, would go for that - but the condition probably should be
something like (!bMoveProtect && bMoveAllowed && !bResizeProtect &&
bResizePropAllowed) or somesuch - this bContortionPossible contortion
relates to the crook functionality. Once you have that hacked, play a
bit with Draw/Impress, too, in the position/size dialog, you can lock
move and resize - if that behaves sensibly with your crop feature.

HTH,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: editeng/inc

[Fridrich Štrba]

 editeng/inc/editeng/svxenum.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7bcb98de0df8e18d4b97bd67a273c6685fee261
Author: Fridrich Å trba 
Date:   Tue Mar 12 23:47:58 2013 +0100

Oops

Change-Id: Idc22c05ff2425702fb7a5ab25b3413f967238569

diff --git a/editeng/inc/editeng/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index f8e2cd5..2759beb 100644
--- a/editeng/inc/editeng/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
@@ -210,7 +210,7 @@ enum SvxExtNumType
 SVX_NUM_PAGEDESC,   // Numbering from the page template
 SVX_NUM_BITMAP,
 SVX_NUM_CHARS_UPPER_LETTER_N, // Counts from  a-z, aa-zz, aaa-zzz
-SVX_NUM_CHARS_LOWER_LETTER_N
+SVX_NUM_CHARS_LOWER_LETTER_N,
 SVX_NUM_TRANSLITERATION,
 SVX_NUM_NATIVE_NUMBERING,
 SVX_NUM_FULL_WIDTH_ARABIC,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/CustomTarget_android_desktop.mk android/CustomTarget_docloader.mk android/CustomTarget_lo4android.mk android/CustomTarget_sdremote.mk

[Tor Lillqvist]

 android/CustomTarget_android_desktop.mk |8 ++--
 android/CustomTarget_docloader.mk   |8 ++--
 android/CustomTarget_lo4android.mk  |8 ++--
 android/CustomTarget_sdremote.mk|8 ++--
 4 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 46cb9a29823073e042ea9e1c065328faafc53b80
Author: Tor Lillqvist 
Date:   Wed Mar 13 00:40:19 2013 +0200

Copy the .apks where the daily build uploader will find them

Sure, it is not "clean" to write to 
$(SRCDIR)/instsetoo_native/$(INPATH)/bin,
but as long as the push_nightlies.sh script looks in instsetoo_native for
.apks, that is where they need to go.

This partially reverts commit b89ea45e5ba32589f69b9539851a51fbe2199a85.

Change-Id: If1a0e50516f20c7571566a2cfa7e6a4b1dad30e4

diff --git a/android/CustomTarget_android_desktop.mk 
b/android/CustomTarget_android_desktop.mk
index 185f9ac..a1e12d7 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -24,8 +24,12 @@ $(call gb_CustomTarget_get_target,android/desktop) : \
 $(android_desktop_DIR)/done : $(lo4android_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all
-   mkdir -p $(WORKDIR)/installation/bin
-   cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk 
$(WORKDIR)/installation/bin
+# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as 
that is where the tinderbox build script
+# still looks for the .apk, and we want fresh daily builds to be uploaded.
+   if test $(SRCDIR) = $(BUILDDIR); then \
+   mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
+   cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk 
$(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
+   fi
 
 $(call gb_CustomTarget_get_clean_target,android/desktop) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_docloader.mk 
b/android/CustomTarget_docloader.mk
index 63fcfb7..badcabd 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -23,8 +23,12 @@ $(call gb_CustomTarget_get_target,android/docloader) : \
 $(docloader_DIR)/done : $(sdremote_DIR)/done $(call 
gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
-   mkdir -p $(WORKDIR)/installation/bin
-   cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk 
$(WORKDIR)/installation/bin
+# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as 
that is where the tinderbox build script
+# still looks for the .apk, and we want fresh daily builds to be uploaded.
+   if test $(SRCDIR) = $(BUILDDIR); then \
+   mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
+   cp 
$(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk 
$(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
+   fi
 
 $(call gb_CustomTarget_get_clean_target,android/docloader) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_lo4android.mk 
b/android/CustomTarget_lo4android.mk
index 30d0e11..651c435 100644
--- a/android/CustomTarget_lo4android.mk
+++ b/android/CustomTarget_lo4android.mk
@@ -24,8 +24,12 @@ $(call gb_CustomTarget_get_target,android/lo4android) : \
 $(lo4android_DIR)/done : $(docloader_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
-   mkdir -p $(WORKDIR)/installation/bin
-   cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk 
$(WORKDIR)/installation/bin
+# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as 
that is where the tinderbox build script
+# still looks for the .apk, and we want fresh daily builds to be uploaded.
+   if test $(SRCDIR) = $(BUILDDIR); then \
+   mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
+   cp 
$(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk 
$(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
+   fi
 
 $(call gb_CustomTarget_get_clean_target,android/lo4android) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index c5705bd..65d9db8 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -15,8 +15,12 @@ $(call gb_CustomTarget_get_target,android/sdremote) : 
$(sdremote_DIR)/done
 $(sdremote_DIR)/done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/sdremote && $(MAKE) all
-   mkdir -p $(WORKDIR)/installation/bin

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 39/e9cae1ac9b7944c9df0642a193b042a1b68266

[Fridrich Štrba]

 39/e9cae1ac9b7944c9df0642a193b042a1b68266 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 59901e5949413c8646caf69fad768b99d8704af4
Author: Fridrich Å trba 
Date:   Tue Mar 12 23:39:31 2013 +0100

Notes added by 'git notes add'

diff --git a/39/e9cae1ac9b7944c9df0642a193b042a1b68266 
b/39/e9cae1ac9b7944c9df0642a193b042a1b68266
new file mode 100644
index 000..44c4427
--- /dev/null
+++ b/39/e9cae1ac9b7944c9df0642a193b042a1b68266
@@ -0,0 +1 @@
+merged as: ef23b47e887908161d980f3e6f6d321f18acca77
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/inc filter/source sd/source

[Zhe Wang]

 editeng/inc/editeng/svxenum.hxx |   14 
 filter/source/msfilter/svdfppt.cxx  |   57 
 sd/source/filter/eppt/epptso.cxx|5 +++
 sd/source/filter/eppt/pptx-text.cxx |   44 +++
 4 files changed, 120 insertions(+)

New commits:
commit ef23b47e887908161d980f3e6f6d321f18acca77
Author: Zhe Wang 
Date:   Fri Sep 7 04:46:35 2012 +

Resolves: #i120773 Numbering lost when saving or opening a ppt file

* subversion/main/editeng/inc/editeng/svxenum.hxx
Define some numbering types supported by MS ppt
* subversion/main/filter/source/msfilter/svdfppt.cxx
Mapping added MS numbering types to Symphony numbering types
* subversion/main/sd/source/filter/eppt/epptso.cxx
Export added MS numbering types

Patch by: Yin Bing 
Suggested by: Wang Zhe 
Found by: Yin Bing 
Review by: Wang Zhe (cherry picked from commit 
39e9cae1ac9b7944c9df0642a193b042a1b68266)

Signed-off-by: Fridrich Å trba 

Conflicts:
editeng/inc/editeng/svxenum.hxx
sd/source/filter/eppt/epptso.cxx

Change-Id: Ic8a9406fd1b58e5cec5c5adc28bf0190ccb87315

diff --git a/editeng/inc/editeng/svxenum.hxx b/editeng/inc/editeng/svxenum.hxx
index ff751b0..f8e2cd5 100644
--- a/editeng/inc/editeng/svxenum.hxx
+++ b/editeng/inc/editeng/svxenum.hxx
@@ -211,6 +211,20 @@ enum SvxExtNumType
 SVX_NUM_BITMAP,
 SVX_NUM_CHARS_UPPER_LETTER_N, // Counts from  a-z, aa-zz, aaa-zzz
 SVX_NUM_CHARS_LOWER_LETTER_N
+SVX_NUM_TRANSLITERATION,
+SVX_NUM_NATIVE_NUMBERING,
+SVX_NUM_FULL_WIDTH_ARABIC,
+SVX_NUM_CIRCLE_NUMBER,
+SVX_NUM_NUMBER_LOWER_ZH,
+SVX_NUM_NUMBER_UPPER_ZH,
+SVX_NUM_NUMBER_UPPER_ZH_TW,
+SVX_NUM_TIAN_GAN_ZH,
+SVX_NUM_DI_ZI_ZH,
+SVX_NUM_NUMBER_TRADITIONAL_JA,
+SVX_NUM_AIU_FULLWIDTH_JA,
+SVX_NUM_AIU_HALFWIDTH_JA,
+SVX_NUM_IROHA_FULLWIDTH_JA,
+SVX_NUM_IROHA_HALFWIDTH_JA
 };
 
 enum SvxCompareMode
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index ba10637..94bf34b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3531,6 +3531,63 @@ sal_Bool PPTNumberFormatCreator::ImplGetExtNumberFormat( 
SdrPowerPointImport& rM
 rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
")" ) ) );
 }
 break;
+case 16: // Simplified Chinese.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+}
+break;
+case 17: // Simplified Chinese with single-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH );
+rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
"." ) ) );
+}
+break;
+case 18: // Double byte circle numbers.
+case 19: // Wingdings white circle numbers.
+case 20: // Wingdings black circle numbers.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_CIRCLE_NUMBER );
+}
+break;
+case 21: // Traditional Chinese.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+}
+break;
+case 22: // Traditional Chinese with single-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_UPPER_ZH_TW );
+rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
"." ) ) );
+}
+break;
+case 26: // Japanese/Korean.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+}
+break;
+case 27: // Japanese/Korean with single-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH );
+rNumberFormat.SetSuffix( String( RTL_CONSTASCII_USTRINGPARAM( 
"." ) ) );
+}
+break;
+case 28: // Double-byte Arabic numbers.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+}
+break;
+case 29: // Double-byte Arabic numbers with double-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_FULL_WIDTH_ARABIC );
+rNumberFormat.SetSuffix( OUString( sal_Unicode(0xff0e) ) );
+}
+break;
+case 38: // Japanese with double-byte period.
+{
+rNumberFormat.SetNumberingType( SVX_NUM_NUMBER_LOWER_ZH ); // 
No such type. Instead with Lower Chinese Number
+rNumberFormat.SetSuffix( OUString( sal_Unicode(0xff0e) ) );
+}
+break;
 }
 rStartNumbering = boost::optional< sal_Int16 >( nAnmScheme >> 16 );
 }
diff --git a/sd/source/filter/eppt/epptso.cxx

Re: scalc UNO api compilation question about header files

[Neeraj Rai]

understood. Thanks for clarifying this and other issues earlier.
I can build my example on centos 6 with your help.

Neeraj

On Tue, Mar 12, 2013 at 4:08 AM, Stephan Bergmann wrote:

> On 03/12/2013 03:19 AM, Neeraj Rai wrote:
>
>> Since I misunderstood a few things before, I wanted to confirm that this
>> cppumaker run for system UNO objects is needed only once per box per LO
>> version ?
>> If yes, it doesn't belong as a dependency in my  makefiles which is
>> triggered or each compilation.
>>
>> when I am upgrading the version,which is rare, there would be lot of one
>> time activity - so regenrating UNO idl can be part of that.
>>
>> --- cppumaker for system idl (one time per box per version)
>>   $(binpath)/cppumaker -BUCR -Gc $(path)/offapi.rdb \
>> $(OO_SDK_URE_HOME)/share/misc/**types.rdb
>>
>
> Yes, it is fine if you do the above just once.  The reason it is part of
> all the example makefiles (via settings/stdtarget.mk) is so that it is
> actually done /at least/ once.
>
> Stephan
>



-- 
=
Intuition - is the inability to figure out the facts on which we based the
decision.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About coverity 705732 (svdundo.cxx from svx module)

[Thorsten Behrens]

Julien Nabet wrote:
> I noticed several things:
> 1) we could replace "if (pText1)" by "if (pNewText)". Of course if blocks
> must be changed
> 2) if pText1 corresponds to a new OutlinerParaObject and !pText, it seems
> there's a leak
>
Yeps.

> 3) why pObj->ActionChanged() and  ImpShowPageOfThisObject() are always
> called ?
> 
I would not suggest relying on that - this code has some serious 15+
years of bugfix sedimentation behind it. If you've played some
multiple hours with your fix in, and understood the code flow, go for
it - otherwise, don't take chances. ;)

Cheers,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

mdds 0.7.0 on master

[Kohei Yoshida]

Hi there,

FYI, the master branch now requires mdds 0.7.0 to build. This should
not be a problem for those who use internal mdds, but for those who
use the system mdds, please be aware of this.

Actually, at the moment, it should build fine with mdds 0.6.0, but
soon I'll start using bits that are only available in 0.7.0, which
causes a build failure if you build with the older versions.

Best,

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

LibreOffice Compile Error

[Güner Kaan ALKIM]

Hi,

 

I have got a problem. I compiled libreoffice on Ubuntu 12.04. When
everythings finished, I take a error message.

 

My terminal output is

 

cpp: line 19, Fatal error: Cannot open include file
"accessibility/helper/accessiblestrings.hrc"
#include 
make[1]: ***
[/home/kaan/core/workdir/unxlngi6/SrsPartTarget/accessibility/source/helper/
accessiblestrings.src] Hata 1
make: *** [build] Hata 2

 

[hata = error in turkish]

 

Can help me ?

 

 

Güner Kaan ALKIM - TR

  k...@kaanalkim.com

  www.kaanalkim.com

 

 

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

[Libreoffice-commits] core.git: padmin/source

[Caolán McNamara]

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

New commits:
commit 5908e9012491d53bba8670d37088e78153915e8d
Author: Caolán McNamara 
Date:   Tue Mar 12 21:43:33 2013 +

Len() != isEmpty()

Change-Id: I249c0cd072c51c07fddac730791468952a0757af

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 46706e3..6f8165b 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -526,7 +526,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* 
pParent )
 // read the command
 aConfig.SetGroup( "ports" );
 rtl::OString aCommand( aConfig.ReadKey( aPort ) );
-if (aCommand.isEmpty())
+if (!aCommand.isEmpty())
 {
 OUString aText( PaResId( RID_TXT_PRINTERWITHOUTCOMMAND ) );
 aText.replaceFirst( OUString(  "%s"  ), 
rtl::OStringToOUString(aPrinter, aEncoding) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: padmin/source

[Caolán McNamara]

 padmin/source/cmddlg.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d20da2c6094df58235ee865d88f3ba9e9e76166b
Author: Caolán McNamara 
Date:   Tue Mar 12 21:40:17 2013 +

Len() != isEmpty()

Change-Id: Ia8ba54ec3a99e7d72a6c97fa4082f9e605b6575c

diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index ea2d547..911b879 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -336,7 +336,7 @@ void RTSCommandPage::save()
 {
 if( !aToken.isEmpty() )
 {
-if( aFeatures.isEmpty() )
+if( !aFeatures.isEmpty() )
 aFeatures += ",";
 aFeatures += OUString( aToken );
 }
@@ -355,13 +355,13 @@ void RTSCommandPage::save()
 ::std::list< String >* pList = &m_aPrinterCommands;
 if( bExternalDialog )
 {
-if( aFeatures.isEmpty() )
+if( !aFeatures.isEmpty() )
 aFeatures += ",";
 aFeatures += "external_dialog" ;
 }
 if( bHaveFax )
 {
-if( aFeatures.isEmpty() )
+if( !aFeatures.isEmpty() )
 aFeatures += ",";
 aFeatures += "fax=" ;
 if( bFaxSwallow )
@@ -370,7 +370,7 @@ void RTSCommandPage::save()
 }
 if( bHavePdf )
 {
-if( aFeatures.isEmpty() )
+if( !aFeatures.isEmpty() )
 aFeatures += ",";
 aFeatures += "pdf=" ;
 aFeatures += m_aPdfDirectoryEdit.GetText() ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: padmin/source

[Caolán McNamara]

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

New commits:
commit 1125882c0963a592ffe5b3e99c013e10f3ea3d5f
Author: Caolán McNamara 
Date:   Tue Mar 12 21:38:20 2013 +

Len() != isEmpty()

Change-Id: I42151d1f406ad43fae3c720c5c2663789a23cf8e

diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 283c6b0..ea2d547 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -124,7 +124,7 @@ void CommandStore::getStoredCommands( const char* pGroup, 
::std::list< String >&
 while( nKeys-- )
 {
 OUString aCommand( rConfig.ReadKey(rtl::OString::valueOf(nKeys), 
RTL_TEXTENCODING_UTF8 ) );
-if( aCommand.isEmpty() )
+if( !aCommand.isEmpty() )
 {
 for( it = rCommands.begin(); it != rCommands.end() && *it != 
aCommand; ++it )
 ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: padmin/source

[Caolán McNamara]

 padmin/source/adddlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0b226da01318ce4af7d7a58829ef6bb41d640f61
Author: Caolán McNamara 
Date:   Tue Mar 12 21:35:58 2013 +

Len() != isEmpty()

Change-Id: I56e29f20b4c4eaf73b98c1190040629ca36066e4

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 7a52fdc..46706e3 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -198,8 +198,8 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, 
pButton )
 for( int i = 0; i < m_aDriverBox.GetSelectEntryCount(); i++ )
 {
 int nSelect = m_aDriverBox.GetSelectEntryPos(i);
-OUString aDriver( *(String*)m_aDriverBox.GetEntryData( nSelect ) );
-if( aDriver.isEmpty() )
+OUString aDriver( *(OUString*)m_aDriverBox.GetEntryData( nSelect ) 
);
+if( !aDriver.isEmpty() )
 {
 // never delete the default driver
 if( aDriver.equalsIgnoreAsciiCase( "SGENPRT" ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/app/dbggui.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e04fd835296e6fbe56e3a539038198a993b9bc13
Author: Caolán McNamara 
Date:   Tue Mar 12 21:28:57 2013 +

fix dbgutil build

Change-Id: Icc541fdcf854a2e8f660c3d8c03448c5e8cb46f7

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 39d0ba0..0b544e2 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1078,7 +1078,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
 DbgInfoDialog aInfoDialog( this );
 aDbgInfoBuf[0] = '\0';
 DbgXtorInfo( aDbgInfoBuf );
-OUString aInfoText( aDbgInfoBuf, RTL_TEXTENCODING_UTF8 );
+OUString aInfoText( aDbgInfoBuf, strlen(aDbgInfoBuf), 
RTL_TEXTENCODING_UTF8 );
 aInfoDialog.SetText( "Debug InfoReport" );
 aInfoDialog.SetInfoText( aInfoText );
 aInfoDialog.Execute();
@@ -1098,7 +1098,7 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt )
 const sal_Char** pHelpStrs = pDbgHelpText;
 while ( *pHelpStrs )
 {
-aHelpText += *pHelpStrs;
+aHelpText += OUString::createFromAscii(*pHelpStrs);
 pHelpStrs++;
 }
 aInfoDialog.SetText( "Debug Hilfe" );
@@ -1259,7 +1259,7 @@ void DbgDialogTest( Window* pWindow )
 const ::com::sun::star::lang::Locale& rLocale = 
Application::GetSettings().GetLanguageTag().getLocale();
 uno::Reference < i18n::XCharacterClassification > 
xCharClass = vcl::unohelper::CreateCharacterClassification();
 OUString aUpperText = xCharClass->toUpper( aText, 0, 
aText.getLength(), rLocale );
-cAccel = aUpperText.GetChar( nAccelPos+1 );
+cAccel = aUpperText[nAccelPos+1];
 if ( pChild->IsVisible() )
 {
 if ( aAccelBuf[cAccel] )
@@ -1346,7 +1346,7 @@ void DbgDialogTest( Window* pWindow )
 if( nAccelPos != STRING_NOTFOUND )
 {
 aWidth = pChild->GetTextWidth( aText, 0, nAccelPos ) +
- pChild->GetTextWidth( aText, nAccelPos+1, 
aText.Len() - nAccelPos - 1);
+ pChild->GetTextWidth( aText, nAccelPos+1, 
aText.getLength() - nAccelPos - 1);
 }
 else
 aWidth = pChild->GetTextWidth( aText );
@@ -1359,7 +1359,7 @@ void DbgDialogTest( Window* pWindow )
 }
 }
 
-if ( (i+1 < nChildCount) && aText.Len() )
+if ( (i+1 < nChildCount) && !aText.isEmpty() )
 {
 Window* pTempChild = pGetChild->GetWindow( WINDOW_NEXT 
)->ImplGetWindow();
 if ( (pTempChild->GetType() == WINDOW_EDIT) ||
@@ -1669,7 +1669,7 @@ void DbgPrintMsgBox( const char* pLine )
 strcat( aDbgOutBuf, "\nAbort ? (Yes=abort / No=ignore / Cancel=crash)" );
 #endif
 
-SolarMessageBoxExecutor aMessageBox( OUString( aDbgOutBuf, 
RTL_TEXTENCODING_UTF8 ) );
+SolarMessageBoxExecutor aMessageBox( OUString( aDbgOutBuf, 
strlen(aDbgOutBuf), RTL_TEXTENCODING_UTF8 ) );
 TimeValue aTimeout; aTimeout.Seconds = 2; aTimeout.Nanosec = 0;
 long nResult = aMessageBox.execute( aTimeout );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Translate German comments

[Fridrich Strba (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/2691

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b386fd0c7cb0382fa3a5187389369966365b1fb
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Weissenbacher 
Gerrit-Reviewer: Fridrich Strba 

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

[PUSHED] coverity#704143: Resource leak in object

[Fridrich Strba (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/2686

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6bf9fc6e65de857d4d05df0c7be64dc6ec38dc07
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Fridrich Strba 

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

[PATCH] Translate German comments

[Philipp Weissenbacher (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2691

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/2691/1

Translate German comments

Change-Id: I0b386fd0c7cb0382fa3a5187389369966365b1fb
---
M sw/source/core/draw/dobjfac.cxx
M sw/source/core/para/paratr.cxx
2 files changed, 14 insertions(+), 27 deletions(-)



diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index 6ad9d25..891856b 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -23,23 +23,16 @@
 
 SwObjectFactory aSwObjectFactory;
 
-/*
-|*
-|* void SwObjectFactory::MakeObject()
-|*
-\/
-
 IMPL_LINK( SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory )
 {
 if ( pObjFactory->nInventor == SWGInventor )
 {
-//Kein switch, derzeit gibt es nur einen.
+// No switch, there's only one at the moment
 OSL_ENSURE( pObjFactory->nIdentifier == SwFlyDrawObjIdentifier,
-"Falscher Inventor oder identifier." );
+"Wrong inventor or identifier" );
 pObjFactory->pNewObj = new SwFlyDrawObj();
 }
 return 0;
 }
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 6810db2..1db5303 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -48,12 +48,6 @@
 TYPEINIT1_AUTOFACTORY( SwNumRuleItem, SfxStringItem);
 TYPEINIT1_AUTOFACTORY( SwParaConnectBorderItem, SfxBoolItem);
 
-/*
-|*Beschreibung  Methoden von SwFmtDrop
-*/
-
-
-
 SwFmtDrop::SwFmtDrop()
 : SfxPoolItem( RES_PARATR_DROP ),
 SwClient( 0 ),
@@ -90,7 +84,7 @@
 
 void SwFmtDrop::SetCharFmt( SwCharFmt *pNew )
 {
-//Ummelden
+// Rewire
 if ( GetRegisteredIn() )
 GetRegisteredInNonConst()->Remove( this );
 if(pNew)
@@ -109,9 +103,8 @@
 else if( pDefinedIn->GetDepends() &&
 !pDefinedIn->IsModifyLocked() )
 {
-// selbst den Abhaengigen vom Format bescheid sagen. Das
-// Format selbst wuerde es nicht weitergeben, weil es ueber
-// die Abpruefung nicht hinauskommt.
+// Notify those who are dependend on the format on our own.
+// The format itself wouldn't pass on the notify as it does not 
get past the check.
 pDefinedIn->ModifyBroadcast( this, this );
 }
 }
@@ -119,12 +112,12 @@
 
 bool SwFmtDrop::GetInfo( SfxPoolItem& ) const
 {
-return true;// weiter
+return true; // Continue
 }
 
 int SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const
 {
-OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "No mathing attributes" );
 return ( nLines == ((SwFmtDrop&)rAttr).GetLines() &&
  nChars == ((SwFmtDrop&)rAttr).GetChars() &&
  nDistance ==  ((SwFmtDrop&)rAttr).GetDistance() &&
@@ -222,22 +215,25 @@
 return true;
 }
 
-// class SwRegisterItem -
-
+/**
+ * SwRegisterItem
+ */
 
 SfxPoolItem* SwRegisterItem::Clone( SfxItemPool * ) const
 {
 return new SwRegisterItem( *this );
 }
 
-// class SwNumRuleItem -
+/**
+ * SwNumRuleItem
+ */
 SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const
 {
 return new SwNumRuleItem( *this );
 }
 int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const
 {
-OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "No matching attributes" );
 
 return GetValue() == ((SwNumRuleItem&)rAttr).GetValue();
 }
@@ -261,7 +257,5 @@
 {
 return new SwParaConnectBorderItem( *this );
 }
-
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b386fd0c7cb0382fa3a5187389369966365b1fb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Weissenbacher 

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

[PUSHED] fdo#38838: Replaced some String with OUString

[Fridrich Strba (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/2675

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a5f4acb22db42173f4489655f5e702c4cee7c1c
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Prashant Pandey 
Gerrit-Reviewer: Bosdonnat Cedric 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: Prashant Pandey 
Gerrit-Reviewer: Tor Lillqvist 

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

[Libreoffice-commits] core.git: sw/source

[Philipp Weissenbacher]

 sw/source/core/draw/dobjfac.cxx |   11 ++-
 sw/source/core/para/paratr.cxx  |   30 --
 2 files changed, 14 insertions(+), 27 deletions(-)

New commits:
commit 26bb45921a2eac1da79ed7f53f5f39575b998f61
Author: Philipp Weissenbacher 
Date:   Tue Mar 12 21:42:13 2013 +0100

Translate German comments

Change-Id: I0b386fd0c7cb0382fa3a5187389369966365b1fb
Reviewed-on: https://gerrit.libreoffice.org/2691
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index 6ad9d25..891856b 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -23,23 +23,16 @@
 
 SwObjectFactory aSwObjectFactory;
 
-/*
-|*
-|* void SwObjectFactory::MakeObject()
-|*
-\/
-
 IMPL_LINK( SwObjectFactory, MakeObject, SdrObjFactory*, pObjFactory )
 {
 if ( pObjFactory->nInventor == SWGInventor )
 {
-//Kein switch, derzeit gibt es nur einen.
+// No switch, there's only one at the moment
 OSL_ENSURE( pObjFactory->nIdentifier == SwFlyDrawObjIdentifier,
-"Falscher Inventor oder identifier." );
+"Wrong inventor or identifier" );
 pObjFactory->pNewObj = new SwFlyDrawObj();
 }
 return 0;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 6810db2..1db5303 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -48,12 +48,6 @@ TYPEINIT1_AUTOFACTORY( SwRegisterItem, SfxBoolItem);
 TYPEINIT1_AUTOFACTORY( SwNumRuleItem, SfxStringItem);
 TYPEINIT1_AUTOFACTORY( SwParaConnectBorderItem, SfxBoolItem);
 
-/*
-|*Beschreibung  Methoden von SwFmtDrop
-*/
-
-
-
 SwFmtDrop::SwFmtDrop()
 : SfxPoolItem( RES_PARATR_DROP ),
 SwClient( 0 ),
@@ -90,7 +84,7 @@ SwFmtDrop::~SwFmtDrop()
 
 void SwFmtDrop::SetCharFmt( SwCharFmt *pNew )
 {
-//Ummelden
+// Rewire
 if ( GetRegisteredIn() )
 GetRegisteredInNonConst()->Remove( this );
 if(pNew)
@@ -109,9 +103,8 @@ void SwFmtDrop::Modify( const SfxPoolItem*, const 
SfxPoolItem * )
 else if( pDefinedIn->GetDepends() &&
 !pDefinedIn->IsModifyLocked() )
 {
-// selbst den Abhaengigen vom Format bescheid sagen. Das
-// Format selbst wuerde es nicht weitergeben, weil es ueber
-// die Abpruefung nicht hinauskommt.
+// Notify those who are dependend on the format on our own.
+// The format itself wouldn't pass on the notify as it does not 
get past the check.
 pDefinedIn->ModifyBroadcast( this, this );
 }
 }
@@ -119,12 +112,12 @@ void SwFmtDrop::Modify( const SfxPoolItem*, const 
SfxPoolItem * )
 
 bool SwFmtDrop::GetInfo( SfxPoolItem& ) const
 {
-return true;// weiter
+return true; // Continue
 }
 
 int SwFmtDrop::operator==( const SfxPoolItem& rAttr ) const
 {
-OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "No mathing attributes" );
 return ( nLines == ((SwFmtDrop&)rAttr).GetLines() &&
  nChars == ((SwFmtDrop&)rAttr).GetChars() &&
  nDistance ==  ((SwFmtDrop&)rAttr).GetDistance() &&
@@ -222,22 +215,25 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 
nMemberId )
 return true;
 }
 
-// class SwRegisterItem -
-
+/**
+ * SwRegisterItem
+ */
 
 SfxPoolItem* SwRegisterItem::Clone( SfxItemPool * ) const
 {
 return new SwRegisterItem( *this );
 }
 
-// class SwNumRuleItem -
+/**
+ * SwNumRuleItem
+ */
 SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const
 {
 return new SwNumRuleItem( *this );
 }
 int SwNumRuleItem::operator==( const SfxPoolItem& rAttr ) const
 {
-OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "No matching attributes" );
 
 return GetValue() == ((SwNumRuleItem&)rAttr).GetValue();
 }
@@ -262,6 +258,4 @@ SfxPoolItem* SwParaConnectBorderItem::Clone( SfxItemPool * 
) const
 return new SwParaConnectBorderItem( *this );
 }
 
-
-
 /* 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] core.git: extensions/source

[Julien Nabet]

 extensions/source/abpilot/datasourcehandling.cxx |4 
 extensions/source/abpilot/datasourcehandling.hxx |1 +
 2 files changed, 5 insertions(+)

New commits:
commit 634baa8702df8050bba5b6f3dcff64047b328cfe
Author: Julien Nabet 
Date:   Tue Mar 12 19:53:39 2013 +0100

coverity#704143: Resource leak in object

Change-Id: I6bf9fc6e65de857d4d05df0c7be64dc6ec38dc07
Reviewed-on: https://gerrit.libreoffice.org/2686
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/extensions/source/abpilot/datasourcehandling.cxx 
b/extensions/source/abpilot/datasourcehandling.cxx
index 16bb8e3..ca82fb9 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -209,6 +209,10 @@ namespace abp
 OSL_FAIL( "ODataSourceContext::ODataSourceContext: caught an 
exception!" );
 }
 }
+ODataSourceContext::~ODataSourceContext()
+{
+delete(m_pImpl);
+}
 
 //-
 ::rtl::OUString& ODataSourceContext::disambiguate(::rtl::OUString& 
_rDataSourceName)
diff --git a/extensions/source/abpilot/datasourcehandling.hxx 
b/extensions/source/abpilot/datasourcehandling.hxx
index 7804f1b..3a2dab8 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -56,6 +56,7 @@ namespace abp
 ODataSourceContext(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB
 );
+~ODataSourceContext();
 
 /// retrieves the names of all data sources
 voidgetDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: padmin/source

[elixir]

 padmin/source/adddlg.cxx   |   97 ++---
 padmin/source/adddlg.hxx   |2 
 padmin/source/cmddlg.cxx   |   68 +++
 padmin/source/helper.cxx   |   12 ++---
 padmin/source/helper.hxx   |5 --
 padmin/source/newppdlg.cxx |   11 ++---
 6 files changed, 95 insertions(+), 100 deletions(-)

New commits:
commit a53f5933ea67cdc05695861fc15175c9451ceb3e
Author: elixir 
Date:   Tue Mar 12 13:27:17 2013 +0530

fdo#38838: Replaced some String with OUString

Change-Id: I1a5f4acb22db42173f4489655f5e702c4cee7c1c
Reviewed-on: https://gerrit.libreoffice.org/2675
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index f1db9e1..7a52fdc 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -36,7 +36,6 @@ using namespace psp;
 using namespace padmin;
 using namespace std;
 
-using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 using ::rtl::OUStringHash;
 using ::rtl::OUStringToOString;
@@ -93,7 +92,7 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo )
 rInfo.m_aFeatures = OUString("fax");
 }
 else
-rInfo.m_aFeatures = OUString();
+rInfo.m_aFeatures = "";
 }
 
 //
@@ -127,7 +126,7 @@ bool APChooseDriverPage::check()
 void APChooseDriverPage::fill( PrinterInfo& rInfo )
 {
 sal_uInt16 nPos = m_aDriverBox.GetSelectEntryPos();
-String* pDriver = (String*)m_aDriverBox.GetEntryData( nPos );
+OUString* pDriver = (OUString*)m_aDriverBox.GetEntryData( nPos );
 rInfo.m_aDriverName = *pDriver;
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "m_aLastPrinterName = \"%s\", rInfo.m_aPrinterName = 
\"%s\"\n",
@@ -136,30 +135,30 @@ void APChooseDriverPage::fill( PrinterInfo& rInfo )
 #endif
 if( rInfo.m_aPrinterName.equals( m_aLastPrinterName ) )
 {
-String aPrinter( AddPrinterDialog::uniquePrinterName( 
m_aDriverBox.GetEntry( nPos ) ) );
+OUString aPrinter( AddPrinterDialog::uniquePrinterName( 
m_aDriverBox.GetEntry( nPos ) ) );
 rInfo.m_aPrinterName = m_aLastPrinterName = aPrinter;
 }
 }
 
-void APChooseDriverPage::updateDrivers( bool bRefresh, const rtl::OUString& 
rSelectDriver )
+void APChooseDriverPage::updateDrivers( bool bRefresh, const OUString& 
rSelectDriver )
 {
 for( int k = 0; k < m_aDriverBox.GetEntryCount(); k++ )
 delete (String*)m_aDriverBox.GetEntryData( k );
 m_aDriverBox.Clear();
 
-std::list< rtl::OUString > aDrivers;
+std::list< OUString > aDrivers;
 psp::PPDParser::getKnownPPDDrivers( aDrivers, bRefresh );
 
-rtl::OUString aSelectDriver( psp::PPDParser::getPPDPrinterName( 
rSelectDriver ) );
+OUString aSelectDriver( psp::PPDParser::getPPDPrinterName( rSelectDriver ) 
);
 
-rtl::OUString aSelectedEntry;
-for( std::list< rtl::OUString >::const_iterator it = aDrivers.begin(); it 
!= aDrivers.end(); ++it )
+OUString aSelectedEntry;
+for( std::list< OUString >::const_iterator it = aDrivers.begin(); it != 
aDrivers.end(); ++it )
 {
-rtl::OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) );
+OUString aDriver( psp::PPDParser::getPPDPrinterName( *it ) );
 if( !aDriver.isEmpty() )
 {
 int nPos = m_aDriverBox.InsertEntry( aDriver );
-m_aDriverBox.SetEntryData( nPos, new String( *it ) );
+m_aDriverBox.SetEntryData( nPos, new OUString( *it ) );
 if( aDriver == aSelectDriver )
 aSelectedEntry = aDriver;
 }
@@ -184,7 +183,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, 
pButton )
 PPDImportDialog aDlg( this );
 if( aDlg.Execute() )
 {
-const std::list< rtl::OUString >& rImported( 
aDlg.getImportedFiles() );
+const std::list< OUString >& rImported( aDlg.getImportedFiles() );
 if( rImported.empty() )
 updateDrivers( true );
 else
@@ -199,14 +198,14 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, 
pButton )
 for( int i = 0; i < m_aDriverBox.GetSelectEntryCount(); i++ )
 {
 int nSelect = m_aDriverBox.GetSelectEntryPos(i);
-String aDriver( *(String*)m_aDriverBox.GetEntryData( nSelect ) );
-if( aDriver.Len() )
+OUString aDriver( *(String*)m_aDriverBox.GetEntryData( nSelect ) );
+if( aDriver.isEmpty() )
 {
 // never delete the default driver
-if( aDriver.EqualsIgnoreCaseAscii( "SGENPRT" ) )
+if( aDriver.equalsIgnoreAsciiCase( "SGENPRT" ) )
 {
-String aText( PaResId( RID_ERR_REMOVESGENPRT ) );
-aText.SearchAndReplace( rtl::OUString( "%s" ), 
m_aDriverBox.GetSelectEntry( i ) );
+OUString aText( PaResId( RID_ERR_REMOVESGENPRT

[PUSHED] Replace XubString with OUString (vcl/ilstbox)

[Fridrich Strba (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/2690

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2cefe1649538d411ae858e21a3145ca01fff2ee
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 
Gerrit-Reviewer: Fridrich Strba 

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

[PUSHED] Replace XubString with OUString (dbggui.cxx)

[Fridrich Strba (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/2688

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I080f6671eaa923790fd41d4ed9f147c44c721442
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith 
Gerrit-Reviewer: Fridrich Strba 

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

[Libreoffice-commits] core.git: vcl/inc vcl/source

[Chr . Rossmanith]

 vcl/inc/ilstbox.hxx|   24 
 vcl/source/control/ilstbox.cxx |   22 +++---
 2 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit d2ffd0799fcaef0603b76984bf024ab1ba54b095
Author: Chr. Rossmanith 
Date:   Tue Mar 12 22:02:14 2013 +0100

Replace XubString with OUString (vcl/ilstbox)

Change-Id: Ia2cefe1649538d411ae858e21a3145ca01fff2ee
Reviewed-on: https://gerrit.libreoffice.org/2690
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 4c1b700..d2ae81f 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -57,14 +57,14 @@ enum LB_EVENT_TYPE
 
 struct ImplEntryType
 {
-XubString   maStr;
+OUStringmaStr;
 Image   maImage;
 void*   mpUserData;
-sal_BoolmbIsSelected;
+sal_BoolmbIsSelected;
 longmnFlags;
 longmnHeight;
 
-ImplEntryType( const XubString& rStr, const Image& rImage ) :
+ImplEntryType( const OUString& rStr, const Image& rImage ) :
 maStr( rStr ),
 maImage( rImage ),
 mnFlags( 0 ),
@@ -74,7 +74,7 @@ struct ImplEntryType
 mpUserData = NULL;
 }
 
-ImplEntryType( const XubString& rStr ) :
+ImplEntryType( const OUString& rStr ) :
 maStr( rStr ),
 mnFlags( 0 ),
 mnHeight( 0 )
@@ -143,7 +143,7 @@ public:
 sal_uInt16  GetEntryCount() const { return 
(sal_uInt16)maEntries.size(); }
 sal_BoolHasImages() const { return mnImages ? sal_True : 
sal_False; }
 
-XubString   GetEntryText( sal_uInt16 nPos ) const;
+OUStringGetEntryText( sal_uInt16 nPos ) const;
 
 sal_BoolHasEntryImage( sal_uInt16 nPos ) const;
 Image   GetEntryImage( sal_uInt16 nPos ) const;
@@ -157,7 +157,7 @@ public:
 voidSelectEntry( sal_uInt16 nPos, sal_Bool bSelect );
 
 sal_uInt16  GetSelectEntryCount() const;
-XubString   GetSelectEntry( sal_uInt16 nIndex ) const;
+OUStringGetSelectEntry( sal_uInt16 nIndex ) const;
 sal_uInt16  GetSelectEntryPos( sal_uInt16 nIndex ) const;
 sal_BoolIsEntryPosSelected( sal_uInt16 nIndex ) const;
 
@@ -429,9 +429,9 @@ public:
 virtual const Wallpaper& GetDisplayBackground() const;
 virtual Window* GetPreferredKeyInputWindow();
 
-sal_uInt16  InsertEntry( sal_uInt16 nPos, const XubString& rStr );
+sal_uInt16  InsertEntry( sal_uInt16 nPos, const OUString& rStr );
 sal_uInt16  InsertEntry( sal_uInt16 nPos, const Image& rImage );
-sal_uInt16  InsertEntry( sal_uInt16 nPos, const XubString& rStr, 
const Image& rImage );
+sal_uInt16  InsertEntry( sal_uInt16 nPos, const OUString& rStr, 
const Image& rImage );
 voidRemoveEntry( sal_uInt16 nPos );
 voidSetEntryData( sal_uInt16 nPos, void* pNewData ) { 
maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); }
 voidClear();
@@ -560,7 +560,7 @@ class ImplWin : public Control
 private:
 
 sal_uInt16  mnItemPos;  // because of UserDraw I have to know which 
item I draw
-XubString   maString;
+OUStringmaString;
 Image   maImage;
 
 Rectangle   maFocusRect;
@@ -588,11 +588,11 @@ public:
 virtual voidLoseFocus();
 virtual longPreNotify( NotifyEvent& rNEvt );
 
-sal_uInt16  GetItemPos() const { return mnItemPos; }
+sal_uInt16  GetItemPos() const { return mnItemPos; }
 voidSetItemPos( sal_uInt16 n ) { mnItemPos = n; }
 
-const XubString& GetString() const { return maString; }
-voidSetString( const XubString& rStr ) { maString = rStr; }
+const OUString& GetString() const { return maString; }
+voidSetString( const OUString& rStr ) { maString = rStr; }
 
 const Image&GetImage() const { return maImage; }
 voidSetImage( const Image& rImg ) { maImage = rImg; }
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index e790a43..73e5c5d 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -376,9 +376,9 @@ long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const
 
 // ---
 
-XubString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
+OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
 {
-XubString aEntryText;
+OUString aEntryText;
 ImplEntryType* pImplEntry = GetEntry( nPos );
 if ( pImplEntry )
 aEntryText = pImplEntry->maStr;
@@ -457,7 +457,7 @@ sal_uInt16 ImplEntryList::GetSelectEntryCount() const
 
 // --

[Libreoffice-commits] core.git: vcl/inc vcl/source

[Chr . Rossmanith]

 vcl/inc/dbggui.hxx|3 
 vcl/source/app/dbggui.cxx |  146 +++---
 2 files changed, 74 insertions(+), 75 deletions(-)

New commits:
commit 8905062428705cd9a321ec225ac32547712e3787
Author: Chr. Rossmanith 
Date:   Tue Mar 12 22:00:34 2013 +0100

Replace XubString with OUString (dbggui.cxx)

Change-Id: I080f6671eaa923790fd41d4ed9f147c44c721442
Reviewed-on: https://gerrit.libreoffice.org/2688
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index 8ff50fc..a52dbb0 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -29,7 +29,6 @@
 #ifdef DBG_UTIL
 
 class Window;
-class XubString;
 
 void DbgGUIInit();
 void DbgGUIDeInit();
@@ -42,7 +41,7 @@ void DbgDialogTest( Window* pWindow );
 ->DbgData::nWarningOut and ->DbgData::nTraceOut
 @see DBG_OUT_USER_CHANNEL_0
 */
-sal_uInt16 DbgRegisterNamedUserChannel( const XubString& _rChannelUIName, 
DbgPrintLine pProc );
+sal_uInt16 DbgRegisterNamedUserChannel( const OUString& _rChannelUIName, 
DbgPrintLine pProc );
 
 #define DBGGUI_INIT()   DbgGUIInit()
 #define DBGGUI_DEINIT() DbgGUIDeInit()
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index ddd7d09..39d0ba0 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -341,7 +341,7 @@ NULL
 namespace
 {
 // ---
-typedef ::std::map< XubString, DbgChannelId > UserDefinedChannels;
+typedef ::std::map< OUString, DbgChannelId > UserDefinedChannels;
 UserDefinedChannels& ImplDbgGetUserDefinedChannels()
 {
 static UserDefinedChannels s_aChannels;
@@ -410,7 +410,7 @@ public:
 virtual sal_BoolClose();
 virtual voidResize();
 virtual longPreNotify( NotifyEvent& rNEvt );
-voidInsertLine( const XubString& rLine );
+voidInsertLine( const OUString& rLine );
 voidUpdate() { WorkWindow::Update(); maLstBox.Update(); }
 
 private:
@@ -431,7 +431,7 @@ private:
 public:
 DbgInfoDialog( Window* pParent, sal_Bool bHelpText = 
sal_False );
 
-voidSetInfoText( const XubString& rStr );
+voidSetInfoText( const OUString& rStr );
 };
 
 // -
@@ -509,7 +509,7 @@ DbgWindow::DbgWindow() :
 SetWindowState( aState );
 }
 
-SetText(OUString("StarView Debug Window"));
+SetText("StarView Debug Window");
 Show();
 Update();
 }
@@ -614,23 +614,23 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt )
 
 // ---
 
-void DbgWindow::InsertLine( const XubString& rLine )
+void DbgWindow::InsertLine( const OUString& rLine )
 {
-XubString aStr = convertLineEnd(rLine, LINEEND_LF);
-xub_StrLen  nPos = aStr.Search( _LF );
-sal_Bool bFirstEntry = sal_True;
-while ( nPos != STRING_NOTFOUND )
+OUString   aStr = convertLineEnd(rLine, LINEEND_LF);
+sal_Int32  nPos = aStr.indexOf( _LF );
+sal_Bool   bFirstEntry = sal_True;
+while ( nPos != -1 )
 {
 if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES )
 maLstBox.RemoveEntry( 0 );
 
-sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr.Copy( 0, nPos ) 
);
+sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr.copy( 0, nPos ) 
);
 if ( bFirstEntry )
 maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 
0x0001 ) );
 bFirstEntry = sal_False;
 
-aStr.Erase( 0, nPos+1 );
-nPos = aStr.Search( _LF );
+aStr.replaceAt( 0, nPos+1, "" );
+nPos = aStr.indexOf( _LF );
 }
 if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES )
 maLstBox.RemoveEntry( 0 );
@@ -685,7 +685,7 @@ DbgDialog::DbgDialog() :
 
 {
 maXtorThis.Show();
-maXtorThis.SetText(OUString("T~his"));
+maXtorThis.SetText("T~his");
 if ( pData->nTestFlags & DBG_TEST_XTOR_THIS )
 maXtorThis.Check( sal_True );
 maXtorThis.SetPosSizePixel( LogicToPixel( Point( 10, 15 ), aAppMap ),
@@ -694,7 +694,7 @@ DbgDialog::DbgDialog() :
 
 {
 maXtorFunc.Show();
-maXtorFunc.SetText(OUString("~Function"));
+maXtorFunc.SetText("~Function");
 if ( pData->nTestFlags & DBG_TEST_XTOR_FUNC )
 maXtorFunc.Check( sal_True );
 maXtorFunc.SetPosSizePixel( LogicToPixel( Point( 75, 15 ), aAppMap ),
@@ -703,7 +703,7 @@ DbgDialog::DbgDialog() :
 
 {
 maXtorExit.Show();
-maXtorExit.SetText(OUString("E~xit"));
+maXtorExit.SetText("E~xit");
 if ( pData->nTestFlags & DBG_TEST_XTOR_EXIT )
 maXtorExit.Check( sal_True );
 maXtorExit.SetPosSizePixel( LogicToPixel( Point( 140, 15 ), aAppMap ),
@@ -712,7 +712,7 @@ DbgDialog::DbgDialog() :
 
 {
 maXtorReport.Show();
-maXtorReport.SetText(OUString("~Report"));
+maXtorReport.SetText("~Report");

[PUSHED] coverity#705734: Resource leak

[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/2689

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04eba87de232958650c649c6ec18acb6b699b0ff
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Caolán McNamara 

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

[ABANDONED] coverity#704153: Resource leak in object

[Julien Nabet (via Code Review)]

Julien Nabet has abandoned this change.

Change subject: coverity#704153: Resource leak in object
..


Patch Set 1: Abandoned

Thank you for your quick feedback Caolán.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I24fe7c8f7667bc4d847d025106673255813ddaf6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Caolán McNamara 
Gerrit-Reviewer: Julien Nabet 

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

[Libreoffice-commits] core.git: svx/source

[Julien Nabet]

 svx/source/xml/xmlxtexp.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b926b0af7cf769fb8a018ccc89d7169eb32d6954
Author: Julien Nabet 
Date:   Tue Mar 12 21:47:09 2013 +0100

coverity#705734: Resource leak

Change-Id: I04eba87de232958650c649c6ec18acb6b699b0ff
Reviewed-on: https://gerrit.libreoffice.org/2689
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 36de147..8ba2981 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -407,6 +407,7 @@ bool SvxXMLXTableExportComponent::exportTable() throw()
 aAny = mxTable->getByName( *pNames );
 pExporter->exportEntry( *pNames, aAny );
 }
+delete pExporter;
 
 bRet = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/table.hxx   |3 +++
 sc/source/core/data/table2.cxx |9 +
 2 files changed, 12 insertions(+)

New commits:
commit 651ee7089bfff730c31384ed3316e7096d18c623
Author: Kohei Yoshida 
Date:   Tue Mar 12 16:39:03 2013 -0400

Accessor in ScTable.

Change-Id: Id29e746c799365c679e60f22f88bfbcb3dbdf693

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index a43c04d..8786ccf 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -201,6 +201,9 @@ public:
 sal_uLong   GetWeightedCount() const;
 sal_uLong   GetCodeCount() const;   // RPN code in formula
 
+sal_uInt16 GetTextWidth(SCCOL nCol, SCROW nRow) const;
+void SetTextWidth(SCCOL nCol, SCROW nRow, sal_uInt16 nWidth);
+
 boolSetOutlineTable( const ScOutlineTable* pNewOutline );
 voidStartOutlineTable();
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a53ad1d..9acc677 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -53,6 +53,15 @@
 
 // STATIC DATA ---
 
+sal_uInt16 ScTable::GetTextWidth(SCCOL nCol, SCROW nRow) const
+{
+return aCol[nCol].GetTextWidth(nRow);
+}
+
+void ScTable::SetTextWidth(SCCOL nCol, SCROW nRow, sal_uInt16 nWidth)
+{
+aCol[nCol].SetTextWidth(nRow, nWidth);
+}
 
 bool ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Replace XubString with OUString (vcl/ilstbox)

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2690

To pull it, you can do:

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

Replace XubString with OUString (vcl/ilstbox)

Change-Id: Ia2cefe1649538d411ae858e21a3145ca01fff2ee
---
M vcl/inc/ilstbox.hxx
M vcl/source/control/ilstbox.cxx
2 files changed, 23 insertions(+), 23 deletions(-)



diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 4c1b700..d2ae81f 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -57,14 +57,14 @@
 
 struct ImplEntryType
 {
-XubString   maStr;
+OUStringmaStr;
 Image   maImage;
 void*   mpUserData;
-sal_BoolmbIsSelected;
+sal_BoolmbIsSelected;
 longmnFlags;
 longmnHeight;
 
-ImplEntryType( const XubString& rStr, const Image& rImage ) :
+ImplEntryType( const OUString& rStr, const Image& rImage ) :
 maStr( rStr ),
 maImage( rImage ),
 mnFlags( 0 ),
@@ -74,7 +74,7 @@
 mpUserData = NULL;
 }
 
-ImplEntryType( const XubString& rStr ) :
+ImplEntryType( const OUString& rStr ) :
 maStr( rStr ),
 mnFlags( 0 ),
 mnHeight( 0 )
@@ -143,7 +143,7 @@
 sal_uInt16  GetEntryCount() const { return 
(sal_uInt16)maEntries.size(); }
 sal_BoolHasImages() const { return mnImages ? sal_True : 
sal_False; }
 
-XubString   GetEntryText( sal_uInt16 nPos ) const;
+OUStringGetEntryText( sal_uInt16 nPos ) const;
 
 sal_BoolHasEntryImage( sal_uInt16 nPos ) const;
 Image   GetEntryImage( sal_uInt16 nPos ) const;
@@ -157,7 +157,7 @@
 voidSelectEntry( sal_uInt16 nPos, sal_Bool bSelect );
 
 sal_uInt16  GetSelectEntryCount() const;
-XubString   GetSelectEntry( sal_uInt16 nIndex ) const;
+OUStringGetSelectEntry( sal_uInt16 nIndex ) const;
 sal_uInt16  GetSelectEntryPos( sal_uInt16 nIndex ) const;
 sal_BoolIsEntryPosSelected( sal_uInt16 nIndex ) const;
 
@@ -429,9 +429,9 @@
 virtual const Wallpaper& GetDisplayBackground() const;
 virtual Window* GetPreferredKeyInputWindow();
 
-sal_uInt16  InsertEntry( sal_uInt16 nPos, const XubString& rStr );
+sal_uInt16  InsertEntry( sal_uInt16 nPos, const OUString& rStr );
 sal_uInt16  InsertEntry( sal_uInt16 nPos, const Image& rImage );
-sal_uInt16  InsertEntry( sal_uInt16 nPos, const XubString& rStr, 
const Image& rImage );
+sal_uInt16  InsertEntry( sal_uInt16 nPos, const OUString& rStr, 
const Image& rImage );
 voidRemoveEntry( sal_uInt16 nPos );
 voidSetEntryData( sal_uInt16 nPos, void* pNewData ) { 
maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); }
 voidClear();
@@ -560,7 +560,7 @@
 private:
 
 sal_uInt16  mnItemPos;  // because of UserDraw I have to know which 
item I draw
-XubString   maString;
+OUStringmaString;
 Image   maImage;
 
 Rectangle   maFocusRect;
@@ -588,11 +588,11 @@
 virtual voidLoseFocus();
 virtual longPreNotify( NotifyEvent& rNEvt );
 
-sal_uInt16  GetItemPos() const { return mnItemPos; }
+sal_uInt16  GetItemPos() const { return mnItemPos; }
 voidSetItemPos( sal_uInt16 n ) { mnItemPos = n; }
 
-const XubString& GetString() const { return maString; }
-voidSetString( const XubString& rStr ) { maString = rStr; }
+const OUString& GetString() const { return maString; }
+voidSetString( const OUString& rStr ) { maString = rStr; }
 
 const Image&GetImage() const { return maImage; }
 voidSetImage( const Image& rImg ) { maImage = rImg; }
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index e790a43..73e5c5d 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -376,9 +376,9 @@
 
 // ---
 
-XubString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
+OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
 {
-XubString aEntryText;
+OUString aEntryText;
 ImplEntryType* pImplEntry = GetEntry( nPos );
 if ( pImplEntry )
 aEntryText = pImplEntry->maStr;
@@ -457,7 +457,7 @@
 
 // ---
 
-XubString ImplEntryList::GetSelectEntry( sal_uInt16 nIndex ) const
+OUString ImplEntryList::GetSelectEntry( sal_uInt16 nIndex ) const
 {
 return GetEntryText( GetSelectEntryPos( nIndex ) );
 }
@@ -672,7 +672,7 @@
 void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
 {
 ImplEntryMetrics aMetr

[PATCH] coverity#705734: Resource leak

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2689

To pull it, you can do:

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

coverity#705734: Resource leak

Change-Id: I04eba87de232958650c649c6ec18acb6b699b0ff
---
M svx/source/xml/xmlxtexp.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 36de147..86547ec 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -407,6 +407,7 @@
 aAny = mxTable->getByName( *pNames );
 pExporter->exportEntry( *pNames, aAny );
 }
+delete(pExporter);
 
 bRet = true;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04eba87de232958650c649c6ec18acb6b699b0ff
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[PATCH] Replace XubString with OUString (dbggui.cxx)

[via Code Review]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2688

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2688/1

Replace XubString with OUString (dbggui.cxx)

Change-Id: I080f6671eaa923790fd41d4ed9f147c44c721442
---
M vcl/source/app/dbggui.cxx
1 file changed, 73 insertions(+), 73 deletions(-)



diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index ddd7d09..39d0ba0 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -341,7 +341,7 @@
 namespace
 {
 // ---
-typedef ::std::map< XubString, DbgChannelId > UserDefinedChannels;
+typedef ::std::map< OUString, DbgChannelId > UserDefinedChannels;
 UserDefinedChannels& ImplDbgGetUserDefinedChannels()
 {
 static UserDefinedChannels s_aChannels;
@@ -410,7 +410,7 @@
 virtual sal_BoolClose();
 virtual voidResize();
 virtual longPreNotify( NotifyEvent& rNEvt );
-voidInsertLine( const XubString& rLine );
+voidInsertLine( const OUString& rLine );
 voidUpdate() { WorkWindow::Update(); maLstBox.Update(); }
 
 private:
@@ -431,7 +431,7 @@
 public:
 DbgInfoDialog( Window* pParent, sal_Bool bHelpText = 
sal_False );
 
-voidSetInfoText( const XubString& rStr );
+voidSetInfoText( const OUString& rStr );
 };
 
 // -
@@ -509,7 +509,7 @@
 SetWindowState( aState );
 }
 
-SetText(OUString("StarView Debug Window"));
+SetText("StarView Debug Window");
 Show();
 Update();
 }
@@ -614,23 +614,23 @@
 
 // ---
 
-void DbgWindow::InsertLine( const XubString& rLine )
+void DbgWindow::InsertLine( const OUString& rLine )
 {
-XubString aStr = convertLineEnd(rLine, LINEEND_LF);
-xub_StrLen  nPos = aStr.Search( _LF );
-sal_Bool bFirstEntry = sal_True;
-while ( nPos != STRING_NOTFOUND )
+OUString   aStr = convertLineEnd(rLine, LINEEND_LF);
+sal_Int32  nPos = aStr.indexOf( _LF );
+sal_Bool   bFirstEntry = sal_True;
+while ( nPos != -1 )
 {
 if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES )
 maLstBox.RemoveEntry( 0 );
 
-sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr.Copy( 0, nPos ) 
);
+sal_uInt16 nInsertionPos = maLstBox.InsertEntry( aStr.copy( 0, nPos ) 
);
 if ( bFirstEntry )
 maLstBox.SetEntryData( nInsertionPos, reinterpret_cast< void* >( 
0x0001 ) );
 bFirstEntry = sal_False;
 
-aStr.Erase( 0, nPos+1 );
-nPos = aStr.Search( _LF );
+aStr.replaceAt( 0, nPos+1, "" );
+nPos = aStr.indexOf( _LF );
 }
 if ( maLstBox.GetEntryCount() >= DBGWIN_MAXLINES )
 maLstBox.RemoveEntry( 0 );
@@ -685,7 +685,7 @@
 
 {
 maXtorThis.Show();
-maXtorThis.SetText(OUString("T~his"));
+maXtorThis.SetText("T~his");
 if ( pData->nTestFlags & DBG_TEST_XTOR_THIS )
 maXtorThis.Check( sal_True );
 maXtorThis.SetPosSizePixel( LogicToPixel( Point( 10, 15 ), aAppMap ),
@@ -694,7 +694,7 @@
 
 {
 maXtorFunc.Show();
-maXtorFunc.SetText(OUString("~Function"));
+maXtorFunc.SetText("~Function");
 if ( pData->nTestFlags & DBG_TEST_XTOR_FUNC )
 maXtorFunc.Check( sal_True );
 maXtorFunc.SetPosSizePixel( LogicToPixel( Point( 75, 15 ), aAppMap ),
@@ -703,7 +703,7 @@
 
 {
 maXtorExit.Show();
-maXtorExit.SetText(OUString("E~xit"));
+maXtorExit.SetText("E~xit");
 if ( pData->nTestFlags & DBG_TEST_XTOR_EXIT )
 maXtorExit.Check( sal_True );
 maXtorExit.SetPosSizePixel( LogicToPixel( Point( 140, 15 ), aAppMap ),
@@ -712,7 +712,7 @@
 
 {
 maXtorReport.Show();
-maXtorReport.SetText(OUString("~Report"));
+maXtorReport.SetText("~Report");
 if ( pData->nTestFlags & DBG_TEST_XTOR_REPORT )
 maXtorReport.Check( sal_True );
 maXtorReport.SetPosSizePixel( LogicToPixel( Point( 205, 15 ), aAppMap ),
@@ -721,7 +721,7 @@
 
 {
 maXtorTrace.Show();
-maXtorTrace.SetText(OUString("~Trace"));
+maXtorTrace.SetText("~Trace");
 if ( pData->nTestFlags & DBG_TEST_XTOR_TRACE )
 maXtorTrace.Check( sal_True );
 maXtorTrace.SetPosSizePixel( LogicToPixel( Point( 270, 15 ), aAppMap ),
@@ -730,14 +730,14 @@
 
 {
 maBox1.Show();
-maBox1.SetText(OUString("Object Tests"));
+maBox1.SetText("Object Tests");
 maBox1.SetPosSizePixel( LogicToPixel( Point( 5, 5 ), aAppMap ),
 LogicToPixel( Size( 330, 30 ), aAppMap ) );
 }
 
 {
 maProf.Show();
-maProf.SetText(OUString("~Profiling"));
+maProf.SetText("~Profiling");
 if ( pData->nTestFlags & DBG_TEST_PROFILING )
 maProf.Check( sal_True );
 maProf.SetPosSizePixel( LogicToPixel( Point( 10, 95 ), aAppMap ),
@@ -746,7 

About coverity 705732 (svdundo.cxx from svx module)

[julien2412]

Hello,

Scan coverity reported this:
leaked_storage: Variable "pText1" going out of scope leaks the storage it
points to.
See
http://opengrok.libreoffice.org/xref/core/svx/source/svdraw/svdundo.cxx#1137
   1137 void SdrUndoObjSetText::Redo()
   1138 {
   1139 // copy text for Undo, because the original now belongs to
SetOutlinerParaObject()
   1140 OutlinerParaObject* pText1 = pNewText;
   1141 
   1142 if(pText1)
   1143 pText1 = new OutlinerParaObject(*pText1);
   1144 
   1145 SdrText* pText = static_cast< SdrTextObj*>( pObj
)->getText(mnText);
   1146 if( pText )
   1147 static_cast< SdrTextObj* >( pObj
)->NbcSetOutlinerParaObjectForText( pText1, pText );
   1148 
   1149 pObj->ActionChanged();
   1150 
   1151 // Trigger PageChangeCall
   1152 ImpShowPageOfThisObject();
   1153 }

I noticed several things:
1) we could replace "if (pText1)" by "if (pNewText)". Of course if blocks
must be changed
2) if pText1 corresponds to a new OutlinerParaObject and !pText, it seems
there's a leak
3) why pObj->ActionChanged() and  ImpShowPageOfThisObject() are always
called ?

So I thought about this patch:
void SdrUndoObjSetText::Redo()
{
SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
if( pText && pNewText)
{
// copy text for Undo, because the original now belongs to
SetOutlinerParaObject()
OutlinerParaObject* pText1 = new OutlinerParaObject(*pNewText);
static_cast< SdrTextObj* >( pObj )->NbcSetOutlinerParaObjectForText(
pText1, pText );
 
pObj->ActionChanged();

// Trigger PageChangeCall
ImpShowPageOfThisObject();
}
}

Any comment?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-coverity-705732-svdundo-cxx-from-svx-module-tp4043389.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About coverity 705665 (javaunohelper.cxx)

[julien2412]

The following discussion is interesting but shows that it's not a quick
and/or easy fix for casual contributor like me. So I let the experts keep on
about this and determine if there's something to change or not.
Thank you for your feedback about this  Michael, Tor and Matúš

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-coverity-705665-javaunohelper-cxx-tp4043372p4043387.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About coverity 705665 (javaunohelper.cxx)

[Tor Lillqvist]

> Only c++  components have prefixes.

Sure, and what this code does is load a native (C++) library (component).

> and still not all off them,
> stoc/util/bootstrap.component is one of the last(if not the last), a
> little more complicated.

Hmm, indeed, so maybe this code is intended then to load the bootstrap
component (and nothing else)?

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

[Libreoffice-commits] core.git: wizards/com

[Xisco Fauli]

 wizards/com/sun/star/wizards/agenda/CGAgenda.py  |3 +-
 wizards/com/sun/star/wizards/common/ConfigSet.py |   26 ---
 2 files changed, 16 insertions(+), 13 deletions(-)

New commits:
commit 58b8c60758cea0249735d8208bd3cd55759722fb
Author: Xisco Fauli 
Date:   Tue Mar 12 20:58:37 2013 +0100

pywizards: make configset general

Change-Id: Ia2d953166cac672fd9aa44e71d6486cb59df440e

diff --git a/wizards/com/sun/star/wizards/agenda/CGAgenda.py 
b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
index 335f6ed..ee8435b 100644
--- a/wizards/com/sun/star/wizards/agenda/CGAgenda.py
+++ b/wizards/com/sun/star/wizards/agenda/CGAgenda.py
@@ -17,6 +17,7 @@
 #
 from ..common.ConfigGroup import ConfigGroup
 from ..common.ConfigSet import ConfigSet
+from .CGTopic import CGTopic
 
 class CGAgenda(ConfigGroup):
 
@@ -42,4 +43,4 @@ class CGAgenda(ConfigGroup):
 self.cp_TemplatePath = str()
 self.cp_ProceedMethod = int()
 
-self.cp_Topics = ConfigSet()
+self.cp_Topics = ConfigSet(CGTopic)
diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.py 
b/wizards/com/sun/star/wizards/common/ConfigSet.py
index ee041de..79ae0e3 100644
--- a/wizards/com/sun/star/wizards/common/ConfigSet.py
+++ b/wizards/com/sun/star/wizards/common/ConfigSet.py
@@ -18,7 +18,6 @@
 import traceback
 from .ConfigGroup import ConfigGroup
 from .Configuration import Configuration
-from ..agenda.CGTopic import CGTopic
 
 class ConfigSet(ConfigGroup):
 '''
@@ -30,7 +29,8 @@ class ConfigSet(ConfigGroup):
 to avoid this "deletion" of nulls.
 '''
 
-def __init__(self):
+def __init__(self, childType):
+self.childType = childType
 self.childrenList = []
 self.childrenListLen = 0
 
@@ -42,12 +42,13 @@ class ConfigSet(ConfigGroup):
 try:
 childView = configurationView.createInstance()
 configurationView.insertByName(index, childView)
-topic = CGTopic()
-topic.cp_Index = item[0].Value
-topic.cp_Topic = item[1].Value
-topic.cp_Responsible = item[2].Value
-topic.cp_Time = item[3].Value
-topic.writeConfiguration(childView, param)
+if callable( self.childType ):
+topic = self.childType()
+topic.cp_Index = item[0].Value
+topic.cp_Topic = item[1].Value
+topic.cp_Responsible = item[2].Value
+topic.cp_Time = item[3].Value
+topic.writeConfiguration(childView, param)
 except Exception:
 traceback.print_exc()
 
@@ -57,10 +58,11 @@ class ConfigSet(ConfigGroup):
 if names:
 for i in names:
 try:
-topic = CGTopic()
-topic.readConfiguration(
-configurationView.getByName(i), param)
-self.childrenList.append(topic)
+if callable( self.childType ):
+topic = self.childType()
+topic.readConfiguration(
+configurationView.getByName(i), param)
+self.childrenList.append(topic)
 except Exception:
 traceback.print_exc()
 self.childrenListLen = len(self.childrenList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About coverity 705665 (javaunohelper.cxx)

[Matúš Kukan]

On 12 March 2013 20:41, Tor Lillqvist  wrote:
>> http://opengrok.libreoffice.org/xref/core/javaunohelper/source/javaunohelper.cxx#236)
>
> I wonder if that native method actually gets used. If it does, it is
> to load 3rd-party native UNO components (in extensions) from Java, as
> all our own UNO components use a prefix, don't they?
>

Only c++  components have prefixes.. and still not all off them,
stoc/util/bootstrap.component is one of the last(if not the last), a
little more complicated.
One example of java component is javaunohelper/Jar_juh.mk with its
javaunohelper/util/juh.component.
you can grep for loader="com.sun.star.loader.Java2", no java component
is prefixed.

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

[Libreoffice-commits] core.git: 2 commits - dbaccess/source qadevOOo/tests

[Michael Stahl]

 dbaccess/source/core/dataaccess/ModelImpl.cxx  |4 
 qadevOOo/tests/java/mod/_dbaccess/ORowSet.java |4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 97346bdddf4c7f5bd156e60b83223bc547d5d6f5
Author: Michael Stahl 
Date:   Tue Mar 12 20:48:47 2013 +0100

Revert "There's no reason for these defaults in one constructor but not the 
other"

The reason is that dbaccess_unoapi dbaccess.ORowSet fails with:

lib.StatusException: couldn't set up test environment
at mod._dbaccess.ORowSet.createTestEnvironment(ORowSet.java:479)

This reverts commit 36caac0e029a3caf50cb27af339efd69008d414e.

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 62c5713..2d77fc1 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -427,7 +427,11 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< 
XMultiServiceFactory >&
 ,m_pSharedConnectionManager(NULL)
 ,m_nControllerLockCount(0)
 {
+// some kind of default
 DBG_CTOR(ODatabaseModelImpl,NULL);
+m_sConnectURL = "jdbc:";
+m_aTableFilter.realloc(1);
+m_aTableFilter[0] = "%";
 impl_construct_nothrow();
 }
 
commit 811462723bcf72591b5dbbf38cb760612bd6030f
Author: Michael Stahl 
Date:   Tue Mar 12 20:48:28 2013 +0100

qadevOOo: fix typo

Change-Id: I00e90954f535d023b48a80d319563c43bd935d93

diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java 
b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index 10f88b6..5d84b90 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -466,7 +466,7 @@ public class ORowSet extends TestCase {
 }
 catch(com.sun.star.uno.Exception e)
 {
-log.println( "couldn't set up tes tenvironment:" );
+log.println( "couldn't set up test environment:" );
 e.printStackTrace(log);
 try
 {
@@ -476,7 +476,7 @@ public class ORowSet extends TestCase {
 catch(Exception ex)
 {
 }
-throw new StatusException( "couldn't set up tes tenvironment", e );
+throw new StatusException( "couldn't set up test environment", e );
 }
 finally
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/smaller-base-cell' - 0 commits -

[Unknown]

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

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 6 commits - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx   |   15 -
 sc/source/core/data/column.cxx  |   63 
 sc/source/core/data/column2.cxx |4 ++
 sc/source/core/data/column3.cxx |   16 ++
 4 files changed, 91 insertions(+), 7 deletions(-)

New commits:
commit 0713b97ea4031233984f24ad6a56b91fd09d4fe6
Author: Kohei Yoshida 
Date:   Tue Nov 6 22:08:42 2012 -0500

Add accessor methods for text widths using mdds::multi_type_vector.

We only use unsigned short and empty types in this container.  Empty type
represents empty cells whereas unsigned short type represents non-empty
cells.

Change-Id: Id9b6e0941fdfabc48fc8bb2aa6479f466270381c

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ce5823e..1226f9b 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -36,6 +36,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 using ::editeng::SvxBorderLine;
 using namespace formula;
@@ -55,6 +57,11 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 
 struct ScColumnImpl
 {
+typedef mdds::multi_type_vector 
TextWidthType;
+
+TextWidthType maTextWidths;
+
+ScColumnImpl() : maTextWidths(MAXROWCOUNT) {}
 };
 
 ScNeededSizeOptions::ScNeededSizeOptions() :
@@ -2287,5 +2294,22 @@ bool ScColumn::SearchStyleRange(
 return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp, 
NULL );
 }
 
+sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
+{
+switch (mpImpl->maTextWidths.get_type(nRow))
+{
+case mdds::mtv::element_type_ushort:
+return mpImpl->maTextWidths.get(nRow);
+default:
+;
+}
+return TEXTWIDTH_DIRTY;
+}
+
+void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
+{
+// We only use unsigned short type in this container.
+mpImpl->maTextWidths.set(nRow, static_cast(nWidth));
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 71881b4..c43320a 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1952,13 +1952,4 @@ xub_StrLen ScColumn::GetMaxNumberStringLen(
 return nStringLen;
 }
 
-sal_uInt16 ScColumn::GetTextWidth(SCROW nRow) const
-{
-return 0;
-}
-
-void ScColumn::SetTextWidth(SCROW nRow, sal_uInt16 nWidth)
-{
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 289d3beef83f3c651e29633557d5ec7eccd6bb42
Author: Kohei Yoshida 
Date:   Tue Nov 6 19:17:19 2012 -0500

Re-order the header includes. Make sure column.hxx comes first.

Change-Id: I9f93724c4e0b565a9148d0893feda9e82109bff7

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 5ae9b8a..ce5823e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -30,6 +30,13 @@
 #include "detfunc.hxx"  // for Notes in Sort/Swap
 #include "postit.hxx"
 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
 using ::editeng::SvxBorderLine;
 using namespace formula;
 
commit 7c15b4fad26210e3d7fddaeef8f7096f17a2f74b
Author: Kohei Yoshida 
Date:   Tue Nov 6 19:15:11 2012 -0500

Let's start using impl class for ScColumn.

No need to migrate the existing data members to it for now, but let's
define new members in the impl class from now on.

Change-Id: Idee66dae87beb4bb6efc9c7d7ffd658148ed887c

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8653bfd..39f9753 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -58,6 +58,7 @@ struct ScMergePatternState;
 class ScFlatBoolRowSegments;
 struct ScSetStringParam;
 struct ScColWidthParam;
+struct ScColumnImpl;
 
 struct ScNeededSizeOptions
 {
@@ -79,6 +80,8 @@ struct ColEntry
 class ScColumn
 {
 private:
+ScColumnImpl* mpImpl;
+
 SCCOL   nCol;
 SCTAB   nTab;
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index d5d73c4..5ae9b8a 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -30,16 +30,11 @@
 #include "detfunc.hxx"  // for Notes in Sort/Swap
 #include "postit.hxx"
 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
 using ::editeng::SvxBorderLine;
 using namespace formula;
 
+namespace {
+
 inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
 {
 //! move to a header file
@@ -49,12 +44,19 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
  nScript != 0 );
 }
 
+}
+
+struct ScColumnImpl
+{
+};
+
 ScNeededSizeOptions::ScNeededSizeOptions() :
 pPattern(NULL), bFormula(false), bSkipMerged(true), bGetFont(true), 
bTotalSize(false)
 {
 }
 
 ScColumn::ScColumn() :
+mpImpl(new ScColumnImpl),
 nCol( 0 ),
 pAttrArray( NULL ),
 pDocument( NULL )
commit 2f232849c33eb681339c67858c083e71db914ea4
Author: Kohei Yoshida 
Date:   Tue Nov 6 17:14:54 2012 -0500

Add empty GetTextWidth() to ScColumn. Will b

Re: Problems amending commit

[Philipp Weissenbacher]

Hi Ruslan,

That did it. Thanks!


On 5 March 2013 09:08, Ruslan Kabatsayev  wrote:

> Hi,
>
> On Tue, Mar 5, 2013 at 2:28 AM, Philipp Weissenbacher
>  wrote:
> > Hi all,
> >
> > I have problems incorporating the changes suggested by Thomas Arnhold in
> > Change-Id: I98c1ffcb.
> >
> > I tried the following (following the wiki and Winfried's question
> regarding
> > this
> >
> http://nabble.documentfoundation.org/how-to-submit-a-patch-set-2-or-greater-to-gerrit-td4027094.html
> ):
> >
> > philipp@styx libo$ ./logerrit cherry-pick I98c1ffcb4
> > From ssh://logerrit/core
> >  * branchrefs/changes/39/2539/2 -> FETCH_HEAD
> > # On branch master
> > # Your branch is ahead of 'origin/master' by 4 commits.
> > #   (use "git push" to publish your local commits)
> > #
> > # You are currently cherry-picking.
> > #   (all conflicts fixed: run "git commit")
> > #
> > # Changes not staged for commit:
> > #   (use "git add ..." to update what will be committed)
> > #   (use "git checkout -- ..." to discard changes in working
> > directory)
> > #
> > # modified:   sc/source/core/data/dociter.cxx
> > #
> > no changes added to commit (use "git add" and/or "git commit -a")
> > The previous cherry-pick is now empty, possibly due to conflict
> resolution.
> > If you wish to commit it anyway, use:
> >
> > git commit --allow-empty
> >
> > Otherwise, please use 'git reset'
> > philipp@styx libo$ git commit -a --amend && ./logerrit submit
> > fatal: You are in the middle of a cherry-pick -- cannot amend.
> >
> > I tried to git reset --hard and do the cherry-pick + editing + git commit
> > --amend again, but to no avail. I always end up with "fatal: You are in
> the
> > middle of a cherry-pick -- cannot amend."
>
> You can reset to remote state via "git reset --hard origin/HEAD" or
> "git reset --hard origin/BranchName". Or, just as easy, look some
> recent commit in your tree and reset ot it via "git reset --hard
> $COMMIT_ID". This will take you out of being in the middle of the
> cherry-pick.
>
> >
> > Any help much appreciated.
> >
> > I really should've used branches like in the wiki. :-/
> >
> > Regards,
> > Philipp
> >
> >
> > ___
> > LibreOffice mailing list
> > LibreOffice@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libreoffice
> >
>
> Regards,
> Ruslan
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About coverity 705665 (javaunohelper.cxx)

[Tor Lillqvist]

> That native 
> com.sun.star.comp.helper.SharedLibraryLoader.component_getFactory()
> method doesn't take any prefix argument, it always looks for a symbol
> called exactly "component_getFactory".

Forgot to mention, first it looks for a symbol called
"component_getImplementationEnvironment", no prefix there either, and
if that isn't found, it doesn't look for "component_getFactory". Very
few of our own components have any
component_getImplementationEnvironment(), which also suggests this
code isn't intended for loading our own components, but for loading
3rd-party ones.

Anyway, in that
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java ,
there is some code that talks about a "default library which contains
the SharedLibraryLoader component" that would be called
shlibloader.uno (presumably with .dll, .so or .dylib appended). But I
don't see any such library being built. So that code at least can't be
useful, can it?

Indeed I now notice that this whole SharedLibraryLoader class is
marked as @deprecated.

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

[Libreoffice-commits] core.git: configure.ac download.lst

[Kohei Yoshida]

 configure.ac |2 +-
 download.lst |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4613d78e6aceabafbc4dd066c7c0a55d728b6763
Author: Kohei Yoshida 
Date:   Tue Mar 12 15:45:19 2013 -0400

Updated mdds to 0.7.0.

Change-Id: I5e4a4b80a0f83aefcd85cf5e76ccd52906d39f83

diff --git a/configure.ac b/configure.ac
index a017909..b202172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7920,7 +7920,7 @@ if test "$with_system_mdds" = "yes"; then
 AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
 [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
 AC_CHECK_HEADER(mdds/multi_type_matrix.hpp, [],
-[AC_MSG_ERROR(mdds/multi_type_matrix.hpp not found. install mdds >= 
0.6.0)], [])
+[AC_MSG_ERROR(mdds/multi_type_matrix.hpp not found. install mdds >= 
0.7.0)], [])
 CPPFLAGS="$save_CPPFLAGS"
 AC_LANG_POP([C++])
 else
diff --git a/download.lst b/download.lst
index aaa735f..75d1123 100644
--- a/download.lst
+++ b/download.lst
@@ -59,7 +59,7 @@ export LIBXML_TARBALL := 
7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 export LIBXSLT_TARBALL := 
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
+export MDDS_TARBALL := cc23006b1b77c4223bc3eebdd88dd906-mdds_0.7.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - configure.ac download.lst

[Kohei Yoshida]

 configure.ac |2 +-
 download.lst |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c94731b93c189e225cd0e8f91a6f29cd71fc1645
Author: Kohei Yoshida 
Date:   Tue Mar 12 15:45:19 2013 -0400

Updated mdds to 0.7.0.

Change-Id: I5e4a4b80a0f83aefcd85cf5e76ccd52906d39f83

diff --git a/configure.ac b/configure.ac
index 89b55e0..0a12041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7920,7 +7920,7 @@ if test "$with_system_mdds" = "yes"; then
 AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
 [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
 AC_CHECK_HEADER(mdds/multi_type_matrix.hpp, [],
-[AC_MSG_ERROR(mdds/multi_type_matrix.hpp not found. install mdds >= 
0.6.0)], [])
+[AC_MSG_ERROR(mdds/multi_type_matrix.hpp not found. install mdds >= 
0.7.0)], [])
 CPPFLAGS="$save_CPPFLAGS"
 AC_LANG_POP([C++])
 else
diff --git a/download.lst b/download.lst
index aaa735f..75d1123 100644
--- a/download.lst
+++ b/download.lst
@@ -59,7 +59,7 @@ export LIBXML_TARBALL := 
7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
 export LIBXSLT_TARBALL := 
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
+export MDDS_TARBALL := cc23006b1b77c4223bc3eebdd88dd906-mdds_0.7.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About coverity 705665 (javaunohelper.cxx)

[Tor Lillqvist]

> http://opengrok.libreoffice.org/xref/core/javaunohelper/source/javaunohelper.cxx#236)

I wonder if that native method actually gets used. If it does, it is
to load 3rd-party native UNO components (in extensions) from Java, as
all our own UNO components use a prefix, don't they?

That native com.sun.star.comp.helper.SharedLibraryLoader.component_getFactory()
method doesn't take any prefix argument, it always looks for a symbol
called exactly "component_getFactory".

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

Re: About coverity 705665 (javaunohelper.cxx)

[Michael Meeks]

Hi there,

On Tue, 2013-03-12 at 12:21 -0700, julien2412 wrote:
> leaked_storage: Variable "lib" going out of scope leaks the storage it
> points to. line 236
> (see
> http://opengrok.libreoffice.org/xref/core/javaunohelper/source/javaunohelper.cxx#236)
> I just thought adding 
> osl_unloadModule(lib) just before line 235, so last line of the block if
> (lib)

Unloading modules can be reasonably dangerous, depending on what the
application has done - particularly favourites of registering pointers
to const / static data that are then not cleaned up properly on exiting
are particularly problematic.

At least on Linux - IIRC there were some libraries that were
deliberately not un-loaded; clearly the intersection of that with Java
may make it even more problematic.

So - I'd be careful - not every apparent leak is a bug ;-)

ATB,

Michael.

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

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

About coverity 705665 (javaunohelper.cxx)

[julien2412]

Hello,

Scan coverity detected this:
leaked_storage: Variable "lib" going out of scope leaks the storage it
points to. line 236
(see
http://opengrok.libreoffice.org/xref/core/javaunohelper/source/javaunohelper.cxx#236)
I just thought adding 
osl_unloadModule(lib) just before line 235, so last line of the block if
(lib)

Now I'm not sure because I don't know at all the mechanism of modules and
wonder if the declaration of "lib" would do the trick:
oslModule lib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_LAZY |
SAL_LOADMODULE_GLOBAL );
Would " SAL_LOADMODULE_LAZY" mean unload "automagically" when necessary for
example?

Julien 



--
View this message in context: 
http://nabble.documentfoundation.org/About-coverity-705665-javaunohelper-cxx-tp4043372.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] coverity#704153: Resource leak in object

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2687

To pull it, you can do:

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

coverity#704153: Resource leak in object

Change-Id: I24fe7c8f7667bc4d847d025106673255813ddaf6
---
M package/source/zippackage/ZipPackage.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 26e7c46..3a803ea 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -163,6 +163,7 @@
 ZipPackage::~ZipPackage( void )
 {
 delete m_pZipFile;
+delete m_pRootFolder;
 
 // All folders and streams contain pointers to their parents, when a 
parent diappeares
 // it should disconnect all the children from itself during destruction 
automatically.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I24fe7c8f7667bc4d847d025106673255813ddaf6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[Libreoffice-commits] core.git: 2 commits - config_host/config_kde4.h.in configure.ac vcl/Library_vclplug_kde4.mk vcl/unx

[Luboš Luňák]

 config_host/config_kde4.h.in |   10 ++
 configure.ac |9 +++--
 vcl/Library_vclplug_kde4.mk  |   11 +++
 vcl/unx/kde4/KDEXLib.cxx |9 +++--
 4 files changed, 35 insertions(+), 4 deletions(-)

New commits:
commit 42bbe3a96ff4dfe4e2d34d522fd67c386a6c3647
Author: Luboš Luňák 
Date:   Tue Mar 12 20:05:08 2013 +0100

Qt4.8 is enough for Qt glib integration support working properly

Change-Id: Ifaec37040f81de2718506b1ed27c7b52e74c513b

diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 8bdad52..86495eb 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -48,10 +48,11 @@
 
 #if QT_VERSION >= QT_VERSION_CHECK( 4, 9, 0 )
 #define QT_UNIX_EVENT_LOOP_SUPPORT
+#endif
+
 #ifdef KDE_HAVE_GLIB
 #define GLIB_EVENT_LOOP_SUPPORT
 #endif
-#endif
 
 #ifdef GLIB_EVENT_LOOP_SUPPORT
 #include 
@@ -204,7 +205,8 @@ void KDEXLib::setupEventLoop()
 // The catch is that Qt has a bug that allows triggering timers even when they 
should
 // not be, leading to crashes caused by QClipboard re-entering the event loop.
 // (http://bugreports.qt.nokia.com/browse/QTBUG-14461), so enable only with 
Qt>=4.8.0,
-// where it is(?) fixed.
+// where it is fixed.
+#if QT_VERSION >= QT_VERSION_CHECK( 4, 8, 0 )
 if( QAbstractEventDispatcher::instance()->inherits( "QEventDispatcherGlib" 
))
 {
 eventLoopType = GlibEventLoop;
@@ -216,6 +218,7 @@ void KDEXLib::setupEventLoop()
 return;
 }
 #endif
+#endif
 #ifdef QT_UNIX_EVENT_LOOP_SUPPORT
 // When Qt does not use Glib support, it uses its own Unix event dispatcher.
 // That one has aboutToBlock() and awake() signals, but they are broken (either
commit 6fbd87113576540ff42a03f4b08857bd066f9161
Author: Luboš Luňák 
Date:   Tue Mar 12 20:04:24 2013 +0100

re-add support for KDE4 Qt+glib eventloop intergration

The necessary build stuff was apparently silently dropped during gbuild
conversion and never noticed.

Change-Id: Ib1f530b92618a9d4f11c54818e984f737abaa283

diff --git a/config_host/config_kde4.h.in b/config_host/config_kde4.h.in
new file mode 100644
index 000..6e5cddf
--- /dev/null
+++ b/config_host/config_kde4.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for KDE4 integration.
+*/
+
+#ifndef CONFIG_KDE4_H
+#define CONFIG_KDE4_H
+
+#undef KDE_HAVE_GLIB
+
+#endif
diff --git a/configure.ac b/configure.ac
index 89b55e0..a017909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10278,9 +10278,13 @@ int main(int argc, char **argv) {
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
 
-   # Glib is needed for properly handling Qt event loop with Qt's Glib 
integration enabled
+# Glib is needed for properly handling Qt event loop with Qt's Glib 
integration enabled.
+# Sets also KDE_GLIB_CFLAGS/KDE_GLIB_LIBS if successful.
 PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
-[KDE_HAVE_GLIB=1],
+[
+KDE_HAVE_GLIB=1
+AC_DEFINE(KDE_HAVE_GLIB,1)
+],
 AC_MSG_WARN([[No Glib found, KDE4 support will not integrate with Qt's 
Glib event loop support]]))
 fi
 AC_SUBST(KDE4_CFLAGS)
@@ -11722,6 +11726,7 @@ AC_CONFIG_FILES([config_host.mk Makefile lo.xcent 
instsetoo_native/util/openoffi
 AC_CONFIG_HEADERS([config_host/config_clang.h])
 AC_CONFIG_HEADERS([config_host/config_global.h])
 AC_CONFIG_HEADERS([config_host/config_graphite.h])
+AC_CONFIG_HEADERS([config_host/config_kde4.h])
 AC_CONFIG_HEADERS([config_host/config_mingw.h])
 AC_CONFIG_HEADERS([config_host/config_telepathy.h])
 AC_CONFIG_HEADERS([config_host/config_typesizes.h])
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 1079d84..ff4b89c 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -63,6 +63,17 @@ $(eval $(call gb_Library_add_libs,vclplug_kde4,\
-lICE \
 ))
 
+ifneq ($(KDE_HAVE_GLIB),)
+$(eval $(call gb_Library_add_defs,vclplug_kde4,\
+$(KDE_GLIB_CFLAGS) \
+))
+
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+$(KDE_GLIB_LIBS) \
+))
+endif
+
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
 vcl/unx/kde4/KDEData \
vcl/unx/kde4/KDE4FilePicker \
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index dbd6664..8bdad52 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -44,6 +44,8 @@
 
 #include 
 
+#include 
+
 #if QT_VERSION >= QT_VERSION_CHECK( 4, 9, 0 )
 #define QT_UNIX_EVENT_LOOP_SUPPORT
 #ifdef KDE_HAVE_GLIB
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] coverity#704143: Resource leak in object

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2686

To pull it, you can do:

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

coverity#704143: Resource leak in object

Change-Id: I6bf9fc6e65de857d4d05df0c7be64dc6ec38dc07
---
M extensions/source/abpilot/datasourcehandling.cxx
M extensions/source/abpilot/datasourcehandling.hxx
2 files changed, 5 insertions(+), 0 deletions(-)



diff --git a/extensions/source/abpilot/datasourcehandling.cxx 
b/extensions/source/abpilot/datasourcehandling.cxx
index 16bb8e3..ca82fb9 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -209,6 +209,10 @@
 OSL_FAIL( "ODataSourceContext::ODataSourceContext: caught an 
exception!" );
 }
 }
+ODataSourceContext::~ODataSourceContext()
+{
+delete(m_pImpl);
+}
 
 //-
 ::rtl::OUString& ODataSourceContext::disambiguate(::rtl::OUString& 
_rDataSourceName)
diff --git a/extensions/source/abpilot/datasourcehandling.hxx 
b/extensions/source/abpilot/datasourcehandling.hxx
index 7804f1b..3a2dab8 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -56,6 +56,7 @@
 ODataSourceContext(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB
 );
+~ODataSourceContext();
 
 /// retrieves the names of all data sources
 voidgetDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ));

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bf9fc6e65de857d4d05df0c7be64dc6ec38dc07
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[Libreoffice-commits] core.git: vcl/aqua

[Eike Rathke]

 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ba3f6551ce47c690267485f3f6f2b6004aae435c
Author: Eike Rathke 
Date:   Tue Mar 12 19:51:16 2013 +0100

maybe fix MacOSX build

Change-Id: I5a3842e95e45ee80a2a3fb7954fb16878ad16907

diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx 
b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 93c487e..2ac160d 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -315,7 +315,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, 
ImplDevFontAttributes& rDF
 // ignore font names starting with '.'
 if( aUtf16Name[0] == '.' )
 nNameValue = 0;
-else if( rDFA.GetFamilyName().Len() )
+else if( !rDFA.GetFamilyName().isEmpty() )
 {
 // even if a family name is not the one we are looking for
 // it is still useful as a font name alternative
@@ -349,7 +349,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, 
ImplDevFontAttributes& rDF
 }
 }
 
-bool bRet = (rDFA.GetFamilyName().Len() > 0);
+bool bRet = (rDFA.GetFamilyName().getLength() > 0);
 return bRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About coverity 704144 (XSLTFilter)

[julien2412]

Hello,

Scan coverity detected this:
Resource leak in object (CTOR_DTOR_LEAK)1. alloc_fn: Calling allocation
function "osl_createCondition()". [show details]
(see
http://opengrok.libreoffice.org/xref/core/filter/source/xsltfilter/XSLTFilter.cxx#164)

osl_createCondition in unx part calls a malloc function  (see
http://opengrok.libreoffice.org/xref/core/sal/osl/unx/conditn.cxx#43)
and osl_destroyCondition frees the element (see
http://opengrok.libreoffice.org/xref/core/sal/osl/unx/conditn.cxx#92)

First I thought about adding a destructor for "XSLTFilter" which would just
call "osl_destroyCondition"
but then I noticed the class "XSLTFilter" which inherits from
"WeakImplHelper4" which itself inherits from "OWeakObject"
Finally I must recognize I don't know if these classes do the trick to free
the memory or if a destructor in "XSLTFilter"  is relevant.

Any idea?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-coverity-704144-XSLTFilter-tp4043364.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: tools/source

[Thomas Arnhold]

 tools/source/fsys/tempfile.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f965bc80986ecf8b5edd153cc8b072eddf916a03
Author: Thomas Arnhold 
Date:   Tue Mar 12 16:27:38 2013 +0100

fix merge conflict

Change-Id: I015a0065a88022ad4ff93711f1faae2874ccf506

diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index 9308d7a..e771849 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.cxx
@@ -59,7 +59,7 @@ OUString ConstructTempDir_Impl()
 // use system directory
 ::rtl::OUString& rTempNameBase_Impl = TempNameBase_Impl::get();
 if ( rTempNameBase_Impl.isEmpty() )
-rTempNameBase_Impl = GetSystemTempDirPath_Impl();
+osl::FileBase::getTempDirURL( rTempNameBase_Impl );
 OUString aName = rTempNameBase_Impl;
 
 // Make sure that directory ends with a separator
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] tempfile: Creating tempfiles in a given folder is not used

[Thomas Arnhold (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/2558


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c53b263a640e53140a8ae8795181b1c5e43f26d
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Luboš Luňák 
Gerrit-Reviewer: Thomas Arnhold 

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

[Libreoffice-commits] core.git: tools/inc tools/source unotools/source

[Thomas Arnhold]

 tools/inc/tools/tempfile.hxx   |   17 ++---
 tools/source/fsys/tempfile.cxx |   95 +++--
 unotools/source/ucbhelper/tempfile.cxx |1 
 3 files changed, 31 insertions(+), 82 deletions(-)

New commits:
commit a548924aece3dc99b2aa36b5c9b0fa52de9951ae
Author: Thomas Arnhold 
Date:   Wed Mar 6 02:24:16 2013 +0100

tempfile: Creating tempfiles in a given folder is not used

It's always the case, that the default temp folder is used. aName and
aRet are always empty, pParent is no longer used. So the pParent
argument makes no sense anymore.

bDirectory makes no sense without pParent and is apparently unused
(always sal_False by default).

The include of tools/tempfile.hxx in unotools/tempfile.cxx in not
necessary.

Conflicts:
tools/source/fsys/tempfile.cxx

Change-Id: I9c53b263a640e53140a8ae8795181b1c5e43f26d

diff --git a/tools/inc/tools/tempfile.hxx b/tools/inc/tools/tempfile.hxx
index 9e84adc..8ef8c57 100644
--- a/tools/inc/tools/tempfile.hxx
+++ b/tools/inc/tools/tempfile.hxx
@@ -29,19 +29,18 @@ class TOOLS_DLLPUBLIC TempFile
 sal_BoolbKillingFileEnabled;
 
 public:
-/** Create a temporary file or directory in a given folder or the default
-tempfile folder. */
-TempFile( const String* pParent=NULL, sal_Bool bDirectory=sal_False );
+/** Create a temporary file in the default tempfile folder. */
+TempFile();
 
-/** Create a temporary file or directory in a given folder or the default
-tempfile folder; its name starts with some given characters followed by
-a counter ( example: rLeadingChars="abc" means "abc0","abc1" and so on,
-depending on existing files in that folder ).
+/** Create a temporary file in the default tempfile folder; its name starts
+with some given characters followed by a counter ( example:
+rLeadingChars="abc" means "abc0", "abc1" and so on, depending on
+existing files in that folder ).
 
 The extension string may be f.e. ".txt" or "", if no extension string 
is
 given, ".tmp" is used.
 */
-TempFile( const String& rLeadingChars, const String* pExtension=NULL, 
const String* pParent=NULL, sal_Bool bDirectory=sal_False );
+TempFile( const String& rLeadingChars, const String* pExtension=NULL );
 
 /** TempFile will be removed from disk in dtor if EnableKillingTempFile was
 called before. TempDirs will be removed recursively in that case. */
@@ -59,7 +58,7 @@ public:
 sal_Bool IsKillingFileEnabled() const { return bKillingFileEnabled; }
 
 /** Only create a name for a temporary file that would be valid at that 
moment. */
-static String   CreateTempName( const String* pParent=NULL );
+static String   CreateTempName();
 };
 
 #endif
diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index ab80c70..9308d7a 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.cxx
@@ -40,7 +40,6 @@ namespace { struct TempNameBase_Impl : public rtl::Static< 
::rtl::OUString, Temp
 struct TempFile_Impl
 {
 String  aName;
-sal_BoolbIsDirectory;
 };
 
 extern rtl::OUString GetSystemTempDirPath_Impl();
@@ -55,33 +54,13 @@ rtl::OUString GetSystemTempDirPath_Impl()
 
 #define TMPNAME_SIZE  ( 1 + 5 + 5 + 4 + 1 )
 
-OUString ConstructTempDir_Impl( const String* pParent )
+OUString ConstructTempDir_Impl()
 {
-OUString aName;
-if ( pParent && pParent->Len() )
-{
-rtl::OUString aRet;
-
-// test for valid filename
-{
-::osl::DirectoryItem aItem;
-sal_Int32 i = aRet.getLength();
-if ( aRet[i-1] == '/' )
-i--;
-
-if ( DirectoryItem::get( aRet.copy(0, i), aItem ) == 
FileBase::E_None )
-aName = aRet;
-}
-}
-
-if ( aName.isEmpty() )
-{
-// if no parent or invalid parent : use system directory
-::rtl::OUString& rTempNameBase_Impl = TempNameBase_Impl::get();
-if ( rTempNameBase_Impl.isEmpty() )
-osl::FileBase::getTempDirURL( rTempNameBase_Impl );
-aName = rTempNameBase_Impl;
-}
+// use system directory
+::rtl::OUString& rTempNameBase_Impl = TempNameBase_Impl::get();
+if ( rTempNameBase_Impl.isEmpty() )
+rTempNameBase_Impl = GetSystemTempDirPath_Impl();
+OUString aName = rTempNameBase_Impl;
 
 // Make sure that directory ends with a separator
 if( !aName.endsWith( "/" ) )
@@ -145,10 +124,10 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, 
sal_Bool bDir = sal_Tru
 }
 }
 
-String TempFile::CreateTempName( const String* pParent )
+String TempFile::CreateTempName()
 {
 // get correct directory
-String aName = ConstructTempDir_Impl( pParent );
+String aName = ConstructTempDir_Impl();
 
 // get TempFile name with default naming scheme
 CreateTempName_Impl( aName, sal_Fals

[Libreoffice-commits] core.git: Changes to 'feature/formula-core-rework'

[Luboš Luňák]

New branch 'feature/formula-core-rework' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'feature/pivot-table-result-tree'

[Kohei Yoshida]

New branch 'feature/pivot-table-result-tree' available with the following 
commits:
commit 0ece22f211bdd7a1c46ed21a146654914a41b041
Author: Kohei Yoshida 
Date:   Mon Mar 11 17:16:54 2013 -0400

fdo#60300: Work-in-progress change to rework pivot table core.

The idea is to avoid parsing the pivot table sheet output in order
to calculate GETPIVOTDATA.  The table outout is configurable, and it
will only be more configurable in the future.  The gist of my rework
is to calcualte the result of GETPIVOTDATA with the internl result
tree alone.

Also, the same result tree can be used for drill down too, which also
currently parses the table output, therefore subject to the same
limitation & fragility.

Change-Id: Ib0147e2aa2b710dfd627df7f535a685301214a52

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

PATCH

[Vishal Subbiah]

0001-removed-EESelectionMode.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] Removal finished of CreateFromAscii

[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/2685

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 
Gerrit-Reviewer: Luboš Luňák 

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

[Libreoffice-commits] core.git: vcl/aqua

[Luboš Luňák]

 vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e75fba46b0080df4fb415bdefacf74a167b6cb6e
Author: Luboš Luňák 
Date:   Tue Mar 12 18:37:58 2013 +0100

fix incorrectly applied patch

Change-Id: Ia35a4dc3c199d94cdaaefe0c632e6f08050ae63a

diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx 
b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 5703eac..93c487e 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -302,7 +302,7 @@ static bool GetDevFontAttributes( ATSUFontID nFontID, 
ImplDevFontAttributes& rDF
 else if( eEncoding == RTL_TEXTENCODING_UCS4 )
 aUtf16Name = OUString(); // TODO
 else // assume the non-unicode encoded names are byte encoded
-+aUtf16Name = OUString( &aNameBuffer[0], nNameLength, eEncoding );
+aUtf16Name = OUString( &aNameBuffer[0], nNameLength, eEncoding );
 
 // ignore empty strings
 if( aUtf16Name.getLength() <= 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx vcl/workben

[Ricardo Montania]

 vcl/unx/generic/app/salinst.cxx |6 +++---
 vcl/workben/outdevgrind.cxx |3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 08b9817b778a64b63a83744ac8b309bbed743f00
Author: Ricardo Montania 
Date:   Tue Mar 12 14:23:48 2013 -0300

Removal finished of CreateFromAscii

Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
Reviewed-on: https://gerrit.libreoffice.org/2685
Reviewed-by: Luboš Luňák 
Tested-by: Luboš Luňák 

diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index b234b8b..af958fb 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -292,9 +292,9 @@ void X11SalInstance::FillFontPathList( std::list< OString 
>& o_rFontPaths )
 const char* lang = getenv("LANG");
 if ( lang != NULL )
 {
-String aOpenWinDir( String::CreateFromAscii( 
"/usr/openwin/lib/locale/" ) );
-aOpenWinDir.AppendAscii( lang );
-aOpenWinDir.AppendAscii( "/OWfontpath" );
+OUString aOpenWinDir( "/usr/openwin/lib/locale/" );
+aOpenWinDir += OUString::createFromAscii( lang );
+aOpenWinDir += "/OWfontpath";
 
 SvFileStream aStream( aOpenWinDir, STREAM_READ );
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 3c0d375..bec832a 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -892,8 +892,7 @@ sal_uInt16 GrindApp::Exception( sal_uInt16 nError )
 switch( nError & EXC_MAJORTYPE )
 {
 case EXC_RSCNOTLOADED:
-Abort( String::CreateFromAscii(
-   "Error: could not load language resources.\nPlease 
check your installation.\n" ) );
+Abort( "Error: could not load language resources.\nPlease check 
your installation.\n" );
 break;
 }
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Removal finished of CreateFromAscii

[Ricardo Montania (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2685

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2685/1

Removal finished of CreateFromAscii

Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
---
M vcl/unx/generic/app/salinst.cxx
M vcl/workben/outdevgrind.cxx
2 files changed, 4 insertions(+), 5 deletions(-)



diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index b234b8b..af958fb 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -292,9 +292,9 @@
 const char* lang = getenv("LANG");
 if ( lang != NULL )
 {
-String aOpenWinDir( String::CreateFromAscii( 
"/usr/openwin/lib/locale/" ) );
-aOpenWinDir.AppendAscii( lang );
-aOpenWinDir.AppendAscii( "/OWfontpath" );
+OUString aOpenWinDir( "/usr/openwin/lib/locale/" );
+aOpenWinDir += OUString::createFromAscii( lang );
+aOpenWinDir += "/OWfontpath";
 
 SvFileStream aStream( aOpenWinDir, STREAM_READ );
 
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 3c0d375..bec832a 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -892,8 +892,7 @@
 switch( nError & EXC_MAJORTYPE )
 {
 case EXC_RSCNOTLOADED:
-Abort( String::CreateFromAscii(
-   "Error: could not load language resources.\nPlease 
check your installation.\n" ) );
+Abort( "Error: could not load language resources.\nPlease check 
your installation.\n" );
 break;
 }
 return 0;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bb590fef530c64adbe473cffa9e09b2e4507daf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ricardo Montania 

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

[Libreoffice-commits] core.git: connectivity/inc dbaccess/inc oox/inc sal/inc sc/inc sd/inc starmath/inc svtools/inc svx/inc sw/inc vcl/inc writerfilter/inc xmloff/inc

[Luboš Luňák]

 connectivity/inc/pch/precompiled_file.hxx |7 +++
 connectivity/inc/pch/precompiled_flat.hxx |7 +++
 dbaccess/inc/pch/precompiled_dbu.hxx  |7 +++
 oox/inc/pch/precompiled_oox.hxx   |8 
 sal/inc/pch/precompiled_sal.hxx   |7 +++
 sc/inc/pch/precompiled_sc.hxx |7 +++
 sd/inc/pch/precompiled_sd.hxx |7 +++
 starmath/inc/pch/precompiled_sm.hxx   |7 +++
 svtools/inc/pch/precompiled_svt.hxx   |7 +++
 svx/inc/pch/precompiled_svx.hxx   |7 +++
 svx/inc/pch/precompiled_svxcore.hxx   |7 +++
 sw/inc/pch/precompiled_msword.hxx |7 +++
 sw/inc/pch/precompiled_sw.hxx |7 +++
 vcl/inc/pch/precompiled_vcl.hxx   |7 +++
 writerfilter/inc/pch/precompiled_writerfilter.hxx |7 +++
 xmloff/inc/pch/precompiled_xo.hxx |7 +++
 16 files changed, 113 insertions(+)

New commits:
commit 8563f011ab4001a77ff1dfaeb74abb5900b1a73c
Author: Luboš Luňák 
Date:   Tue Mar 12 18:23:12 2013 +0100

update pch headers

Change-Id: Ibb368e6a80a73bf6bf1a097d14bc6e75b24d

diff --git a/connectivity/inc/pch/precompiled_file.hxx 
b/connectivity/inc/pch/precompiled_file.hxx
index 83eb21a..18e25b4 100644
--- a/connectivity/inc/pch/precompiled_file.hxx
+++ b/connectivity/inc/pch/precompiled_file.hxx
@@ -7,6 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 #include "sal/config.h"
 #include 
 #include 
diff --git a/connectivity/inc/pch/precompiled_flat.hxx 
b/connectivity/inc/pch/precompiled_flat.hxx
index 1cde569..e83aa35 100644
--- a/connectivity/inc/pch/precompiled_flat.hxx
+++ b/connectivity/inc/pch/precompiled_flat.hxx
@@ -7,6 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 #include 
 #include 
 #include 
diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx 
b/dbaccess/inc/pch/precompiled_dbu.hxx
index 1d358ef..b385a5c 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -7,6 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 #include "com/sun/star/beans/NamedValue.hpp"
 #include "com/sun/star/beans/XMultiPropertySet.hpp"
 #include "com/sun/star/beans/XPropertiesChangeListener.hpp"
diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx
index c1831b3..274a6d3 100644
--- a/oox/inc/pch/precompiled_oox.hxx
+++ b/oox/inc/pch/precompiled_oox.hxx
@@ -7,6 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 #include "basegfx/numeric/ftools.hxx"
 #include "comphelper/anytostring.hxx"
 #include "cppuhelper/exc_hlp.hxx"
@@ -355,6 +362,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 54ddb4e..24ff7af 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -7,6 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 #include "boost/bind.hpp"
 #include "boost/noncopyable.hpp"
 #include 
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precomp

[Libreoffice-commits] core.git: 3 commits - dbaccess/source reportbuilder/java reportdesign/source sal/inc xmloff/inc xmloff/source

[Lionel Elie Mamane]

 dbaccess/source/core/dataaccess/ModelImpl.cxx  
 |4 -
 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java   
 |9 +-
 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
 |   40 +-
 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroup.java   
 |   11 ++
 
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeGroupInstanceSection.java
 |   13 +++
 
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/GroupReadHandler.java
  |5 +
 reportdesign/source/filter/xml/xmlEnums.hxx
 |1 
 reportdesign/source/filter/xml/xmlExport.cxx   
 |   15 +++
 reportdesign/source/filter/xml/xmlfilter.cxx   
 |1 
 sal/inc/rtl/ustring.h  
 |2 
 xmloff/inc/xmloff/xmltoken.hxx 
 |1 
 xmloff/source/core/xmltoken.cxx
 |1 
 12 files changed, 88 insertions(+), 15 deletions(-)

New commits:
commit 404e5097a86325d36b17731fad568ca37839a67a
Author: Lionel Elie Mamane 
Date:   Tue Mar 12 18:06:31 2013 +0100

janitorial: typo in comment

Change-Id: Idd62c2768a03f7aab8ff11165425f8c383653f38

diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 23ea47a..ba19b83 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -1754,7 +1754,7 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uString_newTrim(
 the number of the token to return, starting at index.
 
 @param cTok
-the character that seperates the tokens.
+the character that separates the tokens.
 
 @param idx
 the position at which searching for the token starts.  Must not be greater
commit 4178806bb010129f3b13b6282547fe48ddcd
Author: Lionel Elie Mamane 
Date:   Tue Mar 12 17:57:57 2013 +0100

reportbuilder: make "Group on" not-"Each Value" actually work

Change-Id: Id5d73f9aac48ebfb6987e5bf0df37e62f1817bdc

diff --git 
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java 
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index a22be04..24e1fe1 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -139,6 +139,7 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 private static final Log LOGGER = 
LogFactory.getLog(SDBCReportDataFactory.class);
 public static final String COMMAND_TYPE = "command-type";
 public static final String ESCAPE_PROCESSING = "escape-processing";
+public static final String SORT_EXPRESSIONS = "sort-expressions";
 public static final String GROUP_EXPRESSIONS = "group-expressions";
 public static final String MASTER_VALUES = "master-values";
 public static final String MASTER_COLUMNS = "master-columns";
@@ -229,10 +230,10 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 }
 }
 
-private String getOrderStatement(final int commandType, final String 
command, final List groupExpressions)
+private String getOrderStatement(final int commandType, final String 
command, final List sortExpressions)
 {
 final StringBuffer order = new StringBuffer();
-final int count = groupExpressions.size();
+final int count = sortExpressions.size();
 if (count != 0)
 {
 try
@@ -244,7 +245,7 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 {
 for (int i = 0; i < count; i++)
 {
-final Object[] pair = (Object[]) 
groupExpressions.get(i);
+final Object[] pair = (Object[]) 
sortExpressions.get(i);
 String expression = (String) pair[0];
 
 if (!expression.startsWith(quote) && 
columns.hasByName(expression))
@@ -533,7 +534,7 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 WrappedTargetException,
 NoSuchElementException
 {
-final StringBuffer order = new 
StringBuffer(getOrderStatement(commandType, command, (ArrayList) 
parameters.get(GROUP_EXPRESSIONS)));
+final StringBuffer order = new 
StringBuffer(getOrderStatement(commandType, command, (ArrayList) 
parameters.get(SORT_EXPRESSIONS)));
 if (order.length() > 0 && commandType != CommandType.TABLE)
 {
 String statement = command;
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java 
b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java
index e1cf4f3..fc8b4ff 100644
--- a/reportbuilder/java/org/libreoffice/report/pen

[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/window/gtkframe.cxx |   32 
 1 file changed, 32 deletions(-)

New commits:
commit b1beaf3f7a7d332890ea3877b657cd014562cf33
Author: Caolán McNamara 
Date:   Tue Mar 12 16:33:01 2013 +

Resolves: rhbz#920697, #i110881#, rhbz#623191 presentation not fullscreen

Undecorated windows don't go full-screen correctly. Lets try and avoid using
gtk_window_set_decorated and rely on gtk_window_set_role to get the WM to do
the right thing.

Change-Id: I0f9e9c26372ac50398fa69c404013e3035ed637b

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 07f6fb3..9433ae5 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1091,7 +1091,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong 
nStyle )
 
 if( bDecoHandling )
 {
-bool bNoDecor = ! (nStyle & (SAL_FRAME_STYLE_MOVEABLE | 
SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_CLOSEABLE ) );
 GdkWindowTypeHint eType = GDK_WINDOW_TYPE_HINT_NORMAL;
 if( (nStyle & SAL_FRAME_STYLE_DIALOG) && m_pParent != 0 )
 eType = GDK_WINDOW_TYPE_HINT_DIALOG;
@@ -1109,7 +1108,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong 
nStyle )
 {
 eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
 lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, true );
-bNoDecor = true;
 }
 else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
 {
@@ -1124,8 +1122,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong 
nStyle )
 }
 #endif
 gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
-if( bNoDecor )
-gtk_window_set_decorated( GTK_WINDOW(m_pWindow), FALSE );
 gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
 if( m_pParent && ! (m_pParent->m_nStyle & SAL_FRAME_STYLE_PLUG) )
 gtk_window_set_transient_for( GTK_WINDOW(m_pWindow), 
GTK_WINDOW(m_pParent->m_pWindow) );
@@ -3331,40 +3327,12 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, 
GdkEventFocus* pEvent, gpointer f
 return sal_False;
 }
 
-extern "C" {
-gboolean implDelayedFullScreenHdl (void *pWindow)
-{
-SolarMutexGuard aGuard;
-
-/* #i110881# workaround a gtk issue (see
-   https://bugzilla.redhat.com/show_bug.cgi?id=623191#c8)
-   gtk_window_fullscreen can fail due to a race condition,
-   request an additional status change to fullscreen to be
-   safe: if the window is now mapped ... and wasn't
-   previously, ie. the race; we'll end up doing a nice
-   gdk_wmspec_change_state here anyway.
-*/
-if( pWindow )
-{
-gdk_window_fullscreen( GDK_WINDOW( pWindow ) );
-g_object_unref( pWindow );
-}
-
-return FALSE;
-}
-}
-
 gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame 
)
 {
 GtkSalFrame* pThis = (GtkSalFrame*)frame;
 
 GTK_YIELD_GRAB();
 
-if( pThis->m_bFullscreen )
-g_idle_add_full( G_PRIORITY_HIGH, implDelayedFullScreenHdl,
- g_object_ref( widget_get_window( pThis->m_pWindow ) ),
- NULL );
-
 bool bSetFocus = pThis->m_bSetFocusOnMap;
 pThis->m_bSetFocusOnMap = false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - solenv/bin

[Luboš Luňák]

 solenv/bin/update_pch.sh |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 7ac75351f16358fd0f9d83162eda25cca6de2622
Author: Luboš Luňák 
Date:   Tue Mar 12 17:23:18 2013 +0100

mention that temporary edits in autogenerated pch headers are ok

Change-Id: Ifafa5c8847dec80a3b80afc5e10044f9c1c8d48a

diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh
index 84ff445..39569f7 100755
--- a/solenv/bin/update_pch.sh
+++ b/solenv/bin/update_pch.sh
@@ -91,6 +91,13 @@ function list_file_includes()
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+/*
+ This file has been autogenerated by update_pch.sh . It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed. All 
such
+ manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
+ also fixes all possible problems, so it's usually better to use it).
+*/
+
 EOF
 
 # Library_svx needs this (sendreportw32.cxx)
commit 2b26ac2efca151ce00af66db9a57eea351fbd947
Author: Luboš Luňák 
Date:   Tue Mar 12 17:22:32 2013 +0100

do not require full path when passing a pch header file to update

Change-Id: Ie1b0588cf6424e836f865cda9d4451aa0e1db32d

diff --git a/solenv/bin/update_pch.sh b/solenv/bin/update_pch.sh
index fdb17a7a..84ff445 100755
--- a/solenv/bin/update_pch.sh
+++ b/solenv/bin/update_pch.sh
@@ -7,6 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+# Usage: update_pch.sh [precompiled_xxx.hxx]
+
 root=`dirname $0`
 root=`cd $root/../.. && pwd`
 
@@ -19,7 +21,7 @@ fi
 for x in $headers; do
 header=$x
 echo updating `echo $header | sed -e s%$root/%%`
-module=`echo $header | sed -e s%$root/%% -e s%/.*%%`
+module=`readlink -f $header | sed -e s%$root/%% -e s%/.*%%`
 name=`echo $header | sed -e s/.*precompiled_// -e s/\.hxx//`
 makefile="Library_$name.mk"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

WPXStringStream

[Ivan]

Hello, I am a freelance developer. And I have just found some remarks in 
this project.


1)There is a error in function:

WPXInputStream *WPXStringStream::getDocumentOLEStream(const char *name);

"if (!d->buffer.empty())" The first line in this function shouldn't have 
'!' symbol.


(line 443 in file "libwpd/WPXStreamImplementation.h")

2)WPXMemoryInputStream class doesn't have an OLE Stream implementation. 
I think this thing shoudn't depend on the type of Stream. It's better to 
make one function implementation in base WPXInputStream class.


3)I tried to compile the "libvisio" library in widows an I used "libwpd" 
twice


There are two folders with same code in my project: "libwpd-stream" and 
"libwpd".
The files inside are the same from libwpd. What about using "#include 
" instead of "#include 
"?


4)Where can I download libxml source?

Thank you!

Ivan.


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

[Libreoffice-commits] core.git: sc/qa

[Noel Power]

 sc/qa/extras/macros-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15366dbf24311734a8eae4fb7e7dadaeec12ee56
Author: Noel Power 
Date:   Tue Mar 12 16:05:39 2013 +

re-enable testStarBasic() & testVba() in for Windows ( macosx later )

Change-Id: I9f7621fdadbff1c7b1b3d0fbadf43715327e39d6

diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 972b009..da29b14 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -61,7 +61,7 @@ public:
 void testStarBasic();
 void testVba();
 CPPUNIT_TEST_SUITE(ScMacrosTest);
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(MACOSX)
 //enable this test if you want to play with star basic macros in unit tests
 //works but does nothing useful yet
 CPPUNIT_TEST(testStarBasic);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: --enable-pch option is broken?

[Lubos Lunak]

On Sunday 10 of March 2013, Peter Foley wrote:
> David,
>
> Should be fixed now.
> you can just run ./solenv/bin/update_pch.sh to auto-regenerate all the pch
> files.
> Maybe a note should be added somewhere to run it whenever header files are
> moved around?

 That is not necessary, as it was the commit doing the change that was broken. 
PCH headers are not really that special, in this regard they are normal 
headers and could/should have been changed together with all the other 
changes. Such manual changes will of course be overwritten by next 
update_pch.sh run, but incorrect #include directives should not be left in 
the sources, one way or another.

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 57061, which changed state.

Bug 57061 Summary: Not all personal data imported during install from /3 User 
Profile
https://bugs.freedesktop.org/show_bug.cgi?id=57061

   What|Removed |Added

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

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

[PUSHED libreoffice-4-0] fdo#61564 when WrappedTargetException not in specification, ...

[Fridrich Strba (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/2684

Approvals:
  Eike Rathke: Looks good to me, approved
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3c995557f320b1d0241f0ef5d94b1c9aeb66528
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Fridrich Strba 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/dataaccess/documentcontainer.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6b26441f4b01f4e01390b9a5b4710d0932751a93
Author: Lionel Elie Mamane 
Date:   Sat Mar 2 08:10:14 2013 +0100

fdo#61564 when WrappedTargetException not in specification, do not throw it!

Change-Id: Id3c995557f320b1d0241f0ef5d94b1c9aeb66528
Reviewed-on: https://gerrit.libreoffice.org/2684
Reviewed-by: Eike Rathke 
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx 
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 54cda92..8b8116a 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -38,6 +38,7 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 #include 
+#include 
 
 #include 
 #include 
@@ -557,9 +558,9 @@ Reference< XComponent > SAL_CALL 
ODocumentContainer::loadComponentFromURL( const
 {
 throw IllegalArgumentException();
 }
-catch(const WrappedTargetException&)
+catch(const WrappedTargetException &e)
 {
-throw;
+throw WrappedTargetRuntimeException(e.Message, e.Context, 
e.TargetException);
 }
 return xComp;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] add pch support to gcc

[Lubos Lunak]

On Monday 11 of March 2013, Michael Meeks wrote:
> Hi Peter,
>
> On Sun, 2013-03-10 at 21:50 +, Peter Foley (via Code Review) wrote:
> > add pch support to gcc
>
>   Sounds interesting :-) Any performance numbers and/or rough anecdotes
> of goodness to go with that ?

 I'd be interested too. I don't know about GCC (besides the rumour that PCH 
there is fragile), but with Clang I actually couldn't see any noticeable 
improvement when using PCH (barring the cases when it seems to make the 
compile even slower for me for some reason). With MSVC the difference is big 
though.

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

Pivot Table data provider extension framework (removal possibility)

[Kohei Yoshida]

Hi there,

I'd like to ask whether someone actually uses this Pivot Table data 
provider extension framework, because I'd like to remove this if nobody 
is using it, or only few people are using it.


Currently, Calc's pivot table supports 4 different backends.  They are:

1. cell range on sheet
2. named range on sheet
3. database (registered via database manager)
4. extension acting as a data provider.

The 4th one is what I'd like to get rid of.  When creating a pivot table 
via Data > Pivot Table > Create..., you'll get a dialog with these 4 
choices.  The 4th one, labeled "External source/interface" is usually 
disabled *unless* you have extension installed that implements all pivot 
table interfaces necessary to act as a data provider.  These are UNO 
interfaces that are recently *un*-published in the 4.0 release.


On this page:

https://wiki.documentfoundation.org/ReleaseNotes/4.0

All UNO services/interfaces/etc starting with

com.sun.star.sheet.DataPilotSource

and below are the ones that are relevant for this data provider 
functionality.


I believe the same functionality can be achieve via database 
connectivity, by having such external data provider register as a 
database, and use it to act as a data provider for pivot tables.  So, I 
don't see a reason why we need to keep this as a separate data source 
category.


The way it is currently implemented also makes it *extremely* difficult 
for us to optimize the pivot table engine, because all its functionality 
has to go through the UNO API which forces us to do data conversion 
*twice* for every single transaction.  That's very very expensive 
especially as the data size grows (and it always does).


So, I'd *love* to get rid of this sooner rather than later, and I'd like 
to know whether there are people who would absolutely need this 
functionality, and if so why.  As I said above, I believe the same 
functionality could be achieved via the database connectivity backend 
even if we remove the extension backend.


Thanks,

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

[Libreoffice-commits] core.git: 6 commits - desktop/inc desktop/Library_libreoffice.mk desktop/Library_sofficeapp.mk desktop/Module_desktop.mk desktop/source Repository.mk smoketest/Executable_libtest

[Michael Meeks]

 Repository.mk |2 
 desktop/Library_libreoffice.mk|   32 ++
 desktop/Library_sofficeapp.mk |5 +
 desktop/Module_desktop.mk |6 +
 desktop/inc/liblibreoffice.hxx|   29 +
 desktop/inc/liblibreoffice_impl.hxx   |   27 +
 desktop/source/lib/init.cxx   |  166 ++
 desktop/source/lib/shim.cxx   |   57 +++
 smoketest/Executable_libtest.mk   |   47 +
 smoketest/Module_smoketest.mk |6 +
 smoketest/libtest.cxx |   38 +++
 vcl/inc/vcl/svapp.hxx |5 -
 vcl/source/app/svapp.cxx  |2 
 vcl/unx/generic/plugadapt/salplug.cxx |   30 ++
 14 files changed, 429 insertions(+), 23 deletions(-)

New commits:
commit ddaf31f183fe3f2fbf76c1b87eb5a943dc6d833f
Author: Michael Meeks 
Date:   Tue Mar 5 22:21:57 2013 +

liblibo: install test library by itself and install it.

Also fix debugging with threads, find fundamentalrc correctly,
make it headless, finally loads a document then exits.

Change-Id: I2017075bf3b3c7198bde53b9fe85585089e5ab6c

diff --git a/Repository.mk b/Repository.mk
index e3ea69b..ffcf18c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 gsicheck \
 helpex \
 idxdict \
+   libtest \
 lngconvex \
 localize \
 makedepend \
diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk
index 96b18a1..dbe3e81 100644
--- a/desktop/Library_libreoffice.mk
+++ b/desktop/Library_libreoffice.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Library_set_include,libreoffice,\
 $(eval $(call gb_Library_add_libs,libreoffice,\
$(if $(filter $(OS),LINUX), \
-ldl \
+-lpthread \
) \
 ))
 
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index d97bff3..a05cceb 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
 AllLangResTarget_dkt \
 Library_deployment \
 Library_deploymentmisc \
-   Library_libreoffice \
 Library_offacc \
 Library_sofficeapp \
 Library_spl \
@@ -43,6 +42,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
 Zip_brand_dev \
 ))
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Module_add_targets,desktop,\
+   Library_libreoffice \
+))
+endif
+
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,desktop,\
 Executable_unopkg.bin \
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index de5788d..06f5eac 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -87,8 +87,20 @@ aBasicErrorFunc( const OUString &rErr, const OUString 
&rAction )
 }
 
 static void
-initialize_uno( const rtl::OUString &aUserProfileURL )
+initialize_uno( const rtl::OUString &aAppURL )
 {
+rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" );
+
+OUString aValue;
+rtl::Bootstrap::set( "CONFIGURATION_LAYERS",
+ "xcsxcu:${BRAND_BASE_DIR}/share/registry "
+ "res:${BRAND_BASE_DIR}/share/registry "
+//   
"bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 " );
+//   
"sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 "
+//   
"userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 "
+// 
"user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu"
+ );
+
 xContext = cppu::defaultBootstrap_InitialComponentContext();
 fprintf( stderr, "Uno initialized %d\n", xContext.is() );
 xFactory = xContext->getServiceManager();
@@ -96,8 +108,9 @@ initialize_uno( const rtl::OUString &aUserProfileURL )
 comphelper::setProcessServiceFactory(xSFactory);
 
 // set UserInstallation to user profile dir in test/user-template
-rtl::Bootstrap aDefaultVars;
-aDefaultVars.set(rtl::OUString("UserInstallation"), aUserProfileURL );
+//rtl::Bootstrap aDefaultVars;
+//aDefaultVars.set(rtl::OUString("UserInstallation"), aAppURL + 
"../registry" );
+// configmgr setup ?
 }
 
 bool
@@ -117,15 +130,17 @@ LibLibreOffice_Impl::initialize( const char *app_path )
 return false;
 
 try {
-initialize_uno( aAppURL + "../registry" );
+initialize_uno( aAppURL );
 force_c_locale();
+
+// Force headless
+rtl::Bootstrap::set( "SAL_USE_VCLPLUGIN", "svp" );
 InitVCL();
-if (Application::IsHeadlessM

[PATCH libreoffice-4-0] fdo#61564 when WrappedTargetException not in specification, ...

[Lionel Elie Mamane (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2684

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/2684/1

fdo#61564 when WrappedTargetException not in specification, do not throw it!

Change-Id: Id3c995557f320b1d0241f0ef5d94b1c9aeb66528
---
M dbaccess/source/core/dataaccess/documentcontainer.cxx
1 file changed, 3 insertions(+), 2 deletions(-)



diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx 
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 54cda92..8b8116a 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -38,6 +38,7 @@
 #include "core_resource.hxx"
 #include "core_resource.hrc"
 #include 
+#include 
 
 #include 
 #include 
@@ -557,9 +558,9 @@
 {
 throw IllegalArgumentException();
 }
-catch(const WrappedTargetException&)
+catch(const WrappedTargetException &e)
 {
-throw;
+throw WrappedTargetRuntimeException(e.Message, e.Context, 
e.TargetException);
 }
 return xComp;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3c995557f320b1d0241f0ef5d94b1c9aeb66528
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Lionel Elie Mamane 

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

Re: gmake instructions for running an individual unit test appear to be out of date

[Matúš Kukan]

On 12 March 2013 16:18, Lubos Lunak  wrote:
> On Tuesday 12 of March 2013, Matúš Kukan wrote:
>> On 12 March 2013 15:20, Noel Grandin  wrote:
>> > to rerun just this failed test without all others, run:
>> > make /home/noel/libo/workdir/unxlngx6/JunitTest/sfx2_complex/done
>> >
>> > When it should actually say something like (I guess?) :
>> >
>> > to rerun just this failed test without all others, run:
>> >  make JunitTest_sfx2_complex
>> >
>> > Certainly the current instructions don't work.
>>
>> Indeed, thanks.
>
>  That's strange, though. The user-friendly JunitTest_* target is just a phony
> target depending on the .../done target, so they both should work.

They work if you are already forwarded in gbuild's makefiles by
Makefile.gbuild or solenv/gbuild/partial_build.mk
but toplevel Makefile does not know the target and there is no
automatic rule to forward unknown targets.
Maybe there could be and then we don't need gbuild_TARGETS list in Makefile

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

[Libreoffice-commits] core.git: connectivity/source

[Lionel Elie Mamane]

 connectivity/source/commontools/AutoRetrievingBase.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6ea685090806a2a2f39b8d5ec6a749eaf9b1856e
Author: Lionel Elie Mamane 
Date:   Tue Mar 12 16:26:15 2013 +0100

janitorial: readability

Change-Id: Iaab09826d79b0fbcd3104d33d1f159767a09921a

diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx 
b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 6e39c85..c3a1366 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -23,9 +23,8 @@ namespace connectivity
 {
 ::rtl::OUString 
OAutoRetrievingBase::getTransformedGeneratedStatement(const ::rtl::OUString& 
_sInsertStatement) const
 {
-::rtl::OUString sStmt = _sInsertStatement;
 OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. 
isAutoRetrievingEnabled is false!");
-sStmt = sStmt.toAsciiUpperCase();
+::rtl::OUString sStmt = _sInsertStatement.toAsciiUpperCase();
 ::rtl::OUString sStatement;
 if ( sStmt.startsWith("INSERT") )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

need help with shell / configure

[Matúš Kukan]

Hi,

With ./configure --build=x86_64-unknown-linux-gnu
--host=arm-unknown-linux-gnueabihf I get:
...
checking which languages to be built... en-US
checking for alternative branding images directory... ./configure:
35560: ./configure.lineno: Syntax error: "(" unexpected
configure: error: Running configure script for BUILD system failed,
see CONF-FOR-BUILD/config.log

I can avoid this by commenting brand_vars and brand_files variables in
configure but no idea what is wrong.
It happens in configure for build platform running inside configure
for host platform.
Is it possible to re-write that part of configure ?
What could be wrong ?

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

[PUSHED libreoffice-4-0] Resolves: #i119658#, some Chinese numbering formats not supp...

[Michael Stahl (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2682

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: If3f27764352b59fdb45bf84c4a0e604c9c844077
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba 
Gerrit-Reviewer: Michael Stahl 

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

[PUSHED libreoffice-4-0] Package fonts to the fonts subpackage

[Michael Stahl (via Code Review)]

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/2683

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


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6262d46d381bd5ef8e97cd55f367cc4d12c59907
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Petr Mladek 
Gerrit-Reviewer: Michael Stahl 

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

[Jian Fang Zhang]

 writerfilter/source/dmapper/ConversionHelper.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 775c3ddd47e0619a7f0ebed6dbcba3d5b41a708e
Author: Jian Fang Zhang 
Date:   Mon Sep 3 07:50:59 2012 +

Resolves: #i119658#, some Chinese numbering formats not supported

Found by: xiao ting xiao, tingxi...@gmail.com
Patch by: bjcheny, compan...@gmail.com
Review by: zhangjf
(cherry picked from commit 50eca22976c42014f5e2c53f4bf19e2e1d21ee62)

Change-Id: If3f27764352b59fdb45bf84c4a0e604c9c844077
Signed-off-by: Fridrich Å trba 
(cherry picked from commit 3c1eba7314d3a0dae925cbe90e0cd98cfb79c81b)
Reviewed-on: https://gerrit.libreoffice.org/2682
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx 
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 88c9372..86357af 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -426,8 +426,12 @@ sal_Int16 ConvertNumberingType(sal_Int32 nNFC)
 case NS_ooxml::LN_Value_ST_NumberFormat_japaneseCounting:
 case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCounting:
 case NS_ooxml::LN_Value_ST_NumberFormat_ideographDigital:
+case NS_ooxml::LN_Value_ST_NumberFormat_chineseCountingThousand:
 nRet = style::NumberingType::NUMBER_LOWER_ZH;
 break;
+case NS_ooxml::LN_Value_ST_NumberFormat_chineseLegalSimplified:
+nRet = style::NumberingType::NUMBER_UPPER_ZH;
+break;
 default: nRet = style::NumberingType::ARABIC;
 }
 /*  TODO: Lots of additional values are available - some are supported in the 
I18 framework
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits