[Libreoffice-commits] .: sc/source
sc/source/ui/view/dbfunc3.cxx | 25 +
1 file changed, 9 insertions(+), 16 deletions(-)
New commits:
commit 6e57e691fa87b4b60678cc3f9a89ac7034a0ebdd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Dec 5 14:16:25 2012 -0500
Same logic without using the boolean variable.
Slightly simpler to follow its logic.
Change-Id: I988158c93c813fbeffe8e0319c7970d2d3cf3e02
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 5925e3f..84754c2 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1238,8 +1238,6 @@ void ScDBFunc::UngroupDataPilot()
ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
-bool bApply = false;
-
ScDPSaveGroupDimension* pGroupDim = pDimData-GetNamedGroupDimAcc(
aDimName );
const ScDPSaveNumGroupDimension* pNumGroupDim = pDimData-GetNumGroupDim(
aDimName );
if ( ( pGroupDim pGroupDim-GetDatePart() != 0 ) ||
@@ -1249,10 +1247,10 @@ void ScDBFunc::UngroupDataPilot()
// This is done using DateGroupDataPilot with nParts=0.
DateGroupDataPilot( ScDPNumGroupInfo(), 0 );
-// bApply remains FALSE
-// dimension pointers become invalid
+return;
}
-else if ( pGroupDim )
+
+if ( pGroupDim )
{
ScDPUniqueStringSet::const_iterator it = aEntries.begin(), itEnd =
aEntries.end();
for (; it != itEnd; ++it)
@@ -1275,26 +1273,21 @@ void ScDBFunc::UngroupDataPilot()
// also remove SaveData settings for the dimension that no longer
exists
aData.RemoveDimensionByName( aDimName );
}
-bApply = true;
}
else if ( pNumGroupDim )
{
// remove the numerical grouping
pDimData-RemoveNumGroupDimension( aDimName );
// SaveData settings can remain unchanged - the same dimension still
exists
-bApply = true;
}
-if ( bApply )
-{
-// apply changes
-ScDBDocFunc aFunc( *GetViewData()-GetDocShell() );
-pDPObj-SetSaveData( aData );
-aFunc.RefreshPivotTableGroups(pDPObj);
+// apply changes
+ScDBDocFunc aFunc( *GetViewData()-GetDocShell() );
+pDPObj-SetSaveData( aData );
+aFunc.RefreshPivotTableGroups(pDPObj);
-// unmark cell selection
-Unmark();
-}
+// unmark cell selection
+Unmark();
}
static OUString lcl_replaceMemberNameInSubtotal(const OUString rSubtotal,
const OUString rMemberName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/view/dbfunc3.cxx | 25 +
1 file changed, 9 insertions(+), 16 deletions(-)
New commits:
commit 233d840bd2f56ea50e0a26b96e42c2fae802c427
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Dec 5 14:16:25 2012 -0500
Same logic without using the boolean variable.
Slightly simpler to follow its logic.
Change-Id: I988158c93c813fbeffe8e0319c7970d2d3cf3e02
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 5925e3f..84754c2 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -1238,8 +1238,6 @@ void ScDBFunc::UngroupDataPilot()
ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
-bool bApply = false;
-
ScDPSaveGroupDimension* pGroupDim = pDimData-GetNamedGroupDimAcc(
aDimName );
const ScDPSaveNumGroupDimension* pNumGroupDim = pDimData-GetNumGroupDim(
aDimName );
if ( ( pGroupDim pGroupDim-GetDatePart() != 0 ) ||
@@ -1249,10 +1247,10 @@ void ScDBFunc::UngroupDataPilot()
// This is done using DateGroupDataPilot with nParts=0.
DateGroupDataPilot( ScDPNumGroupInfo(), 0 );
-// bApply remains FALSE
-// dimension pointers become invalid
+return;
}
-else if ( pGroupDim )
+
+if ( pGroupDim )
{
ScDPUniqueStringSet::const_iterator it = aEntries.begin(), itEnd =
aEntries.end();
for (; it != itEnd; ++it)
@@ -1275,26 +1273,21 @@ void ScDBFunc::UngroupDataPilot()
// also remove SaveData settings for the dimension that no longer
exists
aData.RemoveDimensionByName( aDimName );
}
-bApply = true;
}
else if ( pNumGroupDim )
{
// remove the numerical grouping
pDimData-RemoveNumGroupDimension( aDimName );
// SaveData settings can remain unchanged - the same dimension still
exists
-bApply = true;
}
-if ( bApply )
-{
-// apply changes
-ScDBDocFunc aFunc( *GetViewData()-GetDocShell() );
-pDPObj-SetSaveData( aData );
-aFunc.RefreshPivotTableGroups(pDPObj);
+// apply changes
+ScDBDocFunc aFunc( *GetViewData()-GetDocShell() );
+pDPObj-SetSaveData( aData );
+aFunc.RefreshPivotTableGroups(pDPObj);
-// unmark cell selection
-Unmark();
-}
+// unmark cell selection
+Unmark();
}
static OUString lcl_replaceMemberNameInSubtotal(const OUString rSubtotal,
const OUString rMemberName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] Minutes - QA Call 2012/11/30
*Time Start: 1405 UTC Participants: Bjoern, Joel, Florian, Petr +Another participant was present, apologies for not getting name *Completed Action Items +BSA -Invitation to participate after submitting a bug [Rob] +Wiki -Basic triage instructions (BSA linked to this page) [Joel Petr] +FDO -Renamed 3.7 master to 4.0 master and moved bugs [Joel] *Pending Action Items +FDO -Old Bugs (6+ months, no activity) Options *Concern that really old bugs are no longer bugs any longer on current releases but that they were fixed independent of the bug and therefore never marked as RESOLVED → FIXED *New White Board Status Possible (Inactive) *Lower Priority Automatically -Problems with this, not a good option *Using Enhancement Status More -Concern that bugs might be listed as Enhancement accidentally *Any option will require communication with bug submitter to ask for further testing *This isn't an urgent matter and any solution should be well thought out before implementing -Identifying Most Active Bugs *Similar to the heat meter which Canonical uses for bugs *Joel is going to play around with FDO and see if there's any way we can do something similar internally +Bugzilla OpenID Alternatives -OpenID is not an option *Bjoern will discuss with Tolef to find out if there are alternatives *Possibilities include GoogleID, Facebook, Twitter -Goal to have one authenticator is unlikely to occur *Florian is a big fan of Google Login +BSA -Localization *Rob discussed during hackfest, said sounds good should be doable *Joel will email Rob for Update +Twitter Feed -Twitter feed to announce bug fixes (great for marketing/getting more volunteers involved) *Bjoern researching this, will ping Florian about this -Note that there is a max per hour for tweets but we shouldn't hit this limit +Goals -Punt until after release of version 4.0 +Hard Hacks -Keep an eye out for hard hacks -Joel add 57619 *New Items +Meetbot -Meetbot is set up and Bjoern/Joel played around with it, weren't quite comfortable enough to use it yet -Not very functional for making agendas -Minutes uploaded to TDF server, not Wiki *Joel will link to documents from wiki -Goal to try during next QA Call +Funding Wish List -Discussed Marc's funding wish list *http://wiki.documentfoundation.org/Marketing/Funding_Priorities -Going to be a limited funding request because most larger items paid for, just need volunteers to implement -QA Travel Expenses *Travel expenses not paid separate from main fund, no need to request -FDO Improvements *Possibly pay someone through a contract to implement some of Rainer's list of improvements to FDO -http://wiki.documentfoundation.org/How_to_Improve_Bugzilla *Bjoern will go through list and prioritize them, try to come up with amount -Prizes/Thank You's for most active QA volunteers *Possible, need to discuss more and come up with concrete plan +Leadership Structure/”Board of QA” -First thing has to be getting call right and getting more people involved -Question about if we need a board at all is still up in the air -Joel will announce next Call to user list as a test to see how it goes +Triage Contest -General agreement that this is a good idea -Date is a concern, right after final release of 4 might be good because a lot of people are excited about the release -Bjoern will talk to TDF Board about money -Joel will start creating a wiki -Next meeting we will discuss more details -Talk to Cor Nouws Italo Vignoli about their experience -See http://wiki.documentfoundation.org/QA/BugHunting_Session_3.5.0.-1 for example *To Do List +Joel -See if we can get some “heat meter” internally with what is available on FDO -Make wiki for triage contest -Contact Rob about localized BSA -Announce next QA call on user list -Add hard hack -Get comfortable with meetbot +Bjoern -OpenID Alternatives -Twitter Feed -Go through FDO list to see if we can pay someone to implement changes -Discuss money with TDF for triage contest Time End: 1505 UTC ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Modify the default Style list in Writer, give them a custom ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1248 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1248/1 Modify the default Style list in Writer, give them a custom order. Asking on UX-Advise, there were no negative voices for this change: http://nabble.documentfoundation.org/Libreoffice-ux-advise-Default-Styles-in-Writer-td4020441.html Change-Id: I780eaecc29c88493f09194399dfc00be1484c549 --- M svx/source/tbxctrls/tbcontrl.cxx 1 file changed, 10 insertions(+), 8 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1248 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I780eaecc29c88493f09194399dfc00be1484c549 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix position correction for flipped shapes
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1250 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1250/1 fix position correction for flipped shapes This complements change ef3f5a37a4ff0d86911903fc6e6083e182b67dd5. The Translation-compensation of that fix didn't work for flipped shapes. Also, vertically flipped shapes made problems. Also 360 °C = 0°C (drawingml.hxx) I didn't dare to fix it earlier because there is some problem with the selection frames. But that is an import bug, not caused by some export stuff! This import bug makes the manipulation rectangles around the shapes flipped turning in the wrong direction, perhaps due to CroftCro$oft clockwisification! Change-Id: I05aa036d31cd5d9a8b194897b3d92ec12d6d2c61 Signed-off-by: Lennard wassert...@nefkom.net --- M oox/inc/oox/export/drawingml.hxx M oox/source/export/drawingml.cxx 2 files changed, 9 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1250 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05aa036d31cd5d9a8b194897b3d92ec12d6d2c61 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lennard Wasserthal wassert...@nefkom.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
About numbertext
Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/share/extensions/numbertext/reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien -- View this message in context: http://nabble.documentfoundation.org/About-numbertext-tp4022762.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/dbgui/pvlaydlg.cxx | 40 +++-
sc/source/ui/inc/pvlaydlg.hxx |4 ++--
2 files changed, 25 insertions(+), 19 deletions(-)
New commits:
commit 1d5ec29f4ce11bf273e554c97a65191372ff87bd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Dec 5 16:34:01 2012 -0500
Don't forget to set focus handler for the reference edit boxes.
Or else the reference mode wouldn't work at all. Also rename the
pointer that holds the current reference edit box instance, to be
consistent with our other reference edit dialogs.
Change-Id: I72e98b5a81b4c313d41c5bd0e429781997cf78b2
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 3dfa58e..3ef8e0b 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -116,7 +116,7 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB,
SfxChildWindow* pCW, Window
mxDlgDPObject( new ScDPObject( rDPObject ) ),
mpViewData( ((ScTabViewShell*)SfxViewShell::Current())-GetViewData() ),
mpDoc(
((ScTabViewShell*)SfxViewShell::Current())-GetViewData()-GetDocument() ),
-mpActiveEdit(NULL),
+mpRefInputEdit(NULL),
maStrUndefined(SC_RESSTR(SCSTR_UNDEFINED)),
maStrNewTable(SC_RESSTR(SCSTR_NEWTABLE)),
@@ -185,6 +185,12 @@ ScPivotLayoutDlg::ScPivotLayoutDlg( SfxBindings* pB,
SfxChildWindow* pCW, Window
maBtnOk.SetClickHdl( LINK( this, ScPivotLayoutDlg, OkHdl ) );
maBtnCancel.SetClickHdl( LINK( this, ScPivotLayoutDlg, CancelHdl ) );
+// Set focus handler for the reference edit text boxes.
+Link aGetFocusLink = LINK(this, ScPivotLayoutDlg, GetFocusHdl);
+if (maEdInPos.IsEnabled())
+maEdInPos.SetGetFocusHdl(aGetFocusLink);
+maEdOutPos.SetGetFocusHdl(aGetFocusLink);
+
if ( mpViewData mpDoc )
{
/*
@@ -1597,23 +1603,23 @@ sal_uInt8 ScPivotLayoutDlg::GetNextDupCount(
void ScPivotLayoutDlg::SetReference( const ScRange rRef, ScDocument* pDoc )
{
-if ( !mbRefInputMode || !mpActiveEdit )
+if (!mbRefInputMode || !mpRefInputEdit)
return;
if ( rRef.aStart != rRef.aEnd )
-RefInputStart( mpActiveEdit );
+RefInputStart(mpRefInputEdit);
-if ( mpActiveEdit == maEdInPos )
+if (mpRefInputEdit == maEdInPos)
{
rtl::OUString aRefStr;
rRef.Format( aRefStr, SCR_ABS_3D, pDoc, pDoc-GetAddressConvention() );
-mpActiveEdit-SetRefString( aRefStr );
+mpRefInputEdit-SetRefString(aRefStr);
}
-else if ( mpActiveEdit == maEdOutPos )
+else if (mpRefInputEdit == maEdOutPos)
{
rtl::OUString aRefStr;
rRef.aStart.Format( aRefStr, STD_FORMAT, pDoc,
pDoc-GetAddressConvention() );
-mpActiveEdit-SetRefString( aRefStr );
+mpRefInputEdit-SetRefString(aRefStr);
}
}
@@ -1626,12 +1632,12 @@ void ScPivotLayoutDlg::SetActive()
{
if ( mbRefInputMode )
{
-if ( mpActiveEdit )
-mpActiveEdit-GrabFocus();
+if (mpRefInputEdit)
+mpRefInputEdit-GrabFocus();
-if ( mpActiveEdit == maEdInPos )
+if (mpRefInputEdit == maEdInPos)
EdInModifyHdl( NULL );
-else if ( mpActiveEdit == maEdOutPos )
+else if (mpRefInputEdit == maEdOutPos)
EdOutModifyHdl( NULL );
}
else
@@ -1906,13 +1912,13 @@ IMPL_LINK_NOARG(ScPivotLayoutDlg, SelAreaHdl)
return 0;
}
-IMPL_LINK( ScPivotLayoutDlg, GetFocusHdl, Control*, pCtrl )
+IMPL_LINK( ScPivotLayoutDlg, GetFocusHdl, formula::RefEdit*, pEdit )
{
-mpActiveEdit = NULL;
-if ( pCtrl == maEdInPos )
-mpActiveEdit = maEdInPos;
-else if ( pCtrl == maEdOutPos )
-mpActiveEdit = maEdOutPos;
+if (pEdit == maEdInPos)
+mpRefInputEdit = maEdInPos;
+else if (pEdit == maEdOutPos)
+mpRefInputEdit = maEdOutPos;
+else mpRefInputEdit = NULL;
return 0;
}
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index 9b1ce0a..678ccba 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -204,7 +204,7 @@ private:
DECL_LINK( EdOutModifyHdl, void * );
DECL_LINK( EdInModifyHdl, void * );
DECL_LINK( SelAreaHdl, void * );
-DECL_LINK( GetFocusHdl, Control* );
+DECL_LINK( GetFocusHdl, formula::RefEdit* );
private:
struct FieldRect
@@ -257,7 +257,7 @@ private:
ScViewData* mpViewData;
ScDocument* mpDoc;
-::formula::RefEdit* mpActiveEdit;
+formula::RefEdit* mpRefInputEdit;
const rtl::OUString maStrUndefined;
const rtl::OUString maStrNewTable;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: callgrind / profiling ...
The next couple of days I'll work on the automation of producing a graphing
of this magic number.
Also I'm doing repeat testing now to get a feeling of the kind of spread in
the numbers that cachegrind is producing.
Stephan
2012/12/5 Michael Meeks michael.me...@suse.com
Hi guys,
Forwarding Josef's rather interesting mail (with permission) to
the dev
list - since it's generally useful :-) Stephan is working on plugging a
nice callgrinding script into tinderbox building so we can build an
automated performance tracker that will catch even small - 0.5% type
performance regressions which can accumulate over time - and do it in a
reproducible way, independent of the underlying hardware.
Thanks so much for working on this Stephan; it seems the punch-line
formula for the magic number should be:
Actually, what I have in recent versions of {Q,K}Cachegrind is this:
CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
ATB !
Michael.
Forwarded Message
Hi,
Am 04.12.2012 15:07, schrieb Julian Seward:
Josef,
Gruesse. See below ..
Michael:
Josef is the expert on this, so forwarding it to him.
It used to be 1 * #insns + 10 * #L1 misses + 100 * #L2 misses,
but I wouldn't put too much reliance on it. It was just something
that (IIRC!) NickN and I kludged up during a coffee break probably
about a decade ago at cl.cam.ac.uk. Like so many other bits of
Valgrind :-) (*)
AFAIK, Cachegrind always just printed out the raw event numbers.
Also, nowhere in Callgrind you will find that magic formula ;-)
I think I actually was the one who came up with that formula as
a rough Cycle Estimation in KCachegrind ;-)
Actually, doing a somehow accurate time estimation is quite tricky.
The rule of thumb should be: If you come up with an optimization
reducing miss numbers (and also the time estimation formula above),
always also check against real time.
In general, any estimation using cache metrics gets more accurate
the worse the cache behavior of the application, as time needed
for memory accesses is more predictable and hides any smaller latencies
within a core, especially with out-of-order execution, and even
ARM application cores are out-of-order nowadays (Cortex A9/A15).
The most accurate thing next to real measurement would be cycle-accurate
simulation, which of course is out of scope. There is some nice work
on a simpler, yet quite accurate processor timing model using so-called
interval simulation, as implemented in the Sniper simulator
(see http://snipersim.org). However, it's roughly an order of magnitude
slower than Cachegrind/Callgrind.
The biggest issues with the simple formulas above are:
(1) Hardware prefetching is not taken into account, which often allows
streaming of data at maximum bandwidth from memory,
(2) Latency hiding effects are not included, e.g. it easily can happen
that with lots of memory accesses, it does not matter if the code
actually was compiled with -O3 or -O0. Further, it can make
a huge difference whether two consecutive memory accesses depend on each
other or not (ie. one hiding the latency of the other or not).
(3) Saturation effects are not taken into account. E.g. if all cores
on a multicore chip do memory accesses at the same time, the limited
bandwidth going off-chip will slow down each of them.
Thus, the accuracy of the simple formula very much depends on an
average application behavior, in the hope that the difficult
effects mentioned above do not play too much of a role each.
BTW, one can argue whether L1/LL misses on write should appear in
the formula at all. Writes usually are done by the hardware in the
background. However, if there is a memcpy operation doing a lot
of consecutive writes, write buffers will fill up, and will
throttle execution in the end.
That said, I am sure it got checked by Josef :-)
Despite above issues, I still think that it is useful to combine
the cache simulation results into one value. It makes it easier to
get an overview regarding the cache behavior.
The thing is: too make time estimation more accurate, you need to
extend the model, which results in slower simulation.
I have some ideas to make the cache model more accurate for time
estimation, but I am not sure it is worth it (real measurements
are faster anyway).
E.g. there is an optional hardware prefetch simulation in Callgrind.
We can introduce a new event LL miss detected by prefetcher, and
give this e.g. a much lower penalty, depending on the bandwidth your
hardware can do: e.g. if you can do 1GB/s on a 1GHz processor, this
means 1 bytes on average per clock, thus with a 64byte line size
one line can be fetched every 64 cycles. As every LL miss will also
be a L1 miss (with penalty of 10), you would go for around 50 for
the penalty for the new prefetchable memory access event.
For latency effects, it gets more complicated as
Re: Reworking the MSVC-related build options
Le Wed, 05 Dec 2012 16:56:23 +0100, Norbert Thiebaud nthieb...@gmail.com a écrit: On Wed, Dec 5, 2012 at 9:43 AM, Tor Lillqvist t...@iki.fi wrote: to be able to reproduce a scenario: build using the same config than the one that broke ? Hmm, but there are tons of stuff that can break in various ways, should we have options permanently in there to intentionally reproduce all of them? if something _is_ optional then both way should 'work' (that is not abend/cpu-loop/eat-you-document if one try to use a feature that require that 'option' for instance' And therefore it is usefull to be able to force that options on build. As stated by [1], Remove DirectX implementation for the new XCanvas interface. As came from blame, option was added in 2004 [3]: 2004/05/08 04:44:48 waratah 1.63.8.6: #i26548# Change directx default to on and allow disable Since 2004, we can assume we only need to disable in special cases (since it is the default, and fallback may deprecate anytime from now). I am in favor of removing --disable-directx and --with-directx-home, warning that we did not found DXSDK_DIR and it needs to be set if desired. DXSDK_DIR seems to be provided by installer, so we can complain about not finding it. and Directx SDK is part of prerequisites [2].If you ever need to disable it, just unset DXSDK_DIR. I'm agreeing completely with you that in the absence of any user input, autogen should pick up the mos recent VS available and DirectX if available etc.. I also strongly agree that a single argument to select the VS version when one has more than one is desirable to select a consistent/coherent set of values but still the ability to override is still desirable in corner case... that may not have to be via argument from the command line.. that can also be like for CC, if the value is set in the env, then honor it, otherwise find a best effort value. Norbert PS: if there are combination of options that are not supported, autogen _should_ ideally block them. for instance if system-python is incompatible with internal-openssl, then that should be detected and blocked at configure time. we agree [1] http://wiki.documentfoundation.org/Development/How_to_build/Configure_options [2] http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies [3] http://cgit.freedesktop.org/libreoffice/core/commit/?id=1c01781236a2ea76217f6cad300dfbdfe5ce5ba4 -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac
configure.ac | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 1a65a1b4fb54583a1fb1e5b6e7325bfc8a210c34 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Dec 6 02:33:46 2012 +0200 Set OOO_VENDOR to the login name as fallback If OOO_VENDOR is empty you get annoying warnings from the Windows Resource Compiler at line 55 in solenv/inc/shlinfo.rc. diff --git a/configure.ac b/configure.ac index 7a96485..55ca717 100644 --- a/configure.ac +++ b/configure.ac @@ -11866,7 +11866,17 @@ AC_SUBST(EXTRA_BUILDID) OOO_VENDOR= AC_MSG_CHECKING([for vendor]) if test -z $with_vendor -o $with_vendor = no; then -AC_MSG_RESULT([not set]) +OOO_VENDOR=$USERNAME + +if test -z $OOO_VENDOR; then +OOO_VENDOR=$USER +fi + +if test -z $OOO_VENDOR; then +OOO_VENDOR=`id -u -n` +fi + +AC_MSG_RESULT([not set, using $OOO_VENDOR]) else OOO_VENDOR=$with_vendor AC_MSG_RESULT([$OOO_VENDOR]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.ac sd/Library_sd.mk sd/source
configure.ac |8 +++-
sd/Library_sd.mk |1 +
sd/source/ui/remotecontrol/BluetoothServer.cxx |1 -
3 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 3be458578445b82c718b1a8512d16d706fc2329b
Author: Peter Foley pefol...@verizon.net
Date: Wed Dec 5 19:46:36 2012 -0500
we dont execute config.guess anymore
Change-Id: Ia2a0158b2824748625e4ece26d3a145fefd519cb
diff --git a/configure.ac b/configure.ac
index 48c01d7..b09f2c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12254,9 +12254,6 @@ fi
AC_SUBST(LO_PATH)
-# make sure config.guess is +x; we execute config.guess, so it has to be so
-chmod +x ./config.guess
-
# Generate a configuration timestamp we can use for deps
if test -f config_host.mk; then
mv -f config_host.mk config_host.mk.last
commit 0743ccea543dfcad5c4875b943330fd894a5132a
Author: Peter Foley pefol...@verizon.net
Date: Wed Dec 5 19:41:32 2012 -0500
define must be overridden on cmdline
Change-Id: If85a60d9db69ab96c8a77b7715fc2a51fcd7ba51
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 6390e11..449b761 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -534,6 +534,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
$(eval $(call gb_Library_add_defs,sd,\
-DENABLE_SDREMOTE_BLUETOOTH \
+ $(if $(filter MSC,$(COM)),-UMSC) \
))
endif
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 9ba9bad..63be65e 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -28,7 +28,6 @@
#endif
#ifdef WIN32
- #undef MSC // Unset a legacy define, as otherwise ws2bth.h breaks
#include winsock2.h
#include ws2bth.h
#endif
commit 0f6286ae723e5c677ca02b9376797a3ea047fd45
Author: Peter Foley pefol...@verizon.net
Date: Mon Dec 3 18:54:18 2012 -0500
dont create warn file if no warnings
Change-Id: I338b76971c4fd94455231d58e9d0bcce4524e829
diff --git a/configure.ac b/configure.ac
index 55ca717..48c01d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,6 @@ PathFormat()
fi
}
-cat /dev/null warn
have_WARNINGS=no
add_warning()
{
@@ -12334,6 +12333,8 @@ $GNUMAKE check
_EOF
fi
-cat warn
+if test -f warn; then
+ cat warn
+fi
dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac download Makefile.top oowintool
Makefile.top |9 -
configure.ac | 229 --
download | 81 --
oowintool| 438 ---
4 files changed, 209 insertions(+), 548 deletions(-)
New commits:
commit f9a687719960a6636186cbd2db917ad660139a11
Author: Peter Foley pefol...@verizon.net
Date: Mon Dec 3 18:11:54 2012 -0500
kill oowintool
Change-Id: Ifb0c8a34ecb7b77a92fb67ca947b4ed46f51fd9a
diff --git a/Makefile.top b/Makefile.top
index 9d88c7c..42e134b 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -145,7 +145,7 @@ ifeq ($(BUILD_DMAKE),YES)
endif
rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
config.log config.status configure \
- config_host.mk.last config_host.mk.stamp src.downloaded warn
+ config_host.mk.last config_host.mk.stamp warn
find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
#
@@ -165,7 +165,6 @@ ifneq ($(DO_FETCH_TARBALLS),NO)
include $(SRCDIR)/Makefile.fetch
fetch: download
fetch: get-submodules
-fetch: $(SRCDIR)/src.downloaded
ifneq (,$(wildcard .git))
get-submodules:
@@ -195,12 +194,6 @@ endif
endif
-# TODO: This should be really in external/ module, I think.
-$(SRCDIR)/src.downloaded : $(SRCDIR)/download $(SRCDIR)/config_host.mk |
download
-ifeq ($(COM),MSC)
- $ touch $@
-endif
-
else
fetch:
@echo Automatic fetching of external tarballs is disabled.
diff --git a/configure.ac b/configure.ac
index b09f2c2..fc908e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2829,6 +2829,18 @@ AC_SUBST(XCRUN)
dnl ===
dnl Windows specific tests and stuff
dnl ===
+
+reg_get_value()
+{
+ unset regvalue
+ _regvalue=`cat /proc/registry/$1 2 /dev/null`
+
+ if test $? -eq 0; then
+ regvalue=$_regvalue
+ fi
+}
+
+
if test $_os = WINNT -a $WITH_MINGW != yes; then
AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
if test $enable_64_bit = -o $enable_64_bit = no; then
@@ -3029,12 +3041,44 @@ AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
dnl ===
dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
dnl ===
+find_msvs() {
+# find Visual Studio 2012/2010/2008
+for ver in 11.0 10.0 9.0; do
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
+ if test -n $regvalue; then
+ vstest=$regvalue
+ break
+ fi
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VS/ProductDir
+ if test -n $regvalue; then
+ vstest=$regvalue
+ break
+ fi
+done
+}
+
+find_msvc() {
+# find Visual Studio 2012/2010/2008
+for ver in 11.0 10.0 9.0; do
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
+ if test -n $regvalue; then
+ vctest=$regvalue
+ break
+ fi
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VC/ProductDir
+ if test -n $regvalue; then
+ vctest=$regvalue
+ break
+ fi
+done
+}
+
SHOWINCLUDES_PREFIX=
if test $_os = WINNT; then
if test $WITH_MINGW != yes; then
AC_MSG_CHECKING([for a friendly Microsoft C/C++ compiler installation
path])
if test -z $with_cl_home; then
-vctest=`./oowintool --msvc-productdir`
+ find_msvc
if test $BITNESS_OVERRIDE = ; then
if test -x $vctest/bin/cl.exe; then
with_cl_home=$vctest
@@ -4099,7 +4143,6 @@ if test $cross_compiling = yes; then
config.guess \
config_host.mk.in \
configure \
-oowintool \
bin/get_config_variables \
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
@@ -4697,7 +4740,146 @@ dnl that to mean Visual Studio .NET 2003 ? And does
this also
dnl in fact apply equally to what we actually support, i.e.
dnl Visual Studio 2008 and 2010?)
dnl ===
+find_csc() {
+if test $VCVER -eq 90; then
+ reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v3.5/InstallPath
+ if test -n $regvalue; then
+ csctest=$regvalue
+ return
+ fi
+ reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot
+ if test -n $regvalue; then
+ csctest=${regvalue}v2.0.50727
+ fi
+else
+ reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v4/Client/InstallPath
+ if test -n $regvalue; then
+
[PUSHED] kill oowintool
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1240 -- To view, visit https://gerrit.libreoffice.org/1240 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb0c8a34ecb7b77a92fb67ca947b4ed46f51fd9a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Peter Foley jpfol...@gmail.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ATTENTION] Git repo move to gerrit.libreoofice.org
Dear all, I've clone the remainder of the active git repo that are on fdo to gerrit that include contrib/buildbot contrib/libvisio contrib/test-files cppunit libcdr libexttextcat libmspub templates voting I'm trying to get the fdo admin to do the change needed to prevent pushing on fdo directly to avoid conflict. That change will also allow full replication from gerrit to fdo in the mean time be careful, if you keep pushing to fdo that may end-up silently overwritten Also, as soon as fdo admin are ready, we can re-establish replication... and this time it will be a mirror replication that is branches that are not on the gerrit side will be removed from fdo too... so make sure that everything is fine on the gerrit side and that all the branches you need are there... (note: the repos newly moved to gerrit were cloned --bare --mirror so they should have all the branches they had on fdo... ) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: icon-themes/galaxy
icon-themes/galaxy/sc/res/xml_attribute.png |binary icon-themes/galaxy/sc/res/xml_element.png|binary icon-themes/galaxy/sc/res/xml_element_repeat.png |binary 3 files changed New commits: commit 332b61dc04bf10906edf89f9fe34a96fde1eeac0 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Dec 5 20:14:35 2012 -0500 Different set of icons for Calc's XML Source dialog. I made them, so they make not look all that polished but at least they are functional. Change-Id: I7964a7d42176f69a68ac831fea032dc521c5fe3f diff --git a/icon-themes/galaxy/sc/res/xml_attribute.png b/icon-themes/galaxy/sc/res/xml_attribute.png index 013bd4b..bba7674 100644 Binary files a/icon-themes/galaxy/sc/res/xml_attribute.png and b/icon-themes/galaxy/sc/res/xml_attribute.png differ diff --git a/icon-themes/galaxy/sc/res/xml_element.png b/icon-themes/galaxy/sc/res/xml_element.png index cda4265..5677673 100644 Binary files a/icon-themes/galaxy/sc/res/xml_element.png and b/icon-themes/galaxy/sc/res/xml_element.png differ diff --git a/icon-themes/galaxy/sc/res/xml_element_repeat.png b/icon-themes/galaxy/sc/res/xml_element_repeat.png index fe90995..0c1098a 100644 Binary files a/icon-themes/galaxy/sc/res/xml_element_repeat.png and b/icon-themes/galaxy/sc/res/xml_element_repeat.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/conditio.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit af3030e6bc0ac443387bca80d2969ad1caa2606b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Dec 5 05:51:20 2012 +0100
OSL_* to SAL_WARN in conditio.cxx
Change-Id: I866217341572a79f653fb9900789a7e523b620a6
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index c193607..a684e63 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -465,7 +465,7 @@ void ScConditionEntry::CompileXML()
void ScConditionEntry::SetSrcString( const rtl::OUString rNew )
{
// aSrcString is only evaluated in CompileXML
-OSL_ENSURE( mpDoc-IsImportingXML(), SetSrcString is only valid for XML
import );
+SAL_WARN_IF( !mpDoc-IsImportingXML(), sc, SetSrcString is only valid
for XML import );
aSrcString = rNew;
}
@@ -1138,7 +1138,7 @@ bool ScConditionEntry::IsValid( double nArg, const
ScAddress rPos ) const
bValid = !bValid;
break;
default:
-OSL_FAIL(unbekannte Operation bei ScConditionEntry);
+SAL_WARN(sc, unbekannte Operation bei ScConditionEntry);
break;
}
return bValid;
@@ -1246,7 +1246,7 @@ bool ScConditionEntry::IsValidStr( const rtl::OUString
rArg, const ScAddress r
break;
// SC_COND_DIRECT schon oben abgefragt
default:
-OSL_FAIL(unbekannte Operation bei ScConditionEntry);
+SAL_WARN(sc, unbekannte Operation bei
ScConditionEntry);
bValid = false;
break;
}
@@ -1317,7 +1317,7 @@ rtl::OUString ScConditionEntry::GetExpression( const
ScAddress rCursor, sal_uIn
}
else
{
-OSL_FAIL(GetExpression: falscher Index);
+SAL_WARN(sc, GetExpression: falscher Index);
}
return aRet;
@@ -1356,7 +1356,7 @@ ScTokenArray* ScConditionEntry::CreateTokenArry(
sal_uInt16 nIndex ) const
}
else
{
-OSL_FAIL(GetExpression: falscher Index);
+SAL_WARN(sc, GetExpression: falscher Index);
}
return pRet;
@@ -2110,7 +2110,7 @@ ScConditionalFormat* ScConditionalFormatList::GetFormat(
sal_uInt32 nKey )
if (itr-GetKey() == nKey)
return (*itr);
-OSL_FAIL(ScConditionalFormatList: Eintrag nicht gefunden);
+SAL_WARN(sc, ScConditionalFormatList: Eintrag nicht gefunden);
return NULL;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - icon-themes/galaxy
icon-themes/galaxy/sc/res/xml_attribute.png |binary icon-themes/galaxy/sc/res/xml_element.png|binary icon-themes/galaxy/sc/res/xml_element_repeat.png |binary 3 files changed New commits: commit d6579884752c298a18b7cdfcc7d1614b55c9c7cc Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Dec 5 20:14:35 2012 -0500 Different set of icons for Calc's XML Source dialog. I made them, so they make not look all that polished but at least they are functional. Change-Id: I7964a7d42176f69a68ac831fea032dc521c5fe3f diff --git a/icon-themes/galaxy/sc/res/xml_attribute.png b/icon-themes/galaxy/sc/res/xml_attribute.png index 013bd4b..bba7674 100644 Binary files a/icon-themes/galaxy/sc/res/xml_attribute.png and b/icon-themes/galaxy/sc/res/xml_attribute.png differ diff --git a/icon-themes/galaxy/sc/res/xml_element.png b/icon-themes/galaxy/sc/res/xml_element.png index cda4265..5677673 100644 Binary files a/icon-themes/galaxy/sc/res/xml_element.png and b/icon-themes/galaxy/sc/res/xml_element.png differ diff --git a/icon-themes/galaxy/sc/res/xml_element_repeat.png b/icon-themes/galaxy/sc/res/xml_element_repeat.png index fe90995..0c1098a 100644 Binary files a/icon-themes/galaxy/sc/res/xml_element_repeat.png and b/icon-themes/galaxy/sc/res/xml_element_repeat.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/inc/gridwin.hxx |4 +++-
sc/source/ui/view/gridwin.cxx | 39 +++
2 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit abb1e3352b21d26e2ea00f504162540daa7d69f2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Dec 6 00:32:22 2012 -0500
Avoid activating window pane when launching popup window.
Else, activating another window pane where the cursor is not would cause
the pivot table field popup to immediately get dismissed after launch
because
ClickExtern() gets called from ActivatePart().
For example, imagine a field popup button is on C2, the cell cursor is
on E5, and the window is frozen between rows 2 and 3. Clicking the popup
button in C2 would launch it for a brief second and dismiss it immediately
afterward. Conceptually, launching a popup in another pane shouldn't
activate that pane anyway. So it makes sense not to activate it for that
scenario.
Change-Id: Ib970cb898fb9c79d254411e2519cfce74c60b72f
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 055924a..fcd4dbf 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -93,6 +93,8 @@ private:
boost::scoped_ptrRectangle mpAutoFillRect;
+struct MouseEventState;
+
/**
* Stores current visible column and row ranges, used to avoid expensive
* operations on objects that are outside visible area.
@@ -228,7 +230,7 @@ private:
sal_Int8DropTransferObj( ScTransferObj* pTransObj, SCCOL
nDestPosX, SCROW nDestPosY,
const Point rLogicPos, sal_Int8
nDndAction );
-voidHandleMouseButtonDown( const MouseEvent rMEvt );
+voidHandleMouseButtonDown( const MouseEvent rMEvt,
MouseEventState rState );
boolDrawMouseButtonDown(const MouseEvent rMEvt);
boolDrawMouseButtonUp(const MouseEvent rMEvt);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fba27b7..c116d43 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -155,6 +155,13 @@ extern SfxViewShell* pScActiveViewShell;//
global.cxx
extern sal_uInt16 nScClickMouseModifier;// global.cxx
extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
+struct ScGridWindow::MouseEventState
+{
+bool mbActivatePart;
+
+MouseEventState() : mbActivatePart(false) {}
+};
+
#define SC_FILTERLISTBOX_LINES 12
//
@@ -1720,7 +1727,10 @@ void ScGridWindow::MouseButtonDown( const MouseEvent
rMEvt )
{
nNestedButtonState = SC_NESTEDBUTTON_DOWN;
-HandleMouseButtonDown( rMEvt );
+MouseEventState aState;
+HandleMouseButtonDown(rMEvt, aState);
+if (aState.mbActivatePart)
+pViewData-GetView()-ActivatePart(eWhich);
if ( nNestedButtonState == SC_NESTEDBUTTON_UP )
{
@@ -1737,7 +1747,7 @@ void ScGridWindow::MouseButtonDown( const MouseEvent
rMEvt )
nNestedButtonState = SC_NESTEDBUTTON_NONE;
}
-void ScGridWindow::HandleMouseButtonDown( const MouseEvent rMEvt )
+void ScGridWindow::HandleMouseButtonDown( const MouseEvent rMEvt,
MouseEventState rState )
{
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the event.
@@ -1818,12 +1828,9 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
if (!bDouble)
nMouseStatus = SC_GM_NONE;
-if (!bFormulaMode)
-{
-if ( pViewData-GetActivePart() != eWhich )
-pViewData-GetView()-ActivatePart( eWhich );
-}
-else
+rState.mbActivatePart = !bFormulaMode; // Don't activate when in formula
mode.
+
+if (bFormulaMode)
{
ScViewSelectionEngine* pSelEng = pViewData-GetView()-GetSelEngine();
pSelEng-SetWindow(this);
@@ -1879,9 +1886,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
{
bRFMouse = true;// die anderen Variablen sind oben
initialisiert
-if ( pViewData-GetActivePart() != eWhich )
-pViewData-GetView()-ActivatePart( eWhich ); //! schon oben
immer ???
-
+rState.mbActivatePart = true; // always activate ?
StartTracking();
return;
}
@@ -1892,7 +1897,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
if ( bDouble )
pViewData-GetView()-FillCrossDblClick();
else
-pScMod-InputEnterHandler();//
Autofill etc.
+pScMod-InputEnterHandler();//
Autofill etc.
}
if ( !bCrossPointer )
@@ -1927,10 +1932,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
SCTAB nTab = pViewData-GetTabNo();
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/inc/gridwin.hxx |4 +++-
sc/source/ui/view/gridwin.cxx | 39 +++
2 files changed, 26 insertions(+), 17 deletions(-)
New commits:
commit 9ead8b3f965ce32beea12961ca2ce418ffbccd5f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Dec 6 00:32:22 2012 -0500
Avoid activating window pane when launching popup window.
Else, activating another window pane where the cursor is not would cause
the pivot table field popup to immediately get dismissed after launch
because
ClickExtern() gets called from ActivatePart().
For example, imagine a field popup button is on C2, the cell cursor is
on E5, and the window is frozen between rows 2 and 3. Clicking the popup
button in C2 would launch it for a brief second and dismiss it immediately
afterward. Conceptually, launching a popup in another pane shouldn't
activate that pane anyway. So it makes sense not to activate it for that
scenario.
Change-Id: Ib970cb898fb9c79d254411e2519cfce74c60b72f
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 055924a..fcd4dbf 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -93,6 +93,8 @@ private:
boost::scoped_ptrRectangle mpAutoFillRect;
+struct MouseEventState;
+
/**
* Stores current visible column and row ranges, used to avoid expensive
* operations on objects that are outside visible area.
@@ -228,7 +230,7 @@ private:
sal_Int8DropTransferObj( ScTransferObj* pTransObj, SCCOL
nDestPosX, SCROW nDestPosY,
const Point rLogicPos, sal_Int8
nDndAction );
-voidHandleMouseButtonDown( const MouseEvent rMEvt );
+voidHandleMouseButtonDown( const MouseEvent rMEvt,
MouseEventState rState );
boolDrawMouseButtonDown(const MouseEvent rMEvt);
boolDrawMouseButtonUp(const MouseEvent rMEvt);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fba27b7..c116d43 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -155,6 +155,13 @@ extern SfxViewShell* pScActiveViewShell;//
global.cxx
extern sal_uInt16 nScClickMouseModifier;// global.cxx
extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
+struct ScGridWindow::MouseEventState
+{
+bool mbActivatePart;
+
+MouseEventState() : mbActivatePart(false) {}
+};
+
#define SC_FILTERLISTBOX_LINES 12
//
@@ -1720,7 +1727,10 @@ void ScGridWindow::MouseButtonDown( const MouseEvent
rMEvt )
{
nNestedButtonState = SC_NESTEDBUTTON_DOWN;
-HandleMouseButtonDown( rMEvt );
+MouseEventState aState;
+HandleMouseButtonDown(rMEvt, aState);
+if (aState.mbActivatePart)
+pViewData-GetView()-ActivatePart(eWhich);
if ( nNestedButtonState == SC_NESTEDBUTTON_UP )
{
@@ -1737,7 +1747,7 @@ void ScGridWindow::MouseButtonDown( const MouseEvent
rMEvt )
nNestedButtonState = SC_NESTEDBUTTON_NONE;
}
-void ScGridWindow::HandleMouseButtonDown( const MouseEvent rMEvt )
+void ScGridWindow::HandleMouseButtonDown( const MouseEvent rMEvt,
MouseEventState rState )
{
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the event.
@@ -1818,12 +1828,9 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
if (!bDouble)
nMouseStatus = SC_GM_NONE;
-if (!bFormulaMode)
-{
-if ( pViewData-GetActivePart() != eWhich )
-pViewData-GetView()-ActivatePart( eWhich );
-}
-else
+rState.mbActivatePart = !bFormulaMode; // Don't activate when in formula
mode.
+
+if (bFormulaMode)
{
ScViewSelectionEngine* pSelEng = pViewData-GetView()-GetSelEngine();
pSelEng-SetWindow(this);
@@ -1879,9 +1886,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
{
bRFMouse = true;// die anderen Variablen sind oben
initialisiert
-if ( pViewData-GetActivePart() != eWhich )
-pViewData-GetView()-ActivatePart( eWhich ); //! schon oben
immer ???
-
+rState.mbActivatePart = true; // always activate ?
StartTracking();
return;
}
@@ -1892,7 +1897,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
if ( bDouble )
pViewData-GetView()-FillCrossDblClick();
else
-pScMod-InputEnterHandler();//
Autofill etc.
+pScMod-InputEnterHandler();//
Autofill etc.
}
if ( !bCrossPointer )
@@ -1927,10 +1932,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
SCTAB nTab = pViewData-GetTabNo();
[Libreoffice-commits] .: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d5516e8fe2933b482058b0d6ec2e256e21ae93a3
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 6 07:42:21 2012 +0100
MinGW: Fix configure.
Change-Id: Ia4f72b7bfe12f8f7e526b7dc2a2a2ba3d6eae861
diff --git a/configure.ac b/configure.ac
index fc908e3..c9f9337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5983,7 +5983,7 @@ if test $_os = Linux -a $host_cpu = powerpc; then
fi
AC_SUBST([JITC_PROCESSOR_TYPE])
-if test $_os = WINNT; then
+if test $_os = WINNT -a $WITH_MINGW != yes; then
AC_MSG_CHECKING([for Microsoft_VC${VCVER}_CRT_x86.msm])
copy_msms
if test -n $msms_copied ; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/source
svtools/source/filter/wmf/emfwr.cxx | 204 +++-
svtools/source/filter/wmf/emfwr.hxx | 12 ++
2 files changed, 215 insertions(+), 1 deletion(-)
New commits:
commit f1fee2a65c8c1968798e1246a4b455d9160d8eb9
Author: Muthu Subramanian sumu...@suse.com
Date: Thu Dec 6 12:21:24 2012 +0530
n#780748: Basic EMF+ implementation.
* Minimalistic implementation of EMF+ export
* Currently exports transparent polygons.
diff --git a/svtools/source/filter/wmf/emfwr.cxx
b/svtools/source/filter/wmf/emfwr.cxx
index c4caf02..39e33c0 100644
--- a/svtools/source/filter/wmf/emfwr.cxx
+++ b/svtools/source/filter/wmf/emfwr.cxx
@@ -130,6 +130,9 @@
#define WIN_SRCPAINT0x00EE0086L
#define WIN_SRCAND 0x008800C6L
#define WIN_SRCINVERT 0x00660046L
+#define WIN_EMR_COMMENT_EMFSPOOL0xL
+#define WIN_EMR_COMMENT_EMFPLUS 0x2B464D45L
+#define WIN_EMR_COMMENT_PUBLIC 0x43494447L
#define HANDLE_INVALID 0x
#define MAXHANDLES 65000
@@ -154,10 +157,194 @@
#define MM_ANISOTROPIC 8
+typedef enum
+{
+ EmfPlusHeader = 0x4001,
+ EmfPlusEndOfFile = 0x4002,
+ EmfPlusComment= 0x4003,
+ EmfPlusGetDC = 0x4004,
+ EmfPlusMultiFormatStart = 0x4005,
+ EmfPlusMultiFormatSection = 0x4006,
+ EmfPlusMultiFormatEnd = 0x4007,
+ EmfPlusObject = 0x4008,
+ EmfPlusClear = 0x4009,
+ EmfPlusFillRects = 0x400A,
+ EmfPlusDrawRects = 0x400B,
+ EmfPlusFillPolygon= 0x400C,
+ EmfPlusDrawLines = 0x400D,
+ EmfPlusFillEllipse= 0x400E,
+ EmfPlusDrawEllipse= 0x400F,
+ EmfPlusFillPie= 0x4010,
+ EmfPlusDrawPie= 0x4011,
+ EmfPlusDrawArc= 0x4012,
+ EmfPlusFillRegion = 0x4013,
+ EmfPlusFillPath = 0x4014,
+ EmfPlusDrawPath = 0x4015,
+ EmfPlusFillClosedCurve= 0x4016,
+ EmfPlusDrawClosedCurve= 0x4017,
+ EmfPlusDrawCurve = 0x4018,
+ EmfPlusDrawBeziers= 0x4019,
+ EmfPlusDrawImage = 0x401A,
+ EmfPlusDrawImagePoints= 0x401B,
+ EmfPlusDrawstring = 0x401C,
+ EmfPlusSetRenderingOrigin = 0x401D,
+ EmfPlusSetAntiAliasMode = 0x401E,
+ EmfPlusSetTextRenderingHint = 0x401F,
+ EmfPlusSetTextContrast= 0x4020,
+ EmfPlusSetInterpolationMode = 0x4021,
+ EmfPlusSetPixelOffsetMode = 0x4022,
+ EmfPlusSetCompositingMode = 0x4023,
+ EmfPlusSetCompositingQuality = 0x4024,
+ EmfPlusSave = 0x4025,
+ EmfPlusRestore= 0x4026,
+ EmfPlusBeginContainer = 0x4027,
+ EmfPlusBeginContainerNoParams = 0x4028,
+ EmfPlusEndContainer = 0x4029,
+ EmfPlusSetWorldTransform = 0x402A,
+ EmfPlusResetWorldTransform= 0x402B,
+ EmfPlusMultiplyWorldTransform = 0x402C,
+ EmfPlusTranslateWorldTransform= 0x402D,
+ EmfPlusScaleWorldTransform= 0x402E,
+ EmfPlusRotateWorldTransform = 0x402F,
+ EmfPlusSetPageTransform = 0x4030,
+ EmfPlusResetClip = 0x4031,
+ EmfPlusSetClipRect= 0x4032,
+ EmfPlusSetClipPath= 0x4033,
+ EmfPlusSetClipRegion = 0x4034,
+ EmfPlusOffsetClip = 0x4035,
+ EmfPlusDrawDriverstring = 0x4036,
+ EmfPlusStrokeFillPath = 0x4037,
+ EmfPlusSerializableObject = 0x4038,
+ EmfPlusSetTSGraphics = 0x4039,
+ EmfPlusSetTSClip = 0x403A
+} EmfPlusRecordType;
+
+
// -
// - EMFWriter -
// -
+void EMFWriter::ImplBeginCommentRecord( sal_Int32 nCommentType )
+{
+ImplBeginRecord( WIN_EMR_GDICOMMENT );
+m_rStm.SeekRel( 4 );
+m_rStm (sal_Int32) nCommentType;
+}
+
+void EMFWriter::ImplEndCommentRecord()
+{
+if( mbRecordOpen )
+{
+sal_Int32 nActPos = m_rStm.Tell();
+m_rStm.Seek( mnRecordPos + 8 );
+m_rStm (sal_uInt32)( nActPos - mnRecordPos - 0xc );
+m_rStm.Seek( nActPos );
+}
+ImplEndRecord();
+}
+
+void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags )
+{
+DBG_ASSERT( !mbRecordPlusOpen, Another EMF+ record is already opened! );
+
+if( !mbRecordPlusOpen )
+{
+mbRecordPlusOpen = sal_True;
+mnRecordPlusPos = m_rStm.Tell();
+
+m_rStm (sal_uInt16) nType (sal_uInt16) nFlags;
+m_rStm.SeekRel( 8 );
+}
+}
+
+//
-
+
+void
[Libreoffice-commits] .: 2 commits - sal/inc sal/Library_sal.mk sal/osl sal/Package_inc.mk
sal/Library_sal.mk |2 -
sal/Package_inc.mk |1
sal/inc/rtl/oustringostreaminserter.hxx | 21 ---
sal/osl/all/compat.cxx | 42 +++
sal/osl/all/semaphor.c | 43
5 files changed, 43 insertions(+), 66 deletions(-)
New commits:
commit 43b8e719d22bd115ecbd71e48be8aae42ed61a0d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 09:13:53 2012 +0100
API CHANGE: drop obsolete rtl/oustringostreaminserter.hxx
...its functionality moved directly into rtl/ustring.hxx
Change-Id: I5a1af63a4fd61c71e6594f1fab0c17f503fdd1c5
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 0e91e08..425db1d 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -81,7 +81,6 @@ $(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/memory.h,rtl/memory.h))
-$(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/oustringostreaminserter.hxx,rtl/oustringostreaminserter.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
diff --git a/sal/inc/rtl/oustringostreaminserter.hxx
b/sal/inc/rtl/oustringostreaminserter.hxx
deleted file mode 100644
index e29c637..000
--- a/sal/inc/rtl/oustringostreaminserter.hxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
-#define INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
-
-// depreacted header... include ustring.hxx instead
-#ifndef CPPUNIT_VERSION // protect agaisnt WaE with include all_headers in qa
of strings
-#warning deprecated header, include rtl/ustring.hxx instead
-#endif
-#include rtl/ustring.hxx
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c4a8ba908cca0228336330ae72e5d7ad29a6ed2e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 09:06:55 2012 +0100
Put stubs for removed functionality into compat.cxx
Change-Id: I634c6c699f8573113cdf0763c2cc83dcc04b0b0e
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 51823fe..d4fae98 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\
endif
$(eval $(call gb_Library_add_exception_objects,sal,\
+ sal/osl/all/compat \
sal/osl/all/debugbase \
sal/osl/all/loadmodulerelative \
sal/osl/all/log \
@@ -138,7 +139,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
$(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
- sal/osl/all/semaphor \
))
ifeq ($(OS),IOS)
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
new file mode 100644
index 000..fb8a1ec
--- /dev/null
+++ b/sal/osl/all/compat.cxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include sal/config.h
+
+#include cstdlib
+
+#include sal/types.h
+
+// Stubs for removed functionality, to be killed when we bump sal SONAME
+
+extern C {
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL osl_createSemaphore(sal_uInt32) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_destroySemaphore(void *) {
+std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/semaphor.c b/sal/osl/all/semaphor.c
deleted file mode 100644
index 5afb950..000
--- a/sal/osl/all/semaphor.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil;
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - sal/inc sal/Library_sal.mk sal/osl sal/Package_inc.mk
sal/Library_sal.mk |2 -
sal/Package_inc.mk |1
sal/inc/rtl/oustringostreaminserter.hxx | 21 ---
sal/osl/all/compat.cxx | 42 +++
sal/osl/all/semaphor.c | 43
5 files changed, 43 insertions(+), 66 deletions(-)
New commits:
commit 9e7df8efe11f9a8a5d394faf43a9ea1ecb738968
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 09:13:53 2012 +0100
API CHANGE: drop obsolete rtl/oustringostreaminserter.hxx
...its functionality moved directly into rtl/ustring.hxx
Change-Id: I5a1af63a4fd61c71e6594f1fab0c17f503fdd1c5
(cherry picked from commit 43b8e719d22bd115ecbd71e48be8aae42ed61a0d)
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index 0e91e08..425db1d 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -81,7 +81,6 @@ $(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/malformeduriexception.hxx,rtl/
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.h,rtl/math.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/math.hxx,rtl/math.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/memory.h,rtl/memory.h))
-$(eval $(call
gb_Package_add_file,sal_inc,inc/rtl/oustringostreaminserter.hxx,rtl/oustringostreaminserter.hxx))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/process.h,rtl/process.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/random.h,rtl/random.h))
$(eval $(call gb_Package_add_file,sal_inc,inc/rtl/ref.hxx,rtl/ref.hxx))
diff --git a/sal/inc/rtl/oustringostreaminserter.hxx
b/sal/inc/rtl/oustringostreaminserter.hxx
deleted file mode 100644
index e29c637..000
--- a/sal/inc/rtl/oustringostreaminserter.hxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
-#define INCLUDED_RTL_OUSTRINGOSTREAMINSERTER_HXX
-
-// depreacted header... include ustring.hxx instead
-#ifndef CPPUNIT_VERSION // protect agaisnt WaE with include all_headers in qa
of strings
-#warning deprecated header, include rtl/ustring.hxx instead
-#endif
-#include rtl/ustring.hxx
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7b0df11e4fd3c3de771050a3e4be904b21a3b565
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 09:06:55 2012 +0100
Put stubs for removed functionality into compat.cxx
Change-Id: I634c6c699f8573113cdf0763c2cc83dcc04b0b0e
(cherry picked from commit c4a8ba908cca0228336330ae72e5d7ad29a6ed2e)
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 51823fe..d4fae98 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\
endif
$(eval $(call gb_Library_add_exception_objects,sal,\
+ sal/osl/all/compat \
sal/osl/all/debugbase \
sal/osl/all/loadmodulerelative \
sal/osl/all/log \
@@ -138,7 +139,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
))
$(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
- sal/osl/all/semaphor \
))
ifeq ($(OS),IOS)
diff --git a/sal/osl/all/compat.cxx b/sal/osl/all/compat.cxx
new file mode 100644
index 000..fb8a1ec
--- /dev/null
+++ b/sal/osl/all/compat.cxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include sal/config.h
+
+#include cstdlib
+
+#include sal/types.h
+
+// Stubs for removed functionality, to be killed when we bump sal SONAME
+
+extern C {
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_acquireSemaphore(void *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL osl_createSemaphore(sal_uInt32) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+SAL_DLLPUBLIC_EXPORT void SAL_CALL osl_destroySemaphore(void *) {
+std::abort();
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_releaseSemaphore(void *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL osl_tryToAcquireSemaphore(void *) {
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/all/semaphor.c b/sal/osl/all/semaphor.c
deleted file mode 100644
index
Default Styles in Writer
Hi, I have submitted a patch changing the list of default Styles in the Toolbar in Writer [1]. Now, we [2] also wanted to remove the entry Default Style from the list, but removing Standard in the code didn't do that. Can anyone point me in the right direction where this is added? Thanks, Samuel [1] https://gerrit.libreoffice.org/1248 [2] http://nabble.documentfoundation.org/Libreoffice-ux-advise-Default-Styles-in-Writer-td4020441.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/filter/ww8/wrtww8.cxx |4 +++-
sw/source/filter/ww8/ww8atr.cxx |9 -
2 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 44dafcf9e29b2286016b9be2ac47c2609c817abc
Author: Luke Deller l...@deller.id.au
Date: Mon Nov 26 20:08:22 2012 +1100
fdo#56513 second header/footer lost saving as .doc
This reverts changeset 723f772d for i#106749, then applies an
alternative fix for that issue.
Change-Id: Ib5a1788b67517c8d3cf80fd76801e30587535366
Reviewed-on: https://gerrit.libreoffice.org/1170
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e0bacc4..453ee0c 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2386,7 +2386,9 @@ void MSWordExportBase::WriteText()
}
else if ( pNd-IsTableNode() )
{
-mpTableInfo-processSwTable( pNd-GetTableNode()-GetTable() );
+SwTable * pTable = pNd-GetTableNode()-GetTable();
+OutputSectionBreaks( pTable-GetTableFmt()-GetAttrSet(), *pNd );
+mpTableInfo-processSwTable( pTable );
}
else if ( pNd-IsSectionNode() TXT_MAINTEXT == nTxtTyp )
OutputSectionNode( *pNd-GetSectionNode() );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 26db61b..4354d68 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -436,15 +436,6 @@ void MSWordExportBase::OutputSectionBreaks( const
SfxItemSet *pSet, const SwNode
//section.
bool bBreakSet = false;
-const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
-
-if (pAktPageDesc != pPageDesc)
-{
-bBreakSet = true;
-bNewPageDesc = true;
-pAktPageDesc = pPageDesc;
-}
-
if ( pSet pSet-Count() )
{
if ( SFX_ITEM_SET == pSet-GetItemState( RES_PAGEDESC, false, pItem )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libxmlsec/UnpackedTarball_xmlsec.mk
libxmlsec/UnpackedTarball_xmlsec.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 458530deaae92a328fd51c043af1039ad3fbff82 Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 6 08:52:30 2012 + fix xmlsec build under RHEL-5 (again) last fix was removed with ec6af4194e80f5f0b2e46ca59802ff397a2a4a24 Change-Id: Ibb459d5c43356abb782dbd6a88f712bd1e01b54b diff --git a/libxmlsec/UnpackedTarball_xmlsec.mk b/libxmlsec/UnpackedTarball_xmlsec.mk index 6f8e4d0..fc2ed16 100644 --- a/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/libxmlsec/UnpackedTarball_xmlsec.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ libxmlsec/xmlsec1-configure.patch \ libxmlsec/xmlsec1-configure-libxml-libxslt.patch \ libxmlsec/xmlsec1-olderlibxml2.patch \ + libxmlsec/xmlsec1-oldlibtool.patch \ libxmlsec/xmlsec1-nssdisablecallbacks.patch \ libxmlsec/xmlsec1-nssmangleciphers.patch \ libxmlsec/xmlsec1-noverify.patch \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#56513 second header/footer lost saving as .doc
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1244 -- To view, visit https://gerrit.libreoffice.org/1244 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5a1788b67517c8d3cf80fd76801e30587535366 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Luke Deller l...@deller.id.au Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Luke Deller l...@deller.id.au Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libxmlsec/xmlsec1-oldlibtool.patch
libxmlsec/xmlsec1-oldlibtool.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit efca6f15609322f62a35619619a6d5fe5c9bd5a4 Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 6 09:05:13 2012 + fix patch path Change-Id: I3da11f199cdb6b9394e99fc549cff2388a04d6b2 diff --git a/libxmlsec/xmlsec1-oldlibtool.patch b/libxmlsec/xmlsec1-oldlibtool.patch index fd6f021..7d59ce1 100644 --- a/libxmlsec/xmlsec1-oldlibtool.patch +++ b/libxmlsec/xmlsec1-oldlibtool.patch @@ -1,5 +1,5 @@ --- /dev/null 2012-11-27 15:14:41.892226008 +0100 -+++ /build/xmlsec1-1.2.14/compile 2012-11-29 12:27:14.0 +0100 misc/xmlsec1-1.2.14/compile2012-11-29 12:27:14.0 +0100 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - libxmlsec/xmlsec1-oldlibtool.patch
libxmlsec/xmlsec1-oldlibtool.patch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d9061db785a096269fb026bd9cc1e67381d3bf4d Author: Caolán McNamara caol...@redhat.com Date: Thu Dec 6 09:05:13 2012 + fix patch path Change-Id: I3da11f199cdb6b9394e99fc549cff2388a04d6b2 (cherry picked from commit efca6f15609322f62a35619619a6d5fe5c9bd5a4) Signed-off-by: Caolán McNamara caol...@redhat.com diff --git a/libxmlsec/xmlsec1-oldlibtool.patch b/libxmlsec/xmlsec1-oldlibtool.patch index fd6f021..7d59ce1 100644 --- a/libxmlsec/xmlsec1-oldlibtool.patch +++ b/libxmlsec/xmlsec1-oldlibtool.patch @@ -1,5 +1,5 @@ --- /dev/null 2012-11-27 15:14:41.892226008 +0100 -+++ /build/xmlsec1-1.2.14/compile 2012-11-29 12:27:14.0 +0100 misc/xmlsec1-1.2.14/compile2012-11-29 12:27:14.0 +0100 @@ -0,0 +1,142 @@ +#! /bin/sh +# Wrapper for compilers which do not understand `-c -o'. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/ExtensionTarget.mk |1 + 1 file changed, 1 insertion(+) New commits: commit e43d62fb39e0b6b3e59b22110460d23b6d507b59 Author: Andras Timar ati...@suse.com Date: Thu Dec 6 09:53:47 2012 +0100 rm intermediate files that are input of helpindexer and should not be packaged Change-Id: I8b3e526fd413bd3ced75bf1cd81f9be2540bf9e8 diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index ff5b790..b3fb4f0 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -428,6 +428,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done : \ $$(HELPFILES)) \ $(gb_ExtensionTarget_HELPINDEXERCOMMAND) -lang $(2) -mod help \ -dir $$(basename $$@) \ +rm -fr $$(basename $$@)/caption $$(basename $$@)/content \ touch $$@) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About numbertext
Hello, I will check your fixes, and make a new release from the Numbertext extension (with fixes and the new Latvian and Lithuanian modules of the version 0.9.5). Many thanks for your work and mail! Best regards, Laszlo 2012/12/5 julien2412 serval2...@yahoo.fr Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/share/extensions/numbertext/ reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien -- View this message in context: http://nabble.documentfoundation.org/About-numbertext-tp4022762.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbcontrl.cxx | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit b22881c8166708d6fd42fbadad47ff880ba19ed4
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Wed Dec 5 20:48:43 2012 +0100
Modify the default Style list in Writer, give them a custom order.
Asking on UX-Advise, there were no negative voices for this change:
http://nabble.documentfoundation.org/Libreoffice-ux-advise-Default-Styles-in-Writer-td4020441.html
Change-Id: I780eaecc29c88493f09194399dfc00be1484c549
Reviewed-on: https://gerrit.libreoffice.org/1248
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fab0466..05f2b08 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1681,11 +1681,13 @@ struct SvxStyleToolBoxControl::Impl
xParaStyles;
static const sal_Char* aWriterStyles[] =
{
-Standard,
+Text body,
+Quotations,
+Title,
+Subtitle,
Heading 1,
Heading 2,
-Heading 3,
-Text body
+Heading 3
};
for( sal_uInt32 nStyle = 0; nStyle sizeof( aWriterStyles ) /
sizeof( sal_Char*); ++nStyle )
{
@@ -1946,6 +1948,11 @@ void SvxStyleToolBoxControl::FillStyleBox()
if( pImpl-bSpecModeWriter || pImpl-bSpecModeCalc )
{
+// disable sort to preserve special order
+WinBits nWinBits = pBox-GetStyle();
+nWinBits = ~WB_SORT;
+pBox-SetStyle( nWinBits );
+
// insert default styles
sal_uInt16 _i;
sal_uInt32 nCnt = pImpl-aDefaultStyles.size();
@@ -1956,11 +1963,6 @@ void SvxStyleToolBoxControl::FillStyleBox()
++nPos;
}
-// disable sort to preserve special order
-WinBits nWinBits = pBox-GetStyle();
-nWinBits = ~WB_SORT;
-pBox-SetStyle( nWinBits );
-
pBox-InsertEntry( pImpl-aClearForm, 0 );
pBox-SetSeparatorPos( 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic
vcl/generic/glyphs/gcach_layout.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2f80337e5eccbb7c57493eddd1d4e62de0fb1276
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 6 09:35:37 2012 +
Resolves: fdo#57939 use different layout instances for differing kerning
flags
use different layout engine instances for different kerning+ligature
combinations
Change-Id: I951dec2dfdd25df2c60f617e70a094bd0753aa77
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index f5bc98a..a8ddc49 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -266,6 +266,7 @@ private:
IcuFontFromServerFont maIcuFont;
le_int32meScriptCode;
+le_int32mnLayoutFlags;
LayoutEngine* mpIcuLE;
public:
@@ -280,6 +281,7 @@ public:
IcuLayoutEngine::IcuLayoutEngine( ServerFont rServerFont )
: maIcuFont( rServerFont ),
meScriptCode( USCRIPT_INVALID_CODE ),
+mnLayoutFlags( 0 ),
mpIcuLE( NULL )
{}
@@ -367,13 +369,14 @@ bool IcuLayoutEngine::layout(ServerFontLayout rLayout,
ImplLayoutArgs rArgs)
if( eScriptCode 0 ) // TODO: handle errors better
eScriptCode = latnScriptCode;
-// get layout engine matching to this script
+// get layout engine matching to this script and ligature/kerning
combination
// no engine change necessary if script is latin
-if( !mpIcuLE || ((eScriptCode != meScriptCode) (eScriptCode
USCRIPT_INHERITED)) )
+if( !mpIcuLE || ((eScriptCode != meScriptCode) (eScriptCode
USCRIPT_INHERITED)) || (mnLayoutFlags != nLayoutFlags) )
{
// TODO: cache multiple layout engines when multiple scripts are
used
delete mpIcuLE;
meScriptCode = eScriptCode;
+mnLayoutFlags = nLayoutFlags;
le_int32 eLangCode = 0; // TODO: get better value
mpIcuLE = LayoutEngine::layoutEngineFactory( maIcuFont,
eScriptCode, eLangCode, nLayoutFlags, rcIcu );
if( LE_FAILURE(rcIcu) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/generic
vcl/generic/glyphs/gcach_layout.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9adfadfe380f83af8c7ff5358d2027f0babc504d
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 6 09:35:37 2012 +
Resolves: fdo#57939 use different layout instances for differing kerning
flags
use different layout engine instances for different kerning+ligature
combinations
Change-Id: I951dec2dfdd25df2c60f617e70a094bd0753aa77
(cherry picked from commit 2f80337e5eccbb7c57493eddd1d4e62de0fb1276)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/generic/glyphs/gcach_layout.cxx
b/vcl/generic/glyphs/gcach_layout.cxx
index f5bc98a..a8ddc49 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -266,6 +266,7 @@ private:
IcuFontFromServerFont maIcuFont;
le_int32meScriptCode;
+le_int32mnLayoutFlags;
LayoutEngine* mpIcuLE;
public:
@@ -280,6 +281,7 @@ public:
IcuLayoutEngine::IcuLayoutEngine( ServerFont rServerFont )
: maIcuFont( rServerFont ),
meScriptCode( USCRIPT_INVALID_CODE ),
+mnLayoutFlags( 0 ),
mpIcuLE( NULL )
{}
@@ -367,13 +369,14 @@ bool IcuLayoutEngine::layout(ServerFontLayout rLayout,
ImplLayoutArgs rArgs)
if( eScriptCode 0 ) // TODO: handle errors better
eScriptCode = latnScriptCode;
-// get layout engine matching to this script
+// get layout engine matching to this script and ligature/kerning
combination
// no engine change necessary if script is latin
-if( !mpIcuLE || ((eScriptCode != meScriptCode) (eScriptCode
USCRIPT_INHERITED)) )
+if( !mpIcuLE || ((eScriptCode != meScriptCode) (eScriptCode
USCRIPT_INHERITED)) || (mnLayoutFlags != nLayoutFlags) )
{
// TODO: cache multiple layout engines when multiple scripts are
used
delete mpIcuLE;
meScriptCode = eScriptCode;
+mnLayoutFlags = nLayoutFlags;
le_int32 eLangCode = 0; // TODO: get better value
mpIcuLE = LayoutEngine::layoutEngineFactory( maIcuFont,
eScriptCode, eLangCode, nLayoutFlags, rcIcu );
if( LE_FAILURE(rcIcu) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Modify the default Style list in Writer, give them a custom ...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1248 Approvals: Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1248 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I780eaecc29c88493f09194399dfc00be1484c549 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 5 commits - sfx2/inc sfx2/source
sfx2/inc/sfx2/templateabstractview.hxx |4 +
sfx2/inc/sfx2/templatelocalview.hxx |2
sfx2/inc/sfx2/templateview.hxx |6 +-
sfx2/inc/sfx2/thumbnailview.hxx |4 +
sfx2/inc/templatedlg.hxx |3 +
sfx2/source/control/templateabstractview.cxx | 66 ++-
sfx2/source/control/templatelocalview.cxx|6 +-
sfx2/source/control/templateview.cxx |4 -
sfx2/source/control/thumbnailview.cxx| 46 --
sfx2/source/doc/templatedlg.cxx | 30 +---
sfx2/source/doc/templatedlg.hrc |1
sfx2/source/doc/templatedlg.src | 59 ++--
12 files changed, 171 insertions(+), 60 deletions(-)
New commits:
commit 4396c1f1572de98b39937e4c07bdc68a8b84dee1
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Dec 5 18:40:16 2012 +0100
Template manager: keep thumbnails ratio when scaling down
Change-Id: Ic597dd9fd12895c0d21f678cba44feba9f6fcd47
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index 8cbf60f..0baed64 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -137,10 +137,33 @@ BitmapEx TemplateAbstractView::scaleImg (const BitmapEx
rImg, long width, long
{
BitmapEx aImg = rImg;
-int sWidth = std::min(aImg.GetSizePixel().getWidth(),width);
-int sHeight = std::min(aImg.GetSizePixel().getHeight(),height);
+if ( !rImg.IsEmpty() )
+{
+
+const Size aImgSize = aImg.GetSizePixel();
+double nRatio = double(aImgSize.getWidth()) /
double(aImgSize.getHeight());
+
+long nDestWidth = aImgSize.getWidth();
+long nDestHeight = aImgSize.getHeight();
+
+// Which one side is the overflowing most?
+long nDistW = aImgSize.getWidth() - width;
+long nDistH = aImgSize.getHeight() - height;
+
+// Use the biggest overflow side to make it fit the destination
+if ( nDistW = nDistH nDistW 0 )
+{
+nDestWidth = width;
+nDestHeight = width / nRatio;
+}
+else if ( nDistW nDistH nDistH 0 )
+{
+nDestHeight = height;
+nDestWidth = height * nRatio;
+}
-aImg.Scale(Size(sWidth,sHeight),BMP_SCALE_INTERPOLATE);
+aImg.Scale(Size(nDestWidth,nDestHeight));
+}
return aImg;
}
commit 133f92643beed84ce298c054097a0ea637a408c4
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Dec 5 18:09:03 2012 +0100
Template manager: pickup non-empty thumbnails for folders
Change-Id: Idcb2987dc98ea9d00c8b160902446e71e8d6daff
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 26d9f3c..582e508 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -748,9 +748,9 @@ static void lcl_updateThumbnails (TemplateLocalViewItem
*pItem)
pItem-maPreview2.Clear();
// Update folder thumbnails
-for (size_t i = 0, n = pItem-maTemplates.size(); i 2 i n; ++i)
+for (size_t i = 0, n = pItem-maTemplates.size(); i n (
pItem-maPreview1.IsEmpty() || pItem-maPreview2.IsEmpty( ) ); ++i)
{
-if (i == 0)
+if ( pItem-maPreview1.IsEmpty( ) )
{
pItem-maPreview1 =
TemplateAbstractView::scaleImg(pItem-maTemplates[i].aThumbnail,
TEMPLATE_THUMBNAIL_MAX_WIDTH*0.75,
commit fcd853cf77268bd221f11d96f3ab1e222cca088e
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Dec 5 17:15:04 2012 +0100
Template Manager: put all the ToolBoxes in a Control to ease painting
changes
Change-Id: Ie63638a2b69594edf21e8025b1531842390f409d
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 8ce829e..8e70039 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -125,6 +125,7 @@ private:
PushButton aButtonSheets;
PushButton aButtonDraws;
ImageButton maButtonSelMode;
+Control *mpToolbars;
Edit *mpSearchEdit;
ToolBox *mpViewBar;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 371f873..b4fb512 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -54,7 +54,6 @@
#define INIT_FOLDER_COLS 3
#define INIT_FOLDER_LINES 2
-#define PADDING_TOOLBAR_VIEW15
#define PADDING_DLG_BORDER 10
using namespace ::com::sun::star;
@@ -106,10 +105,11 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window
*parent)
aButtonSheets(this,SfxResId(BTN_SELECT_SHEETS)),
aButtonDraws(this,SfxResId(BTN_SELECT_DRAWS)),
maButtonSelMode(this,SfxResId(BTN_SELECTION_MODE)),
+ mpToolbars( new Control(this,SfxResId(TOOLBARS))),
mpSearchEdit(new
[Libreoffice-commits] .: cppuhelper/Library_cppuhelper.mk cppuhelper/source
cppuhelper/Library_cppuhelper.mk |1 +
cppuhelper/source/compat.cxx | 38 ++
2 files changed, 39 insertions(+)
New commits:
commit c8a733079f6718dc908edd4af8d9befeac157e80
Author: Michael Meeks michael.me...@suse.com
Date: Thu Dec 6 09:48:07 2012 +
cppuhelper: add compatible symbol for obsolete method.
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index a9fb383..07b8a41 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_static_libraries,cppuhelper,\
$(eval $(call gb_Library_add_exception_objects,cppuhelper,\
cppuhelper/source/access_control \
cppuhelper/source/bootstrap \
+ cppuhelper/source/compat \
cppuhelper/source/component_context \
cppuhelper/source/component \
cppuhelper/source/defaultbootstrap \
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
new file mode 100644
index 000..c24a8a8
--- /dev/null
+++ b/cppuhelper/source/compat.cxx
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include sal/config.h
+#include rtl/ustring.hxx
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/reflection/XIdlClass.hpp
+
+using namespace ::com::sun::star;
+
+// Stubs for removed functionality, to be killed when we bump sal SONAME
+
+SAL_DLLPUBLIC_EXPORT
+reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
+ const uno::Reference lang::XMultiServiceFactory , const
rtl::OUString ,
+ const uno::Reference reflection::XIdlClass , const uno::Sequence
rtl::OUString )
+ SAL_THROW( () )
+{
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Reworking the MSVC-related build options
BTW, as you no doubt will notice, we got a patch in from Peter Foley through gerrit that does the kill-oowintool aspect of what I was working on, great! That already cleans up things quite a bit. Now just the reduce-unnecessary-options part is left to do, and perhaps some tweaking of preference in compilers, and especially in what .NET Framework to use. I yesterday noticed that installing on a vanilla XP SP3 fails if you have managed code built with the 4 framework, so probably we need to make sure to build our CLI stuff with version 2 of the framework? Is it enough to use the v2.0.foo csc.exe (which is always present, I think?), or do we need to find an older al.exe, too? Not totally clear to me. At least, we should give a warning from configure if building with too new .NET tools, warn that a thusly built LO should not be distributed to the public as it won't necessarily install on XP. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - readlicense_oo/odt solenv/gbuild
readlicense_oo/odt/LICENSE.odt |binary solenv/gbuild/ExtensionTarget.mk |1 + 2 files changed, 1 insertion(+) New commits: commit 9ecaf9c810b3fc53046273257aee3d140e74b2be Author: Andras Timar ati...@suse.com Date: Thu Dec 6 09:53:47 2012 +0100 rm intermediate files that are input of helpindexer and should not be packaged Change-Id: I8b3e526fd413bd3ced75bf1cd81f9be2540bf9e8 diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index ff5b790..b3fb4f0 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -428,6 +428,7 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done : \ $$(HELPFILES)) \ $(gb_ExtensionTarget_HELPINDEXERCOMMAND) -lang $(2) -mod help \ -dir $$(basename $$@) \ +rm -fr $$(basename $$@)/caption $$(basename $$@)/content \ touch $$@) endef commit f71fc1948db9acb641c396e9516ba28f8b85484c Author: Andras Timar ati...@suse.com Date: Wed Dec 5 10:21:56 2012 +0100 Bye bye ODMA (LICENSE.odt) Change-Id: I5e83d9fd524e5a414e0bd12879c53f20e0df9fd4 diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/odt/LICENSE.odt index 4f7f027..5e2b4a6 100644 Binary files a/readlicense_oo/odt/LICENSE.odt and b/readlicense_oo/odt/LICENSE.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 57198, which changed state. Bug 57198 Summary: Mac OSX Daily installation package to small and invalid https://bugs.freedesktop.org/show_bug.cgi?id=57198 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source cui/uiconfig
cui/source/options/personalization.cxx | 12 cui/uiconfig/ui/personalization_tab.ui |2 +- 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 1d3a86cfb11b3490806444e70683a8fa1fa1487d Author: Jan Holesovsky ke...@suse.cz Date: Thu Dec 6 11:19:37 2012 +0100 Personas: Hide the Persona UI on non-Windows. Change-Id: I6b2c9a33cb1c2144eb42a577071ade5b44b38964 diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 562b7b4..b33acae 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -106,6 +106,18 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const Sfx get( m_pSelectPersona, select_persona ); m_pSelectPersona-SetClickHdl( LINK( this, SvxPersonalizationTabPage, SelectPersona ) ); + +#ifndef __WIN32__ +// so far available for Windows only +Window *pWindow; +get( pWindow, personas_label ); +pWindow-Hide(); + +m_pNoPersona-Hide(); +m_pDefaultPersona-Hide(); +m_pOwnPersona-Hide(); +m_pSelectPersona-Hide(); +#endif } SvxPersonalizationTabPage::~SvxPersonalizationTabPage() diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index 12acf49..f6f11be 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -216,7 +216,7 @@ /object /child child type=label - object class=GtkLabel id=label1 + object class=GtkLabel id=personas_label property name=visibleTrue/property property name=can_focusFalse/property property name=label translatable=yesFirefox Personas/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit ec530530b7c4afbc7b521aaf05ac4e3d527fdf7e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 11:38:03 2012 +0100
Fix Linux-specific code
Change-Id: I36971b78dcc2fb0ab8570c8b80feb51bf6043e54
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 2559417..6ec590d 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -316,16 +316,17 @@ void SAL_CALL BluetoothServer::run()
socklen_t aRemoteAddrLen = sizeof(aRemoteAddr);
while ( true )
{
-SOCKET socket;
+int bSocket;
SAL_INFO( sdremote.bluetooth, waiting on accept );
-if ( (socket = accept(aSocket, (sockaddr*) aRemoteAddr,
aRemoteAddrLen)) == INVALID_SOCKET )
+if ( (bSocket = accept(aSocket, (sockaddr*) aRemoteAddr,
aRemoteAddrLen)) 0 )
{
-SAL_WARN( sdremote.bluetooth, accept failed with error
WSAGetLastError() );
+int err = errno;
+SAL_WARN( sdremote.bluetooth, accept failed with errno err
);
close( aSocket );
return;
} else {
SAL_INFO( sdremote.bluetooth, connection accepted );
-Communicator* pCommunicator = new Communicator( new
BufferedStreamSocket( socket ) );
+Communicator* pCommunicator = new Communicator( new
BufferedStreamSocket( bSocket ) );
mpCommunicators-push_back( pCommunicator );
pCommunicator-launch();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Default Styles in Writer
Hello Samuel, On Thu, 2012-12-06 at 09:33 +0100, Samuel Mehrbrodt wrote: I have submitted a patch changing the list of default Styles in the Toolbar in Writer [1]. Now, we [2] also wanted to remove the entry Default Style from the list, but removing Standard in the code didn't do that. Can anyone point me in the right direction where this is added? Removing that style is pretty tricky as it holds quite some things on its shoulders. Why not start by hiding it by default now that we can hide styles? There are several concerns with this removal: * Display name of pooled styles is tightly bound with the display of the style in the Styles Formatting dialog. You can't just remove it plainly as it would prevent to show the style when editing existing documents. * This particular styles holds the styles configuration (See Tools Options... dialog, LibreOffice Writer Basic Fonts items. * Almost all other paragraph styles are inheriting from this one What is so bad with this style? If you really want to remove pooled styles, start with the ListXXX paragraph styles. Regards, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 584cd8d1c23d47becb776e382f853ffe77ce9fc2 Author: Noel Grandin n...@peralex.com Date: Thu Dec 6 13:00:22 2012 +0200 Fix: errno.h needs to be included under Linux Change-Id: I00cbeaa3d00b6001b1b9adf00059f27d7affb08f diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 6ec590d..32e5bca 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -14,6 +14,7 @@ #if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS) #include glib.h #include dbus/dbus-glib.h + #include errno.h #include sys/unistd.h #include sys/socket.h #include bluetooth/bluetooth.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Default Styles in Writer
Hi Cedric, I don't want to remove Default Style completely, I just want to remove it from the Styles ComboBox in the toolbar in Writer. Sorry for being unclear. Samuel 2012/12/6 Cedric Bosdonnat cbosdon...@suse.com Hello Samuel, On Thu, 2012-12-06 at 09:33 +0100, Samuel Mehrbrodt wrote: I have submitted a patch changing the list of default Styles in the Toolbar in Writer [1]. Now, we [2] also wanted to remove the entry Default Style from the list, but removing Standard in the code didn't do that. Can anyone point me in the right direction where this is added? Removing that style is pretty tricky as it holds quite some things on its shoulders. Why not start by hiding it by default now that we can hide styles? There are several concerns with this removal: * Display name of pooled styles is tightly bound with the display of the style in the Styles Formatting dialog. You can't just remove it plainly as it would prevent to show the style when editing existing documents. * This particular styles holds the styles configuration (See Tools Options... dialog, LibreOffice Writer Basic Fonts items. * Almost all other paragraph styles are inheriting from this one What is so bad with this style? If you really want to remove pooled styles, start with the ListXXX paragraph styles. Regards, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] 4.0 Test week/marathon Re: [...-qa] 3.7 bug hunt party ?
Cor Nouws píše v St 05. 12. 2012 v 10:53 +0100: Hi Michael, Michael Meeks wrote (05-12-12 10:34) So - my hope would be that our Beta1 would be of a better quality than previous betas out of the door :-) but lets see. Yep - fully agree with even such an expectation. Beta1 build is in progress. Linux and MAC packages are even already available at http://dev-builds.libreoffice.org/pre-releases/ I did some very basic testing yesterday and did not find any problem, so I am much more optimistic now ;-) Why was I so careful? If you look at http://dev-builds.libreoffice.org/pre-releases/src/commits-libreoffice-4-0-release-4.0.0.0-alpha1-to-beta1.log there were about 1350 commits between alpha1 and beta1. Master was hardly buidable entire Monday and big part of Tuesday. I wanted to be rather careful with any promises and estimations. Still the natural behaviour of devs to do a lot of work, push late and take some risks, should be closely watched ;-) I am afraid that we could not do much about this. We could encourage but this is natural behavior for most people. In fact, I want to say a big thank you to all developers. Of course, there was some pain. But after all this has been the easiest beta1 from my point of view in compare with older releases. I think that testing from Thursday 13 to Wednesday 19th is perfectly fine and beta1 state looks promising for it. When is the freeze for RC1 planned? It would be useful to have testing done so that the devs that are available, could do something with the result before the RC1? Quite; I think the details you want are all in the wiki: http://wiki.documentfoundation.org/ReleasePlan/4.0 Know that, but fail to read when freeze for RC1 is - or is that the range Jan 7 - Jan 13, 2013 ? That doesn't help much with strict planning of a QA event.. Heh, it describes real life. We used exact dates in the past but there were delays of few days from time time. The typical proceeding is described at http://wiki.documentfoundation.org/ReleasePlan#Dates. We are one day behind with beta1 so far. I am looking forward to see the test week/marathon happen. Thanks a lot for organizing it. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANNOUNCE] libreoffice-4.0.0.0.beta1 tag created
Petr Mladek píše v St 05. 12. 2012 v 18:31 +0100: Hi, there have been created the libreoffice-4.0.0.0.beta1 tag. The corresponding official builds will be available within next few days. See the attached list of changes against 4.0.0.0.alpha1[*] See also http://wiki.documentfoundation.org/ReleaseNotes/4.0 [*] I am going to upload the list of changes against 3.6.4.3 tomorrow. It is a long list and it takes quite some time to filter cherry-picked commits and get list of bugzilla entries even by a script :-) You might find the list of commits and fixed bugs against 4.6.4.3 is at http://dev-builds.libreoffice.org/pre-releases/src/commits-libreoffice-4-0-release-4.0.0.0.beta1.log http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-release-4.0.0.0.beta1.log The script used git cherry to filer cherry-picked commits. I hope that it did it correctly ;-) Anyway, much more interesting are the releases notes at http://wiki.documentfoundation.org/ReleaseNotes/4.0 at this point. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbcontrl.cxx | 67 +--
1 file changed, 30 insertions(+), 37 deletions(-)
New commits:
commit 1faac45905a2dc28b36f7957cb008e8c0e7fa3c1
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Wed Dec 5 21:37:32 2012 +0100
Translate German comments in tbcontrl.cxx
Change-Id: I071feef9c7df4ad5ab72cd9caef5cbcbec1ae53d
Reviewed-on: https://gerrit.libreoffice.org/1249
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 05f2b08..8c7d0d2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -133,7 +133,7 @@ public:
~SvxStyleBox_Impl();
voidSetFamily( SfxStyleFamily eNewFamily );
-inline sal_Bool IsVisible() { return bVisible; }
+inline sal_Bool IsVisible() { return bVisible; }
virtual longPreNotify( NotifyEvent rNEvt );
virtual longNotify( NotifyEvent rNEvt );
@@ -153,18 +153,18 @@ protected:
private:
SfxStyleFamily eStyleFamily;
-sal_uInt16 nCurSel;
-sal_BoolbRelease;
+sal_uInt16 nCurSel;
+sal_BoolbRelease;
SizeaLogicalSize;
LinkaVisibilityListener;
-sal_BoolbVisible;
+sal_BoolbVisible;
Reference XDispatchProvider m_xDispatchProvider;
Reference XFrame m_xFrame;
OUStringm_aCommand;
String aClearFormatKey;
String aMoreKey;
String sDefaultStyle;
-sal_BoolbInSpecialMode;
+sal_BoolbInSpecialMode;
voidReleaseFocus();
};
@@ -184,8 +184,8 @@ private:
Font aCurFont;
Size aLogicalSize;
String aCurText;
-sal_uInt16 nFtCount;
-sal_Bool bRelease;
+sal_uInt16 nFtCount;
+sal_Bool bRelease;
Reference XDispatchProvider m_xDispatchProvider;
Reference XFrame m_xFrame;
@@ -203,7 +203,7 @@ public:
voidFillList();
voidUpdate( const SvxFontItem* pFontItem );
-sal_uInt16 GetListCount() { return nFtCount; }
+sal_uInt16 GetListCount() { return nFtCount; }
voidClear() { FontNameBox::Clear(); nFtCount = 0; }
voidFill( const FontList* pList )
{ FontNameBox::Fill( pList );
@@ -220,8 +220,7 @@ public:
// class SvxFrameWindow_Impl --
//
-// fuer den SelectHdl werden die Modifier gebraucht, also
-// muss man sie im MouseButtonUp besorgen
+// SelectHdl needs the Modifiers, get them in MouseButtonUp
class SvxFrmValueSet_Impl : public ValueSet
{
@@ -292,7 +291,7 @@ public:
};
//
-// Hilfsklassen:
+// Helper classes:
//
// class SfxStyleControllerItem --
//
@@ -705,23 +704,23 @@ sal_Bool GetDocFontList_Impl( const FontList**
ppFontList, SvxFontNameBox_Impl*
const FontList* pNewFontList = pFontListItem-GetFontList();
DBG_ASSERT( pNewFontList, Doc-FontList not available! );
-// keine alte Liste, aber neue Liste
+// No old list, but a new list
if ( !*ppFontList pNewFontList )
{
-// = ubernehmen
+// = take over
*ppFontList = pNewFontList;
bChanged = sal_True;
}
else
{
-// Vergleich der Fontlisten ist nicht vollkommen
-// wird die Fontliste am Doc geaendert, kann man hier
-// nur ueber die Listbox Aenderungen feststellen, weil
-// ppFontList dabei schon upgedatet wurde
+// Comparing the font lists is not perfect.
+// When you change the font list in the Doc, you can track
+// changes here only on the Listbox, because ppFontList
+// has already been updated.
bChanged =
( ( *ppFontList != pNewFontList ) ||
pBox-GetListCount() != pNewFontList-GetFontNameCount() );
-// HACK(vergleich ist unvollstaendig) ???
+// HACK: Comparing is incomplete
if ( bChanged )
[PUSHED] Translate German comments in tbcontrl.cxx
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1249 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1249 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I071feef9c7df4ad5ab72cd9caef5cbcbec1ae53d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +--
solenv/inc/minor.mk |4 +--
2 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 97b53a963938ddb6b8ddf31c05ebd6e8978e8610
Author: Petr Mladek pmla...@suse.cz
Date: Thu Dec 6 12:35:37 2012 +0100
bump product version to 4.0.0.0.beta1+, release number to 11
Change-Id: If808aa6a21d81cee563ac07b83f3446e5d488f88
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 2f1ccf8..db88de9 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-UREPACKAGEVERSION 4.0.0.0.alpha1
+UREPACKAGEVERSION 4.0.0.0.beta1
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.beta1
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ABOUTBOXPRODUCTVERSION 4.0.0.0.beta1
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.0.0.0.beta1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -102,13 +102,13 @@ LibreOffice_Dev
PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.beta1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 4.0
USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.0.0.alpha1
+ABOUTBOXPRODUCTVERSION 4.0.0.0.beta1
ABOUTBOXPRODUCTVERSIONSUFFIX +
BASEPRODUCTVERSION 4.0
DEVELOPMENTPRODUCT 1
@@ -123,7 +123,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.0.0.0.beta1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -161,12 +161,12 @@ URE
{
PRODUCTNAME URE
PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.0.0.0.beta1
PACKAGEREVISION 1
PRODUCTEXTENSION
BRANDPACKAGEVERSION 4.0
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.beta1
LICENSENAME LGPL
NOVERSIONINDIRNAME 1
PCPFILENAME ure.pcp
@@ -198,11 +198,11 @@ LibreOffice_SDK
PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.beta1
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.0.0.0.beta1
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
DMG_VOLUMEEXTENSION SDK
@@ -239,12 +239,12 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.beta1
UNIXBASISROOTNAME lodev4.0
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.0.0.0.beta1
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -286,11 +286,11 @@ LibreOffice_Test
PRODUCTVERSION 4.0
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
-SHORT_PRODUCTEXTENSION .0.0.alpha1
+SHORT_PRODUCTEXTENSION .0.0.beta1
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.0.0.alpha1
+PACKAGEVERSION 4.0.0.0.beta1
PACKAGEREVISION
[Libreoffice-commits] .: dbaccess/source extensions/source svtools/source
dbaccess/source/core/dataaccess/databasecontext.cxx |2 -
dbaccess/source/inc/stringconstants.hrc |1
dbaccess/source/inc/stringconstants.inc |1
dbaccess/source/ui/browser/genericcontroller.cxx |8 ++-
dbaccess/source/ui/dlg/DbAdminImpl.cxx |8 +--
extensions/source/propctrlr/formcomponenthandler.cxx | 20 +++
extensions/source/propctrlr/formstrings.hxx |1
svtools/source/dialogs/addresstemplate.cxx |3 --
8 files changed, 15 insertions(+), 29 deletions(-)
New commits:
commit 495111b249e1ef17be96dbdfbc5a13de6d5dd5f9
Author: Noel Grandin n...@peralex.com
Date: Mon Dec 3 11:10:46 2012 +0200
fdo#46808, use service constructor for sdb::DatabaseContext
Change-Id: I4d845f289f324912b0fc4d8e26a2947e2d2f889e
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 798262f..c4c625f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -218,7 +218,7 @@ Reference XInterface ODatabaseContext::Create(const
Reference XComponentCont
Sequence rtl::OUString
ODatabaseContext::getSupportedServiceNames_static(void) throw( RuntimeException
)
{
Sequence ::rtl::OUString aSNS( 1 );
-aSNS[0] = SERVICE_SDB_DATABASECONTEXT;
+aSNS[0] = com.sun.star.sdb.DatabaseContext;
return aSNS;
}
diff --git a/dbaccess/source/inc/stringconstants.hrc
b/dbaccess/source/inc/stringconstants.hrc
index d8a9ceb..6926f60 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.hrc
@@ -355,7 +355,6 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATAACCESSCONNECTION);
-DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_ROWSET);
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET);
diff --git a/dbaccess/source/inc/stringconstants.inc
b/dbaccess/source/inc/stringconstants.inc
index 9d6e79e..010fd63 100644
--- a/dbaccess/source/inc/stringconstants.inc
+++ b/dbaccess/source/inc/stringconstants.inc
@@ -193,7 +193,6 @@
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDBCX_COLUMNDESCRIPTOR, com.sun.star.sdbcx
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_COLUMNSETTINGS,
com.sun.star.sdb.ColumnSettings);
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN,
com.sun.star.sdb.ResultColumn);
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN,
com.sun.star.sdb.DataColumn);
-IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT,
com.sun.star.sdb.DatabaseContext);
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE,
com.sun.star.sdb.DataSource);
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET,
com.sun.star.sdb.ResultSet);
IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_ROWSET, com.sun.star.sdb.RowSet);
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 58345e6..76df18a 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -258,15 +258,13 @@ sal_Bool OGenericUnoController::Construct(Window*
/*pParent*/)
{
m_xDatabaseContext =
DatabaseContext::create(comphelper::getComponentContext(getORB()));
}
-catch(Exception)
+catch(const Exception)
{
OSL_FAIL(OGenericUnoController::Construct: could not create (or start
listening at) the database context!);
+// at least notify the user. Though the whole component does not make
any sense without the database context ...
+ShowServiceNotAvailableError(getView(),
String(com.sun.star.sdb.DatabaseContext), sal_True);
}
-if (!m_xDatabaseContext.is())
-{ // at least notify the user. Though the whole component does not
make any sense without the database context ...
-ShowServiceNotAvailableError(getView(),
String(SERVICE_SDB_DATABASECONTEXT), sal_True);
-}
return sal_True;
}
//--
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 9082417..2b5cbfe 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -210,13 +210,9 @@
ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
{
m_xDatabaseContext =
DatabaseContext::create(comphelper::getComponentContext(m_xORB));
}
-catch(Exception)
-{
-}
-
-if ( !m_xDatabaseContext.is() )
+catch(const Exception)
{
-ShowServiceNotAvailableError(_pParent-GetParent(),
String(SERVICE_SDB_DATABASECONTEXT), sal_True);
+
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 14 ++--
sw/source/filter/ww8/rtfexport.cxx |3
sw/source/filter/ww8/writerwordglue.cxx |2
sw/source/filter/ww8/wrtw8esh.cxx|4 -
sw/source/filter/ww8/wrtw8nds.cxx| 28
sw/source/filter/ww8/wrtww8gr.cxx|4 -
sw/source/filter/ww8/ww8atr.cxx | 92 +--
sw/source/filter/ww8/ww8par5.cxx |8 +-
sw/source/filter/ww8/ww8scan.cxx |2
sw/source/filter/ww8/ww8scan.hxx |7 --
10 files changed, 78 insertions(+), 86 deletions(-)
New commits:
commit 4839c0ab201fd4dd7b32a5d6c9f6e202a88ad09d
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Dec 6 12:41:46 2012 +0100
sw: kill RTL_CONSTASCII_STRINGPARAM and friends in ww8 filters
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b4dbee9..8414e60 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -847,9 +847,9 @@ void DocxAttributeOutput::EndField_Impl( FieldInfos rInfos
)
m_pSerializer-endElementNS( XML_w, XML_r );
rInfos.sCmd = FieldString( ww::eREF );
-rInfos.sCmd.APPEND_CONST_ASC( \ );
+rInfos.sCmd.AppendAscii( \ );
rInfos.sCmd += m_sFieldBkm;
-rInfos.sCmd.APPEND_CONST_ASC( \ );
+rInfos.sCmd.AppendAscii( \ );
// Clean the field bookmark data to avoid infinite loop
m_sFieldBkm = String( );
@@ -1166,16 +1166,16 @@ bool DocxAttributeOutput::AnalyzeURL( const String
rUrl, const String rTarget,
else
{
String sFld( FieldString( ww::eHYPERLINK ) );
-sFld.APPEND_CONST_ASC( \ );
+sFld.AppendAscii( \ );
sURL.Insert( sFld, 0 );
sURL += '\';
}
if ( sMark.Len() )
-( ( sURL.APPEND_CONST_ASC( \\l \ ) ) += sMark ) += '\';
+( ( sURL.AppendAscii( \\l \ ) ) += sMark ) += '\';
if ( rTarget.Len() )
-( sURL.APPEND_CONST_ASC( \\n ) ) += rTarget;
+( sURL.AppendAscii( \\n ) ) += rTarget;
}
*pLinkURL = sURL;
@@ -3545,9 +3545,9 @@ void DocxAttributeOutput::RefField( const SwField rFld,
const String rRef )
if ( nType == RES_GETEXPFLD )
{
String sCmd = FieldString( ww::eREF );
-sCmd.APPEND_CONST_ASC( \ );
+sCmd.AppendAscii( \ );
sCmd += rRef;
-sCmd.APPEND_CONST_ASC( \ );
+sCmd.AppendAscii( \ );
m_rExport.OutputField( rFld, ww::eREF, sCmd );
}
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 8259d59..0d874d8 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -245,8 +245,7 @@ void RtfExport::WriteRevTab()
return;
// RTF always seems to use Unknown as the default first entry
-String sUnknown(RTL_CONSTASCII_USTRINGPARAM(Unknown));
-GetRedline(sUnknown);
+GetRedline(OUString(Unknown));
for( sal_uInt16 i = 0; i pDoc-GetRedlineTbl().size(); ++i )
{
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 9a843dd..3ae8a1c 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -46,7 +46,7 @@
#include breakit.hxx //pBreakIt
#include i18npool/mslangid.hxx
-#define ASSIGN_CONST_ASC(s) AssignAscii(RTL_CONSTASCII_STRINGPARAM(s))
+#define ASSIGN_CONST_ASC(s) AssignAscii(s)
namespace myImplHelpers
{
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index 6262238..719d8e6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2844,9 +2844,9 @@ bool SwMSConvertControls::ExportControl(WW8Export
rWW8Wrt, const SdrObject *pOb
Set_UInt32(pData,nObjId );
String sFld(FieldString(ww::eCONTROL));
-sFld.APPEND_CONST_ASC(Forms.);
+sFld.AppendAscii(Forms.);
sFld += sName;
-sFld.APPEND_CONST_ASC(.1 \\s );
+sFld.AppendAscii(.1 \\s );
rWW8Wrt.OutputField(0, ww::eCONTROL, sFld,
WRITEFIELD_START|WRITEFIELD_CMD_START|WRITEFIELD_CMD_END);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 9320e70..aabd3f3 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -627,7 +627,7 @@ const SfxPoolItem SwWW8AttrIter::GetItem(sal_uInt16
nWhich) const
void WW8AttributeOutput::StartRuby( const SwTxtNode rNode, xub_StrLen
/*nPos*/, const SwFmtRuby rRuby )
{
String aStr( FieldString( ww::eEQ ) );
-aStr.APPEND_CONST_ASC( \\* jc );
+aStr.AppendAscii( \\* jc );
sal_Int32 nJC = 0;
sal_Char cDirective = 0;
switch ( rRuby.GetAdjustment() )
@@ -701,17 +701,17 @@ void
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||57946 --- Comment #42 from Rainer Bielefeld libreoff...@bielefeldundbuss.de --- I add Bug 57946 - EDITING CRASH in menu 'Format - Conditional Formatting - Contition - Condition', looks like a blocker -- 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: Default Styles in Writer
Hi Samuel This is pretty much the issue I tried to raise in the UX-discussion. - Applied styles are shown in the ComboBox (a good thing) - A style that is the basis for another style is seen as Applied and is thus shown in the ComboBox (what I questioned) - The Default Style is the basis for all other styles (not a bad thing) and thus it is *always* shown in the ComboBox (not so nice) An important point, I believe, is that, if in fact the Default Style is explicitly used in the document it should be shown in the ComboBox. So, for this to work I believe the logic behind what is added in the ComboBox at run time needs to changed. I wouldn't mind being proven wrong though. ;) Nice job with the default set of styles though. Regards, Niklas Johansson Samuel Mehrbrodt skrev 2012-12-06 09:33: Hi, I have submitted a patch changing the list of default Styles in the Toolbar in Writer [1]. Now, we [2] also wanted to remove the entry Default Style from the list, but removing Standard in the code didn't do that. Can anyone point me in the right direction where this is added? Thanks, Samuel [1] https://gerrit.libreoffice.org/1248 [2] http://nabble.documentfoundation.org/Libreoffice-ux-advise-Default-Styles-in-Writer-td4020441.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Personas in LibreOffice
Hi list, After take a look in some commits in LO about the FFox Personas, I saw that this is only for Windows until now... There is a reason for that? There is something that we can do for extend this for Linux users? I belvei that's a nice feature for LO! Congrats to the authors! Thanks a lot! -- Att, Marcos Paulo de Souza Acadêmico de Ciencia da Computação - FURB - SC Github: https://github.com/marcosps/ Uma vida sem desafios é uma vida sem razão A life without challenges, is a non reason life ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/text/frmform.cxx |2 -
sw/source/core/text/itrtxt.cxx |2 -
sw/source/core/text/itrtxt.hxx |8 +++
sw/source/core/text/porfld.cxx | 14 ++--
sw/source/core/text/porfld.hxx |6 ++---
sw/source/core/text/porglue.cxx |2 -
sw/source/core/text/porlay.cxx | 22 +--
sw/source/core/text/porlay.hxx |8 +++
sw/source/core/text/porlin.cxx | 14 ++--
sw/source/core/text/porlin.hxx |4 +--
sw/source/core/text/pormulti.cxx | 43 +++
sw/source/core/text/pormulti.hxx | 12 --
sw/source/core/text/txtfrm.cxx |2 -
sw/source/core/text/widorp.cxx |2 -
14 files changed, 69 insertions(+), 72 deletions(-)
New commits:
commit 8909b2c384154baa2174aa53b433b12b02871e75
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Dec 6 21:00:22 2012 +0900
Drop unused declaration
Change-Id: I8673787aac659acfc638b3040a6178e6c21a51f7
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 7180f77..c392c78 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -49,7 +49,6 @@
#include fmtfsize.hxx
using namespace ::com::sun::star;
-extern sal_Bool IsUnderlineBreak( const SwLinePortion rPor, const SwFont
rFnt );
/*--
* class SwMultiPortion
commit 6488d6941dd25f49aa3254f38a5f3185f2fd3e5e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Dec 6 20:59:29 2012 +0900
sal_Bool to bool
Change-Id: I942cad6ec0e06d4f98fdf8e2557e11603b951e7f
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 16641e7..698cf95 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -984,7 +984,7 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter rLine,
if( rLine.IsStop() )
{
-rLine.TruncLines( sal_True );
+rLine.TruncLines( true );
nNew = 1;
}
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index a091b2c..59e916a 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -386,7 +386,7 @@ static sal_Bool lcl_NeedsFieldRest( const SwLineLayout*
pCurr )
* SwTxtIter::TruncLines()
*/
-void SwTxtIter::TruncLines( sal_Bool bNoteFollow )
+void SwTxtIter::TruncLines( bool bNoteFollow )
{
SwLineLayout *pDel = pCurr-GetNext();
const xub_StrLen nEnd = nStart + pCurr-GetLen();
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 1f8cdcf..cd56e8e 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -98,18 +98,18 @@ public:
const SwLineLayout *TwipsToLine(const SwTwips);
// Truncates all after pCurr
-void TruncLines( sal_Bool bNoteFollow = sal_False );
+void TruncLines( bool bNoteFollow = false );
inline KSHORT GetLineHeight() const { return pCurr-GetRealHeight(); }
void CalcAscentAndHeight( KSHORT rAscent, KSHORT rHeight ) const;
// Lots of trouble for querying pCurr == pPara
-inline sal_Bool IsFirstTxtLine() const
+inline bool IsFirstTxtLine() const
{ return nStart == GetInfo().GetTxtStart()
!( pCurr-IsDummy() GetNextLine() ); }
// Replacement for the old IsFirstLine()
-inline sal_Bool IsParaLine() const
+inline bool IsParaLine() const
{ return pCurr == pInf-GetParaPortion(); }
const SwLineInfo GetLineInfo() const { return aLineInf; }
@@ -169,7 +169,7 @@ public:
inline KSHORT GetLineWidth() const
{ return KSHORT( Right() - GetLeftMargin() + 1 ); }
inline SwTwips GetLeftMin() const { return nFirst nLeft ? nFirst :
nLeft; }
-inline sal_Bool HasNegFirst() const { return nFirst nLeft; }
+inline bool HasNegFirst() const { return nFirst nLeft; }
// #i91133#
inline SwTwips GetTabLeft() const
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index b018ca8..94d3986 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -299,7 +299,7 @@ sal_Bool SwFldPortion::Format( SwTxtFormatInfo rInf )
// Scope wegen aDiffTxt::DTOR!
xub_StrLen nRest;
sal_Bool bFull;
-sal_Bool bEOL = sal_False;
+bool bEOL = false;
long nTxtRest = rInf.GetTxt().Len() - rInf.GetIdx();
{
SwFldSlot aDiffTxt( rInf, this );
@@ -618,7 +618,7 @@ sal_Bool SwNumberPortion::Format( SwTxtFormatInfo rInf )
// fieser Sonderfall: FlyFrm liegt in dem Bereich,
// den wir uns gerade unter den Nagel reissen wollen.
// Die NumberPortion wird als verborgen markiert.
-const sal_Bool bFly = rInf.GetFly() ||
+const bool bFly = rInf.GetFly() ||
( rInf.GetLast() rInf.GetLast()-IsFlyPortion() );
if( nDiff
RE: Change in core[master]: fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2
This time to the ML as well... Winfried -Oorspronkelijk bericht- Van: Winfried Donkers Verzonden: donderdag 6 december 2012 12:52 Aan: 'er...@redhat.com' Onderwerp: RE: Change in core[master]: fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2 Hi Eike, Van: Eike Rathke (via Code Review) wrote: donderdag 22 november 2012 23:31 I suggest you take a look at the implementation of ocIf and use a similar approach with only one conditional path instead of two, for which the condition is calculated from the expression's result whether it is an error or not and then a jump is executed or not. There is some special code in the compiler to calculate jump paths (lookout for ocIf), and handling is different from normal functions in the interpreter. Feel free to ask for details and pointers on the mailing list. I agree that my submitted patch is inefficient when it always calculates both arguments. The simple examples of the function disfunctioning (I tested lots of arguments, but never tried direct calculations as an argument) could be remedied, but it would stay an inefficient function (sometimes even less efficient than IF(X;X;Y)). So I followed your suggestion to work along the lines of ScIfJump/ocIf. These last 2 weeks I have not been able to get that working properly. To finally find out what goes wrong, I copied the contents of SCIfJump() into ScIfError(), made ocIfError do the same as ocIf (except in lotus/excel filter files) and gave IFERROR() 3 arguments (just as IF()). It still doesn't work: IFERROR(X;Y;Z) always returns Y, regardless of the value of X. That is, if X produces an error (or Y, or Z), the error is returned. What am I missing/messing up? I can upload the diff file to the bug, but possibly you can give some pointers without them. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] 4.0 Test week/marathon Re: [...-qa] 3.7 bug hunt party ?
Hi Petr, *, Petr Mladek wrote (06-12-12 12:16) Cor Nouws píše v St 05. 12. 2012 v 10:53 +0100: Beta1 build is in progress. Linux and MAC packages are even already available at http://dev-builds.libreoffice.org/pre-releases/ I did some very basic testing yesterday and did not find any problem, so I am much more optimistic now ;-) Top! Still the natural behaviour of devs to do a lot of work, push late and take some risks, should be closely watched ;-) I am afraid that we could not do much about this. We could encourage but this is natural behavior for most people. Yes, natural behaviour of people is a known problem ;-) In fact, I want to say a big thank you to all developers. Of course, there was some pain. But after all this has been the easiest beta1 from my point of view in compare with older releases. Great - thanks to all! I think that testing from Thursday 13 to Wednesday 19th is perfectly fine and beta1 state looks promising for it. OK, will jump to it this evening. Know that, but fail to read when freeze for RC1 is - or is that the range Jan 7 - Jan 13, 2013 ? That doesn't help much with strict planning of a QA event.. Heh, it describes real life. We used exact dates in the past but there were delays of few days from time time. The typical proceeding is described at http://wiki.documentfoundation.org/ReleasePlan#Dates. We are one day behind with beta1 so far. I understand the process and why it works as it does Luckily we know now we will do the test with Beta1 and do not run into problems with waiting for RC2. I am looking forward to see the test week/marathon happen. Thanks a lot for organizing it. You and we all deserve that attention. So I'm glad that I can contribute a little here. Cheers, -- -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cppunit/ExternalPackage_cppunit.mk cppunit/ExternalProject_cppunit.mk cppunit/Makefile cppunit/makefile.mk cppunit/Module_cppunit.mk cppunit/ooo-cppunit_dll.mk cppunit/ooo-Dll
Module_tail_build.mk |1 RepositoryExternal.mk |6 + RepositoryModule_ooo.mk|1 cppunit/ExternalPackage_cppunit.mk | 43 cppunit/ExternalProject_cppunit.mk | 58 +++ cppunit/Makefile |7 + cppunit/Module_cppunit.mk | 20 +++ cppunit/UnpackedTarball_cppunit.mk | 33 ++ cppunit/makefile.mk| 192 - cppunit/ooo-DllPlugInTester.mk | 50 - cppunit/ooo-cppunit_dll.mk | 100 --- cppunit/prj/d.lst | 44 tail_build/prj/build.lst |2 13 files changed, 170 insertions(+), 387 deletions(-) New commits: commit 143835b928d00b922c29471bbeca4772237b4df9 Author: Peter Foley pefol...@verizon.net Date: Sun Nov 25 16:37:40 2012 -0500 convert cppunit to gbuild Change-Id: Idcba54973940b9f197f2fd84a906b50468d1b166 diff --git a/Module_tail_build.mk b/Module_tail_build.mk index 58eb4f5..ed471b8 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ cppcanvas \ cppu \ cppuhelper \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ cpputools \ $(call gb_Helper_optional,CT2N,ct2n) \ cui \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fc307e3..f59c69a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -149,9 +149,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ )) define gb_LinkTarget__use_cppunit +$(call gb_LinkTarget_use_package,$(1),cppunit) + $(call gb_LinkTarget_use_libraries,$(1),\ cppunit \ ) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,cppunit/include)\ + $$(INCLUDE) \ +) endef diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index f860317..83347d2 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ cppcanvas \ cppu \ cppuhelper \ + $(call gb_Helper_optional,CPPUNIT,cppunit) \ cpputools \ $(call gb_Helper_optional,CT2N,ct2n) \ cui \ diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk new file mode 100644 index 000..3d8ab3f --- /dev/null +++ b/cppunit/ExternalPackage_cppunit.mk @@ -0,0 +1,43 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,cppunit,cppunit)) +$(eval $(call gb_ExternalPackage_use_external_project,cppunit,cppunit)) + +ifeq ($(OS),WNT) +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/cppunit_dll.dll,src/cppunit/ReleaseDll/cppunit_dll.dll)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/ReleaseDll/cppunit_dll.lib)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe)) +else +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe)) +endif +else +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester)) +ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.1.3.0.dylib)) +else ifeq ($(OS),AIX) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a)) +else ifeq ($(OS),OPENBSD) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0.0,src/cppunit/.libs/libcppunit-1.13.so.0.0)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0)) +else ifeq ($(DISABLE_DYNLOADING),TRUE) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.a,src/cppunit/.libs/libcppunit.a)) +else ifeq ($(OS),ANDROID) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so,src/cppunit/.libs/libcppunit-1.13.so)) +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so)) +else +$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0,src/cppunit/.libs/libcppunit-1.13.so.0.0.1)) +$(eval $(call
[PUSHED] convert cppunit to gbuild
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1183 -- To view, visit https://gerrit.libreoffice.org/1183 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idcba54973940b9f197f2fd84a906b50468d1b166 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Peter Foley jpfol...@gmail.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About numbertext
Hello, I have made the complete port, tested with LibreOffice 4.0 and 3.6: http://extensions.libreoffice.org/extension-center/numbertext-1/pscreleasefolder.2012-10-09.7591543982/0.9.5/numbertext-0.9.5.oxt or http://www.numbertext.org/dist/numbertext-0.9.5.oxt Could you update the numbertext src package of the LibreOffice? Thanks in advance, Best regards, Laszlo 2012/12/6 Németh László nem...@numbertext.org Hello, I will check your fixes, and make a new release from the Numbertext extension (with fixes and the new Latvian and Lithuanian modules of the version 0.9.5). Many thanks for your work and mail! Best regards, Laszlo 2012/12/5 julien2412 serval2...@yahoo.fr Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/share/extensions/numbertext/ reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien -- View this message in context: http://nabble.documentfoundation.org/About-numbertext-tp4022762.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: jurt/CustomTarget_test_urp.mk
jurt/CustomTarget_test_urp.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5b567649c166c88116733f416bade285acd14f35 Author: David Tardon dtar...@redhat.com Date: Thu Dec 6 13:59:29 2012 +0100 udkapi.rdb is enough Change-Id: Ia9919b2d85264ba3c0bf12a66646821e5c6badb4 diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk index 10db4f7..9707d54 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/jurt/CustomTarget_test_urp.mk @@ -37,7 +37,7 @@ $(jurt_TESTURP)/done : \ $(call gb_Executable_get_target_for_build,javamaker) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) rm -rf $(jurt_TESTURP) \ - $(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $ -X$(OUTDIR)/bin/types.rdb) \ + $(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $ -X$(OUTDIR)/bin/udkapi.rdb) \ touch $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] 4.0 Test week/marathon Re: [...-qa] 3.7 bug hunt party ?
On Thu, 2012-12-06 at 12:16 +0100, Petr Mladek wrote: Why was I so careful? If you look at http://dev-builds.libreoffice.org/pre-releases/src/commits-libreoffice-4-0-release-4.0.0.0-alpha1-to-beta1.log there were about 1350 commits between alpha1 and beta1. We normally have around 1500 commits per month; to have 1350 in two weeks is rather encouraging ;-) In fact, I want to say a big thank you to all developers. Of course, there was some pain. But after all this has been the easiest beta1 from my point of view in compare with older releases. I'm glad it's looking reasonably test-able :-) Nice work Petr ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About numbertext
Hello, I have made the complete port, tested with LibreOffice 4.0 and 3.6: http://extensions.libreoffice.org/extension-center/numbertext-1/pscreleasefolder.2012-10-09.7591543982/0.9.5/numbertext-0.9.5.oxt or http://www.numbertext.org/dist/numbertext-0.9.5.oxt Could you help to update the numbertext src package of the LibreOffice? Thanks in advance, Best regards, Laszlo 2012/12/6 Németh László nem...@numbertext.org Hello, I will check your fixes, and make a new release from the Numbertext extension (with fixes and the new Latvian and Lithuanian modules of the version 0.9.5). Many thanks for your work and mail! Best regards, Laszlo 2012/12/5 julien2412 serval2...@yahoo.fr Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/share/extensions/numbertext/ reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien -- View this message in context: http://nabble.documentfoundation.org/About-numbertext-tp4022762.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 2012/12/6 Németh László nem...@numbertext.org Hello, I will check your fixes, and make a new release from the Numbertext extension (with fixes and the new Latvian and Lithuanian modules of the version 0.9.5). Many thanks for your work and mail! Best regards, Laszlo 2012/12/5 julien2412 serval2...@yahoo.fr Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/share/extensions/numbertext/ reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien -- View this message in context: http://nabble.documentfoundation.org/About-numbertext-tp4022762.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About numbertext
On 12/06/2012 02:02 PM, Németh László wrote: I have made the complete port, tested with LibreOffice 4.0 and 3.6: http://extensions.libreoffice.org/extension-center/numbertext-1/pscreleasefolder.2012-10-09.7591543982/0.9.5/numbertext-0.9.5.oxt or http://www.numbertext.org/dist/numbertext-0.9.5.oxt Could you update the numbertext src package of the LibreOffice? Thanks in advance, LO wants to download the prebuilt oxt from http://ooo.itc.hu/oxygenoffice/download/libreoffice/510117359dc91181ea06b4aa8582ed2c-numbertext-0.9.5.oxt (see LO's Makefile.fetch), so if somebody (Kami?) can put it there, that would be the easiest. I can adapt the single line setting NUMBERTEXT_EXTENSION_PACK in LO's configure.ac then. The first link above leads to a broken oxt, so I assume the second link points to what we want (and the md5sum I give above is for that one). Stephan 2012/12/6 Németh László nem...@numbertext.org mailto:nem...@numbertext.org Hello, I will check your fixes, and make a new release from the Numbertext extension (with fixes and the new Latvian and Lithuanian modules of the version 0.9.5). Many thanks for your work and mail! Best regards, Laszlo 2012/12/5 julien2412 serval2...@yahoo.fr mailto:serval2...@yahoo.fr Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/share/extensions/numbertext/reg.uno.py:7 http://reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-libreoffice/libo/solver/unxlngx6/installation/opt/program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: random number generators for calc
On Wed, 2012-12-05 at 17:12 +0100, Eike Rathke wrote: just happened to reimplement RAND() with a B.A Wichmann and I.D Hill generator.. see As they are entitled to. No doubt we'll come up with a comprehensive, nicely architected and beautiful solution of our own :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac .gitignore
.gitignore |1 -
configure.ac |6 --
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit de2c6007fc584150210eb29d15044fca0d8321f7
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 14:59:42 2012 +0100
Do not accumulate warnings across configure runs
...and remove temporary file again.
Change-Id: I199b054d8e7b87d1c9268abbe628393d480e42f7
diff --git a/.gitignore b/.gitignore
index ddb84f7..4431992 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,6 @@
# misc
/file-lists
/cross-build-toolset.built
-/warn
/build.log
/build_error.log
/install
diff --git a/configure.ac b/configure.ac
index eb2389d..1e80d4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,11 +49,12 @@ PathFormat()
fi
}
+rm -f warn
have_WARNINGS=no
add_warning()
{
if test $have_WARNINGS = no; then
-echo * warn
+echo * warn
have_WARNINGS=yes
if which tput /dev/null 2/dev/null test `tput colors` -ge 8; then
dnl esc as actual byte (U+1b), [ escaped using quadrigraph @:@
@@ -12492,7 +12493,8 @@ _EOF
fi
if test -f warn; then
- cat warn
+cat warn
+rm warn
fi
dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - boost/boost.6397.warnings.patch connectivity/source slideshow/source
boost/boost.6397.warnings.patch | 168
+-
connectivity/source/drivers/evoab2/NStatement.hxx|2
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 16
3 files changed, 166 insertions(+), 20 deletions(-)
New commits:
commit 4689f1c4cf96b43bf7470e31f05614c2a1c16f2d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 11:14:54 2012 +0100
-Werror,-Wunused-function
Change-Id: Ida1f703b4552d891f8fe3defd373ec45697ae5b5
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index efdf7be..dda9154 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -1674,20 +1674,4 @@ boost::shared_ptrOGLTransitionImpl makeNewsflash()
return makeSimpleTransition(aLeavingSlide, aEnteringSlide,
aOverallOperations);
}
-namespace
-{
-
-/** various transitions helper methods
- */
-void prepareDiamond( double nTime, double SlideWidth, double
SlideHeight,double DispWidth, double DispHeight );
-void displaySlidesFadeSmoothly( double nTime, ::sal_Int32 glLeavingSlideTex,
::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale
);
-void displaySlidesFadeThroughBlack( double nTime, ::sal_Int32
glLeavingSlideTex, ::sal_Int32 glEnteringSlideTex, double SlideWidthScale,
double SlideHeightScale );
-void displaySlidesRochade( double nTime, ::sal_Int32 glLeavingSlideTex,
::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale
);
-void displaySlidesShaders( double nTime, ::sal_Int32 glLeavingSlideTex,
::sal_Int32 glEnteringSlideTex, double SlideWidthScale, double SlideHeightScale
);
-void prepareStatic( ::sal_Int32 glLeavingSlideTex, ::sal_Int32
glEnteringSlideTex );
-void prepareDissolve( ::sal_Int32 glLeavingSlideTex, ::sal_Int32
glEnteringSlideTex );
-void preparePermShader();
-
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 150a965248da361440b5cc195c810751ab11e92e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 10:32:34 2012 +0100
-Werror,-Wuninitialized
Change-Id: I885851dd3121e34a3f860a449d4d23d185a4d278
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx
b/connectivity/source/drivers/evoab2/NStatement.hxx
index 52f86f4..2036199 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -93,7 +93,7 @@ namespace connectivity
QueryData( const QueryData _rhs )
:pQuery( NULL )
,sTable()
-,eFilterType( eFilterType )
+,eFilterType( eFilterOther )
,xSelectColumns()
,aSortOrder()
{
commit 23451f2a65527a8e525a6964cb9f6a30f9e2858b
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 10:28:41 2012 +0100
-Werror,-Wshadow
Change-Id: Idd8404cd882181e571da5fd5c02890a0bf4d1a0a
diff --git a/boost/boost.6397.warnings.patch b/boost/boost.6397.warnings.patch
index cf24c9e..383945e 100644
--- a/boost/boost.6397.warnings.patch
+++ b/boost/boost.6397.warnings.patch
@@ -153,6 +153,35 @@
static index_range all()
--- misc/boost_1_44_0/boost/multi_array/multi_array_ref.hpp2012-01-12
20:21:29.790009198 +
+++ misc/build/boost_1_44_0/boost/multi_array/multi_array_ref.hpp
2012-01-12 20:25:49.280492556 +
+@@ -86,24 +86,24 @@
+ num_elements_(other.num_elements_) { }
+
+ template typename ExtentList
+- explicit const_multi_array_ref(TPtr base, const ExtentList extents) :
++ explicit const_multi_array_ref(TPtr base, const ExtentList extents_) :
+ base_(base), storage_(c_storage_order()) {
+ boost::function_requires
+ detail::multi_array::CollectionConceptExtentList ();
+
+ index_base_list_.assign(0);
+-init_multi_array_ref(extents.begin());
++init_multi_array_ref(extents_.begin());
+ }
+
+ template typename ExtentList
+- explicit const_multi_array_ref(TPtr base, const ExtentList extents,
++ explicit const_multi_array_ref(TPtr base, const ExtentList extents_,
+const general_storage_orderNumDims so) :
+ base_(base), storage_(so) {
+ boost::function_requires
+ detail::multi_array::CollectionConceptExtentList ();
+
+ index_base_list_.assign(0);
+-init_multi_array_ref(extents.begin());
++init_multi_array_ref(extents_.begin());
+ }
+
+ explicit const_multi_array_ref(TPtr base,
@@ -124,13 +124,13 @@
}
@@ -170,17 +199,65 @@
*out_iter++ = *in_iter++;
copy_count++;
}
-@@ -327,15 +327,15 @@
+@@ -161,14 +161,14 @@
+ }
+
+ template typename SizeList
+- void reshape(const SizeList extents) {
++ void reshape(const SizeList extents_) {
+ boost::function_requires
+
Re: About numbertext
Hi Stephan, hi Kami, I'm sorry, the first link was a not public link of the of the extension with pending approval at LibreOffice Extensions site, and the target of the second one wasn't updated yet. Here is the right link (extended with the md5sum): http://numbertext.org/dist/92973266240813c7bdb44a4b7d85af04-numbertext-0.9.5.oxt Kami, could you help to copy this extension to the itc.hu? Many thanks for your help. Best regards, Laszlo 2012/12/6 Stephan Bergmann sberg...@redhat.com On 12/06/2012 02:02 PM, Németh László wrote: I have made the complete port, tested with LibreOffice 4.0 and 3.6: http://extensions.libreoffice.**org/extension-center/** numbertext-1/pscreleasefolder.**2012-10-09.7591543982/0.9.5/** numbertext-0.9.5.oxthttp://extensions.libreoffice.org/extension-center/numbertext-1/pscreleasefolder.2012-10-09.7591543982/0.9.5/numbertext-0.9.5.oxt or http://www.numbertext.org/**dist/numbertext-0.9.5.oxthttp://www.numbertext.org/dist/numbertext-0.9.5.oxt Could you update the numbertext src package of the LibreOffice? Thanks in advance, LO wants to download the prebuilt oxt from http://ooo.itc.hu/** oxygenoffice/download/**libreoffice/**510117359dc91181ea06b4aa8582ed** 2c-numbertext-0.9.5.oxthttp://ooo.itc.hu/oxygenoffice/download/libreoffice/510117359dc91181ea06b4aa8582ed2c-numbertext-0.9.5.oxt (see LO's Makefile.fetch), so if somebody (Kami?) can put it there, that would be the easiest. I can adapt the single line setting NUMBERTEXT_EXTENSION_PACK in LO's configure.ac then. The first link above leads to a broken oxt, so I assume the second link points to what we want (and the md5sum I give above is for that one). Stephan 2012/12/6 Németh László nem...@numbertext.org mailto:nem...@numbertext.org** Hello, I will check your fixes, and make a new release from the Numbertext extension (with fixes and the new Latvian and Lithuanian modules of the version 0.9.5). Many thanks for your work and mail! Best regards, Laszlo 2012/12/5 julien2412 serval2...@yahoo.fr mailto:serval2...@yahoo.fr Hello, By trying to reproduce an fdo, I got a lot of these on console: Python exception: class 'TabError': inconsistent use of tabs and spaces in indentation (__init__.py, line 70), traceback follows /home/julien/compile-**libreoffice/libo/solver/** unxlngx6/installation/opt/**program/uno.py:265 in function _uno_import() [return _g_delegatee( name, *optargs, **kwargs )] /home/julien/compile-**libreoffice/libo/solver/** unxlngx6/installation/opt/**share/extensions/numbertext/re**g.uno.py:7http://reg.uno.py:7 http://reg.uno.py:7 in function createInstance() [import org.Numbertext] /home/julien/compile-**libreoffice/libo/solver/** unxlngx6/installation/opt/**program/unohelper.py:292 in function createInstanceWithContext() [return self.clazz( context ) So I unzipped src/**b8cbca7b3363e6ca2d02bc0ba2b639**04-numbertext_0.9.4.oxt and runned pep8 (1.3.3 version) on it. Except E501 lines too long, I fixed all the pep8 warnings. I put all the changes files here: changes.tar.bz2 http://nabble.**documentfoundation.org/file/** n4022762/changes.tar.bz2http://nabble.documentfoundation.org/file/n4022762/changes.tar.bz2 pylint gives warnings too but I don't know really how to fix them. If it's ok, does it worth it to create a new version of numbertext? Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cli_ure/util cli_ure/workbench curl/makefile.mk dbaccess/util idl/util slideshow/util
cli_ure/util/target.pmk | 35 --
cli_ure/workbench/dynload/dynload.cs | 53 -
cli_ure/workbench/dynload/makefile.mk | 59 --
cli_ure/workbench/dynload/readme.txt |2
curl/makefile.mk | 190 --
dbaccess/util/dba.pmk | 20 ---
dbaccess/util/makefile.pmk| 22 ---
idl/util/makefile.mk | 59 --
slideshow/util/makefile.pmk | 38 --
9 files changed, 478 deletions(-)
New commits:
commit 42db3c8036947142771577fd301894e9aa9a995b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Dec 6 13:49:34 2012 +
commit delete various unused makefile.mks
Change-Id: I382423164fd65679d3b893ea0d9729508813b425
diff --git a/cli_ure/util/target.pmk b/cli_ure/util/target.pmk
deleted file mode 100644
index b463e52..000
--- a/cli_ure/util/target.pmk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the License); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-## C# ##
-
-CSCFLAGS = -warnaserror+ -noconfig
-
-.IF $(debug) ==
-
-.IF $(product) ==
-CSCFLAGS += -checked+ -define:DEBUG -define:TRACE
-.ELSE
-CSCFLAGS += -o
-.ENDIF
-
-.ELSE # debug
-
-CSCFLAGS += -debug+ -checked+ -define:DEBUG -define:TRACE
-
-.ENDIF
diff --git a/cli_ure/workbench/dynload/dynload.cs
b/cli_ure/workbench/dynload/dynload.cs
deleted file mode 100644
index 36c3e02..000
--- a/cli_ure/workbench/dynload/dynload.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-using System;
-using unoidl.com.sun.star.lang;
-using unoidl.com.sun.star.uno;
-using unoidl.com.sun.star.bridge;
-using unoidl.com.sun.star.frame;
-
-class DynLoad
-{
-
-static void Main(string[] args)
-{
-connect(args);
-}
-
-/** Connect to a running office that is accepting connections.
-@return The ServiceManager to instantiate office components. */
-static private XMultiServiceFactory connect( string[] args )
-{
-if (args.Length == 0)
-Console.WriteLine(You need to provide a file URL to the office +
- program folder\n);
-System.Collections.Hashtable ht = new System.Collections.Hashtable();
-ht.Add( SYSBINDIR, args[ 0 ] );
-XComponentContext xContext =
-uno.util.Bootstrap.defaultBootstrap_InitialComponentContext(
- args[ 0 ] + /uno.ini, ht.GetEnumerator() );
-
-if (xContext != null)
-Console.WriteLine(Successfully created XComponentContext\n);
-else
-Console.WriteLine(Could not create XComponentContext\n);
-
- return null;
-}
-}
diff --git a/cli_ure/workbench/dynload/makefile.mk
b/cli_ure/workbench/dynload/makefile.mk
deleted file mode 100644
index e20fdcb..000
--- a/cli_ure/workbench/dynload/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding
Re: loader.loadComponentFromURL works slow when we are restoring CALC sheet from byte array | loader.loadComponentFromURL
El 06/12/12 08:50, Michael Meeks escribió:
On Wed, 2012-12-05 at 11:27 -0500, William Beltrán wrote:
Ok, I try to be more specific
Warning: Any further replies that ignore my request to CC (this means
carbon-copy - it is usually the 2nd field down in your mailer after the
To: field) the public developers list - will be ignored. You need to
enter: libreoffice@lists.freedesktop.org into that CC field when you
reply: why ? I don't want to burn my time answering the same questions
again and again to lots of different users :-)
Ok.
I am usign aeroo_reports(aerolib) to generate a ods report, this
report is vey complex and it takes arround 20secs to work and generate
it in .ods type, I can configure the report_aeroo module to
automatically convert the result of my process to xls file but the
times grows up to 15 minutes!!! only in transformation process, so I
analize the module code and i found that this function is the problem:
Fine.
def putDocument(self, data):
try:
desktop =
self._context.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop,
self._context)
except UnknownPropertyException:
self._context = self._resolver.resolve(uno:socket,host=%
s,port=%s;urp;StarOffice.ComponentContext % (self._host, self._port))
desktop =
self._context.ServiceManager.createInstanceWithContext(com.sun.star.frame.Desktop,
self._context)
inputStream =
self.serviceManager.createInstanceWithContext(com.sun.star.io.SequenceInputStream,
self.localContext)
inputStream.initialize((uno.ByteSequence(data),))
Looks like you convert some huge string into a byte sequence. I guess,
that should be reasonably quick. What does your huge string contain ?
zipped ODF ? flat-ODF ? what ?
Is the contain of the file (bytesequence), just like another odf file
that really is a zip file as you knows.
self.document = desktop.loadComponentFromURL('private:stream',
_blank, 0, self._toProperties(InputStream = inputStream))
inputStream.closeInput()
That takes the time ? if so - we'd need a profile of what is going on
to be able to point you at the slow bit so you can help fix it.
Where var data is an inputsream containing the bytes of the ods
file,but there is no problem until the line:
self.document = desktop.loadComponentFromURL('private:stream',
_blank, 0, self._toProperties(InputStream = inputStream))
This line is the devil so I have to waint until 15 minutes to be
done and excecute next line(inputStream.closeInput())
The reports has maybe has 4230 rows so its a big report
4000 rows is not that many; there must be something unusual about them,
or about the SequenceInputStream: which looks like it should be really
fast. If you have a non-confidential example of the file-data there -
can you dump that to a file and try loading that standalone ?
ATB,
Michael.
If I open the file in LibreOffice and saves it as xls file that is very
fast.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Manual conversion printeroption widget
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1242 -- To view, visit https://gerrit.libreoffice.org/1242 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4fa6144c242519d57a6ce92ea8dfe776bc12d765 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: gokul s gswaminat...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - sc/inc sc/qa sc/source
sc/inc/dpsave.hxx|2 +
sc/qa/unit/ucalc.cxx | 29 ++
sc/source/core/data/dpobject.cxx | 12 +-
sc/source/core/data/dpsave.cxx | 37 +
sc/source/ui/inc/gridwin.hxx |4 ++-
sc/source/ui/view/dbfunc3.cxx| 43 ++-
sc/source/ui/view/gridwin.cxx| 39 ---
7 files changed, 112 insertions(+), 54 deletions(-)
New commits:
commit 28daebdf085844b8e611a90ece376ac3b19b8b9b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Dec 6 00:32:22 2012 -0500
Avoid activating window pane when launching popup window.
Else, activating another window pane where the cursor is not would cause
the pivot table field popup to immediately get dismissed after launch
because
ClickExtern() gets called from ActivatePart().
For example, imagine a field popup button is on C2, the cell cursor is
on E5, and the window is frozen between rows 2 and 3. Clicking the popup
button in C2 would launch it for a brief second and dismiss it immediately
afterward. Conceptually, launching a popup in another pane shouldn't
activate that pane anyway. So it makes sense not to activate it for that
scenario.
Change-Id: Ib970cb898fb9c79d254411e2519cfce74c60b72f
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 8a64de9..4f84d43 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -115,6 +115,8 @@ private:
boost::scoped_ptrRectangle mpAutoFillRect;
+struct MouseEventState;
+
/**
* Stores current visible column and row ranges, used to avoid expensive
* operations on objects that are outside visible area.
@@ -250,7 +252,7 @@ private:
sal_Int8DropTransferObj( ScTransferObj* pTransObj, SCCOL
nDestPosX, SCROW nDestPosY,
const Point rLogicPos, sal_Int8
nDndAction );
-voidHandleMouseButtonDown( const MouseEvent rMEvt );
+voidHandleMouseButtonDown( const MouseEvent rMEvt,
MouseEventState rState );
boolDrawMouseButtonDown(const MouseEvent rMEvt);
boolDrawMouseButtonUp(const MouseEvent rMEvt);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 64555e6..e7f82b8 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -167,6 +167,13 @@ extern SfxViewShell* pScActiveViewShell;//
global.cxx
extern sal_uInt16 nScClickMouseModifier;// global.cxx
extern sal_uInt16 nScFillModeMouseModifier; // global.cxx
+struct ScGridWindow::MouseEventState
+{
+bool mbActivatePart;
+
+MouseEventState() : mbActivatePart(false) {}
+};
+
#define SC_FILTERLISTBOX_LINES 12
//
@@ -1734,7 +1741,10 @@ void ScGridWindow::MouseButtonDown( const MouseEvent
rMEvt )
{
nNestedButtonState = SC_NESTEDBUTTON_DOWN;
-HandleMouseButtonDown( rMEvt );
+MouseEventState aState;
+HandleMouseButtonDown(rMEvt, aState);
+if (aState.mbActivatePart)
+pViewData-GetView()-ActivatePart(eWhich);
if ( nNestedButtonState == SC_NESTEDBUTTON_UP )
{
@@ -1751,7 +1761,7 @@ void ScGridWindow::MouseButtonDown( const MouseEvent
rMEvt )
nNestedButtonState = SC_NESTEDBUTTON_NONE;
}
-void ScGridWindow::HandleMouseButtonDown( const MouseEvent rMEvt )
+void ScGridWindow::HandleMouseButtonDown( const MouseEvent rMEvt,
MouseEventState rState )
{
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the event.
@@ -1835,12 +1845,9 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
if (!bDouble)
nMouseStatus = SC_GM_NONE;
-if (!bFormulaMode)
-{
-if ( pViewData-GetActivePart() != eWhich )
-pViewData-GetView()-ActivatePart( eWhich );
-}
-else
+rState.mbActivatePart = !bFormulaMode; // Don't activate when in formula
mode.
+
+if (bFormulaMode)
{
ScViewSelectionEngine* pSelEng = pViewData-GetView()-GetSelEngine();
pSelEng-SetWindow(this);
@@ -1896,9 +1903,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
{
bRFMouse = true;// die anderen Variablen sind oben
initialisiert
-if ( pViewData-GetActivePart() != eWhich )
-pViewData-GetView()-ActivatePart( eWhich ); //! schon oben
immer ???
-
+rState.mbActivatePart = true; // always activate ?
StartTracking();
return;
}
@@ -1909,7 +1914,7 @@ void ScGridWindow::HandleMouseButtonDown( const
MouseEvent rMEvt )
if ( bDouble )
pViewData-GetView()-FillCrossDblClick();
else
-
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source
svx/source/tbxctrls/linectrl.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ee1d26740fbd8e9c9d6c1ee7e493f136c25b038c
Author: Ivan Timofeev timofeev@gmail.com
Date: Tue Dec 4 18:19:07 2012 +0400
fdo#40339: line style toolbar dropdown list not updated
... because XLineDashItem::GetName returns the so-called api name
(from RID_SVXSTR_DASH_DEF_START..RID_SVXSTR_DASH_DEF_END range), while
the listbox is filled with corresponding translated names.
Change-Id: I9ed6f6219f2b31fb02c24c70f3fef4f0efcb
(cherry picked from commit 44ee3ce747058eaf7ca241fe482f4aab54c9bc92)
Reviewed-on: https://gerrit.libreoffice.org/1238
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 0b75ce7..e1c7670 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -45,6 +45,7 @@
#include svx/linectrl.hxx
#include svx/itemwin.hxx
#include svx/dialmgr.hxx
+#include svx/unoapi.hxx
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -169,7 +170,9 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem*
pState )
{
if( pDashItem )
{
-String aString( pDashItem-GetName() );
+String aString;
+SvxUnogetInternalNameForItem(
+XATTR_LINEDASH, pDashItem-GetName(), aString );
pBox-SelectEntry( aString );
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About numbertext
On 6 December 2012 14:40, Stephan Bergmann sberg...@redhat.com wrote: LO wants to download the prebuilt oxt from http://ooo.itc.hu/oxygenoffice/download/libreoffice/510117359dc91181ea06b4aa8582ed2c-numbertext-0.9.5.oxt (see LO's Makefile.fetch), so if somebody (Kami?) can put it there, that would be the easiest. I can adapt the single line setting NUMBERTEXT_EXTENSION_PACK in LO's configure.ac then. Can't we just change this and use http://dev-www.libreoffice.org/src/ ? Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#40339: line style toolbar dropdown list not updated
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1238 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1238 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9ed6f6219f2b31fb02c24c70f3fef4f0efcb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: random number generators for calc
just happened to reimplement RAND() with a B.A Wichmann
and I.D Hill generator.. see
As they are entitled to. No doubt we'll come up with a comprehensive,
nicely architected and beautiful solution of our own :-)
Ok, I'll go ahead with a suggestion then. :)
Attached patch is just a simple wrapper around boost, to be used like
sc::rng::seed() to replace libc srand()
sc::rng::rand() to replace libc rand()
and a few more distributions.
I've also modified ScInterpreter::ScRandom()
to simply call sc::rng::uniform()
which should solve bug 33365.
I've not modified RANDBETWEEN(a,b) yet but this could simply call
sc::rng::uniform_int(a,b).
Also, the rand in Basic could be changed in the future.
Small problems:
- compiler warnings from within boost
- few asserts might need to be replaced
From 569a0e05f1c2320041786be051842a552aca885c Mon Sep 17 00:00:00 2001
From: tino ttk...@gmail.com
Date: Thu, 6 Dec 2012 14:05:11 +
Subject: [PATCH] fdo#33365 added wrapper for boost random, use that in RAND()
Change-Id: Iafc524d12c76423f74dc16b42595e52fbc5a1e54
---
sc/Library_sc.mk | 1 +
sc/source/core/data/global.cxx | 2 +
sc/source/core/inc/random.hxx| 35 ++
sc/source/core/tool/interpr1.cxx | 4 +-
sc/source/core/tool/random.cxx | 255 +++
5 files changed, 296 insertions(+), 1 deletion(-)
create mode 100644 sc/source/core/inc/random.hxx
create mode 100644 sc/source/core/tool/random.cxx
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 348300f..10918e4 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -213,6 +213,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/progress \
sc/source/core/tool/queryentry \
sc/source/core/tool/queryparam \
+ sc/source/core/tool/random \
sc/source/core/tool/rangelst \
sc/source/core/tool/rangenam \
sc/source/core/tool/rangeseq \
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 4e449c5..e18d241 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -75,6 +75,7 @@
#include sc.hrc
#include scmod.hxx
#include appoptio.hxx
+#include random.hxx
// ---
@@ -557,6 +558,7 @@ void ScGlobal::Init()
// names from the compiler.
ScParameterClassification::Init();
srand( (unsigned) time( NULL ) ); // Random Seed Init fuer Interpreter
+sc::rng::seed( time( NULL ) ); // seed for libc rand() replacement
InitAddIns();
diff --git a/sc/source/core/inc/random.hxx b/sc/source/core/inc/random.hxx
new file mode 100644
index 000..dc068b1
--- /dev/null
+++ b/sc/source/core/inc/random.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_RANDOM_HXX
+#define SC_RANDOM_HXX
+
+namespace sc
+{
+namespace rng
+{
+
+void seed(int i); // set initial seed (equivalent of libc srand())
+uint32_t max(); // max number by rand() (equivalent of RAND_MAX)
+uint32_t min(); // min number by rand() (most likely 0)
+uint32_t rand();// replacement for libc's rand()
+
+int uniform_int(int from, int to); // uniform distribution given int range
+double uniform(); // uniform distribution in [0,1)
+double normal();// normal distribution N(0,1)
+double normal(double mu, double sigma); // N(mu, sigma^2)
+double lognormal(); // lognormal distribution: exp(N(0,1))
+double lognormal(double mu, double sigma);
+
+} // namespace
+} // namespace
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 43a21eb..adecc75 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -44,6 +44,7 @@
#include globstr.hrc
#include attrib.hxx
#include jumpmatrix.hxx
+#include random.hxx
#include comphelper/processfactory.hxx
#include comphelper/string.hxx
@@ -1711,7 +1712,8 @@ void ScInterpreter::ScPi()
void ScInterpreter::ScRandom()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScRandom );
-PushDouble((double)rand() / ((double)RAND_MAX+1.0));
+//PushDouble((double)rand() / ((double)RAND_MAX+1.0));
+PushDouble(sc::rng::uniform());
}
diff --git a/sc/source/core/tool/random.cxx b/sc/source/core/tool/random.cxx
new file mode 100644
index 000..4195e26
--- /dev/null
+++ b/sc/source/core/tool/random.cxx
@@ -0,0 +1,255 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ *
Re: About numbertext
On 12/06/2012 03:23 PM, Matúš Kukan wrote: On 6 December 2012 14:40, Stephan Bergmann sberg...@redhat.com wrote: LO wants to download the prebuilt oxt from http://ooo.itc.hu/oxygenoffice/download/libreoffice/510117359dc91181ea06b4aa8582ed2c-numbertext-0.9.5.oxt (see LO's Makefile.fetch), so if somebody (Kami?) can put it there, that would be the easiest. I can adapt the single line setting NUMBERTEXT_EXTENSION_PACK in LO's configure.ac then. Can't we just change this and use http://dev-www.libreoffice.org/src/ ? My understanding is that Kami/OxygenOffice/ooo.itc.hu (whether and however they are actually connected) are the only real consumers to include that prebuilt numbertext oxt as a bundled extension in installation sets. As such, I think it is best to keep the sources hosted at ooo.itc.hu or, if that does not work well, drop --enable-ext-numbertext support from LO. My stake in this is merely that I like to misuse the various --enable-ext-* switches that appear to be there for the benefit of OxygenOffice, to easily have some real extensions as seen in the wild installed in the local builds I do, to see there are any problems with them. So if there is a cheap way to keep those --enable-ext-* switches alive, I do not mind getting involved in some simple maintenance work around them occasionally. But, on the other hand, I would not cry if they were gone for good, either. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About numbertext
2012/12/6 Matúš Kukan matus.ku...@gmail.com On 6 December 2012 14:40, Stephan Bergmann sberg...@redhat.com wrote: LO wants to download the prebuilt oxt from http://ooo.itc.hu/oxygenoffice/download/libreoffice/510117359dc91181ea06b4aa8582ed2c-numbertext-0.9.5.oxt (see LO's Makefile.fetch), so if somebody (Kami?) can put it there, that would be the easiest. I can adapt the single line setting NUMBERTEXT_EXTENSION_PACK in LO's configure.ac then. Can't we just change this and use http://dev-www.libreoffice.org/src/ ? Yes, it would be fine, also with the hunart and the typography toolbar extensions. Laszlo Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About numbertext
Hi, On Thu, Dec 6, 2012 at 3:31 PM, Stephan Bergmann sberg...@redhat.com wrote: My understanding is that Kami/OxygenOffice/ooo.itc.hu (whether and however they are actually connected) are the only real consumers to include that prebuilt numbertext oxt as a bundled extension in installation sets. As such, I think it is best to keep the sources hosted at ooo.itc.hu or, if that does not work well, drop --enable-ext-numbertext support from LO. SUSE build uses it as well, probably it was requested by a customer. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/inc/unosqlmessage.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4b90e055067a829f504b53d59aadc2e97138a79b Author: Noel Grandin n...@peralex.com Date: Thu Dec 6 17:00:48 2012 +0200 fix missing SAL_CALL attribute on method Change-Id: Idd0581d104c5a3e1286763c2deb8d385e04e207b diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index c738b73..f8b4bf2 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -64,7 +64,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; protected: -virtual void initialize(com::sun::star::uno::Sequence ::com::sun::star::uno::Any const args) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); +virtual void SAL_CALL initialize(com::sun::star::uno::Sequence ::com::sun::star::uno::Any const args) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException); // OPropertySetHelper overridables // (overwrittin these three, because we have some special handling for our property) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About numbertext
On 12/06/2012 03:47 PM, Andras Timar wrote: On Thu, Dec 6, 2012 at 3:31 PM, Stephan Bergmann sberg...@redhat.com wrote: My understanding is that Kami/OxygenOffice/ooo.itc.hu (whether and however they are actually connected) are the only real consumers to include that prebuilt numbertext oxt as a bundled extension in installation sets. As such, I think it is best to keep the sources hosted at ooo.itc.hu or, if that does not work well, drop --enable-ext-numbertext support from LO. SUSE build uses it as well, probably it was requested by a customer. ...in which case please just ignore me here. Stephan ___ 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 Bug 54157 depends on bug 57946, which changed state. Bug 57946 Summary: EDITING CRASH in menu 'Format - Conditional Formatting - Contition - Condition' https://bugs.freedesktop.org/show_bug.cgi?id=57946 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: extensions/source
extensions/source/plugin/unx/mediator.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b13abba277397464a2cde3604aaca780191e5d97
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 16:26:52 2012 +0100
-Werror,-Wsometimes-uninitialized
Change-Id: I8996a06a19e7500b212acf863c44231214427f79
diff --git a/extensions/source/plugin/unx/mediator.cxx
b/extensions/source/plugin/unx/mediator.cxx
index 9cb11fc..a4eea38 100644
--- a/extensions/source/plugin/unx/mediator.cxx
+++ b/extensions/source/plugin/unx/mediator.cxx
@@ -202,7 +202,7 @@ void MediatorListener::run()
sal_uLong nHeader[ 3 ];
int nBytes;
-if( m_pMediator ( nBytes = read( m_pMediator-m_nSocket, nHeader,
sizeof( nHeader ) ) ) == sizeof( nHeader ) nHeader[2] == MEDIATOR_MAGIC)
+if( ( nBytes = read( m_pMediator-m_nSocket, nHeader, sizeof( nHeader
) ) ) == sizeof( nHeader ) nHeader[2] == MEDIATOR_MAGIC)
{
if( nHeader[ 0 ] == 0 nHeader[ 1 ] == 0 )
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About numbertext
Hi, Final release: http://numbertext.org/dist/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext-0.9.5.oxt Unfortunately, I don't know the exact status of this extension in LibreOffice. I will publish it on the LibreOffice Extensions site, too (also the other ones mentioned in my previous letter). Thanks, László 2012/12/6 Stephan Bergmann sberg...@redhat.com On 12/06/2012 03:23 PM, Matúš Kukan wrote: On 6 December 2012 14:40, Stephan Bergmann sberg...@redhat.com wrote: LO wants to download the prebuilt oxt from http://ooo.itc.hu/**oxygenoffice/download/**libreoffice/** 510117359dc91181ea06b4aa8582ed**2c-numbertext-0.9.5.oxthttp://ooo.itc.hu/oxygenoffice/download/libreoffice/510117359dc91181ea06b4aa8582ed2c-numbertext-0.9.5.oxt (see LO's Makefile.fetch), so if somebody (Kami?) can put it there, that would be the easiest. I can adapt the single line setting NUMBERTEXT_EXTENSION_PACK in LO's configure.ac then. Can't we just change this and use http://dev-www.libreoffice.**org/src/http://dev-www.libreoffice.org/src/? My understanding is that Kami/OxygenOffice/ooo.itc.hu (whether and however they are actually connected) are the only real consumers to include that prebuilt numbertext oxt as a bundled extension in installation sets. As such, I think it is best to keep the sources hosted at ooo.itc.hu or, if that does not work well, drop --enable-ext-numbertext support from LO. My stake in this is merely that I like to misuse the various --enable-ext-* switches that appear to be there for the benefit of OxygenOffice, to easily have some real extensions as seen in the wild installed in the local builds I do, to see there are any problems with them. So if there is a cheap way to keep those --enable-ext-* switches alive, I do not mind getting involved in some simple maintenance work around them occasionally. But, on the other hand, I would not cry if they were gone for good, either. Stephan __**_ LibreOffice mailing list LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Default Styles in Writer
Hi Niklas, Somehow I missed your post on UX-Advise. Anyway, thanks for the information, that's helpful to me. I'll have a look at it when I've got some time. Thanks Samuel Am 06.12.2012 12:55, schrieb Niklas Johansson: Hi Samuel This is pretty much the issue I tried to raise in the UX-discussion. - Applied styles are shown in the ComboBox (a good thing) - A style that is the basis for another style is seen as Applied and is thus shown in the ComboBox (what I questioned) - The Default Style is the basis for all other styles (not a bad thing) and thus it is *always* shown in the ComboBox (not so nice) An important point, I believe, is that, if in fact the Default Style is explicitly used in the document it should be shown in the ComboBox. So, for this to work I believe the logic behind what is added in the ComboBox at run time needs to changed. I wouldn't mind being proven wrong though. ;) Nice job with the default set of styles though. Regards, Niklas Johansson Samuel Mehrbrodt skrev 2012-12-06 09:33: Hi, I have submitted a patch changing the list of default Styles in the Toolbar in Writer [1]. Now, we [2] also wanted to remove the entry Default Style from the list, but removing Standard in the code didn't do that. Can anyone point me in the right direction where this is added? Thanks, Samuel [1]https://gerrit.libreoffice.org/1248 [2] http://nabble.documentfoundation.org/Libreoffice-ux-advise-Default-Styles-in-Writer-td4020441.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/source
filter/source/svg/svgwriter.cxx |5 ++---
filter/source/svg/svgwriter.hxx |3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit d96c0ee8e9ad0f777bed009e87401e6f684af446
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 16:43:16 2012 +0100
-Werror,-Wunused-private-field
Change-Id: Ia567a2e7f8089ad193af98443e5d662e744fcff7
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 2f269ba..332ff7e 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -440,9 +440,8 @@ void SVGAttributeWriter::setFontFamily()
// - SVGTextWriter -
// ---
-SVGTextWriter::SVGTextWriter( SVGExport rExport, SVGFontExport rFontExport )
+SVGTextWriter::SVGTextWriter( SVGExport rExport )
: mrExport( rExport ),
-mrFontExport( rFontExport ),
mpContext( NULL ),
mpVDev( NULL ),
mbIsTextShapeStarted( sal_False ),
@@ -1941,7 +1940,7 @@ SVGActionWriter::SVGActionWriter( SVGExport rExport,
SVGFontExport rFontExport
mrExport( rExport ),
mrFontExport( rFontExport ),
mpContext( NULL ),
-maTextWriter( rExport, rFontExport ),
+maTextWriter( rExport ),
mnInnerMtfCount( 0 ),
mbClipAttrChanged( sal_False )
{
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index ebffda9..ce2e441 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -196,7 +196,6 @@ class SVGTextWriter
private:
SVGExport mrExport;
-SVGFontExport mrFontExport;
SVGAttributeWriter* mpContext;
VirtualDevice* mpVDev;
sal_BoolmbIsTextShapeStarted;
@@ -230,7 +229,7 @@ class SVGTextWriter
FontmaParentFont;
public:
-SVGTextWriter( SVGExport rExport, SVGFontExport rFontExport );
+SVGTextWriter( SVGExport rExport );
virtual ~SVGTextWriter();
sal_Int32 setTextPosition( const GDIMetaFile rMtf, sal_uLong nCurAction
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d35849b6f718990869b01209865bb70cb7343ceb Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 6 16:54:07 2012 +0100 fdo#57927: Clarify msi installer only installs subset of dicts by default ...since this was changed with fdo#53009 in LO 3.6.3. Change-Id: I95b8da1311c666945e9bbe15d22da59add6b6227 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 57bd434..f2b6917 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -593,10 +593,10 @@ en-US = Back en-US = Cancel [OOO_CONTROL_255] -en-US = [ProductName] will be installed with the default components, including spelling dictionaries in all available languages. +en-US = [ProductName] will be installed with the default components, including user interface languages and spelling dictionaries matching your current language settings. [OOO_CONTROL_256] -en-US = Choose which program features you want installed and where they will be installed. For example here you can select additional user interface languages or deselect unwanted dictionaries. +en-US = Choose which program features you want installed and where they will be installed. For example here you can select additional user interface languages and spelling dictionaries. [OOO_CONTROL_257] en-US = Choose the setup type that best suits your needs. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a0f70009e805ebc37493fb3afefb443b64fa4108 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 6 16:54:07 2012 +0100 fdo#57927: Clarify msi installer only installs subset of dicts by default ...since this was changed with fdo#53009 in LO 3.6.3. Change-Id: I95b8da1311c666945e9bbe15d22da59add6b6227 (cherry picked from commit d35849b6f718990869b01209865bb70cb7343ceb) diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 57bd434..f2b6917 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -593,10 +593,10 @@ en-US = Back en-US = Cancel [OOO_CONTROL_255] -en-US = [ProductName] will be installed with the default components, including spelling dictionaries in all available languages. +en-US = [ProductName] will be installed with the default components, including user interface languages and spelling dictionaries matching your current language settings. [OOO_CONTROL_256] -en-US = Choose which program features you want installed and where they will be installed. For example here you can select additional user interface languages or deselect unwanted dictionaries. +en-US = Choose which program features you want installed and where they will be installed. For example here you can select additional user interface languages and spelling dictionaries. [OOO_CONTROL_257] en-US = Choose the setup type that best suits your needs. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] userfriendly make targets for build and clean
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1253 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/1253/1 userfriendly make targets for build and clean So that now it's possible to do just 'make CppunitTest_sw_macros_test' instead of 'make /home/llunak/build/src/l2/workdir/unxlngx6/CppunitTest/sw_macros_test.test' Change-Id: Ibd1e9ef4fc825043a71bd669b2f5c37ffec68e33 --- M solenv/gbuild/AllLangResTarget.mk M solenv/gbuild/AllLangZip.mk M solenv/gbuild/CliLibrary.mk M solenv/gbuild/CliNativeLibrary.mk M solenv/gbuild/CliUnoApi.mk M solenv/gbuild/Configuration.mk M solenv/gbuild/CppunitTest.mk M solenv/gbuild/CustomTarget.mk M solenv/gbuild/Dictionary.mk M solenv/gbuild/Executable.mk M solenv/gbuild/Extension.mk M solenv/gbuild/ExternalPackage.mk M solenv/gbuild/ExternalProject.mk M solenv/gbuild/Helper.mk M solenv/gbuild/InstallModule.mk M solenv/gbuild/InstallScript.mk M solenv/gbuild/InternalUnoApi.mk M solenv/gbuild/Jar.mk M solenv/gbuild/JunitTest.mk M solenv/gbuild/Library.mk M solenv/gbuild/Package.mk M solenv/gbuild/Pagein.mk M solenv/gbuild/Pyuno.mk M solenv/gbuild/Rdb.mk M solenv/gbuild/StaticLibrary.mk M solenv/gbuild/UI.mk M solenv/gbuild/UnoApi.mk M solenv/gbuild/UnoApiMerge.mk M solenv/gbuild/UnpackedTarball.mk M solenv/gbuild/WinResTarget.mk M solenv/gbuild/Zip.mk 31 files changed, 42 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1253 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd1e9ef4fc825043a71bd669b2f5c37ffec68e33 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#57927: Clarify msi installer only installs subset of dic...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1254 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/1254/1 fdo#57927: Clarify msi installer only installs subset of dicts by default ...since this was changed with fdo#53009 in LO 3.6.3. Change-Id: I95b8da1311c666945e9bbe15d22da59add6b6227 (cherry picked from commit d35849b6f718990869b01209865bb70cb7343ceb) --- M instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1254 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95b8da1311c666945e9bbe15d22da59add6b6227 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab2/NStatement.cxx |2 --
connectivity/source/drivers/evoab2/NStatement.hxx |4
2 files changed, 6 deletions(-)
New commits:
commit 24d7831da52dbb0fdc2f1aa2a5f25f3fa4477acf
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 17:13:51 2012 +0100
-Werror,-Wunused-private-field
Change-Id: I1440856b2a54302f3d95ed1d915fb64523f0db3b
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index bd377e5..949a4e6 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -53,7 +53,6 @@ OCommonStatement::OCommonStatement(OEvoabConnection*
_pConnection)
, ::comphelper::OPropertyContainer(OCommonStatement_IBase::rBHelper)
, OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this )
, m_xResultSet(NULL)
-, m_pResultSet(NULL)
, m_pConnection(_pConnection)
, m_aParser(_pConnection-getDriver().getComponentContext())
, m_aSQLIterator( _pConnection,
_pConnection-createCatalog()-getTables(), m_aParser, NULL )
@@ -66,7 +65,6 @@ OCommonStatement::OCommonStatement(OEvoabConnection*
_pConnection)
, m_nFetchDirection(FetchDirection::FORWARD)
, m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE)
, m_bEscapeProcessing(sal_True)
-, rBHelper(OCommonStatement_IBase::rBHelper)
{
m_pConnection-acquire();
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx
b/connectivity/source/drivers/evoab2/NStatement.hxx
index 2036199..187b1fd 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -47,7 +47,6 @@ namespace connectivity
{
namespace evoab
{
-class OEvoabResultSet;
class OEvoabConnection;
typedef ::cppu::WeakComponentImplHelper2
::com::sun::star::sdbc::XWarningsSupplier
,
::com::sun::star::sdbc::XCloseable
@@ -148,7 +147,6 @@ namespace connectivity
private:
::com::sun::star::uno::WeakReference
::com::sun::star::sdbc::XResultSetm_xResultSet; // The last ResultSet
created
-OEvoabResultSet *m_pResultSet;
OEvoabConnection *m_pConnection;
connectivity::OSQLParser m_aParser;
connectivity::OSQLParseTreeIterator m_aSQLIterator;
@@ -166,8 +164,6 @@ namespace connectivity
sal_Boolm_bEscapeProcessing;
// /properties
-::cppu::OBroadcastHelper rBHelper;
-
protected:
void disposeResultSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Grammar checking] Using LanguageTool lexicons with Lightproof new possible
Hi Olivier,
Thanks, I have tested it, quite fast the dictionary lookup!
Best regards,
László
2012/12/6 Olivier R. olivier.nore...@gmail.com
Hi László,
In fsa_builder.py, in class DAWG, you can replace :
self.minimizedNodes = collections.OrderedDict()
by
self.minimizedNodes = {}
Creating the DAWG is much quicker with a simple dictionary than with an
ordered dictionary.
I only used the latest to test compression with a sorted DAWG, but it’s
unuseful with this version of the script.
Regards,
Olivier
--
View this message in context:
http://nabble.documentfoundation.org/Grammar-checking-Using-LanguageTool-lexicons-with-Lightproof-new-possible-tp4022489p4022817.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svgio/source
svgio/source/svgreader/svgtextpathnode.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit a1f85dd9db88c157d8943f7bf2a101bf8e281023 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 6 17:32:45 2012 +0100 -Werror,-Wunused-private-field Change-Id: Ifa4d44865873bfee8a95c5287e3d8b4f13fa534b diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index c06b6b7..4fb8e09 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -40,7 +40,6 @@ namespace svgio private: const basegfx::B2DPolygon mrPolygon; const doublemfBasegfxPathLength; -const doublemfUserToBasegfx; double mfPosition; const basegfx::B2DPointmrTextStart; @@ -65,7 +64,6 @@ namespace svgio const drawinglayer::primitive2d::TextSimplePortionPrimitive2D rSource, const basegfx::B2DPolygon rPolygon, const double fBasegfxPathLength, -const double fUserToBasegfx, double fPosition, const basegfx::B2DPoint rTextStart); virtual ~pathTextBreakupHelper(); @@ -118,13 +116,11 @@ namespace svgio const drawinglayer::primitive2d::TextSimplePortionPrimitive2D rSource, const basegfx::B2DPolygon rPolygon, const double fBasegfxPathLength, -const double fUserToBasegfx, double fPosition, const basegfx::B2DPoint rTextStart) : drawinglayer::primitive2d::TextBreakupHelper(rSource), mrPolygon(rPolygon), mfBasegfxPathLength(fBasegfxPathLength), -mfUserToBasegfx(fUserToBasegfx), mfPosition(0.0), mrTextStart(rTextStart), mnMaxIndex(rPolygon.isClosed() ? rPolygon.count() : rPolygon.count() - 1), @@ -462,7 +458,6 @@ namespace svgio *pCandidate, aPolygon, fBasegfxPathLength, -fUserToBasegfx, fPosition, rTextStart); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 - writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit 1fd91ad2c94e80ebbc121b1f3b6bc76ad2257500 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Dec 6 17:55:47 2012 +0100 -Werror,-Wunused-private-field Change-Id: Ic4c805079529f13b6cabe78f0c7d33b76c0b7ce6 diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 9381f73..3b8e2d8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -163,7 +163,6 @@ DomainMapper_Impl::DomainMapper_Impl( m_xTextDocument( xModel, uno::UNO_QUERY ), m_xTextFactory( xModel, uno::UNO_QUERY ), m_xComponentContext( xContext ), -m_bFieldMode( false ), m_bSetUserFieldContent( false ), m_bIsFirstSection( true ), m_bIsColumnBreakDeferred( false ), diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 5857455..311485f 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -302,7 +302,6 @@ private: TextContentStack m_aAnchoredStack; FieldStack m_aFieldStack; -bool m_bFieldMode; bool m_bSetUserFieldContent; bool m_bIsFirstSection; bool m_bIsColumnBreakDeferred; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/condformat/condformatdlg.cxx |4 +---
sc/source/ui/condformat/condformatmgr.cxx | 11 +--
sc/source/ui/dbgui/sortkeydlg.cxx |1 -
sc/source/ui/inc/condformatdlg.hxx|4
sc/source/ui/inc/condformatmgr.hxx|5 ++---
sc/source/ui/inc/sortkeydlg.hxx |3 ---
6 files changed, 8 insertions(+), 20 deletions(-)
New commits:
commit 4ee829af622a2932ffad8f9712e2563579746cf0
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 6 18:15:33 2012 +0100
-Werror,-Wunused-private-field
Change-Id: I1866be3b7feb42f0b1a24bf214a1276b76f883b5
diff --git a/sc/source/ui/condformat/condformatdlg.cxx
b/sc/source/ui/condformat/condformatdlg.cxx
index 3398188..6236432 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -368,9 +368,7 @@ ScCondFormatDlg::ScCondFormatDlg(Window* pParent,
ScDocument* pDoc, const ScCond
maCondFormList( this, ScResId( CTRL_LIST ), pDoc, pFormat, rRange, rPos,
eType ),
maPos(rPos),
mpDoc(pDoc),
-mpFormat(pFormat),
-mpLastEdit(NULL),
-meType(eType)
+mpLastEdit(NULL)
{
rtl::OUStringBuffer aTitle( GetText() );
aTitle.append(rtl::OUString( ));
diff --git a/sc/source/ui/condformat/condformatmgr.cxx
b/sc/source/ui/condformat/condformatmgr.cxx
index 5a5ea1b..af9e383 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -37,12 +37,11 @@
#define ITEMID_CONDITION 2
-ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent,
ScDocument* pDoc, ScConditionalFormatList* pFormatList, const ScAddress rPos):
+ScCondFormatManagerWindow::ScCondFormatManagerWindow(Window* pParent,
ScDocument* pDoc, ScConditionalFormatList* pFormatList):
SvTabListBox(pParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP),
maHeaderBar( pParent, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
mpDoc(pDoc),
-mpFormatList(pFormatList),
-mrPos(rPos)
+mpFormatList(pFormatList)
{
Size aBoxSize( pParent-GetOutputSizePixel() );
@@ -142,9 +141,9 @@ IMPL_LINK_NOARG(ScCondFormatManagerWindow, HeaderEndDragHdl)
return 0;
}
-ScCondFormatManagerCtrl::ScCondFormatManagerCtrl(Window* pParent, ScDocument*
pDoc, ScConditionalFormatList* pFormatList, const ScAddress rPos):
+ScCondFormatManagerCtrl::ScCondFormatManagerCtrl(Window* pParent, ScDocument*
pDoc, ScConditionalFormatList* pFormatList):
Control(pParent, ScResId(CTRL_TABLE)),
-maWdManager(this, pDoc, pFormatList, rPos)
+maWdManager(this, pDoc, pFormatList)
{
}
@@ -172,7 +171,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window*
pParent, ScDocument* pDoc
maBtnCancel(this, ScResId(BTN_CANCEL)),
maFlLine(this, ScResId(FL_LINE)),
mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) :
NULL),
-maCtrlManager(this, pDoc, mpFormatList, rPos),
+maCtrlManager(this, pDoc, mpFormatList),
mpDoc(pDoc),
maPos(rPos),
mbModified(false)
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx
b/sc/source/ui/dbgui/sortkeydlg.cxx
index 45d65ca..76a8747 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -109,7 +109,6 @@ ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent,
ScSortKeyItems rItems)
: m_aSortWin(pParent, rItems)
, m_rScrolledWindow(*pParent-getVclScrolledWindow(SortCriteriaPage))
, m_rVertScroll(m_rScrolledWindow.getVertScrollBar())
-, nThumbPos(0)
{
m_rVertScroll.EnableDrag();
m_rVertScroll.Show();
diff --git a/sc/source/ui/inc/condformatdlg.hxx
b/sc/source/ui/inc/condformatdlg.hxx
index 588d04d..5541c49 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -112,12 +112,8 @@ private:
ScAddress maPos;
ScDocument* mpDoc;
-const ScConditionalFormat* mpFormat;
-
formula::RefEdit* mpLastEdit;
-condformat::dialog::ScCondFormatDialogType meType;
-
DECL_LINK( EdRangeModifyHdl, Edit* );
protected:
diff --git a/sc/source/ui/inc/condformatmgr.hxx
b/sc/source/ui/inc/condformatmgr.hxx
index c13ff6b..d3c9099 100644
--- a/sc/source/ui/inc/condformatmgr.hxx
+++ b/sc/source/ui/inc/condformatmgr.hxx
@@ -50,13 +50,12 @@ private:
HeaderBar maHeaderBar;
ScDocument* mpDoc;
ScConditionalFormatList* mpFormatList;
-const ScAddress mrPos;
std::mapSvTreeListEntry*, sal_Int32 maMapLBoxEntryToCondIndex;
DECL_LINK( HeaderEndDragHdl, void* );
public:
-ScCondFormatManagerWindow( Window* pParent, ScDocument* pDoc,
ScConditionalFormatList* pFormatList, const ScAddress rPos );
+ScCondFormatManagerWindow( Window* pParent, ScDocument* pDoc,
ScConditionalFormatList* pFormatList );
void DeleteSelection();
ScConditionalFormat* GetSelection();
@@ -66,7 +65,7 @@ public:
class ScCondFormatManagerCtrl : Control
{
public:
-ScCondFormatManagerCtrl(Window* pParent, ScDocument* pDoc,
[PATCH] -Werror,-Wtautological-constant-out-of-range-compare
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1255 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/1255/1 -Werror,-Wtautological-constant-out-of-range-compare ...so assuming this was meant instead? Change-Id: I1c9cf55e2a0ca9d725ce65d8f0a0748e4ca13886 --- M sw/source/ui/shells/txtattr.cxx 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1255 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c9cf55e2a0ca9d725ce65d8f0a0748e4ca13886 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sal/inc svl/source xmloff/source
sal/inc/rtl/ustrbuf.hxx |4 ++--
svl/source/numbers/zformat.cxx | 14 +++---
xmloff/source/style/xmlnumfi.cxx |2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit eafb82821386e4c14f4a072e4b541dc60f4d7af2
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Dec 6 18:48:15 2012 +0100
OUStringBuffer::remove( int ) - truncate( int )
Although this may seem consistent with remove( int, int ), it is
in fact rather misleading API. The biggest offender is most probably
buffer.remove( 'a' ) , which definitely does not do what it suggests
to do.
Change-Id: I287619cd4b953228b93fa68fb381d66c344c3865
Reviewed-on: https://gerrit.libreoffice.org/1256
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index c5c6f5d..1397a18 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -986,7 +986,7 @@ public:
@since LibreOffice 4.0
*/
-OUStringBuffer remove( sal_Int32 start = 0)
+OUStringBuffer truncate( sal_Int32 start = 0 )
{
rtl_uStringbuffer_remove( pData, start, getLength() - start );
return *this;
@@ -1240,7 +1240,7 @@ public:
}
if(index getLength())
{
-remove(index);
+truncate(index);
}
return result - getLength();
}
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 1d86c92..3f47265 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2625,7 +2625,7 @@ bool SvNumberformat::ImpGetScientificOutput(double
fNumber,
break;
}
ExpStr = sStr.toString().copy( nExpStart );// part following the
E+
-sStr.remove( nExPos );
+sStr.truncate( nExPos );
// cut any decimal delimiter
sal_Int32 index = 0;
@@ -2692,7 +2692,7 @@ bool SvNumberformat::ImpGetScientificOutput(double
fNumber,
// weiter Hauptzahl:
if ( !bCont )
{
-sStr.remove();
+sStr.truncate();
}
else
{
@@ -2739,7 +2739,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
if (rInfo.nCntExp == 0)
{
SAL_WARN( svl.numbers, SvNumberformat:: Bruch, nCntExp == 0);
-sBuff.remove();
+sBuff.truncate();
return false;
}
@@ -2944,7 +2944,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
}
if (rInfo.nCntPre 0 nFrac == 0)
{
-sDiv.remove();
+sDiv.truncate();
}
else
{
@@ -2980,7 +2980,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
// weiter Zaehler:
if ( !bCont )
{
-sFrac.remove();
+sFrac.truncate();
}
else
{
@@ -3001,7 +3001,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
// weiter Hauptzahl
if ( !bCont )
{
-sStr.remove();
+sStr.truncate();
}
else
{
@@ -4376,7 +4376,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
sal_Int32 nLen = rDecSep.getLength();
if ( sStr.getLength() nLen ( sStr.indexOf( rDecSep,
sStr.getLength() - nLen) == sStr.getLength() - nLen) )
{
-sStr.remove( sStr.getLength() - nLen );// no decimals =
strip DecSep
+sStr.truncate( sStr.getLength() - nLen );// no decimals =
strip DecSep
}
}
if (bSign)
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index d53e004..28a4ec6 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -906,7 +906,7 @@ static void lcl_EnquoteIfNecessary( rtl::OUStringBuffer
rContent, const SvXMLNu
rContent[nLen - 1] == (sal_Unicode) ''
rContent[nLen - 2] == (sal_Unicode) '' )
{
-rContent.remove(nLen - 2);
+rContent.truncate(nLen - 2);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Current Master Version?
On Thu, Dec 6, 2012 at 2:15 PM, Joel Madero jmadero@gmail.com wrote: Hi All, Is current master 4.1.0.0.alpha...? I was surprised after my build today that I saw 4.1 vs. 4.0just curious. Thanks all we branched 4.0 ... so now master is for vnext : 4.1 Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] OUStringBuffer::remove( int ) - truncate( int )
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1256 Approvals: Norbert Thiebaud: Verified; Looks good to me, approved Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1256 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I287619cd4b953228b93fa68fb381d66c344c3865 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
