[Libreoffice-commits] .: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 228ba082d3148f13eed79e9cdd682953cccaab1c
Author: Muthu Subramanian
Date: Tue Jan 8 12:40:45 2013 +0530
n#791985: Automatically rotate chart labels (if overlapping).
This bug fixes two issues:
* Overlap detection seems to be approximate and
doesn't work for rotated text. Added a workaround
for labels rotated at angles 45-135 and 225-315.
* Auto rotate labels, which overlap. This is done
only for labels having zero degrees rotate.
For forcing angles, use 'enable overlap' or
non-zero angles (1 degree).
Of course, zero degrees plus skipping of labels
would no longer occur. Better solutions?
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index f394ef8..40b4886 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -137,6 +137,11 @@ bool doesOverlap( const Reference< drawing::XShape >&
xShape1
if( !xShape1.is() || !xShape2.is() )
return false;
+sal_Int32 nAngle = abs(fRotationAngleDegree);
+
+if( ( nAngle >= 45 && nAngle <= 135 ) || ( nAngle >= 225 && nAngle <= 315
) )
+return false;
+
::basegfx::B2IRectangle aRect1(
BaseGFXHelper::makeRectangle(xShape1->getPosition(),ShapeFactory::getSizeAfterRotation(
xShape1, fRotationAngleDegree )));
::basegfx::B2IRectangle aRect2(
BaseGFXHelper::makeRectangle(xShape2->getPosition(),ShapeFactory::getSizeAfterRotation(
xShape2, fRotationAngleDegree )));
return aRect1.overlaps(aRect2);
@@ -662,7 +667,7 @@ bool VCartesianAxis::createTextShapes(
pPREPreviousVisibleTickInfo : pPreviousVisibleTickInfo;
//don't create labels which does not fit into the rhythm
-if( nTick%rAxisLabelProperties.nRhythm != 0)
+if( nTick%rAxisLabelProperties.nRhythm != 0 )
continue;
//don't create labels for invisible ticks
@@ -776,6 +781,15 @@ bool VCartesianAxis::createTextShapes(
}
if( bOverlapAlsoAfterSwitchingOnAutoStaggering )
{
+/* Try auto-rotating to 45 degrees */
+if( !rAxisLabelProperties.bOverlapAllowed &&
::rtl::math::approxEqual( rAxisLabelProperties.fRotationAngleDegree, 0.0 ) )
+{
+rAxisLabelProperties.fRotationAngleDegree = 45;
+rAxisLabelProperties.bLineBreakAllowed = false;
+m_aAxisLabelProperties.fRotationAngleDegree =
rAxisLabelProperties.fRotationAngleDegree;
+removeTextShapesFromTicks();
+return false;
+}
if( rAxisLabelProperties.bRhythmIsFix )
{
xTarget->remove(pTickInfo->xTextShape);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
UI issue
An arguable issue, so an issue resolved in preferences. Navigator. Sections. The section highlighted is may not be the section my cursor is in. Logic requires the Navigator follow where I am. Perhaps the highlighted section in the Navigator should also be the section I am editing? Steven Howe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] .: 2 commits - pyuno/CustomTarget_python_shell.mk pyuno/CustomTarget_pyversion.mk pyuno/Executable_python_wrapper.mk pyuno/Module_pyuno.mk pyuno/zipcore
Hi, On Wed, Jan 02, 2013 at 05:32:45PM +0100, Lubos Lunak wrote: > On Tuesday 01 of January 2013, Libreoffice Gerrit user wrote: > > commit 085e0adf53baff298059980a54758d81b08bb059 > > Author: David Tardon > > Date: Tue Jan 1 11:47:56 2013 +0100 > > > > just pass the define through -D > > > > I am constantly amazed at the creativity of the original makefile > > writers. An extra header file, processed by sed, rather then adding one > > item to CDEFS? Really? > > Please use config_xxx.h files rather than -D flags whenever possible (which, > interestingly, is an extra header file, processed by sed, rather than adding > one item to CDEFS). But it is a "standard" way of adding defined symbols (i.e., the header is created automagically by configure). Writing a custom makefile code that runs sed and produces a header file is not standard (and never has been). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - framework/source sw/source vcl/aqua vcl/source
framework/source/uielement/headermenucontroller.cxx |2
sw/source/ui/lingu/olmenu.cxx |2
sw/source/ui/smartmenu/stmenu.cxx |2
vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx | 98 ++--
vcl/source/window/toolbox2.cxx |2
5 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit 1966f0517e62ca9544a5fe5c65c28d35b90c83d9
Author: Norbert Thiebaud
Date: Tue Jan 8 00:26:42 2013 -0600
Mac follow-up on privatisation of ImplDevFontAttrib
Change-Id: I534935deee99de144bd13fbf6a771ff159a320d6
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 45f046d..8e2a4bb 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -55,50 +55,50 @@ static void UpdateAttributesFromPSName( const String&
rPSName, ImplDevFontAttrib
|| (aPSName.indexOf("standard") != -1)
|| (aPSName.indexOf("std") != -1) )
{
- rDFA.meWidthType = WIDTH_NORMAL;
- rDFA.meWeight= WEIGHT_NORMAL;
- rDFA.meItalic= ITALIC_NONE;
+rDFA.SetWidthType(WIDTH_NORMAL);
+rDFA.SetWeight(WEIGHT_NORMAL);
+rDFA.SetItalic(ITALIC_NONE);
}
// heuristics for font weight
if (aPSName.indexOf("extrablack") != -1)
-rDFA.meWeight = WEIGHT_BLACK;
+rDFA.SetWeight(WEIGHT_BLACK);
else if (aPSName.indexOf("black") != -1)
-rDFA.meWeight = WEIGHT_BLACK;
+rDFA.SetWeight(WEIGHT_BLACK);
//else if (aPSName.indexOf("book") != -1)
-//rDFA.meWeight = WEIGHT_SEMIBOLD;
+//rDFA.SetWeight(WEIGHT_SEMIBOLD);
else if( (aPSName.indexOf("semibold") != -1)
|| (aPSName.indexOf("smbd") != -1))
-rDFA.meWeight = WEIGHT_SEMIBOLD;
+rDFA.SetWeight(WEIGHT_SEMIBOLD);
else if (aPSName.indexOf("ultrabold") != -1)
-rDFA.meWeight = WEIGHT_ULTRABOLD;
+rDFA.SetWeight(WEIGHT_ULTRABOLD);
else if (aPSName.indexOf("extrabold") != -1)
-rDFA.meWeight = WEIGHT_BLACK;
+rDFA.SetWeight(WEIGHT_BLACK);
else if( (aPSName.indexOf("bold") != -1)
|| (aPSName.indexOf("-bd") != -1))
-rDFA.meWeight = WEIGHT_BOLD;
+rDFA.SetWeight(WEIGHT_BOLD);
else if (aPSName.indexOf("extralight") != -1)
-rDFA.meWeight = WEIGHT_ULTRALIGHT;
+rDFA.SetWeight(WEIGHT_ULTRALIGHT);
else if (aPSName.indexOf("ultralight") != -1)
-rDFA.meWeight = WEIGHT_ULTRALIGHT;
+rDFA.SetWeight(WEIGHT_ULTRALIGHT);
else if (aPSName.indexOf("light") != -1)
-rDFA.meWeight = WEIGHT_LIGHT;
+rDFA.SetWeight(WEIGHT_LIGHT);
else if (aPSName.indexOf("thin") != -1)
-rDFA.meWeight = WEIGHT_THIN;
+rDFA.SetWeight(WEIGHT_THIN);
else if (aPSName.indexOf("-w3") != -1)
-rDFA.meWeight = WEIGHT_LIGHT;
+rDFA.SetWeight(WEIGHT_LIGHT);
else if (aPSName.indexOf("-w4") != -1)
-rDFA.meWeight = WEIGHT_SEMILIGHT;
+rDFA.SetWeight(WEIGHT_SEMILIGHT);
else if (aPSName.indexOf("-w5") != -1)
-rDFA.meWeight = WEIGHT_NORMAL;
+rDFA.SetWeight(WEIGHT_NORMAL);
else if (aPSName.indexOf("-w6") != -1)
-rDFA.meWeight = WEIGHT_SEMIBOLD;
+rDFA.SetWeight(WEIGHT_SEMIBOLD);
else if (aPSName.indexOf("-w7") != -1)
-rDFA.meWeight = WEIGHT_BOLD;
+rDFA.SetWeight(WEIGHT_BOLD);
else if (aPSName.indexOf("-w8") != -1)
-rDFA.meWeight = WEIGHT_ULTRABOLD;
+rDFA.SetWeight(WEIGHT_ULTRABOLD);
else if (aPSName.indexOf("-w9") != -1)
-rDFA.meWeight = WEIGHT_BLACK;
+rDFA.SetWeight(WEIGHT_BLACK);
// heuristics for font slant
if( (aPSName.indexOf("italic") != -1)
@@ -114,11 +114,11 @@ static void UpdateAttributesFromPSName( const String&
rPSName, ImplDevFontAttrib
|| (aPSName.indexOf("condit") != -1)
|| (aPSName.indexOf("bookit") != -1)
|| (aPSName.indexOf("blackit") != -1) )
-rDFA.meItalic = ITALIC_NORMAL;
+rDFA.SetItalic(ITALIC_NORMAL);
if( (aPSName.indexOf("oblique") != -1)
|| (aPSName.indexOf("inclined") != -1)
|| (aPSName.indexOf("slanted") != -1) )
-rDFA.meItalic = ITALIC_OBLIQUE;
+rDFA.SetItalic(ITALIC_OBLIQUE);
// heuristics for font width
if( (aPSName.indexOf("condensed") != -1)
@@ -126,36 +126,36 @@ static void UpdateAttributesFromPSName( const String&
rPSName, ImplDevFontAttrib
|| (aPSName.indexOf("boldcond") != -1)
|| (aPSName.indexOf("boldcn") != -1)
|| (aPSName.indexOf("cnit") != -1) )
-rDFA.meWidthType = WIDTH_CONDENSED;
+rDFA.SetWidthType(WIDTH_CONDENSED);
else if (aPSName.indexOf("narrow") != -1)
-rDFA.meWidthType = WIDTH_SEMI_CONDENSED;
+rDFA.SetWidthType(WIDTH_SEMI_CONDENSED);
else if (aPSName.indexOf("expanded") != -1)
-rDFA.meWidthType = WIDTH_EXPANDED;
Questions about Bug 39370:RTL / LTR and right/left alignment buttons' icons should not be reversed in RTL interface.
Hello all,
Here is the bug's page: https://bugs.freedesktop.org/show_bug.cgi?id=39370
1- First, In the RTL UI, Does the toolbar automatically flips the order and
alignment of its items ?
2- I'm thinking to solve this bug by adding a new Formatting Toolbar for the
RTL UI that have the buttons in their preferable location.
I was able to add a new toolbar, but couldn't change the default one.
What do you think about this approach?
How can I determine the default toolbars?
3- As indicated in the bugzilla comments #11
The Bullets and Numbering icons are actually mirrored in RTL UI, not only in
the reverse order.
For me I don't think this is a problem for the Bullets button, but for the
Numbering it's really look weird.
I tried to solve this by prevent the Numbering button from mirroring:
framework/source/uielement/toolbarmanager.cxx:ToolBarManager::UpdateImageOrientation()
if( Application::GetSettings().GetLayoutRTL() )
if(!((aMirrorCmd == ".uno:DefaultNumbering") || (aMirrorCmd ==
".uno:NumberOrNoNumber")))
{
pIter = m_aCommandMap.find( aMirrorCmd );
if ( pIter != m_aCommandMap.end() )
pIter->second.bMirrored = sal_True;
}
What do you think?
It seems to work, but I'm not sure if it's the "correct" way to do it
Any suggestion or code pointers would be appreciated.
P.S. I'm a beginner in LibreOffice development so sorry for any silly question,
but I really want to learn : )
Thanks in advance.
Regards,
Manal M. Alhassoun
Motah Program, KACST
http://www.motah.org.sa
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/src/colorformat.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a131769adc3eb31209bbcf8e72333f38c2de042b
Author: Markus Mohrhard
Date: Tue Jan 8 02:47:17 2013 +0100
correct label for data bar dialog, fdo#58608
Change-Id: I91cdb23a25092f44ff76784b5347134a3c9a3528
diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src
index 2cc5852..6333bf4 100644
--- a/sc/source/ui/src/colorformat.src
+++ b/sc/source/ui/src/colorformat.src
@@ -52,7 +52,7 @@ ModalDialog RID_SCDLG_DATABAR
{
Pos = MAP_APPFONT( 5, 5 );
Size = MAP_APPFONT( 190, 10 );
-Text [ en-US ] = "Bar Colors";
+Text [ en-US ] = "Entry Values";
};
FixedLine FL_BAR_COLORS
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/src/colorformat.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 002531190d88c7e8f7dc9287af32d54c56b5495a
Author: Markus Mohrhard
Date: Tue Jan 8 02:47:17 2013 +0100
correct label for data bar dialog, fdo#58608
Change-Id: I91cdb23a25092f44ff76784b5347134a3c9a3528
diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src
index 2cc5852..6333bf4 100644
--- a/sc/source/ui/src/colorformat.src
+++ b/sc/source/ui/src/colorformat.src
@@ -52,7 +52,7 @@ ModalDialog RID_SCDLG_DATABAR
{
Pos = MAP_APPFONT( 5, 5 );
Size = MAP_APPFONT( 190, 10 );
-Text [ en-US ] = "Bar Colors";
+Text [ en-US ] = "Entry Values";
};
FixedLine FL_BAR_COLORS
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#45964 - Wrong behavior of words list in AutoCorrect > Wo...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1571
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/1571/1
fdo#45964 - Wrong behavior of words list in AutoCorrect > Word Completion
The MultiListBox control should be initialized with the SimpleMode attribute
set to True.
Change-Id: I463f07530d5bbdc6d1f4a3789e039e4ce784aead
---
M cui/source/tabpages/autocdlg.src
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 299dcf9..4cd3beb 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -797,6 +797,7 @@
Group = TRUE;
Border = TRUE;
Sort = TRUE;
+SimpleMode = TRUE;
};
PushButton PB_ENTRIES
{
--
To view, visit https://gerrit.libreoffice.org/1571
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I463f07530d5bbdc6d1f4a3789e039e4ce784aead
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christopher Copits
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] minor String to OUString in svx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1570
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/1570/1
minor String to OUString in svx
Change-Id: I36c83605c0bb4180e879cab6cd39baa2aa441c12
---
M svx/source/svdraw/svdview.cxx
1 file changed, 58 insertions(+), 34 deletions(-)
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 7333a36..1603e60 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1161,16 +1161,16 @@
#define STR_NOTHING "nothing"
XubString SdrView::GetStatusText()
{
-XubString aStr;
+OUString aStr;
XubString aName;
-aStr.AppendAscii(STR_NOTHING);
+aStr=STR_NOTHING;
if (pAktCreate!=NULL)
{
aStr=pAktCreate->getSpecialDragComment(aDragStat);
-if(!aStr.Len())
+if(aStr.isEmpty())
{
pAktCreate->TakeObjNameSingul(aName);
aStr = ImpGetResStr(STR_ViewCreateObj);
@@ -1180,14 +1180,16 @@
{
if (bInsPolyPoint || IsInsertGluePoint())
{
-aStr=aInsPointUndoStr;
+aStr = aInsPointUndoStr;
}
else
{
if (aDragStat.IsMinMoved())
{
OSL_TRACE("SdrView::GetStatusText(%lx) %lx", this,
mpCurrentSdrDragMethod);
-mpCurrentSdrDragMethod->TakeSdrDragComment(aStr);
+String aTemp=aStr;
+mpCurrentSdrDragMethod->TakeSdrDragComment(aTemp);
+aStr = aTemp;
}
}
}
@@ -1223,12 +1225,15 @@
aStr = ImpGetResStr(STR_ViewMarkGluePoints);
}
}
-else if (IsTextEdit() && pTextEditOutlinerView!=NULL) {
-aStr=ImpGetResStr(STR_ViewTextEdit); // "TextEdit - Row y, Column x";
+else if (IsTextEdit() && pTextEditOutlinerView!=NULL)
+{
+aStr = ImpGetResStr(STR_ViewTextEdit); // "TextEdit - Row y, Column x";
ESelection aSel(pTextEditOutlinerView->GetSelection());
long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos;
-if (aSel.nEndPara>0) {
-for (sal_uInt16 nParaNum=0; nParaNum0)
+{
+for (sal_uInt16 nParaNum=0; nParaNumGetLineCount(nParaNum);
}
}
@@ -1238,54 +1243,73 @@
sal_uInt16 nParaLine=0;
sal_uIntPtr
nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
sal_Bool bBrk=sal_False;
-while (!bBrk) {
+while (!bBrk)
+{
sal_uInt16
nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
sal_Bool bLastLine=(nParaLine==nParaLineAnz-1);
-if (nCol>nLen || (!bLastLine && nCol==nLen)) {
+if (nCol>nLen || (!bLastLine && nCol==nLen))
+{
nCol-=nLen;
nLin++;
nParaLine++;
-} else bBrk=sal_True;
-if (nLen==0) bBrk=sal_True; // to be sure
+}
+else
+{
+bBrk = sal_True;
+}
+if (nLen == 0)
+{
+bBrk = sal_True; // to be sure
+}
}
-aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1));
-aStr.SearchAndReplaceAscii("%2", UniString::CreateFromInt32(nLin + 1));
-aStr.SearchAndReplaceAscii("%3", UniString::CreateFromInt32(nCol + 1));
+aStr.replaceAll("%1", OUString::valueOf(nPar + 1));
+aStr.replaceAll("%2", OUString::valueOf(nLin + 1));
+aStr.replaceAll("%3", OUString::valueOf(nCol + 1));
#ifdef DBG_UTIL
-aStr += UniString( RTL_CONSTASCII_USTRINGPARAM( ", Level " ) );
-aStr += UniString::CreateFromInt32( pTextEditOutliner->GetDepth(
aSel.nEndPara ) );
+aStr += ", Level ";
+aStr += OUString::valueOf( pTextEditOutliner->GetDepth( aSel.nEndPara
) );
#endif
}
-if(aStr.EqualsAscii(STR_NOTHING))
+if(aStr.equals(STR_NOTHING))
{
-if (AreObjectsMarked()) {
-ImpTakeDescriptionStr(STR_ViewMarked,aStr);
-if (IsGluePointEditMode()) {
-if (HasMarkedGluePoints()) {
-
ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_GLUEPOINTSDESCRIPTION);
-}
-} else {
-if (HasMarkedPoints()) {
-
ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,IMPSDR_POINTSDESCRIPTION);
+if (AreObjectsMarked())
+{
+String aTemp = aStr;
+ImpTakeDescriptionStr(STR_ViewMarked,aTemp);
+if (IsGluePointEditMode())
+{
+if (HasMarkedGluePoints())
+{
+ImpTakeDescriptionStr(STR_ViewMarked, aTemp, 0,
IMPSDR_GLUEPOINTSDESCRIPTION);
}
}
-} else {
-aStr.Erase();
+else
+{
+if (HasMarkedPoints()
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/frmedt/feshview.cxx |4 ++--
sw/source/ui/app/swmodul1.cxx | 16
sw/source/ui/app/swmodule.cxx |2 +-
sw/source/ui/cctrl/actctrl.cxx |4 ++--
sw/source/ui/chrdlg/drpcps.cxx | 12 ++--
sw/source/ui/chrdlg/numpara.cxx|4 ++--
sw/source/ui/chrdlg/pardlg.cxx |2 +-
sw/source/ui/docvw/edtdd.cxx |4 ++--
sw/source/ui/docvw/edtwin.cxx | 34 ++
sw/source/ui/ribbar/conform.cxx|4 ++--
sw/source/ui/ribbar/drawbase.cxx | 16
sw/source/ui/ribbar/dselect.cxx|2 --
sw/source/ui/shells/textfld.cxx|6 +++---
sw/source/ui/uiview/view.cxx |6 +++---
sw/source/ui/wrtsh/wrtsh3.cxx |6 +++---
15 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit ff927ba4272aa8f115472577ec9393df19016f2a
Author: Takeshi Abe
Date: Tue Jan 8 10:09:22 2013 +0900
sal_Bool to bool
Change-Id: I4e4063321da69d45d14a2fc870c33ea8ae46e4ef
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 048eb1d3..de5622c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -110,13 +110,13 @@ static void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm*
pOldSelFly)
{
// now call set macro if applicable
pSh->GetFlyMacroLnk().Call( (void*)pFlyFmt );
-extern sal_Bool bNoInterrupt; // in swapp.cxx
+extern bool bNoInterrupt; // in swapp.cxx
// if a dialog was started inside a macro, then
// MouseButtonUp arrives at macro and not to us. Therefore
// flag is always set here and will never be switched to
// respective Shell !!!
-bNoInterrupt = sal_False;
+bNoInterrupt = false;
}
else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt->Which() )
{
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 3c1388f..9337d9c 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -74,9 +74,9 @@ using namespace ::com::sun::star::lang;
static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView,
ViewShell* pSh )
{
// in FrameSets the actual visibility can differ from the ViewOption's
setting
-sal_Bool bVScrollChanged = rPref.IsViewVScrollBar() !=
pSh->GetViewOptions()->IsViewVScrollBar();
-sal_Bool bHScrollChanged = rPref.IsViewHScrollBar() !=
pSh->GetViewOptions()->IsViewHScrollBar();
-sal_Bool bVAlignChanged = rPref.IsVRulerRight() !=
pSh->GetViewOptions()->IsVRulerRight();
+bool bVScrollChanged = rPref.IsViewVScrollBar() !=
pSh->GetViewOptions()->IsViewVScrollBar();
+bool bHScrollChanged = rPref.IsViewHScrollBar() !=
pSh->GetViewOptions()->IsViewHScrollBar();
+bool bVAlignChanged = rPref.IsVRulerRight() !=
pSh->GetViewOptions()->IsVRulerRight();
pSh->SetUIOptions(rPref);
const SwViewOption* pNewPref = pSh->GetViewOptions();
@@ -156,7 +156,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref,
SwView* pActView,
pCurrView &&
pCurrView->ISA(SwWebView) ));
// with Uno, only sdbcx::View, but not the Module should be changed
-sal_Bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
+bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
// fob PreView off
SwPagePreView* pPPView;
if( !pCurrView && 0 != (pPPView = PTR_CAST( SwPagePreView,
SfxViewShell::Current())) )
@@ -303,11 +303,11 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar,
sal_Bool bWeb)
pPref = pUsrPref;
}
sal_Bool bOldApplyCharUnit = pPref->IsApplyCharUnit();
-sal_Bool bHasChanged = sal_False;
+bool bHasChanged = false;
if(bOldApplyCharUnit != bApplyChar)
{
pPref->SetApplyCharUnit(bApplyChar);
-bHasChanged = sal_True;
+bHasChanged = true;
}
if( !bHasChanged )
@@ -460,7 +460,7 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor,
SfxItemSet &rSet,
sizeof( aColArr[0] )) ] );
}
-sal_Bool bBackGr = COL_NONE == rAttr.nColor;
+bool bBackGr = COL_NONE == rAttr.nColor;
switch (rAttr.nItemId)
{
@@ -503,7 +503,7 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor,
SfxItemSet &rSet,
case SID_ATTR_BRUSH:
rSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ));
-bBackGr = sal_True;
+bBackGr = true;
break;
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 0add2ed..3c61ac7 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -128,7 +128,7 @@
#include
#include
ResMgr *pSwResMgr = 0;
-sal_Bool bNoInterrupt = sal_False;
+bool bNoInterrupt = false;
#include
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index d930a46..d4a8d0e 100644
--- a/sw/sou
[libreoffice-dev] - building difficulties with C++ extension,addIn
Hi Michael, I tried your extension suggestion to convert examples/java/SpreadSheet/CalcAddins.java to C++. I am having problem installing my extension using unpkg. Error : The extension "my simple extension" does not work on this computer. I tried various values in META-INF/manifest.xml : platform=linux_x86_64 and platform=all but I get the same error. I probably did something wrong transporting the xml files or oxt files from the example. The original example in java works for me. Would you happen to have expertise in this area and time to help me out ? I also came across the following link which states that regmerge is legacy. However, the CalcAddIn was using it, so I went with it too. http://wiki.openoffice.org/wiki/Documentation/DevGuide/WritingUNO/Deployment_Options_for_Components If that is the not the right way forward, please point me in the right direction. Thanks Neeraj -Original Message- From: Michael Stahl [mailto:mst...@redhat.com] Sent: Thursday, January 03, 2013 3:44 PM To: Rai, Neeraj [ICG-MKTS] Cc: 'libreoffice@lists.freedesktop.org' Subject: Re: [libreoffice-dev] - architecture question about interproces,extension,addIn hi Neeraj, On 03/01/13 16:54, Rai, Neeraj wrote: > Based on above text, I looked at addIns but it doesn't seem like what I > need. I don't want to be restricted to a function call. I need a > component running in scalc. > > _http://wiki.openoffice.org/wiki/Documentation/DevGuide/Spreadsheets/Spreadsheet_Add-Ins_ > > Can someone please advise what is the "fastest code as a C++ UNO > component " mean and where can I find more docs related to it. C++ UNO components that are instantiated in-process currently do not go through a bridge when interacting with the LO API (although there have been varying opinions about changing that, since it makes maintaining backward compatibility more difficult): for such components, calling a LO API method (or being called from LO itself) is just a C++ virtual function call. the best documented way to get this performance benefit is to implement your client code as an extension. http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/Extensions there may also be a way to get there with less efforts, there are some variables to add additional service rdbs to the soffice process (URE_MORE_SERVICES/URE_MORE_TYPES) but i don't have any experience with them; probably there is some way to implement what you want to do as a service and then start it from inside soffice, if all else fails via a trivial BASIC macro :) http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> http://extensions.openoffice.org/testarea/desktop/license/update/lic3.update.xml"; /> http://extensions.openoffice.org/testarea/desktop/publisher/publisher_de.html"; lang="de">My OpenOffice de http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en.html"; lang="en">My OpenOffice en http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_de.txt"; lang="de" /> http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_en.txt"; lang="en" /> CalcAddinCpp My simple extension CalcAddinCpp.oxt Description: CalcAddinCpp.oxt http://openoffice.org/2001/manifest";> ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#59090 clean up memory leaks
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1569
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/1569/1
fdo#59090 clean up memory leaks
Change-Id: Ifbade82383694ebac0e82920014cddfff5b12fcb
---
M basic/source/classes/sb.cxx
M cui/source/options/optdict.cxx
M embeddedobj/source/commonembedding/xfactory.cxx
M embeddedobj/source/general/xcreator.cxx
M embeddedobj/source/msole/xdialogcreator.cxx
M extensions/source/propctrlr/defaultforminspection.cxx
M extensions/source/propctrlr/defaulthelpprovider.cxx
M forms/source/component/ComboBox.cxx
M forms/source/runtime/formoperations.cxx
M fpicker/source/office/OfficeFilePicker.cxx
M fpicker/source/office/OfficeFolderPicker.cxx
M package/source/zippackage/ZipPackage.cxx
M package/source/zippackage/zipfileaccess.cxx
M sc/source/ui/unoobj/servuno.cxx
M sfx2/source/appl/xpackcreator.cxx
M sfx2/source/doc/objcont.cxx
M sfx2/source/doc/objstor.cxx
M sfx2/source/doc/ownsubfilterservice.cxx
M sfx2/source/view/frmload.cxx
M starmath/source/smdetect.cxx
M stoc/source/javaloader/javaloader.cxx
M stoc/source/namingservice/namingservice.cxx
M stoc/test/testiadapter.cxx
M svl/source/fsstor/fsfactory.cxx
M svl/source/passwordcontainer/passwordcontainer.cxx
M svtools/source/hatchwindow/hatchwindowfactory.cxx
M svx/source/fmcomp/gridcell.cxx
M svx/source/sdr/contact/viewcontactofunocontrol.cxx
M svx/source/tbxctrls/extrusioncontrols.cxx
M svx/source/tbxctrls/fontworkgallery.cxx
M svx/source/tbxctrls/tbunocontroller.cxx
M svx/source/unodraw/unobtabl.cxx
M svx/source/unodraw/unoctabl.cxx
M svx/source/unodraw/unodtabl.cxx
M svx/source/unodraw/unogtabl.cxx
M svx/source/unodraw/unohtabl.cxx
M svx/source/unodraw/unomtabl.cxx
M svx/source/unodraw/unottabl.cxx
38 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 12cb5da..b75c47f 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1699,7 +1699,7 @@
// Implementation of the code for the string transport to SFX-Error
if( !rMsg.isEmpty() )
{
-code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
+code = (sal_uIntPtr) StringErrorInfo( code, rMsg );
}
SetErrorData( code, l, c1, c2 );
GetSbData()->bCompiler = true;
@@ -1743,11 +1743,11 @@
{
OUString aTmp = "\'" +
OUString::valueOf(SbxErrObject::getUnoErrObject()->getNumber()) +
"\'\n" + OUString(!GetSbData()->aErrMsg.isEmpty()
? GetSbData()->aErrMsg : rMsg);
-code = (sal_uIntPtr)*new StringErrorInfo( code, aTmp );
+code = (sal_uIntPtr) StringErrorInfo( code, aTmp );
}
else
{
-code = (sal_uIntPtr)*new StringErrorInfo( code, rMsg );
+code = (sal_uIntPtr) StringErrorInfo( code, rMsg );
}
}
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9855c8a..32788c3 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -168,7 +168,7 @@
// error: couldn't create new dictionary
SfxErrorContext aContext( ERRCTX_SVX_LINGU_DICTIONARY, String(),
this, RID_SVXERRCTX, &CUI_MGR() );
-ErrorHandler::HandleError( *new StringErrorInfo(
+ErrorHandler::HandleError( StringErrorInfo(
ERRCODE_SVX_LINGU_DICT_NOTWRITEABLE, sDict ) );
EndDialog( RET_CANCEL );
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx
b/embeddedobj/source/commonembedding/xfactory.cxx
index ec29eda..a8cd472 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -54,7 +54,7 @@
uno::Reference< uno::XInterface > SAL_CALL
OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance(
const uno::Reference< lang::XMultiServiceFactory >&
xServiceManager )
{
-return uno::Reference< uno::XInterface >( *new OOoEmbeddedObjectFactory(
xServiceManager ) );
+return uno::Reference< uno::XInterface >( OOoEmbeddedObjectFactory(
xServiceManager ) );
}
//-
@@ -493,7 +493,7 @@
uno::Reference< uno::XInterface > SAL_CALL
OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance(
const uno::Reference< lang::XMultiServiceFactory >&
xServiceManager )
{
-return uno::Reference< uno::XInterface >( *new
OOoSpecialEmbeddedObjectFactory( xServiceManager ) );
+return uno::Reference< uno::XInterface >( OOoSpecialEmbeddedObjectFactory(
xServiceManager ) );
}
//-
diff --git a/embeddedobj/source/general/xcreator.cxx
b/embeddedobj/source/general/xcreator.cxx
index 599fc7c..30def27 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -56,7 +56,7 @@
uno::Reference
[PATCH] Translate German comments, cleanup whitespace
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1568
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/68/1568/1
Translate German comments, cleanup whitespace
Change-Id: I4cea9568c5f24340c6bdac387efe8e94f8edb95a
---
M sw/source/ui/dochdl/swdtflvr.cxx
M sw/source/ui/docvw/edtdd.cxx
M sw/source/ui/docvw/edtwin.cxx
M sw/source/ui/inc/pview.hxx
M sw/source/ui/inc/uitool.hxx
M sw/source/ui/ribbar/conform.cxx
M sw/source/ui/ribbar/conrect.cxx
7 files changed, 129 insertions(+), 192 deletions(-)
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 28bd60c..9dd3f36 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -583,7 +583,7 @@
{
case SWTRANSFER_OBJECTTYPE_DRAWMODEL:
{
-// dont change the sequence of commands
+// don't change the sequence of commands
SdrModel *pModel = (SdrModel*)pObject;
xStream->SetBufferSize( 16348 );
@@ -822,7 +822,7 @@
SwDoc *const pTmpDoc = lcl_GetDoc(*pClpDocFac);
-pTmpDoc->LockExpFlds(); // nie die Felder updaten - Text so
belassen
+pTmpDoc->LockExpFlds(); // Never update fields - leave text as is
lclOverWriteDoc(*pWrtShell, *pTmpDoc);
{
@@ -843,7 +843,7 @@
pMarkAccess->deleteMark(*ppMark);
}
-// a new one was created in CORE (OLE-Objekte copied!)
+// a new one was created in CORE (OLE objects copied!)
aDocShellRef = pTmpDoc->GetTmpDocShell();
if( aDocShellRef.Is() )
SwTransferable::InitOle( aDocShellRef, *pTmpDoc );
@@ -2407,7 +2407,7 @@
sFileURL, aEmptyStr );
if( pFlt && !rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
{
-// and then pull up the insert-region-dialog by PostUser event
+// and then pull up the insert-region-dialog by PostUser event
SwSectionData * pSect = new SwSectionData(
FILE_LINK_SECTION,
rSh.GetDoc()->GetUniqueSectionName() );
@@ -3053,7 +3053,7 @@
{
// first, ask for the SelectionType, then action-bracketing
// (otherwise it's not pasted into a TableSelection!!!)
-OSL_ENSURE( !rShell.ActionPend(), "Paste darf nie eine Actionklammerung
haben" );
+OSL_ENSURE( !rShell.ActionPend(), "Paste must never have an ActionPend" );
if ( !pClpDocFac )
return sal_False; // the return value of the SwFEShell::Paste also is
sal_Bool!
@@ -3092,7 +3092,7 @@
// in the buffer, word in this context means 'something with spaces at
beginning
// and end'. In this case we definitely want these spaces to be inserted here.
bInWrd = rShell.IsInWrd();
- bEndWrd = rShell.IsEndWrd();
+bEndWrd = rShell.IsEndWrd();
bSmart = bInWrd || bEndWrd;
if( bSmart )
{
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index 0cdafc1..c75ec9b 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -77,7 +77,7 @@
if( rSh.GetDrawView()->Command( aDragEvent, this ) )
{
rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
-return; // Event von der SdrView ausgewertet
+return; // Event evaluated by SdrView
}
}
@@ -218,13 +218,13 @@
}
-// There's a special treatment for file lists
with a single
-// element, that depends on the actual content of
the
-// Transferable to be accessible. Since the
transferable
-// may only be accessed after the drop has been
accepted
-// (according to KA due to Java D&D), we'll have
to
-// reevaluate the drop action once more _with_ the
-// Transferable.
+// There's a special treatment for file lists with a single
+// element, that depends on the actual content of the
+// Transferable to be accessible. Since the transferable
+// may only be accessed after the drop has been accepted
+// (according to KA due to Java D&D), we'll have to
+// reevaluate the drop action once more _with_ the
+// Transferable.
sal_uInt16 nEventAction;
sal_Int8 nUserOpt = rEvt.mbDefault ? EXCHG_IN_ACTION_DEFAULT
: rEvt.mnAction;
@@ -415,8 +415,8 @@
}
else if( rEvt.mbDefault )
{
-// internal Drag&Drop: within same Doc a Move
-// otherwise a Copy - Task 54974
+// internal Drag&Drop: within same Doc a Move
+// otherwise a Copy - Task 54974
Re: LATE FEATURE: Personas in LibreOffice
Hi Kendy Jan Holesovsky wrote (07-01-13 11:32) Please let me know if this is acceptable, and if you need any help with the review. Idea looks great to me and is an invitement for futher enhancements in the future :-) I gues the code in a daily from 2012-12-28 (1) is not yet complet? I see the option page, but choosing an own background image does not work (file picker handling is broken) and a choosen persona is not shown... Cheers Cor 1) Version 4.0.0.0.beta2+ (Build ID: 1d7287f8d7984eae98a577f60a8bc0a740fc5e9) -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - ios/prj Module_tail_build.mk nss/prj openldap/prj RepositoryModule_ooo.mk tail_build/prj
Module_tail_build.mk |4 RepositoryModule_ooo.mk |1 + ios/prj/build.lst|2 +- nss/prj/build.lst|2 +- openldap/prj/d.lst |5 - tail_build/prj/build.lst |2 +- 6 files changed, 4 insertions(+), 12 deletions(-) New commits: commit bd2de1201f0a745cbd8a962f957a7f2c8a219c88 Author: Matúš Kukan Date: Mon Jan 7 20:51:44 2013 +0100 openldap: clear d.lst Change-Id: I197d03e55cd5c996ca85d4a31f1907722de2fa20 diff --git a/openldap/prj/d.lst b/openldap/prj/d.lst index ff6eaff..e69de29 100644 --- a/openldap/prj/d.lst +++ b/openldap/prj/d.lst @@ -1,5 +0,0 @@ -mkdir: %_DEST%\inc\openldap -..\%__SRC%\inc\*.h %_DEST%\inc\openldap\*.h -..\%__SRC%\lib\libldap.a %_DEST%\lib\libldap.a -..\%__SRC%\lib\libldap_r.a %_DEST%\lib\libldap_r.a -..\%__SRC%\lib\liblber.a %_DEST%\lib\liblber.a commit 2baa4b333fe3046f106e114a01dfe0411a6cc6f0 Author: Matúš Kukan Date: Mon Jan 7 20:19:58 2013 +0100 nss: depend on python3 nss is not in tail_build because of moz, so expat, external, openssl and python3 must go also out. Change-Id: I52a3b02ff477ae52abc298d96770755ebc392d57 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 0407aae..dfac982 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -70,9 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ embedserv \ $(call gb_Helper_optional,EPM,epm) \ eventattacher \ - $(call gb_Helper_optional,EXPAT,expat) \ extensions \ - external \ extras \ fileaccess \ filter \ @@ -134,13 +132,11 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ oovbaapi \ oox \ $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ package \ padmin \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ psprint_config \ $(call gb_Helper_optional,PYUNO,pyuno) \ - $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ $(call gb_Helper_optional,REDLAND,redland) \ diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 9c4caa1..b5f776f 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,2 +1,2 @@ -ns nss : solenv soltools NULL +ns nss : solenv soltools PYTHON:python3 NULL ns nss\prj nmake - all ns_nss NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 0b03bb2..5d13406 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss XPDF:xpdf solenv soltools NULL +tb tail_build : EXPAT:expat LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL commit ea96f22f2d1218111c47f5ac9a12f8d5a32f6d6c Author: Matúš Kukan Date: Mon Jan 7 20:17:43 2013 +0100 RepositoryModule_ooo.mk: add android Change-Id: I8d75da8c28b5b1386b860b2d8bde5f386ad1f928 diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index ff6c730..f2bde73 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ accessibility \ $(call gb_Helper_optional,AFMS,afms) \ + android \ animations \ $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \ apple_remote \ commit 67cb70c80d5665270d7814420b51556ff0787b8d Author: Matúš Kukan Date: Mon Jan 7 20:16:20 2013 +0100 module packimages is gone Change-Id: I4a6c6b8680f0cbd9a64442b8e57bb229fc2b6e4d diff --git a/ios/prj/build.lst b/ios/prj/build.lst index dcd87cc..d067f9c 100644 --- a/ios/prj/build.lst +++ b/ios/prj/build.lst @@ -1,2 +1,2 @@ -ios ios :: packimages postprocess NULL +ios ios :: postprocess NULL ios ios\prj nmake - all an_prj NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] .: 4 commits - canvas/source filter/source offapi/UnoApi_offapi.mk sax/inc sax/source svx/inc svx/source xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source
On Monday 07 of January 2013, Libreoffice Gerrit user wrote: > commit 6eb0522395c236ae6930a300992ad092449f9592 > Author: Chr. Rossmanith > Date: Tue Jan 1 21:38:06 2013 +0100 > > dummy commit (WIP) > > Change-Id: Ibeee6553312323b75b2403ad6832595f228e0e3c I have reverted this commit in the repository. It does not build because of a missing file and the commit message and contents suggest it was not meant to be pushed. If it was meant to be pushed, please fix it and push again. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source offapi/UnoApi_offapi.mk svx/inc svx/source xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source
filter/source/svg/svgreader.cxx | 24
offapi/UnoApi_offapi.mk |2
svx/inc/svx/xflgrit.hxx |5 -
svx/source/xoutdev/xattr.cxx | 19 ---
xmloff/Library_xo.mk |1
xmloff/Package_inc.mk|1
xmloff/inc/xmloff/xmlstyle.hxx |5 -
xmloff/source/style/FillStyleContext.cxx | 151 ---
xmloff/source/style/FillStyleContext.hxx | 67 -
xmloff/source/style/GradientStyle.cxx| 12 --
xmloff/source/style/xmlstyle.cxx |5 -
11 files changed, 18 insertions(+), 274 deletions(-)
New commits:
commit eda0cec9ac990020e9da804ec3ed38e2cbfeeb77
Author: LuboÅ¡ LuÅák
Date: Mon Jan 7 22:27:41 2013 +0100
Revert "dummy commit (WIP)"
This reverts commit 6eb0522395c236ae6930a300992ad092449f9592.
It does not compile and the message and contents suggest it probably wasn't
meant to be pushed.
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 51a0860..5e9e994 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -179,6 +179,7 @@ struct AnnotatingVisitor
case XML_LINEARGRADIENT:
{
const sal_Int32 nNumAttrs( xAttributes->getLength() );
+rtl::OUString sAttributeValue;
maGradientVector.push_back(Gradient(Gradient::LINEAR));
// do we have a reference to a parent gradient? parse
@@ -216,6 +217,7 @@ struct AnnotatingVisitor
case XML_RADIALGRADIENT:
{
const sal_Int32 nNumAttrs( xAttributes->getLength() );
+rtl::OUString sAttributeValue;
maGradientVector.push_back(Gradient(Gradient::RADIAL));
// do we have a reference to a parent gradient? parse
@@ -253,6 +255,7 @@ struct AnnotatingVisitor
case XML_STOP:
{
const sal_Int32 nNumAttrs( xAttributes->getLength() );
+rtl::OUString sAttributeValue;
maGradientStopVector.push_back(GradientStop());
maGradientVector.back().maStops.push_back(maGradientStopVector.size()-1);
for( sal_Int32 i=0; iAddAttribute( "draw:angle",
-
rtl::OUString::valueOf(rRotate*1800.0/M_PI + 900) );
-SAL_INFO("svg", "maStops " << rState.maFillGradient.maStops[0] <<
" " << rState.maFillGradient.maStops[1] );
+
rtl::OUString::valueOf(rRotate*1800.0/M_PI ) );
xAttrs->AddAttribute( "draw:start-color",
getOdfColor(
maGradientStopVector[
@@ -811,11 +813,6 @@ struct AnnotatingVisitor
const sal_Int32 nTokenId,
const rtl::OUString& sValue )
{
-rtl::OString aValueUtf8( sValue.getStr(),
- sValue.getLength(),
- RTL_TEXTENCODING_UTF8 );
-
-SAL_INFO("svg", "nTokenId " << nTokenId);
switch(nTokenId)
{
case XML_HREF:
@@ -839,18 +836,7 @@ struct AnnotatingVisitor
case XML_STYLE:
parseStyle( sValue );
break;
-case XML_STOP_COLOR:
-parseColor( aValueUtf8.getStr(), io_rGradientStop.maStopColor
);
-break;
-case XML_STOP_OPACITY:
-io_rGradientStop.maStopColor.a = sValue.toDouble();
-if (io_rGradientStop.maStopColor.a < 0)
-io_rGradientStop.maStopColor.a = 0;
-else if (io_rGradientStop.maStopColor.a > 1)
-io_rGradientStop.maStopColor.a = 1;
-break;
default:
-SAL_INFO("svg", "nTokenId unknown " << getTokenName(nTokenId));
break;
}
}
@@ -1045,11 +1031,9 @@ struct AnnotatingVisitor
parseTextAlign(maCurrState,aValueUtf8.getStr());
break;
case XML_STOP_COLOR:
-SAL_INFO("svg", "XML_STOP_COLOR1");
if( maGradientVector.empty() ||
maGradientVector.back().maStops.empty() )
break;
-SAL_INFO("svg", "XML_STOP_COLOR2");
parseColor( aValueUtf8.getStr(),
maGradientStopVector[
maGradientVector.back().maStops.back()].maStopColor );
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 454b297..56e5f48 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1642,9 +1642,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/awt,\
FontWeight \
FontWidth \
Gradient \
- SvgGradient \
GradientStyle \
Re: No test on the return of pOleObject->Close in embedserv/source/inprocserv/inprocembobj.cxx
Oups, forgot to tell I prefered to submit it since it isn't taken into account during my build. So I don't even know if it builds or not :-( -- View this message in context: http://nabble.documentfoundation.org/No-test-on-the-return-of-pOleObject-Close-in-embedserv-source-inprocserv-inprocembobj-cxx-tp4025755p4027676.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: No test on the return of pOleObject->Close in embedserv/source/inprocserv/inprocembobj.cxx
Thank you Stephan for your feedback. I submitted a patch to review (see https://gerrit.libreoffice.org/#/c/1567/). Julien -- View this message in context: http://nabble.documentfoundation.org/No-test-on-the-return-of-pOleObject-Close-in-embedserv-source-inprocserv-inprocembobj-cxx-tp4025755p4027674.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] test on the return of pOleObject->Close
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1567
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1567/1
test on the return of pOleObject->Close
Change-Id: Iee64f6f369e2312d479fa81e7a59fb962ed8d90e
---
M embedserv/source/inprocserv/inprocembobj.cxx
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx
b/embedserv/source/inprocserv/inprocembobj.cxx
index c6bad46..27c28ad 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -771,6 +771,7 @@
//---
STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
{
+HRESULT ret = S_OK;
if ( m_pDefHandler && CheckDefHandler() )
{
// no need to close if there is no default handler.
@@ -781,14 +782,18 @@
if ( SUCCEEDED( hr ) && pOleObject )
{
hr = pOleObject->Close( dwSaveOption );
+if (!SUCCEEDED(hr))
+ ret = hr;
hr = CoDisconnectObject( (IUnknown*)(IPersistStorage*)this, 0 );
+if (!(SUCCEEDED(hr) && SUCCEEDED(ret)))
+ ret = hr;
}
}
// if the object is closed from outside that means that it should go to
uninitialized state
Clean();
-return S_OK;
+return ret;
}
//---
--
To view, visit https://gerrit.libreoffice.org/1567
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee64f6f369e2312d479fa81e7a59fb962ed8d90e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: scripting/source
scripting/source/pyprov/mailmerge.py | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 8269d576ec5dcfd4ca76ae219e85935efcdc008b
Author: Julien Nabet
Date: Sun Jan 6 15:02:41 2013 +0100
Fix type SMPT->SMTP
Change-Id: I09dfd8c2385e6257248b6a43ee4e2ce97ee6bdfc
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index 236bea1..e87f9a5 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -61,23 +61,23 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
self.connectioncontext = None
self.notify = EventObject()
if dbg:
- print("PyMailSMPTService init", file=dbgout)
+ print("PyMailSMTPService init", file=dbgout)
def addConnectionListener(self, xListener):
if dbg:
- print("PyMailSMPTService addConnectionListener",
file=dbgout)
+ print("PyMailSMTPService addConnectionListener",
file=dbgout)
self.listeners.append(xListener)
def removeConnectionListener(self, xListener):
if dbg:
- print("PyMailSMPTService removeConnectionListener",
file=dbgout)
+ print("PyMailSMTPService removeConnectionListener",
file=dbgout)
self.listeners.remove(xListener)
def getSupportedConnectionTypes(self):
if dbg:
- print("PyMailSMPTService getSupportedConnectionTypes",
file=dbgout)
+ print("PyMailSMTPService getSupportedConnectionTypes",
file=dbgout)
return self.supportedtypes
def connect(self, xConnectionContext, xAuthenticator):
self.connectioncontext = xConnectionContext
if dbg:
- print("PyMailSMPTService connect", file=dbgout)
+ print("PyMailSMTPService connect", file=dbgout)
server = xConnectionContext.getValueByName("ServerName")
if dbg:
print(server, file=dbgout)
@@ -110,7 +110,7 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
listener.connected(self.notify)
def disconnect(self):
if dbg:
- print("PyMailSMPTService disconnect", file=dbgout)
+ print("PyMailSMTPService disconnect", file=dbgout)
if self.server:
self.server.quit()
self.server = None
@@ -118,17 +118,17 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
listener.disconnected(self.notify)
def isConnected(self):
if dbg:
- print("PyMailSMPTService isConnected", file=dbgout)
+ print("PyMailSMTPService isConnected", file=dbgout)
return self.server != None
def getCurrentConnectionContext(self):
if dbg:
- print("PyMailSMPTService getCurrentConnectionContext",
file=dbgout)
+ print("PyMailSMTPService getCurrentConnectionContext",
file=dbgout)
return self.connectioncontext
def sendMailMessage(self, xMailMessage):
COMMASPACE = ', '
if dbg:
- print("PyMailSMPTService sendMailMessage", file=dbgout)
+ print("PyMailSMTPService sendMailMessage", file=dbgout)
recipients = xMailMessage.getRecipients()
sendermail = xMailMessage.SenderAddress
sendername = xMailMessage.SenderName
@@ -136,10 +136,10 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
ccrecipients = xMailMessage.getCcRecipients()
bccrecipients = xMailMessage.getBccRecipients()
if dbg:
- print("PyMailSMPTService subject " + subject,
file=dbgout)
- print("PyMailSMPTService from " +
sendername.encode('utf-8'), file=dbgout)
+ print("PyMailSMTPService subject " + subject,
file=dbgout)
+ print("PyMailSMTPService from " +
sendername.encode('utf-8'), file=dbgout)
print("PyMailSMTPService from " + sendermail,
file=dbgout)
- print("PyMailSMPTService send to " + recipients,
file=dbgout)
+ print("PyMailSMTPService send to " + recipients,
file=dbgout)
attachments = xMailMessage.getAttachments()
@@ -148,13 +148,13 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
content = xMailMessage.Body
flavors = content.getTransferDataFlavors()
if dbg:
- print("PyMailSMPTService flavors len " + len(flavors),
file
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/qa
sc/qa/unit/filters-test.cxx| 15 +--
sc/qa/unit/subsequent_filters-test.cxx | 151 -
2 files changed, 46 insertions(+), 120 deletions(-)
New commits:
commit 6918c1e61933cfb9090de7438ac7416647fcee45
Author: Kohei Yoshida
Date: Mon Jan 7 16:03:22 2013 -0500
Adjusted all test methods for loadDoc.
There was already a method that did the same thing (loadDoc). Let's
stick with loadDoc instead.
Also took advantage of automatic literal to OUString conversion while
I was at it.
Change-Id: I184f6278dd4bf8e3f2f7e5eda1e5e293303df68c
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 060fbaa..755be75 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -320,8 +320,7 @@ ScDocShellRef ScFiltersTest::loadDoc(const rtl::OUString&
rName, sal_Int32 nForm
void ScFiltersTest::testRangeNameODS()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("named-ranges-global."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, 0);
+ScDocShellRef xDocSh = loadDoc("named-ranges-global.", ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-globals.*",
xDocSh.Is());
@@ -387,8 +386,7 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat )
//same code for ods,
void ScFiltersTest::testContentODS()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, ODS);
+ScDocShellRef xDocSh = loadDoc("universal-content.", ODS);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -398,8 +396,7 @@ void ScFiltersTest::testContentODS()
void ScFiltersTest::testContentXLS()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, XLS);
+ScDocShellRef xDocSh = loadDoc("universal-content.", XLS);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -409,8 +406,7 @@ void ScFiltersTest::testContentXLS()
void ScFiltersTest::testContentXLSX()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, XLSX);
+ScDocShellRef xDocSh = loadDoc("universal-content.", XLSX);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -420,8 +416,7 @@ void ScFiltersTest::testContentXLSX()
void ScFiltersTest::testContentLotus123()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, LOTUS123);
+ScDocShellRef xDocSh = loadDoc("universal-content.", LOTUS123);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2140693..04a7ffe 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -113,8 +113,6 @@ public:
const rtl::OUString &rUserData, const rtl::OUString& rTypeName,
unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int
nFilterVersion);
-ScDocShellRef loadFile(const OUString& rBaseName, size_t nExt);
-
void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString&
aFileExtension, rtl::OUString& rFilePath);
void createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rFilePath);
@@ -234,7 +232,7 @@ public:
private:
void testPassword_Impl(const rtl::OUString& rFileNameBase);
-ScDocShellRef loadDoc(const rtl::OUString& rName, sal_Int32 nType);
+ScDocShellRef loadDoc(const rtl::OUString& rBaseName, size_t nExt);
uno::Reference m_xCalcComponent;
::rtl::OUString m_aBaseString;
@@ -265,7 +263,7 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
&rFilter, const rtl::OUStr
return xDocShRef;
}
-ScDocShellRef ScFiltersTest::loadFile(const OUString& rBaseName, size_t nExt)
+ScDocShellRef ScFiltersTest::loadDoc(const OUString& rBaseName, size_t nExt)
{
OUString aFileExt = OUString::createFromAscii(aFileFormats[nExt].pName);
OUString aFilterName =
OUString::createFromAscii(aFileFormats[nExt].pFilterName);
@@ -276,7 +274,9 @@ ScDocShellRef ScFiltersTest::loadFile(const OUString&
rBaseName, size_t nExt)
unsigned int nFormatType = aFileFormats[nExt].nFormatType;
unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-return load(aFilterName, aFileName, OUString(), aFilterType, nFormatType,
nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
+ScDocShellRef xDocSh = load(aFilterName, aFileName, OUString(),
aFilterType, nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
+CPPUNIT_ASSERT(xDocSh.Is());
+return xDocSh;
}
bool ScFiltersTest::load(const rtl::OUString &rFilter, const r
[Libreoffice-commits] .: sc/qa
sc/qa/unit/filters-test.cxx| 15 +--
sc/qa/unit/subsequent_filters-test.cxx | 151 -
2 files changed, 46 insertions(+), 120 deletions(-)
New commits:
commit 2ba80e59ceaceabd04b0426154b3402062731d5b
Author: Kohei Yoshida
Date: Mon Jan 7 16:03:22 2013 -0500
Adjusted all test methods for loadDoc.
There was already a method that did the same thing (loadDoc). Let's
stick with loadDoc instead.
Also took advantage of automatic literal to OUString conversion while
I was at it.
Change-Id: I184f6278dd4bf8e3f2f7e5eda1e5e293303df68c
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 060fbaa..755be75 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -320,8 +320,7 @@ ScDocShellRef ScFiltersTest::loadDoc(const rtl::OUString&
rName, sal_Int32 nForm
void ScFiltersTest::testRangeNameODS()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("named-ranges-global."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, 0);
+ScDocShellRef xDocSh = loadDoc("named-ranges-global.", ODS);
CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-globals.*",
xDocSh.Is());
@@ -387,8 +386,7 @@ void testContentImpl(ScDocument* pDoc, sal_Int32 nFormat )
//same code for ods,
void ScFiltersTest::testContentODS()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, ODS);
+ScDocShellRef xDocSh = loadDoc("universal-content.", ODS);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -398,8 +396,7 @@ void ScFiltersTest::testContentODS()
void ScFiltersTest::testContentXLS()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, XLS);
+ScDocShellRef xDocSh = loadDoc("universal-content.", XLS);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -409,8 +406,7 @@ void ScFiltersTest::testContentXLS()
void ScFiltersTest::testContentXLSX()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, XLSX);
+ScDocShellRef xDocSh = loadDoc("universal-content.", XLSX);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
@@ -420,8 +416,7 @@ void ScFiltersTest::testContentXLSX()
void ScFiltersTest::testContentLotus123()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("universal-content."));
-ScDocShellRef xDocSh = loadDoc(aFileNameBase, LOTUS123);
+ScDocShellRef xDocSh = loadDoc("universal-content.", LOTUS123);
xDocSh->DoHardRecalc(true);
ScDocument* pDoc = xDocSh->GetDocument();
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2140693..04a7ffe 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -113,8 +113,6 @@ public:
const rtl::OUString &rUserData, const rtl::OUString& rTypeName,
unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int
nFilterVersion);
-ScDocShellRef loadFile(const OUString& rBaseName, size_t nExt);
-
void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString&
aFileExtension, rtl::OUString& rFilePath);
void createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rFilePath);
@@ -234,7 +232,7 @@ public:
private:
void testPassword_Impl(const rtl::OUString& rFileNameBase);
-ScDocShellRef loadDoc(const rtl::OUString& rName, sal_Int32 nType);
+ScDocShellRef loadDoc(const rtl::OUString& rBaseName, size_t nExt);
uno::Reference m_xCalcComponent;
::rtl::OUString m_aBaseString;
@@ -265,7 +263,7 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
&rFilter, const rtl::OUStr
return xDocShRef;
}
-ScDocShellRef ScFiltersTest::loadFile(const OUString& rBaseName, size_t nExt)
+ScDocShellRef ScFiltersTest::loadDoc(const OUString& rBaseName, size_t nExt)
{
OUString aFileExt = OUString::createFromAscii(aFileFormats[nExt].pName);
OUString aFilterName =
OUString::createFromAscii(aFileFormats[nExt].pFilterName);
@@ -276,7 +274,9 @@ ScDocShellRef ScFiltersTest::loadFile(const OUString&
rBaseName, size_t nExt)
unsigned int nFormatType = aFileFormats[nExt].nFormatType;
unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-return load(aFilterName, aFileName, OUString(), aFilterType, nFormatType,
nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
+ScDocShellRef xDocSh = load(aFilterName, aFileName, OUString(),
aFilterType, nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
+CPPUNIT_ASSERT(xDocSh.Is());
+return xDocSh;
}
bool ScFiltersTest::load(const rtl::OUString &rFilter, const r
[Libreoffice-commits] .: Makefile.in
Makefile.in |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 568e489be45bb57c344326beec96a8b708d7e654 Author: Petr Mladek Date: Mon Jan 7 21:10:12 2013 +0100 another fix of install test to work with "LibreOffice" installer name It is done by gbuild these days. Change-Id: I5a01d42f8e25eacc3f1c63d6f52e4144c7312cff diff --git a/Makefile.in b/Makefile.in index f0b5ce1..af83e64 100644 --- a/Makefile.in +++ b/Makefile.in @@ -325,8 +325,8 @@ dev-install: build @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip" - mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip" + mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @@ -352,8 +352,8 @@ install-tb: @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip" - mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip" + mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - Makefile.top
Makefile.top |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 4f15dd36f6498d52e653056101616ec8dabe8434 Author: Petr Mladek Date: Mon Jan 7 21:05:22 2013 +0100 another fix of install test to work with "LibreOffice" installer name It is done by gbuild these days. Change-Id: I6003a0f924d1db8b8d4b024173b905923d27bd71 diff --git a/Makefile.top b/Makefile.top index 28f56d2..3dabd7f 100644 --- a/Makefile.top +++ b/Makefile.top @@ -282,8 +282,8 @@ dev-install: build @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip" - mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip" + mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @@ -309,8 +309,8 @@ install-tb: @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip" - mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip" + mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - xmlhelp/util
xmlhelp/util/main_transform.xsl | 14 -- 1 file changed, 14 deletions(-) New commits: commit 2dea3c582d2bc51b6dac8ac3065df040c9b641d0 Author: Andras Timar Date: Mon Jan 7 21:08:54 2013 +0100 'distrib' switch is unused in help Change-Id: I54539f75a682fa873684d07566207973cd1ead28 diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl index 803f7c7..2834668 100644 --- a/xmlhelp/util/main_transform.xsl +++ b/xmlhelp/util/main_transform.xsl @@ -101,17 +101,6 @@ - - - - - - - - - - - commit fc89654e4f562a2682f6e9ed932f91c5cdfd3cff Author: Andras Timar Date: Mon Jan 7 21:07:06 2013 +0100 remove unused meta variables Change-Id: Iec9ad2da61668d00438462c38a135381e37ca668 diff --git a/xmlhelp/util/main_transform.xsl b/xmlhelp/util/main_transform.xsl index 6df417f..803f7c7 100644 --- a/xmlhelp/util/main_transform.xsl +++ b/xmlhelp/util/main_transform.xsl @@ -74,10 +74,7 @@ - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/qa
sc/qa/unit/subsequent_filters-test.cxx | 88 -
1 file changed, 23 insertions(+), 65 deletions(-)
New commits:
commit 4898e938a6730a0f4e53edc86871fa2480554c6f
Author: Kohei Yoshida
Date: Mon Jan 7 15:02:25 2013 -0500
Remove duplicated code blocks.
Change-Id: I332a39fe86fee385bcd2cce33fe2096043111472
TODO: Do this in the other tests as well.
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index df858da..2140693 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -113,6 +113,8 @@ public:
const rtl::OUString &rUserData, const rtl::OUString& rTypeName,
unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int
nFilterVersion);
+ScDocShellRef loadFile(const OUString& rBaseName, size_t nExt);
+
void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString&
aFileExtension, rtl::OUString& rFilePath);
void createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rFilePath);
@@ -263,6 +265,20 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
&rFilter, const rtl::OUStr
return xDocShRef;
}
+ScDocShellRef ScFiltersTest::loadFile(const OUString& rBaseName, size_t nExt)
+{
+OUString aFileExt = OUString::createFromAscii(aFileFormats[nExt].pName);
+OUString aFilterName =
OUString::createFromAscii(aFileFormats[nExt].pFilterName);
+OUString aFilterType =
OUString::createFromAscii(aFileFormats[nExt].pTypeName);
+
+rtl::OUString aFileName;
+createFileURL(rBaseName, aFileExt, aFileName);
+
+unsigned int nFormatType = aFileFormats[nExt].nFormatType;
+unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
+return load(aFilterName, aFileName, OUString(), aFilterType, nFormatType,
nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
+}
+
bool ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString
&rURL,
const rtl::OUString &rUserData, unsigned int nFilterFlags,
unsigned int nClipboardID, unsigned int nFilterVersion)
@@ -1392,19 +1408,7 @@ void ScFiltersTest::testControlImport()
void ScFiltersTest::testNumberFormatHTML()
{
-OUString aFileNameBase("numberformat.");
-OUString aFileExt = OUString::createFromAscii(aFileFormats[HTML].pName);
-OUString aFilterName =
OUString::createFromAscii(aFileFormats[HTML].pFilterName);
-OUString aFilterType =
OUString::createFromAscii(aFileFormats[HTML].pTypeName);
-
-rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExt, aFileName);
-
-unsigned int nFormatType = aFileFormats[HTML].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(aFilterName, aFileName, rtl::OUString(),
aFilterType,
-nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
-
+ScDocShellRef xDocSh = loadFile("numberformat.", HTML);
CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -1424,20 +1428,8 @@ void ScFiltersTest::testNumberFormatHTML()
void ScFiltersTest::testNumberFormatCSV()
{
-OUString aFileNameBase("numberformat.");
-OUString aFileExt = OUString::createFromAscii(aFileFormats[CSV].pName);
-OUString aFilterName =
OUString::createFromAscii(aFileFormats[CSV].pFilterName);
-OUString aFilterType =
OUString::createFromAscii(aFileFormats[CSV].pTypeName);
-
-rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExt, aFileName);
-
-unsigned int nFormatType = aFileFormats[CSV].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(aFilterName, aFileName, rtl::OUString(),
aFilterType,
-nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
-
-CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is());
+ScDocShellRef xDocSh = loadFile("numberformat.", CSV);
+CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -1456,19 +1448,7 @@ void ScFiltersTest::testNumberFormatCSV()
void ScFiltersTest::testCellAnchoredShapesODS()
{
-OUString aFileNameBase("cell-anchored-shapes.");
-OUString aFileExt = OUString::createFromAscii(aFileFormats[ODS].pName);
-OUString aFilterName =
OUString::createFromAscii(aFileFormats[ODS].pFilterName);
-OUString aFilterType =
OUString::createFromAscii(aFileFormats[ODS].pTypeName);
-
-rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExt, aFileName);
-
-unsigned int nFormatType = aFileFormats[ODS].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(aFilterName, aFileName, rtl::OUString(),
aFilterType,
-nFormatT
[Libreoffice-commits] .: sc/qa
sc/qa/unit/subsequent_filters-test.cxx | 88 -
1 file changed, 23 insertions(+), 65 deletions(-)
New commits:
commit 0bb184196e2b6a10640155a02d0eac263a1f48e4
Author: Kohei Yoshida
Date: Mon Jan 7 15:02:25 2013 -0500
Remove duplicated code blocks.
Change-Id: I332a39fe86fee385bcd2cce33fe2096043111472
TODO: Do this in the other tests as well.
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index df858da..2140693 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -113,6 +113,8 @@ public:
const rtl::OUString &rUserData, const rtl::OUString& rTypeName,
unsigned int nFilterFlags, unsigned int nClipboardID, unsigned int
nFilterVersion);
+ScDocShellRef loadFile(const OUString& rBaseName, size_t nExt);
+
void createFileURL(const rtl::OUString& aFileBase, const rtl::OUString&
aFileExtension, rtl::OUString& rFilePath);
void createCSVPath(const rtl::OUString& aFileBase, rtl::OUString&
rFilePath);
@@ -263,6 +265,20 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString
&rFilter, const rtl::OUStr
return xDocShRef;
}
+ScDocShellRef ScFiltersTest::loadFile(const OUString& rBaseName, size_t nExt)
+{
+OUString aFileExt = OUString::createFromAscii(aFileFormats[nExt].pName);
+OUString aFilterName =
OUString::createFromAscii(aFileFormats[nExt].pFilterName);
+OUString aFilterType =
OUString::createFromAscii(aFileFormats[nExt].pTypeName);
+
+rtl::OUString aFileName;
+createFileURL(rBaseName, aFileExt, aFileName);
+
+unsigned int nFormatType = aFileFormats[nExt].nFormatType;
+unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
+return load(aFilterName, aFileName, OUString(), aFilterType, nFormatType,
nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
+}
+
bool ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString
&rURL,
const rtl::OUString &rUserData, unsigned int nFilterFlags,
unsigned int nClipboardID, unsigned int nFilterVersion)
@@ -1392,19 +1408,7 @@ void ScFiltersTest::testControlImport()
void ScFiltersTest::testNumberFormatHTML()
{
-OUString aFileNameBase("numberformat.");
-OUString aFileExt = OUString::createFromAscii(aFileFormats[HTML].pName);
-OUString aFilterName =
OUString::createFromAscii(aFileFormats[HTML].pFilterName);
-OUString aFilterType =
OUString::createFromAscii(aFileFormats[HTML].pTypeName);
-
-rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExt, aFileName);
-
-unsigned int nFormatType = aFileFormats[HTML].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(aFilterName, aFileName, rtl::OUString(),
aFilterType,
-nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
-
+ScDocShellRef xDocSh = loadFile("numberformat.", HTML);
CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -1424,20 +1428,8 @@ void ScFiltersTest::testNumberFormatHTML()
void ScFiltersTest::testNumberFormatCSV()
{
-OUString aFileNameBase("numberformat.");
-OUString aFileExt = OUString::createFromAscii(aFileFormats[CSV].pName);
-OUString aFilterName =
OUString::createFromAscii(aFileFormats[CSV].pFilterName);
-OUString aFilterType =
OUString::createFromAscii(aFileFormats[CSV].pTypeName);
-
-rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExt, aFileName);
-
-unsigned int nFormatType = aFileFormats[CSV].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(aFilterName, aFileName, rtl::OUString(),
aFilterType,
-nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
-
-CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is());
+ScDocShellRef xDocSh = loadFile("numberformat.", CSV);
+CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -1456,19 +1448,7 @@ void ScFiltersTest::testNumberFormatCSV()
void ScFiltersTest::testCellAnchoredShapesODS()
{
-OUString aFileNameBase("cell-anchored-shapes.");
-OUString aFileExt = OUString::createFromAscii(aFileFormats[ODS].pName);
-OUString aFilterName =
OUString::createFromAscii(aFileFormats[ODS].pFilterName);
-OUString aFilterType =
OUString::createFromAscii(aFileFormats[ODS].pTypeName);
-
-rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExt, aFileName);
-
-unsigned int nFormatType = aFileFormats[ODS].nFormatType;
-unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
-ScDocShellRef xDocSh = load(aFilterName, aFileName, rtl::OUString(),
aFilterType,
-nFormatT
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/qa
sc/qa/unit/subsequent_filters-test.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0494167d0057e052acb768e57d786b00d5cd902b
Author: Kohei Yoshida
Date: Mon Jan 7 14:45:00 2013 -0500
Append ODS to the test method name.
Change-Id: I024d142b59ccceed944d641b6306f47dcf03ef9d
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 618e627..df858da 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -170,7 +170,7 @@ public:
void testPivotTableBasicODS();
void testFormulaDependency();
-void testRowHeight();
+void testRowHeightODS();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testRangeNameXLS);
@@ -213,7 +213,7 @@ public:
CPPUNIT_TEST(testCellAnchoredShapesODS);
CPPUNIT_TEST(testPivotTableBasicODS);
-CPPUNIT_TEST(testRowHeight);
+CPPUNIT_TEST(testRowHeightODS);
CPPUNIT_TEST(testFormulaDependency);
//disable testPassword on MacOSX due to problems with libsqlite3
@@ -1574,7 +1574,7 @@ void ScFiltersTest::testPivotTableBasicODS()
xDocSh->DoClose();
}
-void ScFiltersTest::testRowHeight()
+void ScFiltersTest::testRowHeightODS()
{
OUString aFileNameBase("row-height-import.");
OUString aFileExt = OUString::createFromAscii(aFileFormats[ODS].pName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/subsequent_filters-test.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f6bf087a039a7c275207eba4a35e0ad814cf2813
Author: Kohei Yoshida
Date: Mon Jan 7 14:45:00 2013 -0500
Append ODS to the test method name.
Change-Id: I024d142b59ccceed944d641b6306f47dcf03ef9d
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 618e627..df858da 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -170,7 +170,7 @@ public:
void testPivotTableBasicODS();
void testFormulaDependency();
-void testRowHeight();
+void testRowHeightODS();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testRangeNameXLS);
@@ -213,7 +213,7 @@ public:
CPPUNIT_TEST(testCellAnchoredShapesODS);
CPPUNIT_TEST(testPivotTableBasicODS);
-CPPUNIT_TEST(testRowHeight);
+CPPUNIT_TEST(testRowHeightODS);
CPPUNIT_TEST(testFormulaDependency);
//disable testPassword on MacOSX due to problems with libsqlite3
@@ -1574,7 +1574,7 @@ void ScFiltersTest::testPivotTableBasicODS()
xDocSh->DoClose();
}
-void ScFiltersTest::testRowHeight()
+void ScFiltersTest::testRowHeightODS()
{
OUString aFileNameBase("row-height-import.");
OUString aFileExt = OUString::createFromAscii(aFileFormats[ODS].pName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] silence a few WaE: private field 'foo' is not used
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1566
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/1566/1
silence a few WaE: private field 'foo' is not used
Change-Id: I96f5ceda1ae833c5ce58bd846763c003181d55a1
---
M forms/source/component/errorbroadcaster.cxx
M sc/source/filter/oox/stylesbuffer.cxx
M slideshow/source/engine/transitions/fanwipe.cxx
3 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/forms/source/component/errorbroadcaster.cxx
b/forms/source/component/errorbroadcaster.cxx
index 8c8baac..f33cd98 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -45,6 +45,7 @@
//-
OErrorBroadcaster::~OErrorBroadcaster( )
{
+(void) m_rBHelper;
OSL_ENSURE( m_rBHelper.bDisposed || m_rBHelper.bInDispose,
"OErrorBroadcaster::~OErrorBroadcaster: not disposed!" );
// herein, we don't have a chance to do the dispose ourself
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index b7cc8db..9aadf33 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -700,6 +700,7 @@
maUsedFlags( !bDxf ),
mbDxf( bDxf )
{
+(void) mbDxf;
}
Font::Font( const WorkbookHelper& rHelper, const FontModel& rModel ) :
@@ -708,6 +709,7 @@
maUsedFlags( true ),
mbDxf( false )
{
+(void) mbDxf;
}
void Font::importAttribs( sal_Int32 nElement, const AttributeList& rAttribs )
@@ -1675,6 +1677,7 @@
void Border::importDxfBorder( sal_Int32 nElement, SequenceInputStream& rStrm )
{
+(void) mbDxf;
OSL_ENSURE( mbDxf, "Border::importDxfBorder - missing conditional
formatting flag" );
if( BorderLineModel* pBorderLine = getBorderLine( nElement ) )
{
diff --git a/slideshow/source/engine/transitions/fanwipe.cxx
b/slideshow/source/engine/transitions/fanwipe.cxx
index fd3792c..e1f42b7 100644
--- a/slideshow/source/engine/transitions/fanwipe.cxx
+++ b/slideshow/source/engine/transitions/fanwipe.cxx
@@ -51,6 +51,7 @@
}
else
{
+(void) m_fanIn;
OSL_ASSERT( ! m_fanIn );
res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5,
1.0, 0.5, 1.0));
}
--
To view, visit https://gerrit.libreoffice.org/1566
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I96f5ceda1ae833c5ce58bd846763c003181d55a1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matúš Kukan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
UI issue
Two issue with respect to LibreOffice Writer and usability. 1) Insert->Section. When there is more then one section, they are listed in the order created, not linear order with respect to the document. Although in the Navigator view, the sections are ordered linearly. This should look the same I think; preferably linearly. 2) When you are inserting a new section, the naming box has 'Section1' in it. Although I know, if I just accept at that point the name 'Section1' will persist, who does that? Like in Nautilus or any desktop viewing program, a new folder or new document, the name is highlighted so it can be replace easily; typed over. Of course if you don't replace the 'untitled folder', that's the name you get. The point is, I think 'Section1' should be highlighted so it can be typed over. This should be the expected behavior. Thanks for reading my suggestions. Steven Howe ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - canvas/source filter/source offapi/UnoApi_offapi.mk sax/inc sax/source svx/inc svx/source xmloff/inc xmloff/Library_xo.mk xmloff/Package_inc.mk xmloff/source
canvas/source/vcl/canvas.cxx |5 -
canvas/source/vcl/canvasbitmap.cxx | 10 +-
canvas/source/vcl/canvascustomsprite.cxx | 10 +-
canvas/source/vcl/canvasfont.cxx | 10 +-
canvas/source/vcl/spritecanvas.cxx |4
canvas/source/vcl/spritecanvashelper.cxx | 18 +--
canvas/source/vcl/textlayout.cxx | 10 +-
canvas/source/vcl/windowoutdevholder.cxx |3
filter/source/svg/svgreader.cxx | 24
offapi/UnoApi_offapi.mk |2
sax/inc/sax/tools/converter.hxx |7 +
sax/source/tools/converter.cxx | 22
svx/inc/svx/xflgrit.hxx |5 -
svx/source/xoutdev/xattr.cxx | 19 +++
xmloff/Library_xo.mk |1
xmloff/Package_inc.mk|1
xmloff/inc/xmloff/xmlstyle.hxx |5 -
xmloff/inc/xmloff/xmltoken.hxx |7 +
xmloff/source/core/xmltoken.cxx | 11 +-
xmloff/source/style/FillStyleContext.cxx | 151 ++-
xmloff/source/style/FillStyleContext.hxx | 67 +
xmloff/source/style/GradientStyle.cxx| 12 +-
xmloff/source/style/xmlstyle.cxx |5 +
23 files changed, 350 insertions(+), 59 deletions(-)
New commits:
commit 58ae10ed582d845412210042db97a9c47a66a55b
Author: Chr. Rossmanith
Date: Mon Jan 7 19:42:36 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in canvas (WIP)
Change-Id: Id8db06826b77a2b59df51dc0829cd9e7539045fa
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 9cfb73a..4b59cef 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -101,8 +101,7 @@ namespace vclcanvas
OutputDevice* pOutDev = reinterpret_cast(nPtr);
if( !pOutDev )
throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Passed OutDev invalid!")),
+::rtl::OUString( "Passed OutDev invalid!" ),
NULL);
OutDevProviderSharedPtr pOutdevProvider( new OutDevHolder(*pOutDev) );
@@ -134,7 +133,7 @@ namespace vclcanvas
::rtl::OUString SAL_CALL Canvas::getServiceName( ) throw
(::com::sun::star::uno::RuntimeException)
{
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
CANVAS_SERVICE_NAME ) );
+return ::rtl::OUString( CANVAS_SERVICE_NAME );
}
bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf,
diff --git a/canvas/source/vcl/canvasbitmap.cxx
b/canvas/source/vcl/canvasbitmap.cxx
index a943ba6..b941eb1 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.cxx
@@ -74,9 +74,9 @@ namespace vclcanvas
#define IMPLEMENTATION_NAME "VCLCanvas.CanvasBitmap"
#define SERVICE_NAME "com.sun.star.rendering.CanvasBitmap"
-::rtl::OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw
(uno::RuntimeException)
+OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw
(uno::RuntimeException)
{
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
IMPLEMENTATION_NAME ) );
+return OUString( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL CanvasBitmap::supportsService( const ::rtl::OUString&
ServiceName ) throw (uno::RuntimeException)
@@ -84,10 +84,10 @@ namespace vclcanvas
return ServiceName == SERVICE_NAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames(
) throw (uno::RuntimeException)
{
-uno::Sequence< ::rtl::OUString > aRet(1);
-aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME
) );
+uno::Sequence< OUString > aRet(1);
+aRet[0] = OUString( SERVICE_NAME );
return aRet;
}
diff --git a/canvas/source/vcl/canvascustomsprite.cxx
b/canvas/source/vcl/canvascustomsprite.cxx
index f1cb72d..a452212 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -121,9 +121,9 @@ namespace vclcanvas
#define IMPLEMENTATION_NAME "VCLCanvas.CanvasCustomSprite"
#define SERVICE_NAME "com.sun.star.rendering.CanvasCustomSprite"
-::rtl::OUString SAL_CALL CanvasCustomSprite::getImplementationName()
throw( uno::RuntimeException )
+OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw(
uno::RuntimeException )
{
-return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
IMPLEMENTATION_NAME ) );
+return OUString( IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const
::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
@@ -131,10 +131,10 @@ namespace vclcanvas
return ServiceName == SERVICE_NAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
CanvasCustomSprite::getSupport
[Libreoffice-commits] .: solenv/inc
solenv/inc/installationtest.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 0d957d1c10eeb6e0d15cc2fbc56239c1ec40fb6c Author: Petr Mladek Date: Mon Jan 7 18:51:08 2013 +0100 fix install test to work with "LibreOffice" installer name Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index fcfb520..c9ed719 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -97,10 +97,10 @@ my_javaenv = \ .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XX`) $(MISC)/$(TARGET)/installation.flag : $(shell \ -ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip) +ls $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip) $(COMMAND_ECHO)$(MKDIRHIER) $(@:d) -$(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" -$(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibO_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt +$(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" +$(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibreOffice_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - solenv/inc
solenv/inc/installationtest.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 8b30366d1fcb40949f58575599be658f59276871 Author: Petr Mladek Date: Mon Jan 7 18:51:08 2013 +0100 fix install test to work with "LibreOffice" installer name Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index fcfb520..c9ed719 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -97,10 +97,10 @@ my_javaenv = \ .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XX`) $(MISC)/$(TARGET)/installation.flag : $(shell \ -ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip) +ls $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip) $(COMMAND_ECHO)$(MKDIRHIER) $(@:d) -$(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" -$(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibO_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt +$(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" +$(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibreOffice_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/docrecord.py src/globals.py test/doc
src/docrecord.py|5 +++--
src/globals.py |4 ++--
test/doc/escape.doc |binary
test/doc/test.py|5 +
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 660f41190a78a9dc562a1ebebfa27b377d3264e7
Author: Miklos Vajna
Date: Mon Jan 7 18:48:26 2013 +0100
doc: add escape testcase
diff --git a/src/docrecord.py b/src/docrecord.py
index e5f29fe..09e5701 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -31,6 +31,7 @@ class FcCompressed(DOCDirStream):
print ''
def getTransformedValue(self, start, end, logical = True):
+lowLimit = 21 # would be only 20 by default
if self.fCompressed:
offset = self.fc/2
if logical:
@@ -39,7 +40,7 @@ class FcCompressed(DOCDirStream):
else:
fro = start
to = end
-return globals.encodeName(self.mainStream.bytes[fro:to])
+return globals.encodeName(self.mainStream.bytes[fro:to], lowLimit
= lowLimit)
else:
if logical:
offset = self.fc
@@ -48,7 +49,7 @@ class FcCompressed(DOCDirStream):
else:
fro = start
to = end
-return
globals.encodeName(self.mainStream.bytes[fro:to].decode('utf-16'), lowOnly =
True)
+return
globals.encodeName(self.mainStream.bytes[fro:to].decode('utf-16'), lowOnly =
True, lowLimit = lowLimit)
class Pcd(DOCDirStream):
"""The Pcd structure specifies the location of text in the WordDocument
Stream and additional properties for this text."""
diff --git a/src/globals.py b/src/globals.py
index dbb6690..e51a846 100644
--- a/src/globals.py
+++ b/src/globals.py
@@ -151,7 +151,7 @@ def debug (msg):
sys.stderr.write("DEBUG: %s\n"%msg)
-def encodeName (name, lowOnly = False):
+def encodeName (name, lowOnly = False, lowLimit = 20):
"""Encode name that contains unprintable characters."""
n = len(name)
@@ -160,7 +160,7 @@ def encodeName (name, lowOnly = False):
newname = ''
for i in xrange(0, n):
-if ord(name[i]) <= 20 or ((not lowOnly) and ord(name[i]) >= 127):
+if ord(name[i]) <= lowLimit or ((not lowOnly) and ord(name[i]) >= 127):
newname += "\\x%2.2X"%ord(name[i])
else:
newname += name[i]
diff --git a/test/doc/escape.doc b/test/doc/escape.doc
new file mode 100644
index 000..fa609f7
Binary files /dev/null and b/test/doc/escape.doc differ
diff --git a/test/doc/test.py b/test/doc/test.py
index edd39c3..5fe743c 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -128,6 +128,11 @@ class Test(unittest.TestCase):
self.assertEqual('Hello world!',
runs[0].findall('transformed')[0].attrib['value'])
+def test_escape(self):
+# From https://bugs.freedesktop.org/show_bug.cgi?id=59106
+# This first caused unhandled exceptions, then later invalid XML
output.
+self.dump('escape')
+
if __name__ == '__main__':
unittest.main()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/docdirstream.py src/docrecord.py
src/docdirstream.py |6 ++
src/docrecord.py| 14 +++---
2 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 311bac96551070ba0a0d7bf93e2e9776f7ff245b
Author: Miklos Vajna
Date: Mon Jan 7 18:38:32 2013 +0100
doc-dump xml output: quote xml attribute values
diff --git a/src/docdirstream.py b/src/docdirstream.py
index 33d065c..bc89ab1 100644
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -7,6 +7,7 @@
import globals
import struct
+from xml.sax.saxutils import quoteattr
class DOCDirStream:
"""Represents one single word file subdirectory, like e.g.
'WordDocument'."""
@@ -34,6 +35,11 @@ class DOCDirStream:
else:
print '<%s value="%s"%s>' % (key, value, offstr)
+def quoteAttr(self, value):
+"""Wrapper around xml.sax.saxutils.quoteattr, assumes the caller will
put " around the result."""
+ret = quoteattr("'"+value+"'")
+return ret[2:len(ret)-2]
+
def getuInt8(self, bytes = None, pos = None):
if not bytes:
bytes = self.bytes
diff --git a/src/docrecord.py b/src/docrecord.py
index 8d40588..e5f29fe 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -159,7 +159,7 @@ class PlcfBkl(DOCDirStream, PLC):
end = offset + self.getuInt32(pos = pos)
print '' % (i, end)
start = self.mainStream.plcfAtnBkf.aCP[i]
-print '' %
self.mainStream.retrieveText(start, end)
+print '' %
self.quoteAttr(self.mainStream.retrieveText(start, end))
pos += 4
print ''
print ''
@@ -194,7 +194,7 @@ class PlcPcd(DOCDirStream, PLC):
start, end = self.ranges[i]
print '' % (i, start, end)
self.aPcd[i].dump()
-print '' %
self.aPcd[i].fc.getTransformedValue(start, end)
+print '' %
self.quoteAttr(self.aPcd[i].fc.getTransformedValue(start, end))
print ''
print ''
@@ -254,7 +254,7 @@ class PlcfSed(DOCDirStream, PLC):
aSed = Sed(self, self.getOffset(self.pos, i))
aSed.dump()
-print '' %
self.mainStream.retrieveText(start, end, logical = True)
+print '' %
self.quoteAttr(self.mainStream.retrieveText(start, end, logical = True))
print ''
print ''
@@ -563,7 +563,7 @@ class ChpxFkp(DOCDirStream):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print '' % (i, start, end)
-print '' %
self.pnFkpChpx.mainStream.retrieveText(start, end)
+print '' %
self.quoteAttr(self.pnFkpChpx.mainStream.retrieveText(start, end))
pos += 4
# rgbx
@@ -592,7 +592,7 @@ class PapxFkp(DOCDirStream):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print '' % (i, start, end)
-print '' %
self.mainStream.retrieveText(start, end)
+print '' %
self.quoteAttr(self.mainStream.retrieveText(start, end))
pos += 4
# rgbx
@@ -707,7 +707,7 @@ class PlcfandTxt(DOCDirStream, PLC):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print '' % (i, start, end)
-print '' %
self.mainStream.retrieveText(offset + start, offset + end)
+print '' %
self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end))
pos += 4
print ''
print ''
@@ -727,7 +727,7 @@ class PlcfandRef(DOCDirStream, PLC):
for i in range(self.getElements()):
start = offset + self.getuInt32(pos = pos)
print '' % (i, start)
-print '' %
self.mainStream.retrieveText(start, start + 1)
+print '' %
self.quoteAttr(self.mainStream.retrieveText(start, start + 1))
pos += 4
# aATRDPre10
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Thu, 2012-12-13 at 17:16 +, Michael Meeks wrote: > * 4.0 pending tasks > + MSI file re-name to be renamed for 4.0 LibreOffice > + also rename the Linux download tar-balls (Fridrich) > + and Mac packages. > + causes some pain for download scripts (Thorsten) > + getting installer up on download list, other > shuffling is painful > + LibO not a great truncation - branding-wise. I have pushed this change to master and 4.0 branch: http://cgit.freedesktop.org/libreoffice/core/commit/?id=44cd995f02d2b46e5b0bfb3cbd743a366d4284f7 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0&id=6be476c04c48ff081f595b28e1eb51c94e382bb6 Note that I used "LibreOffice" only for the release builds. "LibO-Dev" is still used for daily builds and betas because I am not brave enough to break uploading daily builds at this stage. Well, it would be great to do it soon. Note that the fix for the tinderbox scripts is already pushed, see http://cgit.freedesktop.org/libreoffice/contrib/buildbot/commit/?id=fd17b6be133056f618a32964f216c73cd7af1906 Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: instsetoo_native/util solenv/bin
instsetoo_native/util/openoffice.lst |8
solenv/bin/modules/installer/download.pm | 10 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 44cd995f02d2b46e5b0bfb3cbd743a366d4284f7
Author: Petr Mladek
Date: Mon Jan 7 17:43:53 2013 +0100
use "LibreOffice" instead of "LibO" for final download file names
"LibreOffice" is the name of the product and we should promote it.
This change has been proposed on the ESC call.
Change-Id: I755ea5b2ec7b6357a7fd2c86ec8479737696042b
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 487f460..94197bf 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -85,9 +85,9 @@ LibreOffice
active 1
compression 5
script setup_osl
-downloadnameLibO_{productversion}_{os}_install_{languages}
-langpackdownloadname
LibO_{productversion}_languagepack_{os}_install_{languages}
-helppackdownloadname
LibO_{productversion}_helppack_{os}_install_{languages}
+downloadnameLibreOffice_{productversion}_{os}_install_{languages}
+langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
+helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -191,7 +191,7 @@ LibreOffice_SDK
{
Settings
{
-downloadname LibO-SDK_{packageversion}_{os}_install_{languages}
+downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LibreOffice
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 07308c5..97d29a8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -314,21 +314,21 @@ sub get_downloadname_productname
{
my ($allvariables) = @_;
-my $start = "LibO";
+my $start = "LibreOffice";
-if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
+if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start =
"LibreOffice"; }
if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; }
-if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
+if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start =
"LibreOffice-SDK"; }
if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
-if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Test"; }
+if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start =
"LibreOffice-Test"; }
if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start =
"LibO-Dev-Test"; }
-if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
+if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start =
"LibreOffice-URE"; }
if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP";
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: No test on the return of pOleObject->Close in embedserv/source/inprocserv/inprocembobj.cxx
On 12/22/2012 12:12 AM, julien2412 wrote:
Cppcheck reported this:
[source/inprocserv/inprocembobj.cxx:783] ->
[source/inprocserv/inprocembobj.cxx:784]: (performance) Variable 'hr' is
reassigned a value before the old one has been used
Here are the lines:
778 HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject,
(void**)&pOleObject );
779
780 ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance
problem
781 if ( SUCCEEDED( hr ) && pOleObject )
782 {
783 hr = pOleObject->Close( dwSaveOption );
784 hr = CoDisconnectObject(
(IUnknown*)(IPersistStorage*)this, 0 );
785 }
(see
http://opengrok.libreoffice.org/xref/core/embedserv/source/inprocserv/inprocembobj.cxx#778)
Moreover, the result of CoDisconnectObject isn't tested too.
I thought about adding after 783 and 784 (so after both lines) this:
if( !SUCCEEDED( hr ) ) return hr;
What do you think?
I really know zero about this, but I would /assume/ that (a) one wants
to indeed call CoDisconnectObject even if pOleObject->Close fails, and
(b) the return value of InprocEmbedDocument_Impl::Close should reflect
any failures returned from pOleObject->Close and CoDisconnectObject.
Something like
HRESULT ret = S_OK;
if ( m_pDefHandler ...
...
hr = pOleObject->Close(...);
if (!SUCCEEDED(hr))
ret = hr;
hr = CoDisconnectObject(...);
if (!(SUCCEEDED(hr) && SUCCEEDED(ret)))
ret = hr;
}
...
return ret;
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/qa
sc/qa/unit/ucalc.cxx | 178 +++
1 file changed, 178 insertions(+)
New commits:
commit 6f3bdadf1d37fb02a2ab42ca3d59ef51a1ae15d6
Author: Kohei Yoshida
Date: Mon Jan 7 11:49:01 2013 -0500
New test for pivot table with field references.
Change-Id: I65d932d6c258b965a6084acb07298387b7274215
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6a8af5d..d9d643f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -80,6 +80,9 @@
#include
#include
+#include
+#include
+#include
#include
#include
@@ -195,6 +198,12 @@ public:
*/
void testPivotTableNumStability();
+/**
+ * Test for pivot table that include field with various non-default field
+ * refrences.
+ */
+void testPivotTableFieldReference();
+
void testSheetCopy();
void testSheetMove();
void testExternalRef();
@@ -277,6 +286,7 @@ public:
CPPUNIT_TEST(testPivotTableTextNumber);
CPPUNIT_TEST(testPivotTableCaseInsensitiveStrings);
CPPUNIT_TEST(testPivotTableNumStability);
+CPPUNIT_TEST(testPivotTableFieldReference);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -3400,6 +3410,174 @@ void Test::testPivotTableNumStability()
m_pDoc->DeleteTab(0);
}
+void Test::testPivotTableFieldReference()
+{
+m_pDoc->InsertTab(0, OUString("Data"));
+m_pDoc->InsertTab(1, OUString("Table"));
+
+// Raw data
+const char* aData[][2] = {
+{ "Name", "Value" },
+{ "A", "1" },
+{ "B", "2" },
+{ "C", "4" },
+{ "D", "8" },
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ "Name", sheet::DataPilotFieldOrientation_ROW, 0 },
+{ "Value", sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+};
+
+ScAddress aPos(1,1,0);
+ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position",
aDataRange.aStart == aPos);
+
+ScDPObject* pDPObj = createDPFromRange(
+m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false);
+
+ScDPCollection* pDPs = m_pDoc->GetDPCollection();
+bool bSuccess = pDPs->InsertNewTable(pDPObj);
+
+CPPUNIT_ASSERT_MESSAGE("failed to insert a new pivot table object into
document.", bSuccess);
+CPPUNIT_ASSERT_MESSAGE("there should be only one data pilot table.",
+ pDPs->GetCount() == 1);
+pDPObj->SetName(pDPs->CreateNewName());
+
+ScRange aOutRange = refresh(pDPObj);
+
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", "1" },
+{ "B", "2" },
+{ "C", "4" },
+{ "D", "8" },
+{ "Total Result", "15" },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck,
"Field reference (none)");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+ScDPSaveData aSaveData = *pDPObj->GetSaveData();
+sheet::DataPilotFieldReference aFieldRef;
+aFieldRef.ReferenceType =
sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE;
+aFieldRef.ReferenceField = "Name";
+aFieldRef.ReferenceItemType =
sheet::DataPilotFieldReferenceItemType::NAMED;
+aFieldRef.ReferenceItemName = "A";
+ScDPSaveDimension* pDim = aSaveData.GetDimensionByName("Value");
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve dimension 'Value'.", pDim);
+pDim->SetReferenceValue(&aFieldRef);
+pDPObj->SetSaveData(aSaveData);
+
+aOutRange = refresh(pDPObj);
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", 0 },
+{ "B", "1" },
+{ "C", "3" },
+{ "D", "7" },
+{ "Total Result", 0 },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck,
"Field reference (difference from)");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+aFieldRef.ReferenceType =
sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE;
+pDim->SetReferenceValue(&aFieldRef);
+pDPObj->SetSaveData(aSaveData);
+
+aOutRange = refresh(pDPObj);
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", "100.00%" },
+{ "B", "200.00%" },
+{ "C", "400.00%" },
+{ "D", "800.00%" },
+{ "Total Result", 0 },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck,
"Field reference (% of)");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+aFieldRef.ReferenceType =
sheet::DataPilotFieldReference
[Libreoffice-commits] .: 2 commits - src/docrecord.py src/docsprm.py
src/docrecord.py | 12 +++-
src/docsprm.py | 15 +++
2 files changed, 22 insertions(+), 5 deletions(-)
New commits:
commit 1b6338ee50aaba77da82e1eacec81690421348ea
Author: Miklos Vajna
Date: Mon Jan 7 17:53:33 2013 +0100
even the size of variable SPRMs is known in most cases
diff --git a/src/docrecord.py b/src/docrecord.py
index e487cc0..8d40588 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -456,11 +456,12 @@ class Sprm(DOCDirStream):
def getOperandSize(self):
if self.spra == 6: # variable
-if self.sprm == 0xd634:
-return 7
-elif self.sprm in [0xd234, 0xd235, 0xd236, 0xd237]: # sprmSBrcTop
/ Left / Bottom / Right
-return 9
-raise Exception()
+if self.sprm not in [0xD608, 0xC615]: # sprmTDefTable, sprmPChgTabs
+# these structures are prefixed with their size
+return self.getuInt8() + 1
+elif self.sprm == 0xD608:
+return self.getuInt16() + 1
+raise Exception("No idea what is the size of SPRM %s" %
hex(self.sprm))
return self.operandSizeMap[self.spra]
class Prl(DOCDirStream):
commit 9e13db1dbb0b57dc50700b889ad6cd1d59d42fd4
Author: Miklos Vajna
Date: Mon Jan 7 17:53:28 2013 +0100
add picture sprms
diff --git a/src/docrecord.py b/src/docrecord.py
index 7e31afe..e487cc0 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -436,6 +436,7 @@ class Sprm(DOCDirStream):
nameMap = {
1: docsprm.parMap,
2: docsprm.chrMap,
+3: docsprm.picMap,
4: docsprm.secMap,
5: docsprm.tblMap,
}
diff --git a/src/docsprm.py b/src/docsprm.py
index fcd01de..5dbffc6 100644
--- a/src/docsprm.py
+++ b/src/docsprm.py
@@ -5,6 +5,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+# see 2.6.5 of the spec
+picMap = {
+0x6C02: "sprmPicBrcTop80",
+0x6C03: "sprmPicBrcLeft80",
+0x6C04: "sprmPicBrcBottom80",
+0x6C05: "sprmPicBrcRight80",
+0xCE08: "sprmPicBrcTop",
+0xCE09: "sprmPicBrcLeft",
+0xCE0A: "sprmPicBrcBottom",
+0xCE0B: "sprmPicBrcRight",
+}
+
# see 2.6.4 of the spec
secMap = {
0x3000: "sprmScnsPgn",
@@ -155,6 +167,7 @@ tblMap = {
# see 2.6.2 of the spec
parMap = {
0x4600: "sprmPIstd",
+0x6654: "sprmPAnldCv",
0xC601: "sprmPIstdPermute",
0x2602: "sprmPIncLvl",
0x2403: "sprmPJc80",
@@ -213,6 +226,7 @@ parMap = {
0x664A: "sprmPDtap",
0x244B: "sprmPFInnerTableCell",
0x244C: "sprmPFInnerTtp",
+0xC63E: "sprmPAnld80",
0xC64D: "sprmPShd",
0xC64E: "sprmPBrcTop",
0xC64F: "sprmPBrcLeft",
@@ -312,6 +326,7 @@ chrMap = {
0x4866: "sprmCShd80",
0x4867: "sprmCIdslRMarkDel",
0x0868: "sprmCFUsePgsuSettings",
+0x486B: "sprmCCpg",
0x486D: "sprmCRgLid0_80",
0x486E: "sprmCRgLid1_80",
0x286F: "sprmCIdctHint",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 178 +++
1 file changed, 178 insertions(+)
New commits:
commit 40ce68b3318b2c9205a5e58ced9a7e733951594d
Author: Kohei Yoshida
Date: Mon Jan 7 11:49:01 2013 -0500
New test for pivot table with field references.
Change-Id: I65d932d6c258b965a6084acb07298387b7274215
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6a8af5d..d9d643f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -80,6 +80,9 @@
#include
#include
+#include
+#include
+#include
#include
#include
@@ -195,6 +198,12 @@ public:
*/
void testPivotTableNumStability();
+/**
+ * Test for pivot table that include field with various non-default field
+ * refrences.
+ */
+void testPivotTableFieldReference();
+
void testSheetCopy();
void testSheetMove();
void testExternalRef();
@@ -277,6 +286,7 @@ public:
CPPUNIT_TEST(testPivotTableTextNumber);
CPPUNIT_TEST(testPivotTableCaseInsensitiveStrings);
CPPUNIT_TEST(testPivotTableNumStability);
+CPPUNIT_TEST(testPivotTableFieldReference);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -3400,6 +3410,174 @@ void Test::testPivotTableNumStability()
m_pDoc->DeleteTab(0);
}
+void Test::testPivotTableFieldReference()
+{
+m_pDoc->InsertTab(0, OUString("Data"));
+m_pDoc->InsertTab(1, OUString("Table"));
+
+// Raw data
+const char* aData[][2] = {
+{ "Name", "Value" },
+{ "A", "1" },
+{ "B", "2" },
+{ "C", "4" },
+{ "D", "8" },
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ "Name", sheet::DataPilotFieldOrientation_ROW, 0 },
+{ "Value", sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+};
+
+ScAddress aPos(1,1,0);
+ScRange aDataRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT_MESSAGE("failed to insert range data at correct position",
aDataRange.aStart == aPos);
+
+ScDPObject* pDPObj = createDPFromRange(
+m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false);
+
+ScDPCollection* pDPs = m_pDoc->GetDPCollection();
+bool bSuccess = pDPs->InsertNewTable(pDPObj);
+
+CPPUNIT_ASSERT_MESSAGE("failed to insert a new pivot table object into
document.", bSuccess);
+CPPUNIT_ASSERT_MESSAGE("there should be only one data pilot table.",
+ pDPs->GetCount() == 1);
+pDPObj->SetName(pDPs->CreateNewName());
+
+ScRange aOutRange = refresh(pDPObj);
+
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", "1" },
+{ "B", "2" },
+{ "C", "4" },
+{ "D", "8" },
+{ "Total Result", "15" },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck,
"Field reference (none)");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+ScDPSaveData aSaveData = *pDPObj->GetSaveData();
+sheet::DataPilotFieldReference aFieldRef;
+aFieldRef.ReferenceType =
sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE;
+aFieldRef.ReferenceField = "Name";
+aFieldRef.ReferenceItemType =
sheet::DataPilotFieldReferenceItemType::NAMED;
+aFieldRef.ReferenceItemName = "A";
+ScDPSaveDimension* pDim = aSaveData.GetDimensionByName("Value");
+CPPUNIT_ASSERT_MESSAGE("Failed to retrieve dimension 'Value'.", pDim);
+pDim->SetReferenceValue(&aFieldRef);
+pDPObj->SetSaveData(aSaveData);
+
+aOutRange = refresh(pDPObj);
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", 0 },
+{ "B", "1" },
+{ "C", "3" },
+{ "D", "7" },
+{ "Total Result", 0 },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck,
"Field reference (difference from)");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+aFieldRef.ReferenceType =
sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE;
+pDim->SetReferenceValue(&aFieldRef);
+pDPObj->SetSaveData(aSaveData);
+
+aOutRange = refresh(pDPObj);
+{
+// Expected output table content. 0 = empty cell
+const char* aOutputCheck[][2] = {
+{ "Name", 0 },
+{ "A", "100.00%" },
+{ "B", "200.00%" },
+{ "C", "400.00%" },
+{ "D", "800.00%" },
+{ "Total Result", 0 },
+};
+
+bSuccess = checkDPTableOutput<2>(m_pDoc, aOutRange, aOutputCheck,
"Field reference (% of)");
+CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
+}
+
+aFieldRef.ReferenceType =
sheet::DataPilotFieldReference
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - instsetoo_native/util solenv/bin
instsetoo_native/util/openoffice.lst |8
solenv/bin/modules/installer/download.pm | 10 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 6be476c04c48ff081f595b28e1eb51c94e382bb6
Author: Petr Mladek
Date: Mon Jan 7 17:43:53 2013 +0100
use "LibreOffice" instead of "LibO" for final download file names
"LibreOffice" is the name of the product and we should promote it.
This change has been proposed on the ESC call.
Change-Id: I755ea5b2ec7b6357a7fd2c86ec8479737696042b
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 677e1b6..5cbff0a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -85,9 +85,9 @@ LibreOffice
active 1
compression 5
script setup_osl
-downloadnameLibO_{productversion}_{os}_install_{languages}
-langpackdownloadname
LibO_{productversion}_languagepack_{os}_install_{languages}
-helppackdownloadname
LibO_{productversion}_helppack_{os}_install_{languages}
+downloadnameLibreOffice_{productversion}_{os}_install_{languages}
+langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
+helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -191,7 +191,7 @@ LibreOffice_SDK
{
Settings
{
-downloadname LibO-SDK_{packageversion}_{os}_install_{languages}
+downloadname LibreOffice-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LibreOffice
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 07308c5..97d29a8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -314,21 +314,21 @@ sub get_downloadname_productname
{
my ($allvariables) = @_;
-my $start = "LibO";
+my $start = "LibreOffice";
-if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; }
+if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start =
"LibreOffice"; }
if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; }
-if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; }
+if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start =
"LibreOffice-SDK"; }
if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; }
-if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Test"; }
+if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start =
"LibreOffice-Test"; }
if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start =
"LibO-Dev-Test"; }
-if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; }
+if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start =
"LibreOffice-URE"; }
if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP";
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change public variables of class ImplDevFontAttributes to pr...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1565
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/1565/1
Change public variables of class ImplDevFontAttributes to private.
Change-Id: I256a1ca329f715270ba31261b16858341c91fc26
---
M vcl/generic/glyphs/gcach_ftyp.cxx
M vcl/generic/print/genpspgraphics.cxx
M vcl/headless/svptext.cxx
M vcl/inc/outfont.hxx
M vcl/source/gdi/outdev3.cxx
M vcl/source/gdi/pdfwriter_impl.cxx
M vcl/unx/generic/gdi/salgdi3.cxx
7 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index de44e31..591fd46 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -315,12 +315,12 @@
mpExtraKernInfo( pExtraKernInfo )
{
// prefer font with low ID
-maDevFontAttributes.mnQuality += 1 - nFontId;
+maDevFontAttributes.SetQuality( maDevFontAttributes.GetQuality() + (1
- nFontId) );
// prefer font with matching file names
-maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost();
+maDevFontAttributes.SetQuality( maDevFontAttributes.GetQuality() +
mpFontFile->GetLangBoost() );
// prefer font with more external info
if( pExtraKernInfo )
-maDevFontAttributes.mnQuality += 100;
+maDevFontAttributes.SetQuality( maDevFontAttributes.GetQuality() + 100
);
}
// ---
@@ -619,8 +619,8 @@
: PhysicalFontFace( rDFA, IFTSFONT_MAGIC ),
mpFtFontInfo( pFI )
{
-mbDevice= false;
-mbOrientation = true;
+SetDevice( false );
+SetRotatable( true );
}
// ---
diff --git a/vcl/generic/print/genpspgraphics.cxx
b/vcl/generic/print/genpspgraphics.cxx
index 7b2ce32..1b5d592 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -932,7 +932,7 @@
{
ImplDevFontAttributes aDFA = Info2DevFontAttributes( aInfo );
static_cast(*pMetric) = aDFA;
-pMetric->mbDevice = aDFA.mbDevice;
+pMetric->mbDevice = aDFA.IsDeviceFont();
pMetric->mbScalableFont = true;
pMetric->mnOrientation = m_pPrinterGfx->GetFontAngle();
@@ -1132,42 +1132,43 @@
aDFA.SetWidthType( rInfo.m_eWidth );
aDFA.SetPitch( rInfo.m_ePitch );
aDFA.SetSymbolFlag( (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL) );
-aDFA.mbSubsettable = rInfo.m_bSubsettable;
-aDFA.mbEmbeddable = rInfo.m_bEmbeddable;
+aDFA.SetSubsettable( rInfo.m_bSubsettable );
+aDFA.SetEmbeddable( rInfo.m_bEmbeddable );
switch( rInfo.m_eType )
{
case psp::fonttype::Builtin:
-aDFA.mnQuality = 1024;
-aDFA.mbDevice= true;
+aDFA.SetQuality( 1024 );
+aDFA.SetDevice( true );
break;
case psp::fonttype::TrueType:
-aDFA.mnQuality = 512;
-aDFA.mbDevice= false;
+aDFA.SetQuality( 512 );
+aDFA.SetDevice( false );
break;
case psp::fonttype::Type1:
-aDFA.mnQuality = 0;
-aDFA.mbDevice= false;
+aDFA.SetQuality( 0 );
+aDFA.SetDevice( false );
break;
default:
-aDFA.mnQuality = 0;
-aDFA.mbDevice= false;
+aDFA.SetQuality( 0 );
+aDFA.SetDevice( false );
break;
}
-aDFA.mbOrientation = true;
+aDFA.SetRotatable( true );
// add font family name aliases
+String sMapNames = aDFA.GetAliasNames();
::std::list< OUString >::const_iterator it = rInfo.m_aAliases.begin();
bool bHasMapNames = false;
for(; it != rInfo.m_aAliases.end(); ++it )
{
if( bHasMapNames )
-aDFA.maMapNames.Append( ';' );
-aDFA.maMapNames.Append( (*it).getStr() );
-bHasMapNames = true;
+sMapNames.Append( ';' );
+sMapNames.Append( (*it).getStr() );
+bHasMapNames = true;
}
-
+aDFA.SetMapNames( sMapNames );
#if OSL_DEBUG_LEVEL > 2
if( bHasMapNames )
{
@@ -1232,7 +1233,8 @@
}
ImplPspFontData* pFD = new ImplPspFontData( aInfo );
-pFD->mnQuality += nQuality;
+nQuality += pFD->GetQuality();
+pFD->SetQuality( nQuality );
pFontList->Add( pFD );
}
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 834f6a0..327f356 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -339,7 +339,7 @@
// inform GlyphCache about this font provided by the PsPrint subsystem
ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes(
aInfo );
-aDFA.mnQuality += 4096;
+aDFA.SetQuality( aDFA.GetQuality() + 4096 );
const rtl::OString& rFileN
[PUSHED] Added Autotext widget ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1383 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1383 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8b06549f8b75118b3818d255196ede0419fc9e1f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s Gerrit-Reviewer: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/uiconfig sw/UI_swriter.mk
sw/UI_swriter.mk |2 sw/uiconfig/swriter/ui/autotext.ui | 353 +++ sw/uiconfig/swriter/ui/editcategories.ui | 235 3 files changed, 590 insertions(+) New commits: commit 8a77d4c1a9e72e54651256132250381d63d9f201 Author: Gokul Date: Mon Dec 17 13:41:35 2012 +0300 Added Autotext widget ui Change-Id: I8b06549f8b75118b3818d255196ede0419fc9e1f Reviewed-on: https://gerrit.libreoffice.org/1383 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk index 0e131a0..d24053c 100644 --- a/sw/UI_swriter.mk +++ b/sw/UI_swriter.mk @@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,modules/swriter)) $(eval $(call gb_UI_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/autoformattable \ + sw/uiconfig/swriter/ui/autotext \ sw/uiconfig/swriter/ui/bibliographyentry \ sw/uiconfig/swriter/ui/bulletsandnumbering \ sw/uiconfig/swriter/ui/captionoptions \ @@ -20,6 +21,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/columnwidth \ sw/uiconfig/swriter/ui/converttexttable \ sw/uiconfig/swriter/ui/endnotepage \ + sw/uiconfig/swriter/ui/editcategories \ sw/uiconfig/swriter/ui/footnotepage \ sw/uiconfig/swriter/ui/indexentry \ sw/uiconfig/swriter/ui/insertbookmark \ diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui new file mode 100644 index 000..ba33858 --- /dev/null +++ b/sw/uiconfig/swriter/ui/autotext.ui @@ -0,0 +1,353 @@ + + + + +False + + +True +False +2 +2 +5 +3 +4 + + +True +False +20 +10 + + +True +False +0 +none + + +True +False +12 + + +True +False + + +File System +False +True +True +False +False +0 +True + + +0 +0 +1 +1 + + + + +Internet +False +True +True +False +False +0 +True + + +1 +0 +1 +1 + + + + + + + + +True +False +Save links relative to + + + + + + + +0 +1 +1 +1 + + + + +Show preview +False +True +True +False +False +0 +True + + +1 +1 +1 +1 + + + + +True +False + + +1 +0 +1 +1 + + + + +True +False +25 +15 + + +Display remainder of name as suggestion while typing +False +True +True +False +False +0 +True + + +0 +0 +1 +1 + + + + +
[Libreoffice-commits] .: nss/prj
nss/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddb4d8dff3ab92ed651442540756736b9d0ace46 Author: Tor Lillqvist Date: Mon Jan 7 18:10:04 2013 +0200 Revert "Depend on python3 (for Windows, but shouldn't hurt elsewhere I hope)" Seems to cause even weirder problems in the tinderboxes. This reverts commit e855dfbc3eb5a97ab57743a28b14555fd4b3375f. diff --git a/nss/prj/build.lst b/nss/prj/build.lst index b5f776f..9c4caa1 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,2 +1,2 @@ -ns nss : solenv soltools PYTHON:python3 NULL +ns nss : solenv soltools NULL ns nss\prj nmake - all ns_nss NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/cppu.py | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit c2fe5679e9eb8c3a18b286bbd8b85a6a17fe6858
Author: Stephan Bergmann
Date: Mon Jan 7 16:59:26 2013 +0100
Avoid infinite recursion in -gdb.py printers
...when printing the pThread argument in a
cppu_threadpool::ThreadPool::waitInPool call frame.
Change-Id: I5c94485a0218be449c9dab67701a634eef3e08a1
diff --git a/solenv/gdb/libreoffice/cppu.py b/solenv/gdb/libreoffice/cppu.py
index 1e3b25e..8db684a 100644
--- a/solenv/gdb/libreoffice/cppu.py
+++ b/solenv/gdb/libreoffice/cppu.py
@@ -143,6 +143,16 @@ class UnoTypePrinter(object):
else:
return "invalid %s" % self.typename
+class CppuThreadpoolThreadPoolPrinter(object):
+'''Prints cppu_threadpool::ThreadPool objects (a hack to avoid infinite
recursion through sal.RtlReferencePrinter when printing an
rtl::Reference whose
std::list m_lstThreads member, via
rtl::Reference thread member, via
rtl::Reference m_aThreadPool member, has a
circular reference back)'''
+
+def __init__(self, typename, value):
+self.typename = typename
+self.value = value
+
+def to_string(self):
+return '%s@%s' % (self.typename, self.value.address)
+
printer = None
def build_pretty_printers():
@@ -156,6 +166,7 @@ def build_pretty_printers():
printer.add('com::sun::star::uno::Reference', UnoReferencePrinter)
printer.add('com::sun::star::uno::Sequence', UnoSequencePrinter)
printer.add('com::sun::star::uno::Type', UnoTypePrinter)
+printer.add('cppu_threadpool::ThreadPool', CppuThreadpoolThreadPoolPrinter)
def register_pretty_printers(obj):
printing.register_pretty_printer(printer, obj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - basic/source desktop/source
basic/source/runtime/methods.cxx |6 +-
desktop/source/app/cmdlineargs.cxx |9 +
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit ccd30d3bb395fd367d8b687fc2b3b13641c8d846
Author: Christopher Copits
Date: Tue Jan 1 16:29:32 2013 -0500
fdo#53521 Crash when running BASIC's "shell()" with a non-existent program
The problem is that the process handle is freed regardless of whether
osl_executeProcess was successful or not. Therefore, a segmentation fault would
result, as a random memory address would be freed. This patch checks whether
osl_executeProcess was successful. If it was, then it frees the handle; if it
wasn't successful, the memory is not freed.
Change-Id: Ic3af07be06e7af7730a3bcb1680c659a88b66af3
Reviewed-on: https://gerrit.libreoffice.org/1530
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit dbfc8777bf73872d1b96f956b9e778d9099d52b3)
(cherry picked from commit 96b985145b3efbaf4552adbeccf24bfac2fa71b0)
Signed-off-by: Michael Stahl
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d54c506..fbf6883 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3294,7 +3294,11 @@ RTLFUNC(Shell)
NULL, 0,
&pApp ) == osl_Process_E_None;
-osl_freeProcessHandle( pApp );
+// 53521 only free process handle on success
+if (bSucc)
+{
+osl_freeProcessHandle( pApp );
+}
for(int j = 0; i < nParamCount; i++)
{
commit 80984766863c12009415e28b7d7e8a9fe9255546
Author: Aurimas Fišeras
Date: Sun Dec 16 13:41:31 2012 +0200
fdo#57203 Unknown option: -Embedding
Ignore this option on Windows.
This work-arounds a regression introduced by f4a4ba9ac
Windows appends -Embedding when LibreOffice is called by COM+
Before f4a4ba9ac this option was silently ignored.
Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5
Reviewed-on: https://gerrit.libreoffice.org/1514
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69)
Conflicts:
desktop/source/app/cmdlineargs.cxx
(cherry picked from commit abf0ed8400d7787fec906b21de74698936d40e28)
Signed-off-by: Michael Stahl
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 51bdad0..28f8054 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -520,6 +520,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const
::rtl::OUString& aArg
return true;
}
#endif
+#ifdef WIN32
+/* fdo#57203 ignore -Embedding on Windows
+ when LibreOffice is launched by COM+
+ */
+else if ( oArg == "Embedding" )
+{
+return true;
+}
+#endif
else if (
oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
{
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 6 commits - basic/source desktop/source officecfg/registry svx/source sw/source
basic/source/runtime/methods.cxx |6 +-
desktop/source/app/cmdlineargs.cxx |9 +
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |2 +-
svx/source/svdraw/svdedxv.cxx |2 +-
svx/source/table/tablecontroller.cxx |2 +-
svx/source/table/tablemodel.cxx|2 +-
sw/source/ui/shells/textsh1.cxx|2 +-
7 files changed, 19 insertions(+), 6 deletions(-)
New commits:
commit b1670e2ebe56209f94b84443e1f79c1460f06320
Author: jorendc
Date: Mon Jan 7 14:35:51 2013 +0100
typo fix
Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae
Reviewed-on: https://gerrit.libreoffice.org/1563
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 2001cb9db7e1d13e8bd142fa99c51aa5f96174f2)
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 4d11e48..50f76cf 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -259,7 +259,7 @@
I10N SHORTCUTS
- NO TRANSLATE
- .uno.SearchDialog
+ .uno:SearchDialog
commit 5e13f102b85253d44325f976b3717cae79232875
Author: K_Karthikeyan
Date: Mon Jan 7 13:56:08 2013 +0300
Bugfix for improper function call, column count was compared with row count
Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
Reviewed-on: https://gerrit.libreoffice.org/1562
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 5350075ad5f589c242ec40f9f6ab7fe822a5)
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 46b1c9a..93ebc58 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1116,7 +1116,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow,
sal_Int32 nColSpan, sal_
const sal_Int32 nLastRow = nRow + nRowSpan;
const sal_Int32 nLastCol = nCol + nColSpan;
-if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) )
+if( (nLastRow > getRowCount()) || (nLastCol > getColumnCount() ) )
{
OSL_FAIL("TableModel::merge(), merge beyound the table!");
}
commit 96b985145b3efbaf4552adbeccf24bfac2fa71b0
Author: Christopher Copits
Date: Tue Jan 1 16:29:32 2013 -0500
fdo#53521 Crash when running BASIC's "shell()" with a non-existent program
The problem is that the process handle is freed regardless of whether
osl_executeProcess was successful or not. Therefore, a segmentation fault would
result, as a random memory address would be freed. This patch checks whether
osl_executeProcess was successful. If it was, then it frees the handle; if it
wasn't successful, the memory is not freed.
Change-Id: Ic3af07be06e7af7730a3bcb1680c659a88b66af3
Reviewed-on: https://gerrit.libreoffice.org/1530
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit dbfc8777bf73872d1b96f956b9e778d9099d52b3)
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6c17234..e09f447 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3527,7 +3527,11 @@ RTLFUNC(Shell)
NULL, 0,
&pApp ) == osl_Process_E_None;
-osl_freeProcessHandle( pApp );
+// 53521 only free process handle on success
+if (bSucc)
+{
+osl_freeProcessHandle( pApp );
+}
for(int j = 0; i < nParamCount; i++)
{
commit 02369ca82db8326058d38403c91185fdeb7311d8
Author: Werner Koerner
Date: Sat Dec 29 13:24:20 2012 +0100
Fix wrong bracketing
Wrong bracketing, item is put at a which-id of sal_false.
Change-Id: Ic4216519d74de75690b21a3efa5083e79aa5b83d
Reviewed-on: https://gerrit.libreoffice.org/1498
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 06bdc1e3ae8e93154dc9b9487691b547348c8634)
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1124d51..c351e38 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1426,7 +1426,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case FN_GLOSSARY_DLG:
{
-rSet.Put(SfxBoolItem(nWhich), sal_True);
+rSet.Put( SfxBoolItem( nWhich, sal_True ) );
}
break;
commit abf0ed8400d7787fec906b21de74698936d40e28
Author: Aurimas Fišeras
Date: Sun Dec 16 13:41:31 2012 +0200
fdo#57203 Unknown option: -Embedding
Ignore this option on Windows.
This work-arounds a regression introduced by f4a
Re: Master Build Failure in Python3 on Mac OSX with SDK 10.6 and XCode 4.5.2
Le 07/01/13 14:35, Alexander Thurgood a écrit : > I'm going to copy the XCode xcrun to /usr/bin and see if that makes a > difference, I've just noticed there's a difference in the dates of my > xcrun in /usr/bin and the one supplied with Xcode 4.5.2. > OK, so the copying of xcrun to /usr/bin got rid of my python3 build error, the build then fails later on in tail_build with a segfault sig 11... Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: nss/prj
nss/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e855dfbc3eb5a97ab57743a28b14555fd4b3375f Author: Tor Lillqvist Date: Mon Jan 7 17:23:52 2013 +0200 Depend on python3 (for Windows, but shouldn't hurt elsewhere I hope) Change-Id: I52a3b02ff477ae52abc298d96770755ebc392d57 diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 9c4caa1..b5f776f 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,2 +1,2 @@ -ns nss : solenv soltools NULL +ns nss : solenv soltools PYTHON:python3 NULL ns nss\prj nmake - all ns_nss NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dictionaries/pt_PT
dictionaries/pt_PT/description.xml |2 dictionaries/pt_PT/pt_PT.dic | 258 - 2 files changed, 144 insertions(+), 116 deletions(-) New commits: commit 9bdaa65359ed05bb860b3e0de4b61370a557dc77 Author: Andras Timar Date: Mon Jan 7 16:15:12 2013 +0100 Update pt-PT dictionary Change-Id: Ifb8926b8a4394cab2006ce7d9bf89f8a1b322ff9 diff --git a/dictionaries/pt_PT/description.xml b/dictionaries/pt_PT/description.xml index 18b5238..39fbbf6 100644 --- a/dictionaries/pt_PT/description.xml +++ b/dictionaries/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + diff --git a/dictionaries/pt_PT/pt_PT.dic b/dictionaries/pt_PT/pt_PT.dic index 4ca5141..15e58e2 100644 --- a/dictionaries/pt_PT/pt_PT.dic +++ b/dictionaries/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 43851 + 43879 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -1311,6 +1311,7 @@ alojar/XYPLSMR[CAT=v,T=inf,TR=t] alojo [CAT=nc,G=m,N=s] alombar/XYPL [CAT=v,T=inf,TR=t] alongar/XYPLM [CAT=v,T=inf,TR=t] +aloquete/p [CAT=nc,G=m,N=s] aloucar/XYL[CAT=v,T=inf,TR=i] alourar/XYPL [CAT=v,T=inf,TR=t] aloirar/XYPL [CAT=v,T=inf,TR=t] @@ -1567,7 +1568,7 @@ amÃgdala/p [CAT=nc,G=f,N=s] amigdalar [CAT=adj,N=s,G=_] amigdalina [CAT=nc,G=f,N=s] amigdalite/p [CAT=nc,G=f,N=s] -amigo/fp [CAT=nc,G=m,N=s] +amigo/hfp [CAT=nc,G=m,N=s] amiloide [PREAO90=amilóide,CAT=adj,N=s,G=_] amimar/XYPLD [CAT=v,T=inf,TR=t] amimia [CAT=nc,G=f,N=s] @@ -1737,7 +1738,7 @@ anavalhar/XYPL[CAT=v,T=inf,TR=t] anca/p [CAT=nc,G=f,N=s] ancestral/pm [CAT=adj,N=s,G=_] anciã/p [CAT=nc,G=f,N=s] -ancião/a [CAT=nc,G=m,N=s] +ancião/ap [CAT=nc,G=m,N=s] ancinhar/XYPL [CAT=v,T=inf,TR=t] ancinho/p [CAT=nc,G=m,N=s] anchova/p [CAT=nc,G=f,N=s] @@ -1833,7 +1834,7 @@ angélico/f [CAT=adj,N=s,G=m] angelismo/p[CAT=nc,G=m,N=s] angelitude [CAT=nc,G=f,N=s] angelizar/XYPLc[CAT=v,T=inf,TR=t] -angina [CAT=nc,G=f,N=s] +angina/p [CAT=nc,G=f,N=s] anginoso [CAT=adj,N=s,G=m] angiologia [CAT=nc,G=f,N=s] anglicanismo/p [CAT=nc,G=m,N=s] @@ -2075,7 +2076,7 @@ antiescorbútico [CAT=adj,N=s,G=m] antiespiritualismo/p [CAT=nc,G=m,N=s] antiestético [CAT=adj,N=s,G=m] antievangélico[CAT=adj,N=s,G=m] -antifebril [CAT=adj,N=s,G=_] +antifebril/p [CAT=adj,N=s,G=_] antiferruginoso[CAT=adj,N=s,G=m] antifilosófico[CAT=adj,N=s,G=m] antÃfrase [CAT=nc,G=f,N=s] @@ -3110,7 +3111,7 @@ asceta/pi [CAT=nc,G=_,N=s] ascético/fp [CAT=adj,N=s,G=m] asco/p [CAT=nc,G=m,N=s] ascórbico [CAT=adj,N=s,G=m] -ascoroso [CAT=adj,N=s,G=m] +ascoroso/fp[CAT=adj,N=s,G=m] aselha/pG [CAT=a_nc,G=2,N=s] asfaltador/p [CAT=nc,G=m,N=s] asfaltar/XYPLD [CAT=v,T=inf,TR=t] @@ -3404,7 +3405,7 @@ atazanar/XYPL [CAT=v,T=inf,TR=t] ateador[CAT=a_nc,G=m,N=s] atear/ZYPLD[CAT=v,T=inf,TR=t] atear/XYLn [CAT=v,T=inf,TR=_] -ateatrado [CAT=adj,N=s,G=m] +ateatrado/fp [CAT=adj,N=s,G=m] até [CAT=con] até [CAT=prep] atediar/XYPL [CAT=v,T=inf,TR=t] @@ -3498,7 +3499,7 @@ atomizar/XYPLc[CAT=v,T=inf,TR=t] atonalidade/p [CAT=nc,G=f,N=s] atonar/XYL [CAT=v,T=inf,TR=i] atónico [CAT=adj,N=s,G=m] -atónito [CAT=adj,N=s,G=m] +atónito/fp[CAT=adj,N=s,G=m] átono/fp [CAT=adj,N=s,G=m] atontadiço[CAT=adj,N=s,G=m] atontar/XYPL [CAT=v,T=inf,TR=t] @@ -3859,6 +3860,7 @@ avidez[CAT=nc,G=f,N=s] ávido/fp [CAT=adj,N=s,G=m] avigorar/XYPL [CAT=v,T=inf,TR=t] avilanar/XYPL [CAT=v,T=inf,TR=t] +aviltar/XYPL [CAT=v,T=inf,TR=t] avinagrar/XYPL [CAT=v,T=inf,TR=t] avincar/XYPL [CAT=v,T=inf,TR=t] avinhar/XYPL [CAT=v,T=inf,TR=t] @@ -4664,6 +4666,7 @@ beringela/p [CAT=nc,G=f,N=s] berlinda [CAT=nc,G=f,N=s] berlinde/p [CAT=nc,G=m,N=s] berlinense/p [CAT=a_nc,N=s,G=_] +berloque/p [CAT=nc,G=m,N=s] berma/p[CAT=nc,G=f,N=s] bermudas [CAT=nc,G=f,N=p] bernardo [CAT=a_nc,G=m,N=s] @@ -5179,6 +5182,7 @@ boqueira [CAT=nc,G=f,N=s] boqueirão [CAT=nc,G=m,N=s] boquiaberto/fp [CAT=adj,N=s,G=m] boquilha/p [CAT=nc,G=f,N=s] +borato/p [CAT=nc,G=m,N=s] borboleta/p[CAT=nc,G=f,N=s] borboletear/ZYL[CAT=v,T=inf,TR=i] borborejar/XYL [CAT=v,T=inf,TR=i] @@ -5229,7 +5233,7 @@ borralheiro/f [CAT=a_nc,G=m,N=s] borralhento[CAT=adj,N=s,G=m] borralho [CAT=nc,G=m,N=s] borra/p[CAT=nc,G=f,N=s] -borrão[CAT=nc,G=m,N=s] +borrão/p [CAT=nc,G=m,N=s] borrar/XYPLD [CAT=v,T=inf,TR=_] borrasca [CAT=nc,G=f,N=s] borrascoso [CAT=adj,N=s,G=m] @@ -5269,7 +5273,7 @@ botequim/p[CAT=nc,G=m,N=s] botequineiro [CAT=nc,G=m,N=s] botica/p
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 pt_PT/pt_PT.dic | 258 +++--- 2 files changed, 144 insertions(+), 116 deletions(-) New commits: commit 7e895dc439c87d229b7396076fdd8945b3b51f3f Author: Andras Timar Date: Mon Jan 7 16:15:12 2013 +0100 Update pt-PT dictionary Change-Id: Ifb8926b8a4394cab2006ce7d9bf89f8a1b322ff9 diff --git a/pt_PT/description.xml b/pt_PT/description.xml index 18b5238..39fbbf6 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 4ca5141..15e58e2 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 43851 + 43879 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -1311,6 +1311,7 @@ alojar/XYPLSMR[CAT=v,T=inf,TR=t] alojo [CAT=nc,G=m,N=s] alombar/XYPL [CAT=v,T=inf,TR=t] alongar/XYPLM [CAT=v,T=inf,TR=t] +aloquete/p [CAT=nc,G=m,N=s] aloucar/XYL[CAT=v,T=inf,TR=i] alourar/XYPL [CAT=v,T=inf,TR=t] aloirar/XYPL [CAT=v,T=inf,TR=t] @@ -1567,7 +1568,7 @@ amÃgdala/p [CAT=nc,G=f,N=s] amigdalar [CAT=adj,N=s,G=_] amigdalina [CAT=nc,G=f,N=s] amigdalite/p [CAT=nc,G=f,N=s] -amigo/fp [CAT=nc,G=m,N=s] +amigo/hfp [CAT=nc,G=m,N=s] amiloide [PREAO90=amilóide,CAT=adj,N=s,G=_] amimar/XYPLD [CAT=v,T=inf,TR=t] amimia [CAT=nc,G=f,N=s] @@ -1737,7 +1738,7 @@ anavalhar/XYPL[CAT=v,T=inf,TR=t] anca/p [CAT=nc,G=f,N=s] ancestral/pm [CAT=adj,N=s,G=_] anciã/p [CAT=nc,G=f,N=s] -ancião/a [CAT=nc,G=m,N=s] +ancião/ap [CAT=nc,G=m,N=s] ancinhar/XYPL [CAT=v,T=inf,TR=t] ancinho/p [CAT=nc,G=m,N=s] anchova/p [CAT=nc,G=f,N=s] @@ -1833,7 +1834,7 @@ angélico/f [CAT=adj,N=s,G=m] angelismo/p[CAT=nc,G=m,N=s] angelitude [CAT=nc,G=f,N=s] angelizar/XYPLc[CAT=v,T=inf,TR=t] -angina [CAT=nc,G=f,N=s] +angina/p [CAT=nc,G=f,N=s] anginoso [CAT=adj,N=s,G=m] angiologia [CAT=nc,G=f,N=s] anglicanismo/p [CAT=nc,G=m,N=s] @@ -2075,7 +2076,7 @@ antiescorbútico [CAT=adj,N=s,G=m] antiespiritualismo/p [CAT=nc,G=m,N=s] antiestético [CAT=adj,N=s,G=m] antievangélico[CAT=adj,N=s,G=m] -antifebril [CAT=adj,N=s,G=_] +antifebril/p [CAT=adj,N=s,G=_] antiferruginoso[CAT=adj,N=s,G=m] antifilosófico[CAT=adj,N=s,G=m] antÃfrase [CAT=nc,G=f,N=s] @@ -3110,7 +3111,7 @@ asceta/pi [CAT=nc,G=_,N=s] ascético/fp [CAT=adj,N=s,G=m] asco/p [CAT=nc,G=m,N=s] ascórbico [CAT=adj,N=s,G=m] -ascoroso [CAT=adj,N=s,G=m] +ascoroso/fp[CAT=adj,N=s,G=m] aselha/pG [CAT=a_nc,G=2,N=s] asfaltador/p [CAT=nc,G=m,N=s] asfaltar/XYPLD [CAT=v,T=inf,TR=t] @@ -3404,7 +3405,7 @@ atazanar/XYPL [CAT=v,T=inf,TR=t] ateador[CAT=a_nc,G=m,N=s] atear/ZYPLD[CAT=v,T=inf,TR=t] atear/XYLn [CAT=v,T=inf,TR=_] -ateatrado [CAT=adj,N=s,G=m] +ateatrado/fp [CAT=adj,N=s,G=m] até [CAT=con] até [CAT=prep] atediar/XYPL [CAT=v,T=inf,TR=t] @@ -3498,7 +3499,7 @@ atomizar/XYPLc[CAT=v,T=inf,TR=t] atonalidade/p [CAT=nc,G=f,N=s] atonar/XYL [CAT=v,T=inf,TR=i] atónico [CAT=adj,N=s,G=m] -atónito [CAT=adj,N=s,G=m] +atónito/fp[CAT=adj,N=s,G=m] átono/fp [CAT=adj,N=s,G=m] atontadiço[CAT=adj,N=s,G=m] atontar/XYPL [CAT=v,T=inf,TR=t] @@ -3859,6 +3860,7 @@ avidez[CAT=nc,G=f,N=s] ávido/fp [CAT=adj,N=s,G=m] avigorar/XYPL [CAT=v,T=inf,TR=t] avilanar/XYPL [CAT=v,T=inf,TR=t] +aviltar/XYPL [CAT=v,T=inf,TR=t] avinagrar/XYPL [CAT=v,T=inf,TR=t] avincar/XYPL [CAT=v,T=inf,TR=t] avinhar/XYPL [CAT=v,T=inf,TR=t] @@ -4664,6 +4666,7 @@ beringela/p [CAT=nc,G=f,N=s] berlinda [CAT=nc,G=f,N=s] berlinde/p [CAT=nc,G=m,N=s] berlinense/p [CAT=a_nc,N=s,G=_] +berloque/p [CAT=nc,G=m,N=s] berma/p[CAT=nc,G=f,N=s] bermudas [CAT=nc,G=f,N=p] bernardo [CAT=a_nc,G=m,N=s] @@ -5179,6 +5182,7 @@ boqueira [CAT=nc,G=f,N=s] boqueirão [CAT=nc,G=m,N=s] boquiaberto/fp [CAT=adj,N=s,G=m] boquilha/p [CAT=nc,G=f,N=s] +borato/p [CAT=nc,G=m,N=s] borboleta/p[CAT=nc,G=f,N=s] borboletear/ZYL[CAT=v,T=inf,TR=i] borborejar/XYL [CAT=v,T=inf,TR=i] @@ -5229,7 +5233,7 @@ borralheiro/f [CAT=a_nc,G=m,N=s] borralhento[CAT=adj,N=s,G=m] borralho [CAT=nc,G=m,N=s] borra/p[CAT=nc,G=f,N=s] -borrão[CAT=nc,G=m,N=s] +borrão/p [CAT=nc,G=m,N=s] borrar/XYPLD [CAT=v,T=inf,TR=_] borrasca [CAT=nc,G=f,N=s] borrascoso [CAT=adj,N=s,G=m] @@ -5269,7 +5273,7 @@ botequim/p[CAT=nc,G=m,N=s] botequineiro [CAT=nc,G=m,N=s] botica/p [CAT=nc,G=f,N=s] boticária [CAT=nc,G=f,N=s] -boticário/f [CAT=nc,G=m,N=s] +boticário/fp [CAT=nc,G=m,N=
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8cd396ba44a9be3fd7b0352aee8cb58d0289339a Author: Andras Timar Date: Mon Jan 7 16:15:12 2013 +0100 Updated core Project: dictionaries 7e895dc439c87d229b7396076fdd8945b3b51f3f diff --git a/dictionaries b/dictionaries index d4944dec..7e895dc 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit d4944decdf713cbbfa121f4f15699a7ccb96b3d5 +Subproject commit 7e895dc439c87d229b7396076fdd8945b3b51f3f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 pt_PT/pt_PT.dic | 258 +++--- 2 files changed, 144 insertions(+), 116 deletions(-) New commits: commit d047a0fa0746ce527720d15a36907e52dc67bf47 Author: Andras Timar Date: Mon Jan 7 16:15:12 2013 +0100 Update pt-PT dictionary Change-Id: Ifb8926b8a4394cab2006ce7d9bf89f8a1b322ff9 diff --git a/pt_PT/description.xml b/pt_PT/description.xml index 18b5238..39fbbf6 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 4ca5141..15e58e2 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 43851 + 43879 à [$ao$CAT=cp,Prep=a,Art=o$G=f,N=s] abacateiro/p [CAT=nc,G=m,N=s] abacate/p [CAT=nc,G=m,N=s] @@ -1311,6 +1311,7 @@ alojar/XYPLSMR[CAT=v,T=inf,TR=t] alojo [CAT=nc,G=m,N=s] alombar/XYPL [CAT=v,T=inf,TR=t] alongar/XYPLM [CAT=v,T=inf,TR=t] +aloquete/p [CAT=nc,G=m,N=s] aloucar/XYL[CAT=v,T=inf,TR=i] alourar/XYPL [CAT=v,T=inf,TR=t] aloirar/XYPL [CAT=v,T=inf,TR=t] @@ -1567,7 +1568,7 @@ amÃgdala/p [CAT=nc,G=f,N=s] amigdalar [CAT=adj,N=s,G=_] amigdalina [CAT=nc,G=f,N=s] amigdalite/p [CAT=nc,G=f,N=s] -amigo/fp [CAT=nc,G=m,N=s] +amigo/hfp [CAT=nc,G=m,N=s] amiloide [PREAO90=amilóide,CAT=adj,N=s,G=_] amimar/XYPLD [CAT=v,T=inf,TR=t] amimia [CAT=nc,G=f,N=s] @@ -1737,7 +1738,7 @@ anavalhar/XYPL[CAT=v,T=inf,TR=t] anca/p [CAT=nc,G=f,N=s] ancestral/pm [CAT=adj,N=s,G=_] anciã/p [CAT=nc,G=f,N=s] -ancião/a [CAT=nc,G=m,N=s] +ancião/ap [CAT=nc,G=m,N=s] ancinhar/XYPL [CAT=v,T=inf,TR=t] ancinho/p [CAT=nc,G=m,N=s] anchova/p [CAT=nc,G=f,N=s] @@ -1833,7 +1834,7 @@ angélico/f [CAT=adj,N=s,G=m] angelismo/p[CAT=nc,G=m,N=s] angelitude [CAT=nc,G=f,N=s] angelizar/XYPLc[CAT=v,T=inf,TR=t] -angina [CAT=nc,G=f,N=s] +angina/p [CAT=nc,G=f,N=s] anginoso [CAT=adj,N=s,G=m] angiologia [CAT=nc,G=f,N=s] anglicanismo/p [CAT=nc,G=m,N=s] @@ -2075,7 +2076,7 @@ antiescorbútico [CAT=adj,N=s,G=m] antiespiritualismo/p [CAT=nc,G=m,N=s] antiestético [CAT=adj,N=s,G=m] antievangélico[CAT=adj,N=s,G=m] -antifebril [CAT=adj,N=s,G=_] +antifebril/p [CAT=adj,N=s,G=_] antiferruginoso[CAT=adj,N=s,G=m] antifilosófico[CAT=adj,N=s,G=m] antÃfrase [CAT=nc,G=f,N=s] @@ -3110,7 +3111,7 @@ asceta/pi [CAT=nc,G=_,N=s] ascético/fp [CAT=adj,N=s,G=m] asco/p [CAT=nc,G=m,N=s] ascórbico [CAT=adj,N=s,G=m] -ascoroso [CAT=adj,N=s,G=m] +ascoroso/fp[CAT=adj,N=s,G=m] aselha/pG [CAT=a_nc,G=2,N=s] asfaltador/p [CAT=nc,G=m,N=s] asfaltar/XYPLD [CAT=v,T=inf,TR=t] @@ -3404,7 +3405,7 @@ atazanar/XYPL [CAT=v,T=inf,TR=t] ateador[CAT=a_nc,G=m,N=s] atear/ZYPLD[CAT=v,T=inf,TR=t] atear/XYLn [CAT=v,T=inf,TR=_] -ateatrado [CAT=adj,N=s,G=m] +ateatrado/fp [CAT=adj,N=s,G=m] até [CAT=con] até [CAT=prep] atediar/XYPL [CAT=v,T=inf,TR=t] @@ -3498,7 +3499,7 @@ atomizar/XYPLc[CAT=v,T=inf,TR=t] atonalidade/p [CAT=nc,G=f,N=s] atonar/XYL [CAT=v,T=inf,TR=i] atónico [CAT=adj,N=s,G=m] -atónito [CAT=adj,N=s,G=m] +atónito/fp[CAT=adj,N=s,G=m] átono/fp [CAT=adj,N=s,G=m] atontadiço[CAT=adj,N=s,G=m] atontar/XYPL [CAT=v,T=inf,TR=t] @@ -3859,6 +3860,7 @@ avidez[CAT=nc,G=f,N=s] ávido/fp [CAT=adj,N=s,G=m] avigorar/XYPL [CAT=v,T=inf,TR=t] avilanar/XYPL [CAT=v,T=inf,TR=t] +aviltar/XYPL [CAT=v,T=inf,TR=t] avinagrar/XYPL [CAT=v,T=inf,TR=t] avincar/XYPL [CAT=v,T=inf,TR=t] avinhar/XYPL [CAT=v,T=inf,TR=t] @@ -4664,6 +4666,7 @@ beringela/p [CAT=nc,G=f,N=s] berlinda [CAT=nc,G=f,N=s] berlinde/p [CAT=nc,G=m,N=s] berlinense/p [CAT=a_nc,N=s,G=_] +berloque/p [CAT=nc,G=m,N=s] berma/p[CAT=nc,G=f,N=s] bermudas [CAT=nc,G=f,N=p] bernardo [CAT=a_nc,G=m,N=s] @@ -5179,6 +5182,7 @@ boqueira [CAT=nc,G=f,N=s] boqueirão [CAT=nc,G=m,N=s] boquiaberto/fp [CAT=adj,N=s,G=m] boquilha/p [CAT=nc,G=f,N=s] +borato/p [CAT=nc,G=m,N=s] borboleta/p[CAT=nc,G=f,N=s] borboletear/ZYL[CAT=v,T=inf,TR=i] borborejar/XYL [CAT=v,T=inf,TR=i] @@ -5229,7 +5233,7 @@ borralheiro/f [CAT=a_nc,G=m,N=s] borralhento[CAT=adj,N=s,G=m] borralho [CAT=nc,G=m,N=s] borra/p[CAT=nc,G=f,N=s] -borrão[CAT=nc,G=m,N=s] +borrão/p [CAT=nc,G=m,N=s] borrar/XYPLD [CAT=v,T=inf,TR=_] borrasca [CAT=nc,G=f,N=s] borrascoso [CAT=adj,N=s,G=m] @@ -5269,7 +5273,7 @@ botequim/p[CAT=nc,G=m,N=s] botequineiro [CAT=nc,G=m,N=s] botica/p [CAT=nc,G=f,N=s] boticária [CAT=nc,G=f,N=s] -boticário/f [CAT=nc,G=m,N=s] +boticário/fp [CAT=nc,G=m,N=
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be2a308401e6381219bbc7d714c56c650c6dc2cb Author: Andras Timar Date: Mon Jan 7 16:15:12 2013 +0100 Updated core Project: dictionaries d047a0fa0746ce527720d15a36907e52dc67bf47 diff --git a/dictionaries b/dictionaries index a844895..d047a0f 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit a84489515d2207b1c34646be7d6f532b84a37439 +Subproject commit d047a0fa0746ce527720d15a36907e52dc67bf47 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4b4ca80c6b2b950d109c1c2ccea289de7a92b725
Author: Tor Lillqvist
Date: Mon Jan 7 17:00:55 2013 +0200
More ImplFontAttributes change fallout, in --enable-dbgutil code
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index d533181..a410028 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -231,7 +231,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
String& rFontFileNam
void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const
ImplDevFontAttributes& rDFA )
{
-DBG_ASSERT( rFontFileName.Len() && rDFA.maName.Len(),
"ImplFontNameCache::AddFontName - invalid data!" );
+DBG_ASSERT( rFontFileName.Len() && rDFA.GetFamilyName().Len(),
"ImplFontNameCache::AddFontName - invalid data!" );
if ( rFontFileName.Len() && rDFA.GetFamilyName().Len() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL(
rFontFileName ), rDFA ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: crashrep/README
crashrep/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e5683f002bcc6df785c41471f43e4b88a571544 Author: Michael Meeks Date: Mon Jan 7 14:50:31 2013 + fix misleading comment. Change-Id: I8f56239738742a6dae8cbaf3e6b7075f9db03255 diff --git a/crashrep/README b/crashrep/README index 306b807..515f81a 100644 --- a/crashrep/README +++ b/crashrep/README @@ -1 +1 @@ -Reports crashes (Novell disabled that). +Reports crashes (currently disabled). ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit d7fbc4ad10c954e8705716721018edf546862a46 Author: LuboÅ¡ LuÅák Date: Mon Jan 7 15:23:28 2013 +0100 further windows build fix for vcl changes Caused by 1e1ba8611fb134fb693354daae8931e93e46124c and not fixed in 83f684c86c22df40ff1ef5fe7dc4b829a66c2645. Change-Id: I43853f1d933a70789c4b89a22d06d2d383493758 diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 69a05ee..d533181 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -165,7 +165,9 @@ ImplFontAttrCache::ImplFontAttrCache( const String& rFileNameURL, const String& aCacheFile >> n; aDFA.SetFamilyType(static_cast(n)); aCacheFile >> n; aDFA.SetSymbolFlag(n != 0); -aCacheFile.ReadByteStringLine( aDFA.GetStyleName(), RTL_TEXTENCODING_UTF8 ); +String styleName; +aCacheFile.ReadByteStringLine( styleName, RTL_TEXTENCODING_UTF8 ); +aDFA.SetStyleName( styleName ); aFontAttributes[ aFontFileURL ] = aDFA; } @@ -904,7 +906,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE aDFA.SetSymbolFlag(rLogFont.lfCharSet == SYMBOL_CHARSET); // get the font face name -aDFA.SetFamilyName(reinterpret_cast(rLogFont.lfFaceName)); +aDFA.SetFamilyName( String().Assign(reinterpret_cast(rLogFont.lfFaceName))); // use the face's style name only if it looks reasonable const wchar_t* pStyleName = rEnumFont.elfStyle; @@ -914,7 +916,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE if( *p < 0x0020 ) break; if( p < pEnd ) -aDFA.SetStyleName(reinterpret_cast(pStyleName)); +aDFA.SetStyleName( String().Assign(reinterpret_cast(pStyleName))); // get device specific font attributes aDFA.mbOrientation = (nFontType & RASTER_FONTTYPE) == 0; @@ -1679,7 +1681,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe wchar_t aFaceName[LF_FACESIZE+60]; if( ::GetTextFaceW( mhDC, sizeof(aFaceName)/sizeof(wchar_t), aFaceName ) ) -pMetric->SetFamilyName(reinterpret_cast(aFaceName)); +pMetric->SetFamilyName( String().Assign( reinterpret_cast(aFaceName))); // get the font metric TEXTMETRICA aWinMetric; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#57950: More chained appends in dbaccess
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1564
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/1564/1
fdo#57950: More chained appends in dbaccess
And more:
Remove RTL_* macros
Remove ::rtl prefix
Change-Id: I5a68ea61b284eb63c22d376c45e1f3788b1b4b50
Signed-off-by: Marcos Paulo de Souza
---
M dbaccess/source/core/api/OptimisticSet.cxx
M dbaccess/source/core/dataaccess/documentcontainer.cxx
M dbaccess/source/core/dataaccess/documentdefinition.cxx
M dbaccess/source/core/inc/composertools.hxx
M dbaccess/source/core/misc/sdbcoretools.cxx
5 files changed, 92 insertions(+), 139 deletions(-)
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index ca6f1b5..a19df84 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -67,19 +67,19 @@
using namespace ::cppu;
using namespace ::osl;
-DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUStringBuffer,TSQLStatements);
+DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements);
namespace
{
-void lcl_fillKeyCondition(const ::rtl::OUString& i_sTableName,const
::rtl::OUString& i_sQuotedColumnName,const ORowSetValue&
i_aValue,TSQLStatements& io_aKeyConditions)
+void lcl_fillKeyCondition(const OUString& i_sTableName,const OUString&
i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements&
io_aKeyConditions)
{
-::rtl::OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName];
+OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName];
if ( rKeyCondition.getLength() )
-rKeyCondition.appendAscii(" AND ");
+rKeyCondition.append(" AND ");
rKeyCondition.append(i_sQuotedColumnName);
if ( i_aValue.isNull() )
-rKeyCondition.appendAscii(" IS NULL");
+rKeyCondition.append(" IS NULL");
else
-rKeyCondition.appendAscii(" = ?");
+rKeyCondition.append(" = ?");
}
}
@@ -91,7 +91,7 @@
const ORowSetValueVector&
_aParameterValueForCache,
sal_Int32 i_nMaxRows,
sal_Int32& o_nRowCount)
-
:OKeySet(NULL,NULL,::rtl::OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
+
:OKeySet(NULL,NULL,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
,m_aSqlParser( _rContext.getUNOContext() )
,m_aSqlIterator( i_xConnection,
Reference(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser,
NULL )
,m_bResultSetChanged(false)
@@ -105,7 +105,7 @@
DBG_DTOR(OptimisticSet,NULL);
}
-void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const
::rtl::OUString& i_sRowSetFilter)
+void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const
OUString& i_sRowSetFilter)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com",
"OptimisticSet::construct" );
OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
@@ -117,9 +117,9 @@
const Reference xQueryColumns = xQueryColSup->getColumns();
const Reference xTabSup(m_xComposer,UNO_QUERY);
const Reference xTables = xTabSup->getTables();
-const Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames();
-const ::rtl::OUString* pTableNameIter = aTableNames.getConstArray();
-const ::rtl::OUString* pTableNameEnd = pTableNameIter +
aTableNames.getLength();
+const Sequence< OUString> aTableNames = xTables->getElementNames();
+const OUString* pTableNameIter = aTableNames.getConstArray();
+const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength();
for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter)
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -135,15 +135,15 @@
m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue));
m_aKeyIter = m_aKeyMap.begin();
-::rtl::OUStringBuffer aFilter = createKeyFilter();
+OUStringBuffer aFilter = createKeyFilter();
Reference< XSingleSelectQueryComposer>
xSourceComposer(m_xComposer,UNO_QUERY);
Reference< XMultiServiceFactory > xFactory(m_xConnection,
UNO_QUERY_THROW);
Reference
xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
-::rtl::OUString sQuery = xSourceComposer->getQuery();
+OUString sQuery = xSourceComposer->getQuery();
xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery());
// check for joins
-::rtl::OUString aErrorMsg;
+OUString aErrorMsg;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr pStatementNode( m_aSqlParser.parseTree(
aErrorMsg, sQuery ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -151,7 +151,7 @@
m_aSqlIterator.traverseAll();
fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions());
-cons
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Petr Mladek changed: What|Removed |Added Depends on||58275 --- Comment #72 from Petr Mladek --- Add bug 58275 - Install fails if .NET Framework 4.0 (Client) is not present -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #71 from Petr Mladek --- Add bug 58815 - create new Impress/Draw document, add slide/page, close without saving crashes Impress, Draw. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error building with clang
On Saturday 05 of January 2013, Marc-André Laverdière wrote: > Miklos was right - the newer version changes everything. I just > finished building, and the only option I used was to enable the > plugins. > > I'll put together a small blog entry about this, in case others want > to try the same. Should I update the wiki too? If there's anything wrong or important missing, yes, go ahead. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] typo fix
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1563 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Bugfix for improper function call, column count was compared...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1562 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1562 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Karthikeyan Krishnamurthi Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/sl
source/sl/svx/uiconfig/ui.po | 211 +++ 1 file changed, 211 insertions(+) New commits: commit df288c090b86e7eeab5cada7b812089fc47d3ac5 Author: Andras Timar Date: Mon Jan 7 15:07:21 2013 +0100 build fix Change-Id: I0da184c45c519952eb86420ffa9909f149ca4cb5 diff --git a/source/sl/svx/uiconfig/ui.po b/source/sl/svx/uiconfig/ui.po new file mode 100644 index 000..415f45c --- /dev/null +++ b/source/sl/svx/uiconfig/ui.po @@ -0,0 +1,211 @@ +#. extracted from svx/uiconfig/ui +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: LibO 40l10n\n" +"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; +"POT-Creation-Date: 2013-01-07 14:15+0100\n" +"PO-Revision-Date: 2012-11-17 19:02+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: sh\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: LibreOffice\n" +"X-Accelerator-Marker: ~\n" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label7\n" +"label\n" +"string.text" +msgid "Original Size:" +msgstr "Izvo~rna veliÄina" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label8\n" +"label\n" +"string.text" +msgid "View Size:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label9\n" +"label\n" +"string.text" +msgid "Image Capacity:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label10\n" +"label\n" +"string.text" +msgid "New Capacity:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label1\n" +"label\n" +"string.text" +msgid "Image Information" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"radio-lossless\n" +"label\n" +"string.text" +msgid "Lossless Compression" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"checkbox-reduce-resolution\n" +"label\n" +"string.text" +msgid "Reduce Image Resolution" +msgstr "" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label2\n" +"label\n" +"string.text" +msgid "Width:" +msgstr "Å irina" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label3\n" +"label\n" +"string.text" +msgid "Heigth:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"radio-jpeg\n" +"label\n" +"string.text" +msgid "JPEG Compression" +msgstr "" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label4\n" +"label\n" +"string.text" +msgid "Resolution:" +msgstr "Rezolucija" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label6\n" +"label\n" +"string.text" +msgid "Quality:" +msgstr "Kvalitet" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label5\n" +"label\n" +"string.text" +msgid "Compression:" +msgstr "Komprimovanje" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label11\n" +"label\n" +"string.text" +msgid "Interpolation:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label12\n" +"label\n" +"string.text" +msgid "px" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label13\n" +"label\n" +"string.text" +msgid "px" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label14\n" +"label\n" +"string.text" +msgid "DPI" +msgstr "" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"0\n" +"stringlist.text" +msgid "None" +msgstr "Nijedan" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"1\n" +"stringlist.text" +msgid "Bilinear" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"2\n" +"stringlist.text" +msgid "Bicubic" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"3\n" +"stringlist.text" +msgid "Lanczos" +msgstr "" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09e52d6bad90e9d73e7de29372f5be08cbf82acd Author: Andras Timar Date: Mon Jan 7 15:07:21 2013 +0100 Updated core Project: translations df288c090b86e7eeab5cada7b812089fc47d3ac5 diff --git a/translations b/translations index 7dda834..df288c0 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7dda834b0c49f7d91e5585d3a9430f1905235dbb +Subproject commit df288c090b86e7eeab5cada7b812089fc47d3ac5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2001cb9db7e1d13e8bd142fa99c51aa5f96174f2 Author: jorendc Date: Mon Jan 7 14:35:51 2013 +0100 typo fix Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae Reviewed-on: https://gerrit.libreoffice.org/1563 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 4d11e48..50f76cf 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -259,7 +259,7 @@ I10N SHORTCUTS - NO TRANSLATE - .uno.SearchDialog + .uno:SearchDialog ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/table/tablemodel.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5350075ad5f589c242ec40f9f6ab7fe822a5
Author: K_Karthikeyan
Date: Mon Jan 7 13:56:08 2013 +0300
Bugfix for improper function call, column count was compared with row count
Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
Reviewed-on: https://gerrit.libreoffice.org/1562
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 5387babf..59358e3 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1116,7 +1116,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow,
sal_Int32 nColSpan, sal_
const sal_Int32 nLastRow = nRow + nRowSpan;
const sal_Int32 nLastCol = nCol + nColSpan;
-if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) )
+if( (nLastRow > getRowCount()) || (nLastCol > getColumnCount() ) )
{
OSL_FAIL("TableModel::merge(), merge beyound the table!");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#57950: Remove some chained appends in chart2 and more
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1549 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1549 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24a7a0c5adcee17eab4c9d6442b472a5992f261e Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#53521 Crash when running BASIC's "shell()" with a non-ex...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1530 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1530 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic3af07be06e7af7730a3bcb1680c659a88b66af3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christopher Copits Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove some RTL_* and some rtl:: prefixes in chart2
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1550 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1550 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47889319530d8f03bd7c78e937de55cf380d2d41 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: chart2/source
chart2/source/controller/accessibility/AccessibleBase.cxx| 11 ++
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 20 +--
chart2/source/tools/DataSeriesHelper.cxx |1
chart2/source/tools/MeanValueRegressionCurveCalculator.cxx |7 +--
4 files changed, 17 insertions(+), 22 deletions(-)
New commits:
commit aea18e985ed07691bca39aae3dc3c58d33ae3dd5
Author: Marcos Paulo de Souza
Date: Sat Jan 5 12:13:57 2013 -0200
fdo#57950: Remove some chained appends in chart2 and more
Removed a not needed variable;
Removed some rt:: prefixes
Change-Id: I24a7a0c5adcee17eab4c9d6442b472a5992f261e
Signed-off-by: Marcos Paulo de Souza
Reviewed-on: https://gerrit.libreoffice.org/1549
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 9c38b84..8671673 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -578,13 +578,10 @@ Reference< XAccessible >
AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i
i < 0 ||
static_cast< ChildListVectorType::size_type >( i ) >=
m_aChildList.size() )
{
-OUStringBuffer aBuf;
-aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Index " ));
-aBuf.append( i );
-aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " is invalid for range [
0, " ));
-aBuf.append( static_cast< sal_Int32 >( m_aChildList.size() - 1 ) );
-aBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( " ]" ) );
-lang::IndexOutOfBoundsException aEx( aBuf.makeStringAndClear(),
+OUString aBuf = "Index " + OUString::valueOf( i ) + " is invalid for
range [ 0, " +
+OUString::valueOf( static_cast< sal_Int32 >(
m_aChildList.size() - 1 ) ) +
+" ]";
+lang::IndexOutOfBoundsException aEx( aBuf,
const_cast< ::cppu::OWeakObject *
>(
static_cast< const
::cppu::OWeakObject * >( this )));
throw aEx;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 16a0d24..4671811 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -149,17 +149,17 @@ void LightSourceInfo::initButtonFromSource()
namespace
{
-rtl::OUString lcl_makeColorName( Color rColor )
+OUString lcl_makeColorName( Color rColor )
{
-rtl::OUStringBuffer aStr(SVX_RESSTR(RID_SVXFLOAT3D_FIX_R));
-aStr.append((sal_Int32)rColor.GetRed());
-aStr.append(' ');
-aStr.append(SVX_RESSTR(RID_SVXFLOAT3D_FIX_G));
-aStr.append((sal_Int32)rColor.GetGreen());
-aStr.append(' ');
-aStr.append(SVX_RESSTR(RID_SVXFLOAT3D_FIX_B));
-aStr.append((sal_Int32)rColor.GetBlue());
-return aStr.makeStringAndClear();
+OUString aStr = SVX_RESSTR(RID_SVXFLOAT3D_FIX_R) +
+OUString::valueOf((sal_Int32)rColor.GetRed()) +
+" " +
+SVX_RESSTR(RID_SVXFLOAT3D_FIX_G) +
+OUString::valueOf((sal_Int32)rColor.GetGreen()) +
+" " +
+SVX_RESSTR(RID_SVXFLOAT3D_FIX_B) +
+OUString::valueOf((sal_Int32)rColor.GetBlue());
+return aStr;
}
void lcl_selectColor( ColorListBox& rListBox, const Color& rColor )
{
diff --git a/chart2/source/tools/DataSeriesHelper.cxx
b/chart2/source/tools/DataSeriesHelper.cxx
index b5fa305..15ea915 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -273,7 +273,6 @@ OUString lcl_getDataSequenceLabel( const Reference<
chart2::data::XDataSequence
Sequence< OUString > aSeq( xTextSeq->getTextualData());
const sal_Int32 nMax = aSeq.getLength() - 1;
-OUString aVal;
OUStringBuffer aBuf;
for( sal_Int32 i = 0; i <= nMax; ++i )
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 3caef43..0551cbd 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -123,11 +123,10 @@ OUString
MeanValueRegressionCurveCalculator::ImplGetRepresentation(
const uno::Reference< util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const
{
-OUStringBuffer aBuf( C2U( "f(x) = " ));
+OUString aBuf = "f(x) = " +
+getFormattedString( xNumFormatter, nNumberFormatKey,
m_fMeanValue );
-aBuf.append( getForm
[Libreoffice-commits] .: basic/source
basic/source/runtime/methods.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit dbfc8777bf73872d1b96f956b9e778d9099d52b3
Author: Christopher Copits
Date: Tue Jan 1 16:29:32 2013 -0500
fdo#53521 Crash when running BASIC's "shell()" with a non-existent program
The problem is that the process handle is freed regardless of whether
osl_executeProcess was successful or not. Therefore, a segmentation fault would
result, as a random memory address would be freed. This patch checks whether
osl_executeProcess was successful. If it was, then it frees the handle; if it
wasn't successful, the memory is not freed.
Change-Id: Ic3af07be06e7af7730a3bcb1680c659a88b66af3
Reviewed-on: https://gerrit.libreoffice.org/1530
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 45e59a6..3a6eb97 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -3534,7 +3534,11 @@ RTLFUNC(Shell)
NULL, 0,
&pApp ) == osl_Process_E_None;
-osl_freeProcessHandle( pApp );
+// 53521 only free process handle on success
+if (bSucc)
+{
+osl_freeProcessHandle( pApp );
+}
for(int j = 0; i < nParamCount; i++)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/controller/accessibility/AccStatisticsObject.cxx |4
chart2/source/controller/accessibility/AccessibleBase.cxx| 27
++---
chart2/source/controller/accessibility/AccessibleChartElement.cxx|4
chart2/source/controller/accessibility/AccessibleChartShape.cxx | 20
++--
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 14 +-
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx |6 -
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx| 14 +-
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 21
++--
chart2/source/controller/chartapiwrapper/GridWrapper.cxx |4
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 48
-
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx|4
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 16 +--
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |4
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx | 50
--
14 files changed, 101 insertions(+), 135 deletions(-)
New commits:
commit b380744c205089aa0b480e059bec645631010444
Author: Marcos Paulo de Souza
Date: Sat Jan 5 13:01:09 2013 -0200
Remove some RTL_* and some rtl:: prefixes in chart2
Change-Id: I47889319530d8f03bd7c78e937de55cf380d2d41
Signed-off-by: Marcos Paulo de Souza
Reviewed-on: https://gerrit.libreoffice.org/1550
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index b5623de..0d4a1e3 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -22,8 +22,6 @@
#include
#include
-using ::rtl::OUString;
-
namespace chart
{
@@ -47,7 +45,7 @@ OUString SAL_CALL AccStatisticsObject::getAccessibleName()
OUString SAL_CALL AccStatisticsObject::getImplementationName()
throw (::com::sun::star::uno::RuntimeException)
{
-return OUString( RTL_CONSTASCII_USTRINGPARAM( "StatisticsObject" ));
+return OUString( "StatisticsObject" );
}
} // namespace chart
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 183945b..9c38b84 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -58,8 +58,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::UNO_QUERY;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::com::sun::star::uno::Reference;
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -131,9 +129,8 @@ bool AccessibleBase::NotifyEvent( EventType eEventType,
const AccessibleUniqueId
BroadcastAccEvent(
AccessibleEventId::VISIBLE_DATA_CHANGED, aEmpty, aEmpty );
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE(
-::rtl::OUStringToOString(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Visible data event sent by: " )) +
+OUStringToOString(
+OUString( "Visible data event sent by: " ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -150,9 +147,8 @@ bool AccessibleBase::NotifyEvent( EventType eEventType,
const AccessibleUniqueId
BroadcastAccEvent( AccessibleEventId::STATE_CHANGED,
aSelected, aEmpty, true );
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE(
-::rtl::OUStringToOString(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Selection acquired by: " )) +
+OUStringToOString(
+OUString( "Selection acquired by: " ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
#endif
@@ -169,9 +165,8 @@ bool AccessibleBase::NotifyEvent( EventType eEventType,
const AccessibleUniqueId
BroadcastAccEvent( AccessibleEventId::STATE_CHANGED,
aEmpty, aSelected, true );
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE(
-::rtl::OUStringToOString(
-OUString( RTL_CONSTASCII_USTRINGPARAM(
- "Selection lost by: " )) +
+OUStringToOString(
+OUString( "Selection lost by: " ) +
getAccessibleName(),
RTL_TEXTENCODING_ASCII_US ).g
[PUSHED] fdo#57950: Remove some chained appends in dbaccess
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1559 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1559 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#57950: More fixes for chained appends in dbaccess
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1561 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c3902672518559e8a139c37bc1933843bebfe5d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 16
1 file changed, 4 insertions(+), 12 deletions(-)
New commits:
commit 36e1e0ce128a25ce63743bed18a599a6915f3ec3
Author: Marcos Paulo de Souza
Date: Mon Jan 7 07:45:44 2013 -0200
fdo#57950: Remove some chained appends in dbaccess
Also simplify logic a little bit.
Change-Id: I342f8d1d22e70023d23c6c8ca3976d501e18fb90
Signed-off-by: Marcos Paulo de Souza
Reviewed-on: https://gerrit.libreoffice.org/1559
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index aff9dde..f398a46 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -765,25 +765,17 @@ Reference< XNameAccess > SAL_CALL
OSingleSelectQueryComposer::getColumns( ) thr
bCase = m_xMetaData->supportsMixedCaseQuotedIdentifiers();
aSelectColumns = m_aSqlIterator.getSelectColumns();
-::rtl::OUStringBuffer aSQL;
-aSQL.append( m_aPureSelectSQL );
-aSQL.append( STR_WHERE );
+OUStringBuffer aSQL( m_aPureSelectSQL + STR_WHERE + " ( 0 = 1 )");
// preserve the original WHERE clause
// #i102234#
-::rtl::OUString sOriginalWhereClause = getSQLPart( Where,
m_aSqlIterator, sal_False );
+OUString sOriginalWhereClause = getSQLPart( Where, m_aSqlIterator,
sal_False );
if ( !sOriginalWhereClause.isEmpty() )
{
-aSQL.appendAscii( " ( 0 = 1 ) AND ( " );
-aSQL.append( sOriginalWhereClause );
-aSQL.appendAscii( " ) " );
-}
-else
-{
-aSQL.appendAscii( " ( 0 = 1 ) " );
+aSQL.append( " AND ( " + sOriginalWhereClause + " ) " );
}
-::rtl::OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True
);
+OUString sGroupBy = getSQLPart( Group, m_aSqlIterator, sal_True );
if ( !sGroupBy.isEmpty() )
aSQL.append( sGroupBy );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 309 +++--
1 file changed, 144 insertions(+), 165 deletions(-)
New commits:
commit 2b0b5f7df0e3c7deab2fdccec49b6bbb4186f58a
Author: Marcos Paulo de Souza
Date: Mon Jan 7 08:44:24 2013 -0200
fdo#57950: More fixes for chained appends in dbaccess
And also:
Remove some RTL_* macros
Remove ::rtl prefix
Change-Id: I9c3902672518559e8a139c37bc1933843bebfe5d
Signed-off-by: Marcos Paulo de Souza
Reviewed-on: https://gerrit.libreoffice.org/1561
Reviewed-by: LuboÅ¡ LuÅák
Tested-by: LuboÅ¡ LuÅák
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 6f1c57f..aff9dde 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -80,18 +80,18 @@ namespace dbaccess {
namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
}
-#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "))
-#define STR_FROM::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "))
-#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))
-#define STR_GROUP_BY::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY
"))
-#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING
"))
-#define STR_ORDER_BY::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY
"))
-#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND "))
-#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR "))
-#define STR_LIKE::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE "))
-#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
-#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))
-#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
+#define STR_SELECT "SELECT "
+#define STR_FROM" FROM "
+#define STR_WHERE " WHERE "
+#define STR_GROUP_BY" GROUP BY "
+#define STR_HAVING " HAVING "
+#define STR_ORDER_BY" ORDER BY "
+#define STR_AND " AND "
+#define STR_OR " OR "
+#define STR_LIKEOUString(" LIKE ")
+#define L_BRACKET "("
+#define R_BRACKET ")"
+#define COMMA ","
namespace
{
@@ -100,14 +100,14 @@ namespace
If the statement cannot be parsed, an error is thrown.
*/
-const OSQLParseNode* parseStatement_throwError( OSQLParser& _rParser,
const ::rtl::OUString& _rStatement, const Reference< XInterface >& _rxContext )
+const OSQLParseNode* parseStatement_throwError( OSQLParser& _rParser,
const OUString& _rStatement, const Reference< XInterface >& _rxContext )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess",
"frank.schoenh...@sun.com",
"SingleSelectQueryComposer.cxx::parseStatement_throwError" );
-::rtl::OUString aErrorMsg;
+OUString aErrorMsg;
const OSQLParseNode* pNewSqlParseNode = _rParser.parseTree( aErrorMsg,
_rStatement );
if ( !pNewSqlParseNode )
{
-::rtl::OUString sSQLStateGeneralError( getStandardSQLState(
SQL_GENERAL_ERROR ) );
+OUString sSQLStateGeneralError( getStandardSQLState(
SQL_GENERAL_ERROR ) );
SQLException aError2( aErrorMsg, _rxContext,
sSQLStateGeneralError, 1000, Any() );
SQLException aError1( _rStatement, _rxContext,
sSQLStateGeneralError, 1000, makeAny( aError2 ) );
throw
SQLException(_rParser.getContext().getErrorMessage(OParseContext::ERROR_GENERAL),_rxContext,sSQLStateGeneralError,1000,makeAny(aError1));
@@ -120,7 +120,7 @@ namespace
an error if not
*/
void checkForSingleSelect_throwError( const OSQLParseNode* pStatementNode,
OSQLParseTreeIterator& _rIterator,
-const Reference< XInterface >& _rxContext, const ::rtl::OUString&
_rOriginatingCommand )
+const Reference< XInterface >& _rxContext, const OUString&
_rOriginatingCommand )
{
const OSQLParseNode* pOldNode = _rIterator.getParseTree();
@@ -146,7 +146,7 @@ namespace
// .
/** combines parseStatement_throwError and checkForSingleSelect_throwError
*/
-void parseAndCheck_throwError( OSQLParser& _rParser, const
::rtl::OUString& _rStatement,
+void parseAndCheck_throwError( OSQLParser& _rParser, const OUString&
_rStatement,
OSQLParseTreeIterator& _rIterator, const Reference< XInterface >&
_rxContext )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess",
"frank.schoenh...@sun.com",
"SingleSelectQueryComposer.cxx::parseAndCheck_throwError" );
@@ -158,9 +158,9 @@ namespace
/** transforms a parse node describing a complete statement into a pure
select
statement, without any filter/order/groupby/having clauses
[PATCH] typo fix
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1563 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/1563/1 typo fix Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae --- M officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 4d11e48..50f76cf 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -259,7 +259,7 @@ I10N SHORTCUTS - NO TRANSLATE - .uno.SearchDialog + .uno:SearchDialog -- To view, visit https://gerrit.libreoffice.org/1563 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7530e477a6cf4ab52772b7ba1c5e3d41dc2d6fae Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Master Build Failure in Python3 on Mac OSX with SDK 10.6 and XCode 4.5.2
Le 07/01/13 12:53, Tor Lillqvist a écrit : I'm going to copy the XCode xcrun to /usr/bin and see if that makes a difference, I've just noticed there's a difference in the dates of my xcrun in /usr/bin and the one supplied with Xcode 4.5.2. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salgdi3.cxx | 184 -
1 file changed, 92 insertions(+), 92 deletions(-)
New commits:
commit 83f684c86c22df40ff1ef5fe7dc4b829a66c2645
Author: Miklos Vajna
Date: Mon Jan 7 14:34:55 2013 +0100
vcl: port WinSalGraphics and friends to new getter/setter methods
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index da4f4e0..69a05ee 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -155,17 +155,17 @@ ImplFontAttrCache::ImplFontAttrCache( const String&
rFileNameURL, const String&
aFontFileURL =
read_lenPrefixed_uInt8s_ToOUString(aCacheFile,
RTL_TEXTENCODING_UTF8);
if( !aFontFileURL.Len() )
break;
-aDFA.maName =
read_lenPrefixed_uInt8s_ToOUString(aCacheFile,
RTL_TEXTENCODING_UTF8);
+
aDFA.SetFamilyName(read_lenPrefixed_uInt8s_ToOUString(aCacheFile,
RTL_TEXTENCODING_UTF8));
short n;
-aCacheFile >> n; aDFA.meWeight = static_cast(n);
-aCacheFile >> n; aDFA.meItalic = static_cast(n);
-aCacheFile >> n; aDFA.mePitch = static_cast(n);
-aCacheFile >> n; aDFA.meWidthType = static_cast(n);
-aCacheFile >> n; aDFA.meFamily = static_cast(n);
-aCacheFile >> n; aDFA.mbSymbolFlag = (n != 0);
+aCacheFile >> n; aDFA.SetWeight(static_cast(n));
+aCacheFile >> n; aDFA.SetItalic(static_cast(n));
+aCacheFile >> n; aDFA.SetPitch(static_cast(n));
+aCacheFile >> n; aDFA.SetWidthType(static_cast(n));
+aCacheFile >> n; aDFA.SetFamilyType(static_cast(n));
+aCacheFile >> n; aDFA.SetSymbolFlag(n != 0);
-aCacheFile.ReadByteStringLine( aDFA.maStyleName, RTL_TEXTENCODING_UTF8
);
+aCacheFile.ReadByteStringLine( aDFA.GetStyleName(),
RTL_TEXTENCODING_UTF8 );
aFontAttributes[ aFontFileURL ] = aDFA;
}
@@ -188,16 +188,16 @@ ImplFontAttrCache::~ImplFontAttrCache()
const String rFontFileURL( (*aIter).first );
const ImplDevFontAttributes& rDFA( (*aIter).second );
write_lenPrefixed_uInt8s_FromOUString(aCacheFile,
rFontFileURL, RTL_TEXTENCODING_UTF8);
-write_lenPrefixed_uInt8s_FromOUString(aCacheFile,
rDFA.maName, RTL_TEXTENCODING_UTF8);
+write_lenPrefixed_uInt8s_FromOUString(aCacheFile,
rDFA.GetFamilyName(), RTL_TEXTENCODING_UTF8);
-aCacheFile << static_cast(rDFA.meWeight);
-aCacheFile << static_cast(rDFA.meItalic);
-aCacheFile << static_cast(rDFA.mePitch);
-aCacheFile << static_cast(rDFA.meWidthType);
-aCacheFile << static_cast(rDFA.meFamily);
-aCacheFile << static_cast(rDFA.mbSymbolFlag != false);
+aCacheFile << static_cast(rDFA.GetWeight());
+aCacheFile << static_cast(rDFA.GetSlant());
+aCacheFile << static_cast(rDFA.GetPitch());
+aCacheFile << static_cast(rDFA.GetWidthType());
+aCacheFile << static_cast(rDFA.GetFamilyType());
+aCacheFile << static_cast(rDFA.IsSymbolFont() != false);
-write_lenPrefixed_uInt8s_FromOUString(aCacheFile,
rDFA.maStyleName, RTL_TEXTENCODING_UTF8);
+write_lenPrefixed_uInt8s_FromOUString(aCacheFile,
rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8);
++aIter;
}
@@ -230,7 +230,7 @@ ImplDevFontAttributes ImplFontAttrCache::GetFontAttr( const
String& rFontFileNam
void ImplFontAttrCache::AddFontAttr( const String& rFontFileName, const
ImplDevFontAttributes& rDFA )
{
DBG_ASSERT( rFontFileName.Len() && rDFA.maName.Len(),
"ImplFontNameCache::AddFontName - invalid data!" );
-if ( rFontFileName.Len() && rDFA.maName.Len() )
+if ( rFontFileName.Len() && rDFA.GetFamilyName().Len() )
{
aFontAttributes.insert( FontAttrMap::value_type( OptimizeURL(
rFontFileName ), rDFA ) );
bModified = TRUE;
@@ -574,8 +574,8 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern& rFon
// are the missing characters symbols?
pDevFont = pDevFontList->ImplFindByAttributes( IMPL_FONT_ATTR_SYMBOL,
-rFontSelData.meWeight, rFontSelData.meWidthType,
-rFontSelData.meItalic, rFontSelData.maSearchName );
+rFontSelData.GetWeight(), rFontSelData.GetWidthType(),
+rFontSelData.GetSlant(), rFontSelData.maSearchName );
if( pDevFont )
{
const PhysicalFontFace* pFace = pDevFont->FindBestFontFace(
rFontSelData );
@@ -599,7 +599,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute(
FontSelectPattern& rFon
const PhysicalFontFace* pFace = pTestFontList->Get( i );
if( !HasMissingChars( pFace, rMissingChars ) )
continue;
-rFontSelData.maSearchName = pFace->maName;
+rFontSelData.maSe
[PUSHED] Fix wrong bracketing
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1498 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1498 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4216519d74de75690b21a3efa5083e79aa5b83d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Werner Körner Gerrit-Reviewer: Michael Stahl Gerrit-Reviewer: Tor Lillqvist ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/shells/textsh1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 06bdc1e3ae8e93154dc9b9487691b547348c8634
Author: Werner Koerner
Date: Sat Dec 29 13:24:20 2012 +0100
Fix wrong bracketing
Wrong bracketing, item is put at a which-id of sal_false.
Change-Id: Ic4216519d74de75690b21a3efa5083e79aa5b83d
Reviewed-on: https://gerrit.libreoffice.org/1498
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1124d51..c351e38 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1426,7 +1426,7 @@ void SwTextShell::GetState( SfxItemSet &rSet )
break;
case FN_GLOSSARY_DLG:
{
-rSet.Put(SfxBoolItem(nWhich), sal_True);
+rSet.Put( SfxBoolItem( nWhich, sal_True ) );
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#57203 Unknown option: -Embedding
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1514 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1514 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source
desktop/source/app/cmdlineargs.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69
Author: Aurimas Fišeras
Date: Sun Dec 16 13:41:31 2012 +0200
fdo#57203 Unknown option: -Embedding
Ignore this option on Windows.
This work-arounds a regression introduced by f4a4ba9ac
Windows appends -Embedding when LibreOffice is called by COM+
Before f4a4ba9ac this option was silently ignored.
Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5
Reviewed-on: https://gerrit.libreoffice.org/1514
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 4a8ddcd..be40f87 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -500,6 +500,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const
::rtl::OUString& aArg
return true;
}
#endif
+#ifdef WIN32
+/* fdo#57203 ignore -Embedding on Windows
+ when LibreOffice is launched by COM+
+ */
+else if ( oArg == "Embedding" )
+{
+return true;
+}
+#endif
else if ( oArg.matchIgnoreAsciiCase("infilter="))
{
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Fix calls to SfxPoolItem* Put with a Which-ID of sal_false
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1499 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1499 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39914909fd394532e7a32c791d4480530393c1c0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Werner Körner Gerrit-Reviewer: Markus Mohrhard Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/svdraw/svdedxv.cxx|2 +-
svx/source/table/tablecontroller.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 475469626b3a92528a9584d6c34f2b44b7eb8d1c
Author: Werner Koerner
Date: Sat Dec 29 13:53:01 2012 +0100
Fix calls to SfxPoolItem* Put with a Which-ID of sal_false
Change-Id: I39914909fd394532e7a32c791d4480530393c1c0
Reviewed-on: https://gerrit.libreoffice.org/1499
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 10d4736..f047b78 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1348,7 +1348,7 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet&
rTargetSet, sal_Bool bOnlyHar
{
// FALSE= regard InvalidItems as "holes," not as Default
rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
-rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
+rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ) );
}
if(GetMarkedObjectCount()==1 &&
GetMarkedObjectByIndex(0)==mxTextEditObj.get())
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index a0050c3..9368675 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2340,7 +2340,7 @@ bool SvxTableController::GetAttributes(SfxItemSet&
rTargetSet, bool bOnlyHardAtt
{
// FALSE= InvalidItems nicht al Default, sondern als "Loecher"
betrachten
rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
-rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
+rTargetSet.Put( SvxScriptTypeItem(
pTextEditOutlinerView->GetSelectedScriptType() ) );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Cleanup: #include
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1484 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1484 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic547b4a59102afc8bdbc85ec95ac312e32ef2530 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matteo Casalin Gerrit-Reviewer: Matteo Casalin Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/sh source/sr
source/sh/svx/uiconfig/ui.po | 211 ++ source/sr/svx/uiconfig/ui.po | 212 +++ 2 files changed, 423 insertions(+) New commits: commit 7dda834b0c49f7d91e5585d3a9430f1905235dbb Author: Andras Timar Date: Mon Jan 7 14:20:41 2013 +0100 build fix Change-Id: I2c90f8f5ef21e6ff4973a72376a32ec5e92428dd diff --git a/source/sh/svx/uiconfig/ui.po b/source/sh/svx/uiconfig/ui.po new file mode 100644 index 000..415f45c --- /dev/null +++ b/source/sh/svx/uiconfig/ui.po @@ -0,0 +1,211 @@ +#. extracted from svx/uiconfig/ui +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: LibO 40l10n\n" +"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; +"POT-Creation-Date: 2013-01-07 14:15+0100\n" +"PO-Revision-Date: 2012-11-17 19:02+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: sh\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: LibreOffice\n" +"X-Accelerator-Marker: ~\n" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label7\n" +"label\n" +"string.text" +msgid "Original Size:" +msgstr "Izvo~rna veliÄina" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label8\n" +"label\n" +"string.text" +msgid "View Size:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label9\n" +"label\n" +"string.text" +msgid "Image Capacity:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label10\n" +"label\n" +"string.text" +msgid "New Capacity:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label1\n" +"label\n" +"string.text" +msgid "Image Information" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"radio-lossless\n" +"label\n" +"string.text" +msgid "Lossless Compression" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"checkbox-reduce-resolution\n" +"label\n" +"string.text" +msgid "Reduce Image Resolution" +msgstr "" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label2\n" +"label\n" +"string.text" +msgid "Width:" +msgstr "Å irina" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label3\n" +"label\n" +"string.text" +msgid "Heigth:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"radio-jpeg\n" +"label\n" +"string.text" +msgid "JPEG Compression" +msgstr "" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label4\n" +"label\n" +"string.text" +msgid "Resolution:" +msgstr "Rezolucija" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label6\n" +"label\n" +"string.text" +msgid "Quality:" +msgstr "Kvalitet" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"label5\n" +"label\n" +"string.text" +msgid "Compression:" +msgstr "Komprimovanje" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label11\n" +"label\n" +"string.text" +msgid "Interpolation:" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label12\n" +"label\n" +"string.text" +msgid "px" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label13\n" +"label\n" +"string.text" +msgid "px" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"label14\n" +"label\n" +"string.text" +msgid "DPI" +msgstr "" + +#: compressgraphicdialog.ui +#, fuzzy +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"0\n" +"stringlist.text" +msgid "None" +msgstr "Nijedan" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"1\n" +"stringlist.text" +msgid "Bilinear" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"2\n" +"stringlist.text" +msgid "Bicubic" +msgstr "" + +#: compressgraphicdialog.ui +msgctxt "" +"compressgraphicdialog.ui\n" +"interpolation-method-store\n" +"3\n" +"stringlist.text" +msgid "Lanczos" +msgstr "" diff --git a/source/sr/svx/uiconfig/ui.po b/source/sr/svx/uiconfig/ui.po new file mode 100644 index 000..6495f08 --- /dev/null +++ b/source/sr/svx/uiconfig/ui.po @@ -0,0 +1,212 @@ +#. extracted from svx/uiconfig/ui +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: LibO 40l10n\n" +"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; +"POT-Creation-Date: 2013-01-07 14:15+0100\n" +"PO-Revision-Date: 2012-11-17 19:02+0200\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: sr\n" +"MIME-Version: 1
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 93e281edaa7f2e38b299625f6668e9f56f452e9c Author: Andras Timar Date: Mon Jan 7 14:20:41 2013 +0100 Updated core Project: translations 7dda834b0c49f7d91e5585d3a9430f1905235dbb diff --git a/translations b/translations index c3a029c..7dda834 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit c3a029cb13eda1c9153a23d62e087301161b6c22 +Subproject commit 7dda834b0c49f7d91e5585d3a9430f1905235dbb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: accessibility/source basctl/source cppcanvas/source dbaccess/inc desktop/source editeng/inc editeng/source filter/source idl/inc lotuswordpro/source sc/inc sc/source sd/inc sd
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx |1 accessibility/source/helper/characterattributeshelper.cxx |1 basctl/source/basicide/iderdll2.hxx|1 cppcanvas/source/mtfrenderer/pointaction.cxx |2 - cppcanvas/source/mtfrenderer/polypolyaction.cxx|2 - cppcanvas/source/mtfrenderer/textaction.hxx|2 - dbaccess/inc/ToolBoxHelper.hxx |1 desktop/source/deployment/gui/dp_gui_dependencydialog.cxx |1 editeng/inc/editeng/svxfont.hxx|3 + editeng/source/items/svxfont.cxx |1 editeng/source/misc/swafopt.cxx|1 filter/source/graphicfilter/idxf/dxfvec.cxx|1 filter/source/graphicfilter/idxf/dxfvec.hxx|4 +- idl/inc/bastype.hxx|2 - idl/inc/lex.hxx|2 - lotuswordpro/source/filter/lwpgrfobj.hxx |3 + sc/inc/postit.hxx |2 - sc/source/core/data/postit.cxx |1 sc/source/filter/excel/xechart.cxx |1 sc/source/filter/inc/imp_op.hxx|2 - sc/source/filter/inc/xechart.hxx |2 - sc/source/ui/inc/formdata.hxx |1 sd/inc/sdfilter.hxx|2 - sd/source/filter/eppt/eppt.hxx |2 - sd/source/filter/ppt/propread.hxx |2 - sd/source/ui/inc/undoheaderfooter.hxx |1 sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx |1 sd/source/ui/slidesorter/cache/SlsPageCache.cxx|1 sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx|2 - sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx |1 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx|2 - sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx |2 - sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |1 sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx |3 + sfx2/inc/sfx2/imgmgr.hxx |1 slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx |3 + slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx |3 + svl/source/items/szitem.cxx|1 svtools/inc/svtools/fltcall.hxx|2 - svtools/inc/svtools/javainteractionhandler.hxx |2 - svtools/inc/svtools/scriptedtext.hxx |3 + svtools/source/control/scriptedtext.cxx|1 svx/inc/svx/EnhancedCustomShape2d.hxx |1 svx/inc/svx/IAccessibleViewForwarderListener.hxx |1 svx/inc/svx/framelink.hxx |3 + svx/inc/svx/msdffdef.hxx |2 - svx/inc/svx/sdr/contact/objectcontactofpageview.hxx|1 svx/inc/svx/sdr/contact/viewcontact.hxx|1 svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx |1 svx/inc/svx/sdr/contact/viewobjectcontact.hxx |1 svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx |1 svx/inc/svx/sdr/overlay/overlayhatchrect.hxx |1 svx/inc/svx/sdr/overlay/overlayobjectlist.hxx |4 +- svx/inc/svx/unoshape.hxx |4 +- svx/inc/xpolyimp.hxx |3 + svx/source/dialog/framelink.cxx|1 svx/source/gallery2/codec.hxx |2 - svx/source/mnuctrls/clipboardctl.cxx |1 svx/source/sdr/overlay/overlaycrosshair.cxx|1 svx/source/sdr/overlay/overlayhelpline.cxx |1 svx/source/sdr/overlay/overlayline.cxx |1 svx/source/sdr/overlay/overlayobjectlist.cxx |1 svx/source/sdr/overlay/overlayrollingrectangle.cxx |1 svx/source/svdraw/gradtrns.hxx |1 svx/source/table/tablelayouter.cxx |2 + svx/source/table/tablelay
[PUSHED] Code enhancement remove duplicate code from presenter consol...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1480 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibbb131b64c66307d38a135ac570c1e2ed37bef6c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterWindowManager.cxx | 125 --
1 file changed, 28 insertions(+), 97 deletions(-)
New commits:
commit 07969f6effe89b8cdc65764135337054751f280e
Author: Abdulmajeed Al-Abaulrazzaq
Date: Mon Dec 24 12:38:10 2012 +0300
Code enhancement remove duplicate code from presenter console
Change-Id: Ibbb131b64c66307d38a135ac570c1e2ed37bef6c
Reviewed-on: https://gerrit.libreoffice.org/1480
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx
b/sdext/source/presenter/PresenterWindowManager.cxx
index 7c8124d..9f1e8d0 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -656,8 +656,8 @@ void PresenterWindowManager::LayoutStandardMode (void)
const double nGap (20);
const double nHorizontalSlideDivide (aBox.Width / nGoldenRatio);
double nSlidePreviewTop (0);
- /// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL()){
+
+
// For the current slide view calculate the outer height from the outer
// width. This takes into acount the slide aspect ratio and thus has to
// go over the inner pane size.
@@ -669,9 +669,13 @@ void PresenterWindowManager::LayoutStandardMode (void)
nHorizontalSlideDivide - 1.5*nGap,
PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
nSlidePreviewTop = (aBox.Height - aCurrentSlideOuterBox.Height) / 2;
+double Temp=nGap;
+/// check whether RTL interface or not
+if(Application::GetSettings().GetLayoutRTL())
+Temp=aBox.Width - aCurrentSlideOuterBox.Width - nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msCurrentSlidePreviewPaneURL,
-nGap,
+Temp,
nSlidePreviewTop,
aCurrentSlideOuterBox.Width,
aCurrentSlideOuterBox.Height);
@@ -686,51 +690,18 @@ void PresenterWindowManager::LayoutStandardMode (void)
const awt::Size aNextSlideOuterBox (CalculatePaneSize(
aBox.Width - nHorizontalSlideDivide - 1.5*nGap,
PresenterPaneFactory::msNextSlidePreviewPaneURL));
+double Temp=aBox.Width - aNextSlideOuterBox.Width - nGap;
+/// check whether RTL interface or not
+if(Application::GetSettings().GetLayoutRTL())
+Temp=nGap;
SetPanePosSizeAbsolute (
PresenterPaneFactory::msNextSlidePreviewPaneURL,
-aBox.Width - aNextSlideOuterBox.Width - nGap,
+Temp,
nSlidePreviewTop,
aNextSlideOuterBox.Width,
aNextSlideOuterBox.Height);
}
- }else{
-// For the current slide view calculate the outer height from the outer
-// width. This takes into acount the slide aspect ratio and thus has to
-// go over the inner pane size.
- PresenterPaneContainer::SharedPaneDescriptor pPane (
-
mpPaneContainer->FindPaneURL(PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
-if (pPane.get() != NULL)
-{
-const awt::Size aNextSlideOuterBox (CalculatePaneSize(
-nHorizontalSlideDivide - 1.5*nGap,
-PresenterPaneFactory::msCurrentSlidePreviewPaneURL));
-nSlidePreviewTop = (aBox.Height - aNextSlideOuterBox.Height) / 2;
-SetPanePosSizeAbsolute (
-PresenterPaneFactory::msCurrentSlidePreviewPaneURL,
-aBox.Width - aNextSlideOuterBox.Width - nGap,
-nSlidePreviewTop,
-aNextSlideOuterBox.Width,
-aNextSlideOuterBox.Height);
-}
-
-// For the next slide view calculate the outer height from the outer
-// width. This takes into acount the slide aspect ratio and thus has to
-// go over the inner pane size.
-pPane =
mpPaneContainer->FindPaneURL(PresenterPaneFactory::msNextSlidePreviewPaneURL);
-if (pPane.get() != NULL)
-{
-const awt::Size aCurrentSlideOuterBox(CalculatePaneSize(
-aBox.Width - nHorizontalSlideDivide - 1.5*nGap,
-PresenterPaneFactory::msNextSlidePreviewPaneURL));
-SetPanePosSizeAbsolute (
-PresenterPaneFactory::msNextSlidePreviewPaneURL,
-nGap,
-nSlidePreviewTop,
-aCurrentSlideOuterBox.Width,
-aCurrentSlideOuterBox.Height);
-}
- }
LayoutToolBar();
}
@@ -748,7 +719,7 @@ void PresenterWindowManager::LayoutNotesMode (void)
double nSlidePreviewTop (0);
double nNotesViewBottom (aToolBarBox.Y1 - nGap);
/// check whether RTL interface or not
- if(!Application::GetSettings().GetLayoutRTL()){
+
// The notes view has no fixed aspect ratio.
PresenterPaneContainer::SharedPaneDescriptor pPane (
@@ -760,9 +731,13 @@ void PresenterWindowManager::LayoutNotesMode (void)
nNotesViewBottom);
nSlidePreviewTop = (aBox.Height
- aToolBarBox.Y2 + aTool
Re: not installing icon themes
Hello Petr, Il 07/01/2013 13:44, Petr Mladek ha scritto: On Fri, 2013-01-04 at 18:47 +0100, Riccardo Magliocchetti wrote: Hello, i'd like to start stripping unneeded stuff when building for headless, starting from images. I've tried with --with-theme="" but got the default themes instead. Would it be ok to change the meaning of "" to be none instead of default? What about disabling all themes when using the option "--without-theme". It is the same as "--with-theme=no". In each case, we should make sure that some theme is used if you do not use this option at all. Most builders want some icon theme and we should not force them using this option everytime ;-) Indeed :) Then i've tried with this patch which compiles fine but gives an error at install time because the installer still looks for them. Some grepping of "theme" in solenv shows gb_ResTarget_DEFIMAGESLOCATION which used later in $(call gb_ResTarget_get_target,%) makes me think that at least an icon set is mandatory. Any hint on a sensible approach? I am sorry, I do not have time to investigate. Does it fail in postprocess or in instsettoo_native? If it fails in instsetto_native, you might want to look into the scp2 module. It defines what files are needed during installation. You might need to add some extra #ifdefs around the icons. If it fails in postprocess, it might really need some tweaking of the scripts and makefiles. Ah! I haven't taken scp2 into account, thanks for the hint. thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac
configure.ac |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 37c6106f3a74f249cd421454d20f8ce561f71eb0 Author: Tor Lillqvist Date: Mon Jan 7 14:40:51 2013 +0200 Since 6eff6fae6272e8ed5d74553597bb4b73db3f2864 Python needed on Windows Change-Id: Id49730b7ad2f7122a2c9b0415330b6fb803ec21c diff --git a/configure.ac b/configure.ac index 0a1fd05..2fa044f 100644 --- a/configure.ac +++ b/configure.ac @@ -7415,12 +7415,18 @@ AC_MSG_CHECKING([which Python to use]) case "$enable_python" in no|disable) +if test $build_os = cygwin; then +# Python is required to build nss. In theory we could separate the build-time Python +# requirement from the choice whether to include Python stuff in the installer, but why +# bother? +AC_MSG_ERROR([Python is required at build time when building on Windows]) +fi enable_python=no AC_MSG_RESULT([none]) DISABLE_PYTHON=TRUE ;; ""|yes|auto) -if test "$DISABLE_SCRIPTING" = TRUE; then +if test "$DISABLE_SCRIPTING" = TRUE -a $build_os != cygwin; then AC_MSG_RESULT([no, overridden by --disable-scripting]) enable_python=no DISABLE_PYTHON=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: [PATCH] Change public variables of class ImplFontAttributes to priva...
I hereby declare that:
All my contributions, past and future, to LibreOffice are licensed
under the terms of the MPL / LGPLv3+.
thanks,
--navin-patidar
From: libreoffice-bounces+patidar=kacst.edu...@lists.freedesktop.org
[libreoffice-bounces+patidar=kacst.edu...@lists.freedesktop.org] on behalf of
navin patidar (via Code Review) [ger...@gerrit.libreoffice.org]
Sent: Saturday, January 05, 2013 10:38 PM
To: Norbert Thiebaud
Cc: LibreOffice Developer List
Subject: [PATCH] Change public variables of class ImplFontAttributes to priva...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1551
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1551/1
Change public variables of class ImplFontAttributes to private.
Change-Id: I56ff5d7d2420c334c6fc9e4c552f8b5c4715d93f
---
M vcl/generic/fontmanager/fontconfig.cxx
M vcl/generic/fontmanager/fontsubst.cxx
M vcl/generic/glyphs/gcach_ftyp.cxx
M vcl/generic/glyphs/glyphcache.cxx
M vcl/generic/print/genpspgraphics.cxx
M vcl/inc/outfont.hxx
M vcl/source/gdi/font.cxx
M vcl/source/gdi/outdev3.cxx
M vcl/source/gdi/pdfwriter_impl.cxx
9 files changed, 163 insertions(+), 148 deletions(-)
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index b707b78..0efdbe4 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -946,8 +946,8 @@
FcCharSetDestroy(unicodes);
}
-addtopattern(pPattern, rPattern.meItalic, rPattern.meWeight,
-rPattern.meWidthType, rPattern.mePitch);
+addtopattern(pPattern, rPattern.GetSlant(), rPattern.GetWeight(),
+rPattern.GetWidthType(), rPattern.GetPitch());
// query fontconfig for a substitute
FcConfigSubstitute(FcConfigGetCurrent(), pPattern, FcMatchPattern);
@@ -1017,13 +1017,13 @@
{
int val = 0;
if (FcResultMatch == FcPatternGetInteger(pSet->fonts[0],
FC_WEIGHT, 0, &val))
-rPattern.meWeight = convertWeight(val);
+rPattern.SetWeight( convertWeight(val) );
if (FcResultMatch == FcPatternGetInteger(pSet->fonts[0],
FC_SLANT, 0, &val))
-rPattern.meItalic = convertSlant(val);
+rPattern.SetItalic( convertSlant(val) );
if (FcResultMatch == FcPatternGetInteger(pSet->fonts[0],
FC_SPACING, 0, &val))
-rPattern.mePitch = convertSpacing(val);
+rPattern.SetPitch ( convertSpacing(val) );
if (FcResultMatch == FcPatternGetInteger(pSet->fonts[0],
FC_WIDTH, 0, &val))
-rPattern.meWidthType = convertWidth(val);
+rPattern.SetWidthType ( convertWidth(val) );
FcBool bEmbolden;
if (FcResultMatch == FcPatternGetBool(pSet->fonts[0],
FC_EMBOLDEN, 0, &bEmbolden))
rPattern.mbEmbolden = bEmbolden;
diff --git a/vcl/generic/fontmanager/fontsubst.cxx
b/vcl/generic/fontmanager/fontsubst.cxx
index 23ac968..a026ee9 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -132,10 +132,10 @@
return
(
rOrig.maTargetName == rNew.maSearchName &&
-rOrig.meWeight == rNew.meWeight &&
-rOrig.meItalic == rNew.meItalic &&
-rOrig.mePitch == rNew.mePitch &&
-rOrig.meWidthType == rNew.meWidthType
+rOrig.GetWeight() == rNew.GetWeight() &&
+rOrig.GetSlant() == rNew.GetSlant() &&
+rOrig.GetPitch() == rNew.GetPitch() &&
+rOrig.GetWidthType() == rNew.GetWidthType()
);
}
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx
b/vcl/generic/glyphs/gcach_ftyp.cxx
index d7e693b..de44e31 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -788,8 +788,8 @@
mnLoadFlags |= FT_LOAD_IGNORE_TRANSFORM;
#endif
-mbArtItalic = (rFSD.meItalic != ITALIC_NONE &&
pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
-mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM &&
pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
+mbArtItalic = (rFSD.GetSlant() != ITALIC_NONE &&
pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
+mbArtBold = (rFSD.GetWeight() > WEIGHT_MEDIUM &&
pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
mbUseGamma = false;
if( mbArtBold )
{
@@ -934,7 +934,7 @@
(rTo.GetFamilyName().EqualsAscii("StarSymbol"))
)
{
-rTo.mbSymbolFlag = true;
+rTo.SetSymbolFlag( true );
}
if( maSizeFT )
@@ -964,11 +964,11 @@
// map the panose info from the OS2 table to their VCL counterparts
switch( pOS2->panose[0] )
{
-case 1: rTo.meFamily = FAMILY_ROMAN; break;
-case 2: rTo.meFamily = FAMILY_SWISS; break;
-
Re: Extending Dictionaries
On 2013-01-03 at 17:30 +0100 Samuel Mehrbrodt sent off: > If there are no objections from the plugin authors, I'll create a > patch against the dictionaries file. please jsut send me the list of words. Patching dictionaries doesn't make much sense for getting that upstream. The dictionary is a "compiled" version of the dictionaries of igerman98. Cheers Björn signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
