Re: [PATCH (partial)] fdo#48549 System::Beep() removal
2012/7/20 Mek Otar meko.o...@gmail.com: Hi, I've written a patch that remove all call to Sound:Beep. Thomas Arnhold suggest me to replace the Sound:Beep by some error reporting mechanism. My question is: What is, in your opinion, the best way to do this? Best regards Mek Otar Hi Mek, When I looked at your patch I was also wondering if such a radical deletion is such a good thing... or if it wouldn't be better to log at least in some of those cases an error messages? In my eyes these beeps were originally intended to tell the user that something unexpected happend but I agree that a beep is not the right way to do so. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH (partial)] fdo#48549 System::Beep() removal
Hey, 2012/7/23 Mathieu Vonlanthen mat_...@fastmail.fm: Hi, Here is my license statement: - All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. -- I send a new version of the patch taking into account the last commits. I didn't add error reporting because I don't know the official way to do this. Best regards Mathieu Vonlanthen Thank you very much for your work! Having reviewed your patch, I still think that a warning/logging might be helpful for latter debugging in the following files: * basctl/source/basicide/baside2.cxx - @@ -572,9 +571,6 @@ sal_Bool ModulWindow::ToggleBreakPoint( sal_uLong nLine ) - @@ -790,10 +782,7 @@ void ModulWindow::BasicAddWatch() - @@ -1022,10 +1011,6 @@ void ModulWindow::ExecuteCommand( SfxRequest rReq ) * basic/source/runtime/methods.cxx * formula/source/ui/dlg/funcutl.cxx * sc/source/ui/app/inputhdl.cxx * sc/source/ui/docshell/olinefun.cxx * sc/source/ui/navipi/content.cxx * sc/source/ui/navipi/navipi.cxx * sc/source/ui/view/viewfun2.cxx * sc/source/ui/view/viewfun6.cxx * svtools/source/edit/textview.cxx * svx/source/form/tbxform.cxx * svx/workben/edittest.cxx * sw/source/ui/utlui/content.cxx But I do not know what the general opinion of the LO developers for that cases is... Maybe they are happy without any logging in there... Whould love to hear from the others what they think. Nevertheless, removing that annoying beeps is a good thing! Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Proposal/Prototype support for fill in character in Calc Number Format Strings // final patch set
2012/7/31 Noel Power nopo...@suse.com: On 31/07/12 16:59, Johann Messner wrote: Please get my final patch info set for my local libreoffice-3.5.3 file tree on https://linux.jku.at/messner/LibreOffice/ (- file: patchInfo-31-Jul-2012__for_libreoffice.3.5.3.txt ) I am sure your changes are useful :-)), however it would be just great if possible that you could provide a diff that just shows the differences between the patch set you based your changes on and what your final version. Noel Hi Noel, to my eyes the diffs are below the text description in the .txt file. Correct me if I am wrong but with all comment lines starting with # it should be a valid patch file even if the file extension is .txt and not .patch, or not? However, I did not try to apply it since I have no source clone here. Or did I understand something wrong in your comment above? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Proposal/Prototype support for fill in character in Calc Number Format Strings // final patch set
2012/8/1 Noel Power nopo...@suse.com: On 01/08/12 09:01, Philipp Riemer wrote: Hi Noel, to my eyes the diffs are below the text description in the .txt file. Correct me if I am wrong but with all comment lines starting with # it should be a valid patch file even if the file extension is .txt and not .patch, or not? However, I did not try to apply it since I have no source clone here. Or did I understand something wrong in your comment above? I'm not disputing the validity of the patch format, but... Johann has created a patch that contains a large portion of existing patches that I already created ( that already either exist on master and/or in the mail thread referenced ) with I believe additional tweaks from himself. However since that patch is effectively a squash of his and my work it is rather difficult to see what changes he made exactly. A patch consisting solely of his changes against the source ( patched already with my patches ) would be much easier for me to read Noel Ah, ok. Then I got you wrong. Sorry. Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] translated German comments in starmath
Hi Alex, 2012/8/3 Alexander Wilms alexander.wi...@zoho.com: Hi, this is my first patch, so I don't really what the procedure is. If it's alright, can I push it? Alex Thank you very much for your contribution! I will check your patch and push it as soon as I find some time (should definitely be done before Sunday). I do not expect that you have a freedesktop account and hence commit rights to the official Git repository...and even then I would not suggest pushing directly since, as you write, this is your first contribution. Can you please also send a license statement to the mailing list (see e.g. http://nabble.documentfoundation.org/license-statement-td3999073.html)? Otherwise we cannot integrate your patch and that would be pity... For more regarding the procedure of patch contribution please have a look at the related wiki pages under https://wiki.documentfoundation.org/Development#Preparing_patches. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: starmath/source
starmath/source/accessibility.cxx |6 -
starmath/source/config.cxx|3
starmath/source/dialog.cxx| 134 +-
starmath/source/document.cxx | 24 ++
starmath/source/edit.cxx | 16 ++--
starmath/source/node.cxx | 133 +++--
6 files changed, 139 insertions(+), 177 deletions(-)
New commits:
commit 72778119fde55218354ee100481bfad2a1cedf35
Author: Alexander Wilms alexander.wi...@zoho.com
Date: Fri Aug 3 10:22:14 2012 +0200
Translated German comments in starmath (fdo#39468)
Change-Id: If3be0db9213c405525f01c92aa4dd039e3aa6aad
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/starmath/source/accessibility.cxx
b/starmath/source/accessibility.cxx
index a7b39bc..b271773 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -572,12 +572,12 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint(
const awt::Point aPoin
if (pWin)
{
const SmNode *pTree = pWin-GetView()-GetDoc()-GetFormulaTree();
-//! kann NULL sein! ZB wenn bereits beim laden des Dokuments (bevor der
-//! Parser angeworfen wurde) ins Fenster geklickt wird.
+// can be NULL! e.g. if one clicks within the window already during
loading of the
+// document (before the parser even started)
if (!pTree)
return nRes;
-// get position relativ to formula draw position
+// get position relative to formula draw position
Point aPos( aPoint.X, aPoint.Y );
aPos = pWin-PixelToLogic( aPos );
aPos -= pWin-GetFormulaDrawPos();
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index 533dd8c..15934d6 100644
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -82,8 +82,7 @@ void SmConfig::ItemSetToConfig(const SfxItemSet rSet)
{
SetIgnoreSpacesRight( bVal );
-// (angezeigte) Formeln muessen entsprechen neu formatiert werden.
-// Das erreichen wir mit:
+// reformat (displayed) formulas accordingly
Broadcast(SfxSimpleHint(HINT_FORMATCHANGED));
}
}
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 532ed8a..7edd2e1 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -53,12 +53,9 @@
using ::rtl::OUString;
-
-//
-// Da der FontStyle besser ueber die Attribute gesetzt/abgefragt wird als ueber
-// den StyleName bauen wir uns hier unsere eigene Uebersetzung
+// Since it's better to set/query the FontStyle via its attributes rather
+// than via the StyleName we create a way to translate
// Attribute - StyleName
-//
class SmFontStyles
{
@@ -135,8 +132,8 @@ const SmFontStyles GetFontStyles()
void SetFontStyle(const XubString rStyleName, Font rFont)
{
-// finden des Index passend zum StyleName fuer den leeren StyleName wird
-// 0 (nicht bold nicht italic) angenommen.
+// Find index related to StyleName. For an empty StyleName it's assumed to
be
+// 0 (neither bold nor italic).
sal_uInt16 nIndex = 0;
if (rStyleName.Len())
{
@@ -801,9 +798,8 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *,
pCheckBox )
void SmDistanceDialog::SetHelpId(MetricField rField, const rtl::OString
sHelpId)
{
-//! HelpID's die auf diese Weise explizit gesetzt werden, muessen im
-//! util Verzeichnis im File hidother.src mit Hilfe von hidspecial
-//! definiert werden!
+// HelpIDs which are explicitly set in this way have to be defined in the
+// util directory in the file hidother.src with the help of hidspecial!
const XubString aEmptyText;
#if OSL_DEBUG_LEVEL 1
@@ -862,8 +858,8 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
SmCategoryDesc *pCat;
-// merken der (evtl neuen) Einstellungen der aktiven SmCategoryDesc
-// bevor zu der neuen gewechselt wird.
+// remember the (maybe new) settings of the active SmCategoryDesc
+// before switching to the new one
if (nActiveCategory != CATEGORY_NONE)
{
pCat = Categories[nActiveCategory];
@@ -878,16 +874,15 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
aMenuButton.GetPopupMenu()-CheckItem(nActiveCategory + 1, false);
}
-// aktivieren/deaktivieren der zugehoerigen Controls in Abhaengigkeit von
der
-// gewaehlten Kategorie.
+// activation/deactivation of the associated controls depending on the
chosen category
bool bActive;
for (sal_uInt16 i = 0; i 4; i++)
{
FixedText *pFT = (FixedText * const) aWin[i][0];
MetricField *pMF = (MetricField * const) aWin[i][1];
-// Um feststellen welche Controls aktiv sein sollen wird das
-// vorhandensein einer zugehoerigen HelpID ueberprueft.
+// To determine which
Re: [PATCH] translated German comments in starmath
Heyhey, 2012/8/3 Alexander Wilms alexander.wi...@zoho.com: Hi Philipp, I do have commit rights, but I don't feel comfortable yet pushing stuff myself :) So thanks for the link. Here's my license statement: http://nabble.documentfoundation.org/License-statement-td3979585.html Kind Regards, Alex sorry, looks as if I did not search long enough for your license statement (I was assuming that you didn't do it since you wrote that this was your first contribution). In addition, I am impressed that you have commit rights w/o any contribution. I wanted to inform you that I cleaned your patch a little bit and just integrated it into the code base ;-) Thank you very much! You can find it at http://cgit.freedesktop.org/libreoffice/core/commit/?id=72778119fde55218354ee100481bfad2a1cedf35. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/crsr/crsrsh.cxx |2 +-
sw/source/core/crsr/findattr.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dde9fd99ac35bf90a3cebdc428b7f0654e12d0e8
Author: Bertrand Lorentz bertrand.lore...@gmail.com
Date: Fri Aug 3 19:21:33 2012 +0200
Translate German comments in sw/source/core/crsr/
Change-Id: Ib31c6c11162053a447112d76ed4580236fde92e8
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 78544a8..1c38bcc 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -594,7 +594,7 @@ sal_Bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara,
SwPosPara fnPosPara )
sal_Bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
SwPosSection fnPosSect)
{
-SwCallLink aLk( *this );// Crsr-Moves ueberwachen, evt. Link callen
+SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
SwCursor* pTmpCrsr = getShellCrsr( true );
sal_Bool bRet = pTmpCrsr-MoveSection( fnWhichSect, fnPosSect );
if( bRet )
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 0081079..7e85288 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -57,7 +57,7 @@ using namespace ::com::sun::star::util;
typedef std::setSwFmt* SwpFmts;
-// Sonderbehandlung fuer SvxFontItem, nur den Namen vergleichen:
+// Special case for SvxFontItem: only compare the name
int CmpAttr( const SfxPoolItem rItem1, const SfxPoolItem rItem2 )
{
switch( rItem1.Which() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] translated German comments in starmath
Hey, 2012/8/3 Alexander Wilms alexander.wi...@zoho.com: Ah thanks, I'm in the design team and got the commit rights for the new templates in 3.6, so I'm not entirely new to the project :) Ah, I see ;-) I hope this isn't too off-topic: When I want to continue working, is 'git reset --hard origin/master' all I need to do? It's one valid way that should work. Yes! But I am currently not sure if this does also pull the latest changes, so doing a git pull afterwards does not harm... gn8 Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: Translate German comments in sw/source/core/docnode/ndcopy.c...
Hey Bertrand, 2012/8/4 Gerrit ger...@gerrit.libreoffice.org: From Bertrand Lorentz bertrand.lore...@gmail.com: Hello Philipp Riemer, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/365 to look at the new patch set (#3). Change subject: Translate German comments in sw/source/core/docnode/ndcopy.cxx .. Translate German comments in sw/source/core/docnode/ndcopy.cxx Change-Id: I6de2586d54d3e0938e2e9701885a043c76f686ae --- M sw/source/core/docnode/ndcopy.cxx 1 file changed, 91 insertions(+), 99 deletions(-) Good work! However, I couldn't find your name on https://wiki.documentfoundation.org/Development/Developers and also no license statement of you (but the search page for the mailing archives is quite buggy)... Did you already send such a mail to the LibreOffice mailing list? If you did, could you please send me a link to the respective nabble/archive/... url? I will then add you to the wiki page and also integrate the patch as soon as possible. Have a great weekend! Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/docnode/ndcopy.cxx | 190 ++
1 file changed, 91 insertions(+), 99 deletions(-)
New commits:
commit bf68634a4ee34fb465cf35e019812b3ed48787a4
Author: Bertrand Lorentz bertrand.lore...@gmail.com
Date: Fri Aug 3 19:23:57 2012 +0200
fdo#39468: Translate German comments in sw/source/core/docnode/ndcopy.cxx
Change-Id: I6de2586d54d3e0938e2e9701885a043c76f686ae
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index fb49030..c15e6fc 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -224,9 +224,8 @@ namespace
}
}
-// Struktur fuer das Mappen von alten und neuen Frame-Formaten an den
-// Boxen und Lines einer Tabelle
-
+// Structure for the mapping from old and new frame formats to the
+// boxes and lines of a table
struct _MapTblFrmFmt
{
const SwFrmFmt *pOld, *pNew;
@@ -246,7 +245,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex rIdx ) const
SwTxtNode* pCpyTxtNd = (SwTxtNode*)this;
SwTxtNode* pCpyAttrNd = pCpyTxtNd;
-// kopiere die Formate in das andere Dokument:
+// Copy the formats to the other document
SwTxtFmtColl* pColl = 0;
if( pDoc-IsInsOnlyTextGlossary() )
{
@@ -265,9 +264,9 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex rIdx ) const
// METADATA: register copy
pTxtNd-RegisterAsCopyOf(*pCpyTxtNd);
-// kopiere Attribute/Text
+// Copy Attribute/Text
if( !pCpyAttrNd-HasSwAttrSet() )
-// wurde ein AttrSet fuer die Numerierung angelegt, so loesche diesen!
+// An AttrSet was added for numbering, so delete it
pTxtNd-ResetAllAttr();
// if Copy-Textnode unequal to Copy-Attrnode, then copy first
@@ -284,29 +283,25 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const
SwNodeIndex rIdx ) const
}
}
-// ??? reicht das ??? was ist mit PostIts/Feldern/FeldTypen ???
+// Is that enough? What about PostIts/Fields/FieldTypes?
// #i96213# - force copy of all attributes
pCpyTxtNd-CopyText( pTxtNd, SwIndex( pCpyTxtNd ),
pCpyTxtNd-GetTxt().Len(), true );
-//FEATURE::CONDCOLL
if( RES_CONDTXTFMTCOLL == pColl-Which() )
pTxtNd-ChkCondColl();
-//FEATURE::CONDCOLL
return pTxtNd;
}
-
static bool lcl_SrchNew( const _MapTblFrmFmt rMap, const SwFrmFmt** pPara )
{
if( rMap.pOld != *pPara )
return true;
*pPara = rMap.pNew;
-return false; // abbrechen, Pointer gefunden
+return false;
}
-
struct _CopyTable
{
SwDoc* pDoc;
@@ -332,7 +327,7 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable*
pCT )
for( _MapTblFrmFmts::const_iterator it = pCT-rMapArr.begin(); it !=
pCT-rMapArr.end(); ++it )
if ( !lcl_SrchNew( *it, (const SwFrmFmt**)pBoxFmt ) )
break;
-if( pBoxFmt == pBox-GetFrmFmt() ) // ein neues anlegen ??
+if( pBoxFmt == pBox-GetFrmFmt() ) // Create a new one?
{
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pBoxFmt-GetItemState( RES_BOXATR_FORMULA,
sal_False,
@@ -369,7 +364,7 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable*
pCT )
{
SwNodeIndex aNewIdx( *pCT-pTblNd,
pBox-GetSttIdx() - pCT-nOldTblSttIdx );
-OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), Index nicht auf einem
StartNode );
+OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), Index is not on the
start node );
pNewBox = new SwTableBox( pBoxFmt, aNewIdx, pCT-pInsLine );
pNewBox-setRowSpan( pBox-getRowSpan() );
}
@@ -384,7 +379,7 @@ static void lcl_CopyTblBox( SwTableBox* pBox, _CopyTable*
pCT )
lcl_CopyTblLine( pLine, aPara );
}
else if( pNewBox-IsInHeadline( pCT-pTblNd-GetTable() ))
-// in der HeadLine sind die Absaetze mit BedingtenVorlage anzupassen
+// In the headline, the paragraphs must match conditional styles
pNewBox-GetSttNd()-CheckSectionCondColl();
}
@@ -394,7 +389,7 @@ static void lcl_CopyTblLine( const SwTableLine* pLine,
_CopyTable* pCT )
for( _MapTblFrmFmts::const_iterator it = pCT-rMapArr.begin(); it !=
pCT-rMapArr.end(); ++it )
if ( !lcl_SrchNew( *it, (const SwFrmFmt**)pLineFmt ) )
break;
-if( pLineFmt == pLine-GetFrmFmt() ) // ein neues anlegen ??
+if( pLineFmt == pLine-GetFrmFmt() ) // Create a new one?
{
pLineFmt = pCT-pDoc-MakeTableLineFmt();
pLineFmt-CopyAttrs( *pLine-GetFrmFmt() );
@@ -402,7 +397,7 @@ static void lcl_CopyTblLine( const SwTableLine* pLine,
_CopyTable* pCT )
}
SwTableLine* pNewLine = new SwTableLine( pLineFmt,
pLine-GetTabBoxes().size(), pCT-pInsBox );
-// die neue Zeile in die Tabelle eintragen
+// Insert the new row into the table
if( pCT-pInsBox
Re: Change in core[master]: Translate German comments in sw/source/core/docnode/ndcopy.c...
Hey Bertrand, 2012/8/4 Bertrand Lorentz bertrand.lore...@gmail.com: Hi, On Sat, Aug 4, 2012 at 4:07 PM, Philipp Riemer ruderphil...@gmail.com wrote: Good work! However, I couldn't find your name on https://wiki.documentfoundation.org/Development/Developers and also no license statement of you (but the search page for the mailing archives is quite buggy)... Did you already send such a mail to the LibreOffice mailing list? If you did, could you please send me a link to the respective nabble/archive/... url? I will then add you to the wiki page and also integrate the patch as soon as possible. I've just sent my license statement to the list (my subscription request took some time to go through): http://lists.freedesktop.org/archives/libreoffice/2012-August/036264.html Cheers, Cool! I added your name to the respective wiki page and pushed the change ;-) ATB, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: regexp/inc sd/inc sd/source
regexp/inc/regexp/reclass.hxx| 233 ++-
sd/inc/anminfo.hxx | 26 +-
sd/inc/sdpage.hxx| 30 +-
sd/inc/sdpptwrp.hxx |2
sd/inc/sdxmlwrp.hxx |6
sd/source/filter/eppt/eppt.hxx |4
sd/source/filter/eppt/escherex.hxx | 16 -
sd/source/filter/eppt/pptexsoundcollection.hxx |4
sd/source/filter/html/htmlex.hxx | 10
sd/source/ui/animations/motionpathtag.hxx| 11 -
sd/source/ui/annotations/annotationtag.hxx | 10
sd/source/ui/presenter/CanvasUpdateRequester.hxx |4
12 files changed, 162 insertions(+), 194 deletions(-)
New commits:
commit 78b55ad11365bb97def308071bc45ca52cc557c7
Author: Norah A. Abanumay naban...@kacst.edu.sa
Date: Sun Aug 5 13:32:31 2012 +0300
Convert documents to follow the doxygen standard (fdo#44502, fdo#39468)
Change-Id: I58c73f74d53b5dc2eb462fb03664be65d4500170
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/regexp/inc/regexp/reclass.hxx b/regexp/inc/regexp/reclass.hxx
index cc9bf1d..1b1f6d9 100644
--- a/regexp/inc/regexp/reclass.hxx
+++ b/regexp/inc/regexp/reclass.hxx
@@ -45,35 +45,35 @@
typedef enum
{
#ifdef _XOPEN_SOURCE
- REG_ENOSYS = -1, /* This will never happen for this implementation. */
+ REG_ENOSYS = -1, /// This will never happen for this implementation.
#endif
- REG_NOERROR = 0, /* Success. */
- REG_NOMATCH, /* Didn't find a match (for regexec). */
+ REG_NOERROR = 0, /// Success.
+ REG_NOMATCH, /// Didn't find a match (for regexec).
/* POSIX regcomp return error codes. (In the order listed in the
standard.) */
- REG_BADPAT, /* Invalid pattern. */
- REG_ECOLLATE, /* Not implemented. */
- REG_ECTYPE, /* Invalid character class name. */
- REG_EESCAPE, /* Trailing backslash. */
- REG_ESUBREG, /* Invalid back reference. */
- REG_EBRACK, /* Unmatched left bracket. */
- REG_EPAREN, /* Parenthesis imbalance. */
- REG_EBRACE, /* Unmatched \{. */
- REG_BADBR,/* Invalid contents of \{\}. */
- REG_ERANGE, /* Invalid range end. */
- REG_ESPACE, /* Ran out of memory. */
- REG_BADRPT, /* No preceding re for repetition op. */
+ REG_BADPAT, /// Invalid pattern.
+ REG_ECOLLATE, /// Not implemented.
+ REG_ECTYPE, /// Invalid character class name.
+ REG_EESCAPE, /// Trailing backslash.
+ REG_ESUBREG, /// Invalid back reference.
+ REG_EBRACK, /// Unmatched left bracket.
+ REG_EPAREN, /// Parenthesis imbalance.
+ REG_EBRACE, /// Unmatched \{.
+ REG_BADBR,/// Invalid contents of \{\}.
+ REG_ERANGE, /// Invalid range end.
+ REG_ESPACE, /// Ran out of memory.
+ REG_BADRPT, /// No preceding re for repetition op.
/* Error codes we've added. */
- REG_EEND, /* Premature end. */
- REG_ESIZE,/* Compiled pattern bigger than 2^16 bytes. */
- REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */
+ REG_EEND, /// Premature end.
+ REG_ESIZE,/// Compiled pattern bigger than 2^16 bytes.
+ REG_ERPAREN /// Unmatched ) or \); not returned from regcomp.
} reg_errcode_t;
-/* This data structure represents a compiled pattern. Before calling
+/** This data structure represents a compiled pattern. Before calling
the pattern compiler, the fields `buffer', `allocated', `fastmap',
can be set. After the pattern has been
compiled, the `re_nsub' field is available. All other fields are
@@ -83,44 +83,41 @@ struct REGEXP_DLLPUBLIC re_pattern_buffer
{
/* [[[begin pattern_buffer]]] */
/* Space that holds the compiled pattern. It is declared as
- `unsigned char *' because its elements are
- sometimes used as array indexes. */
+ `unsigned char *' because its elements are
+sometimes used as array indexes. */
sal_Unicode *buffer;
-/* Number of bytes to which `buffer' points. */
+ /// Number of bytes to which `buffer' points.
sal_uInt32 allocated;
-/* Number of bytes actually used in `buffer'. */
+ /// Number of bytes actually used in `buffer'.
sal_uInt32 used;
-/* Pointer to a fastmap, if any, otherwise zero. re_search uses
- the fastmap, if there is one, to skip over impossible
- starting points for matches. */
+ /** Pointer to a fastmap, if any, otherwise zero. re_search uses the
fastmap,
+ if there is one, to skip over impossible starting points for matches. */
sal_Unicode *fastmap;
-
-/* Number of subexpressions found by the compiler. */
+ /// Number of subexpressions found by the compiler.
size_t re_nsub;
-/* Zero if this pattern cannot match the empty string, one else.
- Well, in truth it's used
[PUSHED] Re: [PATCH] translated German comments in starmath
Patch was pushed, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=72778119fde55218354ee100481bfad2a1cedf35. Sorry, forgot to send a mail/change the mail subject. Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] a few lines of German translation
Hey Daniel, 2012/8/9 Daniel Herde dan...@dher.de: Please review the translation of the german comments in some of the source files in dbaccess/source. More will follow. Thanks, Daniel. Thank you very much! I will take care of you patch. However, before I'll integrate it, could you please send a license statement to the mailing list that we than can link under https://wiki.documentfoundation.org/Development/Developers? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - dbaccess/source
dbaccess/source/ui/control/marktree.cxx | 37 +-
dbaccess/source/ui/control/sqledit.cxx | 21 ++--
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 44 ++---
dbaccess/source/ui/dlg/adtabdlg.cxx | 60 +---
dbaccess/source/ui/dlg/dbfindex.cxx | 54 -
dbaccess/source/ui/dlg/queryfilter.cxx | 37 --
dbaccess/source/ui/dlg/queryorder.cxx | 19 ---
7 files changed, 58 insertions(+), 214 deletions(-)
New commits:
commit 95ab516729ccf847f6e588a224677314afb77b29
Author: Philipp Riemer ruderphil...@gmail.com
Date: Fri Aug 10 20:53:16 2012 +0200
fdo#39468: Translate German comments in dbaccess/
Follow-up patch of b803fa2579256979bac83f0b193f2c30d524d76b.
Change-Id: I86bea8483cc9a9703cc725eaef641c2df5896af0
diff --git a/dbaccess/source/ui/control/marktree.cxx
b/dbaccess/source/ui/control/marktree.cxx
index 7efa249..07367d8 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -79,7 +79,7 @@ void OMarkableTreeListBox::InitButtonData()
void OMarkableTreeListBox::KeyInput( const KeyEvent rKEvt )
{
-// nur wenn space
+// only if there are spaces
if (rKEvt.GetKeyCode().GetCode() == KEY_SPACE
!rKEvt.GetKeyCode().IsShift() !rKEvt.GetKeyCode().IsMod1())
{
SvLBoxEntry* pCurrentHandlerEntry = GetHdlEntry();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index d587959..88a24f5 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -343,7 +343,7 @@ DBG_NAME(OTextConnectionHelper)
pErrorWin = m_aTextSeparator;
}
else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText())
-{ // Zehner und TextTrenner duerfen nicht gleich sein
+{ // Tenner and TextSeparator must not be the same
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii(#1,m_aTextSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii(#2,m_aDecimalSeparatorLabel.GetText());
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx
b/dbaccess/source/ui/dlg/dbfindex.cxx
index 88e6616..9dd9916 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -387,7 +387,7 @@ void ODbaseIndexDialog::Init()
void ODbaseIndexDialog::SetCtrls()
{
-// ComboBox Tabellen
+// ComboBox tables
for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
aLoop != m_aTableInfoList.end();
++aLoop
@@ -428,7 +428,7 @@ void ODbaseIndexDialog::SetCtrls()
// OTableInfo
--
void OTableInfo::WriteInfFile( const String rDSN ) const
{
-// INF-Datei oeffnen
+// open INF file
INetURLObject aURL;
aURL.SetSmartProtocol(INET_PROT_FILE);
String aDsn = rDSN;
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx
b/dbaccess/source/ui/dlg/queryfilter.cxx
index affc779..cbcee0e 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -727,7 +727,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *,
pListBox )
}
else
{
-OSL_FAIL(DlgFilterCrit::ListSelectHdl: Diese Column d�rfte
garnicht vorhanden sein!);
+OSL_FAIL(DlgFilterCrit::ListSelectHdl: This column should not
exist at all.);
}
}
pComp-SelectEntryPos(0);
commit 25a56559db5d7dbf6ebee979b0b1aaf6be2a64e3
Author: Philipp Riemer ruderphil...@gmail.com
Date: Fri Aug 10 20:50:33 2012 +0200
cleaned-up comments
Files were originally touched by b803fa2579256979bac83f0b193f2c30d524d76b.
This is just a follow-up patch.
Change-Id: I1e35d5e3c3d193bb5dfdb4b743328d8d22466a4d
diff --git a/dbaccess/source/ui/control/marktree.cxx
b/dbaccess/source/ui/control/marktree.cxx
index 830f138..7efa249 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -17,23 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include marktree.hxx
#include dbu_control.hrc
#include vcl/svapp.hxx
-//.
namespace dbaui
{
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-//.
+using namespace ::com::sun::star::lang;
+
#define SPACEBETWEENENTRIES 4
-//
-//= OMarkableTreeListBox
-//
+
DBG_NAME(OMarkableTreeListBox
[Libreoffice-commits] .: toolkit/inc toolkit/source unotools/inc unotools/source xmloff/source
toolkit/inc/toolkit/awt/vclxgraphics.hxx |3 +
toolkit/inc/toolkit/awt/vclxprinter.hxx |2 -
toolkit/inc/toolkit/controls/stdtabcontroller.hxx |2 -
toolkit/inc/toolkit/helper/property.hxx |4 +-
toolkit/source/awt/vclxcontainer.cxx | 15
toolkit/source/awt/vclxwindow.cxx | 19 +--
toolkit/source/awt/vclxwindows.cxx| 16 +
toolkit/source/controls/stdtabcontroller.cxx | 34 +---
toolkit/source/controls/stdtabcontrollermodel.cxx | 17 --
toolkit/source/controls/unocontrol.cxx| 28
toolkit/source/controls/unocontrolbase.cxx|2 -
toolkit/source/controls/unocontrolcontainer.cxx | 16 -
toolkit/source/controls/unocontrolmodel.cxx | 37 ++
toolkit/source/controls/unocontrols.cxx | 15
toolkit/source/helper/unowrapper.cxx |8 ++--
unotools/inc/unotools/textsearch.hxx | 17 --
unotools/source/i18n/textsearch.cxx |8 ++--
xmloff/source/draw/sdxmlexp.cxx |2 -
xmloff/source/text/txtprmap.cxx |2 -
19 files changed, 122 insertions(+), 125 deletions(-)
New commits:
commit be88027c327b5f09d134f235db100ec54afdc30d
Author: Oliver Günther m...@oliverguenther.de
Date: Thu Aug 9 14:47:19 2012 +0200
fdo#39468: Translate German comments in toolkit,unotools, xmloff
Also checked the following with bin/find-german-comments (all
false positives):
- sysui
- xml2cmp
- udm
- ucb
Change-Id: I2c72f973f5cecf56d70b5419e56338170dd55a2e
diff --git a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
index 1feea0b..a63723d 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
@@ -61,7 +61,8 @@ class VCLXGraphics :public
::com::sun::star::awt::XGraphics,
public ::cppu::OWeakObject
{
private:
-::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice
mxDevice; // nur um bei getDevice() immer das gleiche zurueckzugeben
+// used to return same reference on each call to getDevice()
+::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice mxDevice;
OutputDevice* mpOutputDevice;
FontmaFont;
diff --git a/toolkit/inc/toolkit/awt/vclxprinter.hxx
b/toolkit/inc/toolkit/awt/vclxprinter.hxx
index 0e962c8..6671f83 100644
--- a/toolkit/inc/toolkit/awt/vclxprinter.hxx
+++ b/toolkit/inc/toolkit/awt/vclxprinter.hxx
@@ -34,7 +34,7 @@
#include vcl/oldprintadaptor.hxx
-// Fuer den Drucker relevante Properties:
+// relevant properties for the printer:
/*
sal_Bool Horizontal
sal_uInt16 CopyCount;
diff --git a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
index de6420e..dd54c95 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
@@ -45,7 +45,7 @@ private:
protected:
::osl::Mutex GetMutex() { return maMutex; }
sal_BoolImplCreateComponentSequence(
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference
::com::sun::star::awt::XControl rControls, const
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference
::com::sun::star::awt::XControlModel rModels,
::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference
::com::sun::star::awt::XWindow rComponents,
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any* pTabStops,
sal_Bool bPeerComponent ) const;
-// wenn rModels kuerzer als rControls ist, werden nur die rModels
entsprechenden Elemente geliefert und die korrespondierenden Elemente aus
rControls entfernt
+// if sequence length of rModels is less than rControls, return only the
matching elements in rModels sequence and remove corresponding elements from
rControls
voidImplActivateControl( sal_Bool bFirst ) const;
public:
diff --git a/toolkit/inc/toolkit/helper/property.hxx
b/toolkit/inc/toolkit/helper/property.hxx
index dd4bdd1..a44db62 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.hxx
@@ -55,7 +55,7 @@ namespace rtl {
#define BASEPROPERTY_LINECOLOR 5 // sal_Int32
#define BASEPROPERTY_BORDER 6 // sal_Int16
#define BASEPROPERTY_ALIGN 7 // sal_Int16
-#define BASEPROPERTY_FONTDESCRIPTOR 8 //
::com::sun::star::awt::FontDescriptor, war mal Font, aber nie gespeichert...
+#define BASEPROPERTY_FONTDESCRIPTOR 8 //
::com::sun::star::awt::FontDescriptor
#define BASEPROPERTY_DROPDOWN9 // sal_Bool
#define BASEPROPERTY_MULTILINE 10
[PUSHED][PATCH] fdo#39468 translate German comments, removing redundant ones
2012/8/9 Oliver Günther m...@oliverguenther.de: I've translated the following core folders: toolkit, unotools, xmloff Please review the respective patch for fdo#39468 that I've attached to this post. The following reported folders (from the find-german-comments script) only yield false positves: - sysui, xml2cmp, udm, ucb All of my past future contributions to LibreOffice are licensed under the MPL 1.1 and LGPLv3+ dual license. Thanks, Oliver Pushed! Thank you very much! However, I had to remove some trailing whitespaces in your patch before pushing it (git warns you when committing). Please take care of those in your next contribution. Hope to see more of such great work from you again soon ;-) gn8, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxwindows.cxx |2 +-
toolkit/source/controls/unocontrols.cxx |2 +-
toolkit/source/helper/unowrapper.cxx|4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1e0a822fa14eb4f8d3da80cf76dd5a43df472649
Author: Philipp Riemer ruderphil...@gmail.com
Date: Fri Aug 10 23:47:53 2012 +0200
fdo#39468: Translate remaining German comments in toolkit/
This is a follow-up patch of be88027c327b5f09d134f235db100ec54afdc30d
translating the remaing comments that were missed there.
Change-Id: I7866060ef6eec5f92751671bd4fc4bee64db149b
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 586d3a6..88ae10a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -467,7 +467,7 @@ void VCLXButton::setActionCommand( const ::rtl::OUString
rCommand ) throw(::com
if ( pButton )
{
Size aMinSz = pButton-CalcMinimumSize();
-// Kein Text, also Image
+// no text, thus image
if ( !pButton-GetText().Len() )
{
if ( aSz.Width() aMinSz.Width() )
diff --git a/toolkit/source/controls/unocontrols.cxx
b/toolkit/source/controls/unocontrols.cxx
index 9d7c942..7fa0101 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -926,7 +926,7 @@ UnoImageControlControl::UnoImageControlControl( const
Reference XMultiServiceFa
:UnoImageControlControl_Base( i_factory )
,maActionListeners( *this )
{
-// Woher die Defaults nehmen?
+// TODO: Where should I look for defaults?
maComponentInfos.nWidth = 100;
maComponentInfos.nHeight = 100;
}
diff --git a/toolkit/source/helper/unowrapper.cxx
b/toolkit/source/helper/unowrapper.cxx
index 1712622..aab4433 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -258,8 +258,8 @@ sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window*
pPossibleChild )
void UnoWrapper::WindowDestroyed( Window* pWindow )
{
-// ggf. existieren noch von ::com::sun::star::loader::Java erzeugte
Children, die sonst erst
-// im Garbage-Collector zerstoert werden...
+// their still might be some children created with
::com::sun::star::loader::Java
+// that would otherwise not be destroyed until the garbage collector
cleans up
Window* pChild = pWindow-GetWindow( WINDOW_FIRSTCHILD );
while ( pChild )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/inc/DExport.hxx | 22 ++--- dbaccess/source/ui/inc/FieldDescControl.hxx |7 +--- dbaccess/source/ui/inc/HtmlReader.hxx| 12 +++ dbaccess/source/ui/inc/JoinExchange.hxx |2 - dbaccess/source/ui/inc/JoinTableView.hxx | 30 ++ dbaccess/source/ui/inc/QEnumTypes.hxx|3 + dbaccess/source/ui/inc/QueryTableView.hxx| 37 --- dbaccess/source/ui/inc/RelationTableView.hxx |4 +- dbaccess/source/ui/inc/RtfReader.hxx | 10 +++--- dbaccess/source/ui/inc/TableConnection.hxx |9 +++-- dbaccess/source/ui/inc/TableConnectionData.hxx | 10 +++--- dbaccess/source/ui/inc/TableDesignControl.hxx|4 +- dbaccess/source/ui/inc/TableDesignHelpBar.hxx|5 +-- dbaccess/source/ui/inc/TableFieldDescription.hxx |4 +- 14 files changed, 84 insertions(+), 75 deletions(-) New commits: commit 401a454c2da7560d5ec41ef07ac116403956c55a Author: Daniel Herde dan...@dher.de Date: Fri Aug 10 21:24:32 2012 +0200 fdo#39468: Translate German comments in dbaccess/source/ui/inc Change-Id: Ibf6993a5b935d4ca4e0c792e8676b293ab224d68 diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 9b1fa8b..974d7c3 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -60,8 +60,8 @@ namespace dbaui typedef ::std::vector ::std::pairsal_Int32,sal_Int32TPositions; protected: -TPositions m_vColumns; // Welche Spalten ubernommen werden sollen -::std::vectorsal_Int32m_vColumnTypes; // FeldTypen fur schnelleren Zugriff +TPositions m_vColumns; // columns to be used +::std::vectorsal_Int32m_vColumnTypes; // ColumnTypes for faster access ::std::vectorsal_Int32m_vColumnSize; ::std::vectorsal_Int16m_vNumberFormat; ::com::sun::star::lang::Locale m_aLocale; @@ -84,20 +84,20 @@ namespace dbaui //for save the selected tablename ::rtl::OUString m_sDefaultTableName; -String m_sTextToken; // Zellen Inhalt +String m_sTextToken; /// cell content String m_sNumToken;/// SDNUM value String m_sValToken;/// SDVAL value TOTypeInfoSPm_pTypeInfo;// contains the default type const TColumnVector* m_pColumnList; const OTypeInfoMap* m_pInfoMap; -sal_Int32 m_nColumnPos; // aktuelle Spaltenposition -sal_Int32 m_nRows;// Anzahl der Zeilen die durchsucht werden sollen +sal_Int32 m_nColumnPos; // current column position +sal_Int32 m_nRows;// number of rows to be searched sal_Int32 m_nRowCount;// current count of rows -rtl_TextEncodingm_nDefToken;// Sprache -sal_Boolm_bError; // Fehler und Abbruchstatus -sal_Boolm_bInTbl; // Ist gesetzt, wenn der Parser sich in der RTF Tabelle befindet -sal_Boolm_bHead;// ist true, wenn die Kopfzeile noch nicht gelesen wurde -sal_Boolm_bDontAskAgain;// Falls beim Einfugen ein Fehler auftritt, soll die Fehlermeldung nicht +rtl_TextEncodingm_nDefToken;// language +sal_Boolm_bError; // error and termination code +sal_Boolm_bInTbl; // true, if parser is in RTF table +sal_Boolm_bHead;// true, if the header hasn't been read yet +sal_Boolm_bDontAskAgain;// if there is an error when pasting, don't show it again sal_Boolm_bIsAutoIncrement; // if PKey is set by user sal_Boolm_bFoundTable; // set to true when a table was found sal_Boolm_bCheckOnly; @@ -139,7 +139,7 @@ namespace dbaui SvStream _rInputStream ); -// wird fur auto. Typ-Erkennung gebraucht +// required for automatic type recognition ODatabaseExport( sal_Int32 nRows, const TPositions _rColumnPositions, diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 69c6bc8..e19baf1 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -26,7 +26,7 @@ #include TypeInfo.hxx //-- -// die Spalten einer Feld-Beschreibung einer Tabelle +// field description columns of a table #define FIELD_NAME 1 #define FIELD_TYPE 2 #define HELP_TEXT 3 @@
[PUSHED][PATCH] more german translations in dbaccess
2012/8/10 Daniel Herde dan...@dher.de: Hi, here are some more translations of german comments. Have a nice friday evening, Daniel. Thank you very much! However, I had to clean up your patch before applying it since it contained trailing whitespaces. Please take care about this when preparing the next patch (git should warn you when adding a file, maybe try git add -p FILE)! Looking forward to see more of such great patches from you! Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
same id twice in dbaccess/source/ui/inc/FieldDescControl.hxx ?
Hello, When integrating a translation patch (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=401a454c2da7560d5ec41ef07ac116403956c55a) I realized that in dbaccess/source/ui/inc/FieldDescControl.hxx there is twice the same number assigned to two different constants. Should this be that way or is it a mistake/bug/... ? If it is a wished behavior, maybe a short comment behind the constant declaration of someone knowing the code better than me would help here. --- snip --- #define COLUMN_DESCRIPTION 4 #define FIELD_FIRST_VIRTUAL_COLUMN 5 #define FIELD_PROPERTY_REQUIRED 5 #define FIELD_PROPERTY_NUMTYPE 6 --- snip --- Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/inc/DExport.hxx | 47 +- dbaccess/source/ui/inc/HtmlReader.hxx|6 - dbaccess/source/ui/inc/JoinTableView.hxx | 104 +++ dbaccess/source/ui/inc/QueryTableView.hxx| 44 - dbaccess/source/ui/inc/RelationTableView.hxx | 13 +- dbaccess/source/ui/inc/RtfReader.hxx |4 dbaccess/source/ui/inc/TableConnection.hxx | 19 ++-- dbaccess/source/ui/inc/TableConnectionData.hxx | 22 ++-- dbaccess/source/ui/inc/TableDesignControl.hxx|5 - dbaccess/source/ui/inc/TableFieldDescription.hxx |8 - 10 files changed, 139 insertions(+), 133 deletions(-) New commits: commit 5c293bfa9023fcc4fbb104c49e9ef28d23b38594 Author: Philipp Riemer ruderphil...@gmail.com Date: Sun Aug 12 18:22:40 2012 +0200 convert comments into doxygen style + reformat some existing ones Change-Id: Ia9580f8d6ef19025654b5486816e5a75f76f1174 diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index 974d7c3..5b6c72f 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -60,46 +60,46 @@ namespace dbaui typedef ::std::vector ::std::pairsal_Int32,sal_Int32TPositions; protected: -TPositions m_vColumns; // columns to be used -::std::vectorsal_Int32m_vColumnTypes; // ColumnTypes for faster access +TPositions m_vColumns; /// columns to be used +::std::vectorsal_Int32m_vColumnTypes; /// ColumnTypes for faster access ::std::vectorsal_Int32m_vColumnSize; ::std::vectorsal_Int16m_vNumberFormat; ::com::sun::star::lang::Locale m_aLocale; -TColumnsm_aDestColumns; // container for new created columns +TColumnsm_aDestColumns; /// container for new created columns TColumnVector m_vDestVector; -::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySetm_xTable; // dest table -::com::sun::star::uno::Reference ::com::sun::star::container::XNameAccess m_xTables; // container -SharedConnection m_xConnection; // dest conn +::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySetm_xTable; /// dest table +::com::sun::star::uno::Reference ::com::sun::star::container::XNameAccess m_xTables; /// container +SharedConnection m_xConnection; /// dest conn ::boost::shared_ptrIUpdateHelper m_pUpdateHelper; -::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet m_xResultSet; // -::com::sun::star::uno::Reference ::com::sun::star::util::XNumberFormatter m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier +::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet m_xResultSet; +::com::sun::star::uno::Reference ::com::sun::star::util::XNumberFormatter m_xFormatter; /// a number formatter working with the connection's NumberFormatsSupplier ::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory m_xFactory; ::com::sun::star::util::Date m_aNullDate; SvNumberFormatter* m_pFormatter; SvStream m_rInputStream; -//for save the selected tablename +/// for saving the selected tablename ::rtl::OUString m_sDefaultTableName; -String m_sTextToken; /// cell content -String m_sNumToken;/// SDNUM value -String m_sValToken;/// SDVAL value -TOTypeInfoSPm_pTypeInfo;// contains the default type +String m_sTextToken; /// cell content +String m_sNumToken;/// SDNUM value +String m_sValToken;/// SDVAL value +TOTypeInfoSPm_pTypeInfo;/// contains the default type const TColumnVector* m_pColumnList; const OTypeInfoMap* m_pInfoMap; -sal_Int32 m_nColumnPos; // current column position -sal_Int32 m_nRows;// number of rows to be searched -sal_Int32 m_nRowCount;// current count of rows -rtl_TextEncodingm_nDefToken;// language -sal_Boolm_bError; // error and termination code -sal_Boolm_bInTbl; // true, if parser is in RTF table -sal_Boolm_bHead;// true
[Libreoffice-commits] .: 5 commits - dbaccess/source
dbaccess/source/ui/inc/DExport.hxx | 37 +++
dbaccess/source/ui/inc/FieldDescControl.hxx | 11 --
dbaccess/source/ui/inc/HtmlReader.hxx| 15 --
dbaccess/source/ui/inc/JoinExchange.hxx | 13 --
dbaccess/source/ui/inc/JoinTableView.hxx | 72 +++---
dbaccess/source/ui/inc/QEnumTypes.hxx|4
dbaccess/source/ui/inc/QueryTableView.hxx| 18 +--
dbaccess/source/ui/inc/RelationTableView.hxx | 17 +--
dbaccess/source/ui/inc/RtfReader.hxx |4
dbaccess/source/ui/inc/TableConnection.hxx |3
dbaccess/source/ui/inc/TableConnectionData.hxx | 22 +---
dbaccess/source/ui/inc/TableDesignControl.hxx| 19 +--
dbaccess/source/ui/inc/TableDesignHelpBar.hxx|8 -
dbaccess/source/ui/inc/TableFieldDescription.hxx | 117 +++
14 files changed, 170 insertions(+), 190 deletions(-)
New commits:
commit 6bf0ea22d6198def6b59f45a93960842a3198bf9
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Aug 12 18:55:05 2012 +0200
formatted a missed comment into doxygen style
This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a.
Change-Id: I33d995fd195b6f40644ce124de2578bde7a2c85c
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx
b/dbaccess/source/ui/inc/JoinTableView.hxx
index e554095..8c97240 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -232,13 +232,18 @@ namespace dbaui
/** @note can be used for special ui handling after dd */
virtual void lookForUiActivities();
-/// called after moving/resizing TabWins
-/// (the standard implementation just passes the new data to the Wins)
+/** Hook that is called after moving/resizing TabWins
+
+The position is 'virtual': the container has a virtual area of
+which only a part - changeable by scroll bar - is visible.
+Therefore: ptOldPosition is always positive, even if it represents
+a point with a negative physical ordinate above the visible area
+
+@note The standard implementation just passes the new data to the
+ Wins
+ */
virtual void TabWinMoved(OTableWindow* ptWhich, const Point
ptOldPosition);
-// the position is 'virtual': the container has a virtual area
-// of which only a part - changeable by scroll bar - is visible
-// therefore: ptOldPosition is always positive, even if it
represents
-// a point with a negative physical ordinate above the visible area
+
virtual void TabWinSized(OTableWindow* ptWhich, const Point
ptOldPosition, const Size szOldSize);
void modified();
commit 5ffdd7803d302f240e749750d92dc36fe23ae9a5
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Aug 12 18:48:35 2012 +0200
change indentation
This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a.
Change-Id: Idf2c7da3e449dec1afcc0aa3683ea46c6172420a
diff --git a/dbaccess/source/ui/inc/DExport.hxx
b/dbaccess/source/ui/inc/DExport.hxx
index 8eda75f..e1c4068 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -153,9 +153,9 @@ namespace dbaui
SvStream _rInputStream
);
-voidSetColumnTypes(const TColumnVector* rList,const OTypeInfoMap*
_pInfoMap);
+void SetColumnTypes(const TColumnVector* rList,const OTypeInfoMap*
_pInfoMap);
-inline voidSetTableName(const ::rtl::OUString
_sTableName){ m_sDefaultTableName = _sTableName ; }
+inline void SetTableName(const ::rtl::OUString _sTableName){
m_sDefaultTableName = _sTableName ; }
virtual void release() = 0;
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx
b/dbaccess/source/ui/inc/HtmlReader.hxx
index a1c14f8..f00d25c 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.hxx
@@ -66,8 +66,8 @@ namespace dbaui
const OTypeInfoMap* _pInfoMap,
sal_Bool _bAutoIncrementEnabled);
-virtual SvParserState CallParser();// base class
-virtual void release();
+virtual SvParserState CallParser();// base class
+virtual void release();
/// @attention recovers only valid data if 1. CTOR has been used
};
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx
b/dbaccess/source/ui/inc/JoinTableView.hxx
index 40aefff..e554095 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -137,7 +137,7 @@ namespace dbaui
virtual void RemoveTabWin( OTableWindow* pTabWin );
// hide all TabWins (does NOT delete them; they are put in an UNDO
action)
-virtual voidHideTabWins();
+virtual void HideTabWins();
virtual void
Re: same id twice in dbaccess/source/ui/inc/FieldDescControl.hxx ?
opengrok shows FIELD_FIRST_VIRTUAL_COLUMN used only in dbaccess/source/ui/tabledesign/TEditControl.cxx, where two lines read ... if( nColId FIELD_FIRST_VIRTUAL_COLUMN ) My conclusion is that the definitions are reasonable. HTH, Terry. Ok. Sorry, I did not grok for it but asked directly... Next time I will hopefully do it upfront before asking embarrassing questions again..! Thank you very much for the fast answer! Philipp PS1: So I will write a little explanatory comment at this line, ok? PS2: I had to read your comment at Nabble since it was not forwarded by mail: 2012/8/12 Terrence Enger ten...@iseries-guru.com: -- View this message in context: http://nabble.documentfoundation.org/same-id-twice-in-dbaccess-source-ui-inc-FieldDescControl-hxx-tp4000772p4000819.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: [PATCH] fdo#39468 translate German comments in core/tools
Hey Oliver,
2012/8/12 Oliver Günther m...@oliverguenther.de:
Hi,
I finished translation all german comments in the core/tools folder.
Please find the patch attached.
Sorry for messing up with the whitespace, I was simply missing the approriate
Vim highlights and git warnings.
I hope the new patch is more conformant.
Cheers,
Oliver
I tried applying your patch. While this worked like a charm, I
realized some stuff (also citing mmeeks here):
Some of the original German comments are sometimes a bit cute / un-necessary:
// class FooBaa //
class FooBaa {
...
};
In that case you can delete the comment completely. If there is some
valueable info in the box than please remove all the ascii art and
just keep the pure commit content. Also the blank line between comment
and class definition is not needed.
In addition, feel free to clean-out redundant cruft like (can also be
completely removed):
// hole Beschreibung vom Objekt FooBaa
rtl::OUString FooBaa::getDescription()
{
}
A super plus would be if you could also format the patches to conform
to Doxygen style (see http://doxygen.org/) if they are in a header
(.hxx etc.) file. This means that one-liners have three slashes
(instead of two) and multi-line comments have a /** */ frame with
@param etc.
So, I am currently going through all the files and clean them up
as well before submitting your patch. Thus, please do not wonder why
it is still not integrated yet.
Cheers,
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/core/docnode/ndnotxt.cxx | 22 +++---
1 file changed, 7 insertions(+), 15 deletions(-)
New commits:
commit a6c7410c1391b67f4550dadf105c8f4979c21dcd
Author: Bertrand Lorentz bertrand.lore...@gmail.com
Date: Mon Aug 13 19:01:29 2012 +0200
fdo#39468: Translated German comments in sw/source/core/docnode/ndnotxt.cxx
Change-Id: I0838ef7e1a80056a2a0bf0fc8d4ff91f9acbe5b7
diff --git a/sw/source/core/docnode/ndnotxt.cxx
b/sw/source/core/docnode/ndnotxt.cxx
index 9b9f6cd..fd3a069 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -38,7 +38,7 @@
#include ndgrf.hxx
#include ndole.hxx
#include ndindex.hxx
-#include hints.hxx// fuer SwFmtChg
+#include hints.hxx
#include istyleaccess.hxx
#include SwStyleNameMapper.hxx
@@ -54,23 +54,21 @@ SwNoTxtNode::SwNoTxtNode( const SwNodeIndex rWhere,
bContourMapModeValid( sal_True ),
bPixelContour( sal_False )
{
-// soll eine Harte-Attributierung gesetzt werden?
+// Should this set a hard attribute?
if( pAutoAttr )
SetAttr( *pAutoAttr );
}
-
SwNoTxtNode::~SwNoTxtNode()
{
delete pContour;
}
-
-// erzeugt fuer alle Ableitungen einen AttrSet mit Bereichen
-// fuer Frame- und Grafik-Attributen
+/// Creates an AttrSet for all derivations with ranges for frame-
+/// and graphics-attributes.
void SwNoTxtNode::NewAttrSet( SwAttrPool rPool )
{
-OSL_ENSURE( !mpAttrSet.get(), AttrSet ist doch gesetzt );
+OSL_ENSURE( !mpAttrSet.get(), AttrSet is already set );
SwAttrSet aNewAttrSet( rPool, aNoTxtNodeSetRange );
// put names of parent style and conditional style:
@@ -84,22 +82,18 @@ void SwNoTxtNode::NewAttrSet( SwAttrPool rPool )
mpAttrSet = GetDoc()-GetIStyleAccess().getAutomaticStyle( aNewAttrSet,
IStyleAccess::AUTO_STYLE_NOTXT );
}
-// Dummies fuer das Laden/Speichern von persistenten Daten
-// bei Grafiken und OLE-Objekten
-
-
+/// Dummies for loading/saving of persistent data
+/// when working with graphics and OLE objects
sal_Bool SwNoTxtNode::RestorePersistentData()
{
return sal_True;
}
-
sal_Bool SwNoTxtNode::SavePersistentData()
{
return sal_True;
}
-
void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, sal_Bool bAutomatic )
{
delete pContour;
@@ -112,7 +106,6 @@ void SwNoTxtNode::SetContour( const PolyPolygon *pPoly,
sal_Bool bAutomatic )
bPixelContour = sal_False;
}
-
void SwNoTxtNode::CreateContour()
{
OSL_ENSURE( !pContour, Contour available. );
@@ -262,7 +255,6 @@ sal_Bool SwNoTxtNode::IsPixelContour() const
return bRet;
}
-
Graphic SwNoTxtNode::GetGraphic() const
{
Graphic aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED][PATCH] fdo#39468 translate German comments in core/tools
2012/8/12 Philipp Riemer ruderphil...@gmail.com:
Hey Oliver,
2012/8/12 Oliver Günther m...@oliverguenther.de:
Hi,
I finished translation all german comments in the core/tools folder.
Please find the patch attached.
Sorry for messing up with the whitespace, I was simply missing the
approriate Vim highlights and git warnings.
I hope the new patch is more conformant.
Cheers,
Oliver
I tried applying your patch. While this worked like a charm, I
realized some stuff (also citing mmeeks here):
Some of the original German comments are sometimes a bit cute / un-necessary:
// class FooBaa //
class FooBaa {
...
};
In that case you can delete the comment completely. If there is some
valueable info in the box than please remove all the ascii art and
just keep the pure commit content. Also the blank line between comment
and class definition is not needed.
In addition, feel free to clean-out redundant cruft like (can also be
completely removed):
// hole Beschreibung vom Objekt FooBaa
rtl::OUString FooBaa::getDescription()
{
}
A super plus would be if you could also format the patches to conform
to Doxygen style (see http://doxygen.org/) if they are in a header
(.hxx etc.) file. This means that one-liners have three slashes
(instead of two) and multi-line comments have a /** */ frame with
@param etc.
So, I am currently going through all the files and clean them up
as well before submitting your patch. Thus, please do not wonder why
it is still not integrated yet.
Cheers,
Philipp
Hey Oliver,
I integrated your patch (see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=c8b7aa55138848fe07108779099267424bc03e3d).
After that I started cleaning up the first parts:
* 7dfba55bfd15b3c3b080a13b63073e6d2ab808b7 doxygenized comments in tools/inc
* 731f3ce64a84b14b43a2a8ca3d455dd8711781b9 clean-up of existing
comments in tools/inc
* 70fc650319f8cfc0b3230ad2dea584eb1368a238 remove ascii art and blank
lines in tools/inc/
Having done inc, I will now continue with my cleanup of the other
subfolders of tools/ over the following evenings...
Waiting for more such great translations from you ;-)
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468: translate German comments (= writer)
After Michael Meeks' enthusiastic talks and a digital chat (sitting side by side is no reason to not type your messages ;-) with him at LinuxTag in Berlin, I got so excited about LibreOffice that I also wanted to help and participate in this project. I do not have much spare time but as I heard also the translation of parts that are still in German does help. Therefore I added my name to the corresponding wiki section https://wiki.documentfoundation.org/Development/Easy_Hacks/Translation_Of_Comments and will submit translations of the writer source code piece by piece in the following weeks as soon as I have some time to work on them. Cheers, Philipp -- ASCII ribbon campaign ( ) against HTML e-mail X www.asciiribbon.org / \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39468: translate German comments (= writer)
Forgot to also add the stat output to my last mail. Maybe interesting for people who want to review my proposed changes: sw/inc/doc.hxx |7 +- sw/inc/docufld.hxx |2 +- sw/inc/editsh.hxx |6 +- sw/inc/swscanner.hxx|4 +- sw/source/core/edit/edattr.cxx |4 +- sw/source/core/undo/rolbck.cxx | 61 sw/source/core/undo/unattr.cxx | 48 ++--- sw/source/core/undo/undel.cxx | 130 +++-- sw/source/core/undo/undobj.cxx | 155 ++- sw/source/core/undo/undobj1.cxx | 79 ++-- sw/source/core/undo/unins.cxx | 51 ++--- sw/source/core/undo/unmove.cxx | 30 sw/source/core/undo/unnum.cxx | 25 +++ sw/source/core/undo/unovwr.cxx | 28 +++ sw/source/core/undo/unredln.cxx | 23 +++--- sw/source/core/undo/unsect.cxx | 32 16 files changed, 324 insertions(+), 361 deletions(-) -- Philipp 2012/5/28 Philipp Riemer ruderphil...@gmail.com: As promised, find the first few files for review attached to this mail. Btw.: I realized a lot of duplicated code in the files I checked so far in sw/source/core/undo. Having no experience in C++, I wanted to ask if there exists a good copy-paste-detection tool to find those root of evil code? Philipp Attachments: 0001-fix-german-adjust-left-margin-comment-in-multiple-files.patch 0002-translated-german-comments-in-sw-inc-docufld.hxx.patch 0003-translated-german-comments-in-sw-inc-swscanner.hxx.patch 0004-translated-german-comments-in-sw-source-core-undo-unnum.cxx.patch 0005-translated-german-comments-in-sw-source-core-undo-unattr.cxx.patch 0006-translated-german-comments-in-sw-source-core-undo-undel.cxx.patch 0007-translated-german-comments-in-sw-source-core-undo-undobj.cxx.patch 0008-translated-german-comments-in-sw-source-core-undo-undobj1.cxx.patch 0009-translated-german-comments-in-sw-source-core-undo-unins.cxx.patch 0010-translated-german-comments-in-sw-source-core-undo-rolbck.cxx.patch 0011-translated-german-comments-in-sw-source-core-undo-unmove.cxx.patch 0012-translated-german-comments-in-sw-source-core-undo-unovwr.cxx.patch 0013-translated-german-comments-in-sw-source-core-undo-unredln.cxx.patch 0014-translated-german-comments-in-sw-source-core-undo-unsect.cxx.patch 2012/5/28 Philipp Riemer ruderphil...@gmail.com: After Michael Meeks' enthusiastic talks and a digital chat (sitting side by side is no reason to not type your messages ;-) with him at LinuxTag in Berlin, I got so excited about LibreOffice that I also wanted to help and participate in this project. I do not have much spare time but as I heard also the translation of parts that are still in German does help. Therefore I added my name to the corresponding wiki section https://wiki.documentfoundation.org/Development/Easy_Hacks/Translation_Of_Comments and will submit translations of the writer source code piece by piece in the following weeks as soon as I have some time to work on them. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39468: translate German comments (= writer)
Of course for all my contributions the following is true: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Philipp 2012/5/28 Philipp Riemer ruderphil...@gmail.com: As promised, find the first few files for review attached to this mail. Btw.: I realized a lot of duplicated code in the files I checked so far in sw/source/core/undo. Having no experience in C++, I wanted to ask if there exists a good copy-paste-detection tool to find those root of evil code? Philipp Attachments: 0001-fix-german-adjust-left-margin-comment-in-multiple-files.patch 0002-translated-german-comments-in-sw-inc-docufld.hxx.patch 0003-translated-german-comments-in-sw-inc-swscanner.hxx.patch 0004-translated-german-comments-in-sw-source-core-undo-unnum.cxx.patch 0005-translated-german-comments-in-sw-source-core-undo-unattr.cxx.patch 0006-translated-german-comments-in-sw-source-core-undo-undel.cxx.patch 0007-translated-german-comments-in-sw-source-core-undo-undobj.cxx.patch 0008-translated-german-comments-in-sw-source-core-undo-undobj1.cxx.patch 0009-translated-german-comments-in-sw-source-core-undo-unins.cxx.patch 0010-translated-german-comments-in-sw-source-core-undo-rolbck.cxx.patch 0011-translated-german-comments-in-sw-source-core-undo-unmove.cxx.patch 0012-translated-german-comments-in-sw-source-core-undo-unovwr.cxx.patch 0013-translated-german-comments-in-sw-source-core-undo-unredln.cxx.patch 0014-translated-german-comments-in-sw-source-core-undo-unsect.cxx.patch 2012/5/28 Philipp Riemer ruderphil...@gmail.com: After Michael Meeks' enthusiastic talks and a digital chat (sitting side by side is no reason to not type your messages ;-) with him at LinuxTag in Berlin, I got so excited about LibreOffice that I also wanted to help and participate in this project. I do not have much spare time but as I heard also the translation of parts that are still in German does help. Therefore I added my name to the corresponding wiki section https://wiki.documentfoundation.org/Development/Easy_Hacks/Translation_Of_Comments and will submit translations of the writer source code piece by piece in the following weeks as soon as I have some time to work on them. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
potentially dead code in sw/source/core/undo/undel.cxx?
Hi, While translating comments and cleaning up the files in sw/source/core/undo, I realized a piece of code which indentation was wrong. I tried to re-indent it but it seems as if there are too many braces in the function call... Could anyone else please also check the body of the function SwUndoDelete::UndoImpl(::sw::UndoRedoContext rContext) in the file sw/source/core/undo/undel.cxx (spanning approx. from line 750 to 900) and try to re-indent the respective parts? Because I get 7 LOC that are outside of the function body after doing this... Cheers, Philipp -- ASCII ribbon campaign ( ) against HTML e-mail X www.asciiribbon.org / \ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: potentially dead code in sw/source/core/undo/undel.cxx?
Ah, I see. Thank you very much for your fast answer. 2012/5/30 Lubos Lunak l.lu...@suse.cz: On Wednesday 30 of May 2012, Philipp Riemer wrote: Hi, While translating comments and cleaning up the files in sw/source/core/undo, I realized a piece of code which indentation was wrong. I tried to re-indent it but it seems as if there are too many braces in the function call... Could anyone else please also check the body of the function SwUndoDelete::UndoImpl(::sw::UndoRedoContext rContext) in the file sw/source/core/undo/undel.cxx (spanning approx. from line 750 to 900) and try to re-indent the respective parts? Because I get 7 LOC that are outside of the function body after doing this... There is no problem with the code. The block with comment // code block so that SwPosition is detached when deleting a Node is a standalone compound statement that is not attached to anything, it is there just to limit the scope and lifetime of the aPos variable. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] fdo#39468: translate German comments (= writer)
Thank you. I will try that tomorrow and than re-send the patch. Philipp 2012/5/30 Tor Lillqvist t...@iki.fi: Thanks. I pushed the first one, but the second one did not apply, severa patch hunks failed. Could you please check that? Probably your source code is out of sync and you need to do a git pull. You might run into merge conflicts when you do that because of slight changes needed to your patch(es) when they were committed by me (because files had changed slightly in some context lines since you had started editing them), so it might be best to first save your unpushed work, and then git reset --hard origin (hmm, I hope I remember that right), then git pull -r. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New Wiki Bug Page
I love the option to have it sortable by different criteria! But please make the Bugzilla-IDs (and the description text) links to the bugtracker to provide an easy option to jump there at interest. In addition, also the field topic which indicates if it e.g. UI related or for the webpage etc. would be good (see https://wiki.documentfoundation.org/Development/Easy_Hacks_Bugzilla_Whiteboard_Status) To be honest, I have to admit that I do not understand the benefit of the column showing the number of mailing lists. -- Philipp 2012/6/1 Joel Madero jmadero@gmail.com: I created a new page and looking for feedback before I complete it. I wanted every bug listed on one page sortable by end user. Furthermore, wanted to include additional information so it would be a bit easier for developers to see information about the bug without having to actually click on it. I'll create a small script to auto pull from bugtracker and keep the list up to date based on that. https://wiki.documentfoundation.org/Development/Sortable_Hack_List_with_Details#Complete_List_of_Hacks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: OpenGrok Search Upon Link Click
2012/6/12 Joel Madero jmadero@gmail.com: Hi All, Wondering if the behavior of opengrok is what is expected. My issue is that when I click on a variable name it takes me to the search page of opengrok and puts in the name as the description instead of as a full search. This rarely (actually never) comes up with anything. For instance if I do a regular full search as: validate between, it comes up with a list, I go into validate.src, then I click on SC_VALIDDLG_DATA_BETWEEN and it will place SC_VALIDDLG_DATA_BETWEEN in the description of a search, clicking search comes up with no results. Seems like it would be much more functional for the link to place the object name in the full search line. Just thinking out loud. Joel Since it is code related the symbol search field might be a better place for such links. This e.g. is the behaviour when clicking on a function name (violet instead of green text) in opengrok source view. Hopefully this is easily reconfigurable in opengrok's options... Just my two cents... Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39468: translate German comments (= sw/source/core/inc)
Hi, again I found some time to translate and clean up files in the core folder structure of Writer. In patch 0002 I deleted some code. Since I am not so firm with the code base, I asked mmeeks before and got his ACK for doing so. Find the patches of my work attached to this mail. Cheers, Philipp --- Git diffstat: sw/source/core/inc/dflyobj.hxx |1 - sw/source/core/inc/fieldhint.hxx |1 + sw/source/core/inc/finalthreadmanager.hxx |5 +- sw/source/core/inc/flowfrm.hxx | 132 sw/source/core/inc/flyfrm.hxx | 122 -- sw/source/core/inc/fntcache.hxx|4 +- sw/source/core/inc/frame.hxx |4 +- sw/source/core/inc/frmtool.hxx |1 - sw/source/core/inc/ifinishedthreadlistener.hxx |7 +- sw/source/core/inc/ithreadlistenerowner.hxx|9 +- sw/source/core/inc/laycache.hxx|4 +- sw/source/core/inc/layouter.hxx|1 - 12 files changed, 147 insertions(+), 144 deletions(-) 0001-minor-code-cleanups-in-sw-source-core-inc.patch Description: Binary data 0002-delete-useless-code-in-sw-source-code-inc.patch Description: Binary data 0003-translate-German-comments-in-and-minor-clean-up-of-s.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: First translation German English
Hey, I made some minor changes to that patch (all credits still go to the original author - Florian) by fixing some typos and deleting also the ASCII art. In addition, I changed the commit message to Translate German comments in sc/inc/viewopti.hxx which in my eyes is more helpful than Translated my first file from German to English and shows what was done where. Cheers, Philipp 2012/6/19 Florian Reisinger reisi...@gmail.com: Hi there! Here is my first translation of comments from German to English Please correct me (There are only small changes) Yours Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice 0001-Translated-my-first-file-from-German-English.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Duplication of some includes due to last commit
Hey, I checked every file that was touched by commit ec5fa0164b9bae5c5bc6654f581e493206584301 by hand and created a patch that deletes all duplicates I could find. Cheers, Philipp 2012/6/21 Christophe JAILLET christophe.jail...@wanadoo.fr: Le 21/06/2012 22:52, Michael Stahl a écrit : On 21/06/12 22:44, Christophe JAILLET wrote: Looking at the last commit : http://cgit.freedesktop.org/libreoffice/core/commit/?id=ec5fa0164b9bae5c5bc6654f581e493206584301 we can see that replacing .hdl include with equivalent .hpp includes leads to duplication of some includes. For example in filter/source/svg/svgfilter.cxx http://cgit.freedesktop.org/libreoffice/core/tree/filter/source/svg/svgfilter.cxx?id=b326c1d728e65afea4257d1142a02185ae6bc4d0, we now have : #include com/sun/star/view/XSelectionSupplier.hpp #include com/sun/star/view/XSelectionSupplier.hpp oh, good catch, can you send a patch to clean these up? :) I will not have time in the coming days to check all the modified files. I've forwarded my mail to the committer of the patch with the hope he would do it by himself :) 0001-cleanup-of-duplicated-includes.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Is fdo#43460 done and can be closed? Or: status of EasyHacks in Bugzilla is important too
Hi, I recently skimmed through the wiki's EasyHacks page and found 43460 - Replace rtl::OUString getLength()==0 with isEmpty() etc. with status NEW https://bugs.freedesktop.org/show_bug.cgi?id=43460. As far as I understand the comments, it is completed and can either be closed or needs new input: Comment 49 - Olivier Hallot 2012-02-06 02:51:51 PST: At this point I have parsed all entries of the log file of comment #1, with the exception of binfilter (which is expected to become deprecated or with no further development). @ Stephan Bergman: Can you run the script once more to generate a last log, just to catch the replacements I may have left? Thank you. Comment 50 Michael Meeks 2012-02-29 04:40:29 PST: nice to see this linked in your slides Stephan :-) be even better to double check the last bits get this closed [ if that's easy ]. Why do I write this to the mailing list? I know there are a lot of bugs in bugzilla and Joel is doing a great work of improving the situation not only by checking the bugtracker but also by providing helpful guidelines/flowcharts/... so that others can jump on the train. But since this bug (43460) is marked as a easyhack, it is listed at least in the wiki as well and newcomers like me would read it to see where they can help improving LO. Assuming that I've done nothing for LO yet, if I would see more than one bug in this category that is already fixed but not updated since 4 months, I would really think twice if I should start spending my time on this lazy project. It's always marketing, you know? So from my point of view it is not only important to check all the bugs that are of high relevance for programmers (even if this _is_ the best help for them and highly appreciated) but also check such bugs of minor importance since they are visible and might be interesting to newcomers. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] First translation German English
Oh, my bad, sorry. I did not apply the patch but just added some more minus characters to stuff that could also be deleted in the patch file before re-submitting it. 2012/6/22 Michael Meeks michael.me...@suse.com: Hi Florian, On Tue, 2012-06-19 at 21:29 +0200, Philipp Riemer wrote: I made some minor changes to that patch (all credits still go to the original author - Florian) by fixing some typos and deleting also the ASCII art. Sadly Philipp's advice (while excellent) didn't produce a patch that applies - did you use diff-mode ? anyhow; I fixed it all up and pushed it. Florian - thanks for that; it helps to have [PATCH] in the mail Subject to get more quickly through the flow, but sorry for the delay. Looking forward to more translation work :-) Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: German comments translation
Hello Jesso, Thank you very much and welcome to the LibreOffice mailing list! While I appreciate your work, much of it looks as if it was the output of an online translation tool... Correct me if I am wrong! I spend some time tweaking your patch but gave up somewhere at line 120 or so... Especially because (in my eyes) trivial comments were left out, e.g.: === snip === -Input: nIdx- Nummer des angeforderten BLIP +Input: nIdx- Number of a requested BLIP ( muss immer uebergeben werden ) === end === (German translation of the sentence in parentheses: has to be provided every time/mandatory) I've seen that your mail address in the patch is from Saudi Arabia. Thus, I want to ask you how well your German skills are? I don't want to offend you but if your German is not pretty well, there are a lot of native people in the community who might be better for this job... I think, I found your blog and it states that you are from India. Phew, now I am confuesed ;-) But I also shows your general interest in programming, so maybe you would consider reporting bugs of LibreOffice or help on other topics as an alternative? Checkout http://wiki.documentfoundation.org/Development/Easy_Hacks_by_Topic. I am pretty sure that there will be something interesting for you! All the best, Philipp 2012/6/23 Jesso Murugan developer.je...@gmail.com: Hi, I tranlsated German comments in filter/inc/filter/msfilter/msdffimp.hxx There are a couple of comments left untranslated in the file as I was not very confident about them. (Check the translated ones too, as the code was new to me and I might have missed any nuances.) Do comments need a licence statement? Anyway, you have mine below. All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. - Jesso Clarence ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: German comments translation
Hey Jesso, 2012/6/23 Jesso Murugan developer.je...@gmail.com: Hi Philipp, You are correct! I was reading the file, following some bug, and found myself translating the comments to understand what's going on and so I thought I'd just send the resulting file across ;) . By the way, no offense taken. I'll check the Easy Hacks. And, Google Summer of Code ideas seem pretty interesting too, so do you recommend me checking that (after an easy hack or two), or is it just reserved for just the participants of GSoC? Start with small tasks and pick bigger ones as soon as you find yourself confident in an area. I think this folk wisdom is also true here. I just know that the GSoC projects are bigger and need more indepth knowledge. So they are not a good starting point. In addition, there is currently a GSoC running - so some of the tasks might be in progress. Would be frustrative if you just duplicate work of someone else, even if it has a great learning effect... (I am an Indian programmer, currently in Saudi Arabia, so that's the reason behind the email and the blog.) - Jesso Clarence On Sat, Jun 23, 2012 at 1:06 PM, Philipp Riemer ruderphil...@gmail.com wrote: I think, I found your blog and it states that you are from India. Phew, now I am confuesed ;-) But I also shows your general interest in programming, so maybe you would consider reporting bugs of LibreOffice or help on other topics as an alternative? Checkout http://wiki.documentfoundation.org/Development/Easy_Hacks_by_Topic. I am pretty sure that there will be something interesting for you! Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39468: translate German comments (= filter/inc/filter/msfilter/msdffimp.hxx) plus questions
2012/6/25 Noel Grandin n...@peralex.com:
On 2012-06-25 15:32, Michael Meeks wrote:
On Sat, 2012-06-23 at 20:45 +0200, Philipp Riemer wrote:
(2) In addition, I was wondering if it would be possible to shorten
parameters (e.g. com::sun::star::uno::Reference
com::sun::star::embed::XStorage xDestStg) by using aliases or
other ways to point to that namespaces. But I am not skilled enough in
C++ to do that (see e.g. patch 0003 for examples).
The great hope is LibreOffice 4 - which will discard the
com::sun::star
prefix and/or do something sensible instead here, making our APIs much
easier to read.
There was also hope for a transitional set of namespace aliases,
but I
forget why that was shot down, in the meantime we have that ugly,
tangled madness (sadly) :-)
Perhaps we could adopt a transitional scheme, where we move our types and
definitions to a new namespace, but leave aliases in the current namespace?
i.e. in pseudo-code:
namespace shiny
{
class Reference . yada yada.
}
namespace com.sun.star.uno
{
typedef ::shiny::Reference Reference;
}
Does that sound reasonable (have no real idea, given my lack of C++
experience).
Correct me if I am wrong, but I think that exact step was proposed and
also rejected after discussion a few weeks ago.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Can #32260 and 51135 be closed? -- both: Request for account
Hi, (1) I just realized that https://bugs.freedesktop.org/show_bug.cgi?id=32260 from 2010-12-09 is still open/ in NEEDINFO state. Last comment from requesting user Andrew Dent is from end of 2010 and also on the mailing list I could not find any message of him after 2010-10-24 (see https://www.google.com/search?q=Andrew+Dentsitesearch=%25%28archive_url%29s%2F#q=Andrew+Dent+site:http%3A%2F%2Flists.freedesktop.org%2Farchives%2Flibreoffice%2Fhl=enprmd=imvnsosa=Xei=R4ToT4CKHo7NswbQuqSmAQved=0CCsQpwUoBgsource=lnttbs=cdr:1%2Ccd_min%3A1%2F1%2F2010%2Ccd_max%3A6%2F25%2F2012tbm=bav=on.2,or.r_gc.r_pw.r_cp.r_qf.,cf.osbfp=a364499a926ab80abiw=1440bih=683). As a result, I want to ask if this request can be closed? (2) Also Muhammad Haggag's request https://bugs.freedesktop.org/show_bug.cgi?id=51135 from 2012-06-15 is in UNCONFIRMED state. But here the situation seems to be different since I can only find three mails in total from him in Feb 2012 on the mailing list (see https://www.google.com/search?q=Muhammad%20Haggagsitesearch=%25%28archive_url%29s%2F#hl=entbs=cdr:1%2Ccd_min%3A1%2F1%2F2010%2Ccd_max%3A6%2F25%2F2012sclient=psy-abq=Muhammad+Haggag+site%3Ahttp%3A%2F%2Flists.freedesktop.org%2Farchives%2Flibreoffice%2Foq=Muhammad+Haggag+site:http%3A%2F%2Flists.freedesktop.org%2Farchives%2Flibreoffice%2Faq=faqi=aql=gs_l=serp.12...9421.9795.0.13069.3.3.0.0.0.0.63.177.3.3.0...0.0.uYm14PDWpJgpbx=1bav=on.2,or.r_gc.r_pw.r_qf.,cf.osbfp=3892739cde4f876ebiw=1440bih=812). Since Muhammad seems to be not interested anymore - can this request be changed into a closed state as well? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] update cppunit to version 1-13
Hey Markus, Michael, all, Two minor things from my side as a newbie to the LO project: (1) In lines 288-291 of the patch you also delete the comment showing from where you got the CPPUNIT file. Might be helpful to keep the URL... (2) In addition, I was wondering why the install folder is still ooo-install in the makefile (lines 321-257)? Backward compatibility reasons? Just my 2 cents, Philipp 2012/6/27 Michael Meeks michael.me...@suse.com: On Wed, 2012-06-27 at 18:57 +0200, Markus Mohrhard wrote: the attached patch updates our cppunit version to a state that will become 1.13.0 if we don't find any problems with it in the next 2 days. All looks good to me; I'd love to get it in since I've a number of queued up commits that are blocking on it :-) If it builds for you, I'd push it to master; much of the patch (that isn't removing crufty patches) is a version search replace it seems to me :-) Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH][PUSHED] update cppunit to version 1-13
2012/6/28 Markus Mohrhard markus.mohrh...@googlemail.com: Hellp Philipp 2012/6/28 Philipp Riemer ruderphil...@gmail.com: Hey Markus, Michael, all, Two minor things from my side as a newbie to the LO project: (1) In lines 288-291 of the patch you also delete the comment showing from where you got the CPPUNIT file. Might be helpful to keep the URL... The URL is wrong now. Our cppunit version is from http://cgit.freedesktop.org/libreoffice/cppunit/log/ so I don't think that we need this URL now. (2) In addition, I was wondering why the install folder is still ooo-install in the makefile (lines 321-257)? Backward compatibility reasons? Why should we make a riskful change to something that is clearly working as it should. IMHO changing internal names without a good reason is not a good idea. Patches is already pushed because Michael needed it for his rebasing. Regards, Markus Hey Markus, thanks for the fast answers. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] cleanup java code and update to Java5, including generics (36)
2012/6/29 Noel Grandin noelgran...@gmail.com: On 2012-06-29 14:30, Philipp Riemer wrote: Hey Noel, I would like to offer my help for that because I have some spare time over the weekend. If it's ok with you, can you send me (better off the list, I guess) some pointers to files/folders I can start working on? It's always great to get more people helping with LibreOffice, but first let's see how happy the powers-that-be are with my changes :-) OK ;-) I'm sure exactly to what degree the LO hackers want such changes (I'm not even sure if they'll be happy with all of my generics changes). So we should probably wait for some feedback before proceeding. Just as a note for other people - I did the bulk of the work using Eclipse and it's built-in re-factoring tools and quickfix tools. Most of my time was spent (a) configuring an Eclipse workspace to handle the weird and wonderful directory layouts that the LO java code lives in. (b) handling the tricky little edge cases that the automatic tools could not figure out. (c) in the case of javadoc errors, trying to figure out the original intention, so I could update it correctly. Did you consider sharing this eclipse project config file or create a blog/wiki post, so that not everyone would need to figure out all this nittygritty stuff..? Now that I think about it, one thing you could do that would help, and that I'm pretty sure the LO hackers would not mind, is to run a spellcheck tool over the java code, and fix whatever errors you may find. These links should be enough to get you started: http://blogs.operationaldynamics.com/andrew/software/java-gnome/spell-checking-source-code http://www.bdaum.de/eclipse/ Thank you for the links! I wasn't aware that such a spellchecking tool even exists as an Eclipse plugin. Even while wishing for it, I never actually checked if someone already did that work. I will see what I can do. Have a nice weekend! Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Questions regarding code peculiarities
Hi, today I cleaned up the code in the directory sw/source/core/attr/ and saw some things I am not sure about. Since I guess that it will not cost much time for an experienced LO dev to look at those curious facts, I post them here on the list: (1) Where should I put documentation? At the moment I just translate every (German) text I find in the source files into English. But I was wondering if this is useful... Where does Doxygen look for documentation? Header file declarations or directly at the function implementation? = sw/source/core/attr/calbck.cxx (2) The two functions SwClient* SwClientIter::First and SwClient* SwClientIter::Last seem to differ in their logic. Same seems to be true for SwClientIter::Next and SwClientIter::Previous. Or is this marginal change in each case correct? Can please anyone more experienced than me take a quick look at those functions? = sw/source/core/attr/cellatr.cxx (3) The switch statement in SwTblBoxFormula::ChangeState has no default case. This might be helpful to capture bogus behaviour... (4) The function SwTblBoxFormula::Calc has only an if statement with no else case and also no other code outside. Is this intended? If so, wouldn't it be more readable if the logic is reversed, e.g. if( rCalcPara.rCalc.IsCalcError() ) return; //explanation why, and everything else is written without being in an if block? = sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx (5) The switch statement in SwFmtWrapInfluenceOnObjPos::QueryValue has only one case and thus can be replaced by an if/else; same for switch statement in SwFmtWrapInfluenceOnObjPos::PutValue. See https://gerrit.libreoffice.org/#/c/251/. = sw/source/core/attr/format.cxx (7) Switch case 0 in SwFmt::Modify seems to be strange since it seems to be unexpected (from the comment) but returns directly without logging an error or the like... Hope you all enjoy your weekend! Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/inc
vcl/inc/helpwin.hxx |4 +-
vcl/inc/ilstbox.hxx | 48 +-
vcl/inc/outfont.hxx | 46 -
vcl/inc/salwtype.hxx | 65 +++
vcl/inc/svdata.hxx | 40 ++--
vcl/inc/unx/saldisp.hxx |2 -
vcl/inc/vcl/accel.hxx| 10 +++
vcl/inc/vcl/gdimtf.hxx |8 ++---
vcl/inc/vcl/menu.hxx | 24 -
vcl/inc/vcl/salbtype.hxx | 12 +++-
vcl/inc/vcl/seleng.hxx | 24 -
vcl/inc/vcl/svapp.hxx|6 ++--
vcl/inc/vcl/window.hxx |8 ++---
vcl/inc/win/saldata.hxx | 16 +--
14 files changed, 156 insertions(+), 157 deletions(-)
New commits:
commit 5d2038b673de2bfc8a8271b0e745b65090b93a20
Author: Luc Castermans l...@bassenge.castermans.org
Date: Sun Jul 1 09:39:59 2012 +0200
translate German comments
Change-Id: I831fdc2aad07242e1eae401e50f33291e1684cc2
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 0c1368b..40a969f 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -40,9 +40,9 @@ class HelpTextWindow : public FloatingWindow
{
private:
Point maPos;
-Rectangle maHelpArea; // Wenn naechste Hilfe fuers gleiche
Rectangle, gleicher Text, dann Fenster stehen lassen
+Rectangle maHelpArea; // If next Help for the same rectangle w/
same text, then keep window
-Rectangle maTextRect; // Bei umgebrochenen Text in QuickHelp
+Rectangle maTextRect; // For wrapped text in QuickHelp
String maHelpText;
String maStatusText;
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index e8074eb..a583f9b 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -205,48 +205,48 @@ public:
class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList
{
private:
-ImplEntryList* mpEntryList; // EntryListe
+ImplEntryList* mpEntryList; // EntryList
Rectangle maFocusRect;
SizemaUserItemSize;
-longmnMaxTxtHeight; // Maximale Hoehe eines Text-Items
-longmnMaxTxtWidth; // Maximale Breite eines Text-Items
- // Entry ohne Image
-longmnMaxImgTxtWidth;// Maximale Breite eines Text-Items
- // Entry UND Image
-longmnMaxImgWidth; // Maximale Breite eines Image-Items
-longmnMaxImgHeight; // Maximale Hoehe eines Image-Items
-longmnMaxWidth; // Maximale Breite eines Eintrags
-longmnMaxHeight; // Maximale Hoehe eines Eintrags
+longmnMaxTxtHeight; // Maximum height of a text item
+longmnMaxTxtWidth; // Maximum width of a text item
+ // Entry without Image
+longmnMaxImgTxtWidth;// Maximum width of a text item
+ // Entry AND Image
+longmnMaxImgWidth; // Maximum width of an image item
+longmnMaxImgHeight; // Maximum height of an image item
+longmnMaxWidth; // Maximum width of an entry
+longmnMaxHeight; // Maximum heigth of an entry
sal_uInt16 mnCurrentPos;// Position (Focus)
-sal_uInt16 mnTrackingSaveSelection; // Selektion vor Tracking();
+sal_uInt16 mnTrackingSaveSelection; // Selection before
Tracking();
sal_uInt16 mnSeparatorPos; // Separator
sal_uInt16 mnUserDrawEntry;
-sal_uInt16 mnTop; // Ausgabe ab Zeile
-longmnLeft; // Ausgabe ab Spalte
-longmnBorder;// Abstand Rahmen - Text
-longmnTextHeight;// Texthoehe
+sal_uInt16 mnTop; // output from line on
+longmnLeft; // output from column on
+longmnBorder;// distance border - text
+longmnTextHeight;// text height
ProminentEntry meProminentType; // where is the prominent entry
sal_uInt16 mnSelectModifier; // Modifiers
sal_BoolmbHasFocusRect: 1,
-mbSort: 1, // ListBox sortiert
+mbSort: 1, // ListBox sorted
mbTrack:1, // Tracking
mbMulti:1, // MultiListBox
mbStackMode:1, // StackSelection
-mbSimpleMode: 1, // SimpleMode fuer MultiListBox
-mbImgsDiffSz: 1, // Images haben verschiedene
Groessen
+mbSimpleMode: 1, // SimpleMode for MultiListBox
+mbImgsDiffSz: 1, //
Re: [PUSHED] [PATCH] translate german comments vcl/source
2012/7/1 Luc Castermans luc.casterm...@gmail.com: herewith another patch with comment translations Thank you very much! Pushed to master after additional cleanup. Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
found nearly perfect tinderbox build - but still errors due to missing files
Hi, today I discovered the tinderbox master status page http://tinderbox.libreoffice.org/MASTER/status.html and I like it! But I don't know how often these are checked by other people... While glancing over the different columns I found something strange (at least for me): (1) I realized that at least 3 errors are hopefully easily fixable (see e.g. http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1341202801.31845#38613): 38613 [ build XCS ] reportbuilder/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs 38614 NEXTwarning: failed to load external entity /builds/tinderbox/libo-master/reportbuilder/registry/schema//org/openoffice/Office/UI/WindowState.xcs 38615 [ build XCU ] sun-report-builder/en-US/org/openoffice/Office/UI/DbReportWindowState.xcu 38616 [ build XCU ] reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu 38617 [ build XCS ] reportbuilder/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs 38618 NEXTwarning: failed to load external entity /builds/tinderbox/libo-master/reportbuilder/registry/schema//org/openoffice/Office/UI/Commands.xcs 38619 NEXTwarning: failed to load external entity /builds/tinderbox/libo-master/reportbuilder/registry/schema//org/openoffice/Office/UI/Commands.xcs When checking the directory with Git (I am not yet very skilled in this program) it seems that commit 9544c14f4a931d8d8b2e66a6cb87fb53d4505cd4 created the folder reportbuilder/registry/data/org/openoffice/Office/UI/ with DbReportWindowState.xcs, ReportCommands.xcs, and makefile.mk. In total Git shows 4 changes for the whole folder but none of them contained the two missing files (Commands.xcs or WindowState.xcs). But I did find the files in reportbuilder/registry/data/org/openoffice/Office/UI/. So it seems as if the search path is somewhere mis-configured. (2) The same build log http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1341202801.31845 shows only *42* errors. While the number itself is great ;-), errors in general are not. But most of them (=28 + the 3 mentioned above) seem to exist because of missing files or registry entries and might be easily solvable for a more experienced user than me: === reg entries === WARNING: could not open key /UCR/com/sun/star/oooimprovement/XCore in registry /builds/tinderbox/libo-master/offapi/type_reference/types.rdb WARNING: could not open key /UCR/com/sun/star/oooimprovement/XCoreController in registry /builds/tinderbox/libo-master/offapi/type_reference/types.rdb WARNING: could not open key /UCR/com/sun/star/oooimprovement/Core in registry /builds/tinderbox/libo-master/offapi/type_reference/types.rdb WARNING: could not open key /UCR/com/sun/star/oooimprovement/CoreController in registry /builds/tinderbox/libo-master/offapi/type_reference/types.rdb === files === = oasis = Warning: No template found for item : ../../unxlngx6/misc/libreoffice/mimelnklist.unxlngx6/oasis-drawing-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/libreoffice/mimelnklist.unxlngx6/oasis-presentation-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/libreoffice/mimelnklist.unxlngx6/oasis-spreadsheet-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/libreoffice/mimelnklist.unxlngx6/oasis-text-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/lodev/mimelnklist.unxlngx6/oasis-drawing-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/lodev/mimelnklist.unxlngx6/oasis-presentation-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/lodev/mimelnklist.unxlngx6/oasis-spreadsheet-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/lodev/mimelnklist.unxlngx6/oasis-text-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/oxygenoffice/mimelnklist.unxlngx6/oasis-drawing-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/oxygenoffice/mimelnklist.unxlngx6/oasis-presentation-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/oxygenoffice/mimelnklist.unxlngx6/oasis-spreadsheet-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/oxygenoffice/mimelnklist.unxlngx6/oasis-text-flat-xml.desktop: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/libreoffice/oasis-drawing-flat-xml.keys: No such file or directory Warning: No template found for item : ../../unxlngx6/misc/libreoffice/oasis-presentation-flat-xml.keys: No such file or directory Warning: No template found for item :
[Libreoffice-commits] .: sw/source
sw/source/core/bastyp/swrect.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 73243adcbe99f3ebd6eb77404168f4c3f91d74cd
Author: Philipp Riemer ruderphil...@gmail.com
Date: Mon Jul 2 17:24:10 2012 +0200
fix coding style of previously added tmp variable
Change-Id: I40d67918e13239141176ff31159653f79af46f88
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index a905dd3..12af59d 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -129,11 +129,11 @@ sal_Bool SwRect::IsInside( const Point rPoint ) const
// mouse moving of table borders
sal_Bool SwRect::IsNear( const Point rPoint, long nTolerance ) const
{
-sal_Bool InTolerance = (((Left() - nTolerance) = rPoint.X())
-((Top()- nTolerance) = rPoint.Y())
-((Right() + nTolerance) = rPoint.X())
-((Bottom() + nTolerance) = rPoint.Y()));
-return IsInside(rPoint) || InTolerance;
+bool bIsNearby = (((Left() - nTolerance) = rPoint.X())
+ ((Top()- nTolerance) = rPoint.Y())
+ ((Right() + nTolerance) = rPoint.X())
+ ((Bottom() + nTolerance) = rPoint.Y()));
+return IsInside(rPoint) || bIsNearby;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: embedserv/Library_emser.mk
embedserv/Library_emser.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8423a74a9131087ceaf939580c14ae6514bd3c15 Author: Philipp Riemer ruderphil...@gmail.com Date: Mon Jul 2 17:56:15 2012 +0200 fixed build break by adding missing parentheses Change-Id: Ia7ab8401334945346c01a3e5cb73bbd73503b97c diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index 9872b4f..f34836e 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_defs,emser,\ )) $(eval $(call gb_Library_use_api,emser)) -$(eval $(call gb_Library_use_api,emser,\ +$(eval $(call gb_Library_use_api,emser)) $(eval $(call gb_Library_use_libraries,emser,\ comphelper \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: rediscovered: missing writer documentation
I am currently working on a simple DOT representation... Seams to be trickier than expected. What would be in your eyes the best kind of visualization? Classical UML class diagrams? -- Philipp 2012/7/5 Michael Meeks michael.me...@suse.com: On Wed, 2012-07-04 at 21:59 +0100, Caolán McNamara wrote: So, I found some old class diagrams for writer which I think I got from khz who I think got them from jp. They're drawn on some printouts which have a 1998 date on them. Coffee ring around SwClient is probably not significant. http://blogs.linux.ie/caolan/files/2012/07/writer.pdf Fun ! :-) We just need some artist to turn them into something beautiful and electronic I guess. Good find, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: rediscovered: missing writer documentation
2012/7/5 David Tardon dtar...@redhat.com: On Thu, Jul 05, 2012 at 10:36:59AM +0100, Michael Meeks wrote: On Wed, 2012-07-04 at 21:59 +0100, Caolán McNamara wrote: So, I found some old class diagrams for writer which I think I got from khz who I think got them from jp. They're drawn on some printouts which have a 1998 date on them. Coffee ring around SwClient is probably not significant. I really should buy a teaproof keyboard... http://blogs.linux.ie/caolan/files/2012/07/writer.pdf Fun ! :-) We just need some artist to turn them into something beautiful and electronic I guess. I think it has already been done: http://wiki.services.openoffice.org/wiki/Writer_Core_And_Layout#Some_UML_Diagrams D. Jep, seems as if you're right. So I'll stop my current work on a graphical representation. -- Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: RFC: where to put sorted vector template/class?
2012/7/10 Noel Grandin n...@peralex.com:
On 2012-07-10 15:35, Caolán McNamara wrote:
How does this look? It's the bare minimum I need in a sorted_vector class.
namespace o3tl
{
/** Represents a sorted vector of values.
@tpl Value
@tpl Compare comparison method
*/
template class Value, class Compare = lessValue
class sorted_vector : vectorValue
{
public:
// MODIFIERS
pairiterator,bool insert( const Value x );
size_type erase( const Value x );
// OPERATIONS
/* Searches the container for an element with a value of x
* and returns an iterator to it if found, otherwise it returns an
* iterator to sorted_vector::end (the element past the end of the
container).
*/
iteratorfind( const Value x ) const;
};
// IMPLEMENTATION
template class Value, class Compare
pairiterator,bool sorted_vectorValue,Compare::insert( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
return make_pair( it, false );
}
it = insert( it, p );
return make_pair( it, true );
}
template class Value, class Compare
size_type sorted_vectorValue,Compare::erase( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
erase( it );
return 1;
}
return 0;
}
template class Value, class Compare
iterator sorted_vectorValue,Compare::find( const Value x )
{
iterator it = std::lower_bound(begin(), end(), p, Compare);
if( !Compare(*it, x) )
{
return it;
}
return end();
}
Maybe a stupid question and more (clean) code related: Why do you
duplicate the search if already included instead of using the ::find
method in ::insert? I mean, sure, at the moment it is just two
lines... but most of the stuff in this code base started that small
and are now big evil monsters ;-) But maybe I am too pessimistic in
this point...
Cheers,
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Upvote important questions on ask.libreoffice.org ([Bug 51894] https://www.libreoffice.org/get-help/ misses a ask.libreoffice.org link)
2012/7/10 Bjoern Michaelsen bjoern.michael...@canonical.com: Hi QA guys and gals, https://bugs.freedesktop.org/show_bug.cgi?id=51894 --- Comment #4 from Jean Spiteri beimaginativeegr...@gmail.com 2012-07-10 21:54:35 CEST --- Can you help me, please? Give me the most important questions from ask.libreoffice.org. I hope this list is a good audience for this task as we have a wide rage of advanced users and good knowledge about the project here. Can we help Jean to get the most important questions out of ask.libreoffice.org by upvoting? Best, Bjoern Thank you for your pointer to this website. I personally wasn't aware of it.So I think it is a good idea to increase visibility! There are so many pages for information... Website, wiki, bugzilla, ask,... Unfortunately, it seems as if I am not the only one in this situation... There are currently quite a lot of questions (n=953) un-answered. Some of them might be pretty easy for people more deeply involved/ using LO more often, e.g. the following (from 2012-04-20) where it seems as if the guy here has a script and everything in place but needs just a single parameter change: from http://ask.libreoffice.org/question/2063/wrong-xls-filetype/: Hi I've been converting .ods files to .xls binary format in headless mode using the convert-to option. Every time I use the command, it converts the file to the 95/5.0 version of xls, not the 97-2003 version. Is there any way to specify which type of .xls to convert to using the convert-to option? What I don't get at the moment is the sense of this platform/ why I should vote and for what... I see that it tries to be something similar to the system at stackoverflow but as far as I understand in contrast to e.g. bugzilla there is no option to close a question if it was answered. So by upvoting some entry do I push a feature request? Or what effect does my vote cause in the end? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: FDO 47164 (increase backing window recent doc hot spot) Advice
2012/7/11 Joel Madero jmadero@gmail.com: Hi All, I've handled FDO 47164 but need input to see if we'll actually implement. Summary: User thinks that recent documents arrow hot spot is too small on our backing window Solution: I moved the horizontal bar to the left a bit and increased the arrow size quite a bit. Here is a before: https://picasaweb.google.com/117397839011853181951/LODevelopment#5764020605655926498 and After: https://picasaweb.google.com/117397839011853181951/LODevelopment#5764020604014127250 I'm not sure if we want to implement this at all, and if so if I went too big. Advice welcome, I'll either close the bug as WONTFIX or submit a patch as soon as we get some feedback. Joel Hi Joel, I tried opening the links but Google tells me that the pages do not exist. Is it maybe a private album...? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Feature comparison: LibreOffice - Microsoft Office in the Wiki
Hi Gerry, 2012/7/15 Gerry T. gerry.trep...@googlemail.com: Dear Philipp, [...] Thank you for your work so far! Pretty impressive! Might also help the marketing guys a lot for their next big advertisement campain (LO4?). Coming from academia, most of the texts are too long for me to read ;-) Would it be possible to make a TL;DR version? Maybe a table with LO on the left and MSO on the right and green background for a column where A outperforms B? Next weekend I have some spare time again and could help with that/ provide a draft if you like. Philipp This is a very good idea. Not many people read lengthy bullet point lists. My graphical skills are limited, though, so the provision of a draft sounds perfect. I assume that you want to limit the focus of a table on the major features (or even a selection out of it) or do you plan to cover all major and minor features in such a table? Best greetings, Gerry I really appreciate your work. Since I think that you made a pretty holistic comparison, I would suggest (kind of how you did already) to group the pro and cons per product/ application type. As a result, someone who is only interested in e.g. Calc vs. Excel might get the info on one page. By linking each point/line to a more detailed explanation further below, we might combine a quick overview with fully phrased content... Will see what I can do next Friday. When I wrote my mail I had something like http://en.wikipedia.org/wiki/Comparison_of_office_suites in mind which also links to http://en.wikipedia.org/wiki/Comparison_of_word_processors and http://en.wikipedia.org/wiki/Comparison_of_spreadsheet_software. Btw. maybe http://en.wikipedia.org/wiki/LibreOffice_Writer gives you also further ideas what might be useful to compare... Having only MSO2007 I don't know how much some functionalities changed. Sorry, just an idea, did not check that yet: Did you already include the information from http://wiki.documentfoundation.org/ReleaseNotes/3.5 and http://wiki.documentfoundation.org/ReleaseNotes/3.6 in your list? Have a nice week! Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Interoperability of LibreOffice and Microsoft Office 2013
2012/7/17 bfo bfo.bugm...@spamgourmet.com: Hi. Microsoft Office Professional Plus 2013 Preview Evaluation is available for download as MSI installer at http://technet.microsoft.com/en-US/evalcenter/hh973391.aspx?wt.mc_id=TEC_114_1_5 (link at the bottom of the page). Windows 7, Windows 8, Windows Server 2008 R2 or Windows Server 2012 required. Both 32bit and 64bit versions are available. It is good opportunity to know what new features will be available in this package and test interoperability with LibreOffice. Product page is available at http://www.microsoft.com/office/preview/en. Best regards. In this context http://www.infoworld.com/d/microsoft-windows/first-look-microsoft-office-2013-197802 might also be interesting which shares some pictures and insights about the new Office version. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: C++11 in LibreOffice
2012/7/17 Kohei Yoshida kohei.yosh...@gmail.com: On 07/17/2012 05:11 AM, Lubos Lunak wrote: So, as long as we require to build LO with MSVC, we can revisit the question of hard-depending on C++11 in, uhm, let's be optimistic and say 3 years. IOW, we can probably get there faster by ditching backwards ABI compatibility with LO4 and switching to a different compiler for Windows. What I'm curious is how the binaries generated from different compilers compare on Windows. If their performances are more or less comparable, then I could care less whether we stick with MSVC or gcc (or clang if it's available on Windows). But if MSVC still produces more optimized binaries, then I would be reluctant to support switching to a different compiler (though my voice is only one head count, easily overruled by the majority votes when it comes down to it). Kohei Clang is not directly available as a binary for windows, however they have a small tutorial how to build it from source at http://clang.llvm.org/get_started.html#buildWindows. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] change indentation
2012/8/14 Michael Meeks michael.me...@suse.com: On Sun, 2012-08-12 at 16:58 +, Gerrit wrote: Philipp Riemer has uploaded a new change for review. Change subject: change indentation Found pushed, Michael. PS. do we really need to send this lot via gerrit ? and hence the mailing list :-) Hey, I am sorry about that. I did a git push than a git stash followed by ./logerrit nextchange -- to reset the start point for Gerrit, at least I thought this. After that, a git stash pop before I added my stuff via git add -p and than said ./logerrit submit. However, the tool did not upload only the last one but all my patches of the evening... Seems as if it is too smart for me and I did something wrong. Help/hints appreciated! However, in general, if the project switches to a repo that is completely maintained by Gerrit than we will see such mails even more often than now, or not? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 38840 - Adding coverage analysis to unit tests
That's great news! Thank you very much for your work!
Unfortunately, the report currently looks pretty red... But now we
have evidence and a way to trace pieces that need more tests.
Philipp
2012/8/23 John Smith lbalba...@gmail.com:
Hi,
I just finished a first full run of lcov. There was one 'make check'
failure though, and there were a lot of 'warnings' running lcov that
may need some further investigation. Also, there is some stuff
included ('/usr/include/boost', for example) that might not be desired
in the report ?
I guess the main thing to do first now is to see if this report
actually makes any sense. Essentially, all code that gets executed by
'make check' on toplevel (which does dev-install and subsequentcheck,
and dev-install includes both unitcheck and slowcheck) should show up
as covered in the report. Maybe people that are familiar with the
contents of the checks/tests and what code/functionality they cover
can take a look at that ?
Anyway, the generated html report as it currently is can be found here :
http://dev-builds.libreoffice.org/lcov_reports/
Regards,
John Smith.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: improving from address in gerrit emails to commits list?
2012/8/23 Miklos Vajna vmik...@suse.cz: On Thu, Aug 23, 2012 at 09:52:53AM +0200, Noel Grandin n...@peralex.com wrote: Is it possible to munge the From: address in the gerrit emails that go to the commit list? I got kind of used to seeing who did the commit in the from column of my email client, and I miss that :-) The script to hack is: /git/libreoffice/core.git/hooks/update at people.freedesktop.org, I'm attaching a trivial diff that could fix the issue (it sets the committer of the last commit as From, hopefully that's good enough). Michael, could you please apply it? Thanks, Miklos Good idea! I am definitely a supporter of it! However, I would prefer using %cN and %cE instead of the variants with lower case. Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Bug 38840 - Adding coverage analysis to unit tests
2012/8/24 John Smith lbalba...@gmail.com: On Fri, Aug 24, 2012 at 5:28 PM, Stephan Bergmann sberg...@redhat.com wrote: In a sense, even during the tests, very much of our code is executed by accident rather than due to dedicated test code calling it: Especially the subsequentcheck stuff contains checks that are not simple unit tests, but start of a complete soffice.bin process, causing unintended testing of large parts of the infrastructure code anyway. Whether code gets tested 'unintended' or not during your 'tests' is really not relevant, is it ? Only if the code gets executed or not ? Hey all, As far as I learned in my Softw. Eng. courses, the main intent of this type of code coverage is _not_ to show which parts are under test but primarily to point out which parts are not tested at all so far. As https://en.wikipedia.org/wiki/Code_coverage#In_practice states: This process allows developers and quality assurance personnel to look for parts of a system that are rarely or never accessed under normal conditions (error handling and the like) and helps reassure test engineers that the most important conditions (function points) have been tested. And as one can (now fortunately) see there are still quite some lines of code that are not touched during the tests... But now we all have a much better overview what parts are exactly missing tests -- which at least from my perspective is much better than just guessing and gut feeling! Thank you very much for all your great work so far, John! Of course, in future, every bug should get a unit test (at best even before starting to fix it) so that regressions are easier get caught ;-) In addition, it would be also good, to have two reports: (1) with only the unit test coverage and (2) one where all test, including integration tests etc., were executed. Just my idealistic university viewpoint :-) ATB, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#39468: Translated German comments in sc/source/core/inc
2012/8/27 oger000 lodevl...@ogersoft.at: Hi Some translations of german comments. Its my first patch to LO so something may be missing? gerhard Hey Gerhard, I fixed your patch and applied the changes. However, the files that you translated are in a part of the code that was not rebased yet. As a result, I uploaded the changes to the Gerrit code-review tool so that someone involved in this rebasing-process can have a look on them. You can find the patch set at https://gerrit.libreoffice.org/#/c/493. Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acccontext.hxx | 12 sw/source/core/access/accfootnote.hxx |9 +++-- sw/source/core/access/accgraphic.hxx |9 +++-- sw/source/core/access/accheaderfooter.hxx |9 +++-- sw/source/core/access/acctable.cxx|4 +--- 5 files changed, 14 insertions(+), 29 deletions(-) New commits: commit 75eec37886157e00bb5e176b1bc2aac958aac882 Author: Philipp Riemer ruderphil...@gmail.com Date: Thu Mar 21 09:44:20 2013 + reduce space needed by comments in sw/source/core Change-Id: Ia9267c50a02acaa60d7514781384623bf17b23bd Signed-off-by: Philipp Riemer ruderphil...@gmail.com diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 5cdc305..95798fc 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -254,8 +254,7 @@ public: throw (::com::sun::star::uno::RuntimeException); /** Return the parents locale or throw exception if this object has no -parent yet/anymore. -*/ +parent yet/anymore. */ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -306,21 +305,18 @@ public: // XServiceInfo -/** Returns an identifier for the implementation of this object. -*/ +/** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); -/** Return whether the specified service is supported by this class. -*/ +/** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const OUString sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just -the AccessibleContext service. -*/ +the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence OUString SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index a2030db..123c32e 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -50,21 +50,18 @@ public: // XServiceInfo -/** Returns an identifier for the implementation of this object. -*/ +/** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); -/** Return whether the specified service is supported by this class. -*/ +/** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just -the AccessibleContext service. -*/ +the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index 11aa87c..a759531 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -34,21 +34,18 @@ public: // XServiceInfo -/** Returns an identifier for the implementation of this object. -*/ +/** Returns an identifier for the implementation of this object. */ virtual ::rtl::OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException); -/** Return whether the specified service is supported by this class. -*/ +/** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService (const ::rtl::OUString sServiceName) throw (::com::sun::star::uno::RuntimeException); /** Returns a list of all supported services. In this case that is just -the AccessibleContext service. -*/ +the AccessibleContext service. */ virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException); diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index e5f37a6..deb6d14 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -47,21 +47,18 @@ public: // XServiceInfo -/** Returns
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/querydesign/QueryTableView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 87f185d192668d233f6a8606b1c3d77469e17e04
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Apr 7 22:50:28 2013 +0200
fix typos
See https://gerrit.libreoffice.org/2444
Change-Id: Ia45a3e30a25692cc1f5de90363bd7fe2f427e0d7
Reviewed-on: https://gerrit.libreoffice.org/3268
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index cc79302..1971bcc 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -768,7 +768,7 @@ void OQueryTableView::RemoveTabWin(OTableWindow* pTabWin)
DBG_CHKTHIS(OQueryTableView,NULL);
OSL_ENSURE(pTabWin != NULL, OQueryTableView::RemoveTabWin : Window should
not be NULL !);
-// I need my parent so it can be infomed about the deletion
+// I need my parent so it can be informed about the deletion
OQueryDesignView* pParent =
static_castOQueryDesignView*(getDesignView());
SfxUndoManager rUndoMgr = m_pView-getController().GetUndoManager();
@@ -961,7 +961,7 @@ sal_Bool OQueryTableView::ShowTabWin( OQueryTableWindow*
pTabWin, OQueryTabWinUn
}
else
{
-// Initiaisation failed
+// Initialisation failed
// (for example when the Connection to the database is not
available at the moment)
pTabWin-clearListBox();
delete pTabWin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doclay.cxx | 11 +--
sw/source/core/doc/visiturl.cxx |4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 88156809f742d95a6a59b94a657567653ea96ca8
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Apr 7 21:35:43 2013 +0200
fix indentation
Change-Id: I6102b08a03349c4bdc6316f578dc2c90a4569716
Reviewed-on: https://gerrit.libreoffice.org/3265
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index d14e199..6a5de2b 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -824,12 +824,11 @@ SwFlyFrmFmt* SwDoc::MakeFlyAndMove( const SwPaM rPam,
const SfxItemSet rSet,
aPos.nContent.Assign( 0, 0 ); // Deregister index!
GetNodes().Delete( aIndex, 1 );
-// This is a hack: whilst FlyFrames/Headers/Footers are not undoable we delete
all Undo objects
-if( GetIDocumentUndoRedo().DoesUndo() )
-{
-GetIDocumentUndoRedo().DelAllUndoObj();
-}
-
+// This is a hack: whilst FlyFrames/Headers/Footers are not
undoable we delete all Undo objects
+if( GetIDocumentUndoRedo().DoesUndo() )
+{
+GetIDocumentUndoRedo().DelAllUndoObj();
+}
}
else
{
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 094883b..74e5716 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -85,8 +85,8 @@ void SwURLStateChanged::Notify( SfxBroadcaster , const
SfxHint rHint )
if( bAction )
pESh-EndAllAction();
- if( bUnLockView )
- pESh-LockView( sal_False );
+if( bUnLockView )
+pESh-LockView( sal_False );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docdesc.cxx | 19
sw/source/core/doc/docdraw.cxx | 38 +++--
sw/source/core/doc/docedt.cxx |3 --
sw/source/core/doc/docfld.cxx |7 --
sw/source/core/doc/doclay.cxx | 23
sw/source/core/doc/docnew.cxx |4 ---
sw/source/core/doc/docsort.cxx |9 ---
sw/source/core/doc/docstat.cxx |9 ---
sw/source/core/doc/doctxm.cxx | 11 +
sw/source/core/doc/fmtcol.cxx |4 ---
sw/source/core/doc/list.cxx |7 --
sw/source/core/doc/notxtfrm.cxx | 46
sw/source/core/doc/sortopt.cxx |6 -
sw/source/core/doc/tblafmt.cxx |2 -
14 files changed, 9 insertions(+), 179 deletions(-)
New commits:
commit adea2a859dcc2722fc9db8acb5bddb864f40e0c4
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Apr 7 21:24:55 2013 +0200
fdo#62475 - remove pointless comments and ASCII art in sw/source/core/doc
Change-Id: I15f0af451a2259ddfeaa5e7964317e6c0537e4db
Reviewed-on: https://gerrit.libreoffice.org/3262
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 9f3fa78..fc6809c 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -114,12 +114,6 @@ static void lcl_DefaultPageFmt( sal_uInt16 nPoolFmtId,
rFmt3.SetFmtAttr( aUL );
}
-/*
-|*
-|* SwDoc::ChgPageDesc()
-|*
-|*/
-
static void lcl_DescSetAttr( const SwFrmFmt rSource, SwFrmFmt rDest,
const bool bPage = true )
{
@@ -514,14 +508,6 @@ void SwDoc::DelPageDesc( sal_uInt16 i, bool bBroadcast )
SetModified();
}
-
-
-/*
-|*
-|* SwDoc::MakePageDesc()
-|*
-|*/
-
sal_uInt16 SwDoc::MakePageDesc( const String rName, const SwPageDesc *pCpy,
bool bRegardLanguage, bool bBroadcast)
{
@@ -582,11 +568,6 @@ SwPageDesc* SwDoc::FindPageDescByName( const String
rName, sal_uInt16* pPos ) c
return pRet;
}
-/**
- * Method : void SwDoc::PrtDataChanged()
- * Description :
-
**/
-
void SwDoc::PrtDataChanged()
{
// If you change this, also modify InJobSetup in Sw3io if appropriate.
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index c172e1f..80cedc9 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -381,12 +381,6 @@ void SwDoc::UnGroupSelection( SdrView rDrawView )
delete [] pFmtsAndObjs;
}
-/*
-|*
-|* SwDoc::DeleteSelection()
-|*
-|*/
-
bool SwDoc::DeleteSelection( SwDrawView rDrawView )
{
bool bCallBase = false;
@@ -482,12 +476,6 @@ bool SwDoc::DeleteSelection( SwDrawView rDrawView )
return bCallBase;
}
-/*
-|*
-|* SwDoc::DeleteSelection()
-|*
-|*/
-
_ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
sal_uInt32 nArrOrdNum )
: pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum )
@@ -524,7 +512,6 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const
SwFmtAnchor* pFlyAn,
}
}
-/*/
// Is also called by the Sw3 Reader, if there was an error when reading the
// drawing layer. If it is called by the Sw3 Reader the layer is rebuilt
// from scratch.
@@ -762,9 +749,6 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const
SdrLayerID _nVisibleLa
return nInvisibleLayerId;
}
-/*/
-
-
void SwDoc::ReleaseDrawModel()
{
if ( mpDrawModel )
@@ -786,9 +770,6 @@ void SwDoc::ReleaseDrawModel()
}
}
-/*/
-
-
SdrModel* SwDoc::_MakeDrawModel()
{
OSL_ENSURE( !mpDrawModel, _MakeDrawModel: Why? );
@@ -812,8 +793,6 @@ SdrModel* SwDoc::_MakeDrawModel()
return mpDrawModel;
}
-/*/
-
void SwDoc::DrawNotifyUndoHdl()
{
mpDrawModel-SetNotifyUndoActionHdl( Link() );
@@ -835,19 +814,14 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
if (pField
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doc.cxx |8
sw/source/core/doc/docbm.cxx |2 +-
sw/source/core/doc/docdraw.cxx |5 ++---
sw/source/core/doc/docfld.cxx | 28 +---
sw/source/core/doc/docfmt.cxx |3 +--
sw/source/core/doc/docnew.cxx |4
sw/source/core/doc/docnum.cxx |2 +-
sw/source/core/doc/docruby.cxx |2 --
sw/source/core/doc/fmtcol.cxx |7 ++-
sw/source/core/doc/number.cxx |2 --
10 files changed, 20 insertions(+), 43 deletions(-)
New commits:
commit af5526cf86aa384d4f978c1d26ff69fe4a990477
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Apr 7 21:29:02 2013 +0200
more work on comments in sw/source/core/doc
Change-Id: I4fbf683da081ad04dfd1b9ea830aa94c38f33d43
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index a337f57..084289f 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1356,13 +1356,10 @@ void SwDoc::CalculatePagesForPrinting(
pStPage = (SwPageFrm*)pStPage-GetNext();
}
-
-//
// now that we have identified the valid pages for printing according
// to the print settings we need to get the PageRange to use and
// use both results to get the actual pages to be printed
// (post-it settings need to be taken into account later on!)
-//
// get PageRange value to use
OUString aPageRange;
@@ -1802,7 +1799,6 @@ void SwDoc::UpdateDocStat( bool bCompleteAsync )
}
}
-// Document - info
void SwDoc::DocInfoChgd( )
{
GetSysFldType( RES_DOCINFOFLD )-UpdateFlds();
@@ -2215,9 +2211,7 @@ bool SwDoc::RemoveInvisibleContent()
}
}
-//
// Remove any hidden paragraph (hidden text attribute)
-//
for( sal_uLong n = GetNodes().Count(); n; )
{
SwTxtNode* pTxtNd = GetNodes()[ --n ]-GetTxtNode();
@@ -2355,9 +2349,7 @@ bool SwDoc::HasInvisibleContent() const
if( aIter.First( TYPE( SwFmtFld ) ) )
bRet = true;
-//
// Search for any hidden paragraph (hidden text attribute)
-//
if( ! bRet )
{
for( sal_uLong n = GetNodes().Count(); !bRet (n 0); )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 7d6f59c..4454659 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1037,7 +1037,7 @@ IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess()
const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const
{ return static_cast IDocumentMarkAccess* (mpMarkManager.get()); }
-// SaveBookmark
+// SaveBookmark methods
SaveBookmark::SaveBookmark(
bool bSavePos,
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 80cedc9..a147595 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -512,12 +512,11 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const
SwFmtAnchor* pFlyAn,
}
}
+#include svx/sxenditm.hxx
+
// Is also called by the Sw3 Reader, if there was an error when reading the
// drawing layer. If it is called by the Sw3 Reader the layer is rebuilt
// from scratch.
-
-#include svx/sxenditm.hxx
-
void SwDoc::InitDrawModel()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, SW, JP93722, SwDoc::InitDrawModel
);
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index c27319c..48bec3c4 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -298,9 +298,7 @@ SwFieldType* SwDoc::GetFldType( sal_uInt16 nResId, const
String rName,
return pRet;
}
-/*
- *All have to be re-evaluated.
- */
+// All have to be re-evaluated.
void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
{
// Call Modify() for every field type,
@@ -2209,18 +2207,18 @@ void SwDocUpdtFld::_MakeFldList( SwDoc rDoc, int
eGetMode )
delete pFldSortLst;
pFldSortLst = new _SetGetExpFlds;
-/// consider and unhide sections
-/// with hide condition, only in mode GETFLD_ALL (eGetMode ==
GETFLD_ALL)
-/// notes by OD:
-/// eGetMode == GETFLD_CALC in call from methods SwDoc::FldsToCalc
-/// eGetMode == GETFLD_EXPAND in call from method
SwDoc::FldsToExpand
-/// eGetMode == GETFLD_ALL in call from method SwDoc::UpdateExpFlds
-/// I figured out that hidden section only have to be shown,
-/// if fields have updated (call by SwDoc::UpdateExpFlds) and thus
-/// the hide conditions of section have to be updated.
-/// For correct updating the hide condition of a section, its
position
-/// have to be known in order to insert the hide condition as a new
-/// expression field into the sorted field list (pFldSortLst).
+// consider and unhide sections
+// with hide condition, only in mode GETFLD_ALL (eGetMode ==
GETFLD_ALL)
+// notes by OD:
+// eGetMode
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doc.cxx |4
sw/source/core/doc/doccomp.cxx |2 --
sw/source/core/doc/docfld.cxx |6 --
3 files changed, 12 deletions(-)
New commits:
commit 0a3fc0130166629209e98bea178905085098a8f2
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Apr 7 21:33:17 2013 +0200
remove code that was commented out many years ago
Change-Id: I45292b157b5ea278ec9e0d9a18bf185276ba78c1
Reviewed-on: https://gerrit.libreoffice.org/3264
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 084289f..1ec553d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2023,15 +2023,11 @@ static bool lcl_SpellAndGrammarAgain( const SwNodePtr
rpNd, void* pArgs )
static bool lcl_CheckSmartTagsAgain( const SwNodePtr rpNd, void* )
{
SwTxtNode *pTxtNode = (SwTxtNode*)rpNd-GetTxtNode();
-// sal_Bool bOnlyWrong = *(sal_Bool*)pArgs;
if( pTxtNode )
{
pTxtNode-SetSmartTagDirty( true );
if( pTxtNode-GetSmartTags() )
{
-//if ( bOnlyWrong ) // only some smart tag types have been enabled
or disabled
-// pTxtNode-GetSmartTags()-SetInvalid( 0, STRING_LEN );
-//else // smart tags all have been enabled or disabled
pTxtNode-SetSmartTags( NULL );
}
}
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index c1f753a..676a937 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1154,7 +1154,6 @@ bool SwCompareLine::CompareNode( const SwNode rDstNd,
const SwNode rSrcNd )
pSrcTOX-GetType() == pDstTOX-GetType()
pSrcTOX-GetTitle() == pDstTOX-GetTitle()
pSrcTOX-GetTypeName() == pDstTOX-GetTypeName()
-// pSrcTOX-GetTOXName() == pDstTOX-GetTOXName()
;
}
break;
@@ -1222,7 +1221,6 @@ String SwCompareLine::GetText() const
if( pTOX )
sRet.Append( pTOX-GetTitle() )
.Append( pTOX-GetTypeName() )
-// .Append( pTOX-GetTOXName() )
.Append( OUString::number( pTOX-GetType() ));
}
break;
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 48bec3c4..65222e7 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1362,12 +1362,6 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool
bUpdRefFlds )
const String rName = pFld-GetTyp()-GetName();
-// Set value for Calculator
-//JP 10.02.96: GetValue doesn't make sense here
-// ((SwDBField*)pFld)-GetValue();
-
-//!OK aCalc.VarChange(aName, ((SwDBField*)pFld)-GetValue(aCalc));
-
// Add entry to hash table
// Entry present?
sal_uInt16 nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.cxx | 163 ++-
1 file changed, 78 insertions(+), 85 deletions(-)
New commits:
commit bcb662a210f5e0c0e760bab1ba7c3d4b5d002c6c
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun May 5 23:18:17 2013 +0200
follow up to commit 2e109641648bed508318d3b65a385f5b9e78edf7
Norbert cherry-picked the original patch [1] without changes. However
some sentences in it where translated misleadingly. So here I am merging my
remarks/corrections to it, plus some minor changes regarding whitespaces
in front of punctuations.
[1] see https://gerrit.libreoffice.org/3788
Change-Id: If5fa033c48b2bd16fc0b83195ba4d46f5051414b
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index eb649b0..5afa08f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -941,8 +941,7 @@ const sal_uInt8* WW8SprmIter::FindSprm(sal_uInt16 nId)
// temporary test
// WW8PLCFx_PCDAttrs cling to WW8PLCF_Pcd and therefore do not have their own
iterators.
-// All relating to iterators methods are therefore dummies.
-// All iterators related to methods are consequently dummies.
+// All methods relating to iterators are therefore dummies.
WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion,
WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase)
: WW8PLCFx(eVersion, true), pPcdI(pPLCFx_PCD-GetPLCFIter()),
@@ -1010,9 +1009,9 @@ void WW8PLCFx_PCDAttrs::GetSprms(WW8PLCFxDesc* p)
}
else
{
-// SPRM is deposited directly into members-Var
+// SPRM is stored directly into members var
/*
-These are the attr that are in the piece-table, instead of in the
text!
+These are the attr that are in the piece-table instead of in the
text!
*/
if (IsSevenMinus(GetFIBVersion()))
@@ -1255,6 +1254,7 @@ WW8_CP WW8PLCFx_PCD::AktPieceStartFc2Cp( WW8_FC nStartPos
)
}
// Helper routines for all
+
short WW8_BRC::DetermineBorderProperties(bool bVer67, short *pSpace,
sal_uInt8 *pCol, short *pIdx) const
{
@@ -1714,7 +1714,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream*
pTblSt,
break;
}
-// PLCF for TextBox-Stories in main text
+// PLCF for TextBox stories in main text
sal_uInt32 nLenTxBxS = (8 pWw8Fib-nVersion) ? 0 : 22;
if( pWwFib-fcPlcftxbxTxt pWwFib-lcbPlcftxbxTxt )
{
@@ -1722,7 +1722,7 @@ WW8ScannerBase::WW8ScannerBase( SvStream* pSt, SvStream*
pTblSt,
pWwFib-lcbPlcftxbxTxt, nLenTxBxS );
}
-// PLCF for TextBox-Stories in Header/Footer range
+// PLCF for TextBox stories in Header/Footer range
if( pWwFib-fcPlcfHdrtxbxTxt pWwFib-lcbPlcfHdrtxbxTxt )
{
pHdFtTxbx = new WW8PLCFspecial( pTblSt, pWwFib-fcPlcfHdrtxbxTxt,
@@ -1765,21 +1765,20 @@ WW8ScannerBase::~WW8ScannerBase()
delete [] pExtendedAtrds;
}
-
-// Fields
+// Fields
static bool WW8SkipField(WW8PLCFspecial rPLCF)
{
void* pData;
WW8_CP nP;
-if (!rPLCF.Get(nP, pData)) // End of PLCFspecial ?
+if (!rPLCF.Get(nP, pData)) // End of PLCFspecial?
return false;
rPLCF.advance();
-ifsal_uInt8*)pData)[0] 0x1f ) != 0x13 )// No begin ?
-return true;// Do not break on error
+ifsal_uInt8*)pData)[0] 0x1f ) != 0x13 )// No beginning?
+return true;// Do not terminate on error
if( !rPLCF.Get( nP, pData ) )
return false;
@@ -1804,7 +1803,7 @@ static bool WW8SkipField(WW8PLCFspecial rPLCF)
while sal_uInt8*)pData)[0] 0x1f ) == 0x13)
{
-// still new (nested) beginnings ?
+// still new (nested) beginnings?
WW8SkipField( rPLCF ); // nested Field in Results
if( !rPLCF.Get( nP, pData ) )
return false;
@@ -1822,12 +1821,12 @@ static bool WW8GetFieldPara(WW8PLCFspecial rPLCF,
WW8FieldDesc rF)
rF.nLen = rF.nId = rF.nOpt = rF.bCodeNest = rF.bResNest = 0;
-if( !rPLCF.Get( rF.nSCode, pData ) ) // end of PLCFspecial ?
+if( !rPLCF.Get( rF.nSCode, pData ) ) // end of PLCFspecial?
goto Err;
rPLCF.advance();
-ifsal_uInt8*)pData)[0] 0x1f ) != 0x13 )// No begin ?
+ifsal_uInt8*)pData)[0] 0x1f ) != 0x13 )// No beginning?
goto Err;
rF.nId = ((sal_uInt8*)pData)[1];
@@ -1836,8 +1835,8 @@ static bool WW8GetFieldPara(WW8PLCFspecial rPLCF,
WW8FieldDesc rF)
goto Err;
rF.nSRes = rF.nLCode; // Default
-rF.nSCode++;// ohne Marken
-rF.nLCode -= rF.nSCode; // Pos zu Laenge
+rF.nSCode++;// without markers
+rF.nLCode
Re: Killing the gerrit to dev-list spam ...
Hey all, so in my eyes the consensus here is the following: (1) we want to get informed about new stuff to - either react/ review it as a regular developer or - to keep up with a topic as sparetime contributor (2) too many automaticly sent mails blur the view for important messages and discussions I would be happy with a regular outline every 8 hours in the style of: These are the new submissions to gerrit of the last x hours. They have the following headlines: * fix a typo http://linktogerrit/123 * kill OUString::bla http://linktogerrit/124 * some important change http://linktogerrit/125 For more information or to get involved into a discussion please checkout the provided Gerrit links. In addition, the following changes were merged in the last time frame: * tricky bug fix http://linktogerrit/101 * simplify life http://linktogerrit/42 Did you know that you can configure Gerrit to send you individualized email overviews? Checkout http://linktowiki/howto My suggestion. Would reduce number of mails while still giving the option to get updates. A little bit like the ESC protocols... Philipp PS: I personally have a filter putting mails from Gerrit into a subfolder. So I do not get distracted while reading the dev-list. However, this leads to the fact, that I less often check for patch submission that are interesting to me. 2013/5/4 Bjoern Michaelsen bjoern.michael...@canonical.com Hi, On Sat, May 04, 2013 at 12:57:46AM +0200, Thorsten Behrens wrote: Bjoern Michaelsen wrote: So removing those who are employed to work on LibreOffice -- which I expect to be capable to set up their mail filters with a second list or with a gerrit watch well not so fast with taking away the right to opine - I would rather like us to come to a consensus here, than arbitrarily excluding valid input. After all, the initial proposal came from a paid developer. ;) Oh, I of course welcome every kind of input, but I prefer to keep these two separated as having the dev mailing list manageable is a key factor in gaining more volunteer contributors, while gaining more salaried developers contributing to the project rather depends on other factors. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Where to find the sources for the tinderbox status?
Hi, when looking at http://tinderbox.libreoffice.org/MASTER/status.html, I currently see the first Android-Tinderbox in a green status -- with 3 errors! However, when checking the output on the Brief Build Log, it appears that these are all false positives. The three lines that are highlighted as errors are just configuration messages containing the word error somehow: (1) Running ./configure with ´--build=x86_64-unknown-linux-gnu´ ´--enable-werror´ ... (2) checking whether ... supports pragma GCC diagnostic error/ignored/warning... yes (3) checking whether /usr/bin/ccache gcc supports pragma GCC diagnostic error/ignored/warning... yes I also checked a failing tinderbox and here the error string is either error: (with a colon) or Error (capital E) or it is marked as sys_err in the output. Can someone give me a pointer to the related reporting script/ whatever reports the number of errors, so that I can try removing these false positive cases? Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Excel Function Meta Bug?
Hi, I am currently cleaning up my mailbox and found this mail that is close to a year old. 2012/7/17 Joel Madero jmadero@gmail.com Nice, the updates make it quite a bit more functional. I noticed that most of the really useful functions are already well on their way to being implemented. Those cube functions...I've never even heard of. Otherwise, I think the users list was not very accurate, I think he had 25+ functions, I found a total of 14. Thanks again, Joel On Tue, Jul 17, 2012 at 12:57 PM, Eike Rathke er...@redhat.com wrote: Hi Joel, On Tuesday, 2012-07-17 08:36:22 -0700, Joel Madero wrote: I've started the page. You can find information on the Calc development page (bottom). Thanks for the guidance, hopefully I (and maybe others) can complete the list soon and then decide if/when/how to start getting the most important functions implemented. Thanks for getting this started, I took the freedom and fiddled with it ;-) Eike It refers to https://wiki.documentfoundation.org/Development/Calc/Spreadsheet_Functions, where there is a list MS Office function currently missing in LO Calc. The last update of the page was 2012-07-21. The page states that 6 of the 14 functions are implemented in OOo CWS pending integration. As far as I know, this integration is done, right? The upcomming week I am busy but maybe someone else has time to check if the listed functions are now supported and update the wiki page. Otherwise I will try to find some time for it in the week after (Mai 20th-26th). Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Where to find the sources for the tinderbox status?
Hey Julien, Christian, 2013/5/12 Christian Lohmaier lohmaier+libreoff...@googlemail.com Hi Philipp, On Sun, May 12, 2013 at 7:38 PM, Philipp Riemer ruderphil...@gmail.com wrote: Hi, when looking at http://tinderbox.libreoffice.org/MASTER/status.html, I currently see the first Android-Tinderbox in a green status Yes, all that counts in terms of build success or failure is the color - the count is just a simple grepping for lines that might be an error. Can someone give me a pointer to the related reporting script/ whatever reports the number of errors, so that I can try removing these false positive cases? http://cgit.freedesktop.org/libreoffice/website/tree/local_conf/Error_Parse.pm?h=tinderbox ciao Christian Thanks for the link. Uh, Perl... Nevertheless, the important line seems to be: ($line =~ /\b(?!\/)[Ee]rror(?!\.)\b/)||# C make error Searching my RegExp book to understand the brainfuckhttp://en.wikipedia.org/wiki/Brainfuckstyle code after rror... :-) What I want, is to ignore it if there is ... at the end of the string: (a) a tick as in ´--enable-werror´ (b) a slash as in error/ignored/warning Seems to be easy, but I am obviously to tired at the moment to wrap my head around this... So far I have the following (see http://perldoc.perl.org/perlre.html): (?!\.) matches (1) a single arbitrary character or (2) an exclamation mark or (3) a dot and the \b stands for boundary (alphanum on the left and !alphanum on the right or the other way around), so obviously both, the tick and the slash, are !alphanum (as is the colon, which should still match)... So maybe the easiest would be to add a and !(A or B) to the line to invalidate a false positive match? I will have a look at this tomorrow again, after taking counsel with my pillow ;-) Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Where to find the sources for the tinderbox status?
Hi Christian, LOL and thank you a lot for your long reply and the obvious hint ;-) I must have been pretty tired to not realize this section in the script. While rusty with Perl (I once wrote some Nagios check scripts in it several years ago and before there were Icinga and Shinken), I got some test script working and added my few cases. Unfortunately, I am unable to push these back upstream (might be PEBKAC), so that I attached the patch to this mail. Could you please take care of integrating the changes? Have a nice week! Philipp PS: Next week - Linuxtag in Berlin http://www.linuxtag.org/2013/! Will you be there? 2013/5/12 Christian Lohmaier lohmaier+libreoff...@googlemail.com Hi Philipp, *, On Sun, May 12, 2013 at 9:40 PM, Philipp Riemer ruderphil...@gmail.com wrote: Thanks for the link. Uh, Perl... regular expressions would be mor or less the same in other langauges, so no difference here. And using something else than perl just for the sake of it would be pointless. Nevertheless, the important line seems to be: ($line =~ /\b(?!\/)[Ee]rror(?!\.)\b/)|| # C make error [...] What I want, is to ignore it if there is ... at the end of the string: You didn't bother to look at the whole file, so I won't bother to write a long reply right now. So far I have the following (see http://perldoc.perl.org/perlre.html): (?!\.) matches (1) a single arbitrary character or no. (2) an exclamation mark or no. the ? signals a group-matching modifier. i.e. it changes the meaning of the () block. ?! makes the stuff in () to be a A zero-width negative look-ahead assertion. (3) a dot yes (and no) - it matches a dot inside the (), but the whole rule says it should only match the previous part *not* followed by a dot. Similarily, the (?!\/) is a A zero-width negative look-behind assertion So the pattern matches Error or error, but only if that [Ee]rror is not after a / and not before a . and the \b stands for boundary (alphanum on the left and !alphanum on the right or the other way around), so obviously both, the tick and the slash, are !alphanum (as is the colon, which should still match)... Nah, you'r tricking yourself again. \b ist a change of \w to \W (not just alphanum, but also _ and some additional unicode characters) or the other way round, as you wrote yourself. But a line like foo/Error.something would happily match \bError\b - as the / marks a switch - but it should *not* match. So maybe the easiest would be to add a and !(A or B) to the line to invalidate a false positive match? No, see my comment abve about you not looking at the whole file. There are a bunch of whitelist lines in there, lines that matche the overall error-marking regexes, that should be *ignore*d (hint, hint :-))) and not counted as errors. ciao Christian 0001-Added-rules-to-capture-more-false-positives-in-log-o.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH]Comment translation vcl/win/source/window/salobj.cxx
Hi Christian, thanks for your submission! I uploaded your patch to Gerrit where it can be easily reviewed approved by other contributors. You can find it under the following URL: https://gerrit.libreoffice.org/2447. However, I could not integrate it into the codebase as long as you did not provide a license statement (see previous off-list mail). Cheers, Philipp 2013/2/24 Christian M. Heller christian.helle...@gmail.com: ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] German comment translation - vcl#2
Hi Christian, thanks for your submission! I uploaded your patch to Gerrit where it can be easily reviewed approved by other contributors. You can find it under the following URL: https://gerrit.libreoffice.org/2447. However, I could not integrate it into the codebase as long as you did not provide a license statement (see previous off-list mail). Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 05175da8b4c1331e74b9293e3dbce8426df6a7d0 Author: Philipp Riemer ruderphil...@gmail.com Date: Thu Jan 2 18:38:55 2014 +0100 fix error in bin/find-german-comments Change-Id: Ice848243654b1bc8923ba65fe87c61e8087c0d8a diff --git a/bin/find-german-comments b/bin/find-german-comments index 59e4c88..a8a3f2e 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -192,7 +192,7 @@ class Parser: elif not self.options.filenames_only: for linenum, s in self.get_comments(path): -if self.is_german(s) and self.options.line_numbers: +if self.is_german(s): print %s:%s: %s % (path, linenum, s) else: fnames = set([]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Bug 72598] [Easyhack] Remove SunStudio cruft from code base
Hi, In commit 9eac4a5http://cgit.freedesktop.org/libreoffice/core/commit/?id=66397a4fd222757a8bd651c0c297615319eac4a5 Jelle changed the following: diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index f6f7b1e..b6b4a05 100644 --- a/cppu/source/uno/data.cxxhttp://cgit.freedesktop.org/libreoffice/core/tree/cppu/source/uno/data.cxx?id=b1d65c9f1535c9ef283d2a91a225359e5983f747 +++ b/cppu/source/uno/data.cxxhttp://cgit.freedesktop.org/libreoffice/core/tree/cppu/source/uno/data.cxx?id=66397a4fd222757a8bd651c0c297615319eac4a5 @@ -351,7 +351,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData( #if (defined(INTEL) \ (defined(__GNUC__) (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) \ - || defined(MACOSX) || defined(DRAGONFLY) || (defined(__SUNPRO_CC) defined(SOLARIS \ + || defined(MACOSX) || defined(DRAGONFLY) || )) \ || defined(IOS) #define MAX_ALIGNMENT_4 #endif Now I was wondering, if the empty OR at the end might bring any complications? Wouldn't it be better to remove these characters as well? I submitted a change request to gerrit: https://gerrit.libreoffice.org/#/c/7269/ Cheers! Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppu/source
cppu/source/uno/data.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e4a98b2b7da8e8ae0de8d489d9f9d79993db5326 Author: Philipp Riemer ruderphil...@gmail.com Date: Sat Jan 4 11:59:44 2014 +0100 remove empty or This is an additional commit to 66397a4fd222757a8bd651c0c297615319eac4a5 Change-Id: I61df7984090e984f50788d0c2573d3bf8bac233b diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index b6b4a05..5c29088 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -351,7 +351,7 @@ CPPU_DLLPUBLIC sal_Bool SAL_CALL uno_type_isAssignableFromData( #if (defined(INTEL) \ (defined(__GNUC__) (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) \ -|| defined(MACOSX) || defined(DRAGONFLY) || )) \ +|| defined(MACOSX) || defined(DRAGONFLY))) \ || defined(IOS) #define MAX_ALIGNMENT_4 #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LibreOffice Android
Hi, I found this mail on the mailing list. However, I am not deep enough in the topic to provide helpful answers. All I found w.r.t. LibreOffice on Android is the following wiki page: https://wiki.documentfoundation.org/Android Is there any more information / report of progress available? It seems as if there exist some builds on a tinderbox but those are not even in an alpha state. So I would not suggest this to this particular (non-tech) user. If anyone has more information, I can act as translator. Here a translation of the mail: Hello! Unfortunately this is the only mail address I could find. I do not understand what are chats but I would like to tell you something, I hope this mail reaches those who are interested. It is obvious that the development of LibreOffice is currently rather slow... In addition, the plea for funding to the users in spring, for me is a warning sign of a close stagnation of a project. As soon as the developers come up with a cost-benefit thinking, the voluntary enthusiasm is mostly gone... Whatever. As the subject implies I talk about Android. I have a Samsung Galaxy S3 with a multimedia docking station. This thing rocks! Especially, that it can transform into a full PC and move like it in the internet when connected to a TV with Full HD is great! However I am missing my favorite (since Star Office 3.1 under Win3.1) office suite! I have litteraly thousands of documents that I would like to use without a laptop in future. But LibreOffice for Android does not pick up pace to publish a release or a simple installation file. For *me* (I am a physician and have no clue about compiling or programming) it would be enough to have a direct port of the current office suite on android. As far as I heard, this should be closed to being finished. Here is my idea as a enthusiastic Galaxy S3 dock user: Why do you not realize a special Android GUI as a simple extensioin for LibreOffice? One could try to make it like Samsung with its Mulit-Window mode where one can slide in the menu on the left side. It does not seem to hard to implement for me. Simply hide the normal menu bar, create a new one (than can be hidden),... This would have the advantage that in desktop mode all menus would be available, the original code does not need any changes and the menu implementation could be seperated from normal development, so to say in microcosm. As a first version you could have a starting screen where one could choose between the traditional and the Android GUI layout. So far to my idea... Now I have another question: How do I install daily builds? If I try to download the package with Android I get a .txt file which does not do anything. What I am looking for is an APK that I just click and then it installs LibreOffice on Android. Could you please help me? Sorry for writing German but my English is too bad and due to my job my time is limited so that I do not have time for digging for technical terms. This should not be offending! I would be truly grateful not having to carry my laptop with me anymore. Thank you for you attention! Respectfully of your special knowledge in my own cluelessness of the mentioned problems. Bernd --- Am 13. Juni 2013 00:23 schrieb Bernd Brüggemann brueggemannbe...@web.de: I will try my luck in German, because my English is to bad to say Schönen Guten Tag! Dies ist leider die einzige Mail Adresse, die ich finden konnte. Da ich keine Ahnung von chat oder was weiß ich habe, meine Ausführungen aber doch mehr als drei Sätze haben werden, hoffe ich, diese Mail erreicht jemanden, den es interessiert. Es ist nicht zu übersehen, dass es bei Libreoffice im Augenblich ein wenig langsamer vonstatten geht Auch der Aufruf im Frühling an die User, zu spenden, ist für mich immer ein Warnzeichen für den nahen Stillstand eines Projektes. Kommt bei den Programmierern erst der Kosten-Nutzen Gedanke auf, hat sich der ehrenamliche Enthusiasmus meist gelegt Egal. Nach der Überschrift, dreht es sich hier um Android. Ich habe ein Galaxy S3 von Samsung mit Multimedia Dockingstation. Das Teil ist einfach super! Vor allem, dass es plötzlich tatsächlich zum PC mutiert und sich auch so im Internet bewegt und nicht mehr als mobile device ist für einen Full HD Fernseher ganz große Klasse! Was mir noch fehlt ist mein bevorzugtes Office (seit Star Office 3.1 unter Windows 3.1)! Ich habe im wahrsten sinne des Wortes tausende an Dokumenten, die ich gerne in Zukunft ohne Laptop benutzen können möchte. LibreOffice Android kommt aber nicht in die Gänge ein fertiges Release oder eine einfache Installation herauszugeben. MIR würde schon genügen (und ich habe KEINE Ahnung von Compilieren oder Programmierenbin Arzt.), wenn es eine direkte Umsetzung des Office Paketes auf Android gäbe! Diese soll ja angeblich nahezu fertig sein! Nun also die Idee eines begeisterten Galaxy S3 dock Benutzers: warum realisiert man eine spezielle Android
[Libreoffice-commits] core.git: include/svl
include/svl/filerec.hxx | 569 +---
1 file changed, 249 insertions(+), 320 deletions(-)
New commits:
commit 2a46a01902bccd1f025cce92ce6d32efbabf6825
Author: Philipp Riemer ruderphil...@gmail.com
Date: Tue Sep 3 19:50:10 2013 +0200
fdo#39468: Translate German comments (first part)
Change-Id: I8cd558c558a369ba2715ccdc0baf58d637e79a38
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 085b1d1..3cc9248 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -25,25 +25,25 @@
#include tools/stream.hxx
#include vector
-#define SFX_REC_PRETAG_EXT sal_uInt8(0x00) // Pre-Tag fur
Extended-Records
-#define SFX_REC_PRETAG_EOR sal_uInt8(0xFF) // Pre-Tag fur
End-Of-Records
+#define SFX_REC_PRETAG_EXT sal_uInt8(0x00) // Pre-Tag for
Extended-Records
+#define SFX_REC_PRETAG_EOR sal_uInt8(0xFF) // Pre-Tag for
End-Of-Records
-#define SFX_REC_TYPE_NONE sal_uInt8(0x00) // unbekannter
Record-Typ
+#define SFX_REC_TYPE_NONE sal_uInt8(0x00) // unknown Record-Typ
#define SFX_REC_TYPE_FIRST sal_uInt8(0x01)
#define SFX_REC_TYPE_SINGLE sal_uInt8(0x01) //
Single-Content-Record
#define SFX_REC_TYPE_FIXSIZEsal_uInt8(0x02) //
Fix-Size-Multi-Content-Record
#define SFX_REC_TYPE_VARSIZE_RELOC sal_uInt8(0x03) // variable Rec-Size
-#define SFX_REC_TYPE_VARSIZEsal_uInt8(0x04) // alt (nicht
verschiebbar)
+#define SFX_REC_TYPE_VARSIZEsal_uInt8(0x04) // old (not movable)
#define SFX_REC_TYPE_MIXTAGS_RELOC sal_uInt8(0x07) // Mixed Tag
Content-Record
-#define SFX_REC_TYPE_MIXTAGSsal_uInt8(0x08) // alt (nicht
verschiebbar)
+#define SFX_REC_TYPE_MIXTAGSsal_uInt8(0x08) // old (not movable)
#define SFX_REC_TYPE_LAST sal_uInt8(0x08)
#define SFX_REC_TYPE_MINI 0x100 // Mini-Record
#define SFX_REC_TYPE_DRAWENG0x400 // Drawing-Engine-Record
#define SFX_REC_TYPE_EOR0xF00 // End-Of-Records
-#define SFX_REC_HEADERSIZE_MINI 4 // Gro\se des Mini-Record-Headers
-#define SFX_REC_HEADERSIZE_SINGLE 4 // zzgl. HEADERSIZE_MINI = 8
-#define SFX_REC_HEADERSIZE_MULTI6 // zzgl. HEADERSIZE_SINGLE = 14
+#define SFX_REC_HEADERSIZE_MINI 4 // size of the Mini-Record-Header
+#define SFX_REC_HEADERSIZE_SINGLE 4 // additional HEADERSIZE_MINI = 8
+#define SFX_REC_HEADERSIZE_MULTI6 // additional HEADERSIZE_SINGLE = 14
#ifndef DBG
#ifdef DBG_UTIL
@@ -162,43 +162,37 @@
High-Nibble des Typs bei Vergleichen nicht berucksichtigt wird.
*/
-/* [Beschreibung]
-
-Mit Instanzen dieser Klasse kann ein einfacher Record in einen Stream
-geschrieben werden, der sich durch ein sal_uInt8-Tag identifiziert, sowie
-seine eigene Lange speichert und somit auch von alteren Versionen
-bzw. Readern, die diesen Record-Type (Tag) nicht kennen, ubersprungen
-werden kann. Es wird keine Version-Nummer gespeichert.
-
-Alternativ kann die Gro\se fest angegeben werden oder sie wird
-automatisch aus der Differenz der Tell()-Angaben vor und nach dem
-Streamen des Inhalts ermittelt.
-
-Um Auf- und Abwartskompatiblitat gewahrleisten zu konnen, mussen
-neue Versionen die Daten der alteren immer komplett enthalten,
-es durfen allenfalls neue Daten hintenan gehangt werden!
-
-[Fileformat]
-
-1* sal_uInt8 Content-Tag (!= 0)
-1* 3-sal_uInt8 OffsetToEndOfRec in Bytes
-SizeOfContent* sal_uInt8 Content
-
-[Beispiel]
-
-{
-SfxMiniRecordWriter aRecord( pStream, MY_TAG_X );
-*aRecord aMember1;
-*aRecord aMember2;
-}
-*/
+/** Writes simple records in a stream
+ *
+ * An instance of this class can write a simple record into a stream. It
identifies itself
+ * with a sal_uInt8 and stores its own size. This allows it to be skipped with
old versions or
+ * readers if they do not know the record type (= tag). No version number will
be stored.
+ *
+ * One can either provide the size or the latter will be automatically
calculated based on the
+ * difference of Tell() before and after streaming the content.
+ *
+ * [File Format]
+ * 1* sal_uInt8Content-Tag (!= 0)
+ * 1* 3-sal_uInt8 OffsetToEndOfRec in Bytes
+ * SizeOfContent* sal_uInt8Content
+ *
+ * @example
+ * {
+ * SfxMiniRecordWriter aRecord( pStream, MY_TAG_X );
+ * *aRecord aMember1;
+ * *aRecord aMember2;
+ * }
+ * @note To ensure up- and downwards compatibility, new versions need to
include
+ * the data of the older ones and are only allowed to add data afterwards.
+ * @see SfxMiniRecordReader
+ */
class SVL_DLLPUBLIC SfxMiniRecordWriter
{
protected:
-SvStream* _pStream; // SvStream, in dem der Record liegt
-sal_uInt32 _nStartPos; // Start-Position
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/trvlfrm.cxx | 271 --
1 file changed, 90 insertions(+), 181 deletions(-)
New commits:
commit 2772d52e86820579b18ceaa4241320b466bad439
Author: Philipp Riemer ruderphil...@gmail.com
Date: Fri Aug 9 20:59:47 2013 +0200
Cleanup sw/source/core/layout/trvlfrm.cxx
Change-Id: I979269121cda8e2b70a410ce622e78efe472c82c
diff --git a/sw/source/core/layout/trvlfrm.cxx
b/sw/source/core/layout/trvlfrm.cxx
index 843f39a..81671bb 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -149,14 +149,7 @@ public:
static SwCrsrOszControl aOszCtrl = { 0, 0, 0 };
-/*
-|*
-|* SwLayoutFrm::GetCrsrOfst()
-|*
-|* Description:Searches the CntntFrm owning the PrtArea
-|* containing the point.
-|*
-|*/
+/** Searches the CntntFrm owning the PrtArea containing the point. */
sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
@@ -183,13 +176,7 @@ sal_Bool SwLayoutFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
return bRet;
}
-/*
-|*
-|* SwPageFrm::GetCrsrOfst()
-|*
-|* Description:Searches the page containing the searched point.
-|*
-|*/
+/** Searches the page containing the searched point. */
sal_Bool SwPageFrm::GetCrsrOfst( SwPosition *pPos, Point rPoint,
SwCrsrMoveState* pCMS, bool bTestBackground )
const
@@ -395,14 +382,10 @@ bool SwRootFrm::FillSelection( SwSelectionList aSelList,
const SwRect rRect) c
return !aSelList.isEmpty();
}
-/*
-|*
-|* SwRootFrm::GetCrsrOfst()
-|*
-|* Description:Primary passes the call to the first page.
-|* If the passed Point gets changed we return sal_False.
-|*
-|*/
+/** Primary passes the call to the first page.
+ *
+ * @return sal_False, if the passed Point gets changed
+ */
sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point rPoint,
SwCrsrMoveState* pCMS, bool bTestBackground )
const
{
@@ -444,16 +427,12 @@ sal_Bool SwRootFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
return aOldPoint == rPoint;
}
-/*
-|*
-|* SwCellFrm::GetCrsrOfst()
-|*
-|* Description:If this is about a Cntnt-carrying cell the Crsr will
-|* be force inserted into one of the CntntFrms if there
are
-|* no other options.
-|* There is no entry for protected cells.
-|*
-|*/
+/**
+ * If this is about a Cntnt-carrying cell the Crsr will be force inserted into
one of the CntntFrms
+ * if there are no other options.
+ *
+ * There is no entry for protected cells.
+ */
sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
@@ -516,19 +495,13 @@ sal_Bool SwCellFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
return sal_False;
}
-/*
-|*
-|* SwFlyFrm::GetCrsrOfst()
-|*
-|*/
//Problem: If two Flys have the same size and share the same position then
//they end inside each other.
//Because we recursively check if a Point doesn't randomly lie inside an other
//fly which lies completely inside the current Fly we could trigger an endless
//loop with the mentioned situation above.
//Using the helper class SwCrsrOszControl we prevent the recursion. During
-// a recursion GetCrsrOfst picks the one which lies on top.
-
+//a recursion GetCrsrOfst picks the one which lies on top.
sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point rPoint,
SwCrsrMoveState* pCMS, bool ) const
{
@@ -605,11 +578,7 @@ sal_Bool SwFlyFrm::GetCrsrOfst( SwPosition *pPos, Point
rPoint,
return bRet;
}
-/*
-|*
-|*Description: Layout dependent cursor travelling
-|*
-|*/
+/** Layout dependent cursor travelling */
sal_Bool SwCntntFrm::LeftMargin(SwPaM *pPam) const
{
if( pPam-GetNode() != (SwCntntNode*)GetNode() )
@@ -640,7 +609,7 @@ static const SwCntntFrm *lcl_GetPrvCnt( const SwCntntFrm*
pCnt )
typedef const SwCntntFrm
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/SwStyleNameMapper.cxx |2 ++
sw/source/core/doc/doc.cxx |1 -
sw/source/core/doc/docbm.cxx |4
sw/source/core/doc/doccomp.cxx |1 -
sw/source/core/doc/docdesc.cxx |1 -
sw/source/core/doc/docedt.cxx|1 -
sw/source/core/doc/docfmt.cxx|3 ---
sw/source/core/doc/docredln.cxx |4
sw/source/core/doc/htmltbl.cxx |3 ---
sw/source/core/doc/poolfmt.cxx |1 -
sw/source/core/doc/swstylemanager.hxx|1 +
sw/source/core/doc/tblafmt.cxx |1 -
12 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit cbcec9930cd6f601b1d4ebfd7ee0351d7d0a097e
Author: Philipp Riemer ruderphil...@gmail.com
Date: Fri Aug 9 21:27:32 2013 +0200
cleanup blank lines in sw/source/core/doc
Change-Id: Idd4704f3056663f56fab6e56112e5c9eff55aef7
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index 4fe5508..336329f 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -21,6 +21,7 @@
#include tools/resmgr.hxx
#include poolfmt.hxx
#include rcid.hrc
+
#ifdef _NEED_TO_DEBUG_MAPPING
#include stdlib.h
#endif
@@ -848,6 +849,7 @@ SwStyleNameMapper::GetProgName(sal_uInt16 const nId, const
OUString rName)
{
return getNameFromId(nId, rName, true);
}
+
// This gets the PoolId from the UI Name
sal_uInt16 SwStyleNameMapper::GetPoolIdFromUIName(
const OUString rName, SwGetPoolIdFromName const eFlags)
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index ff71f35..5fe4cb6 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2193,7 +2193,6 @@ bool SwDoc::RemoveInvisibleContent()
// 1. removing the paragraph would result in an empty section
or
// 2. if the paragraph is the last paragraph in the section and
//there is no paragraph in front of the paragraph:
-
if ( ( 2 == pTxtNd-EndOfSectionIndex() -
pTxtNd-StartOfSectionIndex() ) ||
( 1 == pTxtNd-EndOfSectionIndex() - pTxtNd-GetIndex()
!GetNodes()[ pTxtNd-GetIndex() - 1 ]-GetTxtNode() ) )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 7d81e41..ae066c7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -874,7 +874,6 @@ namespace sw { namespace mark
}} // namespace ::sw::mark
-
#define PCURCRSR (_pCurrCrsr)
#define FOREACHPAM_START(pSttCrsr) \
{\
@@ -987,7 +986,6 @@ namespace
return nReturn;
}
-
static inline int lcl_Greater( const SwPosition rPos, const SwNodeIndex
rNdIdx, const SwIndex* pIdx )
{
return rPos.nNode rNdIdx || ( pIdx rPos.nNode == rNdIdx
rPos.nContent pIdx-GetIndex() );
@@ -1024,11 +1022,9 @@ namespace
rSave.DecType();
}
}
-
}
// IDocumentMarkAccess for SwDoc
-
IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess()
{ return static_cast IDocumentMarkAccess* (mpMarkManager.get()); }
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 10e2279..9bf69d7 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1512,7 +1512,6 @@ void SwCompareData::ShowInsert( sal_uLong nStt, sal_uLong
nEnd )
pInsRing = pTmp;
// #i65201#: These SwPaMs are calculated smaller than needed, see comment
below
-
}
void SwCompareData::ShowDelete( const CompareData rData, sal_uLong nStt,
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 121e065..6d2cfdc 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -437,7 +437,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc
rChged )
pBindings-Invalidate( SID_ATTR_PAGE_ULSPACE );
pBindings-Invalidate( SID_ATTR_PAGE_LRSPACE );
}
-
}
/// All descriptors whose Follow point to the to-be-deleted have to be adapted.
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 512121f..9bee581 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1788,7 +1788,6 @@ bool SwDoc::DeleteRange( SwPaM rPam )
return lcl_DoWithBreaks( *this, rPam, SwDoc::DeleteRangeImpl );
}
-
static void lcl_syncGrammarError( SwTxtNode rTxtNode,
linguistic2::ProofreadingResult rResult,
xub_StrLen /*nBeginGrammarCheck*/, const ModelToViewHelper rConversionMap
)
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index dc78244..7fe4e19 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1532,7 +1532,6 @@ SwFmt *SwDoc::_MakeFrmFmt(const String rFmtName,
return dynamic_castSwFmt*(pFrmFmt);
}
-
// #i40550# - add parameter bAuto - not relevant
SwCharFmt *SwDoc::MakeCharFmt
[Libreoffice-commits] core.git: bin/find-german-comments
bin/find-german-comments | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) New commits: commit 299e6381ef8895ac8d0c762b603ab50b9cfc4441 Author: Philipp Riemer ruderphil...@gmail.com Date: Fri Aug 9 23:02:16 2013 +0200 Add a new option to bin/find-german-comments The new option -L allows to print out potential candidates for translation combined with the number of lines found like -l - but only if there was a positive result (i.e., a file that needs checking). This leads to a much more compact representation helping people to find the few files that still need translations. Change-Id: Iad554eb6ce5b062e96774d9488c54105679b7c4b diff --git a/bin/find-german-comments b/bin/find-german-comments index 1cc9d51..59e4c88 100755 --- a/bin/find-german-comments +++ b/bin/find-german-comments @@ -43,9 +43,11 @@ class Parser: op.add_option(-f, --filenames-only, action=store_true, dest=filenames_only, default=False, help=Only print the filenames of files containing German comments) op.add_option(-v, --verbose, action=store_true, dest=verbose, default=False, -help=Turn on verbose mode (print progress to stderr)) +help=Turn on verbose mode (print only positives progress to stderr)) op.add_option(-l, --line-numbers, action=store_true, dest=line_numbers, default=False, help=Prints the filenames and line numbers only.) +op.add_option(-L, --line-numbers-pos, action=store_true, dest=line_numbers_pos, default=False, +help=Prints the filenames and line numbers only (if positive).) op.add_option(-t, --threshold, action=store, dest=THRESHOLD, default=0, help=When used with '--line-numbers', only bothers outputting comment info if there are more than X number of flagged comments. Useful for weeding out false positives.) self.options, args = op.parse_args() @@ -156,15 +158,19 @@ class Parser: padding = 0 return (diff/4)+padding -if self.options.line_numbers: +if self.options.line_numbers or self.options.line_numbers_pos: TABS = \t*10 path_linenums = [] for linenum, s in self.get_comments(path): if self.is_german(s): path_linenums.append(linenum) valid = len(path_linenums) int(self.options.THRESHOLD) -sys.stderr.write(%s ... %s positives -- %s\n % (path, str(len(path_linenums)), str(valid))) +if self.options.line_numbers: +sys.stderr.write(%s ... %s positives -- %s\n % (path, str(len(path_linenums)), str(valid))) if valid: +if self.options.line_numbers_pos: + sys.stderr.write(%s ... %s positives\n % (path, str(len(path_linenums + return if len(path) + (len(path_linenums)*4) 75: print %s:\n % path while(path_linenums): @@ -180,12 +186,13 @@ class Parser: numline = [str(i) for i in numline] print %s%s %(TABS, ,.join(numline)) else: -path_linenums = [str(i) for i in path_linenums] -print %s:%s%s % (path,\t*tab_calc(path),,.join(path_linenums)) +if self.options.line_numbers: +path_linenums = [str(i) for i in path_linenums] +print %s:%s%s % (path,\t*tab_calc(path),,.join(path_linenums)) elif not self.options.filenames_only: for linenum, s in self.get_comments(path): -if self.is_german(s): +if self.is_german(s) and self.options.line_numbers: print %s:%s: %s % (path, linenum, s) else: fnames = set([]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/notxtfrm.cxx | 15 ---
1 file changed, 15 deletions(-)
New commits:
commit a2b4ebdf3a3fb305de76080d9b4ffbbebd1a3118
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sat Aug 10 22:00:39 2013 +0200
delete dead code
The pJobSetup is never used since the relevant method call is commented out.
Therefore, not only the variable itself but also the bDummyJobSetup parts
can
be removed here.
This code came from a merge with the AOO code base and is like this
since 2005 (see commit 750562b47054741cdd4516affe9741908ee45c11).
Change-Id: I19eec322b05634b4b6f3604bf1da57dfc390af4e
Reviewed-on: https://gerrit.libreoffice.org/5343
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 222962d..e3be834 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -1051,18 +1051,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
Point aPosition(aAlignedGrfArea.Pos());
Size aSize(aAlignedGrfArea.SSize());
-// Im BrowseModus gibt es nicht unbedingt einen Drucker und
-// damit kein JobSetup, also legen wir eines an ...
-const JobSetup* pJobSetup =
pOLENd-getIDocumentDeviceAccess()-getJobsetup();
-sal_Bool bDummyJobSetup = 0 == pJobSetup;
-if( bDummyJobSetup )
-pJobSetup = new JobSetup();
-
-// #i42323#
-// The reason for #114233# is gone, so i remove it again
-//TODO/LATER: is it a problem that the JobSetup isn't used?
-//xRef-DoDraw( pOut, aAlignedGrfArea.Pos(),
aAlignedGrfArea.SSize(), *pJobSetup );
-
const Graphic* pGraphic = pOLENd-GetGraphic();
if ( pGraphic pGraphic-GetType() != GRAPHIC_NONE )
{
@@ -1078,9 +1066,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const
SwRect rGrfArea ) cons
else
::svt::EmbeddedObjectRef::DrawPaintReplacement( Rectangle(
aPosition, aSize ), pOLENd-GetOLEObj().GetCurrentPersistName(), pOut );
-if( bDummyJobSetup )
-delete pJobSetup;
-
sal_Int64 nMiscStatus =
pOLENd-GetOLEObj().GetOleRef()-getStatus( pOLENd-GetAspect() );
if ( !bPrn pShell-ISA( SwCrsrShell )
nMiscStatus
embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Question regarding include/svl/filerec.hxx (potential for optimization)
Hi all, I am currently trying to translate German comments in some files and now I am stuck with the following (as the comments above both are identical copies): In include/svl/filerec.hxx what is the (logical) difference between SfxMulti*M*ixRecordWriter and SfxMulti*F*ixRecordWriter? Maybe someone of you knows some background information and is willing to share his knowledge? Doing some groundwork, I grepped all files for each declared class in this header. The result is that svl/source/items/poolio.cxx is the only file that seems to use some of the classes. For three declared classes I couldn't find any usage, namely: - SfxSingleRecordWriter - SfxSingleRecordReader - SfxMultiFixRecordWriter = here is the initial reason for asking her again ;-) In addition, the other four files that include this header seem to not use any class of it at all, namely: - svx/source/form/fmsrccfg.cxx - svl/source/items/style.cxx - cui/inc/pch/precompiled_cui.hxx - cui/source/dialogs/cuifmsearch.cxx *Can these import statements and class declaration be removed? * Unfortunately, I currently have nothing with me that could compile a whole LibreOffice make check, so could someone please test if anything happens if those lines are deleted and provide feedback here? Many thanks for your answers in advance! Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - cui/source framework/source svx/source
cui/source/dialogs/cuifmsearch.cxx| 24 --
framework/source/uiconfiguration/imagemanagerimpl.hxx |1
svx/source/form/fmsrccfg.cxx | 20 +++
3 files changed, 4 insertions(+), 41 deletions(-)
New commits:
commit 6bb2da3f696d724117a1f3ff5e23e5a7fb3ed314
Author: Philipp Riemer ruderphil...@gmail.com
Date: Mon Sep 2 22:07:55 2013 +0200
fdo#62475 - remove visual noise
Change-Id: Ic944fc45aded66939a2fc1622536eb3f2d80d764
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index ff177e1..96faf47 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::util;
#define MAX_HISTORY_ENTRIES 50
-//
void FmSearchDialog::initCommon( const Reference XResultSet _rxCursor )
{
// init the engine
@@ -82,7 +81,6 @@ void FmSearchDialog::initCommon( const Reference XResultSet
_rxCursor )
m_pbClose.SetHelpText(String());
}
-//
FmSearchDialog::FmSearchDialog(Window* pParent, const OUString sInitialText,
const ::std::vector OUString _rContexts, sal_Int16 nInitialContext,
const Link lnkContextSupplier)
:ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM))
@@ -188,7 +186,6 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const
OUString sInitialText, co
Init(fmscInitial.strUsedFields, sInitialText);
}
-//
void FmSearchDialog::implMoveControls(
Control** _ppControls,
sal_Int32 _nControls,
@@ -208,7 +205,6 @@ void FmSearchDialog::implMoveControls(
SetSizePixel(sz);
}
-//
FmSearchDialog::~FmSearchDialog()
{
if (m_aDelayedPaint.IsActive())
@@ -225,7 +221,6 @@ FmSearchDialog::~FmSearchDialog()
delete m_pSearchEngine;
}
-//
void FmSearchDialog::Init(const OUString strVisibleFields, const OUString
sInitialText)
{
//the initialization of all the Controls
@@ -297,7 +292,6 @@ void FmSearchDialog::Init(const OUString strVisibleFields,
const OUString sIni
FreeResource();
}
-//
sal_Bool FmSearchDialog::Close()
{
// If the close button is disabled and ESC is pressed in a dialog,
@@ -309,7 +303,6 @@ sal_Bool FmSearchDialog::Close()
return ModalDialog::Close();
}
-//
IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
{
if ((pButton == m_rbSearchForText) || (pButton == m_rbSearchForNull) ||
(pButton == m_rbSearchForNotNull))
@@ -332,7 +325,6 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*,
pButton)
return 0;
}
-//
IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
{
if (m_pbClose.IsEnabled())
@@ -378,7 +370,6 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
return 0;
}
-//
IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
{
if (m_pbApproxSettings == pButton)
@@ -425,7 +416,6 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings,
Button*, pButton )
return 0;
}
-//
IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
{
if ((!m_cmbSearchText.GetText().isEmpty()) ||
!m_rbSearchForText.IsChecked())
@@ -437,14 +427,12 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
return 0;
}
-//
IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
{
m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
return 0;
}
-//
IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
{
(void) pBox; // avoid warning
@@ -454,7 +442,6 @@ IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*,
pBox)
return 0;
}
-//
IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
{
(void) pBox; // avoid warning
@@ -469,7 +456,6 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
return 0;
}
-//
IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
{
sal_Bool bChecked = pBox-IsChecked();
@@ -554,7 +540,6 @@ IMPL_LINK
[Libreoffice-commits] core.git: include/svl
include/svl/filerec.hxx |4
1 file changed, 4 deletions(-)
New commits:
commit 5fe4829b5dd35bf2026e531ba4e634cc616fb658
Author: Philipp Riemer ruderphil...@gmail.com
Date: Tue Sep 3 19:51:29 2013 +0200
delete code that was commented out
Change-Id: I1d6e96a3cd26ada7911ee4a538e9441050ca75bc
Reviewed-on: https://gerrit.libreoffice.org/5795
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 5aeb0b9..4f8172c 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -629,8 +629,6 @@ inline SfxMiniRecordWriter::SfxMiniRecordWriter
sal_uInt32 nSize // Gro\se der Daten in Bytes
)
: _pStream( pStream ),
-// _nTag( uninitialized ),
-// _nStarPos( uninitialized ),
_bHeaderOk(true)
{
DBG_ASSERT( nTag != 0 nTag != 0xFF, invalid Tag );
@@ -751,8 +749,6 @@ inline sal_uInt32 SfxSingleRecordWriter::Close( bool
bSeekToEndOfRec )
SfxMiniRecordWriter::Close( bSeekToEndOfRec );
#endif
-// Record war bereits geschlossen
-// nRet = 0;
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source svl/source svx/source
cui/inc/pch/precompiled_cui.hxx|1 - cui/source/dialogs/cuifmsearch.cxx |1 - svl/source/items/style.cxx |1 - svx/source/form/fmsrccfg.cxx |1 - 4 files changed, 4 deletions(-) New commits: commit 387666fbd751561b53b5c7072e85551d22fced74 Author: Philipp Riemer ruderphil...@gmail.com Date: Tue Sep 3 19:19:41 2013 +0200 remove filerec.hxx inclusion where not needed Change-Id: Ia5a65cb53580ed1ed7535a787f4f762da5a43d43 Reviewed-on: https://gerrit.libreoffice.org/5792 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 965a275..74a9e8c 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -407,7 +407,6 @@ #include svl/ctloptions.hxx #include svl/eitem.hxx #include svl/filenotation.hxx -#include svl/filerec.hxx #include svl/flagitem.hxx #include svl/intitem.hxx #include svl/itemiter.hxx diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 96faf47..ad3304c 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -26,7 +26,6 @@ #include osl/mutex.hxx #include sfx2/app.hxx #include cuires.hrc -#include svl/filerec.hxx #include svx/fmsrccfg.hxx #include svx/fmsrcimp.hxx #include fmsearch.hrc diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 1c04655..2695577 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -27,7 +27,6 @@ #include svl/itemset.hxx #include svl/itempool.hxx #include poolio.hxx -#include svl/filerec.hxx #include svl/itemiter.hxx #include svl/style.hxx #include unotools/syslocale.hxx diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index e2c78a2..c74e4df 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -18,7 +18,6 @@ */ #include svx/fmsrccfg.hxx -#include svl/filerec.hxx #include com/sun/star/i18n/TransliterationModules.hpp #include comphelper/processfactory.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl
include/svl/filerec.hxx | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) New commits: commit e1c732c1b45b07ad2fc414d85e725d6498c949a2 Author: Philipp Riemer ruderphil...@gmail.com Date: Tue Sep 3 19:50:46 2013 +0200 adjust code to layout Change-Id: Ia2eeb93fa1eb08c31b9b016c4cb15263633ab518 Reviewed-on: https://gerrit.libreoffice.org/5794 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 4f8172c..7ace888 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -201,22 +201,19 @@ protected: sal_uInt8 _nPreTag; // in den Header zu schreibendes 'Pre-Tag' public: -inline SfxMiniRecordWriter( SvStream *pStream, - sal_uInt8 nTag ); +inline SfxMiniRecordWriter( SvStream *pStream, sal_uInt8 nTag ); inline SfxMiniRecordWriter( SvStream *pStream, sal_uInt8 nTag, sal_uInt32 nSize ); - inline ~SfxMiniRecordWriter(); inline SvStream operator*() const; inline void Reset(); - -sal_uInt32 Close( bool bSeekToEndOfRec = true ); +sal_uInt32 Close( bool bSeekToEndOfRec = true ); private: -// not implementend, not allowed -SfxMiniRecordWriter( const SfxMiniRecordWriter ); +/// not implementend, not allowed +SfxMiniRecordWriter( const SfxMiniRecordWriter ); SfxMiniRecordWriter operator=(const SfxMiniRecordWriter); }; @@ -272,7 +269,7 @@ public: SfxMiniRecordReader( SvStream *pStream, sal_uInt8 nTag ); inline ~SfxMiniRecordReader(); -inline sal_uInt8GetTag() const; +inline sal_uInt8GetTag() const; inline bool IsValid() const; inline SvStreamoperator*() const; @@ -280,8 +277,8 @@ public: inline void Skip(); private: -// not implementend, not allowed -SfxMiniRecordReader( const SfxMiniRecordReader ); +/// not implementend, not allowed +SfxMiniRecordReader( const SfxMiniRecordReader ); SfxMiniRecordReader operator=(const SfxMiniRecordReader); }; @@ -489,7 +486,7 @@ public: voidNewContent(); -virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); +virtual sal_uInt32 Close( bool bSeekToEndOfRec = true ); }; /* [Beschreibung] @@ -588,11 +585,11 @@ public: ~SfxMultiRecordReader(); boolGetContent(); -inline sal_uInt16 GetContentTag(); -inline sal_uInt8GetContentVersion() const; +inline sal_uInt16 GetContentTag(); +inline sal_uInt8GetContentVersion() const; inline bool HasContentVersion( sal_uInt16 nVersion ) const; -inline sal_uInt32 ContentCount() const; +inline sal_uInt32 ContentCount() const; }; /* [Beschreibung] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/cancellablejob.hxx |1
sw/source/core/docnode/finalthreadmanager.cxx |3 -
sw/source/core/docnode/ndcopy.cxx |5 --
sw/source/core/docnode/ndindex.cxx |8 ---
sw/source/core/docnode/ndsect.cxx | 10
sw/source/core/docnode/ndtbl.cxx | 28 -
sw/source/core/docnode/ndtbl1.cxx |9
sw/source/core/docnode/node.cxx| 36 +
sw/source/core/docnode/node2lay.cxx|3 -
sw/source/core/docnode/nodes.cxx | 23 --
sw/source/core/docnode/observablethread.cxx|2
sw/source/core/docnode/pausethreadstarting.cxx |2
sw/source/core/docnode/retrievedinputstreamdata.cxx|1
sw/source/core/docnode/retrieveinputstream.cxx |1
sw/source/core/docnode/retrieveinputstreamconsumer.cxx |1
sw/source/core/docnode/section.cxx | 19
sw/source/core/docnode/swbaslnk.cxx|4 -
sw/source/core/docnode/swthreadjoiner.cxx |1
sw/source/core/docnode/swthreadmanager.cxx |1
19 files changed, 15 insertions(+), 143 deletions(-)
New commits:
commit a7c60c0e639b6cdd0c883794dbbf84596c11d77f
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Aug 11 00:09:00 2013 +0200
remove/add blank lines for consistent code layout in sw/source/core/docnode/
Change-Id: I4ccd099b8ae491c69f25fd32d12a532348d6655d
Reviewed-on: https://gerrit.libreoffice.org/5868
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
Tested-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/sw/source/core/docnode/cancellablejob.hxx
b/sw/source/core/docnode/cancellablejob.hxx
index d424846..2be7824 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _CANCELLABLEJOB_HXX
#define _CANCELLABLEJOB_HXX
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index d375492..7008e7a3 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include finalthreadmanager.hxx
#include osl/thread.hxx
@@ -86,6 +87,7 @@ bool CancelJobsThread::allJobsCancelled() const
return maJobs.empty() mbAllJobsCancelled;
}
+
void CancelJobsThread::stopWhenAllJobsCancelled()
{
osl::MutexGuard aGuard(maMutex);
@@ -227,7 +229,6 @@ void SAL_CALL TerminateOfficeThread::onTerminated()
delete this;
}
-
/** class FinalThreadManager
@author OD
diff --git a/sw/source/core/docnode/ndcopy.cxx
b/sw/source/core/docnode/ndcopy.cxx
index 92c0cec..e0b0d7a 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include editeng/formatbreakitem.hxx
#include hintids.hxx
@@ -522,7 +521,6 @@ void SwTxtNode::CopyCollFmt( SwTxtNode rDestNd )
rDestNd.SetAttr( aPgBrkSet );
}
-
// Copy method from SwDoc
// Prevent copying in Flys that are anchored in the area
static sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
@@ -1615,7 +1613,4 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange rRg,
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndindex.cxx
b/sw/source/core/docnode/ndindex.cxx
index f8097ac..3c3a9f6 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -17,10 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include ndindex.hxx
-
SwNodeRange::SwNodeRange( const SwNodeIndex rS, const SwNodeIndex rE )
: aStart( rS ), aEnd( rE )
{}
@@ -33,7 +31,6 @@ SwNodeRange::SwNodeRange( SwNodes rNds, sal_uLong nSttIdx,
sal_uLong nEndIdx )
: aStart( rNds, nSttIdx ), aEnd( rNds, nEndIdx )
{}
-
SwNodeRange::SwNodeRange( const SwNodeIndex rS, long nSttDiff,
const SwNodeIndex rE, long nEndDiff )
: aStart( rS, nSttDiff ), aEnd( rE, nEndDiff )
@@ -44,14 +41,12 @@ SwNodeRange::SwNodeRange( const SwNode rS, long nSttDiff,
: aStart( rS, nSttDiff ), aEnd( rE, nEndDiff )
{}
-
SwNodeIndex::SwNodeIndex( SwNodes rNds, sal_uLong nIdx )
: pNd( rNds[ nIdx ] ), pNext( 0 ), pPrev( 0 )
{
rNds.RegisterIndex( *this );
}
-
SwNodeIndex::SwNodeIndex( const SwNodeIndex rIdx, long nDiff )
: pNext( 0 ), pPrev( 0
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/finalthreadmanager.cxx |8 -
sw/source/core/docnode/ndtbl.cxx |3
sw/source/core/docnode/ndtbl1.cxx | 41 ++
sw/source/core/docnode/node.cxx| 115 ++---
sw/source/core/docnode/node2lay.cxx| 18 +-
sw/source/core/docnode/observablethread.cxx|4
sw/source/core/docnode/pausethreadstarting.cxx |4
sw/source/core/docnode/retrievedinputstreamdata.cxx|6
sw/source/core/docnode/retrieveinputstream.cxx |4
sw/source/core/docnode/retrieveinputstreamconsumer.cxx |4
sw/source/core/docnode/swthreadjoiner.cxx |4
11 files changed, 78 insertions(+), 133 deletions(-)
New commits:
commit 3a33d89c9728e8947f60bc6b574bf876875dc507
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Aug 11 00:13:50 2013 +0200
work on comments in sw/source/core/docnode/
Change-Id: Ie988076dc73f80fa962daa2e9d8e05132ed7180b
Reviewed-on: https://gerrit.libreoffice.org/5869
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
Tested-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx
b/sw/source/core/docnode/finalthreadmanager.cxx
index 7008e7a3..7ad4b57 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -30,8 +30,6 @@
/** thread to cancel a give list of cancellable jobs
helper class for FinalThreadManager
-
-@author OD
*/
class CancelJobsThread : public osl::Thread
{
@@ -144,8 +142,6 @@ void SAL_CALL CancelJobsThread::run()
/** thread to terminate office, when all jobs are cancelled.
helper class for FinalThreadManager
-
-@author OD
*/
class TerminateOfficeThread : public osl::Thread
{
@@ -229,10 +225,6 @@ void SAL_CALL TerminateOfficeThread::onTerminated()
delete this;
}
-/** class FinalThreadManager
-
-@author OD
-*/
FinalThreadManager::FinalThreadManager(css::uno::Reference
css::uno::XComponentContext const context)
: m_xContext(context),
maMutex(),
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 988cae6..cc6cd9c 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1339,12 +1339,10 @@ SwTableNode* SwNodes::TextToTable( const
SwNodes::TableRanges_t rTableNodes,
new SwEndNode( aInsertIndex, *pTblNd );
#if OSL_DEBUG_LEVEL 1
-/**debug**/
const SwNodeRange rStartRange = *rTableNodes.begin()-begin();
const SwNodeRange rEndRange = *rTableNodes.rbegin()-rbegin();
(void) rStartRange;
(void) rEndRange;
-/**debug**/
#endif
SwDoc* pDoc = GetDoc();
@@ -2533,7 +2531,6 @@ static bool lcl_IsFrmInColumn( const SwCellFrm rFrm,
SwSelBoxes rBoxes )
return false;
}
-// SwDoc::GetTabRows()
void SwDoc::GetTabRows( SwTabCols rFill, const SwCursor* ,
const SwCellFrm* pBoxFrm ) const
{
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 754f63b..f8d797a 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -143,21 +143,6 @@ static bool lcl_GetBoxSel( const SwCursor rCursor,
SwSelBoxes rBoxes,
return !rBoxes.empty();
}
-/**
- * Class: SwDoc
- * Methods: SetRowHeight(), GetRowHeight()
- *
- * The line height is calculated from the Selection.
- * Starting with every Cell within the Selection, all Cells are iterated
- * through in an upwards fashion.
- *
- * The topmost Line gets the requested value, all Lines below it get
- * a respective value that is calculated from the relation of the old and
- * new size of the topmost Line in the lower line's own size.
- *
- * All changed Lines may get an own FrmFmt.
- * Of course we can only touch every Line once.
- */
inline void InsertLine( std::vectorSwTableLine* rLineArr, SwTableLine*
pLine )
{
if( rLineArr.end() == std::find( rLineArr.begin(), rLineArr.end(), pLine )
)
@@ -358,6 +343,21 @@ void SwDoc::GetRowSplit( const SwCursor rCursor,
SwFmtRowSplit * rpSz ) const
}
}
+/* Class: SwDoc
+ * Methods: SetRowHeight(), GetRowHeight()
+ *
+ * The line height is calculated from the Selection.
+ * Starting with every Cell within the Selection, all Cells are iterated
+ * through in an upwards fashion.
+ *
+ * The topmost Line gets the requested value, all Lines below it get
+ * a respective value that is calculated from the relation of the old and
+ * new size of the topmost Line in the lower line's own size.
+ *
+ * All changed Lines may get an own FrmFmt.
+ * Of course we can only touch every Line once.
+ */
+
void SwDoc::SetRowHeight( const SwCursor rCursor, const SwFmtFrmSize rNew )
{
SwTableNode* pTblNd = rCursor.GetPoint()-nNode.GetNode().FindTableNode();
@@ -509,10 +509,6 @@ sal_Bool SwDoc::GetRowBackground( const SwCursor rCursor
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/BlockCursor.cxx |1 +
sw/source/core/crsr/bookmrk.cxx |2 ++
sw/source/core/crsr/callnk.cxx |4 +---
sw/source/core/crsr/crbm.cxx|3 ++-
sw/source/core/crsr/crsrsh.cxx | 13 -
sw/source/core/crsr/crstrvl.cxx |3 +++
sw/source/core/crsr/crstrvl1.cxx|6 +++---
sw/source/core/crsr/findattr.cxx| 10 --
sw/source/core/crsr/findcoll.cxx|1 -
sw/source/core/crsr/findtxt.cxx |6 ++
sw/source/core/crsr/pam.cxx |6 --
sw/source/core/crsr/swcrsr.cxx | 10 +-
sw/source/core/crsr/trvlfnfl.cxx|2 +-
sw/source/core/crsr/trvlreg.cxx |2 --
sw/source/core/crsr/trvltbl.cxx |5 -
sw/source/core/crsr/unocrsr.cxx |2 +-
sw/source/core/crsr/viscrs.cxx |4 ++--
17 files changed, 31 insertions(+), 49 deletions(-)
New commits:
commit 9349f5cd7ffdf10d5be3644762d888c0fdd8ccb4
Author: Philipp Riemer ruderphil...@gmail.com
Date: Mon Jul 9 04:14:47 2012 +0200
add/remove blank lines and braces (in sw/source/core/crsr/)
Change-Id: I4dea8ea84d83c28eb258d0e8ddc2966476a50223
Reviewed-on: https://gerrit.libreoffice.org/272
Reviewed-by: Philipp Riemer ruderphil...@gmail.com
Tested-by: Philipp Riemer ruderphil...@gmail.com
diff --git a/sw/source/core/crsr/BlockCursor.cxx
b/sw/source/core/crsr/BlockCursor.cxx
index 5edbd9f..9c7f443 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -31,6 +31,7 @@ class SwBlockCursor : public IBlockCursor
SwShellCrsr aCursor;
Point *pStartPt;
Point *pEndPt;
+
public:
SwBlockCursor( const SwCrsrShell rCrsrSh, const SwPosition rPos ) :
aCursor( rCrsrSh, rPos ), pStartPt(0), pEndPt(0) {}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index e67b5dc..11e6210 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -66,6 +66,7 @@ namespace
{
SwPosition rStart = pField-GetMarkStart();
SwPosition rEnd = pField-GetMarkEnd();
+
SwTxtNode const*const pStartTxtNode =
rStart.nNode.GetNode().GetTxtNode();
SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
@@ -76,6 +77,7 @@ namespace
const sal_Unicode ch_end = pEndTxtNode-GetTxt()[nEndPos];
SwPaM aStartPaM(rStart);
SwPaM aEndPaM(rEnd);
+
io_pDoc-GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
if( ( ch_start != aStartMark ) ( aEndMark != CH_TXT_ATR_FORMELEMENT
) )
{
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 0ac66f5..04f616b 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -18,7 +18,6 @@
*/
#include hintids.hxx
-
#include com/sun/star/i18n/ScriptType.hpp
#include fmtcntnt.hxx
#include txatbase.hxx
@@ -35,7 +34,6 @@
#include ndtxt.hxx
#include flyfrm.hxx
#include breakit.hxx
-
#includevcl/window.hxx
SwCallLink::SwCallLink( SwCrsrShell rSh, sal_uLong nAktNode, xub_StrLen
nAktCntnt,
@@ -162,9 +160,9 @@ SwCallLink::~SwCallLink()
{
if( nCmp == nAktCntnt pCurCrsr-HasMark() ) // left select
++nCmp;
+
if ( ((SwTxtNode*)pCNd)-HasHints() )
{
-
const SwpHints rHts = ((SwTxtNode*)pCNd)-GetSwpHints();
sal_uInt16 n;
xub_StrLen nStart;
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index ba96a35..219d860 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -20,7 +20,6 @@
#include crsrsh.hxx
#include ndtxt.hxx
#include docary.hxx
-
#include IMark.hxx
#include callnk.hxx
#include swcrsr.hxx
@@ -110,6 +109,7 @@ bool SwCrsrShell::GotoMark(const ::sw::mark::IMark* const
pMark, bool bAtStart)
*(aCrsrSt.m_pCrsr)-GetPoint() = pMark-GetMarkStart();
else
*(aCrsrSt.m_pCrsr)-GetPoint() = pMark-GetMarkEnd();
+
if(aCrsrSt.RollbackIfIllegal()) return false;
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
@@ -239,6 +239,7 @@ bool SwCrsrShell::GotoFieldmark(::sw::mark::IFieldmark
const * const pMark)
aCrsrSt.SetCrsrToMark(pMark);
aCrsrSt.m_pCrsr-GetPoint()-nContent++;
aCrsrSt.m_pCrsr-GetMark()-nContent--;
+
if(aCrsrSt.RollbackIfIllegal()) return false;
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 56134b1..f9aa315 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -19,10 +19,10 @@
#include com/sun/star/util/SearchOptions.hpp
#include com/sun/star/text/XTextRange.hpp
+
#include hintids.hxx
#include svx/svdmodel.hxx
#include editeng/frmdiritem.hxx
-
#include SwSmartTagMgr.hxx
#include doc.hxx
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docfmt.cxx |4
sw/source/core/doc/docnum.cxx |2 +-
sw/source/core/docnode/ndtbl.cxx |8
sw/source/core/txtnode/ndtxt.cxx |4
sw/source/core/unocore/unoobj2.cxx |2 --
sw/source/ui/app/docsh2.cxx|1 -
sw/source/ui/index/cnttab.cxx |5 +
sw/source/ui/wrtsh/wrtsh1.cxx | 25 -
8 files changed, 2 insertions(+), 49 deletions(-)
New commits:
commit 2b8dc46ef3e6c34d86aa0803611e488b2254849b
Author: Philipp Riemer ruderphil...@gmail.com
Date: Sun Sep 29 19:06:02 2013 +0200
delete code that was commented out
Change-Id: I86f53763305682946098ece4fd6d58bcfdc5a73f
Reviewed-on: https://gerrit.libreoffice.org/6083
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 7d4a809..2af2290 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -376,7 +376,6 @@ void SwDoc::ResetAttrs( const SwPaM rRg,
}
// #i96644#
-// SwDataChanged aTmp( *pPam );
std::auto_ptr SwDataChanged pDataChanged;
if ( bSendDataChangedEvents )
{
@@ -696,8 +695,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM rRg, const
SfxItemSet rChgSet,
{
// Set auto flag. Only in the template it's without auto!
SwFmtPageDesc aNew( *pDesc );
-// 38479: AutoFlag is now being set in the WrtShell
-// aNew.SetAuto();
// Tables now also know line breaks
if( 0 == (nFlags nsSetAttrMode::SETATTR_APICALL)
@@ -1874,7 +1871,6 @@ SwTxtFmtColl* SwDoc::CopyTxtColl( const SwTxtFmtColl
rColl )
if(rColl.IsAssignedToListLevelOfOutlineStyle())
pNewColl-AssignToListLevelOfOutlineStyle(rColl.GetAssignedOutlineStyleLevel());//-end,zhaojianwei
-//-end
pNewColl-SetPoolFmtId( rColl.GetPoolFmtId() );
pNewColl-SetPoolHelpId( rColl.GetPoolHelpId() );
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 52f3b1d..5df1a80 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2075,7 +2075,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex rIdx, sal_Bool
bDel )
{
if ( !pTxtNd-IsCountedInList() == !bDel)
{
-sal_Bool bOldNum = bDel; // == pTxtNd-IsCounted();
+sal_Bool bOldNum = bDel;
sal_Bool bNewNum = bDel ? sal_False : sal_True;
pTxtNd-SetCountedInList(bNewNum ? true : false);
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index cc6cd9c..015136b 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1139,7 +1139,6 @@ const SwTable* SwDoc::TextToTable( const std::vector
std::vectorSwNodeRange
const SwPosition *pStt = aOriginal.GetMark();
const SwPosition *pEnd = aOriginal.GetPoint();
-//SwUndoTxtToTbl* pUndo = 0;
bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
if (bUndo)
{
@@ -3520,13 +3519,6 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex rPos,
sal_Bool bWithPrev,
aFndBox.SetTableLines( rTbl );
aFndBox.DelFrms( rTbl );
-// TL_CHART2: since chart currently does not want to get informed about
-// additional rows/cols there is no need for a modified event in the
-// remaining first table. Also, if it is required it should be done
-// after the merging and not here...
-// pDoc-UpdateCharts( rTbl.GetFrmFmt()-GetName() );
-
-
// TL_CHART2:
// tell the charts about the table to be deleted and have them use their
own data
GetDoc()-CreateChartInternalDataProviders( rDelTbl );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 750a649..074b146 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -3839,7 +3839,6 @@ int SwTxtNode::GetActualListLevel() const
void SwTxtNode::SetListRestart( bool bRestart )
{
-//CreateNum()-SetRestart(bRestart);
if ( !bRestart )
{
// attribute not contained in paragraph style's attribute set. Thus,
@@ -3856,7 +3855,6 @@ void SwTxtNode::SetListRestart( bool bRestart )
bool SwTxtNode::IsListRestart() const
{
-//return GetNum() ? GetNum()-IsRestart() : false;
const SfxBoolItem aIsRestartItem =
dynamic_castconst SfxBoolItem(GetAttr( RES_PARATR_LIST_ISRESTART ));
@@ -3885,7 +3883,6 @@ bool SwTxtNode::HasVisibleNumberingOrBullet() const
void SwTxtNode::SetAttrListRestartValue( SwNumberTree::tSwNumTreeNumber
nNumber )
{
-//CreateNum()-SetStart(nNumber);
const bool bChanged( HasAttrListRestartValue()
? GetAttrListRestartValue() != nNumber
: nNumber != USHRT_MAX );
@@ -3922,7 +3919,6 @@ SwNumberTree::tSwNumTreeNumber
SwTxtNode
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docftn.cxx |4
sw/source/core/doc/doctxm.cxx |2 --
sw/source/core/doc/swserv.cxx |1 -
3 files changed, 7 deletions(-)
New commits:
commit 623f89b373114b2034319a573184fe727fb1b33d
Author: Philipp Riemer ruderphil...@gmail.com
Date: Thu Sep 26 13:05:22 2013 +0200
remove commented-out code in sw/source/core/doc/
Change-Id: I9b2c39a905b566dc94d5187e0ca2d177390c0b64
Reviewed-on: https://gerrit.libreoffice.org/6075
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index d50ff9c..b87a8a6 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -283,14 +283,11 @@ void SwDoc::SetFtnInfo(const SwFtnInfo rInfo)
{
std::setSwRootFrm* aAllLayouts = GetAllLayouts();//swmod 080304
if ( bFtnPos )
-//pTmpRoot-RemoveFtns();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(SwRootFrm::AllRemoveFtns));//swmod 080305
else
{
-//pTmpRoot-UpdateFtnNums();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::mem_fun(SwRootFrm::UpdateFtnNums));//swmod 080304
if ( bFtnDesc )
-//pTmpRoot-CheckFtnPageDescs( FALSE );
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(SwRootFrm::CheckFtnPageDescs),
sal_False));//swmod 080304
if ( bExtra )
{
@@ -357,7 +354,6 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo rInfo)
if ( pTmpRoot )
{
if ( bFtnDesc )
-//pTmpRoot-CheckFtnPageDescs( TRUE );
{
std::setSwRootFrm* aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(),
aAllLayouts.end(),std::bind2nd(std::mem_fun(SwRootFrm::CheckFtnPageDescs),
sal_True));//swmod 080304
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 83c90f6..510a890 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -408,8 +408,6 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong
nSttNd, sal_uLong nEndNd
if(pSet)
pFmt-SetFmtAttr(*pSet);
-// --aEnd; // End is inclusive in InsertSection
-
SwSectionNode *const pNewSectionNode =
GetNodes().InsertTextSection(aStt, *pFmt, aSectionData, rTOX, aEnd);
if (!pNewSectionNode)
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 529f23e..6436440 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -252,7 +252,6 @@ sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink*
pChkLnk ) const
}
}
if( !pChkLnk )
-// *((int*)eType) = eSave;
((SwServerObject*)this)-eType = eSave;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
